diff --git a/.github/DockerfileBackendTests b/.github/DockerfileBackendTests
index 9fa9d788ff..e20d023bdc 100644
--- a/.github/DockerfileBackendTests
+++ b/.github/DockerfileBackendTests
@@ -1,22 +1,6 @@
-ARG DEBIAN_IMAGE=debian:bookworm-slim
 ARG RUST_IMAGE=rust:1.80-slim-bookworm
 ARG PYTHON_IMAGE=python:3.11.4-slim-bookworm
 
-FROM ${DEBIAN_IMAGE} as downloader
-
-ARG TARGETPLATFORM
-
-SHELL ["/bin/bash", "-c"]
-
-RUN apt update -y
-RUN apt install -y unzip curl
-
-RUN [ "$TARGETPLATFORM" == "linux/amd64" ] && curl -Lsf https://github.com/denoland/deno/releases/download/v1.46.3/deno-x86_64-unknown-linux-gnu.zip -o deno.zip || true
-RUN [ "$TARGETPLATFORM" == "linux/arm64" ] && curl -Lsf https://github.com/denoland/deno/releases/download/v1.46.3/deno-aarch64-unknown-linux-gnu.zip -o deno.zip || true
-
-
-RUN unzip deno.zip && rm deno.zip
-
 
 FROM ${RUST_IMAGE} as builder
 
@@ -31,7 +15,7 @@ ENV SQLX_OFFLINE=true
 
 RUN mkdir -p /frontend/build
 RUN apt-get update \
-    && apt-get install -y ca-certificates tzdata libpq5 cmake\
+    && apt-get install -y ca-certificates tzdata libpq5 cmake unzip\
     make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev \
     libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libxml2-dev \
     libxmlsec1-dev libffi-dev liblzma-dev mecab-ipadic-utf8 libgdbm-dev libc6-dev git libprotobuf-dev libnl-route-3-dev \
@@ -43,6 +27,9 @@ RUN wget https://golang.org/dl/go1.21.5.linux-amd64.tar.gz && tar -C /usr/local
 ENV PATH="${PATH}:/usr/local/go/bin"
 ENV GO_PATH=/usr/local/go/bin/go
 
+# Install UV
+RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.4.18/uv-installer.sh | sh && mv /usr/local/cargo/bin/uv /usr/local/bin/uv
+
 ENV TZ=Etc/UTC
 
 ENV PYTHON_VERSION 3.11.4
@@ -53,13 +40,14 @@ RUN wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VER
 
 RUN /usr/local/bin/python3 -m pip install pip-tools
 
-COPY --from=oven/bun:1.1.27 /usr/local/bin/bun /usr/bin/bun
+COPY --from=oven/bun:1.1.31 /usr/local/bin/bun /usr/bin/bun
 
+ARG TARGETPLATFORM
 
-RUN [ "$TARGETPLATFORM" == "linux/amd64" ] && curl -Lsf https://github.com/denoland/deno/releases/download/v1.41.0/deno-x86_64-unknown-linux-gnu.zip -o deno.zip || true
-RUN [ "$TARGETPLATFORM" == "linux/arm64" ] && curl -Lsf https://github.com/denoland/deno/releases/download/v1.41.0/deno-aarch64-unknown-linux-gnu.zip -o deno.zip || true
+RUN curl -Lsf https://github.com/denoland/deno/releases/download/v2.0.2/deno-x86_64-unknown-linux-gnu.zip -o deno.zip 
+# RUN [ "$TARGETPLATFORM" == "linux/arm64" ] && curl -Lsf https://github.com/denoland/deno/releases/download/v2.0.0/deno-aarch64-unknown-linux-gnu.zip -o deno.zip || true
 
-COPY --from=downloader --chmod=755 /deno /usr/bin/deno
+RUN unzip deno.zip && rm deno.zip && mv deno /usr/bin/deno
 
 RUN apt-get update \
     && apt-get install -y postgresql-client --allow-unauthenticated
diff --git a/.github/workflows/backend-test.yml b/.github/workflows/backend-test.yml
index 9963ecd4d1..cbcf40ebe6 100644
--- a/.github/workflows/backend-test.yml
+++ b/.github/workflows/backend-test.yml
@@ -41,8 +41,12 @@ jobs:
       - name: cargo test
         timeout-minutes: 15
         run:
+          /usr/bin/deno --version &&
+          /usr/bin/bun -v &&
+          go version &&
+          /usr/local/bin/python3 --version &&
           mkdir frontend/build && cd backend && touch
           windmill-api/openapi-deref.yaml &&
           DATABASE_URL=postgres://postgres:changeme@postgres:5432/windmill
-          DISABLE_EMBEDDING=true RUST_LOG=info cargo test --features enterprise
-          --all -- --nocapture
+          DISABLE_EMBEDDING=true RUST_LOG=info cargo test --features
+          enterprise,deno_core --all -- --nocapture
diff --git a/.github/workflows/build-publish-rh-image.yml b/.github/workflows/build-publish-rh-image.yml
new file mode 100644
index 0000000000..b957ac5148
--- /dev/null
+++ b/.github/workflows/build-publish-rh-image.yml
@@ -0,0 +1,128 @@
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+name: Build and publish windmill for RHEL9
+on:
+  workflow_dispatch
+
+permissions: write-all
+
+jobs:
+  build_ee:
+    runs-on: ubicloud
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Read EE repo commit hash
+        run: |
+          echo "ee_repo_ref=$(cat ./backend/ee-repo-ref.txt)" >> "$GITHUB_ENV"
+
+      - uses: actions/checkout@v4
+        with:
+          repository: windmill-labs/windmill-ee-private
+          path: ./windmill-ee-private
+          ref: ${{ env.ee_repo_ref }}
+          token: ${{ secrets.WINDMILL_EE_PRIVATE_ACCESS }}
+          fetch-depth: 0
+
+      # - name: Set up Docker Buildx
+      #   uses: docker/setup-buildx-action@v2
+      - uses: depot/setup-action@v1
+
+      - name: Docker meta
+        id: meta-ee-public
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ee-rhel9
+          flavor: |
+            latest=false
+          tags: |
+            type=sha
+
+      - name: Login to registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Substitute EE code
+        run: |
+          ./backend/substitute_ee_code.sh --copy --dir ./windmill-ee-private
+
+      - name: Copy RHEL9 Dockerfile
+        run: |
+          cp ./docker/RHEL9/Dockerfile ./Dockerfile
+
+      - name: Build and push publicly ee amd64
+        uses: depot/build-push-action@v1
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          build-args: |
+            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,deno_core
+          secrets: |
+            rh_username=${{ secrets.RH_USERNAME }}
+            rh_password=${{ secrets.RH_PASSWORD }}
+          tags: |
+            ${{ steps.meta-ee-public.outputs.tags }}-amd64
+          labels: |
+            ${{ steps.meta-ee-public.outputs.labels }}-amd64
+            org.opencontainers.image.licenses=Windmill-Enterprise-License
+      
+      - name: Build and push publicly ee arm64
+        uses: depot/build-push-action@v1
+        with:
+          context: .
+          platforms: linux/arm64
+          push: true
+          build-args: |
+            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,deno_core
+          secrets: |
+            rh_username=${{ secrets.RH_USERNAME }}
+            rh_password=${{ secrets.RH_PASSWORD }}
+          tags: |
+            ${{ steps.meta-ee-public.outputs.tags }}-arm64
+          labels: |
+            ${{ steps.meta-ee-public.outputs.labels }}-arm64
+            org.opencontainers.image.licenses=Windmill-Enterprise-License
+
+      - uses: shrink/actions-docker-extract@v3
+        id: extract-ee-amd64
+        with:
+          image: ${{ steps.meta-ee-public.outputs.tags}}-amd64
+          path: "/windmill/target/release/windmill"
+
+      - uses: shrink/actions-docker-extract@v3
+        id: extract-ee-arm64
+        with:
+          image: ${{ steps.meta-ee-public.outputs.tags}}-arm64
+          path: "/windmill/target/release/windmill"
+
+      - name: Rename binary with corresponding architecture
+        run: |
+          mv "${{ steps.extract-ee-amd64.outputs.destination }}/windmill" "${{ steps.extract-ee-amd64.outputs.destination }}/windmill-ee-amd64-rhel9"
+          mv "${{ steps.extract-ee-arm64.outputs.destination }}/windmill" "${{ steps.extract-ee-arm64.outputs.destination }}/windmill-ee-arm64-rhel9"
+      
+      - uses: actions/upload-artifact@v4
+        with:
+          name: RHEL9-amd64 build
+          path: ${{ steps.extract-ee-amd64.outputs.destination }}/windmill-ee-amd64-rhel9
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: RHEL9-arm64 build
+          path: ${{ steps.extract-ee-arm64.outputs.destination }}/windmill-ee-arm64-rhel9
+
+      # - name: Attach binary to release
+      #   uses: softprops/action-gh-release@v2
+      #   if: startsWith(github.ref, 'refs/tags/')
+      #   with:
+      #     files: |
+      #       ${{ steps.extract-ee-arm64.outputs.destination }}/windmill-ee-arm64-rhel9
+      #       ${{ steps.extract-ee-amd64.outputs.destination }}/windmill-ee-amd64-rhel9
diff --git a/.github/workflows/build-staging-image.yml b/.github/workflows/build-staging-image.yml
index 744ae83aae..724fde4e59 100644
--- a/.github/workflows/build-staging-image.yml
+++ b/.github/workflows/build-staging-image.yml
@@ -62,7 +62,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc
+            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,deno_core
           tags: |
             ${{ steps.meta-ee-public.outputs.tags }}
           labels: |
diff --git a/.github/workflows/build_windows_worker.yml b/.github/workflows/build_windows_worker.yml
new file mode 100644
index 0000000000..01c38dd2b1
--- /dev/null
+++ b/.github/workflows/build_windows_worker.yml
@@ -0,0 +1,60 @@
+name: Build and Publish Windows Worker
+
+on:
+  push:
+    tags:
+      - "v*"
+
+env:
+  CARGO_INCREMENTAL: 0
+  SQLX_OFFLINE: true
+  DISABLE_EMBEDDING: true
+  RUST_LOG: info
+
+jobs:
+  cargo_build_windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Read EE repo commit hash
+        shell: pwsh
+        run: |
+          $ee_repo_ref = Get-Content .\backend\ee-repo-ref.txt
+          echo "ee_repo_ref=$ee_repo_ref" | Out-File -FilePath $env:GITHUB_ENV -Append
+
+      - name: Checkout windmill-ee-private repository
+        uses: actions/checkout@v4
+        with:
+          repository: windmill-labs/windmill-ee-private
+          path: ./windmill-ee-private
+          ref: ${{ env.ee_repo_ref }}
+          token: ${{ secrets.WINDMILL_EE_PRIVATE_ACCESS }}
+          fetch-depth: 0
+
+      - name: Substitute EE code
+        shell: bash
+        run: |
+          ./backend/substitute_ee_code.sh --copy --dir ./windmill-ee-private
+
+      - name: Cargo build windows
+        timeout-minutes: 90
+        run: |
+          vcpkg.exe install openssl-windows:x64-windows
+          vcpkg.exe install openssl:x64-windows-static
+          vcpkg.exe integrate install
+          $env:VCPKGRS_DYNAMIC=1
+          $env:OPENSSL_DIR="${Env:VCPKG_INSTALLATION_ROOT}\installed\x64-windows-static"
+          mkdir frontend/build && cd backend
+          New-Item -Path . -Name "windmill-api/openapi-deref.yaml" -ItemType "File" -Force
+          cargo build --release --features=enterprise,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,tantivy,deno_core
+
+      - name: Rename binary with corresponding architecture
+        run: |
+          Rename-Item -Path ".\backend\target\release\windmill.exe" -NewName "windmill-ee.exe"
+
+      - name: Attach binary to release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            ./backend/target/release/windmill-ee.exe
diff --git a/.github/workflows/docker-image-rpi4.yml b/.github/workflows/docker-image-rpi4.yml
index 9fc20c3a87..71a796f679 100644
--- a/.github/workflows/docker-image-rpi4.yml
+++ b/.github/workflows/docker-image-rpi4.yml
@@ -67,7 +67,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            features=embedding,parquet,openidconnect
+            features=embedding,parquet,openidconnect,deno_core
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:dev
             ${{ steps.meta-public.outputs.tags }}
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 8cac56c35b..f1f3cae9f8 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,8 +1,10 @@
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.event_name != 'pull_request' && github.repository ||
+  IMAGE_NAME:
+    ${{ github.event_name != 'pull_request' && github.repository ||
     'windmill-labs/windmill-test' }}
-  DEV_SHA: ${{ github.event_name != 'pull_request' && 'dev' || format('pr-{0}',
+  DEV_SHA:
+    ${{ github.event_name != 'pull_request' && 'dev' || format('pr-{0}',
     github.event.number) }}
 
 name: Build windmill:main
@@ -24,6 +26,7 @@ permissions: write-all
 jobs:
   build:
     runs-on: ubicloud
+    if: (github.event_name != 'issue_comment') || (contains(github.event.comment.body, '/buildimage_all') || contains(github.event.comment.body, '/buildimage_base'))
     steps:
       - uses: actions/checkout@v4
         with:
@@ -75,7 +78,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            features=embedding,parquet,openidconnect,jemalloc
+            features=embedding,parquet,openidconnect,jemalloc,deno_core
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.DEV_SHA }}
             ${{ steps.meta-public.outputs.tags }}
@@ -85,6 +88,7 @@ jobs:
 
   build_ee:
     runs-on: ubicloud
+    if: (github.event_name != 'issue_comment') || (contains(github.event.comment.body, '/buildimage_ee') || contains(github.event.comment.body, '/buildimage_nsjail')) || contains(github.event.comment.body, '/buildimage_all')
     steps:
       - uses: actions/checkout@v4
         with:
@@ -136,7 +140,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,tantivy
+            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,tantivy,deno_core
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ee:${{ env.DEV_SHA }}
             ${{ steps.meta-ee-public.outputs.tags }}
@@ -146,7 +150,7 @@ jobs:
 
   build_ee_312:
     runs-on: ubicloud
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -198,7 +202,7 @@ jobs:
           platforms: linux/amd64
           push: true
           build-args: |
-            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,tantivy
+            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,tantivy,deno_core
             PYTHON_IMAGE=python:3.12.2-slim-bookworm
           tags: |
             ${{ steps.meta-ee-public-py312.outputs.tags }}
@@ -242,7 +246,7 @@ jobs:
   attach_amd64_binary_to_release:
     needs: [build, build_ee]
     runs-on: ubicloud
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
     env:
       ARCH: amd64
     steps:
@@ -335,10 +339,10 @@ jobs:
         with:
           fetch-depth: 0
       - name: Prepare test run
-        if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
+        if: ${{ ! startsWith(github.ref, 'refs/tags/v') }}
         run: cd integration_tests && ./build.sh
       - name: Test run
-        if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
+        if: ${{ ! startsWith(github.ref, 'refs/tags/v') }}
         timeout-minutes: 15
         env:
           LICENSE_KEY: ${{ secrets.WM_LICENSE_KEY_CI }}
@@ -354,7 +358,7 @@ jobs:
   tag_latest:
     runs-on: ubicloud
     needs: [run_integration_test, build]
-    if: github.event_name != 'pull_request'
+    if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
     steps:
       - uses: actions/checkout@v4
         with:
@@ -373,7 +377,7 @@ jobs:
   tag_latest_ee:
     runs-on: ubicloud
     needs: [run_integration_test, build_ee]
-    if: github.event_name != 'pull_request'
+    if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
     steps:
       - uses: actions/checkout@v4
         with:
@@ -392,7 +396,7 @@ jobs:
   verify_ee_image_vulnerabilities:
     runs-on: ubicloud
     needs: [tag_latest_ee]
-    # if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -434,7 +438,7 @@ jobs:
   build_ee_nsjail:
     needs: [build_ee]
     runs-on: ubicloud
-    if: github.event_name != 'pull_request'
+    if: (github.event_name != 'issue_comment') || (github.event_name != 'pull_request') || (contains(github.event.comment.body, '/buildimage_nsjail') || contains(github.event.comment.body, '/buildimage_all'))
     steps:
       - uses: actions/checkout@v4
         with:
@@ -457,6 +461,8 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=sha,enable=true,priority=100,prefix=,suffix=,format=short
+            type=ref,event=branch
+            type=ref,event=pr
 
       - name: Login to registry
         uses: docker/login-action@v3
@@ -474,7 +480,6 @@ jobs:
           file: "./docker/DockerfileNsjail"
           tags: |
             ${{ steps.meta-ee-public.outputs.tags }}
-            ghcr.io/windmill-labs/windmill-ee-nsjail:main
           labels: |
             ${{ steps.meta-ee-public.outputs.labels }}
             org.opencontainers.image.licenses=Windmill-Enterprise-License
@@ -568,7 +573,7 @@ jobs:
           bucket-region: us-east-1
 
   build_ee_cuda:
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
     needs: [build_ee]
     runs-on: ubicloud
     steps:
@@ -587,8 +592,6 @@ jobs:
         with:
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ee-cuda
-          flavor: |
-            latest=false
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
@@ -614,7 +617,7 @@ jobs:
             org.opencontainers.image.licenses=Windmill-Enterprise-License
 
   build_slim:
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
     needs: [build]
     runs-on: ubicloud
     steps:
@@ -633,8 +636,6 @@ jobs:
         with:
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-slim
-          flavor: |
-            latest=false
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
@@ -659,7 +660,7 @@ jobs:
             ${{ steps.meta-ee-public.outputs.labels }}
 
   build_ee_slim:
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
     needs: [build_ee]
     runs-on: ubicloud
     steps:
@@ -678,8 +679,6 @@ jobs:
         with:
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ee-slim
-          flavor: |
-            latest=false
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
@@ -705,7 +704,7 @@ jobs:
             org.opencontainers.image.licenses=Windmill-Enterprise-License
 
   build_full:
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
     needs: [build]
     runs-on: ubicloud
     steps:
@@ -724,8 +723,6 @@ jobs:
         with:
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-full
-          flavor: |
-            latest=false
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
@@ -750,7 +747,7 @@ jobs:
             ${{ steps.meta-public.outputs.labels }}
 
   build_ee_full:
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
     needs: [build_ee]
     runs-on: ubicloud
     steps:
@@ -769,8 +766,6 @@ jobs:
         with:
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ee-full
-          flavor: |
-            latest=false
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 848d9a6f10..111225c3a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,383 @@
 # Changelog
 
+## [1.416.2](https://github.com/windmill-labs/windmill/compare/v1.416.1...v1.416.2) (2024-11-02)
+
+
+### Bug Fixes
+
+* apply NO_PROXY and HTTP_PROXY, HTTPS_PROXY more consistently ([567d621](https://github.com/windmill-labs/windmill/commit/567d6216d2631a90fbe59ec6142c38b3b352eea7))
+
+## [1.416.1](https://github.com/windmill-labs/windmill/compare/v1.416.0...v1.416.1) (2024-11-01)
+
+
+### Bug Fixes
+
+* **prometheus:** fix incorrect worker_busy set to 1 ([53f9136](https://github.com/windmill-labs/windmill/commit/53f9136658b9fc1795793d82408c1f1f04adcf06))
+
+## [1.416.0](https://github.com/windmill-labs/windmill/compare/v1.415.2...v1.416.0) (2024-11-01)
+
+
+### Features
+
+* private hub user accessible url setting ([#4617](https://github.com/windmill-labs/windmill/issues/4617)) ([79edf89](https://github.com/windmill-labs/windmill/commit/79edf89bd17827d5f1d946739385327b6c0520bf))
+
+
+### Bug Fixes
+
+* **frontend:** improve tag selector for workspace script drawer ([66f6985](https://github.com/windmill-labs/windmill/commit/66f69859ad2de51aef5a133df4ab4397d0f61ccf))
+
+## [1.415.2](https://github.com/windmill-labs/windmill/compare/v1.415.1...v1.415.2) (2024-11-01)
+
+
+### Bug Fixes
+
+* **s3:** align s3 handler additional creds providers ([984c6dd](https://github.com/windmill-labs/windmill/commit/984c6dd10c63097eb195883c4d8a9681ab1b49e0))
+
+## [1.415.1](https://github.com/windmill-labs/windmill/compare/v1.415.0...v1.415.1) (2024-10-31)
+
+
+### Bug Fixes
+
+* **cli:** improve --instance handling wmill instance push ([cb005a1](https://github.com/windmill-labs/windmill/commit/cb005a15baef4272bc58c7e80a43e44723556d31))
+
+## [1.415.0](https://github.com/windmill-labs/windmill/compare/v1.414.2...v1.415.0) (2024-10-31)
+
+
+### Features
+
+* **cli:** opts.instance as instace name and prefix ([#4609](https://github.com/windmill-labs/windmill/issues/4609)) ([a07f57e](https://github.com/windmill-labs/windmill/commit/a07f57e698107056d045d8d5c2458e04c809fcc8))
+
+
+### Bug Fixes
+
+* improve express oauth setup ([ba4aed5](https://github.com/windmill-labs/windmill/commit/ba4aed5bf51c65204332cfc158d0ffd9c7095ec7))
+* improve user resource input ([8c7f53b](https://github.com/windmill-labs/windmill/commit/8c7f53b2ebe0990cd93879258d004ac89dc8b24c))
+
+## [1.414.2](https://github.com/windmill-labs/windmill/compare/v1.414.1...v1.414.2) (2024-10-29)
+
+
+### Bug Fixes
+
+* **cli:** improve instance sync for CI/CD + --folder-per-instance ([212579a](https://github.com/windmill-labs/windmill/commit/212579a514d070355fe0d9e0215593bacfa05e1f))
+
+## [1.414.1](https://github.com/windmill-labs/windmill/compare/v1.414.0...v1.414.1) (2024-10-29)
+
+
+### Bug Fixes
+
+* **apps:** enable text selection on aggrid tables by default ([b0b9180](https://github.com/windmill-labs/windmill/commit/b0b9180fb907c92b95a48ff286eb1dae59bb4981))
+* **apps:** public apps can take full height ([703db7d](https://github.com/windmill-labs/windmill/commit/703db7d4412795b4323a2eefcc39ae3cf43bc748))
+* **bun:** handle bun lockfile created with windows ([#4602](https://github.com/windmill-labs/windmill/issues/4602)) ([dcf5e2f](https://github.com/windmill-labs/windmill/commit/dcf5e2f03f977e241f6785530dad61a70c5bdd79))
+* **frontend:** make script and schema scrollable on script detail page ([6e222b3](https://github.com/windmill-labs/windmill/commit/6e222b3b1a419e5543fdf35420a7413699688b41))
+* **frontend:** new approval steps default to timeout 1800 ([b86de62](https://github.com/windmill-labs/windmill/commit/b86de6280e03e014e8ddf85b2b5f8fd030d0467a))
+
+## [1.414.0](https://github.com/windmill-labs/windmill/compare/v1.413.2...v1.414.0) (2024-10-29)
+
+* Issue with previous release, re-releasing
+
+## [1.413.2](https://github.com/windmill-labs/windmill/compare/v1.413.1...v1.413.2) (2024-10-29)
+
+
+### Bug Fixes
+
+* **backend:** in flows, workspace scripts should use their set tags instead of the default one ([5b7c6d7](https://github.com/windmill-labs/windmill/commit/5b7c6d7d62dcfd09fec374e781bdf5c5bafe4a9d))
+* **cli:** fix wmill instance pull  --instance ([3c62f5e](https://github.com/windmill-labs/windmill/commit/3c62f5ea83d1da8bd3705468969d56e2fe680751))
+* **frontend:** fix script and flow renaming ([d743e00](https://github.com/windmill-labs/windmill/commit/d743e0056353a4fca445a7089e3afc1fd4e8c219))
+
+## [1.413.1](https://github.com/windmill-labs/windmill/compare/v1.413.0...v1.413.1) (2024-10-28)
+
+
+### Bug Fixes
+
+* **cli:** fix wmill instance push --base-url and --instance ([8298710](https://github.com/windmill-labs/windmill/commit/82987105a6fd6ec272c170fb094453a0267143be))
+
+## [1.413.0](https://github.com/windmill-labs/windmill/compare/v1.412.0...v1.413.0) (2024-10-28)
+
+
+### Features
+
+* autoscaling v0 ([#4593](https://github.com/windmill-labs/windmill/issues/4593)) ([fe7d044](https://github.com/windmill-labs/windmill/commit/fe7d044a66e8ec223a337cb704d3e58942dd1502))
+
+
+### Bug Fixes
+
+* add run immediately popover to run again ([e54d253](https://github.com/windmill-labs/windmill/commit/e54d25368541dc6109a0f99022a120d28455f9bd))
+* **docs:** smtp setup documentation link ([#4590](https://github.com/windmill-labs/windmill/issues/4590)) ([bac3205](https://github.com/windmill-labs/windmill/commit/bac32057259d893140d649c9dfec2ca75e395ad4))
+
+## [1.412.0](https://github.com/windmill-labs/windmill/compare/v1.411.1...v1.412.0) (2024-10-25)
+
+
+### Features
+
+* add Spotify oauth provider ([#4581](https://github.com/windmill-labs/windmill/issues/4581)) ([a46aa64](https://github.com/windmill-labs/windmill/commit/a46aa644b096e71e75b59507224ed92f7d2f99ba))
+
+
+### Bug Fixes
+
+* **app builder:** date input default value improvements ([9f43d5d](https://github.com/windmill-labs/windmill/commit/9f43d5dcd92ddcd0c0baeaa5271779520af652f4))
+* **bash:** correctly propagate sigterm for cancelled bash scripts ([134cfdb](https://github.com/windmill-labs/windmill/commit/134cfdb30eb8d29c2ecb1b78b8fabae2b6e10700))
+* do not update created_at of scripts on lockfile generation ([d1a28eb](https://github.com/windmill-labs/windmill/commit/d1a28eb7cac5f465e2b07f870a507b0cc5cc722a))
+* initialize empty smtp settings correctly ([84e0524](https://github.com/windmill-labs/windmill/commit/84e05249505c3d2f7eb7a4917f6bca503df81017))
+
+## [1.411.1](https://github.com/windmill-labs/windmill/compare/v1.411.0...v1.411.1) (2024-10-22)
+
+
+### Bug Fixes
+
+* update bun to 1.1.32 ([#4568](https://github.com/windmill-labs/windmill/issues/4568)) ([0586446](https://github.com/windmill-labs/windmill/commit/058644667129f0d79ec147aacdda449142ae0ab9))
+
+## [1.411.0](https://github.com/windmill-labs/windmill/compare/v1.410.3...v1.411.0) (2024-10-21)
+
+
+### Features
+
+* **cli:** encrypt sensitive instance settings ([#4561](https://github.com/windmill-labs/windmill/issues/4561)) ([b8a6a11](https://github.com/windmill-labs/windmill/commit/b8a6a116354b10f5977e54edb365d6711e160538))
+
+
+### Bug Fixes
+
+* Do not ignore file resources with json file ext ([#4562](https://github.com/windmill-labs/windmill/issues/4562)) ([2079b2e](https://github.com/windmill-labs/windmill/commit/2079b2e7e19aa2fe327f2ae66d1b5eba988b9b0a))
+* update bun to 1.1.31 and deno to 2.0.2 ([0d90396](https://github.com/windmill-labs/windmill/commit/0d9039641b3348e75599937188c35dd89a000584))
+
+## [1.410.3](https://github.com/windmill-labs/windmill/compare/v1.410.2...v1.410.3) (2024-10-20)
+
+
+### Bug Fixes
+
+* **go-client:** reduce runtime dependencies by bumping oai-codeen to v2.4.1 ([87f5c07](https://github.com/windmill-labs/windmill/commit/87f5c078dd63cd3e0ba3e719c2da7b83f1458e2c))
+
+## [1.410.1](https://github.com/windmill-labs/windmill/compare/v1.410.0...v1.410.1) (2024-10-19)
+
+
+### Bug Fixes
+
+* **cli:** improve wmill init behavior ([26a40d1](https://github.com/windmill-labs/windmill/commit/26a40d19441aa816ee711ce30f3435dddd3542a7))
+* **frontend:** improve display of error handlers ([a92a2fd](https://github.com/windmill-labs/windmill/commit/a92a2fd6fd67c11c04554a90b8ae6d7a0dd9067c))
+
+## [1.410.1](https://github.com/windmill-labs/windmill/compare/v1.410.0...v1.410.1) (2024-10-19)
+
+
+### Bug Fixes
+
+* **cli:** improve wmill init behavior ([26a40d1](https://github.com/windmill-labs/windmill/commit/26a40d19441aa816ee711ce30f3435dddd3542a7))
+
+## [1.410.0](https://github.com/windmill-labs/windmill/compare/v1.409.4...v1.410.0) (2024-10-18)
+
+
+### Features
+
+* **typescript-bun:** support relative imports without the .ts extension ([248fdc2](https://github.com/windmill-labs/windmill/commit/248fdc24a61aca946902b20b9d8187101a9b7bfa))
+* websocket triggers ([#4505](https://github.com/windmill-labs/windmill/issues/4505)) ([8807e99](https://github.com/windmill-labs/windmill/commit/8807e99f06caf3e26c526eefdc83dbc2f7aa93ee))
+
+
+### Bug Fixes
+
+* cache js static assets by default ([08595c6](https://github.com/windmill-labs/windmill/commit/08595c6f14a89df1559974e8835e63881a1a9601))
+* **frontend:** add back script lockfile to script details pae ([549b11d](https://github.com/windmill-labs/windmill/commit/549b11dcfb39a60acd6d3899fce51b31149f8594))
+* improve cancelling of jobs on public apps for anonymous users ([d7cf5ea](https://github.com/windmill-labs/windmill/commit/d7cf5ea37db313e78865708bc22e87a1feea9e0d))
+
+## [1.409.4](https://github.com/windmill-labs/windmill/compare/v1.409.3...v1.409.4) (2024-10-17)
+
+
+### Bug Fixes
+
+* fix flow viewer renderer outside of flow details and editor context ([59a1e67](https://github.com/windmill-labs/windmill/commit/59a1e67465cd21ded5539cb5b829bc0d4e7169ed))
+
+## [1.409.3](https://github.com/windmill-labs/windmill/compare/v1.409.2...v1.409.3) (2024-10-17)
+
+
+### Bug Fixes
+
+* do not delete primary schedule of script/flow on redeploy even if schedule wasn't loaded ([c3c2fe4](https://github.com/windmill-labs/windmill/commit/c3c2fe462c52f48795a55025414b16f8d3d98fe0))
+* **nsjail:** improve memory reading when using nsjail ([b7ad19b](https://github.com/windmill-labs/windmill/commit/b7ad19bb75bd885a254ebac778349c7d88af8326))
+
+## [1.409.2](https://github.com/windmill-labs/windmill/compare/v1.409.1...v1.409.2) (2024-10-16)
+
+
+### Bug Fixes
+
+* add extra args support for exception to bun scripts ([1466da3](https://github.com/windmill-labs/windmill/commit/1466da3999add0238b9c42ca13df52194f082fc0))
+* fix script persistence in url + add support for extra error args in python ([3174024](https://github.com/windmill-labs/windmill/commit/3174024d8e6ecbe9f8c9e1ea055d611f652c0057))
+
+## [1.409.1](https://github.com/windmill-labs/windmill/compare/v1.409.0...v1.409.1) (2024-10-16)
+
+
+### Bug Fixes
+
+* **apidocs:** fix generated openapi files ([d24e153](https://github.com/windmill-labs/windmill/commit/d24e1530655d27ffda9bb4c19471dc1431124cc2))
+* **git-sync:** propagate update of folders with git sync ([6abb346](https://github.com/windmill-labs/windmill/commit/6abb346013da4a907a860713a8a67642985b8025))
+
+## [1.409.0](https://github.com/windmill-labs/windmill/compare/v1.408.1...v1.409.0) (2024-10-16)
+
+
+### Features
+
+* **frontend:** unify all triggers UX and simplify flow settings ([#4259](https://github.com/windmill-labs/windmill/issues/4259)) ([91a3d06](https://github.com/windmill-labs/windmill/commit/91a3d065298cce7a882464fa0cd31d8f1ae9dda2))
+* Scroll to element in virtual list when clicking on graph point ([#4532](https://github.com/windmill-labs/windmill/issues/4532)) ([7126ba1](https://github.com/windmill-labs/windmill/commit/7126ba12c7eb52d2cfbe8d83311b5592a5707bce))
+* **sso:** adding the ability to define a custom display name for sso ([#4529](https://github.com/windmill-labs/windmill/issues/4529)) ([99c5b3e](https://github.com/windmill-labs/windmill/commit/99c5b3ecdacb1158c2cba5b891c4c3b8b70c3b6a))
+
+
+### Bug Fixes
+
+* Add indexer backup lock to fit the deployment model ([#4531](https://github.com/windmill-labs/windmill/issues/4531)) ([411bce7](https://github.com/windmill-labs/windmill/commit/411bce7e13aabfa53db80d55261ea4511f6d1ae9))
+* **app:** accept connecting to non yet existing state output for convenience ([9eb1ecc](https://github.com/windmill-labs/windmill/commit/9eb1ecc9f3017e2f4284a827a2bcd21f36b1b8ac))
+* **app:** improve absolute url handling in download button and downloadFile ([dcdbf1a](https://github.com/windmill-labs/windmill/commit/dcdbf1afb4d5a18e00b9bbb1eb0bef129ea5667f))
+* **app:** make s3 uploads persistent across tabs change ([c3b536b](https://github.com/windmill-labs/windmill/commit/c3b536b1b8069898131768867a187b186b21e537))
+* canceled jobs button reporting 0 jobs cancelled ([#4534](https://github.com/windmill-labs/windmill/issues/4534)) ([e736572](https://github.com/windmill-labs/windmill/commit/e736572db10929ae5e123c4f6cef73b8e90fc29b))
+* **python-client:** improve get_job_status for running jobs ([a8c4ea2](https://github.com/windmill-labs/windmill/commit/a8c4ea2334d2535fa7d5d43f58d65565afe8f3e5))
+* **ui:** dark mode support for queue metrics based critical alert ([#4535](https://github.com/windmill-labs/windmill/issues/4535)) ([f38b3d1](https://github.com/windmill-labs/windmill/commit/f38b3d14e8092ae58817511aea91a4e77725ead6))
+
+## [1.408.1](https://github.com/windmill-labs/windmill/compare/v1.408.0...v1.408.1) (2024-10-12)
+
+
+### Bug Fixes
+
+* fix deno cache --allow-import on deno 2 ([42fe31f](https://github.com/windmill-labs/windmill/commit/42fe31f804c9e6643cd90167494e45270831e013))
+
+## [1.408.0](https://github.com/windmill-labs/windmill/compare/v1.407.2...v1.408.0) (2024-10-12)
+
+
+### Features
+
+* **app builder:** file download helper ([#4511](https://github.com/windmill-labs/windmill/issues/4511)) ([f82f091](https://github.com/windmill-labs/windmill/commit/f82f09129096cfff975370d8bb7b6d832a2b8f9f))
+
+
+### Bug Fixes
+
+* **cli:** handle case where 'toString' is a schema field ([568cc66](https://github.com/windmill-labs/windmill/commit/568cc66932fb0470f5e89de7b02d94dba4050638))
+* **frontend:** s3 file uploader works on public apps too ([982dde2](https://github.com/windmill-labs/windmill/commit/982dde2b9dfe6d9eda300c683af729d97a03cb4d))
+* **frontend:** set unused schema property fields to null ([be11240](https://github.com/windmill-labs/windmill/commit/be112408e7c4601314726e9517c37daaeaa1bf09))
+* improve workflow as code row-lock on db to handle more concurrency ([d2c4d3f](https://github.com/windmill-labs/windmill/commit/d2c4d3fa207379cb0b8ac180f6ccc759045580e8))
+
+## [1.407.2](https://github.com/windmill-labs/windmill/compare/v1.407.1...v1.407.2) (2024-10-10)
+
+
+### Bug Fixes
+
+* improve default properties of new nodes of flows (suspend, branchone, branchall) ([d9bdc5a](https://github.com/windmill-labs/windmill/commit/d9bdc5a5b08dd4d0381304656af097315398c9d4))
+
+## [1.407.1](https://github.com/windmill-labs/windmill/compare/v1.407.0...v1.407.1) (2024-10-10)
+
+
+### Bug Fixes
+
+* improve handling of empty lock files on deno 2.0 ([7ca5bf2](https://github.com/windmill-labs/windmill/commit/7ca5bf2faeff44a7543b1afa9369c140fcb71dfc))
+
+## [1.407.0](https://github.com/windmill-labs/windmill/compare/v1.406.0...v1.407.0) (2024-10-10)
+
+
+### Features
+
+* upgrade to deno 2 ([26b11a0](https://github.com/windmill-labs/windmill/commit/26b11a00150acbe101abe4bb542f24379da0cc56))
+
+
+### Bug Fixes
+
+* update internal deno runtime to latest (deno 2.0) ([c3a5736](https://github.com/windmill-labs/windmill/commit/c3a57366419882ea2de1938bea592c795b1a1d03))
+
+## [1.406.0](https://github.com/windmill-labs/windmill/compare/v1.405.5...v1.406.0) (2024-10-09)
+
+
+### Features
+
+* **frontend:** components can be moved inside containers by holding ctrl/cmd ([111bfc6](https://github.com/windmill-labs/windmill/commit/111bfc6a659037ae7029e8f557256e2fffcf979b))
+* **monitoring:** Critical Alerts for Jobs Waiting in Queue [enterprise] ([#4491](https://github.com/windmill-labs/windmill/issues/4491)) ([d90d6c2](https://github.com/windmill-labs/windmill/commit/d90d6c2b896c5f99e00681656f376b180901f272))
+
+
+### Bug Fixes
+
+* **cli:** instance sync push does not require sync pull ([257f097](https://github.com/windmill-labs/windmill/commit/257f0971f86938da71b879f32d93473976eaa920))
+* remove monaco-editor for app preview code path for faster app loads ([7b05033](https://github.com/windmill-labs/windmill/commit/7b0503332d1bdd7f5999a5ef99150f8c9f6f18be))
+
+## [1.405.5](https://github.com/windmill-labs/windmill/compare/v1.405.4...v1.405.5) (2024-10-04)
+
+
+### Bug Fixes
+
+* windows.exe build with github workflow doesn't have openssl.dll bundled in ([#4489](https://github.com/windmill-labs/windmill/issues/4489)) ([284cb40](https://github.com/windmill-labs/windmill/commit/284cb4069c97efe59b5caf3effb68c8b30e02b73))
+
+## [1.405.4](https://github.com/windmill-labs/windmill/compare/v1.405.3...v1.405.4) (2024-10-04)
+
+
+### Bug Fixes
+
+* **frontend:** correctly initialize step inputs on new inline script ([289ad51](https://github.com/windmill-labs/windmill/commit/289ad51374f0344582372572fc521f3b2bf12b33))
+
+## [1.405.3](https://github.com/windmill-labs/windmill/compare/v1.405.2...v1.405.3) (2024-10-04)
+
+
+### Bug Fixes
+
+* fix id save on apps ([b034b07](https://github.com/windmill-labs/windmill/commit/b034b070c075a0fab74678bec1fd8b829d55b204))
+
+## [1.405.2](https://github.com/windmill-labs/windmill/compare/v1.405.1...v1.405.2) (2024-10-03)
+
+
+### Bug Fixes
+
+* **cli:** fix opts.yes for instance sync ([26659ce](https://github.com/windmill-labs/windmill/commit/26659ce37d2887d5b98dbdbdbba27bab85d4fe3f))
+* fix uv path ([19c62ba](https://github.com/windmill-labs/windmill/commit/19c62ba195b1df85c38c748dab7d9f137696a5c3))
+
+## [1.405.1](https://github.com/windmill-labs/windmill/compare/v1.405.0...v1.405.1) (2024-10-03)
+
+
+### Bug Fixes
+
+* flow picker of flows + precache hub scripts as bundles ([c84e6fd](https://github.com/windmill-labs/windmill/commit/c84e6fd05de2bea426cae61fa25db0323b8770f5))
+
+## [1.405.0](https://github.com/windmill-labs/windmill/compare/v1.404.1...v1.405.0) (2024-10-03)
+
+
+### Features
+
+* Replace `pip-compile` with `uv` ([#4460](https://github.com/windmill-labs/windmill/issues/4460)) ([b54c9ee](https://github.com/windmill-labs/windmill/commit/b54c9ee657cc88fabe694cae39dc0d3c1918fcbb))
+* **worker:** support workers to run natively on windows ([#4446](https://github.com/windmill-labs/windmill/issues/4446)) ([f5c4727](https://github.com/windmill-labs/windmill/commit/f5c472727465dd95f5378bc08ee9bbb983f4d259))
+
+
+### Bug Fixes
+
+* **cli:** fix set client of instance when passing token and base url ([794c4cd](https://github.com/windmill-labs/windmill/commit/794c4cde3cd47042472dccdf4b60a012014dd26d))
+
+## [1.404.1](https://github.com/windmill-labs/windmill/compare/v1.404.0...v1.404.1) (2024-10-03)
+
+
+### Bug Fixes
+
+* flow picker of flows ([92f61f0](https://github.com/windmill-labs/windmill/commit/92f61f07ed6d354407d26843e3a270b95bae90bc))
+
+## [1.404.0](https://github.com/windmill-labs/windmill/compare/v1.403.1...v1.404.0) (2024-10-03)
+
+
+### Features
+
+* **frontend:** add quick access menu in flow editor ([#4415](https://github.com/windmill-labs/windmill/issues/4415)) ([45ccd45](https://github.com/windmill-labs/windmill/commit/45ccd45e306c66931880a9b8fd48bfe684c774ac))
+
+
+### Bug Fixes
+
+* **cli:** improve schedule path handling on windows ([9ac3b6b](https://github.com/windmill-labs/windmill/commit/9ac3b6b1d5d64d7467dd80506f8a8d772c4630bd))
+* fix id editor for app ([8e58e43](https://github.com/windmill-labs/windmill/commit/8e58e4320a31d71c40a5ed352416a4c2dd3adb26))
+* **frontend:** disable runnable field on route editor from detail panel ([#4469](https://github.com/windmill-labs/windmill/issues/4469)) ([3134f79](https://github.com/windmill-labs/windmill/commit/3134f79ced80aab86912643ab7a60dcf909ab104))
+
+## [1.403.1](https://github.com/windmill-labs/windmill/compare/v1.403.0...v1.403.1) (2024-10-01)
+
+
+### Bug Fixes
+
+* fix new instance db setup ([73ab8e1](https://github.com/windmill-labs/windmill/commit/73ab8e1653d6e0c0c69fa7dcd96583f25d13ef86))
+
+## [1.403.0](https://github.com/windmill-labs/windmill/compare/v1.402.3...v1.403.0) (2024-10-01)
+
+
+### Features
+
+* flow step skipping ([#4461](https://github.com/windmill-labs/windmill/issues/4461)) ([0df169e](https://github.com/windmill-labs/windmill/commit/0df169e3f996ed54b91569b13cce15d7d019a213))
+
+
+### Bug Fixes
+
+* skip one migration to avoid using md5 for azure support ([630ae5d](https://github.com/windmill-labs/windmill/commit/630ae5d425cd9957d674befd2df96e2befec52a3))
+
 ## [1.402.3](https://github.com/windmill-labs/windmill/compare/v1.402.2...v1.402.3) (2024-09-30)
 
 
diff --git a/Dockerfile b/Dockerfile
index 3bc5088aed..8683aa9738 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -158,8 +158,11 @@ RUN set -eux; \
 ENV PATH="${PATH}:/usr/local/go/bin"
 ENV GO_PATH=/usr/local/go/bin/go
 
+# Install UV
+RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.4.18/uv-installer.sh | sh && mv /root/.cargo/bin/uv /usr/local/bin/uv
+
 RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - 
-RUN apt-get -y update && apt-get install -y curl nodejs awscli && apt-get clean \
+RUN apt-get -y update && apt-get install -y curl procps nodejs awscli && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
 # go build is slower the first time it is ran, so we prewarm it in the build
@@ -172,9 +175,9 @@ RUN /usr/local/bin/python3 -m pip install pip-tools
 COPY --from=builder /frontend/build /static_frontend
 COPY --from=builder /windmill/target/release/windmill ${APP}/windmill
 
-COPY --from=denoland/deno:1.46.3 --chmod=755 /usr/bin/deno /usr/bin/deno
+COPY --from=denoland/deno:2.0.2 --chmod=755 /usr/bin/deno /usr/bin/deno
 
-COPY --from=oven/bun:1.1.27 /usr/local/bin/bun /usr/bin/bun
+COPY --from=oven/bun:1.1.32 /usr/local/bin/bun /usr/bin/bun
 
 COPY --from=php:8.3.7-cli /usr/local/bin/php /usr/bin/php
 COPY --from=composer:2.7.6 /usr/bin/composer /usr/bin/composer
diff --git a/backend/.sqlx/query-02424907504848e983bfa89eec343061932dc5b4b17cf13d5cf8d833aedbe6d5.json b/backend/.sqlx/query-02424907504848e983bfa89eec343061932dc5b4b17cf13d5cf8d833aedbe6d5.json
new file mode 100644
index 0000000000..c8b5e3086f
--- /dev/null
+++ b/backend/.sqlx/query-02424907504848e983bfa89eec343061932dc5b4b17cf13d5cf8d833aedbe6d5.json
@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE websocket_trigger SET server_id = $1, last_server_ping = now() WHERE enabled IS TRUE AND workspace_id = $2 AND path = $3 AND (server_id IS NULL OR last_server_ping IS NULL OR last_server_ping < now() - interval '15 seconds') RETURNING true",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "02424907504848e983bfa89eec343061932dc5b4b17cf13d5cf8d833aedbe6d5"
+}
diff --git a/backend/.sqlx/query-02b516dac764662194db1bc33e365c01f40bae70af3683f1f09748f6020f0d49.json b/backend/.sqlx/query-02b516dac764662194db1bc33e365c01f40bae70af3683f1f09748f6020f0d49.json
deleted file mode 100644
index 99f3606bcd..0000000000
--- a/backend/.sqlx/query-02b516dac764662194db1bc33e365c01f40bae70af3683f1f09748f6020f0d49.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT tag, count(*) as count FROM queue WHERE\n                scheduled_for <= now() - ('3 seconds')::interval AND running = false\n                GROUP BY tag",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "tag",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "count",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      null
-    ]
-  },
-  "hash": "02b516dac764662194db1bc33e365c01f40bae70af3683f1f09748f6020f0d49"
-}
diff --git a/backend/.sqlx/query-0ee63ef2dd5c88edba2a1f56d31f29876724922f148dad7af35b36efbf70207a.json b/backend/.sqlx/query-0ee63ef2dd5c88edba2a1f56d31f29876724922f148dad7af35b36efbf70207a.json
new file mode 100644
index 0000000000..5cb52b6ead
--- /dev/null
+++ b/backend/.sqlx/query-0ee63ef2dd5c88edba2a1f56d31f29876724922f148dad7af35b36efbf70207a.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM healthchecks WHERE check_type = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "0ee63ef2dd5c88edba2a1f56d31f29876724922f148dad7af35b36efbf70207a"
+}
diff --git a/backend/.sqlx/query-12a86755706ce030a0a9142da78d035d0c7d361240b60005cc864e4345eb0bc7.json b/backend/.sqlx/query-12a86755706ce030a0a9142da78d035d0c7d361240b60005cc864e4345eb0bc7.json
new file mode 100644
index 0000000000..dc357c2169
--- /dev/null
+++ b/backend/.sqlx/query-12a86755706ce030a0a9142da78d035d0c7d361240b60005cc864e4345eb0bc7.json
@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE websocket_trigger SET enabled = $1, email = $2, edited_by = $3, edited_at = now(), server_id = NULL, last_server_ping = NULL, error = NULL\n        WHERE path = $4 AND workspace_id = $5 RETURNING 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Bool",
+        "Varchar",
+        "Varchar",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "12a86755706ce030a0a9142da78d035d0c7d361240b60005cc864e4345eb0bc7"
+}
diff --git a/backend/.sqlx/query-14abf759dae7ba5c38017ba6001927c6df0653a02b87bcea939066e39ebcf24d.json b/backend/.sqlx/query-14abf759dae7ba5c38017ba6001927c6df0653a02b87bcea939066e39ebcf24d.json
new file mode 100644
index 0000000000..29aaf47e88
--- /dev/null
+++ b/backend/.sqlx/query-14abf759dae7ba5c38017ba6001927c6df0653a02b87bcea939066e39ebcf24d.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO concurrency_locks (id, last_locked_at, owner)\n                    VALUES ($1, now(), $2)\n                    ON CONFLICT (id)\n                    DO UPDATE SET\n                        last_locked_at = now(),\n                        owner = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "14abf759dae7ba5c38017ba6001927c6df0653a02b87bcea939066e39ebcf24d"
+}
diff --git a/backend/.sqlx/query-c2060e8cacef6c3b5ce51ed203a2dbafc18d66f2924d1fe518c6728997647db2.json b/backend/.sqlx/query-1a4d291c2f239f7b50c116594cebb031862e1a18ad9204e02a0194817db26d6a.json
similarity index 75%
rename from backend/.sqlx/query-c2060e8cacef6c3b5ce51ed203a2dbafc18d66f2924d1fe518c6728997647db2.json
rename to backend/.sqlx/query-1a4d291c2f239f7b50c116594cebb031862e1a18ad9204e02a0194817db26d6a.json
index 6a08bbeab3..b8c5b89128 100644
--- a/backend/.sqlx/query-c2060e8cacef6c3b5ce51ed203a2dbafc18d66f2924d1fe518c6728997647db2.json
+++ b/backend/.sqlx/query-1a4d291c2f239f7b50c116594cebb031862e1a18ad9204e02a0194817db26d6a.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT email, login_type::text, verified, super_admin, name, company, username from password ORDER BY super_admin DESC, email LIMIT $1 OFFSET $2",
+  "query": "SELECT email, login_type::text, verified, super_admin, name, company, username, NULL::bool as operator_only FROM password ORDER BY super_admin DESC, email LIMIT $1 OFFSET $2",
   "describe": {
     "columns": [
       {
@@ -37,6 +37,11 @@
         "ordinal": 6,
         "name": "username",
         "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "operator_only",
+        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -52,8 +57,9 @@
       false,
       true,
       true,
-      true
+      true,
+      null
     ]
   },
-  "hash": "c2060e8cacef6c3b5ce51ed203a2dbafc18d66f2924d1fe518c6728997647db2"
+  "hash": "1a4d291c2f239f7b50c116594cebb031862e1a18ad9204e02a0194817db26d6a"
 }
diff --git a/backend/.sqlx/query-1ca5bc2d35c0498b587fd0618434def64233dc4f8fc3344d8d74be8e96ded659.json b/backend/.sqlx/query-1ca5bc2d35c0498b587fd0618434def64233dc4f8fc3344d8d74be8e96ded659.json
new file mode 100644
index 0000000000..3a2e44bdba
--- /dev/null
+++ b/backend/.sqlx/query-1ca5bc2d35c0498b587fd0618434def64233dc4f8fc3344d8d74be8e96ded659.json
@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) FROM schedule WHERE script_path = $1 AND is_flow = $2 AND workspace_id = $3",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Bool",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "1ca5bc2d35c0498b587fd0618434def64233dc4f8fc3344d8d74be8e96ded659"
+}
diff --git a/backend/.sqlx/query-1f5f0858909eb5bac63c4e3b1add95226bd94ca3facb92a620ffa59dacad6705.json b/backend/.sqlx/query-1f5f0858909eb5bac63c4e3b1add95226bd94ca3facb92a620ffa59dacad6705.json
new file mode 100644
index 0000000000..0adff2fe2c
--- /dev/null
+++ b/backend/.sqlx/query-1f5f0858909eb5bac63c4e3b1add95226bd94ca3facb92a620ffa59dacad6705.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO autoscaling_event (worker_group, event_type, desired_workers, reason) VALUES ($1, $2, $3, $4)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        {
+          "Custom": {
+            "name": "autoscaling_event_type",
+            "kind": {
+              "Enum": [
+                "full_scaleout",
+                "scalein",
+                "scaleout"
+              ]
+            }
+          }
+        },
+        "Int4",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1f5f0858909eb5bac63c4e3b1add95226bd94ca3facb92a620ffa59dacad6705"
+}
diff --git a/backend/.sqlx/query-2041526bc58872d71f91f7698144039bd67f8e37895befa94a15b7e4019e114b.json b/backend/.sqlx/query-2041526bc58872d71f91f7698144039bd67f8e37895befa94a15b7e4019e114b.json
new file mode 100644
index 0000000000..cbe5ec7607
--- /dev/null
+++ b/backend/.sqlx/query-2041526bc58872d71f91f7698144039bd67f8e37895befa94a15b7e4019e114b.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM healthchecks WHERE healthy = true AND created_at < NOW() - INTERVAL '14 days'",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "2041526bc58872d71f91f7698144039bd67f8e37895befa94a15b7e4019e114b"
+}
diff --git a/backend/.sqlx/query-2238aaed46031f71b17c1cabcef935a0d3b2ca6d057f446ed9b02d4386e2ddd9.json b/backend/.sqlx/query-2238aaed46031f71b17c1cabcef935a0d3b2ca6d057f446ed9b02d4386e2ddd9.json
new file mode 100644
index 0000000000..aa32886ba8
--- /dev/null
+++ b/backend/.sqlx/query-2238aaed46031f71b17c1cabcef935a0d3b2ca6d057f446ed9b02d4386e2ddd9.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT EXISTS(SELECT 1 FROM websocket_trigger WHERE path = $1 AND workspace_id = $2)",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "exists",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "2238aaed46031f71b17c1cabcef935a0d3b2ca6d057f446ed9b02d4386e2ddd9"
+}
diff --git a/backend/.sqlx/query-27920aaa55666ffc14a36a247f89ff7994ee40d3953b9f772d0e0ab999bccb7b.json b/backend/.sqlx/query-27920aaa55666ffc14a36a247f89ff7994ee40d3953b9f772d0e0ab999bccb7b.json
new file mode 100644
index 0000000000..26a8ba2ee2
--- /dev/null
+++ b/backend/.sqlx/query-27920aaa55666ffc14a36a247f89ff7994ee40d3953b9f772d0e0ab999bccb7b.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO healthchecks (check_type, healthy) VALUES ($1, false)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "27920aaa55666ffc14a36a247f89ff7994ee40d3953b9f772d0e0ab999bccb7b"
+}
diff --git a/backend/.sqlx/query-8813665f8adfcab0daefbac2cc6b50e427dfd1c12d12895451affd307dc59c37.json b/backend/.sqlx/query-2c14d3a88193f16ad3b8cd590749cb5537995f2499f6cb8f0f316fb62902d542.json
similarity index 77%
rename from backend/.sqlx/query-8813665f8adfcab0daefbac2cc6b50e427dfd1c12d12895451affd307dc59c37.json
rename to backend/.sqlx/query-2c14d3a88193f16ad3b8cd590749cb5537995f2499f6cb8f0f316fb62902d542.json
index ce8adcd5b7..93017f5aec 100644
--- a/backend/.sqlx/query-8813665f8adfcab0daefbac2cc6b50e427dfd1c12d12895451affd307dc59c37.json
+++ b/backend/.sqlx/query-2c14d3a88193f16ad3b8cd590749cb5537995f2499f6cb8f0f316fb62902d542.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT email, login_type::TEXT, super_admin, verified, name, company, username FROM password WHERE email = $1",
+  "query": "SELECT email, login_type::TEXT, super_admin, verified, name, company, username, NULL::bool as operator_only FROM password WHERE email = $1",
   "describe": {
     "columns": [
       {
@@ -37,6 +37,11 @@
         "ordinal": 6,
         "name": "username",
         "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "operator_only",
+        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -51,8 +56,9 @@
       false,
       true,
       true,
-      true
+      true,
+      null
     ]
   },
-  "hash": "8813665f8adfcab0daefbac2cc6b50e427dfd1c12d12895451affd307dc59c37"
+  "hash": "2c14d3a88193f16ad3b8cd590749cb5537995f2499f6cb8f0f316fb62902d542"
 }
diff --git a/backend/.sqlx/query-2e6165543e34216dfaedf6e10729f733cff812e62dea1c1bce8cefd3a3979b14.json b/backend/.sqlx/query-2e6165543e34216dfaedf6e10729f733cff812e62dea1c1bce8cefd3a3979b14.json
new file mode 100644
index 0000000000..4a15e2d4fa
--- /dev/null
+++ b/backend/.sqlx/query-2e6165543e34216dfaedf6e10729f733cff812e62dea1c1bce8cefd3a3979b14.json
@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) FROM websocket_trigger WHERE script_path = $1 AND is_flow = $2 AND workspace_id = $3",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Bool",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "2e6165543e34216dfaedf6e10729f733cff812e62dea1c1bce8cefd3a3979b14"
+}
diff --git a/backend/.sqlx/query-2eec077cc9e27d7ccd160cbaac118c321c422705f79e69550bb60f377083bcef.json b/backend/.sqlx/query-2eec077cc9e27d7ccd160cbaac118c321c422705f79e69550bb60f377083bcef.json
new file mode 100644
index 0000000000..f3eecb9006
--- /dev/null
+++ b/backend/.sqlx/query-2eec077cc9e27d7ccd160cbaac118c321c422705f79e69550bb60f377083bcef.json
@@ -0,0 +1,65 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "WITH active_users AS (SELECT distinct username as email FROM audit WHERE timestamp > NOW() - INTERVAL '1 month' AND (operation = 'users.login' OR operation = 'oauth.login')),\n            authors as (SELECT distinct email FROM usr WHERE usr.operator IS false)\n            SELECT email, email NOT IN (SELECT email FROM authors) as operator_only, login_type::text, verified, super_admin, name, company, username\n            FROM password\n            WHERE email IN (SELECT email FROM active_users)\n            ORDER BY super_admin DESC\n            LIMIT $1 OFFSET $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "email",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "operator_only",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 2,
+        "name": "login_type",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "verified",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 4,
+        "name": "super_admin",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 5,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 6,
+        "name": "company",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "username",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      null,
+      null,
+      false,
+      false,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "2eec077cc9e27d7ccd160cbaac118c321c422705f79e69550bb60f377083bcef"
+}
diff --git a/backend/.sqlx/query-31bc3dcea29be9cc0242771d25a232f173446d29c08fc29ddb8d55294f2c070e.json b/backend/.sqlx/query-31bc3dcea29be9cc0242771d25a232f173446d29c08fc29ddb8d55294f2c070e.json
new file mode 100644
index 0000000000..49fc84c349
--- /dev/null
+++ b/backend/.sqlx/query-31bc3dcea29be9cc0242771d25a232f173446d29c08fc29ddb8d55294f2c070e.json
@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) FROM http_trigger WHERE script_path = $1 AND is_flow = $2 AND workspace_id = $3",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Bool",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "31bc3dcea29be9cc0242771d25a232f173446d29c08fc29ddb8d55294f2c070e"
+}
diff --git a/backend/.sqlx/query-9ed77e78e6295c62745ac3ac3b7e5f544f654d7cddc13acb5d3f4fdc12a8875f.json b/backend/.sqlx/query-34a45763bb4d14162f4cd3fa07cd8020f1f6085f4ee85f5eab3458637edf26cd.json
similarity index 52%
rename from backend/.sqlx/query-9ed77e78e6295c62745ac3ac3b7e5f544f654d7cddc13acb5d3f4fdc12a8875f.json
rename to backend/.sqlx/query-34a45763bb4d14162f4cd3fa07cd8020f1f6085f4ee85f5eab3458637edf26cd.json
index 9c7af05c42..f9dc00c28c 100644
--- a/backend/.sqlx/query-9ed77e78e6295c62745ac3ac3b7e5f544f654d7cddc13acb5d3f4fdc12a8875f.json
+++ b/backend/.sqlx/query-34a45763bb4d14162f4cd3fa07cd8020f1f6085f4ee85f5eab3458637edf26cd.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT created_at FROM metrics WHERE id = 'license_key_renewal' ORDER BY created_at DESC LIMIT 1",
+  "query": "SELECT created_at FROM healthchecks WHERE check_type = $1 ORDER BY created_at DESC LIMIT 1",
   "describe": {
     "columns": [
       {
@@ -10,11 +10,13 @@
       }
     ],
     "parameters": {
-      "Left": []
+      "Left": [
+        "Text"
+      ]
     },
     "nullable": [
       false
     ]
   },
-  "hash": "9ed77e78e6295c62745ac3ac3b7e5f544f654d7cddc13acb5d3f4fdc12a8875f"
+  "hash": "34a45763bb4d14162f4cd3fa07cd8020f1f6085f4ee85f5eab3458637edf26cd"
 }
diff --git a/backend/.sqlx/query-3ecb25b05d6c14b499f9b00af42ae74134728899f6b59c68b246979bc5143e30.json b/backend/.sqlx/query-3ecb25b05d6c14b499f9b00af42ae74134728899f6b59c68b246979bc5143e30.json
new file mode 100644
index 0000000000..a652b56bad
--- /dev/null
+++ b/backend/.sqlx/query-3ecb25b05d6c14b499f9b00af42ae74134728899f6b59c68b246979bc5143e30.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT COUNT(*) as count, \n                       MIN(scheduled_for) as oldest_job\n                FROM queue \n                WHERE tag = $1 \n                  AND scheduled_for <= NOW() - $2::interval \n                  AND running = false\n                ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "oldest_job",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Interval"
+      ]
+    },
+    "nullable": [
+      null,
+      null
+    ]
+  },
+  "hash": "3ecb25b05d6c14b499f9b00af42ae74134728899f6b59c68b246979bc5143e30"
+}
diff --git a/backend/.sqlx/query-4e9668a46bad9e82baa51422946d373b18b6577198df7545c94bd19be3446775.json b/backend/.sqlx/query-4e9668a46bad9e82baa51422946d373b18b6577198df7545c94bd19be3446775.json
new file mode 100644
index 0000000000..2f96d31ecb
--- /dev/null
+++ b/backend/.sqlx/query-4e9668a46bad9e82baa51422946d373b18b6577198df7545c94bd19be3446775.json
@@ -0,0 +1,108 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO websocket_trigger (workspace_id, path, url, script_path, is_flow, enabled, filters, edited_by, email, edited_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, now()) RETURNING *",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "url",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "script_path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "is_flow",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 4,
+        "name": "workspace_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 5,
+        "name": "edited_by",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 6,
+        "name": "email",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "edited_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 8,
+        "name": "extra_perms",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 9,
+        "name": "server_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 10,
+        "name": "last_server_ping",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 11,
+        "name": "error",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 12,
+        "name": "enabled",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 13,
+        "name": "filters",
+        "type_info": "JsonbArray"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Bool",
+        "Bool",
+        "JsonbArray",
+        "Varchar",
+        "Varchar"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false
+    ]
+  },
+  "hash": "4e9668a46bad9e82baa51422946d373b18b6577198df7545c94bd19be3446775"
+}
diff --git a/backend/.sqlx/query-4eca060026a0cb19c5794cd56ace89fc04765191f251945d14bbe78718714f6e.json b/backend/.sqlx/query-4eca060026a0cb19c5794cd56ace89fc04765191f251945d14bbe78718714f6e.json
new file mode 100644
index 0000000000..3b812a53db
--- /dev/null
+++ b/backend/.sqlx/query-4eca060026a0cb19c5794cd56ace89fc04765191f251945d14bbe78718714f6e.json
@@ -0,0 +1,39 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT event_type::AUTOSCALING_EVENT_TYPE AS \"event_type: _\", EXTRACT(EPOCH FROM (NOW() - applied_at))::int as seconds_ago FROM autoscaling_event WHERE worker_group = $1 ORDER BY applied_at DESC LIMIT 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "event_type: _",
+        "type_info": {
+          "Custom": {
+            "name": "autoscaling_event_type",
+            "kind": {
+              "Enum": [
+                "full_scaleout",
+                "scalein",
+                "scaleout"
+              ]
+            }
+          }
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "seconds_ago",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      null
+    ]
+  },
+  "hash": "4eca060026a0cb19c5794cd56ace89fc04765191f251945d14bbe78718714f6e"
+}
diff --git a/backend/.sqlx/query-5303cb9dd5903aa4791ef8e5e5881a50a832e65c8c9632e2e12cd9c2747f2fc7.json b/backend/.sqlx/query-5303cb9dd5903aa4791ef8e5e5881a50a832e65c8c9632e2e12cd9c2747f2fc7.json
new file mode 100644
index 0000000000..a95b00b8c8
--- /dev/null
+++ b/backend/.sqlx/query-5303cb9dd5903aa4791ef8e5e5881a50a832e65c8c9632e2e12cd9c2747f2fc7.json
@@ -0,0 +1,98 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT *\n            FROM websocket_trigger\n            WHERE enabled IS TRUE AND (server_id IS NULL OR last_server_ping IS NULL OR last_server_ping < now() - interval '15 seconds')",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "url",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "script_path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "is_flow",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 4,
+        "name": "workspace_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 5,
+        "name": "edited_by",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 6,
+        "name": "email",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "edited_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 8,
+        "name": "extra_perms",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 9,
+        "name": "server_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 10,
+        "name": "last_server_ping",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 11,
+        "name": "error",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 12,
+        "name": "enabled",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 13,
+        "name": "filters",
+        "type_info": "JsonbArray"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false
+    ]
+  },
+  "hash": "5303cb9dd5903aa4791ef8e5e5881a50a832e65c8c9632e2e12cd9c2747f2fc7"
+}
diff --git a/backend/.sqlx/query-57e270e032e8c04dda7b5c1ca949861756b3ad367a4a500728332a7cb91560a4.json b/backend/.sqlx/query-57e270e032e8c04dda7b5c1ca949861756b3ad367a4a500728332a7cb91560a4.json
new file mode 100644
index 0000000000..ccf6b0ad8f
--- /dev/null
+++ b/backend/.sqlx/query-57e270e032e8c04dda7b5c1ca949861756b3ad367a4a500728332a7cb91560a4.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE concurrency_locks SET\n            last_locked_at = now()\n            WHERE id = $1 AND owner = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "57e270e032e8c04dda7b5c1ca949861756b3ad367a4a500728332a7cb91560a4"
+}
diff --git a/backend/.sqlx/query-5fc6b4a4dbb7875bdec76f876c18543435a95b019b20081f52f6ed6f4457e3c7.json b/backend/.sqlx/query-5fc6b4a4dbb7875bdec76f876c18543435a95b019b20081f52f6ed6f4457e3c7.json
new file mode 100644
index 0000000000..d4725c224e
--- /dev/null
+++ b/backend/.sqlx/query-5fc6b4a4dbb7875bdec76f876c18543435a95b019b20081f52f6ed6f4457e3c7.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) FROM token WHERE label LIKE 'webhook-%' AND workspace_id = $1 AND scopes @> ARRAY['run:' || $2]::text[]",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "5fc6b4a4dbb7875bdec76f876c18543435a95b019b20081f52f6ed6f4457e3c7"
+}
diff --git a/backend/.sqlx/query-5fd70c70ce52cbc51fa9124cb05f82b5951f17d1b7eade53c6d89253d55f8b9f.json b/backend/.sqlx/query-5fd70c70ce52cbc51fa9124cb05f82b5951f17d1b7eade53c6d89253d55f8b9f.json
new file mode 100644
index 0000000000..51f58cb81c
--- /dev/null
+++ b/backend/.sqlx/query-5fd70c70ce52cbc51fa9124cb05f82b5951f17d1b7eade53c6d89253d55f8b9f.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT owner FROM concurrency_locks WHERE id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "owner",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "5fd70c70ce52cbc51fa9124cb05f82b5951f17d1b7eade53c6d89253d55f8b9f"
+}
diff --git a/backend/.sqlx/query-6d134b137ae81534e145fc5b6474cf963ee26a3ad3a0a3d8dc064cb14c8fd9a6.json b/backend/.sqlx/query-6d134b137ae81534e145fc5b6474cf963ee26a3ad3a0a3d8dc064cb14c8fd9a6.json
new file mode 100644
index 0000000000..03351cdeab
--- /dev/null
+++ b/backend/.sqlx/query-6d134b137ae81534e145fc5b6474cf963ee26a3ad3a0a3d8dc064cb14c8fd9a6.json
@@ -0,0 +1,52 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT id, worker_group, event_type::text, desired_workers, reason, applied_at FROM autoscaling_event WHERE worker_group = $1 ORDER BY applied_at DESC LIMIT 5",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "worker_group",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "event_type",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "desired_workers",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 4,
+        "name": "reason",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 5,
+        "name": "applied_at",
+        "type_info": "Timestamp"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      null,
+      false,
+      true,
+      false
+    ]
+  },
+  "hash": "6d134b137ae81534e145fc5b6474cf963ee26a3ad3a0a3d8dc064cb14c8fd9a6"
+}
diff --git a/backend/.sqlx/query-722a3096f03d25ef94292d53801d41037de4bc69dd434232029c731cbbcbc22f.json b/backend/.sqlx/query-722a3096f03d25ef94292d53801d41037de4bc69dd434232029c731cbbcbc22f.json
deleted file mode 100644
index 2e4dee2a30..0000000000
--- a/backend/.sqlx/query-722a3096f03d25ef94292d53801d41037de4bc69dd434232029c731cbbcbc22f.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO windmill_migrations (name) VALUES ('bypassrls_1-2')",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": []
-  },
-  "hash": "722a3096f03d25ef94292d53801d41037de4bc69dd434232029c731cbbcbc22f"
-}
diff --git a/backend/.sqlx/query-829130d74c107e4e1a86f3e772657ae030463c139c39072777e453bfb7e9c0c3.json b/backend/.sqlx/query-829130d74c107e4e1a86f3e772657ae030463c139c39072777e453bfb7e9c0c3.json
new file mode 100644
index 0000000000..e00aba3aab
--- /dev/null
+++ b/backend/.sqlx/query-829130d74c107e4e1a86f3e772657ae030463c139c39072777e453bfb7e9c0c3.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT job_kind = 'identity' FROM completed_job WHERE id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "829130d74c107e4e1a86f3e772657ae030463c139c39072777e453bfb7e9c0c3"
+}
diff --git a/backend/.sqlx/query-900ac59515e4283f4b57516210575dfe92f74a7220ed69e61899a6e0f053d9cd.json b/backend/.sqlx/query-900ac59515e4283f4b57516210575dfe92f74a7220ed69e61899a6e0f053d9cd.json
new file mode 100644
index 0000000000..0bcd4d447f
--- /dev/null
+++ b/backend/.sqlx/query-900ac59515e4283f4b57516210575dfe92f74a7220ed69e61899a6e0f053d9cd.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO concurrency_locks (id, last_locked_at) VALUES ($1, NOW()) ON CONFLICT (id) DO NOTHING",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "900ac59515e4283f4b57516210575dfe92f74a7220ed69e61899a6e0f053d9cd"
+}
diff --git a/backend/.sqlx/query-a7f5431e3b8960e9dc46fae69dd4391516d8b169186548ec44528c84078b80d8.json b/backend/.sqlx/query-a7f5431e3b8960e9dc46fae69dd4391516d8b169186548ec44528c84078b80d8.json
new file mode 100644
index 0000000000..7dc8e3efa7
--- /dev/null
+++ b/backend/.sqlx/query-a7f5431e3b8960e9dc46fae69dd4391516d8b169186548ec44528c84078b80d8.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) FROM token WHERE label LIKE 'email-%' AND workspace_id = $1 AND scopes @> ARRAY['run:flow/' || $2]::text[]",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "a7f5431e3b8960e9dc46fae69dd4391516d8b169186548ec44528c84078b80d8"
+}
diff --git a/backend/.sqlx/query-acbf74cf3302bfcf7615285070d3f8958932bb8a2dda715f1b9152ab44442780.json b/backend/.sqlx/query-acbf74cf3302bfcf7615285070d3f8958932bb8a2dda715f1b9152ab44442780.json
new file mode 100644
index 0000000000..eef46ce41d
--- /dev/null
+++ b/backend/.sqlx/query-acbf74cf3302bfcf7615285070d3f8958932bb8a2dda715f1b9152ab44442780.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE websocket_trigger SET url = $1, script_path = $2, path = $3, is_flow = $4, filters = $5, edited_by = $6, email = $7, edited_at = now(), server_id = NULL, last_server_ping = NULL, error = NULL\n            WHERE workspace_id = $8 AND path = $9",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Bool",
+        "JsonbArray",
+        "Varchar",
+        "Varchar",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "acbf74cf3302bfcf7615285070d3f8958932bb8a2dda715f1b9152ab44442780"
+}
diff --git a/backend/.sqlx/query-ad42118ccf6a9d2d1e072c4df064ddf964a5b3cd088fc162d0d8222325d4a5ea.json b/backend/.sqlx/query-ad42118ccf6a9d2d1e072c4df064ddf964a5b3cd088fc162d0d8222325d4a5ea.json
new file mode 100644
index 0000000000..c43c2a2a65
--- /dev/null
+++ b/backend/.sqlx/query-ad42118ccf6a9d2d1e072c4df064ddf964a5b3cd088fc162d0d8222325d4a5ea.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE healthchecks SET healthy = true WHERE check_type = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "ad42118ccf6a9d2d1e072c4df064ddf964a5b3cd088fc162d0d8222325d4a5ea"
+}
diff --git a/backend/.sqlx/query-b3dbdfb50ee8118bdaed3164b210cb549a34b96554ae1872355b90304f5dcb76.json b/backend/.sqlx/query-b3dbdfb50ee8118bdaed3164b210cb549a34b96554ae1872355b90304f5dcb76.json
index 99269c9851..54e94cfb8f 100644
--- a/backend/.sqlx/query-b3dbdfb50ee8118bdaed3164b210cb549a34b96554ae1872355b90304f5dcb76.json
+++ b/backend/.sqlx/query-b3dbdfb50ee8118bdaed3164b210cb549a34b96554ae1872355b90304f5dcb76.json
@@ -18,8 +18,8 @@
       "Left": []
     },
     "nullable": [
-      true,
-      false
+      false,
+      true
     ]
   },
   "hash": "b3dbdfb50ee8118bdaed3164b210cb549a34b96554ae1872355b90304f5dcb76"
diff --git a/backend/.sqlx/query-b49b1eaf58e62063c7a03039d0c36e65991b1d21a3306390fb1c7ca38babafe3.json b/backend/.sqlx/query-b49b1eaf58e62063c7a03039d0c36e65991b1d21a3306390fb1c7ca38babafe3.json
index 71aaf4ba90..cc825ff56f 100644
--- a/backend/.sqlx/query-b49b1eaf58e62063c7a03039d0c36e65991b1d21a3306390fb1c7ca38babafe3.json
+++ b/backend/.sqlx/query-b49b1eaf58e62063c7a03039d0c36e65991b1d21a3306390fb1c7ca38babafe3.json
@@ -52,7 +52,8 @@
                 "trigger",
                 "failure",
                 "command",
-                "approval"
+                "approval",
+                "preprocessor"
               ]
             }
           }
diff --git a/backend/.sqlx/query-c060b8bbc5af7d2e7d0aaff64f0f62ec9db58611a99b0ba7f0375638b128ab89.json b/backend/.sqlx/query-c060b8bbc5af7d2e7d0aaff64f0f62ec9db58611a99b0ba7f0375638b128ab89.json
new file mode 100644
index 0000000000..1a37220559
--- /dev/null
+++ b/backend/.sqlx/query-c060b8bbc5af7d2e7d0aaff64f0f62ec9db58611a99b0ba7f0375638b128ab89.json
@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT schedule FROM schedule WHERE path = $1 AND script_path = $1 AND is_flow = $2 AND workspace_id = $3",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "schedule",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Bool",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "c060b8bbc5af7d2e7d0aaff64f0f62ec9db58611a99b0ba7f0375638b128ab89"
+}
diff --git a/backend/.sqlx/query-c4e1873bfc7b905e7299a021f4baa2a97e95f4797c5e11f37822e19828422b7e.json b/backend/.sqlx/query-c4e1873bfc7b905e7299a021f4baa2a97e95f4797c5e11f37822e19828422b7e.json
new file mode 100644
index 0000000000..d3c16a5275
--- /dev/null
+++ b/backend/.sqlx/query-c4e1873bfc7b905e7299a021f4baa2a97e95f4797c5e11f37822e19828422b7e.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE concurrency_locks SET last_locked_at = NOW() WHERE id = $1 AND last_locked_at < NOW() - INTERVAL '1 second' * $2 RETURNING 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Float8"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "c4e1873bfc7b905e7299a021f4baa2a97e95f4797c5e11f37822e19828422b7e"
+}
diff --git a/backend/.sqlx/query-34ad8a2a5bd89b9b8e25847a7e5e94ef99e35a178ad6328c1bcde2a6d6f88cb5.json b/backend/.sqlx/query-c624f15f3e321b1eecf123da9bf0b18e8c1d16ef25ffb9d04e5447d0d583d55c.json
similarity index 58%
rename from backend/.sqlx/query-34ad8a2a5bd89b9b8e25847a7e5e94ef99e35a178ad6328c1bcde2a6d6f88cb5.json
rename to backend/.sqlx/query-c624f15f3e321b1eecf123da9bf0b18e8c1d16ef25ffb9d04e5447d0d583d55c.json
index 43d0f596ae..edb2fc7f49 100644
--- a/backend/.sqlx/query-34ad8a2a5bd89b9b8e25847a7e5e94ef99e35a178ad6328c1bcde2a6d6f88cb5.json
+++ b/backend/.sqlx/query-c624f15f3e321b1eecf123da9bf0b18e8c1d16ef25ffb9d04e5447d0d583d55c.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO token\n            (token, email, label, expiration, super_admin, scopes)\n            VALUES ($1, $2, $3, $4, $5, $6)",
+  "query": "INSERT INTO token\n            (token, email, label, expiration, super_admin, scopes, workspace_id)\n            VALUES ($1, $2, $3, $4, $5, $6, $7)",
   "describe": {
     "columns": [],
     "parameters": {
@@ -10,10 +10,11 @@
         "Varchar",
         "Timestamptz",
         "Bool",
-        "TextArray"
+        "TextArray",
+        "Varchar"
       ]
     },
     "nullable": []
   },
-  "hash": "34ad8a2a5bd89b9b8e25847a7e5e94ef99e35a178ad6328c1bcde2a6d6f88cb5"
+  "hash": "c624f15f3e321b1eecf123da9bf0b18e8c1d16ef25ffb9d04e5447d0d583d55c"
 }
diff --git a/backend/.sqlx/query-c7ee7ce64686cef41cebd99ad7ef31572fc1bf12e6ae473fd58fafb025989965.json b/backend/.sqlx/query-c7ee7ce64686cef41cebd99ad7ef31572fc1bf12e6ae473fd58fafb025989965.json
new file mode 100644
index 0000000000..7dd454bbbe
--- /dev/null
+++ b/backend/.sqlx/query-c7ee7ce64686cef41cebd99ad7ef31572fc1bf12e6ae473fd58fafb025989965.json
@@ -0,0 +1,59 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT label, concat(substring(token for 10)) as token_prefix, expiration, created_at, last_used_at, scopes, email FROM token WHERE workspace_id = $1 AND scopes @> ARRAY['run:script/' || $2]::text[]",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "label",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "token_prefix",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "expiration",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 3,
+        "name": "created_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 4,
+        "name": "last_used_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 5,
+        "name": "scopes",
+        "type_info": "TextArray"
+      },
+      {
+        "ordinal": 6,
+        "name": "email",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      true,
+      null,
+      true,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "c7ee7ce64686cef41cebd99ad7ef31572fc1bf12e6ae473fd58fafb025989965"
+}
diff --git a/backend/.sqlx/query-cecf1addc4aecb087a14786b2a9165895ca61ef042947c7314f66514d7f29edc.json b/backend/.sqlx/query-cecf1addc4aecb087a14786b2a9165895ca61ef042947c7314f66514d7f29edc.json
new file mode 100644
index 0000000000..361f5ebd78
--- /dev/null
+++ b/backend/.sqlx/query-cecf1addc4aecb087a14786b2a9165895ca61ef042947c7314f66514d7f29edc.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT last_locked_at\n            FROM concurrency_locks\n            WHERE id = $1\n            FOR UPDATE",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "last_locked_at",
+        "type_info": "Timestamp"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "cecf1addc4aecb087a14786b2a9165895ca61ef042947c7314f66514d7f29edc"
+}
diff --git a/backend/.sqlx/query-d54840373df5da9662ed11ed0a605cddac517bdc06dca0a8be071330338e948a.json b/backend/.sqlx/query-d54840373df5da9662ed11ed0a605cddac517bdc06dca0a8be071330338e948a.json
new file mode 100644
index 0000000000..5b298f8db3
--- /dev/null
+++ b/backend/.sqlx/query-d54840373df5da9662ed11ed0a605cddac517bdc06dca0a8be071330338e948a.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM websocket_trigger WHERE workspace_id = $1 AND path = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "d54840373df5da9662ed11ed0a605cddac517bdc06dca0a8be071330338e948a"
+}
diff --git a/backend/.sqlx/query-ec47955683d811b12e82ff3e6aeafa0df46a320c436bad5eb1acc127df138a61.json b/backend/.sqlx/query-d697b7311430e7bd5375ec5494179f4071e3bfe123d9600249cfa80c1103edd8.json
similarity index 51%
rename from backend/.sqlx/query-ec47955683d811b12e82ff3e6aeafa0df46a320c436bad5eb1acc127df138a61.json
rename to backend/.sqlx/query-d697b7311430e7bd5375ec5494179f4071e3bfe123d9600249cfa80c1103edd8.json
index 2ed5e047db..e35c4e2730 100644
--- a/backend/.sqlx/query-ec47955683d811b12e82ff3e6aeafa0df46a320c436bad5eb1acc127df138a61.json
+++ b/backend/.sqlx/query-d697b7311430e7bd5375ec5494179f4071e3bfe123d9600249cfa80c1103edd8.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "UPDATE script SET lock = $1, created_at = now() WHERE hash = $2 AND workspace_id = $3",
+  "query": "UPDATE script SET lock = $1 WHERE hash = $2 AND workspace_id = $3",
   "describe": {
     "columns": [],
     "parameters": {
@@ -12,5 +12,5 @@
     },
     "nullable": []
   },
-  "hash": "ec47955683d811b12e82ff3e6aeafa0df46a320c436bad5eb1acc127df138a61"
+  "hash": "d697b7311430e7bd5375ec5494179f4071e3bfe123d9600249cfa80c1103edd8"
 }
diff --git a/backend/.sqlx/query-d7a0f19f9e18d2ea49316012375ad78b69292ba091d69880945e42bebe890d66.json b/backend/.sqlx/query-d7a0f19f9e18d2ea49316012375ad78b69292ba091d69880945e42bebe890d66.json
new file mode 100644
index 0000000000..f619796a27
--- /dev/null
+++ b/backend/.sqlx/query-d7a0f19f9e18d2ea49316012375ad78b69292ba091d69880945e42bebe890d66.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) FROM token WHERE label LIKE 'webhook-%' AND workspace_id = $1 AND scopes @> ARRAY['run:flow/' || $2]::text[]",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "d7a0f19f9e18d2ea49316012375ad78b69292ba091d69880945e42bebe890d66"
+}
diff --git a/backend/.sqlx/query-db24f1f6ef1e26b7de7926bd3f32d1fa673c4970c25ff9ad98f0fdf199801b53.json b/backend/.sqlx/query-db24f1f6ef1e26b7de7926bd3f32d1fa673c4970c25ff9ad98f0fdf199801b53.json
new file mode 100644
index 0000000000..70f4b91b71
--- /dev/null
+++ b/backend/.sqlx/query-db24f1f6ef1e26b7de7926bd3f32d1fa673c4970c25ff9ad98f0fdf199801b53.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT EXISTS(SELECT 1 FROM websocket_trigger WHERE workspace_id = $1) as \"websocket_used!\", EXISTS(SELECT 1 FROM http_trigger WHERE workspace_id = $1) as \"http_routes_used!\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "websocket_used!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 1,
+        "name": "http_routes_used!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null,
+      null
+    ]
+  },
+  "hash": "db24f1f6ef1e26b7de7926bd3f32d1fa673c4970c25ff9ad98f0fdf199801b53"
+}
diff --git a/backend/.sqlx/query-eb1f916f9beea3eea83ce359f5305d0cfb0d6cdba9cc56c6139f57e46345f843.json b/backend/.sqlx/query-eb1f916f9beea3eea83ce359f5305d0cfb0d6cdba9cc56c6139f57e46345f843.json
deleted file mode 100644
index ecd83ae2e3..0000000000
--- a/backend/.sqlx/query-eb1f916f9beea3eea83ce359f5305d0cfb0d6cdba9cc56c6139f57e46345f843.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT EXISTS(SELECT name FROM windmill_migrations WHERE name = 'bypassrls_1-2')",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "exists",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "eb1f916f9beea3eea83ce359f5305d0cfb0d6cdba9cc56c6139f57e46345f843"
-}
diff --git a/backend/.sqlx/query-9ebb9c16948a695a053068d9a1df0152691271ac33d8c82db47be11746ccbcef.json b/backend/.sqlx/query-eb932b613a6dbb2cdff97e5512d42b538ba83115c0ea798be00b01659600f45a.json
similarity index 60%
rename from backend/.sqlx/query-9ebb9c16948a695a053068d9a1df0152691271ac33d8c82db47be11746ccbcef.json
rename to backend/.sqlx/query-eb932b613a6dbb2cdff97e5512d42b538ba83115c0ea798be00b01659600f45a.json
index ae30d3bd98..7717a34760 100644
--- a/backend/.sqlx/query-9ebb9c16948a695a053068d9a1df0152691271ac33d8c82db47be11746ccbcef.json
+++ b/backend/.sqlx/query-eb932b613a6dbb2cdff97e5512d42b538ba83115c0ea798be00b01659600f45a.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT EXISTS(SELECT 1 FROM http_trigger WHERE workspace_id = $1)",
+  "query": "SELECT EXISTS(SELECT 1 FROM healthchecks WHERE check_type = $1 AND healthy = false)",
   "describe": {
     "columns": [
       {
@@ -18,5 +18,5 @@
       null
     ]
   },
-  "hash": "9ebb9c16948a695a053068d9a1df0152691271ac33d8c82db47be11746ccbcef"
+  "hash": "eb932b613a6dbb2cdff97e5512d42b538ba83115c0ea798be00b01659600f45a"
 }
diff --git a/backend/.sqlx/query-eff32aeac25a75d06f73e08c26dd3fd25f6b85cbea870505751c6a82457ae1da.json b/backend/.sqlx/query-eff32aeac25a75d06f73e08c26dd3fd25f6b85cbea870505751c6a82457ae1da.json
new file mode 100644
index 0000000000..2190ea06eb
--- /dev/null
+++ b/backend/.sqlx/query-eff32aeac25a75d06f73e08c26dd3fd25f6b85cbea870505751c6a82457ae1da.json
@@ -0,0 +1,59 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT label, concat(substring(token for 10)) as token_prefix, expiration, created_at, last_used_at, scopes, email FROM token WHERE workspace_id = $1 AND scopes @> ARRAY['run:flow/' || $2]::text[]",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "label",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "token_prefix",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "expiration",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 3,
+        "name": "created_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 4,
+        "name": "last_used_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 5,
+        "name": "scopes",
+        "type_info": "TextArray"
+      },
+      {
+        "ordinal": 6,
+        "name": "email",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      true,
+      null,
+      true,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "eff32aeac25a75d06f73e08c26dd3fd25f6b85cbea870505751c6a82457ae1da"
+}
diff --git a/backend/.sqlx/query-f06e0e4fa358b26792df22fff48b71a6fcfa1e5603ea472892917c1accd1aafb.json b/backend/.sqlx/query-f06e0e4fa358b26792df22fff48b71a6fcfa1e5603ea472892917c1accd1aafb.json
new file mode 100644
index 0000000000..71cdfe60bf
--- /dev/null
+++ b/backend/.sqlx/query-f06e0e4fa358b26792df22fff48b71a6fcfa1e5603ea472892917c1accd1aafb.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) FROM token WHERE label LIKE 'email-%' AND workspace_id = $1 AND scopes @> ARRAY['run:script/' || $2]::text[]",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "f06e0e4fa358b26792df22fff48b71a6fcfa1e5603ea472892917c1accd1aafb"
+}
diff --git a/backend/.sqlx/query-f2baee15e6d1fecd6d2d7b39fda1b50a15ec8bd349f1081af54da5dc2f5e3021.json b/backend/.sqlx/query-f2baee15e6d1fecd6d2d7b39fda1b50a15ec8bd349f1081af54da5dc2f5e3021.json
new file mode 100644
index 0000000000..2e75b4e74b
--- /dev/null
+++ b/backend/.sqlx/query-f2baee15e6d1fecd6d2d7b39fda1b50a15ec8bd349f1081af54da5dc2f5e3021.json
@@ -0,0 +1,101 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT *\n          FROM websocket_trigger\n          WHERE workspace_id = $1 AND path = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "url",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "script_path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "is_flow",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 4,
+        "name": "workspace_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 5,
+        "name": "edited_by",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 6,
+        "name": "email",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "edited_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 8,
+        "name": "extra_perms",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 9,
+        "name": "server_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 10,
+        "name": "last_server_ping",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 11,
+        "name": "error",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 12,
+        "name": "enabled",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 13,
+        "name": "filters",
+        "type_info": "JsonbArray"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false
+    ]
+  },
+  "hash": "f2baee15e6d1fecd6d2d7b39fda1b50a15ec8bd349f1081af54da5dc2f5e3021"
+}
diff --git a/backend/.sqlx/query-febd70e6d5304ad912c232d3d8fc3f8ce0133d8a1a9e5ca1124eff9a988dc2d7.json b/backend/.sqlx/query-febd70e6d5304ad912c232d3d8fc3f8ce0133d8a1a9e5ca1124eff9a988dc2d7.json
new file mode 100644
index 0000000000..7958f9d2f3
--- /dev/null
+++ b/backend/.sqlx/query-febd70e6d5304ad912c232d3d8fc3f8ce0133d8a1a9e5ca1124eff9a988dc2d7.json
@@ -0,0 +1,25 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE websocket_trigger SET last_server_ping = now(), error = $1 WHERE workspace_id = $2 AND path = $3 AND server_id = $4 AND enabled IS TRUE RETURNING 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "febd70e6d5304ad912c232d3d8fc3f8ce0133d8a1a9e5ca1124eff9a988dc2d7"
+}
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 0ee755b3ec..d12b1b2698 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -14,9 +14,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
@@ -40,22 +40,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
 dependencies = [
  "cfg-if",
- "cipher 0.3.0",
+ "cipher",
  "cpufeatures",
  "opaque-debug",
 ]
 
-[[package]]
-name = "aes"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
-dependencies = [
- "cfg-if",
- "cipher 0.4.4",
- "cpufeatures",
-]
-
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -128,9 +117,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -143,43 +132,43 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.89"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
 
 [[package]]
 name = "arc-swap"
@@ -187,19 +176,6 @@ version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
-[[package]]
-name = "archiver-rs"
-version = "0.5.1"
-source = "git+https://github.com/gz/archiver-rs.git?branch=patch-1#a73cef92c2a5b8f48c2a4a9e889952072e03b4b7"
-dependencies = [
- "bzip2",
- "flate2",
- "tar",
- "thiserror",
- "xz2",
- "zip",
-]
-
 [[package]]
 name = "argon2"
 version = "0.5.3"
@@ -209,7 +185,7 @@ dependencies = [
  "base64ct",
  "blake2",
  "cpufeatures",
- "password-hash 0.5.0",
+ "password-hash",
 ]
 
 [[package]]
@@ -383,7 +359,7 @@ dependencies = [
  "arrow-schema",
  "chrono",
  "half",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "lexical-core",
  "num",
  "serde",
@@ -465,7 +441,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -510,11 +486,11 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.12"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
+checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857"
 dependencies = [
- "brotli",
+ "brotli 7.0.0",
  "bzip2",
  "flate2",
  "futures-core",
@@ -536,7 +512,7 @@ dependencies = [
  "async-task",
  "concurrent-queue",
  "fastrand 2.1.1",
- "futures-lite 2.3.0",
+ "futures-lite 2.4.0",
  "slab",
 ]
 
@@ -551,7 +527,7 @@ dependencies = [
  "async-io",
  "async-lock",
  "blocking",
- "futures-lite 2.3.0",
+ "futures-lite 2.4.0",
  "once_cell",
 ]
 
@@ -565,7 +541,7 @@ dependencies = [
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite 2.3.0",
+ "futures-lite 2.4.0",
  "parking",
  "polling",
  "rustix",
@@ -595,7 +571,7 @@ dependencies = [
  "bytes",
  "http 1.1.0",
  "rand 0.8.5",
- "reqwest 0.12.7",
+ "reqwest 0.12.9",
  "serde",
  "serde-aux",
  "serde_json",
@@ -612,7 +588,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -629,7 +605,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-io",
- "futures-lite 2.3.0",
+ "futures-lite 2.4.0",
  "gloo-timers",
  "kv-log-macro",
  "log",
@@ -643,9 +619,9 @@ dependencies = [
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -654,27 +630,27 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
 name = "async-stripe"
-version = "0.34.1"
+version = "0.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109605d984dd71a9a278e2d43a2831a20e80f25c3bcc25174096d12352cfc469"
+checksum = "58d670cf4d47a1b8ffef54286a5625382e360a34ee76902fd93ad8c7032a0c30"
 dependencies = [
  "chrono",
  "futures-util",
  "hex",
  "hmac",
  "http-types",
- "hyper 0.14.30",
+ "hyper 0.14.31",
  "hyper-tls 0.5.0",
  "serde",
  "serde_json",
@@ -702,7 +678,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -756,9 +732,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "aws-config"
-version = "1.5.7"
+version = "1.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8191fb3091fa0561d1379ef80333c3c7191c6f0435d986e85821bcf7acbd1126"
+checksum = "2d6448cfb224dd6a9b9ac734f58622dd0d4751f3589f3b777345745f46b2eb14"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -818,14 +794,14 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "tracing",
- "uuid 1.10.0",
+ "uuid 1.11.0",
 ]
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.44.0"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b90cfe6504115e13c41d3ea90286ede5aa14da294f3fe077027a6e83850843c"
+checksum = "ded855583fa1d22e88fe39fd6062b062376e50a8211989e07cf5e38d52eb3453"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -845,9 +821,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.45.0"
+version = "1.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167c0fad1f212952084137308359e8e4c4724d1c643038ce163f06de9662c1d0"
+checksum = "9177ea1192e6601ae16c7273385690d88a7ed386a00b74a6bc894d12103cd933"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -867,9 +843,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.44.0"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb5f98188ec1435b68097daa2a37d74b9d17c9caa799466338a8d1544e71b9d"
+checksum = "823ef553cf36713c97453e2ddff1eb8f62be7f4523544e2a5db64caf80100f0a"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -890,9 +866,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "1.2.4"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc8db6904450bafe7473c6ca9123f88cc11089e41a025408f992db4e22d3be68"
+checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-http",
@@ -963,9 +939,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.7.1"
+version = "1.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87"
+checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
@@ -978,7 +954,7 @@ dependencies = [
  "http-body 0.4.6",
  "http-body 1.0.1",
  "httparse",
- "hyper 0.14.30",
+ "hyper 0.14.31",
  "hyper-rustls 0.24.2",
  "once_cell",
  "pin-project-lite",
@@ -1007,9 +983,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "1.2.7"
+version = "1.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b"
+checksum = "07c9cdc179e6afbf5d391ab08c85eac817b51c87e1892a5edb5f7bbdc64314b4"
 dependencies = [
  "base64-simd 0.8.0",
  "bytes",
@@ -1067,7 +1043,7 @@ dependencies = [
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "hyper-util",
  "itoa",
  "matchit",
@@ -1182,9 +1158,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "bb8"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b10cf871f3ff2ce56432fddc2615ac7acc3aa22ca321f8fea800846fbb32f188"
+checksum = "d89aabfae550a5c44b43ab941844ffcd2e993cb6900b342debf59e9ea74acdb8"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -1194,18 +1170,18 @@ dependencies = [
 
 [[package]]
 name = "better_scoped_tls"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de"
+checksum = "297b153aa5e573b5863108a6ddc9d5c968bd0b20e75cc614ee9821d2f45679c7"
 dependencies = [
  "scoped-tls",
 ]
 
 [[package]]
 name = "bigdecimal"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee"
+checksum = "8f850665a0385e070b64c38d2354e6c104c8479c59868d1e48a0c13ee2c7a1c1"
 dependencies = [
  "autocfg",
  "libm",
@@ -1225,9 +1201,9 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.69.4"
+version = "0.69.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
 dependencies = [
  "bitflags 2.6.0",
  "cexpr",
@@ -1236,13 +1212,13 @@ dependencies = [
  "lazy_static",
  "lazycell",
  "log",
- "prettyplease 0.2.22",
+ "prettyplease 0.2.25",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.79",
+ "syn 2.0.86",
  "which 4.4.2",
 ]
 
@@ -1261,7 +1237,7 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1334,7 +1310,7 @@ dependencies = [
  "arrayvec",
  "cc",
  "cfg-if",
- "constant_time_eq 0.3.1",
+ "constant_time_eq",
 ]
 
 [[package]]
@@ -1363,7 +1339,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e"
 dependencies = [
  "block-padding",
- "cipher 0.3.0",
+ "cipher",
 ]
 
 [[package]]
@@ -1381,7 +1357,7 @@ dependencies = [
  "async-channel 2.3.1",
  "async-task",
  "futures-io",
- "futures-lite 2.3.0",
+ "futures-lite 2.4.0",
  "piper",
 ]
 
@@ -1405,7 +1381,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
  "syn_derive",
 ]
 
@@ -1420,6 +1396,17 @@ dependencies = [
  "brotli-decompressor",
 ]
 
+[[package]]
+name = "brotli"
+version = "7.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
 [[package]]
 name = "brotli-decompressor"
 version = "4.0.1"
@@ -1454,6 +1441,9 @@ name = "bumpalo"
 version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+dependencies = [
+ "allocator-api2",
+]
 
 [[package]]
 name = "bytecheck"
@@ -1479,22 +1469,22 @@ dependencies = [
 
 [[package]]
 name = "bytemuck"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
+checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1505,9 +1495,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.2"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
 
 [[package]]
 name = "bytes-utils"
@@ -1609,9 +1599,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.22"
+version = "1.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
+checksum = "e3788d6ac30243803df38a3e9991cf37e41210232916d41a8222ae378f912624"
 dependencies = [
  "jobserver",
  "libc",
@@ -1712,16 +1702,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
@@ -1735,9 +1715,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.18"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1745,9 +1725,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.18"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1764,7 +1744,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1784,9 +1764,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "combine"
@@ -1898,12 +1878,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
 [[package]]
 name = "constant_time_eq"
 version = "0.3.1"
@@ -2150,7 +2124,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -2198,7 +2172,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -2220,7 +2194,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core 0.20.10",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -2259,7 +2233,7 @@ dependencies = [
  "arrow-array",
  "arrow-ipc",
  "arrow-schema",
- "async-compression 0.4.12",
+ "async-compression 0.4.17",
  "async-trait",
  "bytes",
  "bzip2",
@@ -2282,7 +2256,7 @@ dependencies = [
  "glob",
  "half",
  "hashbrown 0.14.5",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "itertools 0.12.1",
  "log",
  "num_cpus",
@@ -2297,7 +2271,7 @@ dependencies = [
  "tokio",
  "tokio-util",
  "url",
- "uuid 1.10.0",
+ "uuid 1.11.0",
  "xz2",
  "zstd 0.13.2",
 ]
@@ -2397,7 +2371,7 @@ dependencies = [
  "regex",
  "sha2 0.10.8",
  "unicode-segmentation",
- "uuid 1.10.0",
+ "uuid 1.11.0",
 ]
 
 [[package]]
@@ -2451,7 +2425,7 @@ dependencies = [
  "datafusion-expr",
  "datafusion-physical-expr",
  "hashbrown 0.14.5",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "itertools 0.12.1",
  "log",
  "regex-syntax 0.8.5",
@@ -2480,7 +2454,7 @@ dependencies = [
  "half",
  "hashbrown 0.14.5",
  "hex",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "itertools 0.12.1",
  "log",
  "paste",
@@ -2524,7 +2498,7 @@ dependencies = [
  "futures",
  "half",
  "hashbrown 0.14.5",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "itertools 0.12.1",
  "log",
  "once_cell",
@@ -2564,16 +2538,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
 dependencies = [
  "serde",
- "uuid 1.10.0",
+ "uuid 1.11.0",
 ]
 
 [[package]]
 name = "deno_ast"
-version = "0.40.0"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d08372522975cce97fe0efbe42fea508c76eea4421619de6d63baae32792f7d"
+checksum = "b2b9d03b1bbeeecdac54367f075d572131736d06c5be3bc49037855bc5ab1bbb"
 dependencies = [
- "anyhow",
  "base64 0.21.7",
  "deno_media_type",
  "deno_terminal 0.1.1",
@@ -2581,15 +2554,16 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "serde",
+ "sourcemap 9.0.0",
  "swc_atoms",
- "swc_common 0.34.4",
+ "swc_common",
  "swc_config",
  "swc_config_macro",
- "swc_ecma_ast 0.115.1",
+ "swc_ecma_ast",
  "swc_ecma_codegen",
  "swc_ecma_codegen_macros",
  "swc_ecma_loader",
- "swc_ecma_parser 0.146.12",
+ "swc_ecma_parser",
  "swc_ecma_transforms_base",
  "swc_ecma_transforms_classes",
  "swc_ecma_transforms_macros",
@@ -2597,7 +2571,7 @@ dependencies = [
  "swc_ecma_transforms_react",
  "swc_ecma_transforms_typescript",
  "swc_ecma_utils",
- "swc_ecma_visit 0.101.0",
+ "swc_ecma_visit",
  "swc_eq_ignore_macros",
  "swc_macros_common",
  "swc_visit",
@@ -2610,18 +2584,18 @@ dependencies = [
 
 [[package]]
 name = "deno_console"
-version = "0.163.0"
+version = "0.171.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4eea4d3eeb96874c63fde5001d0242042957b600000f179af4ad3235a411139"
+checksum = "144108c8bb93b1df2cda4583d9beb8cd4e18798d3e030af8b07d2c55c1e3259b"
 dependencies = [
  "deno_core",
 ]
 
 [[package]]
 name = "deno_core"
-version = "0.299.0"
+version = "0.311.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428488cc6b392a199a159054da754f56a1fdc63ee03f16be2c21cbd22e936e7b"
+checksum = "5e09bd55da542fa1fde753aff617c355b5d782e763ab2a19e4371a56d7844cac"
 dependencies = [
  "anyhow",
  "bincode",
@@ -2642,7 +2616,7 @@ dependencies = [
  "serde_json",
  "serde_v8",
  "smallvec",
- "sourcemap",
+ "sourcemap 8.0.1",
  "static_assertions",
  "tokio",
  "url",
@@ -2657,9 +2631,9 @@ checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1"
 
 [[package]]
 name = "deno_fetch"
-version = "0.187.0"
+version = "0.195.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f11f1ca946366c42e7daaab0d747720710dbb11511d9bfce1b328dd71b58f87"
+checksum = "8a91340a1d60cebe1392e4b6e1614709ab5fdcfc1f55842561e498d7ef9b2cb9"
 dependencies = [
  "base64 0.21.7",
  "bytes",
@@ -2668,9 +2642,10 @@ dependencies = [
  "deno_permissions",
  "deno_tls",
  "dyn-clone",
+ "error_reporter",
  "http 1.1.0",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "hyper-rustls 0.27.3",
  "hyper-util",
  "ipnet",
@@ -2683,7 +2658,7 @@ dependencies = [
  "tokio-socks",
  "tokio-util",
  "tower 0.4.13",
- "tower-http",
+ "tower-http 0.6.1",
  "tower-service",
 ]
 
@@ -2708,14 +2683,14 @@ dependencies = [
  "dlopen2_derive",
  "once_cell",
  "rustls-native-certs 0.7.3",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
 ]
 
 [[package]]
 name = "deno_net"
-version = "0.155.0"
+version = "0.163.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3f337ffe00186bc67f989f5ba2759418bb43e1352b045aa9e715e216c632dc"
+checksum = "5b769fd37232a38bf15a3834c9da8cc99409b52d0cf4a936f3117744369f8063"
 dependencies = [
  "deno_core",
  "deno_permissions",
@@ -2731,31 +2706,44 @@ dependencies = [
 
 [[package]]
 name = "deno_ops"
-version = "0.175.0"
+version = "0.187.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2b71759647722be6ae051919b75cb66b3dccafe61b53c75ad5a6fad9d0ee4a"
+checksum = "e040fd4def8a67538fe38c9955fd970efc9f44284bd69d44f8992a456afd665d"
 dependencies = [
  "proc-macro-rules",
  "proc-macro2",
  "quote",
  "strum 0.25.0",
  "strum_macros 0.25.3",
- "syn 2.0.79",
+ "syn 2.0.86",
  "thiserror",
 ]
 
 [[package]]
-name = "deno_permissions"
-version = "0.23.0"
+name = "deno_path_util"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e67d40735d56445409349cec3eafe25668814c7f3794158c62dfd1b147b13c"
+checksum = "4889646c1ce8437a6fde3acb057fd7e2d039e62c61f5063fc125ed1ede114dc6"
+dependencies = [
+ "percent-encoding",
+ "thiserror",
+ "url",
+]
+
+[[package]]
+name = "deno_permissions"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1328c2d1d26cd066ba9d7d5fb3451081219e373342423f78d7a1b73bfac9849"
 dependencies = [
  "deno_core",
+ "deno_path_util",
  "deno_terminal 0.2.0",
  "fqdn",
  "libc",
  "log",
  "once_cell",
+ "percent-encoding",
  "serde",
  "which 4.4.2",
  "winapi",
@@ -2783,14 +2771,14 @@ dependencies = [
 
 [[package]]
 name = "deno_tls"
-version = "0.150.0"
+version = "0.158.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b995ce6016bc4f05453c8632a9d42a58536c1cbb7ece09f1aa66dda3f8d474b"
+checksum = "22a1abc6bd8af41aa2496ceceef94f4277092c781a9495c437327a17659553a2"
 dependencies = [
  "deno_core",
  "deno_native_certs",
- "rustls 0.23.13",
- "rustls-pemfile 2.1.3",
+ "rustls 0.23.16",
+ "rustls-pemfile 2.2.0",
  "rustls-tokio-stream",
  "rustls-webpki 0.102.8",
  "serde",
@@ -2810,9 +2798,9 @@ dependencies = [
 
 [[package]]
 name = "deno_url"
-version = "0.163.0"
+version = "0.171.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a05423871cf79fc0e73b9117b114045b7936a60b87a188b673a2b377a65eaa1"
+checksum = "68eb6834d66ff13c19633b0e1b621292461b744858130b0a1c51f34a57ba1a03"
 dependencies = [
  "deno_core",
  "urlpattern",
@@ -2820,9 +2808,9 @@ dependencies = [
 
 [[package]]
 name = "deno_web"
-version = "0.194.0"
+version = "0.202.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "884761df6d0bbe2869a8bfb3f4437aef75686dcbedd82dd4d23d1e7b06d50b14"
+checksum = "e0862246372f5b559b788aa07ca1b9385909d59630251156a54c4d2c5342d1eb"
 dependencies = [
  "async-trait",
  "base64-simd 0.8.0",
@@ -2834,14 +2822,14 @@ dependencies = [
  "futures",
  "serde",
  "tokio",
- "uuid 1.10.0",
+ "uuid 1.11.0",
 ]
 
 [[package]]
 name = "deno_webidl"
-version = "0.163.0"
+version = "0.171.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a564c240839f20b8808d0182a0c1a85428a92fb7fe6cc6ea256adda11ad08a8d"
+checksum = "5e969b61b740479379eaf303a6900d11f162f9de610640398f89f0aa58abb7c4"
 dependencies = [
  "deno_core",
 ]
@@ -2919,7 +2907,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version 0.4.1",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -2929,7 +2917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac41dd49fb554432020d52c875fc290e110113f864c6b1b525cd62c7e7747a5d"
 dependencies = [
  "byteorder",
- "cipher 0.3.0",
+ "cipher",
  "opaque-debug",
 ]
 
@@ -3016,7 +3004,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3045,16 +3033,16 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
 [[package]]
 name = "dprint-swc-ext"
-version = "0.17.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b909f9f9b22a6265839887544dce97b0b8e2b2635abf622f45613deb3de63e0"
+checksum = "0ba28c12892aadb751c2ba7001d8460faee4748a04b4edc51c7121cc67ee03db"
 dependencies = [
  "num-bigint",
  "rustc-hash 1.1.0",
  "swc_atoms",
- "swc_common 0.34.4",
- "swc_ecma_ast 0.115.1",
- "swc_ecma_parser 0.146.12",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_parser",
  "text_lines",
 ]
 
@@ -3172,7 +3160,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3192,7 +3180,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3211,6 +3199,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "error_reporter"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31ae425815400e5ed474178a7a22e275a9687086a12ca63ec793ff292d8fdae8"
+
 [[package]]
 name = "esaxx-rs"
 version = "0.1.10"
@@ -3266,9 +3260,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
 [[package]]
 name = "fastdivide"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59668941c55e5c186b8b58c391629af56774ec768f73c08bbcd56f09348eb00b"
+checksum = "9afc2bd4d5a73106dd53d10d73d3401c2f32730ba2c0b93ddb888a8983680471"
 
 [[package]]
 name = "fastrand"
@@ -3342,9 +3336,9 @@ dependencies = [
 
 [[package]]
 name = "flume"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -3357,6 +3351,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -3395,7 +3395,7 @@ checksum = "32016f1242eb82af5474752d00fd8ebcd9004bd69b462b1c91de833972d08ed4"
 dependencies = [
  "proc-macro2",
  "swc_macros_common",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3427,7 +3427,7 @@ checksum = "e99b8b3c28ae0e84b604c75f721c21dc77afb3706076af5e8216d15fd1deaae3"
 dependencies = [
  "frunk_proc_macro_helpers",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3439,7 +3439,7 @@ dependencies = [
  "frunk_core",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3451,7 +3451,7 @@ dependencies = [
  "frunk_core",
  "frunk_proc_macro_helpers",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3482,9 +3482,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -3497,9 +3497,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -3507,15 +3507,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -3535,9 +3535,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
@@ -3556,9 +3556,9 @@ dependencies = [
 
 [[package]]
 name = "futures-lite"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+checksum = "3f1fa2f9765705486b33fd2acf1577f8ec449c2ba1f318ae5447697b7c08d210"
 dependencies = [
  "fastrand 2.1.1",
  "futures-core",
@@ -3569,32 +3569,32 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -3617,7 +3617,7 @@ dependencies = [
  "async-trait",
  "base64 0.21.7",
  "dirs-next",
- "hyper 0.14.30",
+ "hyper 0.14.31",
  "hyper-rustls 0.24.2",
  "ring 0.16.20",
  "rustls 0.21.12",
@@ -3807,9 +3807,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.31.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "git-version"
@@ -3828,7 +3828,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3906,7 +3906,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -3925,7 +3925,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.1.0",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -3974,6 +3974,17 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
 [[package]]
 name = "hashlink"
 version = "0.9.1"
@@ -4167,9 +4178,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -4185,9 +4196,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.30"
+version = "0.14.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -4209,9 +4220,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -4236,7 +4247,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
  "http 0.2.12",
- "hyper 0.14.30",
+ "hyper 0.14.31",
  "log",
  "rustls 0.21.12",
  "rustls-native-certs 0.6.3",
@@ -4252,9 +4263,9 @@ checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
  "http 1.1.0",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "hyper-util",
- "rustls 0.23.13",
+ "rustls 0.23.16",
  "rustls-native-certs 0.8.0",
  "rustls-pki-types",
  "tokio",
@@ -4269,7 +4280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper 0.14.30",
+ "hyper 0.14.31",
  "native-tls",
  "tokio",
  "tokio-native-tls",
@@ -4283,7 +4294,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -4293,16 +4304,16 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
+checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.1",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "pin-project-lite",
  "socket2 0.5.7",
  "tokio",
@@ -4379,12 +4390,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
  "serde",
 ]
 
@@ -4407,15 +4418,6 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac"
 
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "instant"
 version = "0.1.13"
@@ -4448,9 +4450,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.10.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is-macro"
@@ -4461,7 +4463,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -4550,7 +4552,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
 ]
 
 [[package]]
@@ -4670,9 +4672,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "libgit2-sys"
@@ -4698,9 +4700,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
 [[package]]
 name = "libredox"
@@ -4790,11 +4792,11 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
 ]
 
 [[package]]
@@ -4848,7 +4850,7 @@ version = "3.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c42f95f9d296f2dcb50665f507ed5a68a171453142663ce44d77a4eb217b053"
 dependencies = [
- "aes 0.7.5",
+ "aes",
  "base64 0.21.7",
  "block-modes",
  "crc-any",
@@ -4887,7 +4889,7 @@ dependencies = [
  "base64 0.22.1",
  "gethostname",
  "mail-builder",
- "rustls 0.23.13",
+ "rustls 0.23.16",
  "rustls-pki-types",
  "smtp-proto",
  "tokio",
@@ -5084,14 +5086,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
- "hermit-abi 0.3.9",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -5112,7 +5113,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -5151,7 +5152,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
  "termcolor",
  "thiserror",
 ]
@@ -5222,7 +5223,7 @@ dependencies = [
  "subprocess",
  "thiserror",
  "time",
- "uuid 1.10.0",
+ "uuid 1.11.0",
  "zstd 0.13.2",
 ]
 
@@ -5418,9 +5419,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
@@ -5437,14 +5438,14 @@ dependencies = [
  "chrono",
  "futures",
  "humantime",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "itertools 0.13.0",
  "md-5 0.10.6",
  "parking_lot",
  "percent-encoding",
  "quick-xml 0.36.2",
  "rand 0.8.5",
- "reqwest 0.12.7",
+ "reqwest 0.12.9",
  "ring 0.17.8",
  "serde",
  "serde_json",
@@ -5457,12 +5458,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.1"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
-dependencies = [
- "portable-atomic",
-]
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "oneshot"
@@ -5543,9 +5541,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.66"
+version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
@@ -5564,7 +5562,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -5575,9 +5573,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.103"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
@@ -5695,7 +5693,7 @@ dependencies = [
  "arrow-schema",
  "arrow-select",
  "base64 0.22.1",
- "brotli",
+ "brotli 6.0.0",
  "bytes",
  "chrono",
  "flate2",
@@ -5725,17 +5723,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "password-hash"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
-dependencies = [
- "base64ct",
- "rand_core 0.6.4",
- "subtle",
-]
-
 [[package]]
 name = "password-hash"
 version = "0.5.0"
@@ -5755,21 +5742,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pathdiff"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
-[[package]]
-name = "pbkdf2"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
-dependencies = [
- "digest 0.10.7",
- "hmac",
- "password-hash 0.4.2",
- "sha2 0.10.8",
-]
+checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361"
 
 [[package]]
 name = "pem"
@@ -5821,25 +5796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.5.0",
-]
-
-[[package]]
-name = "pg-embed"
-version = "0.7.2"
-source = "git+https://github.com/faokunega/pg-embed#72db5e053f0afac6eee51d3baa2fd5c90803e02d"
-dependencies = [
- "archiver-rs",
- "async-trait",
- "bytes",
- "dirs",
- "futures",
- "lazy_static",
- "log",
- "reqwest 0.11.27",
- "thiserror",
- "tokio",
- "zip",
+ "indexmap 2.6.0",
 ]
 
 [[package]]
@@ -5882,7 +5839,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -5908,29 +5865,29 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -6064,7 +6021,7 @@ dependencies = [
  "postgres-protocol",
  "serde",
  "serde_json",
- "uuid 1.10.0",
+ "uuid 1.11.0",
 ]
 
 [[package]]
@@ -6100,12 +6057,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.22"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -6158,7 +6115,7 @@ checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f"
 dependencies = [
  "proc-macro-rules-macros",
  "proc-macro2",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -6170,14 +6127,14 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -6231,7 +6188,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "syn 2.0.79",
+ "syn 2.0.86",
  "thiserror",
  "typify",
  "unicode-ident",
@@ -6251,7 +6208,7 @@ dependencies = [
  "serde_json",
  "serde_tokenstream",
  "serde_yaml",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -6294,7 +6251,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -6408,7 +6365,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.0.0",
- "rustls 0.23.13",
+ "rustls 0.23.16",
  "socket2 0.5.7",
  "thiserror",
  "tokio",
@@ -6425,7 +6382,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.17.8",
  "rustc-hash 2.0.0",
- "rustls 0.23.13",
+ "rustls 0.23.16",
  "slab",
  "thiserror",
  "tinyvec",
@@ -6434,10 +6391,11 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
+checksum = "e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2 0.5.7",
@@ -6646,9 +6604,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -6733,7 +6691,7 @@ dependencies = [
  "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.30",
+ "hyper 0.14.31",
  "hyper-rustls 0.24.2",
  "hyper-tls 0.5.0",
  "ipnet",
@@ -6767,11 +6725,11 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
- "async-compression 0.4.12",
+ "async-compression 0.4.17",
  "base64 0.22.1",
  "bytes",
  "encoding_rs",
@@ -6781,7 +6739,7 @@ dependencies = [
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "hyper-rustls 0.27.3",
  "hyper-tls 0.6.0",
  "hyper-util",
@@ -6794,9 +6752,9 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.13",
- "rustls-native-certs 0.7.3",
- "rustls-pemfile 2.1.3",
+ "rustls 0.23.16",
+ "rustls-native-certs 0.8.0",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -6887,7 +6845,7 @@ dependencies = [
  "rkyv_derive",
  "seahash",
  "tinyvec",
- "uuid 1.10.0",
+ "uuid 1.11.0",
 ]
 
 [[package]]
@@ -6977,7 +6935,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.79",
+ "syn 2.0.86",
  "walkdir",
 ]
 
@@ -7069,9 +7027,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -7094,9 +7052,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.13"
+version = "0.23.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
 dependencies = [
  "log",
  "once_cell",
@@ -7126,7 +7084,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "schannel",
  "security-framework",
@@ -7139,7 +7097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "schannel",
  "security-framework",
@@ -7156,19 +7114,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
 
 [[package]]
 name = "rustls-tokio-stream"
@@ -7177,7 +7134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22557157d7395bc30727745b365d923f1ecc230c4c80b176545f3f4f08c46e33"
 dependencies = [
  "futures",
- "rustls 0.23.13",
+ "rustls 0.23.16",
  "socket2 0.5.7",
  "tokio",
 ]
@@ -7258,9 +7215,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
 
 [[package]]
 name = "ryu"
@@ -7291,7 +7248,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b75583aad4a51c50fc0af69c230d18078c9d5a69a98d0f6013d01053acf744f4"
 dependencies = [
  "base64 0.21.7",
- "bindgen 0.69.4",
+ "bindgen 0.69.5",
  "chrono",
  "data-encoding",
  "derive_builder",
@@ -7308,7 +7265,7 @@ dependencies = [
  "serde",
  "thiserror",
  "url",
- "uuid 1.10.0",
+ "uuid 1.11.0",
 ]
 
 [[package]]
@@ -7328,9 +7285,9 @@ checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71"
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
 dependencies = [
  "windows-sys 0.59.0",
 ]
@@ -7346,7 +7303,7 @@ dependencies = [
  "schemars_derive",
  "serde",
  "serde_json",
- "uuid 1.10.0",
+ "uuid 1.11.0",
 ]
 
 [[package]]
@@ -7358,7 +7315,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -7458,9 +7415,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
 dependencies = [
  "serde_derive",
 ]
@@ -7499,13 +7456,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -7516,16 +7473,16 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "itoa",
  "memchr",
  "ryu",
@@ -7591,7 +7548,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -7608,9 +7565,9 @@ dependencies = [
 
 [[package]]
 name = "serde_v8"
-version = "0.208.0"
+version = "0.220.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583f3c71a6f7acc1711ad718a33f6e799bacdc711d297b15bb28533f32264c58"
+checksum = "6e7a65d91d79acc82aa229aeb084f4a39bda269069bc1520df40f679495388e4"
 dependencies = [
  "num-bigint",
  "serde",
@@ -7621,15 +7578,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -7639,14 +7596,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
 dependencies = [
  "darling 0.20.10",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -7655,7 +7612,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "itoa",
  "ryu",
  "serde",
@@ -7911,6 +7868,25 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "sourcemap"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dab08a862c70980b8e23698b507e272317ae52a608a164a844111f5372374f1f"
+dependencies = [
+ "base64-simd 0.7.0",
+ "bitvec",
+ "data-encoding",
+ "debugid",
+ "if_chain",
+ "rustc-hash 1.1.0",
+ "rustc_version 0.2.3",
+ "serde",
+ "serde_json",
+ "unicode-id-start",
+ "url",
+]
+
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -7996,7 +7972,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -8035,14 +8011,14 @@ dependencies = [
  "hashbrown 0.14.5",
  "hashlink",
  "hex",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "log",
  "memchr",
  "once_cell",
  "paste",
  "percent-encoding",
- "rustls 0.23.13",
- "rustls-pemfile 2.1.3",
+ "rustls 0.23.16",
+ "rustls-pemfile 2.2.0",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -8053,7 +8029,7 @@ dependencies = [
  "tokio-stream",
  "tracing",
  "url",
- "uuid 1.10.0",
+ "uuid 1.11.0",
  "webpki-roots 0.26.6",
 ]
 
@@ -8067,7 +8043,7 @@ dependencies = [
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -8090,7 +8066,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.79",
+ "syn 2.0.86",
  "tempfile",
  "tokio",
  "url",
@@ -8137,7 +8113,7 @@ dependencies = [
  "stringprep",
  "thiserror",
  "tracing",
- "uuid 1.10.0",
+ "uuid 1.11.0",
  "whoami",
 ]
 
@@ -8179,7 +8155,7 @@ dependencies = [
  "stringprep",
  "thiserror",
  "tracing",
- "uuid 1.10.0",
+ "uuid 1.11.0",
  "whoami",
 ]
 
@@ -8205,7 +8181,7 @@ dependencies = [
  "sqlx-core",
  "tracing",
  "url",
- "uuid 1.10.0",
+ "uuid 1.11.0",
 ]
 
 [[package]]
@@ -8242,7 +8218,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -8296,7 +8272,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -8309,7 +8285,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -8328,6 +8304,19 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
+[[package]]
+name = "swc_allocator"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76aa0eb65c0f39f9b6d82a7e5192c30f7ac9a78f084a21f270de1d8c600ca388"
+dependencies = [
+ "bumpalo",
+ "hashbrown 0.14.5",
+ "ptr_meta",
+ "rustc-hash 1.1.0",
+ "triomphe",
+]
+
 [[package]]
 name = "swc_atoms"
 version = "0.6.7"
@@ -8356,9 +8345,9 @@ dependencies = [
 
 [[package]]
 name = "swc_common"
-version = "0.33.26"
+version = "0.37.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2f9706038906e66f3919028f9f7a37f3ed552f1b85578e93f4468742e2da438"
+checksum = "12d0a8eaaf1606c9207077d75828008cb2dfb51b095a766bd2b72ef893576e31"
 dependencies = [
  "ast_node",
  "better_scoped_tls",
@@ -8371,32 +8360,8 @@ dependencies = [
  "rustc-hash 1.1.0",
  "serde",
  "siphasher",
- "swc_atoms",
- "swc_eq_ignore_macros",
- "swc_visit",
- "tracing",
- "unicode-width",
- "url",
-]
-
-[[package]]
-name = "swc_common"
-version = "0.34.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9087befec6b63911f9d2f239e4f91c9b21589c169b86ed2d616944d23cf4a243"
-dependencies = [
- "ast_node",
- "better_scoped_tls",
- "cfg-if",
- "either",
- "from_variant",
- "new_debug_unreachable",
- "num-bigint",
- "once_cell",
- "rustc-hash 1.1.0",
- "serde",
- "siphasher",
- "sourcemap",
+ "sourcemap 9.0.0",
+ "swc_allocator",
  "swc_atoms",
  "swc_eq_ignore_macros",
  "swc_visit",
@@ -8407,12 +8372,12 @@ dependencies = [
 
 [[package]]
 name = "swc_config"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b67e115ab136fe0eb03558bb0508ca7782eeb446a96d165508c48617e3fd94"
+checksum = "4740e53eaf68b101203c1df0937d5161a29f3c13bceed0836ddfe245b72dd000"
 dependencies = [
  "anyhow",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_json",
  "swc_cached",
@@ -8428,31 +8393,14 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
 name = "swc_ecma_ast"
-version = "0.113.7"
+version = "0.118.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98a534a8360a076a030989f6d121ba6044345594bdf0457c4629f432742026b8"
-dependencies = [
- "bitflags 2.6.0",
- "is-macro",
- "num-bigint",
- "phf",
- "scoped-tls",
- "string_enum",
- "swc_atoms",
- "swc_common 0.33.26",
- "unicode-id-start",
-]
-
-[[package]]
-name = "swc_ecma_ast"
-version = "0.115.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be1306930c235435a892104c00c2b5e16231043c085d5a10bd3e7537b15659b"
+checksum = "a6f866d12e4d519052b92a0a86d1ac7ff17570da1272ca0c89b3d6f802cd79df"
 dependencies = [
  "bitflags 2.6.0",
  "is-macro",
@@ -8462,60 +8410,60 @@ dependencies = [
  "serde",
  "string_enum",
  "swc_atoms",
- "swc_common 0.34.4",
+ "swc_common",
  "unicode-id-start",
 ]
 
 [[package]]
 name = "swc_ecma_codegen"
-version = "0.151.1"
+version = "0.155.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5141a8cb4eb69e090e6aea5d49061b46919be5210f3d084f9d9ad63d30f5cff"
+checksum = "cc7641608ef117cfbef9581a99d02059b522fcca75e5244fa0cbbd8606689c6f"
 dependencies = [
  "memchr",
  "num-bigint",
  "once_cell",
- "rustc-hash 1.1.0",
  "serde",
- "sourcemap",
+ "sourcemap 9.0.0",
+ "swc_allocator",
  "swc_atoms",
- "swc_common 0.34.4",
- "swc_ecma_ast 0.115.1",
+ "swc_common",
+ "swc_ecma_ast",
  "swc_ecma_codegen_macros",
  "tracing",
 ]
 
 [[package]]
 name = "swc_ecma_codegen_macros"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090e409af49c8d1a3c13b3aab1ed09dd4eda982207eb3e63c2ad342f072b49c8"
+checksum = "859fabde36db38634f3fad548dd5e3410c1aebba1b67a3c63e67018fa57a0bca"
 dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
 name = "swc_ecma_loader"
-version = "0.46.1"
+version = "0.49.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9febebf047d1286e7b723fa2758f3229da2c103834f3eaee69833f46692612"
+checksum = "55fa3d55045b97894bfb04d38aff6d6302ac8a6a38e3bb3dfb0d20475c4974a9"
 dependencies = [
  "anyhow",
  "pathdiff",
  "serde",
  "swc_atoms",
- "swc_common 0.34.4",
+ "swc_common",
  "tracing",
 ]
 
 [[package]]
 name = "swc_ecma_parser"
-version = "0.144.3"
+version = "0.149.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0b4193b9c127db1990a5a08111aafe0122bc8b138646807c63f2a6521b7da4"
+checksum = "683dada14722714588b56481399c699378b35b2ba4deb5c4db2fb627a97fb54b"
 dependencies = [
  "either",
  "new_debug_unreachable",
@@ -8527,69 +8475,47 @@ dependencies = [
  "smartstring",
  "stacker",
  "swc_atoms",
- "swc_common 0.33.26",
- "swc_ecma_ast 0.113.7",
- "tracing",
- "typed-arena",
-]
-
-[[package]]
-name = "swc_ecma_parser"
-version = "0.146.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a4e0c2e85f12c63b85c805e923079b04d1fb3e25edd069d638eed5f2098de74"
-dependencies = [
- "either",
- "new_debug_unreachable",
- "num-bigint",
- "num-traits",
- "phf",
- "serde",
- "smallvec",
- "smartstring",
- "stacker",
- "swc_atoms",
- "swc_common 0.34.4",
- "swc_ecma_ast 0.115.1",
+ "swc_common",
+ "swc_ecma_ast",
  "tracing",
  "typed-arena",
 ]
 
 [[package]]
 name = "swc_ecma_transforms_base"
-version = "0.140.3"
+version = "0.145.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d37dc505c92af56d0f77cf6f31a6ccd37ac40cad1e01ff77277e0b1c70e8f8ff"
+checksum = "65f21494e75d0bd8ef42010b47cabab9caaed8f2207570e809f6f4eb51a710d1"
 dependencies = [
  "better_scoped_tls",
  "bitflags 2.6.0",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "once_cell",
  "phf",
  "rustc-hash 1.1.0",
  "serde",
  "smallvec",
  "swc_atoms",
- "swc_common 0.34.4",
- "swc_ecma_ast 0.115.1",
- "swc_ecma_parser 0.146.12",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_parser",
  "swc_ecma_utils",
- "swc_ecma_visit 0.101.0",
+ "swc_ecma_visit",
  "tracing",
 ]
 
 [[package]]
 name = "swc_ecma_transforms_classes"
-version = "0.129.0"
+version = "0.134.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3eab5f8179e5b0aedf385eacc2c033691c6d211a7babd1bbbff12cf794a824e"
+checksum = "3c3d884594385bea9405a2e1721151470d9a14d3ceec5dd773c0ca6894791601"
 dependencies = [
  "swc_atoms",
- "swc_common 0.34.4",
- "swc_ecma_ast 0.115.1",
+ "swc_common",
+ "swc_ecma_ast",
  "swc_ecma_transforms_base",
  "swc_ecma_utils",
- "swc_ecma_visit 0.101.0",
+ "swc_ecma_visit",
 ]
 
 [[package]]
@@ -8601,160 +8527,148 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
 name = "swc_ecma_transforms_proposal"
-version = "0.174.3"
+version = "0.179.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6df8aa6752cc2fcf3d78ac67827542fb666e52283f2b26802aa058906bb750d3"
+checksum = "79938ff510fc647febd8c6c3ef4143d099fdad87a223680e632623d056dae2dd"
 dependencies = [
  "either",
  "rustc-hash 1.1.0",
  "serde",
  "smallvec",
  "swc_atoms",
- "swc_common 0.34.4",
- "swc_ecma_ast 0.115.1",
+ "swc_common",
+ "swc_ecma_ast",
  "swc_ecma_transforms_base",
  "swc_ecma_transforms_classes",
  "swc_ecma_transforms_macros",
  "swc_ecma_utils",
- "swc_ecma_visit 0.101.0",
+ "swc_ecma_visit",
 ]
 
 [[package]]
 name = "swc_ecma_transforms_react"
-version = "0.186.2"
+version = "0.191.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446da32cac8299973aaf1d37496562bfd0c1e4f3c3ab5d0af6f07f42e8184102"
+checksum = "76c76d8b9792ce51401d38da0fa62158d61f6d80d16d68fe5b03ce4bf5fba383"
 dependencies = [
  "base64 0.21.7",
  "dashmap",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "once_cell",
  "serde",
  "sha1",
  "string_enum",
+ "swc_allocator",
  "swc_atoms",
- "swc_common 0.34.4",
+ "swc_common",
  "swc_config",
- "swc_ecma_ast 0.115.1",
- "swc_ecma_parser 0.146.12",
+ "swc_ecma_ast",
+ "swc_ecma_parser",
  "swc_ecma_transforms_base",
  "swc_ecma_transforms_macros",
  "swc_ecma_utils",
- "swc_ecma_visit 0.101.0",
+ "swc_ecma_visit",
 ]
 
 [[package]]
 name = "swc_ecma_transforms_typescript"
-version = "0.191.2"
+version = "0.198.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1ce8af2865449e714ae56dacb6b54b3f6dc4cc25074da4e39b878bd93c5e39c"
+checksum = "15455da4768f97186c40523e83600495210c11825d3a44db43383fd81eace88d"
 dependencies = [
  "ryu-js",
  "serde",
  "swc_atoms",
- "swc_common 0.34.4",
- "swc_ecma_ast 0.115.1",
+ "swc_common",
+ "swc_ecma_ast",
  "swc_ecma_transforms_base",
  "swc_ecma_transforms_react",
  "swc_ecma_utils",
- "swc_ecma_visit 0.101.0",
+ "swc_ecma_visit",
 ]
 
 [[package]]
 name = "swc_ecma_utils"
-version = "0.130.3"
+version = "0.134.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e62b199454a576c5fdbd7e1bef8ab88a395427456d8a713d994b7d469833aa"
+checksum = "029eec7dd485923a75b5a45befd04510288870250270292fc2c1b3a9e7547408"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "num_cpus",
  "once_cell",
  "rustc-hash 1.1.0",
  "ryu-js",
  "swc_atoms",
- "swc_common 0.34.4",
- "swc_ecma_ast 0.115.1",
- "swc_ecma_visit 0.101.0",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_visit",
  "tracing",
  "unicode-id",
 ]
 
 [[package]]
 name = "swc_ecma_visit"
-version = "0.99.1"
+version = "0.104.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28a6ce28ad8e591f8d627f1f9cb26b25e5d83052a9bc1b674d95fc28040cfa98"
+checksum = "5b1c6802e68e51f336e8bc9644e9ff9da75d7da9c1a6247d532f2e908aa33e81"
 dependencies = [
+ "new_debug_unreachable",
  "num-bigint",
  "swc_atoms",
- "swc_common 0.33.26",
- "swc_ecma_ast 0.113.7",
- "swc_visit",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_visit"
-version = "0.101.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce0d997f0c9b4e181225f603d161f6757c2a97022258170982cfe005ec69ec92"
-dependencies = [
- "num-bigint",
- "swc_atoms",
- "swc_common 0.34.4",
- "swc_ecma_ast 0.115.1",
+ "swc_common",
+ "swc_ecma_ast",
  "swc_visit",
  "tracing",
 ]
 
 [[package]]
 name = "swc_eq_ignore_macros"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4"
+checksum = "63db0adcff29d220c3d151c5b25c0eabe7e32dd936212b84cdaa1392e3130497"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
 name = "swc_macros_common"
-version = "0.3.11"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91745f3561057493d2da768437c427c0e979dff7396507ae02f16c981c4a8466"
+checksum = "f486687bfb7b5c560868f69ed2d458b880cebc9babebcb67e49f31b55c5bf847"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
 name = "swc_visit"
-version = "0.5.14"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043d11fe683dcb934583ead49405c0896a5af5face522e4682c16971ef7871b9"
+checksum = "1ceb044142ba2719ef9eb3b6b454fce61ab849eb696c34d190f04651955c613d"
 dependencies = [
  "either",
- "swc_visit_macros",
+ "new_debug_unreachable",
 ]
 
 [[package]]
 name = "swc_visit_macros"
-version = "0.5.12"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae9ef18ff8daffa999f729db056d2821cd2f790f3a11e46422d19f46bb193e7"
+checksum = "92807d840959f39c60ce8a774a3f83e8193c658068e6d270dbe0a05e40e90b41"
 dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -8770,9 +8684,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.79"
+version = "2.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8788,7 +8702,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -8814,7 +8728,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -8920,7 +8834,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "time",
- "uuid 1.10.0",
+ "uuid 1.11.0",
  "winapi",
 ]
 
@@ -9022,9 +8936,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tar"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
+checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6"
 dependencies = [
  "filetime",
  "libc",
@@ -9064,22 +8978,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.64"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -9128,7 +9042,7 @@ dependencies = [
  "tokio-rustls 0.24.1",
  "tokio-util",
  "tracing",
- "uuid 1.10.0",
+ "uuid 1.11.0",
 ]
 
 [[package]]
@@ -9278,32 +9192,33 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
+ "num_cpus",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2 0.5.7",
  "tokio-macros",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -9358,7 +9273,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.13",
+ "rustls 0.23.16",
  "rustls-pki-types",
  "tokio",
 ]
@@ -9401,6 +9316,20 @@ dependencies = [
  "xattr",
 ]
 
+[[package]]
+name = "tokio-tungstenite"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9"
+dependencies = [
+ "futures-util",
+ "log",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tungstenite",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.12"
@@ -9454,7 +9383,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -9467,7 +9396,7 @@ version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -9541,7 +9470,24 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
- "async-compression 0.4.12",
+ "bitflags 2.6.0",
+ "bytes",
+ "http 1.1.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "pin-project-lite",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97"
+dependencies = [
+ "async-compression 0.4.17",
  "bitflags 2.6.0",
  "bytes",
  "futures-core",
@@ -9553,7 +9499,6 @@ dependencies = [
  "tokio-util",
  "tower-layer",
  "tower-service",
- "tracing",
 ]
 
 [[package]]
@@ -9600,7 +9545,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -9663,7 +9608,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea6023f9fe4b69267ccd3ed7d203d931c43c5f82dbaa0f07202bc17193a5f43"
 dependencies = [
  "loki-api",
- "reqwest 0.12.7",
+ "reqwest 0.12.9",
  "serde",
  "serde_json",
  "snap",
@@ -9710,9 +9655,9 @@ dependencies = [
 
 [[package]]
 name = "triomphe"
-version = "0.1.11"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3"
+checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -9772,6 +9717,25 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
+[[package]]
+name = "tungstenite"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http 1.1.0",
+ "httparse",
+ "log",
+ "native-tls",
+ "rand 0.8.5",
+ "sha1",
+ "thiserror",
+ "utf-8",
+]
+
 [[package]]
 name = "twox-hash"
 version = "1.6.3"
@@ -9818,7 +9782,7 @@ dependencies = [
  "regress",
  "schemars",
  "serde_json",
- "syn 2.0.79",
+ "syn 2.0.86",
  "thiserror",
  "unicode-ident",
 ]
@@ -9835,7 +9799,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_tokenstream",
- "syn 2.0.79",
+ "syn 2.0.86",
  "typify-impl",
 ]
 
@@ -9847,7 +9811,7 @@ checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289"
 dependencies = [
  "getrandom 0.2.15",
  "rand 0.8.5",
- "uuid 1.10.0",
+ "uuid 1.11.0",
  "web-time",
 ]
 
@@ -9917,18 +9881,15 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
 
 [[package]]
 name = "unicode-id"
@@ -9938,9 +9899,9 @@ checksum = "10103c57044730945224467c09f71a4db0071c123a0648cc3e818913bde6b561"
 
 [[package]]
 name = "unicode-id-start"
-version = "1.0.4"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02aebfa694eccbbbffdd92922c7de136b9fe764396d2f10e21bce1681477cfc1"
+checksum = "2f322b60f6b9736017344fa0635d64be2f458fbc04eef65f6be22976dd1ffd5b"
 
 [[package]]
 name = "unicode-ident"
@@ -9968,9 +9929,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-properties"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524"
+checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 
 [[package]]
 name = "unicode-segmentation"
@@ -10047,7 +10008,7 @@ dependencies = [
  "log",
  "native-tls",
  "once_cell",
- "rustls 0.23.13",
+ "rustls 0.23.16",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -10075,17 +10036,22 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
 [[package]]
 name = "urlpattern"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609"
+checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d"
 dependencies = [
- "derive_more",
  "regex",
  "serde",
  "unic-ucd-ident",
  "url",
 ]
 
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
 [[package]]
 name = "utf8-ranges"
 version = "1.0.5"
@@ -10109,9 +10075,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "getrandom 0.2.15",
  "serde",
@@ -10119,11 +10085,11 @@ dependencies = [
 
 [[package]]
 name = "v8"
-version = "0.99.0"
+version = "0.106.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa3fc0608a78f0c7d4ec88025759cb78c90a29984b48540060355a626ae329c1"
+checksum = "a381badc47c6f15acb5fe0b5b40234162349ed9d4e4fd7c83a7f5547c0fc69c5"
 dependencies = [
- "bindgen 0.69.4",
+ "bindgen 0.69.5",
  "bitflags 2.6.0",
  "fslock",
  "gzip-header",
@@ -10142,9 +10108,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "value-bag"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
+checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
 
 [[package]]
 name = "vcpkg"
@@ -10228,7 +10194,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
  "wasm-bindgen-shared",
 ]
 
@@ -10262,7 +10228,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -10295,7 +10261,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -10429,7 +10395,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "axum",
@@ -10443,11 +10409,10 @@ dependencies = [
  "lazy_static",
  "object_store",
  "once_cell",
- "pg-embed",
  "prometheus",
  "quote",
  "rand 0.8.5",
- "reqwest 0.12.7",
+ "reqwest 0.12.9",
  "rsmq_async",
  "serde",
  "serde_json",
@@ -10459,9 +10424,10 @@ dependencies = [
  "tokio",
  "tracing",
  "url",
- "uuid 1.10.0",
+ "uuid 1.11.0",
  "windmill-api",
  "windmill-api-client",
+ "windmill-autoscaling",
  "windmill-common",
  "windmill-git-sync",
  "windmill-indexer",
@@ -10471,7 +10437,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10490,7 +10456,6 @@ dependencies = [
  "chrono",
  "chrono-tz 0.10.0",
  "cookie 0.17.0",
- "crc",
  "cron",
  "datafusion",
  "futures",
@@ -10499,7 +10464,7 @@ dependencies = [
  "hf-hub",
  "hmac",
  "http 1.1.0",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "itertools 0.13.0",
  "jsonwebtoken",
  "lazy_static",
@@ -10516,7 +10481,7 @@ dependencies = [
  "quick_cache",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.7",
+ "reqwest 0.12.9",
  "rsa 0.7.2",
  "rsmq_async",
  "rust-embed",
@@ -10534,16 +10499,17 @@ dependencies = [
  "tokio",
  "tokio-native-tls",
  "tokio-tar",
+ "tokio-tungstenite",
  "tokio-util",
  "tower 0.5.1",
  "tower-cookies",
- "tower-http",
+ "tower-http 0.5.2",
  "tracing",
  "tracing-subscriber",
  "ulid",
  "url",
  "urlencoding",
- "uuid 1.10.0",
+ "uuid 1.11.0",
  "windmill-audit",
  "windmill-common",
  "windmill-git-sync",
@@ -10556,7 +10522,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "base64 0.21.7",
  "chrono",
@@ -10569,12 +10535,12 @@ dependencies = [
  "serde",
  "serde_json",
  "syn 1.0.109",
- "uuid 1.10.0",
+ "uuid 1.11.0",
 ]
 
 [[package]]
 name = "windmill-audit"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "chrono",
  "serde",
@@ -10585,9 +10551,24 @@ dependencies = [
  "windmill-common",
 ]
 
+[[package]]
+name = "windmill-autoscaling"
+version = "1.416.2"
+dependencies = [
+ "anyhow",
+ "rsmq_async",
+ "serde",
+ "serde_json",
+ "sqlx",
+ "tracing",
+ "uuid 1.11.0",
+ "windmill-common",
+ "windmill-queue",
+]
+
 [[package]]
 name = "windmill-common"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10597,14 +10578,15 @@ dependencies = [
  "bytes",
  "chrono",
  "const_format",
+ "crc",
  "cron",
  "futures-core",
  "gethostname",
  "git-version",
  "hex",
  "hmac",
- "hyper 1.4.1",
- "indexmap 2.5.0",
+ "hyper 1.5.0",
+ "indexmap 2.6.0",
  "itertools 0.13.0",
  "lazy_static",
  "magic-crypt",
@@ -10613,7 +10595,7 @@ dependencies = [
  "prometheus",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.7",
+ "reqwest 0.12.9",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -10626,12 +10608,13 @@ dependencies = [
  "tracing-flame",
  "tracing-loki",
  "tracing-subscriber",
- "uuid 1.10.0",
+ "uuid 1.11.0",
+ "windmill-macros",
 ]
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10639,19 +10622,20 @@ dependencies = [
  "serde_json",
  "sqlx",
  "tracing",
- "uuid 1.10.0",
+ "uuid 1.11.0",
  "windmill-common",
  "windmill-queue",
 ]
 
 [[package]]
 name = "windmill-indexer"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "bytes",
  "chrono",
  "futures",
+ "lazy_static",
  "object_store",
  "serde",
  "serde_json",
@@ -10661,13 +10645,25 @@ dependencies = [
  "tokio",
  "tokio-tar",
  "tracing",
- "uuid 1.10.0",
+ "uuid 1.11.0",
  "windmill-common",
 ]
 
+[[package]]
+name = "windmill-macros"
+version = "1.416.2"
+dependencies = [
+ "itertools 0.13.0",
+ "lazy_static",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 2.0.86",
+]
+
 [[package]]
 name = "windmill-parser"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10676,7 +10672,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10688,7 +10684,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10700,7 +10696,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10712,7 +10708,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10723,7 +10719,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10734,7 +10730,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10752,7 +10748,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10762,14 +10758,14 @@ dependencies = [
  "quote",
  "regex",
  "serde_json",
- "syn 2.0.79",
+ "syn 2.0.86",
  "toml 0.7.8",
  "windmill-parser",
 ]
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10781,17 +10777,17 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "lazy_static",
  "regex",
  "serde-wasm-bindgen",
  "serde_json",
- "swc_common 0.33.26",
- "swc_ecma_ast 0.113.7",
- "swc_ecma_parser 0.144.3",
- "swc_ecma_visit 0.99.1",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_parser",
+ "swc_ecma_visit",
  "triomphe",
  "wasm-bindgen",
  "windmill-parser",
@@ -10799,7 +10795,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10820,7 +10816,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10830,7 +10826,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10846,7 +10842,7 @@ dependencies = [
  "lazy_static",
  "prometheus",
  "regex",
- "reqwest 0.12.7",
+ "reqwest 0.12.9",
  "rsmq_async",
  "serde",
  "serde_json",
@@ -10856,14 +10852,14 @@ dependencies = [
  "tokio",
  "tracing",
  "ulid",
- "uuid 1.10.0",
+ "uuid 1.11.0",
  "windmill-audit",
  "windmill-common",
 ]
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -10873,7 +10869,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.402.3"
+version = "1.416.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10913,13 +10909,14 @@ dependencies = [
  "prometheus",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.7",
+ "reqwest 0.12.9",
  "rsmq_async",
  "rust_decimal",
  "serde",
  "serde_json",
  "sha2 0.10.8",
  "sqlx",
+ "swc_ecma_parser",
  "tar",
  "tiberius",
  "tokio",
@@ -10927,7 +10924,7 @@ dependencies = [
  "tokio-util",
  "tracing",
  "urlencoding",
- "uuid 1.10.0",
+ "uuid 1.11.0",
  "windmill-audit",
  "windmill-common",
  "windmill-git-sync",
@@ -11238,7 +11235,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
  "synstructure",
 ]
 
@@ -11260,7 +11257,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -11280,7 +11277,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.86",
  "synstructure",
 ]
 
@@ -11296,18 +11293,9 @@ version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
 dependencies = [
- "aes 0.8.4",
  "byteorder",
- "bzip2",
- "constant_time_eq 0.1.5",
  "crc32fast",
  "crossbeam-utils",
- "flate2",
- "hmac",
- "pbkdf2",
- "sha1",
- "time",
- "zstd 0.11.2+zstd.1.5.2",
 ]
 
 [[package]]
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 9b7a0123c8..1c0abc299c 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.402.3"
+version = "1.416.2"
 authors.workspace = true
 edition.workspace = true
 
@@ -13,7 +13,9 @@ members = [
     "./windmill-common",
     "./windmill-audit",
     "./windmill-git-sync",
+    "./windmill-autoscaling",
     "./windmill-indexer",
+    "./windmill-macros",
     "./parsers/windmill-parser",
     "./parsers/windmill-parser-ts",
     "./parsers/windmill-parser-wasm",
@@ -23,11 +25,11 @@ members = [
     "./parsers/windmill-parser-py",
     "./parsers/windmill-parser-py-imports",
     "./parsers/windmill-sql-datatype-parser-wasm",
-    "./parsers/windmill-parser-yaml",
+    "./parsers/windmill-parser-yaml", "windmill-macros",
 ]
 
 [workspace.package]
-version = "1.402.3"
+version = "1.416.2"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
@@ -39,15 +41,17 @@ path = "./src/main.rs"
 opt-level = 0
 incremental = true
 
+[profile.release]
+lto = "thin"
+
 [features]
 default = []
-enterprise = ["windmill-worker/enterprise", "windmill-queue/enterprise", "windmill-api/enterprise", "windmill-git-sync/enterprise", "windmill-common/prometheus", "windmill-common/enterprise", "windmill-indexer/enterprise"]
+enterprise = ["windmill-worker/enterprise", "windmill-queue/enterprise", "windmill-api/enterprise", "dep:windmill-autoscaling", "windmill-autoscaling/enterprise", "windmill-git-sync/enterprise", "windmill-common/prometheus", "windmill-common/enterprise", "windmill-indexer/enterprise"]
 enterprise_saml = ["windmill-api/enterprise_saml"]
 stripe = ["windmill-api/stripe"]
 benchmark = ["windmill-api/benchmark", "windmill-worker/benchmark", "windmill-queue/benchmark", "windmill-common/benchmark"]
 flamegraph = ["windmill-common/flamegraph", "windmill-worker/flamegraph"]
 loki = ["windmill-common/loki"]
-pg_embed = ["dep:pg-embed"]
 embedding = ["windmill-api/embedding"]
 parquet = ["windmill-api/parquet", "windmill-common/parquet", "windmill-worker/parquet", "windmill-indexer/parquet", "dep:object_store"]
 prometheus = ["windmill-common/prometheus", "windmill-api/prometheus", "windmill-worker/prometheus", "windmill-queue/prometheus"]
@@ -57,6 +61,7 @@ cloud = ["windmill-queue/cloud", "windmill-worker/cloud"]
 jemalloc = ["windmill-common/jemalloc", "dep:tikv-jemallocator", "dep:tikv-jemalloc-sys", "dep:tikv-jemalloc-ctl"]
 tantivy = ["dep:windmill-indexer", "windmill-api/tantivy"]
 sqlx = ["windmill-worker/sqlx"]
+deno_core = ["windmill-worker/deno_core", "dep:deno_core"]
 
 [dependencies]
 anyhow.workspace = true
@@ -68,6 +73,7 @@ windmill-git-sync.workspace = true
 windmill-api = { workspace = true, default-features = false }
 windmill-worker.workspace = true
 windmill-indexer = { workspace = true, optional = true }
+windmill-autoscaling = { workspace = true, optional = true }
 futures.workspace = true
 tracing.workspace = true
 sqlx.workspace = true
@@ -85,9 +91,8 @@ uuid.workspace = true
 gethostname.workspace = true
 serde_json.workspace = true
 serde.workspace = true
-deno_core.workspace = true
+deno_core = { workspace = true, optional = true }
 object_store = { workspace = true, optional = true }
-pg-embed = {git = "https://github.com/faokunega/pg-embed", optional = true, default-features = false, features = ['rt_tokio']}
 quote.workspace = true
 
 
@@ -105,6 +110,7 @@ serde.workspace = true
 windmill-api-client.workspace = true
 deno_core = { workspace = true, features = ["include_js_files_for_snapshotting", "unsafe_use_unprotected_platform"] }
 
+
 [workspace.dependencies]
 windmill-api = { path = "./windmill-api", default-features = false  }
 windmill-queue = { path = "./windmill-queue" }
@@ -112,7 +118,9 @@ windmill-worker = { path = "./windmill-worker" }
 windmill-common = { path = "./windmill-common", default-features = false }
 windmill-audit = { path = "./windmill-audit" }
 windmill-git-sync = { path = "./windmill-git-sync" }
+windmill-autoscaling = { path = "./windmill-autoscaling" }
 windmill-indexer = {path = "./windmill-indexer"}
+windmill-macros = {path = "./windmill-macros"}
 windmill-parser = { path = "./parsers/windmill-parser" }
 windmill-parser-ts = { path = "./parsers/windmill-parser-ts" }
 windmill-parser-py = { path = "./parsers/windmill-parser-py" }
@@ -152,7 +160,7 @@ hex = "^0"
 sql-builder = "^3"
 argon2 = "^0"
 quick_cache = "^0"
-rand = "0.8.5"
+rand = "^0"
 rand_core = { version = "^0", features = ["std"] }
 magic-crypt = "^3"
 git-version = "^0"
@@ -164,7 +172,7 @@ urlencoding = "^2"
 url = "^2"
 async-oauth2 = "^0"
 reqwest = { version = "^0.12", features = ["json", "stream", "gzip"] }
-time = "0.3.16"
+time = "^0"
 serde_urlencoded = "^0"
 tokio-tar = "^0"
 tempfile = "^3"
@@ -172,21 +180,25 @@ tokio-util = { version = "^0", features = ["io"] }
 json-pointer = "^0"
 itertools = "^0"
 regex = "^1"
-deno_fetch = "0.187.0"
-deno_tls = "0.150.0"
-deno_console = "0.163.0"
-deno_url = "0.163.0"
-deno_webidl = "0.163.0"
-deno_web = "0.194.0"
-deno_net = "0.155.0"
-deno_core = "0.299.0"
-deno_ast = { version = "=0.40.0", features = ["transpiling"] }
+
+deno_fetch = "0.195.0"
+deno_tls = "0.158.0"
+deno_console = "0.171.0"
+deno_url = "0.171.0"
+deno_webidl = "0.171.0"
+deno_web = "0.202.0"
+deno_net = "0.163.0"
+deno_core = "0.311.0"
+deno_ast = { version = "=0.42.2", features = ["transpiling"] }
+
+swc_common = "=0.37.5"
+swc_ecma_parser = "=0.149.1"
+swc_ecma_ast = "=0.118.2"
+swc_ecma_visit = "=0.104.8"
+
 async-recursion = "^1"
-swc_common = "=0.33.26"
-swc_ecma_parser = "=0.144.3"
-swc_ecma_ast = "=0.113.7"
-swc_ecma_visit = "=0.99.1"
-base64 = "0.21.0"
+
+base64 = "^0"
 base32 = "^0"
 hmac = "0.12.1"
 sha2 = "0.10.6"
@@ -210,7 +222,7 @@ serde_derive = "1.0.147"
 const_format = { version = "0.2", features = ["rust_1_64", "rust_1_51"] }
 dyn-iter = "0.2.0"
 rsa = "0.7.2"
-async-stripe = { version = "0.34.1", features = [
+async-stripe = { version = "0.39.1", features = [
     "runtime-tokio-hyper",
     "checkout",
     "billing",
@@ -270,14 +282,16 @@ tikv-jemallocator = { version = "0.5" }
 tikv-jemalloc-sys  = { version = "^0.5" }
 tikv-jemalloc-ctl = { version = "^0.5" }
 
-# 0.1.12 broken (nested dependency of swc_common) 
-triomphe = "<0.1.12"
+triomphe = "^0"
 
 tantivy = "0.22.0"
 
+# Macro-related
+proc-macro2 = "1.0"
 pulldown-cmark = "0.9"
 toml = "0.7"
 syn = { version = "2.0.74", features = ["full"] }
 quote = "1.0.36"
 regex-lite = "0.1.6"
 yaml-rust = "0.4.5"
+tokio-tungstenite = { version = "0.24.0", features = ["native-tls"] }
\ No newline at end of file
diff --git a/backend/custom_migrations/bypassrls_1.sql b/backend/custom_migrations/bypassrls_1.sql
deleted file mode 100644
index 1918b26b0b..0000000000
--- a/backend/custom_migrations/bypassrls_1.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-CREATE POLICY admin_policy ON account TO windmill_admin USING (true);
-CREATE POLICY admin_policy ON app TO windmill_admin USING (true);
-CREATE POLICY admin_policy ON audit TO windmill_admin USING (true);
-CREATE POLICY admin_policy ON capture TO windmill_admin USING (true);
-CREATE POLICY admin_policy ON completed_job TO windmill_admin USING (true);
-CREATE POLICY admin_policy ON flow TO windmill_admin USING (true);
-CREATE POLICY admin_policy ON folder TO windmill_admin USING (true);
-CREATE POLICY admin_policy ON queue TO windmill_admin USING (true);
-CREATE POLICY admin_policy ON raw_app TO windmill_admin USING (true);
-CREATE POLICY admin_policy ON resource TO windmill_admin USING (true);
-CREATE POLICY admin_policy ON schedule TO windmill_admin USING (true);
-CREATE POLICY admin_policy ON script TO windmill_admin USING (true);
-CREATE POLICY admin_policy ON usr_to_group TO windmill_admin USING (true);
-CREATE POLICY admin_policy ON variable TO windmill_admin USING (true);
\ No newline at end of file
diff --git a/backend/custom_migrations/create_workspace_without_md5.sql b/backend/custom_migrations/create_workspace_without_md5.sql
new file mode 100644
index 0000000000..fc140d9e57
--- /dev/null
+++ b/backend/custom_migrations/create_workspace_without_md5.sql
@@ -0,0 +1,16 @@
+INSERT INTO workspace(id, name, owner) VALUES
+	('admins', 'Admins', 'admin@windmill.dev') ON CONFLICT DO NOTHING;
+
+INSERT INTO workspace_settings (workspace_id) VALUES
+	('admins') ON CONFLICT DO NOTHING;
+
+INSERT INTO workspace_key
+	(workspace_id, kind, key)
+	VALUES ('admins', 'cloud', array_to_string(
+    array(
+        SELECT chr( (trunc(65 + random() * 25)::int) + 
+                    CASE WHEN random() > 0.5 THEN 32 ELSE 0 END )  -- generates random uppercase/lowercase letters
+        FROM generate_series(1, 32) -- generates 32 characters
+    ),
+    ''
+)) ON CONFLICT DO NOTHING;
\ No newline at end of file
diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index 994e59747a..e7dd9365ec 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-3d37b6c31155265d8d026ae9d6ced0b433078f87
\ No newline at end of file
+f136a2f499e0fe7c10c54c79488851980d796eb2
\ No newline at end of file
diff --git a/backend/migrations/20240930183601_add_preprocessor_kind.down.sql b/backend/migrations/20240930183601_add_preprocessor_kind.down.sql
new file mode 100644
index 0000000000..d2f607c5b8
--- /dev/null
+++ b/backend/migrations/20240930183601_add_preprocessor_kind.down.sql
@@ -0,0 +1 @@
+-- Add down migration script here
diff --git a/backend/migrations/20240930183601_add_preprocessor_kind.up.sql b/backend/migrations/20240930183601_add_preprocessor_kind.up.sql
new file mode 100644
index 0000000000..d70dc181aa
--- /dev/null
+++ b/backend/migrations/20240930183601_add_preprocessor_kind.up.sql
@@ -0,0 +1,2 @@
+-- Add up migration script here
+ALTER TYPE SCRIPT_KIND ADD VALUE IF NOT EXISTS 'preprocessor';
\ No newline at end of file
diff --git a/backend/migrations/20241002163207_add_websocket_triggers.down.sql b/backend/migrations/20241002163207_add_websocket_triggers.down.sql
new file mode 100644
index 0000000000..bb579574a8
--- /dev/null
+++ b/backend/migrations/20241002163207_add_websocket_triggers.down.sql
@@ -0,0 +1,2 @@
+-- Add down migration script here
+DROP TABLE websocket_trigger;
\ No newline at end of file
diff --git a/backend/migrations/20241002163207_add_websocket_triggers.up.sql b/backend/migrations/20241002163207_add_websocket_triggers.up.sql
new file mode 100644
index 0000000000..4d6b44cb8f
--- /dev/null
+++ b/backend/migrations/20241002163207_add_websocket_triggers.up.sql
@@ -0,0 +1,67 @@
+-- Add up migration script here
+
+CREATE TABLE websocket_trigger (
+  path VARCHAR(255) NOT NULL,
+  url VARCHAR(255) NOT NULL,
+  script_path VARCHAR(255) NOT NULL,
+  is_flow BOOLEAN NOT NULL,
+  workspace_id VARCHAR(50) NOT NULL,
+  edited_by VARCHAR(50) NOT NULL,
+  email VARCHAR(255) NOT NULL,
+  edited_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+  extra_perms JSONB NOT NULL DEFAULT '{}',
+  server_id VARCHAR(50) NULL,
+  last_server_ping TIMESTAMPTZ NULL,
+  error TEXT NULL,
+  enabled BOOLEAN NOT NULL,
+  filters JSONB[] NOT NULL DEFAULT '{}',
+  PRIMARY KEY (path, workspace_id)
+);
+
+GRANT ALL ON websocket_trigger TO windmill_user;
+GRANT ALL ON websocket_trigger TO windmill_admin;
+
+ALTER TABLE websocket_trigger ENABLE ROW LEVEL SECURITY;
+
+CREATE POLICY admin_policy ON websocket_trigger FOR ALL TO windmill_admin USING (true);
+
+CREATE POLICY see_folder_extra_perms_user_select ON websocket_trigger FOR SELECT TO windmill_user
+USING (SPLIT_PART(websocket_trigger.path, '/', 1) = 'f' AND SPLIT_PART(websocket_trigger.path, '/', 2) = any(regexp_split_to_array(current_setting('session.folders_read'), ',')::text[]));
+CREATE POLICY see_folder_extra_perms_user_insert ON websocket_trigger FOR INSERT TO windmill_user
+WITH CHECK (SPLIT_PART(websocket_trigger.path, '/', 1) = 'f' AND SPLIT_PART(websocket_trigger.path, '/', 2) = any(regexp_split_to_array(current_setting('session.folders_write'), ',')::text[]));
+CREATE POLICY see_folder_extra_perms_user_update ON websocket_trigger FOR UPDATE TO windmill_user
+USING (SPLIT_PART(websocket_trigger.path, '/', 1) = 'f' AND SPLIT_PART(websocket_trigger.path, '/', 2) = any(regexp_split_to_array(current_setting('session.folders_write'), ',')::text[]));
+CREATE POLICY see_folder_extra_perms_user_delete ON websocket_trigger FOR DELETE TO windmill_user
+USING (SPLIT_PART(websocket_trigger.path, '/', 1) = 'f' AND SPLIT_PART(websocket_trigger.path, '/', 2) = any(regexp_split_to_array(current_setting('session.folders_write'), ',')::text[]));
+
+CREATE POLICY see_own ON websocket_trigger FOR ALL TO windmill_user
+USING (SPLIT_PART(websocket_trigger.path, '/', 1) = 'u' AND SPLIT_PART(websocket_trigger.path, '/', 2) = current_setting('session.user'));
+CREATE POLICY see_member ON websocket_trigger FOR ALL TO windmill_user
+USING (SPLIT_PART(websocket_trigger.path, '/', 1) = 'g' AND SPLIT_PART(websocket_trigger.path, '/', 2) = any(regexp_split_to_array(current_setting('session.groups'), ',')::text[]));
+
+CREATE POLICY see_extra_perms_user_select ON websocket_trigger FOR SELECT TO windmill_user
+USING (extra_perms ? CONCAT('u/', current_setting('session.user')));
+CREATE POLICY see_extra_perms_user_insert ON websocket_trigger FOR INSERT TO windmill_user
+WITH CHECK ((extra_perms ->> CONCAT('u/', current_setting('session.user')))::boolean);
+CREATE POLICY see_extra_perms_user_update ON websocket_trigger FOR UPDATE TO windmill_user
+USING ((extra_perms ->> CONCAT('u/', current_setting('session.user')))::boolean);
+CREATE POLICY see_extra_perms_user_delete ON websocket_trigger FOR DELETE TO windmill_user
+USING ((extra_perms ->> CONCAT('u/', current_setting('session.user')))::boolean);
+
+CREATE POLICY see_extra_perms_groups_select ON websocket_trigger FOR SELECT TO windmill_user
+USING (extra_perms ?| regexp_split_to_array(current_setting('session.pgroups'), ',')::text[]);
+CREATE POLICY see_extra_perms_groups_insert ON websocket_trigger FOR INSERT TO windmill_user
+WITH CHECK (exists(
+    SELECT key, value FROM jsonb_each_text(extra_perms) 
+    WHERE SPLIT_PART(key, '/', 1) = 'g' AND key = ANY(regexp_split_to_array(current_setting('session.pgroups'), ',')::text[])
+    AND value::boolean));
+CREATE POLICY see_extra_perms_groups_update ON websocket_trigger FOR UPDATE TO windmill_user
+USING (exists(
+    SELECT key, value FROM jsonb_each_text(extra_perms) 
+    WHERE SPLIT_PART(key, '/', 1) = 'g' AND key = ANY(regexp_split_to_array(current_setting('session.pgroups'), ',')::text[])
+    AND value::boolean));
+CREATE POLICY see_extra_perms_groups_delete ON websocket_trigger FOR DELETE  TO windmill_user
+USING (exists(
+    SELECT key, value FROM jsonb_each_text(extra_perms) 
+    WHERE SPLIT_PART(key, '/', 1) = 'g' AND key = ANY(regexp_split_to_array(current_setting('session.pgroups'), ',')::text[])
+    AND value::boolean));
\ No newline at end of file
diff --git a/backend/migrations/20241006144414_admin_policy.down.sql b/backend/migrations/20241006144414_admin_policy.down.sql
new file mode 100644
index 0000000000..d2f607c5b8
--- /dev/null
+++ b/backend/migrations/20241006144414_admin_policy.down.sql
@@ -0,0 +1 @@
+-- Add down migration script here
diff --git a/backend/migrations/20241006144414_admin_policy.up.sql b/backend/migrations/20241006144414_admin_policy.up.sql
new file mode 100644
index 0000000000..e6a3f3807e
--- /dev/null
+++ b/backend/migrations/20241006144414_admin_policy.up.sql
@@ -0,0 +1,24 @@
+-- Add up migration script here
+DO
+$$
+DECLARE
+    tbl_name text;
+   	policy_exists boolean;
+    tbl_names text[] := ARRAY['account', 'app', 'audit', 'capture', 'completed_job', 'flow', 'folder', 'http_trigger', 'queue', 'raw_app', 'resource', 'schedule', 'script', 'usr_to_group', 'variable'];
+BEGIN
+    FOR tbl_name IN SELECT unnest(tbl_names)
+    LOOP
+        SELECT EXISTS (
+            SELECT 1 
+            FROM pg_policies 
+            WHERE schemaname = 'public'
+              AND tablename = tbl_name
+              AND policyname = 'admin_policy'
+        ) INTO policy_exists;
+
+       	IF NOT policy_exists THEN
+        	EXECUTE format('CREATE POLICY admin_policy ON %I TO windmill_admin USING (true);', tbl_name);
+       	END IF;
+    END LOOP;
+END;
+$$;
\ No newline at end of file
diff --git a/backend/migrations/20241008155800_concurrency_lock_table.down.sql b/backend/migrations/20241008155800_concurrency_lock_table.down.sql
new file mode 100644
index 0000000000..2c7ec9a8f8
--- /dev/null
+++ b/backend/migrations/20241008155800_concurrency_lock_table.down.sql
@@ -0,0 +1,2 @@
+-- Drop the alert_locks table
+DROP TABLE IF EXISTS concurrency_locks;
diff --git a/backend/migrations/20241008155800_concurrency_lock_table.up.sql b/backend/migrations/20241008155800_concurrency_lock_table.up.sql
new file mode 100644
index 0000000000..8449de152a
--- /dev/null
+++ b/backend/migrations/20241008155800_concurrency_lock_table.up.sql
@@ -0,0 +1,6 @@
+-- Create the alert_locks table
+CREATE TABLE concurrency_locks (
+    id VARCHAR PRIMARY KEY,
+    last_locked_at TIMESTAMP NOT NULL,
+    owner VARCHAR NULL
+);
diff --git a/backend/migrations/20241024125924_autoscaling.down.sql b/backend/migrations/20241024125924_autoscaling.down.sql
new file mode 100644
index 0000000000..8f536a7553
--- /dev/null
+++ b/backend/migrations/20241024125924_autoscaling.down.sql
@@ -0,0 +1,3 @@
+-- Add down migration script here
+DROP TABLE autoscaling_event;
+DROP TYPE autoscaling_event_type;
diff --git a/backend/migrations/20241024125924_autoscaling.up.sql b/backend/migrations/20241024125924_autoscaling.up.sql
new file mode 100644
index 0000000000..fa3b161d56
--- /dev/null
+++ b/backend/migrations/20241024125924_autoscaling.up.sql
@@ -0,0 +1,13 @@
+-- Add up migration script here
+CREATE TYPE AUTOSCALING_EVENT_TYPE AS ENUM ('full_scaleout', 'scalein', 'scaleout');
+
+CREATE TABLE autoscaling_event (
+    id SERIAL PRIMARY KEY,
+    worker_group TEXT NOT NULL,
+    event_type AUTOSCALING_EVENT_TYPE NOT NULL,
+    desired_workers INTEGER NOT NULL,
+    applied_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    reason TEXT
+);
+
+CREATE INDEX autoscaling_event_worker_group_idx ON autoscaling_event (worker_group, applied_at);
\ No newline at end of file
diff --git a/backend/oauth_connect.json b/backend/oauth_connect.json
index 034aece2f4..994d9999fd 100644
--- a/backend/oauth_connect.json
+++ b/backend/oauth_connect.json
@@ -152,5 +152,24 @@
       "vismanet_erp_interactive_api:read",
       "vismanet_erp_interactive_api:update"
     ]
+  },
+  "spotify": {
+    "auth_url": "https://accounts.spotify.com/authorize",
+    "token_url": "https://accounts.spotify.com/api/token",
+    "scopes": [
+      "user-read-playback-state",
+      "user-modify-playback-state",
+      "user-read-currently-playing",
+      "playlist-read-private",
+      "playlist-read-collaborative",
+      "playlist-modify-private",
+      "playlist-modify-public",
+      "user-follow-read",
+      "user-read-playback-position",
+      "user-read-recently-played",
+      "user-top-read",
+      "user-library-modify",
+      "user-library-read"
+    ]
   }
 }
\ No newline at end of file
diff --git a/backend/parsers/windmill-parser-py-imports/src/lib.rs b/backend/parsers/windmill-parser-py-imports/src/lib.rs
index 34487e04ef..841a763ec2 100644
--- a/backend/parsers/windmill-parser-py-imports/src/lib.rs
+++ b/backend/parsers/windmill-parser-py-imports/src/lib.rs
@@ -61,6 +61,7 @@ static PYTHON_IMPORTS_REPLACEMENT: phf::Map<&'static str, &'static str> = phf_ma
     "opensearchpy" => "opensearch-py",
     "lokalise" => "python-lokalise-api",
     "msgraph" => "msgraph-sdk",
+    "pythonjsonlogger" => "python-json-logger",
 };
 
 fn replace_import(x: String) -> String {
diff --git a/backend/parsers/windmill-parser-ts/src/lib.rs b/backend/parsers/windmill-parser-ts/src/lib.rs
index 742a840802..d68b2eeb6e 100644
--- a/backend/parsers/windmill-parser-ts/src/lib.rs
+++ b/backend/parsers/windmill-parser-ts/src/lib.rs
@@ -15,13 +15,13 @@ use windmill_parser::{
 
 use swc_common::{sync::Lrc, FileName, SourceMap, SourceMapper, Span, Spanned};
 use swc_ecma_ast::{
-    ArrayLit, AssignPat, BigInt, BindingIdent, Bool, Decl, ExportDecl, Expr, FnDecl, Ident, Lit,
-    MemberExpr, MemberProp, ModuleDecl, ModuleItem, Number, ObjectLit, ObjectPat, Param, Pat, Str,
-    TsArrayType, TsEntityName, TsKeywordType, TsKeywordTypeKind, TsLit, TsLitType, TsOptionalType,
-    TsParenthesizedType, TsPropertySignature, TsType, TsTypeAnn, TsTypeElement, TsTypeLit,
-    TsTypeRef, TsUnionOrIntersectionType, TsUnionType,
+    ArrayLit, AssignPat, BigInt, BindingIdent, Bool, Decl, ExportDecl, Expr, FnDecl, Ident,
+    IdentName, Lit, MemberExpr, MemberProp, ModuleDecl, ModuleItem, Number, ObjectLit, ObjectPat,
+    Param, Pat, Str, TsArrayType, TsEntityName, TsKeywordType, TsKeywordTypeKind, TsLit, TsLitType,
+    TsOptionalType, TsParenthesizedType, TsPropertySignature, TsType, TsTypeAnn, TsTypeElement,
+    TsTypeLit, TsTypeRef, TsUnionOrIntersectionType, TsUnionType,
 };
-use swc_ecma_parser::{lexer::Lexer, EsConfig, Parser, StringInput, Syntax, TsConfig};
+use swc_ecma_parser::{lexer::Lexer, EsSyntax, Parser, StringInput, Syntax, TsSyntax};
 
 use regex::Regex;
 #[cfg(target_arch = "wasm32")]
@@ -48,9 +48,9 @@ impl Visit for ImportsFinder {
 
 pub fn parse_expr_for_imports(code: &str) -> anyhow::Result<Vec<String>> {
     let cm: Lrc<SourceMap> = Default::default();
-    let fm = cm.new_source_file(FileName::Custom("main.d.ts".into()), code.into());
+    let fm = cm.new_source_file(FileName::Custom("main.d.ts".into()).into(), code.into());
     let lexer = Lexer::new(
-        Syntax::Typescript(TsConfig::default()),
+        Syntax::Typescript(TsSyntax::default()),
         // EsVersion defaults to es5
         Default::default(),
         StringInput::from(&*fm),
@@ -69,7 +69,7 @@ pub fn parse_expr_for_imports(code: &str) -> anyhow::Result<Vec<String>> {
     })?;
 
     let mut visitor = ImportsFinder { imports: HashSet::new() };
-    swc_ecma_visit::visit_module(&mut visitor, &expr);
+    visitor.visit_module(&expr);
 
     Ok(visitor.imports.into_iter().collect())
 }
@@ -87,7 +87,7 @@ impl Visit for OutputFinder {
             c.visit_with(self);
         }
         match m {
-            MemberExpr { obj, prop: MemberProp::Ident(Ident { sym, .. }), .. } => {
+            MemberExpr { obj, prop: MemberProp::Ident(IdentName { sym, .. }), .. } => {
                 match *obj.to_owned() {
                     Expr::Ident(Ident { sym: sym_i, .. }) => {
                         self.idents.insert((sym_i.to_string(), sym.to_string()));
@@ -102,10 +102,10 @@ impl Visit for OutputFinder {
 
 pub fn parse_expr_for_ids(code: &str) -> anyhow::Result<Vec<(String, String)>> {
     let cm: Lrc<SourceMap> = Default::default();
-    let fm = cm.new_source_file(FileName::Custom("main.ts".into()), code.into());
+    let fm = cm.new_source_file(FileName::Custom("main.ts".into()).into(), code.into());
     let lexer = Lexer::new(
         // We want to parse ecmascript
-        Syntax::Es(EsConfig { jsx: false, ..Default::default() }),
+        Syntax::Es(EsSyntax { jsx: false, ..Default::default() }),
         // EsVersion defaults to es5
         Default::default(),
         StringInput::from(&*fm),
@@ -124,7 +124,7 @@ pub fn parse_expr_for_ids(code: &str) -> anyhow::Result<Vec<(String, String)>> {
     })?;
 
     let mut visitor = OutputFinder { idents: HashSet::new() };
-    swc_ecma_visit::visit_module(&mut visitor, &expr);
+    visitor.visit_module(&expr);
 
     Ok(visitor.idents.into_iter().collect())
 }
@@ -135,10 +135,10 @@ pub fn parse_deno_signature(
     main_override: Option<String>,
 ) -> anyhow::Result<MainArgSignature> {
     let cm: Lrc<SourceMap> = Default::default();
-    let fm = cm.new_source_file(FileName::Custom("main.ts".into()), code.into());
+    let fm = cm.new_source_file(FileName::Custom("main.ts".into()).into(), code.into());
     let lexer = Lexer::new(
         // We want to parse ecmascript
-        Syntax::Typescript(TsConfig::default()),
+        Syntax::Typescript(TsSyntax::default()),
         // EsVersion defaults to es5
         Default::default(),
         StringInput::from(&*fm),
diff --git a/backend/parsers/windmill-parser-yaml/src/lib.rs b/backend/parsers/windmill-parser-yaml/src/lib.rs
index 151d6eb562..8c29c97b7e 100644
--- a/backend/parsers/windmill-parser-yaml/src/lib.rs
+++ b/backend/parsers/windmill-parser-yaml/src/lib.rs
@@ -188,9 +188,15 @@ pub struct AnsiblePlaybookOptions {
     pub force_handlers: Option<()>,
 }
 
+#[derive(Debug, Clone)]
+pub enum ResourceOrVariablePath {
+    Resource(String),
+    Variable(String),
+}
+
 #[derive(Debug, Clone)]
 pub struct FileResource {
-    pub resource_path: String,
+    pub resource_path: ResourceOrVariablePath,
     pub target_path: String,
 }
 
@@ -309,7 +315,7 @@ pub fn parse_ansible_reqs(
                         }
                     }
                 }
-                Yaml::String(key) if key == "file_resources" => {
+                Yaml::String(key) if key == "files" || key == "file_resources" => {
                     if let Yaml::Array(file_resources) = value {
                         let resources: anyhow::Result<Vec<FileResource>> =
                             file_resources.iter().map(parse_file_resource).collect();
@@ -399,15 +405,11 @@ fn parse_ansible_options(opts: &Vec<Yaml>) -> AnsiblePlaybookOptions {
                             if c > 0 && c <= 6 {
                                 ret.verbosity = Some("v".repeat(c.min(6)));
                             }
-
                         }
                     }
-                    _ => ()
-
+                    _ => (),
                 }
             }
-
-
         }
     }
 
@@ -422,10 +424,10 @@ fn count_consecutive_vs(s: &str) -> usize {
         if c == 'v' {
             current_count += 1;
             if current_count == 6 {
-                return 6;  // Stop early if we reach 6
+                return 6; // Stop early if we reach 6
             }
         } else {
-            current_count = 0;  // Reset count if the character is not 'v'
+            current_count = 0; // Reset count if the character is not 'v'
         }
         max_count = max_count.max(current_count);
     }
@@ -444,7 +446,24 @@ fn parse_file_resource(yaml: &Yaml) -> anyhow::Result<FileResource> {
                     "No `target` provided for file resource {}. Please input a target relative path for the ansible playbook to see this file.",
                     resource_path
                 ))?;
-            return Ok(FileResource { resource_path: resource_path.clone(), target_path });
+            return Ok(FileResource {
+                resource_path: ResourceOrVariablePath::Resource(resource_path.clone()),
+                target_path,
+            });
+        }
+        if let Some(Yaml::String(resource_path)) = f.get(&Yaml::String("variable".to_string())) {
+            let target_path = f
+                .get(&Yaml::String("target".to_string()))
+                .and_then(|x| x.as_str())
+                .map(|x| x.to_string())
+                .ok_or(anyhow!(
+                    "No `target` provided for file resource {}. Please input a target relative path for the ansible playbook to see this file.",
+                    resource_path
+                ))?;
+            return Ok(FileResource {
+                resource_path: ResourceOrVariablePath::Variable(resource_path.clone()),
+                target_path,
+            });
         }
         return Err(anyhow!(
             "File resource should have a `resource` field, linking to a text file resource"
diff --git a/backend/src/ee.rs b/backend/src/ee.rs
index ef944b984b..91816cd1ba 100644
--- a/backend/src/ee.rs
+++ b/backend/src/ee.rs
@@ -1,16 +1,8 @@
-use anyhow::anyhow;
-#[cfg(feature = "enterprise")]
-use windmill_common::error::{Error, Result};
-
-pub async fn set_license_key(_license_key: String) -> anyhow::Result<()> {
+pub async fn set_license_key(_license_key: String) -> () {
     // Implementation is not open source
-    Err(anyhow!("License cannot be set in Windmill CE"))
 }
 
 #[cfg(feature = "enterprise")]
-pub async fn verify_license_key() -> Result<()> {
+pub async fn verify_license_key() -> () {
     // Implementation is not open source
-    Err(Error::InternalErr(
-        "License always invalid in Windmill CE".to_string(),
-    ))
 }
diff --git a/backend/src/main.rs b/backend/src/main.rs
index aa6993cf92..11d12f9dab 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -27,7 +27,7 @@ use uuid::Uuid;
 use windmill_api::HTTP_CLIENT;
 
 #[cfg(feature = "enterprise")]
-use windmill_common::ee::schedule_key_renewal;
+use windmill_common::ee::{maybe_renew_license_key_on_start, LICENSE_KEY_ID, LICENSE_KEY_VALID};
 
 use windmill_common::{
     global_settings::{
@@ -67,7 +67,7 @@ use windmill_worker::{
     get_hub_script_content_and_requirements, BUN_BUNDLE_CACHE_DIR, BUN_CACHE_DIR,
     BUN_DEPSTAR_CACHE_DIR, DENO_CACHE_DIR, DENO_CACHE_DIR_DEPS, DENO_CACHE_DIR_NPM,
     GO_BIN_CACHE_DIR, GO_CACHE_DIR, LOCK_CACHE_DIR, PIP_CACHE_DIR, POWERSHELL_CACHE_DIR,
-    RUST_CACHE_DIR, TAR_PIP_CACHE_DIR, TMP_LOGS_DIR,
+    RUST_CACHE_DIR, TAR_PIP_CACHE_DIR, TMP_LOGS_DIR, UV_CACHE_DIR,
 };
 
 use crate::monitor::{
@@ -92,9 +92,6 @@ const DEFAULT_SERVER_BIND_ADDR: Ipv4Addr = Ipv4Addr::new(0, 0, 0, 0);
 mod ee;
 mod monitor;
 
-#[cfg(feature = "pg_embed")]
-mod pg_embed;
-
 #[inline(always)]
 fn create_and_run_current_thread_inner<F, R>(future: F) -> R
 where
@@ -118,7 +115,8 @@ where
 }
 
 pub fn main() -> anyhow::Result<()> {
-    deno_core::JsRuntime::init_platform(None);
+    #[cfg(feature = "deno_core")]
+    deno_core::JsRuntime::init_platform(None, false);
     create_and_run_current_thread_inner(windmill_main())
 }
 
@@ -137,6 +135,7 @@ async fn cache_hub_scripts(file_path: Option<String>) -> anyhow::Result<()> {
     })?;
 
     create_dir_all(HUB_CACHE_DIR).await?;
+    create_dir_all(BUN_BUNDLE_CACHE_DIR).await?;
 
     for path in paths.values() {
         tracing::info!("Caching hub script at {path}");
@@ -168,7 +167,7 @@ async fn cache_hub_scripts(file_path: Option<String>) -> anyhow::Result<()> {
             create_dir_all(&job_dir).await?;
             if let Some(lockfile) = res.lockfile {
                 let _ = windmill_worker::prepare_job_dir(&lockfile, &job_dir).await?;
-
+                let envs = windmill_worker::get_common_bun_proc_envs(None).await;
                 let _ = windmill_worker::install_bun_lockfile(
                     &mut 0,
                     &mut None,
@@ -177,11 +176,31 @@ async fn cache_hub_scripts(file_path: Option<String>) -> anyhow::Result<()> {
                     None,
                     &job_dir,
                     "cache_init",
-                    windmill_worker::get_common_bun_proc_envs(None).await,
+                    envs.clone(),
                     false,
                     &mut None,
                 )
                 .await?;
+
+                let _ = windmill_common::worker::write_file(&job_dir, "main.js", &res.content)?;
+
+                if let Err(e) = windmill_worker::prebundle_bun_script(
+                    &res.content,
+                    Some(lockfile),
+                    &path,
+                    &job_id,
+                    "admins",
+                    None,
+                    &job_dir,
+                    "",
+                    "cache_init",
+                    "",
+                    &mut None,
+                )
+                .await
+                {
+                    panic!("Error prebundling bun script: {e:#}");
+                }
             } else {
                 tracing::warn!("No lockfile found for bun script {path}, skipping...");
             }
@@ -265,7 +284,8 @@ async fn windmill_main() -> anyhow::Result<()> {
                 tracing::info!("Binary is in 'indexer' mode");
                 #[cfg(not(feature = "tantivy"))]
                 {
-                    panic!("Indexer mode requires the tantivy feature flag");
+                    tracing::error!("Cannot start the indexer because tantivy is not included in this binary/image. Make sure you are using the EE image if you want to access the full text search features.");
+                    panic!("Indexer mode requires compiling with the tantivy feature flag.");
                 }
                 #[cfg(feature = "tantivy")]
                 Mode::Indexer
@@ -288,7 +308,8 @@ async fn windmill_main() -> anyhow::Result<()> {
             Mode::Standalone
         });
 
-    let num_workers = if mode == Mode::Server || mode == Mode::Indexer {
+    #[allow(unused_mut)]
+    let mut num_workers = if mode == Mode::Server || mode == Mode::Indexer {
         0
     } else {
         std::env::var("NUM_WORKERS")
@@ -341,14 +362,6 @@ async fn windmill_main() -> anyhow::Result<()> {
         config
     });
 
-    #[cfg(feature = "pg_embed")]
-    let _pg = {
-        let (db_url, pg) = pg_embed::start().await.expect("pg embed");
-        tracing::info!("Use embedded pg: {db_url}");
-        std::env::set_var("DATABASE_URL", db_url);
-        pg
-    };
-
     tracing::info!("Connecting to database...");
     let db = windmill_common::connect_db(server_mode, indexer_mode).await?;
     tracing::info!("Database connected");
@@ -373,8 +386,16 @@ async fn windmill_main() -> anyhow::Result<()> {
     let is_agent = mode == Mode::Agent;
 
     if !is_agent {
-        // migration code to avoid break
-        windmill_api::migrate_db(&db).await?;
+        let skip_migration = std::env::var("SKIP_MIGRATION")
+            .map(|val| val == "true")
+            .unwrap_or(false);
+
+        if !skip_migration {
+            // migration code to avoid break
+            windmill_api::migrate_db(&db).await?;
+        } else {
+            tracing::info!("SKIP_MIGRATION set, skipping db migration...")
+        }
     }
 
     let (killpill_tx, mut killpill_rx) = tokio::sync::broadcast::channel::<()>(2);
@@ -403,6 +424,50 @@ Windmill Community Edition {GIT_VERSION}
 
     display_config(&ENV_SETTINGS);
 
+    if let Err(e) = reload_base_url_setting(&db).await {
+        tracing::error!("Error loading base url: {:?}", e)
+    }
+
+    if let Err(e) = reload_critical_error_channels_setting(&db).await {
+        tracing::error!("Could loading critical error emails setting: {:?}", e);
+    }
+
+    #[cfg(feature = "enterprise")]
+    {
+        // load the license key and check if it's valid
+        // if not valid and not server mode just quit
+        // if not expired and server mode then force renewal
+        // if key still invalid and num_workers > 0, set to 0
+        if let Err(err) = reload_license_key(&db).await {
+            tracing::error!("Failed to reload license key: {err:#}");
+        }
+        let valid_key = *LICENSE_KEY_VALID.read().await;
+        if !valid_key && !server_mode {
+            panic!("Invalid license key, workers require a valid license key");
+        }
+        if server_mode {
+            // only force renewal if invalid but not empty (= expired)
+            let renewed_now = maybe_renew_license_key_on_start(
+                &HTTP_CLIENT,
+                &db,
+                !valid_key && !LICENSE_KEY_ID.read().await.is_empty(),
+            )
+            .await;
+            if renewed_now {
+                if let Err(err) = reload_license_key(&db).await {
+                    tracing::error!("Failed to reload license key: {err:#}");
+                }
+            }
+            if num_workers > 0 {
+                let valid_key = *LICENSE_KEY_VALID.read().await;
+                if !valid_key {
+                    tracing::warn!("License key invalid, setting num_workers to 0");
+                    num_workers = 0;
+                }
+            }
+        }
+    }
+
     let worker_mode = num_workers > 0;
 
     if server_mode || worker_mode || indexer_mode {
@@ -429,7 +494,16 @@ Windmill Community Edition {GIT_VERSION}
 
         initial_load(&db, killpill_tx.clone(), worker_mode, server_mode, is_agent).await;
 
-        monitor_db(&db, &base_internal_url, rsmq.clone(), server_mode, true).await;
+        monitor_db(
+            &db,
+            &base_internal_url,
+            rsmq.clone(),
+            server_mode,
+            worker_mode,
+            true,
+            killpill_tx.clone(),
+        )
+        .await;
 
         monitor_pool(&db).await;
 
@@ -457,7 +531,7 @@ Windmill Community Edition {GIT_VERSION}
 
         #[cfg(feature = "tantivy")]
         let (index_reader, index_writer) = if should_index_jobs {
-            let (r, w) = windmill_indexer::indexer_ee::init_index().await?;
+            let (r, w) = windmill_indexer::indexer_ee::init_index(&db).await?;
             (Some(r), Some(w))
         } else {
             (None, None)
@@ -529,8 +603,11 @@ Windmill Community Edition {GIT_VERSION}
                     rx.recv().await?;
                 }
             }
-            tracing::info!("Starting phase 2 of shutdown");
-            killpill_phase2_tx.send(())?;
+            if killpill_phase2_tx.receiver_count() > 0 {
+                tracing::info!("Starting phase 2 of shutdown");
+                killpill_phase2_tx.send(())?;
+                tracing::info!("Phase 2 of shutdown completed");
+            }
             Ok(()) as anyhow::Result<()>
         };
 
@@ -556,7 +633,9 @@ Windmill Community Edition {GIT_VERSION}
                                 &base_internal_url,
                                 rsmq.clone(),
                                 server_mode,
-                                false
+                                worker_mode,
+                                false,
+                                tx.clone(),
                             )
                             .await;
                         },
@@ -599,7 +678,15 @@ Windmill Community Edition {GIT_VERSION}
                                                 },
                                                 LICENSE_KEY_SETTING => {
                                                     if let Err(e) = reload_license_key(&db).await {
-                                                        tracing::error!(error = %e, "Could not reload license key setting");
+                                                        tracing::error!("Failed to reload license key: {e:#}");
+                                                    }
+                                                    #[cfg(feature = "enterprise")]
+                                                    if worker_mode {
+                                                        let valid_key = *LICENSE_KEY_VALID.read().await;
+                                                        if !valid_key {
+                                                            tracing::error!("Invalid license key, exiting...");
+                                                            tx.send(()).expect("send");
+                                                        }
                                                     }
                                                 },
                                                 DEFAULT_TAGS_PER_WORKSPACE_SETTING => {
@@ -745,14 +832,8 @@ Windmill Community Edition {GIT_VERSION}
             Ok(()) as anyhow::Result<()>
         };
 
-        let instance_name = rd_string(8);
-        if mode == Mode::Server || mode == Mode::Standalone {
-            schedule_stats(instance_name, &db, &HTTP_CLIENT).await;
-        }
-
-        #[cfg(feature = "enterprise")]
-        if mode == Mode::Server || mode == Mode::Standalone {
-            schedule_key_renewal(&HTTP_CLIENT, &db).await;
+        if server_mode {
+            schedule_stats(&db, &HTTP_CLIENT).await;
         }
 
         futures::try_join!(
@@ -875,6 +956,7 @@ pub async fn run_workers<R: rsmq_async::RsmqConnection + Send + Sync + Clone + '
         LOCK_CACHE_DIR,
         TMP_LOGS_DIR,
         PIP_CACHE_DIR,
+        UV_CACHE_DIR,
         TAR_PIP_CACHE_DIR,
         DENO_CACHE_DIR,
         DENO_CACHE_DIR_DEPS,
diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs
index 92f69a0d64..0618cfd8d8 100644
--- a/backend/src/monitor.rs
+++ b/backend/src/monitor.rs
@@ -27,7 +27,7 @@ use windmill_api::{
     DEFAULT_BODY_LIMIT, IS_SECURE, OAUTH_CLIENTS, REQUEST_SIZE_LIMIT, SAML_METADATA, SCIM_TOKEN,
 };
 #[cfg(feature = "enterprise")]
-use windmill_common::ee::worker_groups_alerts;
+use windmill_common::ee::{jobs_waiting_alerts, worker_groups_alerts, LICENSE_KEY_VALID};
 use windmill_common::{
     auth::JWT_SECRET,
     ee::CriticalErrorChannel,
@@ -76,9 +76,6 @@ use windmill_common::global_settings::OBJECT_STORE_CACHE_CONFIG_SETTING;
 #[cfg(feature = "enterprise")]
 use crate::ee::verify_license_key;
 
-#[cfg(feature = "enterprise")]
-use windmill_common::ee::LICENSE_KEY_VALID;
-
 use crate::ee::set_license_key;
 
 lazy_static::lazy_static! {
@@ -152,18 +149,10 @@ pub async fn initial_load(
         tracing::error!("Error reloading custom tags: {:?}", e)
     }
 
-    if let Err(e) = reload_base_url_setting(db).await {
-        tracing::error!("Error reloading base url: {:?}", e)
-    }
-
     if let Err(e) = reload_hub_base_url_setting(db, server_mode).await {
         tracing::error!("Error reloading hub base url: {:?}", e)
     }
 
-    if let Err(e) = reload_critical_error_channels_setting(&db).await {
-        tracing::error!("Could not reload critical error emails setting: {:?}", e);
-    }
-
     if let Err(e) = reload_jwt_secret_setting(&db).await {
         tracing::error!("Could not reload jwt secret setting: {:?}", e);
     }
@@ -182,11 +171,6 @@ pub async fn initial_load(
         reload_scim_token_setting(&db).await;
     }
 
-    #[cfg(feature = "enterprise")]
-    if let Err(e) = reload_license_key(&db).await {
-        tracing::error!("Error reloading license key: {:?}", e)
-    }
-
     if worker_mode {
         reload_extra_pip_index_url_setting(&db).await;
         reload_pip_index_url_setting(&db).await;
@@ -854,8 +838,10 @@ pub async fn reload_request_size(db: &DB) {
     }
 }
 
-pub async fn reload_license_key(db: &DB) -> error::Result<()> {
-    let q = load_value_from_global_settings(db, LICENSE_KEY_SETTING).await?;
+pub async fn reload_license_key(db: &DB) -> anyhow::Result<()> {
+    let q = load_value_from_global_settings(db, LICENSE_KEY_SETTING)
+        .await
+        .map_err(|err| anyhow::anyhow!("Error reloading license key: {}", err.to_string()))?;
 
     let mut value = std::env::var("LICENSE_KEY")
         .ok()
@@ -873,9 +859,7 @@ pub async fn reload_license_key(db: &DB) -> error::Result<()> {
             tracing::error!("Could not parse LICENSE_KEY found: {:#?}", &q);
         }
     };
-
-    set_license_key(value).await?;
-
+    set_license_key(value).await;
     Ok(())
 }
 
@@ -1014,7 +998,9 @@ pub async fn monitor_db(
     base_internal_url: &str,
     rsmq: Option<MultiplexedRsmq>,
     server_mode: bool,
+    _worker_mode: bool,
     initial_load: bool,
+    _killpill_tx: tokio::sync::broadcast::Sender<()>,
 ) {
     let zombie_jobs_f = async {
         if server_mode && !initial_load {
@@ -1035,15 +1021,14 @@ pub async fn monitor_db(
 
     let verify_license_key_f = async {
         #[cfg(feature = "enterprise")]
-        if let Err(e) = verify_license_key().await {
-            tracing::error!("Error verifying license key: {:?}", e);
-            let mut l = LICENSE_KEY_VALID.write().await;
-            *l = false;
-        } else {
-            let is_valid = LICENSE_KEY_VALID.read().await.clone();
-            if !is_valid {
-                let mut l = LICENSE_KEY_VALID.write().await;
-                *l = true;
+        if !initial_load {
+            verify_license_key().await;
+            if _worker_mode {
+                let valid_key = *LICENSE_KEY_VALID.read().await;
+                if !valid_key {
+                    tracing::error!("Invalid license key, exiting...");
+                    _killpill_tx.send(()).expect("send");
+                }
             }
         }
     };
@@ -1061,12 +1046,30 @@ pub async fn monitor_db(
         }
     };
 
+    let jobs_waiting_alerts_f = async {
+        #[cfg(feature = "enterprise")]
+        if server_mode {
+            jobs_waiting_alerts(&db).await;
+        }
+    };
+
+    let apply_autoscaling_f = async {
+        #[cfg(feature = "enterprise")]
+        if server_mode && !initial_load {
+            if let Err(e) = windmill_autoscaling::apply_all_autoscaling(db).await {
+                tracing::error!("Error applying autoscaling: {:?}", e);
+            }
+        }
+    };
+
     join!(
         expired_items_f,
         zombie_jobs_f,
         expose_queue_metrics_f,
         verify_license_key_f,
-        worker_groups_alerts_f
+        worker_groups_alerts_f,
+        jobs_waiting_alerts_f,
+        apply_autoscaling_f,
     );
 }
 
@@ -1084,19 +1087,11 @@ pub async fn expose_queue_metrics(db: &Pool<Postgres>) {
         .unwrap_or(true);
 
     if metrics_enabled || save_metrics {
-        let queue_counts = sqlx::query!(
-            "SELECT tag, count(*) as count FROM queue WHERE
-                scheduled_for <= now() - ('3 seconds')::interval AND running = false
-                GROUP BY tag"
-        )
-        .fetch_all(db)
-        .await
-        .ok()
-        .unwrap_or_else(|| vec![]);
+        let queue_counts = windmill_common::queue::get_queue_counts(db).await;
 
         for q in queue_counts {
-            let count = q.count.unwrap_or(0);
-            let tag = q.tag;
+            let count = q.1;
+            let tag = q.0;
             if metrics_enabled {
                 let metric = (*QUEUE_COUNT).with_label_values(&[&tag]);
                 metric.set(count as i64);
diff --git a/backend/src/pg_embed.rs b/backend/src/pg_embed.rs
deleted file mode 100644
index ad5529dc02..0000000000
--- a/backend/src/pg_embed.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use pg_embed::pg_enums::PgAuthMethod;
-use pg_embed::pg_fetch::PgFetchSettings;
-use pg_embed::postgres::{PgEmbed, PgSettings};
-use std::path::PathBuf;
-use std::time::Duration;
-
-pub async fn start() -> anyhow::Result<(String, PgEmbed)> {
-    let pg_settings = PgSettings {
-        database_dir: PathBuf::from("/tmp/db"),
-        port: 6543,
-        user: "postgres".to_string(),
-        password: "password".to_string(),
-        auth_method: PgAuthMethod::Plain,
-        persistent: false,
-        timeout: Some(Duration::from_secs(15)),
-        migration_dir: None,
-    };
-
-    let fetch_settings = PgFetchSettings {
-        version: pg_embed::pg_fetch::PostgresVersion("15.3.0"),
-
-        ..Default::default()
-    };
-
-    tracing::info!(
-        "Fetch settings: {:?} {:?}",
-        fetch_settings.operating_system,
-        fetch_settings.architecture
-    );
-
-    let mut pg = PgEmbed::new(pg_settings, fetch_settings).await?;
-
-    pg.setup().await.expect("pg setup");
-
-    pg.start_db().await.expect("pg start db");
-
-    //TODO: re-enable this to make it work
-    // if !pg.database_exists("windmill").await.expect("db exists") {
-    //     pg.create_database("windmill")
-    //         .await
-    //         .expect("pg create database");
-    // }
-
-    let uri = pg.full_db_uri("windmill");
-    Ok((uri, pg))
-}
diff --git a/backend/tests/worker.rs b/backend/tests/worker.rs
index e97c53700a..a93c6eef1d 100644
--- a/backend/tests/worker.rs
+++ b/backend/tests/worker.rs
@@ -1126,6 +1126,7 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
                 FlowModule {
                     id: "b".to_string(),
@@ -1166,6 +1167,7 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                             priority: None,
                             delete_after_use: None,
                             continue_on_error: None,
+                            skip_if: None,
                         }],
                     }
                     .into(),
@@ -1181,6 +1183,7 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
             ],
             same_worker: false,
@@ -1286,6 +1289,7 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
                 FlowModule {
                     id: "b".to_string(),
@@ -1336,6 +1340,7 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                                 priority: None,
                                 delete_after_use: None,
                                 continue_on_error: None,
+                                skip_if: None,
                             },
                             FlowModule {
                                 id: "e".to_string(),
@@ -1372,7 +1377,7 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                                 priority: None,
                                 delete_after_use: None,
                                 continue_on_error: None,
-
+                                skip_if: None,
                             },
                         ],
                     }.into(),
@@ -1388,6 +1393,7 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
                 FlowModule {
                     id: "c".to_string(),
@@ -1431,6 +1437,7 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
             ],
             same_worker: true,
@@ -2738,7 +2745,7 @@ async fn test_flow_lock_all(db: Pool<Postgres>) {
                         "lock": null,
                         "path": null,
                         "type": "rawscript",
-                        "content": "import * as wmill from \"https://deno.land/x/windmill@v1.50.0/mod.ts\"\n\nexport async function main() {\n  return \"Hello\"\n}\n",
+                        "content": "import * as wmill from \"https://deno.land/x/windmill@v1.50.0/mod.ts\"\n\nexport async function main() {\n  return wmill\n}\n",
                         "language": "deno",
                         "input_transforms": {}
                     },
diff --git a/backend/windmill-api/Cargo.toml b/backend/windmill-api/Cargo.toml
index fd8bedf0f9..b7c4a41aed 100644
--- a/backend/windmill-api/Cargo.toml
+++ b/backend/windmill-api/Cargo.toml
@@ -95,9 +95,9 @@ openidconnect = { workspace = true, optional = true}
 url = { workspace = true, optional = true}
 jsonwebtoken = { workspace = true }
 matchit.workspace = true
+tokio-tungstenite.workspace = true
 
 pin-project.workspace = true
-crc.workspace = true
 http.workspace = true
 async-stream.workspace = true
 ulid.workspace = true
diff --git a/backend/windmill-api/openapi-deref.json b/backend/windmill-api/openapi-deref.json
index 23e8f019df..db789c2163 100644
--- a/backend/windmill-api/openapi-deref.json
+++ b/backend/windmill-api/openapi-deref.json
@@ -1,7 +1,7 @@
 {
   "openapi": "3.0.3",
   "info": {
-    "version": "1.304.2",
+    "version": "1.409.0",
     "title": "Windmill API",
     "contact": {
       "name": "Windmill Team",
@@ -176,6 +176,22 @@
           {
             "$ref": "#/components/parameters/Operation"
           },
+          {
+            "name": "operations",
+            "in": "query",
+            "description": "comma separated list of exact operations to include",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "exclude_operations",
+            "in": "query",
+            "description": "comma separated list of operations to exclude",
+            "schema": {
+              "type": "string"
+            }
+          },
           {
             "$ref": "#/components/parameters/ResourceName"
           },
@@ -501,6 +517,9 @@
                 "properties": {
                   "is_super_admin": {
                     "type": "boolean"
+                  },
+                  "name": {
+                    "type": "string"
                   }
                 }
               }
@@ -660,6 +679,65 @@
         }
       }
     },
+    "/users/overwrite": {
+      "post": {
+        "summary": "global overwrite users (require super admin and EE)",
+        "operationId": "globalUsersOverwrite",
+        "tags": [
+          "user"
+        ],
+        "requestBody": {
+          "description": "List of users",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/ExportedUser"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success message",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/users/export": {
+      "get": {
+        "summary": "global export users (require super admin and EE)",
+        "operationId": "globalUsersExport",
+        "tags": [
+          "user"
+        ],
+        "responses": {
+          "200": {
+            "description": "exported users",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ExportedUser"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/users/delete/{username}": {
       "delete": {
         "summary": "delete user (require admin privilege)",
@@ -1061,6 +1139,49 @@
         }
       }
     },
+    "/settings/test_critical_channels": {
+      "post": {
+        "summary": "test critical channels",
+        "operationId": "testCriticalChannels",
+        "tags": [
+          "setting"
+        ],
+        "requestBody": {
+          "description": "test critical channel payload",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "email": {
+                      "type": "string"
+                    },
+                    "slack_channel": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "status",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/settings/test_license_key": {
       "post": {
         "summary": "test license key",
@@ -1155,6 +1276,103 @@
         }
       }
     },
+    "/settings/latest_key_renewal_attempt": {
+      "get": {
+        "summary": "get latest key renewal attempt",
+        "operationId": "getLatestKeyRenewalAttempt",
+        "tags": [
+          "setting"
+        ],
+        "responses": {
+          "200": {
+            "description": "status",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "result": {
+                      "type": "string"
+                    },
+                    "attempted_at": {
+                      "type": "string",
+                      "format": "date-time"
+                    }
+                  },
+                  "required": [
+                    "result",
+                    "attempted_at"
+                  ],
+                  "nullable": true
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/settings/renew_license_key": {
+      "post": {
+        "summary": "renew license key",
+        "operationId": "renewLicenseKey",
+        "tags": [
+          "setting"
+        ],
+        "parameters": [
+          {
+            "name": "license_key",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "status",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/settings/customer_portal": {
+      "post": {
+        "summary": "create customer portal session",
+        "operationId": "createCustomerPortalSession",
+        "tags": [
+          "setting"
+        ],
+        "parameters": [
+          {
+            "name": "license_key",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "url to portal",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/saml/test_metadata": {
       "post": {
         "summary": "test metadata",
@@ -1187,6 +1405,30 @@
         }
       }
     },
+    "/settings/list_global": {
+      "get": {
+        "summary": "list global settings",
+        "operationId": "listGlobalSettings",
+        "tags": [
+          "setting"
+        ],
+        "responses": {
+          "200": {
+            "description": "list of settings",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/GlobalSetting"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/users/email": {
       "get": {
         "summary": "get current user email (if logged in)",
@@ -2122,6 +2364,9 @@
                     "git_sync": {
                       "$ref": "#/components/schemas/WorkspaceGitSyncSettings"
                     },
+                    "deploy_ui": {
+                      "$ref": "#/components/schemas/WorkspaceDeployUISettings"
+                    },
                     "default_app": {
                       "type": "string"
                     },
@@ -2730,6 +2975,46 @@
         }
       }
     },
+    "/w/{workspace}/workspaces/edit_deploy_ui_config": {
+      "post": {
+        "summary": "edit workspace deploy ui settings",
+        "operationId": "editWorkspaceDeployUISettings",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "Workspace deploy UI settings",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "deploy_ui_settings": {
+                    "$ref": "#/components/schemas/WorkspaceDeployUISettings"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "status",
+            "content": {
+              "application/json": {
+                "schema": {}
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/workspaces/edit_default_app": {
       "post": {
         "summary": "edit default app for workspace",
@@ -2934,6 +3219,9 @@
                 "properties": {
                   "new_key": {
                     "type": "string"
+                  },
+                  "skip_reencrypt": {
+                    "type": "boolean"
                   }
                 },
                 "required": [
@@ -3127,6 +3415,40 @@
         }
       }
     },
+    "/w/{workspace}/users/username_to_email/{username}": {
+      "get": {
+        "summary": "get email from username",
+        "operationId": "usernameToEmail",
+        "tags": [
+          "user"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "username",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "email",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/users/tokens/create": {
       "post": {
         "summary": "create token",
@@ -3236,6 +3558,12 @@
             "schema": {
               "type": "boolean"
             }
+          },
+          {
+            "$ref": "#/components/parameters/Page"
+          },
+          {
+            "$ref": "#/components/parameters/PerPage"
           }
         ],
         "responses": {
@@ -3559,6 +3887,19 @@
         "parameters": [
           {
             "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "path_start",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "$ref": "#/components/parameters/Page"
+          },
+          {
+            "$ref": "#/components/parameters/PerPage"
           }
         ],
         "responses": {
@@ -3710,6 +4051,50 @@
         }
       }
     },
+    "/oauth/connect_slack_callback": {
+      "post": {
+        "summary": "connect slack callback instance",
+        "operationId": "connectSlackCallbackInstance",
+        "tags": [
+          "oauth"
+        ],
+        "requestBody": {
+          "description": "code endpoint",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "code": {
+                    "type": "string"
+                  },
+                  "state": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "code",
+                  "state"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "success message",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/oauth/connect_callback/{client_name}": {
       "post": {
         "summary": "connect callback",
@@ -3932,7 +4317,18 @@
                     "oauth": {
                       "type": "array",
                       "items": {
-                        "type": "string"
+                        "type": "object",
+                        "properties": {
+                          "type": {
+                            "type": "string"
+                          },
+                          "display_name": {
+                            "type": "string"
+                          }
+                        },
+                        "required": [
+                          "type"
+                        ]
                       }
                     },
                     "saml": {
@@ -3962,19 +4358,50 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "additionalProperties": {
-                    "type": "object",
-                    "properties": {
-                      "extra_params": {
-                        "additionalProperties": {
-                          "type": "string"
-                        }
-                      },
-                      "scopes": {
-                        "type": "array",
-                        "items": {
-                          "type": "string"
-                        }
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/oauth/get_connect/{client}": {
+      "get": {
+        "summary": "get oauth connect",
+        "operationId": "getOAuthConnect",
+        "tags": [
+          "oauth"
+        ],
+        "parameters": [
+          {
+            "name": "client",
+            "description": "client name",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "get",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "extra_params": {
+                      "type": "object"
+                    },
+                    "scopes": {
+                      "type": "array",
+                      "items": {
+                        "type": "string"
                       }
                     }
                   }
@@ -4294,6 +4721,13 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "path_start",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -4433,6 +4867,30 @@
         }
       }
     },
+    "/w/{workspace}/resources/file_resource_type_to_file_ext_map": {
+      "get": {
+        "summary": "get map from resource type to format extension",
+        "operationId": "fileResourceTypeToFileExtMap",
+        "tags": [
+          "resource"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "map from resource type to file ext",
+            "content": {
+              "application/json": {
+                "schema": {}
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/resources/type/delete/{path}": {
       "delete": {
         "summary": "delete resource_type",
@@ -5281,7 +5739,23 @@
           },
           {
             "name": "show_archived",
-            "description": "(default false)\nshow also the archived files.\nwhen multiple archived hash share the same path, only the ones with the latest create_at\nare \ned.\n",
+            "description": "(default false)\nshow only the archived files.\nwhen multiple archived hash share the same path, only the ones with the latest create_at\nare \ned.\n",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "include_without_main",
+            "description": "(default false)\ninclude scripts without an exported main function\n",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "include_draft_only",
+            "description": "(default false)\ninclude scripts that have no deployed version\n",
             "in": "query",
             "schema": {
               "type": "boolean"
@@ -5310,6 +5784,14 @@
             "schema": {
               "type": "boolean"
             }
+          },
+          {
+            "name": "with_deployment_msg",
+            "description": "(default false)\ninclude deployment message\n",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -5735,6 +6217,13 @@
           },
           {
             "$ref": "#/components/parameters/ScriptPath"
+          },
+          {
+            "name": "with_starred_info",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -5751,6 +6240,67 @@
         }
       }
     },
+    "/w/{workspace}/scripts/get_triggers_count/{path}": {
+      "get": {
+        "summary": "get triggers count of script",
+        "operationId": "getTriggersCountOfScript",
+        "tags": [
+          "script"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "triggers count",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TriggersCount"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/scripts/list_tokens/{path}": {
+      "get": {
+        "summary": "get tokens with script scope",
+        "operationId": "listTokensOfScript",
+        "tags": [
+          "script"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "tokens list",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/TruncatedToken"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/scripts/get/draft/{path}": {
       "get": {
         "summary": "get script by path with draft",
@@ -5963,6 +6513,13 @@
           },
           {
             "$ref": "#/components/parameters/ScriptHash"
+          },
+          {
+            "name": "with_starred_info",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -6076,6 +6633,14 @@
               "type": "integer"
             }
           },
+          {
+            "name": "skip_preprocessor",
+            "description": "skip the preprocessor",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
           {
             "$ref": "#/components/parameters/ParentJob"
           },
@@ -6518,7 +7083,7 @@
           },
           {
             "name": "show_archived",
-            "description": "(default false)\nshow also the archived files.\nwhen multiple archived hash share the same path, only the ones with the latest create_at\nare displayed.\n",
+            "description": "(default false)\nshow only the archived files.\nwhen multiple archived hash share the same path, only the ones with the latest create_at\nare displayed.\n",
             "in": "query",
             "schema": {
               "type": "boolean"
@@ -6531,6 +7096,22 @@
             "schema": {
               "type": "boolean"
             }
+          },
+          {
+            "name": "include_draft_only",
+            "description": "(default false)\ninclude items that have no deployed version\n",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "with_deployment_msg",
+            "description": "(default false)\ninclude deployment message\n",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -6565,6 +7146,133 @@
         }
       }
     },
+    "/w/{workspace}/flows/history/p/{path}": {
+      "get": {
+        "summary": "get flow history by path",
+        "operationId": "getFlowHistory",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "tags": [
+          "flow"
+        ],
+        "responses": {
+          "200": {
+            "description": "Flow history",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/FlowVersion"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/flows/get/v/{version}/p/{path}": {
+      "get": {
+        "summary": "get flow version",
+        "operationId": "getFlowVersion",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "type": "string",
+            "name": "version",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "tags": [
+          "flow"
+        ],
+        "responses": {
+          "200": {
+            "description": "flow details",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Flow"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/flows/history_update/v/{version}/p/{path}": {
+      "post": {
+        "summary": "update flow history",
+        "operationId": "updateFlowHistory",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "type": "string",
+            "name": "version",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "requestBody": {
+          "description": "Flow deployment message",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "deployment_msg": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "deployment_msg"
+                ]
+              }
+            }
+          }
+        },
+        "tags": [
+          "flow"
+        ],
+        "responses": {
+          "200": {
+            "description": "success",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/flows/get/{path}": {
       "get": {
         "summary": "get flow by path",
@@ -6578,6 +7286,13 @@
           },
           {
             "$ref": "#/components/parameters/ScriptPath"
+          },
+          {
+            "name": "with_starred_info",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -6594,6 +7309,67 @@
         }
       }
     },
+    "/w/{workspace}/flows/get_triggers_count/{path}": {
+      "get": {
+        "summary": "get triggers count of flow",
+        "operationId": "getTriggersCountOfFlow",
+        "tags": [
+          "flow"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "triggers count",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TriggersCount"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/flows/list_tokens/{path}": {
+      "get": {
+        "summary": "get tokens with flow scope",
+        "operationId": "listTokensOfFlow",
+        "tags": [
+          "flow"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "tokens list",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/TruncatedToken"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/flows/toggle_workspace_error_handler/{path}": {
       "post": {
         "summary": "Toggle ON and OFF the workspace error handler for a given flow",
@@ -6887,44 +7663,6 @@
         }
       }
     },
-    "/w/{workspace}/flows/input_history/p/{path}": {
-      "get": {
-        "summary": "list inputs for previous completed flow jobs",
-        "operationId": "getFlowInputHistoryByPath",
-        "tags": [
-          "flow"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/components/parameters/WorkspaceId"
-          },
-          {
-            "$ref": "#/components/parameters/ScriptPath"
-          },
-          {
-            "$ref": "#/components/parameters/Page"
-          },
-          {
-            "$ref": "#/components/parameters/PerPage"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "input history for completed jobs with this flow path",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/Input"
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    },
     "/w/{workspace}/raw_apps/list": {
       "get": {
         "summary": "list all raw apps",
@@ -7136,6 +7874,22 @@
             "schema": {
               "type": "boolean"
             }
+          },
+          {
+            "name": "include_draft_only",
+            "description": "(default false)\ninclude items that have no deployed version\n",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "with_deployment_msg",
+            "description": "(default false)\ninclude deployment message\n",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -7258,6 +8012,13 @@
           },
           {
             "$ref": "#/components/parameters/ScriptPath"
+          },
+          {
+            "name": "with_starred_info",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -7756,6 +8517,9 @@
                       "path": {
                         "type": "string"
                       },
+                      "lock": {
+                        "type": "string"
+                      },
                       "cache_ttl": {
                         "type": "integer"
                       }
@@ -7767,6 +8531,15 @@
                   },
                   "force_viewer_static_fields": {
                     "type": "object"
+                  },
+                  "force_viewer_one_of_fields": {
+                    "type": "object"
+                  },
+                  "force_viewer_allow_user_resources": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
                   }
                 },
                 "required": [
@@ -7822,6 +8595,14 @@
               "type": "integer"
             }
           },
+          {
+            "name": "skip_preprocessor",
+            "description": "skip the preprocessor",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
           {
             "$ref": "#/components/parameters/ParentJob"
           },
@@ -7996,6 +8777,14 @@
               "type": "integer"
             }
           },
+          {
+            "name": "skip_preprocessor",
+            "description": "skip the preprocessor",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
           {
             "$ref": "#/components/parameters/ParentJob"
           },
@@ -8339,6 +9128,14 @@
             "schema": {
               "type": "boolean"
             }
+          },
+          {
+            "name": "is_not_schedule",
+            "description": "is not a scheduled job",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -8388,6 +9185,9 @@
                   "properties": {
                     "database_length": {
                       "type": "integer"
+                    },
+                    "suspended": {
+                      "type": "integer"
                     }
                   },
                   "required": [
@@ -8434,10 +9234,120 @@
         }
       }
     },
-    "/w/{workspace}/jobs/queue/cancel_all": {
+    "/w/{workspace}/jobs/queue/list_filtered_uuids": {
+      "get": {
+        "summary": "get the ids of all jobs matching the given filters",
+        "operationId": "listFilteredUuids",
+        "tags": [
+          "job"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/OrderDesc"
+          },
+          {
+            "$ref": "#/components/parameters/CreatedBy"
+          },
+          {
+            "$ref": "#/components/parameters/ParentJob"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptExactPath"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptStartPath"
+          },
+          {
+            "$ref": "#/components/parameters/SchedulePath"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptExactHash"
+          },
+          {
+            "$ref": "#/components/parameters/StartedBefore"
+          },
+          {
+            "$ref": "#/components/parameters/StartedAfter"
+          },
+          {
+            "$ref": "#/components/parameters/Success"
+          },
+          {
+            "$ref": "#/components/parameters/ScheduledForBeforeNow"
+          },
+          {
+            "$ref": "#/components/parameters/JobKinds"
+          },
+          {
+            "$ref": "#/components/parameters/Suspended"
+          },
+          {
+            "$ref": "#/components/parameters/Running"
+          },
+          {
+            "$ref": "#/components/parameters/ArgsFilter"
+          },
+          {
+            "$ref": "#/components/parameters/ResultFilter"
+          },
+          {
+            "$ref": "#/components/parameters/Tag"
+          },
+          {
+            "$ref": "#/components/parameters/Page"
+          },
+          {
+            "$ref": "#/components/parameters/PerPage"
+          },
+          {
+            "name": "concurrency_key",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "all_workspaces",
+            "description": "get jobs from all workspaces (only valid if request come from the `admins` workspace)",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "is_not_schedule",
+            "description": "is not a scheduled job",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "uuids of jobs",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/jobs/queue/cancel_selection": {
       "post": {
-        "summary": "cancel all jobs",
-        "operationId": "cancelAll",
+        "summary": "cancel jobs based on the given uuids",
+        "operationId": "cancelSelection",
         "tags": [
           "job"
         ],
@@ -8446,6 +9356,20 @@
             "$ref": "#/components/parameters/WorkspaceId"
           }
         ],
+        "requestBody": {
+          "description": "uuids of the jobs to cancel",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "uuids of canceled jobs",
@@ -8480,6 +9404,9 @@
           {
             "$ref": "#/components/parameters/CreatedBy"
           },
+          {
+            "$ref": "#/components/parameters/Label"
+          },
           {
             "$ref": "#/components/parameters/ParentJob"
           },
@@ -8545,6 +9472,14 @@
             "schema": {
               "type": "boolean"
             }
+          },
+          {
+            "name": "is_not_schedule",
+            "description": "is not a scheduled job",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -8578,6 +9513,9 @@
           {
             "$ref": "#/components/parameters/CreatedBy"
           },
+          {
+            "$ref": "#/components/parameters/Label"
+          },
           {
             "$ref": "#/components/parameters/ParentJob"
           },
@@ -8599,6 +9537,12 @@
           {
             "$ref": "#/components/parameters/StartedAfter"
           },
+          {
+            "$ref": "#/components/parameters/CreatedBefore"
+          },
+          {
+            "$ref": "#/components/parameters/CreatedAfter"
+          },
           {
             "$ref": "#/components/parameters/CreatedOrStartedBefore"
           },
@@ -8611,9 +9555,15 @@
           {
             "$ref": "#/components/parameters/CreatedOrStartedAfter"
           },
+          {
+            "$ref": "#/components/parameters/CreatedOrStartedAfterCompletedJob"
+          },
           {
             "$ref": "#/components/parameters/JobKinds"
           },
+          {
+            "$ref": "#/components/parameters/Suspended"
+          },
           {
             "$ref": "#/components/parameters/ArgsFilter"
           },
@@ -8668,6 +9618,14 @@
             "schema": {
               "type": "boolean"
             }
+          },
+          {
+            "name": "is_not_schedule",
+            "description": "is not a scheduled job",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -8708,6 +9666,62 @@
         }
       }
     },
+    "/jobs/completed/count_by_tag": {
+      "get": {
+        "summary": "Count jobs by tag",
+        "operationId": "countJobsByTag",
+        "tags": [
+          "job"
+        ],
+        "parameters": [
+          {
+            "name": "horizon_secs",
+            "in": "query",
+            "description": "Past Time horizon in seconds (when to start the count = now - horizon) (default is 3600)",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "workspace_id",
+            "in": "query",
+            "description": "Specific workspace ID to filter results (optional)",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Job counts by tag",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "tag": {
+                        "type": "string"
+                      },
+                      "count": {
+                        "type": "integer"
+                      }
+                    },
+                    "required": [
+                      "tag",
+                      "count"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/jobs_u/get/{id}": {
       "get": {
         "summary": "get job",
@@ -8802,6 +9816,33 @@
         }
       }
     },
+    "/w/{workspace}/jobs_u/get_args/{id}": {
+      "get": {
+        "summary": "get job args",
+        "operationId": "getJobArgs",
+        "tags": [
+          "job"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/JobId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "job args",
+            "content": {
+              "application/json": {
+                "schema": {}
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/jobs_u/getupdate/{id}": {
       "get": {
         "summary": "get job updates",
@@ -8829,6 +9870,13 @@
             "schema": {
               "type": "integer"
             }
+          },
+          {
+            "name": "get_progress",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -8854,6 +9902,9 @@
                     "mem_peak": {
                       "type": "integer"
                     },
+                    "progress": {
+                      "type": "integer"
+                    },
                     "flow_status": {
                       "$ref": "#/components/schemas/WorkflowStatusRecord"
                     }
@@ -8865,6 +9916,38 @@
         }
       }
     },
+    "/w/{workspace}/jobs_u/get_log_file/{path}": {
+      "get": {
+        "summary": "get log file from object store",
+        "operationId": "getLogFileFromStore",
+        "tags": [
+          "job"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "path",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "job log",
+            "content": {
+              "text/plain": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/jobs_u/get_flow_debug_info/{id}": {
       "get": {
         "summary": "get flow debug info",
@@ -8934,6 +10017,34 @@
           },
           {
             "$ref": "#/components/parameters/JobId"
+          },
+          {
+            "name": "suspended_job",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "resume_id",
+            "in": "query",
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "secret",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "approver",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -9027,7 +10138,7 @@
     },
     "/w/{workspace}/jobs_u/queue/cancel/{id}": {
       "post": {
-        "summary": "cancel queued job",
+        "summary": "cancel queued or running job",
         "operationId": "cancelQueuedJob",
         "tags": [
           "job"
@@ -9982,6 +11093,13 @@
             "schema": {
               "type": "boolean"
             }
+          },
+          {
+            "name": "path_start",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -10060,7 +11178,8 @@
                     "type": "string",
                     "enum": [
                       "error",
-                      "recovery"
+                      "recovery",
+                      "success"
                     ]
                   },
                   "override_existing": {
@@ -10097,6 +11216,311 @@
         }
       }
     },
+    "/w/{workspace}/http_triggers/create": {
+      "post": {
+        "summary": "create http trigger",
+        "operationId": "createHttpTrigger",
+        "tags": [
+          "http_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "new http trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NewHttpTrigger"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "http trigger created",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/http_triggers/update/{path}": {
+      "post": {
+        "summary": "update http trigger",
+        "operationId": "updateHttpTrigger",
+        "tags": [
+          "http_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EditHttpTrigger"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "http trigger updated",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/http_triggers/delete/{path}": {
+      "delete": {
+        "summary": "delete http trigger",
+        "operationId": "deleteHttpTrigger",
+        "tags": [
+          "http_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "http trigger deleted",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/http_triggers/get/{path}": {
+      "get": {
+        "summary": "get http trigger",
+        "operationId": "getHttpTrigger",
+        "tags": [
+          "http_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "http trigger deleted",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/HttpTrigger"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/http_triggers/list": {
+      "get": {
+        "summary": "list http triggers",
+        "operationId": "listHttpTriggers",
+        "tags": [
+          "http_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId",
+            "required": true
+          },
+          {
+            "$ref": "#/components/parameters/Page"
+          },
+          {
+            "$ref": "#/components/parameters/PerPage"
+          },
+          {
+            "name": "path",
+            "description": "filter by path",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "is_flow",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "path_start",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "http trigger list",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/HttpTrigger"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/http_triggers/exists/{path}": {
+      "get": {
+        "summary": "does http trigger exists",
+        "operationId": "existsHttpTrigger",
+        "tags": [
+          "http_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "http trigger exists",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/http_triggers/route_exists": {
+      "post": {
+        "summary": "does route exists",
+        "operationId": "existsRoute",
+        "tags": [
+          "http_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "route exists request",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "route_path": {
+                    "type": "string"
+                  },
+                  "http_method": {
+                    "type": "string",
+                    "enum": [
+                      "get",
+                      "post",
+                      "put",
+                      "delete",
+                      "patch"
+                    ]
+                  }
+                },
+                "required": [
+                  "kind",
+                  "route_path",
+                  "http_method"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "route exists",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/http_triggers/used": {
+      "get": {
+        "summary": "whether http triggers are used",
+        "operationId": "used",
+        "tags": [
+          "http_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "whether http triggers are used",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/groups/list": {
       "get": {
         "summary": "list instance groups",
@@ -10351,6 +11775,65 @@
         }
       }
     },
+    "/groups/export": {
+      "get": {
+        "summary": "export instance groups",
+        "operationId": "exportInstanceGroups",
+        "tags": [
+          "group"
+        ],
+        "responses": {
+          "200": {
+            "description": "exported instance groups",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ExportedInstanceGroup"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/groups/overwrite": {
+      "post": {
+        "summary": "overwrite instance groups",
+        "operationId": "overwriteInstanceGroups",
+        "tags": [
+          "group"
+        ],
+        "requestBody": {
+          "description": "overwrite instance groups",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/ExportedInstanceGroup"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "success message",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/groups/list": {
       "get": {
         "summary": "list groups",
@@ -10759,6 +12242,9 @@
                   "name": {
                     "type": "string"
                   },
+                  "summary": {
+                    "type": "string"
+                  },
                   "owners": {
                     "type": "array",
                     "items": {
@@ -10815,6 +12301,9 @@
               "schema": {
                 "type": "object",
                 "properties": {
+                  "summary": {
+                    "type": "string"
+                  },
                   "owners": {
                     "type": "array",
                     "items": {
@@ -11131,6 +12620,57 @@
         }
       }
     },
+    "/workers/queue_metrics": {
+      "get": {
+        "summary": "get queue metrics",
+        "operationId": "getQueueMetrics",
+        "tags": [
+          "worker"
+        ],
+        "responses": {
+          "200": {
+            "description": "metrics",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "string"
+                      },
+                      "values": {
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "created_at": {
+                              "type": "string"
+                            },
+                            "value": {
+                              "type": "number"
+                            }
+                          },
+                          "required": [
+                            "created_at",
+                            "value"
+                          ]
+                        }
+                      }
+                    },
+                    "required": [
+                      "id",
+                      "values"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/configs/list_worker_groups": {
       "get": {
         "summary": "list worker groups",
@@ -11248,6 +12788,30 @@
         }
       }
     },
+    "/configs/list": {
+      "get": {
+        "summary": "list configs",
+        "operationId": "listConfigs",
+        "tags": [
+          "config"
+        ],
+        "responses": {
+          "200": {
+            "description": "list of configs",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Config"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/acls/get/{kind}/{path}": {
       "get": {
         "summary": "get granular acls",
@@ -11277,7 +12841,8 @@
                 "flow",
                 "folder",
                 "app",
-                "raw_app"
+                "raw_app",
+                "http_trigger"
               ]
             }
           }
@@ -11328,7 +12893,8 @@
                 "flow",
                 "folder",
                 "app",
-                "raw_app"
+                "raw_app",
+                "http_trigger"
               ]
             }
           }
@@ -11398,7 +12964,8 @@
                 "flow",
                 "folder",
                 "app",
-                "raw_app"
+                "raw_app",
+                "http_trigger"
               ]
             }
           }
@@ -11633,6 +13200,52 @@
         }
       }
     },
+    "/w/{workspace}/inputs/{jobOrInputId}/args": {
+      "get": {
+        "summary": "Get args from history or saved input",
+        "operationId": "getArgsFromHistoryOrSavedInput",
+        "tags": [
+          "input"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "jobOrInputId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "input",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "allow_large",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "args",
+            "content": {
+              "application/json": {
+                "schema": {}
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/inputs/list": {
       "get": {
         "summary": "List saved Inputs for a Runnable",
@@ -12097,7 +13710,7 @@
     },
     "/w/{workspace}/job_helpers/test_connection": {
       "get": {
-        "summary": "Test connection to the workspace datasets storage",
+        "summary": "Test connection to the workspace object storage",
         "operationId": "datasetStorageTestConnection",
         "tags": [
           "helpers"
@@ -12105,6 +13718,13 @@
         "parameters": [
           {
             "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "storage",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -12121,7 +13741,7 @@
     },
     "/w/{workspace}/job_helpers/list_stored_files": {
       "get": {
-        "summary": "List the file keys available in the workspace files storage (S3)",
+        "summary": "List the file keys available in a workspace object storage",
         "operationId": "listStoredFiles",
         "tags": [
           "helpers"
@@ -12151,6 +13771,13 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "storage",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -12202,6 +13829,13 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "storage",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -12278,6 +13912,13 @@
             "schema": {
               "type": "integer"
             }
+          },
+          {
+            "name": "storage",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -12349,6 +13990,13 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "storage",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -12363,6 +14011,144 @@
         }
       }
     },
+    "/w/{workspace}/job_helpers/load_table_count/{path}": {
+      "get": {
+        "summary": "Load the table row count",
+        "operationId": "loadTableRowCount",
+        "tags": [
+          "helpers"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          },
+          {
+            "name": "search_col",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "search_term",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "storage",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Table count",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "count": {
+                      "type": "number"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/job_helpers/load_csv_preview/{path}": {
+      "get": {
+        "summary": "Load a preview of a csv file",
+        "operationId": "loadCsvPreview",
+        "tags": [
+          "helpers"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          },
+          {
+            "name": "offset",
+            "in": "query",
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "name": "sort_col",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "sort_desc",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "search_col",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "search_term",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "storage",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "csv_separator",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Csv Preview",
+            "content": {
+              "application/json": {
+                "schema": {}
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/job_helpers/delete_s3_file": {
       "delete": {
         "summary": "Permanently delete file from S3",
@@ -12381,6 +14167,13 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "storage",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -12421,6 +14214,13 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "storage",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -12477,6 +14277,13 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "storage",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "requestBody": {
@@ -12547,6 +14354,13 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "storage",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -12564,6 +14378,56 @@
         }
       }
     },
+    "/w/{workspace}/job_helpers/download_s3_parquet_file_as_csv": {
+      "get": {
+        "summary": "Download file to S3 bucket",
+        "operationId": "fileDownloadParquetAsCsv",
+        "tags": [
+          "helpers"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "file_key",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "s3_resource_path",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "resource_type",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The downloaded file",
+            "content": {
+              "text/csv": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/job_metrics/get/{id}": {
       "post": {
         "summary": "get job metrics",
@@ -12637,6 +14501,182 @@
         }
       }
     },
+    "/w/{workspace}/job_metrics/set_progress/{id}": {
+      "post": {
+        "summary": "set job metrics",
+        "operationId": "setJobProgress",
+        "tags": [
+          "metrics"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/JobId"
+          }
+        ],
+        "requestBody": {
+          "description": "parameters for statistics retrieval",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "percent": {
+                    "type": "integer"
+                  },
+                  "flow_job_id": {
+                    "type": "string",
+                    "format": "uuid"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Job progress updated",
+            "content": {
+              "application/json": {
+                "schema": {}
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/job_metrics/get_progress/{id}": {
+      "get": {
+        "summary": "get job progress",
+        "operationId": "getJobProgress",
+        "tags": [
+          "metrics"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/JobId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "job progress between 0 and 99",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/service_logs/list_files": {
+      "get": {
+        "summary": "list log files ordered by timestamp",
+        "operationId": "listLogFiles",
+        "tags": [
+          "service_logs"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/Before"
+          },
+          {
+            "$ref": "#/components/parameters/After"
+          },
+          {
+            "name": "with_error",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "time",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "hostname": {
+                        "type": "string"
+                      },
+                      "mode": {
+                        "type": "string"
+                      },
+                      "worker_group": {
+                        "type": "string"
+                      },
+                      "log_ts": {
+                        "type": "string",
+                        "format": "date-time"
+                      },
+                      "file_path": {
+                        "type": "string"
+                      },
+                      "ok_lines": {
+                        "type": "integer"
+                      },
+                      "err_lines": {
+                        "type": "integer"
+                      },
+                      "json_fmt": {
+                        "type": "boolean"
+                      }
+                    },
+                    "required": [
+                      "hostname",
+                      "mode",
+                      "log_ts",
+                      "file_path",
+                      "json_fmt"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/service_logs/get_log_file/{path}": {
+      "get": {
+        "summary": "get log file by path",
+        "operationId": "getLogFile",
+        "tags": [
+          "service_logs"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "log stream",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/concurrency_groups/list": {
       "get": {
         "summary": "List all concurrency groups",
@@ -12661,7 +14701,7 @@
         }
       }
     },
-    "/concurrency_groups/{concurrency_id}": {
+    "/concurrency_groups/prune/{concurrency_id}": {
       "delete": {
         "summary": "Delete concurrency group",
         "operationId": "deleteConcurrencyGroup",
@@ -12687,6 +14727,238 @@
           }
         }
       }
+    },
+    "/concurrency_groups/{id}/key": {
+      "get": {
+        "summary": "Get the concurrency key for a job that has concurrency limits enabled",
+        "operationId": "getConcurrencyKey",
+        "tags": [
+          "concurrencyGroups"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/JobId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "concurrency key for given job",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/concurrency_groups/list_jobs": {
+      "get": {
+        "summary": "Get intervals of job runtime concurrency",
+        "operationId": "listExtendedJobs",
+        "tags": [
+          "concurrencyGroups",
+          "job"
+        ],
+        "parameters": [
+          {
+            "name": "concurrency_key",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "row_limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/CreatedBy"
+          },
+          {
+            "$ref": "#/components/parameters/Label"
+          },
+          {
+            "$ref": "#/components/parameters/ParentJob"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptExactPath"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptStartPath"
+          },
+          {
+            "$ref": "#/components/parameters/SchedulePath"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptExactHash"
+          },
+          {
+            "$ref": "#/components/parameters/StartedBefore"
+          },
+          {
+            "$ref": "#/components/parameters/StartedAfter"
+          },
+          {
+            "$ref": "#/components/parameters/CreatedOrStartedBefore"
+          },
+          {
+            "$ref": "#/components/parameters/Running"
+          },
+          {
+            "$ref": "#/components/parameters/ScheduledForBeforeNow"
+          },
+          {
+            "$ref": "#/components/parameters/CreatedOrStartedAfter"
+          },
+          {
+            "$ref": "#/components/parameters/CreatedOrStartedAfterCompletedJob"
+          },
+          {
+            "$ref": "#/components/parameters/JobKinds"
+          },
+          {
+            "$ref": "#/components/parameters/ArgsFilter"
+          },
+          {
+            "$ref": "#/components/parameters/Tag"
+          },
+          {
+            "$ref": "#/components/parameters/ResultFilter"
+          },
+          {
+            "$ref": "#/components/parameters/Page"
+          },
+          {
+            "$ref": "#/components/parameters/PerPage"
+          },
+          {
+            "name": "is_skipped",
+            "description": "is the job skipped",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "is_flow_step",
+            "description": "is the job a flow step",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "has_null_parent",
+            "description": "has null parent",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "success",
+            "description": "filter on successful jobs",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "all_workspaces",
+            "description": "get jobs from all workspaces (only valid if request come from the `admins` workspace)",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "is_not_schedule",
+            "description": "is not a scheduled job",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "time",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ExtendedJobs"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/srch/w/{workspace}/index/search/job": {
+      "get": {
+        "summary": "Search through jobs with a string query",
+        "operationId": "searchJobsIndex",
+        "tags": [
+          "indexSearch"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "search_query",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "search results",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "query_parse_errors": {
+                      "description": "a list of the terms that couldn't be parsed (and thus ignored)",
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "dancer": {
+                            "type": "string"
+                          }
+                        }
+                      }
+                    },
+                    "hits": {
+                      "description": "the jobs that matched the query",
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/JobSearchHit"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
     }
   },
   "components": {
@@ -12839,6 +15111,14 @@
           "type": "string"
         }
       },
+      "Label": {
+        "name": "label",
+        "description": "mask to filter exact matching job's label (job labels are completed jobs with as a result an object containing a string in the array at key 'wm_labels')",
+        "in": "query",
+        "schema": {
+          "type": "string"
+        }
+      },
       "ParentJob": {
         "name": "parent_job",
         "description": "The parent job that is at the origin and responsible for the execution of this script if any",
@@ -12929,6 +15209,24 @@
           "type": "string"
         }
       },
+      "CreatedBefore": {
+        "name": "created_before",
+        "description": "filter on created before (inclusive) timestamp",
+        "in": "query",
+        "schema": {
+          "type": "string",
+          "format": "date-time"
+        }
+      },
+      "CreatedAfter": {
+        "name": "created_after",
+        "description": "filter on created after (exclusive) timestamp",
+        "in": "query",
+        "schema": {
+          "type": "string",
+          "format": "date-time"
+        }
+      },
       "StartedBefore": {
         "name": "started_before",
         "description": "filter on started before (inclusive) timestamp",
@@ -12947,6 +15245,15 @@
           "format": "date-time"
         }
       },
+      "Before": {
+        "name": "before",
+        "description": "filter on started before (inclusive) timestamp",
+        "in": "query",
+        "schema": {
+          "type": "string",
+          "format": "date-time"
+        }
+      },
       "CreatedOrStartedAfter": {
         "name": "created_or_started_after",
         "description": "filter on created_at for non non started job and started_at otherwise after (exclusive) timestamp",
@@ -12956,6 +15263,15 @@
           "format": "date-time"
         }
       },
+      "CreatedOrStartedAfterCompletedJob": {
+        "name": "created_or_started_after_completed_jobs",
+        "description": "filter on created_at for non non started job and started_at otherwise after (exclusive) timestamp but only for the completed jobs",
+        "in": "query",
+        "schema": {
+          "type": "string",
+          "format": "date-time"
+        }
+      },
       "CreatedOrStartedBefore": {
         "name": "created_or_started_before",
         "description": "filter on created_at for non non started job and started_at otherwise before (inclusive) timestamp",
@@ -13030,15 +15346,6 @@
           "format": "date-time"
         }
       },
-      "Before": {
-        "name": "before",
-        "description": "filter on created before (exclusive) timestamp",
-        "in": "query",
-        "schema": {
-          "type": "string",
-          "format": "date-time"
-        }
-      },
       "Username": {
         "name": "username",
         "description": "filter on exact username of user",
@@ -13198,7 +15505,10 @@
               "mssql",
               "graphql",
               "nativets",
-              "bun"
+              "bun",
+              "php",
+              "rust",
+              "ansible"
             ]
           },
           "kind": {
@@ -13235,6 +15545,9 @@
           "concurrency_time_window_s": {
             "type": "integer"
           },
+          "concurrency_key": {
+            "type": "string"
+          },
           "cache_ttl": {
             "type": "number"
           },
@@ -13258,6 +15571,15 @@
           },
           "visible_to_runner_only": {
             "type": "boolean"
+          },
+          "no_main_func": {
+            "type": "boolean"
+          },
+          "codebase": {
+            "type": "string"
+          },
+          "has_preprocessor": {
+            "type": "boolean"
           }
         },
         "required": [
@@ -13274,7 +15596,9 @@
           "extra_perms",
           "language",
           "kind",
-          "starred"
+          "starred",
+          "no_main_func",
+          "has_preprocessor"
         ]
       },
       "NewScript": {
@@ -13319,7 +15643,10 @@
               "mssql",
               "graphql",
               "nativets",
-              "bun"
+              "bun",
+              "php",
+              "rust",
+              "ansible"
             ]
           },
           "kind": {
@@ -13379,6 +15706,15 @@
           },
           "visible_to_runner_only": {
             "type": "boolean"
+          },
+          "no_main_func": {
+            "type": "boolean"
+          },
+          "codebase": {
+            "type": "string"
+          },
+          "has_preprocessor": {
+            "type": "boolean"
           }
         },
         "required": [
@@ -13437,9 +15773,6 @@
           "name": {
             "type": "string"
           },
-          "args": {
-            "type": "object"
-          },
           "created_by": {
             "type": "string"
           },
@@ -13613,7 +15946,10 @@
               "mssql",
               "graphql",
               "nativets",
-              "bun"
+              "bun",
+              "php",
+              "rust",
+              "ansible"
             ]
           },
           "email": {
@@ -13630,6 +15966,15 @@
           },
           "priority": {
             "type": "integer"
+          },
+          "self_wait_time_ms": {
+            "type": "number"
+          },
+          "aggregate_wait_time_ms": {
+            "type": "number"
+          },
+          "suspend": {
+            "type": "number"
           }
         },
         "required": [
@@ -13750,7 +16095,10 @@
               "mssql",
               "graphql",
               "nativets",
-              "bun"
+              "bun",
+              "php",
+              "rust",
+              "ansible"
             ]
           },
           "is_skipped": {
@@ -13770,6 +16118,18 @@
           },
           "priority": {
             "type": "integer"
+          },
+          "labels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "self_wait_time_ms": {
+            "type": "number"
+          },
+          "aggregate_wait_time_ms": {
+            "type": "number"
           }
         },
         "required": [
@@ -13789,29 +16149,58 @@
           "tag"
         ]
       },
+      "ObscuredJob": {
+        "type": "object",
+        "properties": {
+          "typ": {
+            "type": "string"
+          },
+          "started_at": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "duration_ms": {
+            "type": "number"
+          }
+        }
+      },
       "Job": {
-        "allOf": [
+        "oneOf": [
           {
-            "oneOf": [
+            "allOf": [
               {
                 "$ref": "#/components/schemas/CompletedJob"
               },
               {
-                "$ref": "#/components/schemas/QueuedJob"
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "CompletedJob"
+                    ]
+                  }
+                }
               }
             ]
           },
           {
-            "type": "object",
-            "properties": {
-              "type": {
-                "type": "string",
-                "enum": [
-                  "CompletedJob",
-                  "QueuedJob"
-                ]
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/QueuedJob"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "QueuedJob"
+                    ]
+                  }
+                }
               }
-            }
+            ]
           }
         ],
         "discriminator": {
@@ -13940,6 +16329,9 @@
             "items": {
               "type": "string"
             }
+          },
+          "email": {
+            "type": "string"
           }
         },
         "required": [
@@ -13963,6 +16355,9 @@
             "items": {
               "type": "string"
             }
+          },
+          "workspace_id": {
+            "type": "string"
           }
         }
       },
@@ -13978,6 +16373,9 @@
           },
           "impersonate_email": {
             "type": "string"
+          },
+          "workspace_id": {
+            "type": "string"
           }
         },
         "required": [
@@ -14025,6 +16423,10 @@
           },
           "is_refreshed": {
             "type": "boolean"
+          },
+          "expires_at": {
+            "type": "string",
+            "format": "date-time"
           }
         },
         "required": [
@@ -14077,6 +16479,10 @@
           },
           "is_oauth": {
             "type": "boolean"
+          },
+          "expires_at": {
+            "type": "string",
+            "format": "date-time"
           }
         },
         "required": [
@@ -14396,6 +16802,14 @@
                 "typ"
               ]
             }
+          },
+          "no_main_func": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "has_preprocessor": {
+            "type": "boolean",
+            "nullable": true
           }
         },
         "required": [
@@ -14403,7 +16817,9 @@
           "start_kwargs",
           "args",
           "type",
-          "error"
+          "error",
+          "no_main_func",
+          "has_preprocessor"
         ]
       },
       "Preview": {
@@ -14433,7 +16849,10 @@
               "mssql",
               "graphql",
               "nativets",
-              "bun"
+              "bun",
+              "php",
+              "rust",
+              "ansible"
             ]
           },
           "tag": {
@@ -14550,6 +16969,13 @@
             "additionalProperties": {
               "type": "boolean"
             }
+          },
+          "created_by": {
+            "type": "string"
+          },
+          "edited_at": {
+            "type": "string",
+            "format": "date-time"
           }
         },
         "required": [
@@ -14597,6 +17023,13 @@
           },
           "account": {
             "type": "number"
+          },
+          "created_by": {
+            "type": "string"
+          },
+          "edited_at": {
+            "type": "string",
+            "format": "date-time"
           }
         },
         "required": [
@@ -14619,6 +17052,16 @@
           "schema": {},
           "description": {
             "type": "string"
+          },
+          "created_by": {
+            "type": "string"
+          },
+          "edited_at": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "format_extension": {
+            "type": "string"
           }
         },
         "required": [
@@ -14698,6 +17141,12 @@
           "on_recovery_extra_args": {
             "$ref": "#/components/schemas/ScriptArgs"
           },
+          "on_success": {
+            "type": "string"
+          },
+          "on_success_extra_args": {
+            "$ref": "#/components/schemas/ScriptArgs"
+          },
           "ws_error_handler_muted": {
             "type": "boolean"
           },
@@ -14712,6 +17161,10 @@
           },
           "tag": {
             "type": "string"
+          },
+          "paused_until": {
+            "type": "string",
+            "format": "date-time"
           }
         },
         "required": [
@@ -14806,6 +17259,12 @@
           "on_recovery_extra_args": {
             "$ref": "#/components/schemas/ScriptArgs"
           },
+          "on_success": {
+            "type": "string"
+          },
+          "on_success_extra_args": {
+            "$ref": "#/components/schemas/ScriptArgs"
+          },
           "ws_error_handler_muted": {
             "type": "boolean"
           },
@@ -14820,6 +17279,10 @@
           },
           "tag": {
             "type": "string"
+          },
+          "paused_until": {
+            "type": "string",
+            "format": "date-time"
           }
         },
         "required": [
@@ -14864,6 +17327,12 @@
           "on_recovery_extra_args": {
             "$ref": "#/components/schemas/ScriptArgs"
           },
+          "on_success": {
+            "type": "string"
+          },
+          "on_success_extra_args": {
+            "$ref": "#/components/schemas/ScriptArgs"
+          },
           "ws_error_handler_muted": {
             "type": "boolean"
           },
@@ -14878,6 +17347,10 @@
           },
           "tag": {
             "type": "string"
+          },
+          "paused_until": {
+            "type": "string",
+            "format": "date-time"
           }
         },
         "required": [
@@ -14888,6 +17361,181 @@
           "args"
         ]
       },
+      "HttpTrigger": {
+        "type": "object",
+        "properties": {
+          "path": {
+            "type": "string"
+          },
+          "edited_by": {
+            "type": "string"
+          },
+          "edited_at": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "route_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "extra_perms": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "boolean"
+            }
+          },
+          "email": {
+            "type": "string"
+          },
+          "workspace_id": {
+            "type": "string"
+          },
+          "http_method": {
+            "type": "string",
+            "enum": [
+              "get",
+              "post",
+              "put",
+              "delete",
+              "patch"
+            ]
+          },
+          "is_async": {
+            "type": "boolean"
+          },
+          "requires_auth": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "path",
+          "edited_by",
+          "edited_at",
+          "script_path",
+          "route_path",
+          "extra_perms",
+          "is_flow",
+          "email",
+          "workspace_id",
+          "is_async",
+          "requires_auth",
+          "http_method"
+        ]
+      },
+      "NewHttpTrigger": {
+        "type": "object",
+        "properties": {
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "route_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "http_method": {
+            "type": "string",
+            "enum": [
+              "get",
+              "post",
+              "put",
+              "delete",
+              "patch"
+            ]
+          },
+          "is_async": {
+            "type": "boolean"
+          },
+          "requires_auth": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "path",
+          "script_path",
+          "route_path",
+          "is_flow",
+          "is_async",
+          "requires_auth",
+          "http_method"
+        ]
+      },
+      "EditHttpTrigger": {
+        "type": "object",
+        "properties": {
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "route_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "http_method": {
+            "type": "string",
+            "enum": [
+              "get",
+              "post",
+              "put",
+              "delete",
+              "patch"
+            ]
+          },
+          "is_async": {
+            "type": "boolean"
+          },
+          "requires_auth": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "path",
+          "script_path",
+          "is_flow",
+          "kind",
+          "is_async",
+          "requires_auth",
+          "http_method"
+        ]
+      },
+      "TriggersCount": {
+        "type": "object",
+        "properties": {
+          "primary_schedule": {
+            "type": "object",
+            "properties": {
+              "schedule": {
+                "type": "string"
+              }
+            }
+          },
+          "schedule_count": {
+            "type": "number"
+          },
+          "http_routes_count": {
+            "type": "number"
+          },
+          "webhook_count": {
+            "type": "number"
+          },
+          "email_count": {
+            "type": "number"
+          }
+        }
+      },
       "Group": {
         "type": "object",
         "properties": {
@@ -14951,6 +17599,16 @@
             "additionalProperties": {
               "type": "boolean"
             }
+          },
+          "summary": {
+            "type": "string"
+          },
+          "created_by": {
+            "type": "string"
+          },
+          "edited_at": {
+            "type": "string",
+            "format": "date-time"
           }
         },
         "required": [
@@ -14992,6 +17650,36 @@
           },
           "wm_version": {
             "type": "string"
+          },
+          "last_job_id": {
+            "type": "string"
+          },
+          "last_job_workspace_id": {
+            "type": "string"
+          },
+          "occupancy_rate": {
+            "type": "number"
+          },
+          "occupancy_rate_15s": {
+            "type": "number"
+          },
+          "occupancy_rate_5m": {
+            "type": "number"
+          },
+          "occupancy_rate_30m": {
+            "type": "number"
+          },
+          "memory": {
+            "type": "number"
+          },
+          "vcpus": {
+            "type": "number"
+          },
+          "memory_usage": {
+            "type": "number"
+          },
+          "wm_memory_usage": {
+            "type": "number"
           }
         },
         "required": [
@@ -15148,6 +17836,12 @@
           }
         ]
       },
+      "ExtraPerms": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "boolean"
+        }
+      },
       "FlowMetadata": {
         "type": "object",
         "properties": {
@@ -15168,10 +17862,7 @@
             "type": "boolean"
           },
           "extra_perms": {
-            "type": "object"
-          },
-          "additionalProperties": {
-            "type": "boolean"
+            "$ref": "#/components/schemas/ExtraPerms"
           },
           "starred": {
             "type": "boolean"
@@ -15291,6 +17982,12 @@
               "type": "object"
             }
           },
+          "triggerables_v2": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
           "execution_mode": {
             "type": "string",
             "enum": [
@@ -15424,7 +18121,9 @@
             "type": "string",
             "format": "date-time"
           },
-          "value": {},
+          "value": {
+            "type": "object"
+          },
           "policy": {
             "$ref": "#/components/schemas/Policy"
           },
@@ -15487,6 +18186,25 @@
           "version"
         ]
       },
+      "FlowVersion": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer"
+          },
+          "created_at": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "deployment_msg": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "created_at"
+        ]
+      },
       "SlackToken": {
         "type": "object",
         "properties": {
@@ -15581,6 +18299,32 @@
           },
           "public_resource": {
             "type": "boolean"
+          },
+          "secondary_storage": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "S3Storage",
+                    "AzureBlobStorage",
+                    "AzureWorkloadIdentity",
+                    "S3AwsOidc"
+                  ]
+                },
+                "s3_resource_path": {
+                  "type": "string"
+                },
+                "azure_blob_resource_path": {
+                  "type": "string"
+                },
+                "public_resource": {
+                  "type": "boolean"
+                }
+              }
+            }
           }
         }
       },
@@ -15709,6 +18453,31 @@
           }
         }
       },
+      "WorkspaceDeployUISettings": {
+        "type": "object",
+        "properties": {
+          "include_path": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "include_type": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "script",
+                "flow",
+                "app",
+                "resource",
+                "variable",
+                "secret"
+              ]
+            }
+          }
+        }
+      },
       "WorkspaceDefaultScripts": {
         "type": "object",
         "properties": {
@@ -15873,7 +18642,10 @@
               "mssql",
               "graphql",
               "nativets",
-              "bun"
+              "bun",
+              "php",
+              "rust",
+              "ansible"
             ]
           }
         },
@@ -15886,21 +18658,144 @@
       "ConcurrencyGroup": {
         "type": "object",
         "properties": {
-          "concurrency_id": {
+          "concurrency_key": {
             "type": "string"
           },
-          "job_uuids": {
+          "total_running": {
+            "type": "number"
+          }
+        },
+        "required": [
+          "concurrency_key",
+          "total_running"
+        ]
+      },
+      "ExtendedJobs": {
+        "type": "object",
+        "properties": {
+          "jobs": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Job"
+            }
+          },
+          "obscured_jobs": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ObscuredJob"
+            }
+          },
+          "omitted_obscured_jobs": {
+            "description": "Obscured jobs omitted for security because of too specific filtering",
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "jobs",
+          "obscured_jobs"
+        ]
+      },
+      "ExportedUser": {
+        "type": "object",
+        "properties": {
+          "email": {
+            "type": "string"
+          },
+          "password_hash": {
+            "type": "string"
+          },
+          "super_admin": {
+            "type": "boolean"
+          },
+          "verified": {
+            "type": "boolean"
+          },
+          "name": {
+            "type": "string"
+          },
+          "company": {
+            "type": "string"
+          },
+          "first_time_user": {
+            "type": "boolean"
+          },
+          "username": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "email",
+          "super_admin",
+          "verified",
+          "first_time_user"
+        ]
+      },
+      "GlobalSetting": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "value": {
+            "type": "object"
+          }
+        },
+        "required": [
+          "name",
+          "value"
+        ]
+      },
+      "Config": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "config": {
+            "type": "object"
+          }
+        },
+        "required": [
+          "name"
+        ]
+      },
+      "ExportedInstanceGroup": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "summary": {
+            "type": "string"
+          },
+          "emails": {
             "type": "array",
             "items": {
               "type": "string"
             }
+          },
+          "id": {
+            "type": "string"
+          },
+          "scim_display_name": {
+            "type": "string"
+          },
+          "external_id": {
+            "type": "string"
           }
         },
         "required": [
-          "concurrency_id",
-          "job_uuids"
+          "name"
         ]
       },
+      "JobSearchHit": {
+        "type": "object",
+        "properties": {
+          "dancer": {
+            "type": "string"
+          }
+        }
+      },
       "StaticTransform": {
         "type": "object",
         "properties": {
@@ -15979,7 +18874,8 @@
               "snowflake",
               "mssql",
               "graphql",
-              "nativets"
+              "nativets",
+              "php"
             ]
           },
           "path": {
@@ -16002,6 +18898,9 @@
           },
           "concurrency_time_window_s": {
             "type": "number"
+          },
+          "custom_concurrency_key": {
+            "type": "string"
           }
         },
         "required": [
@@ -16031,6 +18930,9 @@
             "enum": [
               "script"
             ]
+          },
+          "tag_override": {
+            "type": "string"
           }
         },
         "required": [
@@ -16087,6 +18989,31 @@
               "expr"
             ]
           },
+          "stop_after_all_iters_if": {
+            "type": "object",
+            "properties": {
+              "skip_if_stopped": {
+                "type": "boolean"
+              },
+              "expr": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "expr"
+            ]
+          },
+          "skip_if": {
+            "type": "object",
+            "properties": {
+              "expr": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "expr"
+            ]
+          },
           "sleep": {
             "$ref": "#/components/schemas/InputTransform"
           },
@@ -16139,6 +19066,9 @@
               },
               "hide_cancel": {
                 "type": "boolean"
+              },
+              "continue_on_disapprove_timeout": {
+                "type": "boolean"
               }
             }
           },
@@ -16419,12 +19349,18 @@
           "failure_module": {
             "$ref": "#/components/schemas/FlowModule"
           },
+          "preprocessor_module": {
+            "$ref": "#/components/schemas/FlowModule"
+          },
           "same_worker": {
             "type": "boolean"
           },
           "concurrent_limit": {
             "type": "number"
           },
+          "concurrency_key": {
+            "type": "string"
+          },
           "concurrency_time_window_s": {
             "type": "number"
           },
@@ -16490,6 +19426,9 @@
           "count": {
             "type": "integer"
           },
+          "progress": {
+            "type": "integer"
+          },
           "iterator": {
             "type": "object",
             "properties": {
@@ -16509,6 +19448,12 @@
               "type": "string"
             }
           },
+          "flow_jobs_success": {
+            "type": "array",
+            "items": {
+              "type": "boolean"
+            }
+          },
           "branch_chosen": {
             "type": "object",
             "properties": {
@@ -16559,6 +19504,16 @@
                 "approver"
               ]
             }
+          },
+          "failed_retries": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
+          "skipped": {
+            "type": "boolean"
           }
         },
         "required": [
@@ -16580,6 +19535,13 @@
           "user_states": {
             "additionalProperties": true
           },
+          "preprocessor_module": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/FlowStatusModule"
+              }
+            ]
+          },
           "failure_module": {
             "allOf": [
               {
diff --git a/backend/windmill-api/openapi-deref.yaml b/backend/windmill-api/openapi-deref.yaml
index 9654b10550..e2a0b00a85 100644
--- a/backend/windmill-api/openapi-deref.yaml
+++ b/backend/windmill-api/openapi-deref.yaml
@@ -1,6 +1,6 @@
 openapi: 3.0.3
 info:
-  version: 1.269.0
+  version: 1.409.0
   title: Windmill API
   contact:
     name: Windmill Team
@@ -87,7 +87,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: &ref_24
+          schema: &ref_28
             type: integer
       responses:
         '200':
@@ -221,44 +221,54 @@ paths:
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: &ref_3
+          schema: &ref_5
             type: integer
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: &ref_4
+          schema: &ref_6
             type: integer
         - name: before
-          description: filter on created before (exclusive) timestamp
+          description: filter on started before (inclusive) timestamp
           in: query
-          schema: &ref_102
+          schema: &ref_109
             type: string
             format: date-time
         - name: after
           description: filter on created after (exclusive) timestamp
           in: query
-          schema: &ref_101
+          schema: &ref_110
             type: string
             format: date-time
         - name: username
           description: filter on exact username of user
           in: query
-          schema: &ref_103
+          schema: &ref_119
             type: string
         - name: operation
           description: filter on exact or prefix name of operation
           in: query
-          schema: &ref_104
+          schema: &ref_120
+            type: string
+        - name: operations
+          in: query
+          description: comma separated list of exact operations to include
+          schema:
+            type: string
+        - name: exclude_operations
+          in: query
+          description: comma separated list of operations to exclude
+          schema:
             type: string
         - name: resource
           description: filter on exact or prefix name of resource
           in: query
-          schema: &ref_105
+          schema: &ref_121
             type: string
         - name: action_kind
           description: filter on type of operation
           in: query
-          schema: &ref_106
+          schema: &ref_122
             type: string
             enum:
               - Create
@@ -290,12 +300,12 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_119
+              properties: &ref_136
                 email:
                   type: string
                 password:
                   type: string
-              required: &ref_120
+              required: &ref_137
                 - email
                 - password
       responses:
@@ -332,10 +342,10 @@ paths:
             text/plain:
               schema:
                 type: string
-  /w/{workspace}/users/add:
-    post:
-      summary: create user (require admin privilege)
-      operationId: createUser
+  /w/{workspace}/users/{username}:
+    get:
+      summary: get user (require admin privilege)
+      operationId: getUser
       tags:
         - user
         - admin
@@ -344,31 +354,56 @@ paths:
           in: path
           required: true
           schema: *ref_0
-      requestBody:
-        description: new user
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties: &ref_121
-                email:
-                  type: string
-                username:
-                  type: string
-                is_admin:
-                  type: boolean
-              required: &ref_122
-                - email
-                - username
-                - is_admin
+        - name: username
+          in: path
+          required: true
+          schema:
+            type: string
       responses:
-        '201':
+        '200':
           description: user created
           content:
-            text/plain:
+            application/json:
               schema:
-                type: string
+                type: object
+                properties: &ref_10
+                  email:
+                    type: string
+                  username:
+                    type: string
+                  is_admin:
+                    type: boolean
+                  is_super_admin:
+                    type: boolean
+                  created_at:
+                    type: string
+                    format: date-time
+                  operator:
+                    type: boolean
+                  disabled:
+                    type: boolean
+                  groups:
+                    type: array
+                    items:
+                      type: string
+                  folders:
+                    type: array
+                    items:
+                      type: string
+                  folders_owners:
+                    type: array
+                    items:
+                      type: string
+                required: &ref_11
+                  - email
+                  - username
+                  - is_admin
+                  - is_super_admin
+                  - created_at
+                  - operator
+                  - disabled
+                  - folders
+                  - folders_owners
   /w/{workspace}/users/update/{username}:
     post:
       summary: update user (require admin privilege)
@@ -393,7 +428,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_123
+              properties: &ref_138
                 is_admin:
                   type: boolean
                 operator:
@@ -421,7 +456,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: &ref_17
+          schema: &ref_21
             type: string
       responses:
         '200':
@@ -512,6 +547,8 @@ paths:
               properties:
                 is_super_admin:
                   type: boolean
+                name:
+                  type: string
       responses:
         '200':
           description: user updated
@@ -519,6 +556,74 @@ paths:
             text/plain:
               schema:
                 type: string
+  /users/username_info/{email}:
+    get:
+      summary: global username info (require super admin)
+      operationId: globalUsernameInfo
+      tags:
+        - user
+      parameters:
+        - name: email
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: user renamed
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  username:
+                    type: string
+                  workspace_usernames:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        workspace_id:
+                          type: string
+                        username:
+                          type: string
+                      required:
+                        - workspace_id
+                        - username
+                required:
+                  - username
+                  - workspace_usernames
+  /users/rename/{email}:
+    post:
+      summary: global rename user (require super admin)
+      operationId: globalUserRename
+      tags:
+        - user
+      parameters:
+        - name: email
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        description: new username
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                new_username:
+                  type: string
+              required:
+                - new_username
+      responses:
+        '200':
+          description: user renamed
+          content:
+            text/plain:
+              schema:
+                type: string
   /users/delete/{email}:
     delete:
       summary: global delete user (require super admin)
@@ -538,6 +643,67 @@ paths:
             text/plain:
               schema:
                 type: string
+  /users/overwrite:
+    post:
+      summary: global overwrite users (require super admin and EE)
+      operationId: globalUsersOverwrite
+      tags:
+        - user
+      requestBody:
+        description: List of users
+        required: true
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                type: object
+                properties: &ref_3
+                  email:
+                    type: string
+                  password_hash:
+                    type: string
+                  super_admin:
+                    type: boolean
+                  verified:
+                    type: boolean
+                  name:
+                    type: string
+                  company:
+                    type: string
+                  first_time_user:
+                    type: boolean
+                  username:
+                    type: string
+                required: &ref_4
+                  - email
+                  - super_admin
+                  - verified
+                  - first_time_user
+      responses:
+        '200':
+          description: Success message
+          content:
+            text/plain:
+              schema:
+                type: string
+  /users/export:
+    get:
+      summary: global export users (require super admin and EE)
+      operationId: globalUsersExport
+      tags:
+        - user
+      responses:
+        '200':
+          description: exported users
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: *ref_3
+                  required: *ref_4
   /w/{workspace}/users/delete/{username}:
     delete:
       summary: delete user (require admin privilege)
@@ -577,7 +743,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_5
+                  properties: &ref_7
                     id:
                       type: string
                     name:
@@ -586,7 +752,7 @@ paths:
                       type: string
                     domain:
                       type: string
-                  required: &ref_6
+                  required: &ref_8
                     - id
                     - name
                     - owner
@@ -616,7 +782,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_151
+                properties: &ref_172
                   email:
                     type: string
                   workspaces:
@@ -634,7 +800,7 @@ paths:
                         - id
                         - name
                         - username
-                required: &ref_152
+                required: &ref_173
                   - email
                   - workspaces
   /workspaces/list_as_superadmin:
@@ -647,11 +813,11 @@ paths:
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: *ref_3
+          schema: *ref_5
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: *ref_4
+          schema: *ref_6
       responses:
         '200':
           description: workspaces
@@ -661,8 +827,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_5
-                  required: *ref_6
+                  properties: *ref_7
+                  required: *ref_8
   /workspaces/create:
     post:
       summary: create workspace
@@ -676,17 +842,16 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_153
+              properties: &ref_174
                 id:
                   type: string
                 name:
                   type: string
                 username:
                   type: string
-              required: &ref_154
+              required: &ref_175
                 - id
                 - name
-                - username
       responses:
         '201':
           description: token created
@@ -756,7 +921,7 @@ paths:
         - name: key
           in: path
           required: true
-          schema: &ref_7
+          schema: &ref_9
             type: string
       responses:
         '200':
@@ -773,7 +938,7 @@ paths:
         - name: key
           in: path
           required: true
-          schema: *ref_7
+          schema: *ref_9
       requestBody:
         description: value set
         required: true
@@ -850,6 +1015,33 @@ paths:
             text/plain:
               schema:
                 type: string
+  /settings/test_critical_channels:
+    post:
+      summary: test critical channels
+      operationId: testCriticalChannels
+      tags:
+        - setting
+      requestBody:
+        description: test critical channel payload
+        required: true
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                type: object
+                properties:
+                  email:
+                    type: string
+                  slack_channel:
+                    type: string
+      responses:
+        '200':
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
   /settings/test_license_key:
     post:
       summary: test license key
@@ -875,6 +1067,27 @@ paths:
             text/plain:
               schema:
                 type: string
+  /settings/test_object_storage_config:
+    post:
+      summary: test object storage config
+      operationId: testObjectStorageConfig
+      tags:
+        - setting
+      requestBody:
+        description: test object storage config
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              additionalProperties: true
+      responses:
+        '200':
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
   /settings/send_stats:
     post:
       summary: send stats
@@ -888,6 +1101,110 @@ paths:
             text/plain:
               schema:
                 type: string
+  /settings/latest_key_renewal_attempt:
+    get:
+      summary: get latest key renewal attempt
+      operationId: getLatestKeyRenewalAttempt
+      tags:
+        - setting
+      responses:
+        '200':
+          description: status
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  result:
+                    type: string
+                  attempted_at:
+                    type: string
+                    format: date-time
+                required:
+                  - result
+                  - attempted_at
+                nullable: true
+  /settings/renew_license_key:
+    post:
+      summary: renew license key
+      operationId: renewLicenseKey
+      tags:
+        - setting
+      parameters:
+        - name: license_key
+          in: query
+          required: false
+          schema:
+            type: string
+      responses:
+        '200':
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
+  /settings/customer_portal:
+    post:
+      summary: create customer portal session
+      operationId: createCustomerPortalSession
+      tags:
+        - setting
+      parameters:
+        - name: license_key
+          in: query
+          required: false
+          schema:
+            type: string
+      responses:
+        '200':
+          description: url to portal
+          content:
+            text/plain:
+              schema:
+                type: string
+  /saml/test_metadata:
+    post:
+      summary: test metadata
+      operationId: testMetadata
+      tags:
+        - setting
+      requestBody:
+        description: test metadata
+        required: true
+        content:
+          application/json:
+            schema:
+              type: string
+      responses:
+        '200':
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
+  /settings/list_global:
+    get:
+      summary: list global settings
+      operationId: listGlobalSettings
+      tags:
+        - setting
+      responses:
+        '200':
+          description: list of settings
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: &ref_214
+                    name:
+                      type: string
+                    value:
+                      type: object
+                  required: &ref_215
+                    - name
+                    - value
   /users/email:
     get:
       summary: get current user email (if logged in)
@@ -1026,7 +1343,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_10
+                properties: &ref_12
                   email:
                     type: string
                   login_type:
@@ -1042,7 +1359,9 @@ paths:
                     type: string
                   company:
                     type: string
-                required: &ref_11
+                  username:
+                    type: string
+                required: &ref_13
                   - email
                   - login_type
                   - super_admin
@@ -1062,7 +1381,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_12
+                  properties: &ref_14
                     workspace_id:
                       type: string
                     email:
@@ -1071,7 +1390,7 @@ paths:
                       type: boolean
                     operator:
                       type: boolean
-                  required: &ref_13
+                  required: &ref_15
                     - workspace_id
                     - email
                     - is_admin
@@ -1094,49 +1413,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_8
-                  email:
-                    type: string
-                  username:
-                    type: string
-                  is_admin:
-                    type: boolean
-                  is_super_admin:
-                    type: boolean
-                  created_at:
-                    type: string
-                    format: date-time
-                  operator:
-                    type: boolean
-                  disabled:
-                    type: boolean
-                  groups:
-                    type: array
-                    items:
-                      type: string
-                  folders:
-                    type: array
-                    items:
-                      type: string
-                  folders_owners:
-                    type: array
-                    items:
-                      type: string
-                  usage:
-                    type: object
-                    properties: &ref_118
-                      executions:
-                        type: number
-                required: &ref_9
-                  - email
-                  - username
-                  - is_admin
-                  - is_super_admin
-                  - created_at
-                  - operator
-                  - disabled
-                  - folders
-                  - folders_owners
+                properties: *ref_10
+                required: *ref_11
   /users/accept_invite:
     post:
       summary: accept invite to workspace
@@ -1157,7 +1435,6 @@ paths:
                   type: string
               required:
                 - workspace_id
-                - username
       responses:
         '200':
           description: status
@@ -1257,7 +1534,6 @@ paths:
                 - email
                 - is_admin
                 - operator
-                - username
       responses:
         '200':
           description: status
@@ -1373,6 +1649,82 @@ paths:
             text/plain:
               schema:
                 type: string
+  /w/{workspace}/workspaces/get_workspace_name:
+    get:
+      summary: get workspace name
+      operationId: getWorkspaceName
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      responses:
+        '200':
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/workspaces/change_workspace_name:
+    post:
+      summary: change workspace name
+      operationId: changeWorkspaceName
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                new_name:
+                  type: string
+              required:
+                - username
+      responses:
+        '200':
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/workspaces/change_workspace_id:
+    post:
+      summary: change workspace id
+      operationId: changeWorkspaceId
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                new_id:
+                  type: string
+                new_name:
+                  type: string
+              required:
+                - username
+      responses:
+        '200':
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
   /w/{workspace}/users/whois/{username}:
     get:
       summary: whois
@@ -1396,8 +1748,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_8
-                required: *ref_9
+                properties: *ref_10
+                required: *ref_11
   /users/exists/{email}:
     get:
       summary: exists email
@@ -1427,11 +1779,11 @@ paths:
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: *ref_3
+          schema: *ref_5
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: *ref_4
+          schema: *ref_6
       responses:
         '200':
           description: user
@@ -1441,8 +1793,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_10
-                  required: *ref_11
+                  properties: *ref_12
+                  required: *ref_13
   /w/{workspace}/workspaces/list_pending_invites:
     get:
       summary: list pending invites for a workspace
@@ -1463,8 +1815,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_12
-                  required: *ref_13
+                  properties: *ref_14
+                  required: *ref_15
   /w/{workspace}/workspaces/get_settings:
     get:
       summary: get settings
@@ -1500,6 +1852,8 @@ paths:
                     type: boolean
                   plan:
                     type: string
+                  automatic_billing:
+                    type: boolean
                   customer_id:
                     type: string
                   webhook:
@@ -1514,26 +1868,46 @@ paths:
                     type: string
                   error_handler_extra_args:
                     type: object
-                    additionalProperties: &ref_14 {}
+                    additionalProperties: &ref_16 {}
                   error_handler_muted_on_cancel:
                     type: boolean
                   large_file_storage:
                     type: object
-                    properties: &ref_15
+                    properties: &ref_17
                       type:
                         type: string
                         enum:
                           - S3Storage
                           - AzureBlobStorage
+                          - AzureWorkloadIdentity
+                          - S3AwsOidc
                       s3_resource_path:
                         type: string
                       azure_blob_resource_path:
                         type: string
                       public_resource:
                         type: boolean
+                      secondary_storage:
+                        type: object
+                        additionalProperties:
+                          type: object
+                          properties:
+                            type:
+                              type: string
+                              enum:
+                                - S3Storage
+                                - AzureBlobStorage
+                                - AzureWorkloadIdentity
+                                - S3AwsOidc
+                            s3_resource_path:
+                              type: string
+                            azure_blob_resource_path:
+                              type: string
+                            public_resource:
+                              type: boolean
                   git_sync:
                     type: object
-                    properties: &ref_16
+                    properties: &ref_18
                       include_path:
                         type: array
                         items:
@@ -1552,24 +1926,78 @@ paths:
                             - secret
                             - resourcetype
                             - schedule
+                            - user
+                            - group
                       repositories:
                         type: array
                         items:
                           type: object
-                          properties: &ref_174
+                          properties: &ref_198
                             script_path:
                               type: string
                             git_repo_resource_path:
                               type: string
                             use_individual_branch:
                               type: boolean
-                          required: &ref_175
+                            group_by_folder:
+                              type: boolean
+                            exclude_types_override:
+                              type: array
+                              items:
+                                type: string
+                                enum:
+                                  - script
+                                  - flow
+                                  - app
+                                  - folder
+                                  - resource
+                                  - variable
+                                  - secret
+                                  - resourcetype
+                                  - schedule
+                                  - user
+                                  - group
+                          required: &ref_199
                             - script_path
                             - git_repo_resource_path
+                  deploy_ui:
+                    type: object
+                    properties: &ref_19
+                      include_path:
+                        type: array
+                        items:
+                          type: string
+                      include_type:
+                        type: array
+                        items:
+                          type: string
+                          enum:
+                            - script
+                            - flow
+                            - app
+                            - resource
+                            - variable
+                            - secret
                   default_app:
                     type: string
+                  default_scripts:
+                    type: object
+                    properties: &ref_20
+                      order:
+                        type: array
+                        items:
+                          type: string
+                      hidden:
+                        type: array
+                        items:
+                          type: string
+                      default_script_content:
+                        additionalProperties:
+                          type: string
                 required:
                   - code_completion_enabled
+                  - automatic_billing
+                  - error_handler_muted_on_cancel
   /w/{workspace}/workspaces/get_deploy_to:
     get:
       summary: get deploy to
@@ -1634,8 +2062,43 @@ paths:
                     type: number
                   seats:
                     type: number
+                  automatic_billing:
+                    type: boolean
                 required:
                   - premium
+                  - automatic_billing
+  /w/{workspace}/workspaces/set_automatic_billing:
+    post:
+      summary: set automatic billing
+      operationId: setAutomaticBilling
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: automatic billing
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                automatic_billing:
+                  type: boolean
+                seats:
+                  type: number
+              required:
+                - automatic_billing
+      responses:
+        '200':
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
   /w/{workspace}/workspaces/edit_slack_command:
     post:
       summary: edit slack command
@@ -1867,7 +2330,7 @@ paths:
                   type: string
                 error_handler_extra_args:
                   type: object
-                  additionalProperties: *ref_14
+                  additionalProperties: *ref_16
                 error_handler_muted_on_cancel:
                   type: boolean
       responses:
@@ -1898,7 +2361,7 @@ paths:
               properties:
                 large_file_storage:
                   type: object
-                  properties: *ref_15
+                  properties: *ref_17
       responses:
         '200':
           description: status
@@ -1926,7 +2389,35 @@ paths:
               properties:
                 git_sync_settings:
                   type: object
-                  properties: *ref_16
+                  properties: *ref_18
+      responses:
+        '200':
+          description: status
+          content:
+            application/json:
+              schema: {}
+  /w/{workspace}/workspaces/edit_deploy_ui_config:
+    post:
+      summary: edit workspace deploy ui settings
+      operationId: editWorkspaceDeployUISettings
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: Workspace deploy UI settings
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                deploy_ui_settings:
+                  type: object
+                  properties: *ref_19
       responses:
         '200':
           description: status
@@ -1961,6 +2452,81 @@ paths:
             text/plain:
               schema:
                 type: string
+  /w/{workspace}/workspaces/default_scripts:
+    post:
+      summary: edit default scripts for workspace
+      operationId: editDefaultScripts
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: Workspace default app
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: *ref_20
+      responses:
+        '200':
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
+    get:
+      summary: get default scripts for workspace
+      operationId: get default scripts
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      responses:
+        '200':
+          description: status
+          content:
+            application/json:
+              schema:
+                type: object
+                properties: *ref_20
+  /w/{workspace}/workspaces/set_environment_variable:
+    post:
+      summary: set environment variable
+      operationId: setEnvironmentVariable
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: Workspace default app
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                name:
+                  type: string
+                value:
+                  type: string
+              required:
+                - name
+      responses:
+        '200':
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
   /w/{workspace}/workspaces/encryption_key:
     get:
       summary: retrieves the encryption key for this workspace
@@ -2004,6 +2570,8 @@ paths:
               properties:
                 new_key:
                   type: string
+                skip_reencrypt:
+                  type: boolean
               required:
                 - new_key
       responses:
@@ -2052,7 +2620,25 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_15
+                properties: *ref_17
+  /w/{workspace}/workspaces/usage:
+    get:
+      summary: get usage
+      operationId: getWorkspaceUsage
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      responses:
+        '200':
+          description: usage
+          content:
+            text/plain:
+              schema:
+                type: number
   /w/{workspace}/users/list:
     get:
       summary: list users
@@ -2073,8 +2659,33 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_8
-                  required: *ref_9
+                  properties: *ref_10
+                  required: *ref_11
+  /w/{workspace}/users/list_usage:
+    get:
+      summary: list users usage
+      operationId: listUsersUsage
+      tags:
+        - user
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      responses:
+        '200':
+          description: user
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: &ref_135
+                    email:
+                      type: string
+                    executions:
+                      type: number
   /w/{workspace}/users/list_usernames:
     get:
       summary: list usernames
@@ -2095,6 +2706,29 @@ paths:
                 type: array
                 items:
                   type: string
+  /w/{workspace}/users/username_to_email/{username}:
+    get:
+      summary: get email from username
+      operationId: usernameToEmail
+      tags:
+        - user
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: username
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: email
+          content:
+            text/plain:
+              schema:
+                type: string
   /users/tokens/create:
     post:
       summary: create token
@@ -2108,7 +2742,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_126
+              properties: &ref_139
                 label:
                   type: string
                 expiration:
@@ -2118,6 +2752,8 @@ paths:
                   type: array
                   items:
                     type: string
+                workspace_id:
+                  type: string
       responses:
         '201':
           description: token created
@@ -2138,7 +2774,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_127
+              properties: &ref_140
                 label:
                   type: string
                 expiration:
@@ -2146,7 +2782,9 @@ paths:
                   format: date-time
                 impersonate_email:
                   type: string
-              required: &ref_128
+                workspace_id:
+                  type: string
+              required: &ref_141
                 - impersonate_email
       responses:
         '201':
@@ -2185,6 +2823,14 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: page
+          description: which page to return (start at 1, default 1)
+          in: query
+          schema: *ref_5
+        - name: per_page
+          description: number of items to return for a given page (default 30, max 100)
+          in: query
+          schema: *ref_6
       responses:
         '200':
           description: truncated token
@@ -2194,7 +2840,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_124
+                  properties: &ref_38
                     label:
                       type: string
                     expiration:
@@ -2212,7 +2858,9 @@ paths:
                       type: array
                       items:
                         type: string
-                  required: &ref_125
+                    email:
+                      type: string
+                  required: &ref_39
                     - token_prefix
                     - created_at
                     - last_used_at
@@ -2261,7 +2909,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_131
+              properties: &ref_144
                 path:
                   type: string
                 value:
@@ -2274,7 +2922,10 @@ paths:
                   type: integer
                 is_oauth:
                   type: boolean
-              required: &ref_132
+                expires_at:
+                  type: string
+                  format: date-time
+              required: &ref_145
                 - path
                 - value
                 - is_secret
@@ -2325,7 +2976,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: variable deleted
@@ -2347,7 +2998,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
         - name: already_encrypted
           in: query
           schema:
@@ -2359,7 +3010,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_133
+              properties: &ref_146
                 path:
                   type: string
                 value:
@@ -2389,7 +3040,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
         - name: decrypt_secret
           description: |
             ask to decrypt secret if this variable is secret
@@ -2411,7 +3062,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_18
+                properties: &ref_22
                   workspace_id:
                     type: string
                   path:
@@ -2438,7 +3089,10 @@ paths:
                     type: boolean
                   is_refreshed:
                     type: boolean
-                required: &ref_19
+                  expires_at:
+                    type: string
+                    format: date-time
+                required: &ref_23
                   - workspace_id
                   - path
                   - is_secret
@@ -2457,7 +3111,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: variable
@@ -2479,7 +3133,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: variable
@@ -2498,6 +3152,18 @@ paths:
           in: path
           required: true
           schema: *ref_0
+        - name: path_start
+          in: query
+          schema:
+            type: string
+        - name: page
+          description: which page to return (start at 1, default 1)
+          in: query
+          schema: *ref_5
+        - name: per_page
+          description: number of items to return for a given page (default 30, max 100)
+          in: query
+          schema: *ref_6
       responses:
         '200':
           description: variable list
@@ -2507,8 +3173,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_18
-                  required: *ref_19
+                  properties: *ref_22
+                  required: *ref_23
   /w/{workspace}/variables/list_contextual:
     get:
       summary: list contextual variables
@@ -2529,17 +3195,20 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_129
+                  properties: &ref_142
                     name:
                       type: string
                     value:
                       type: string
                     description:
                       type: string
-                  required: &ref_130
+                    is_custom:
+                      type: boolean
+                  required: &ref_143
                     - name
                     - value
                     - description
+                    - is_custom
   /oauth/login_callback/{client_name}:
     post:
       security: []
@@ -2551,7 +3220,7 @@ paths:
         - name: client_name
           in: path
           required: true
-          schema: &ref_20
+          schema: &ref_24
             type: string
       requestBody:
         description: Partially filled script
@@ -2614,6 +3283,34 @@ paths:
             text/plain:
               schema:
                 type: string
+  /oauth/connect_slack_callback:
+    post:
+      summary: connect slack callback instance
+      operationId: connectSlackCallbackInstance
+      tags:
+        - oauth
+      requestBody:
+        description: code endpoint
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                code:
+                  type: string
+                state:
+                  type: string
+              required:
+                - code
+                - state
+      responses:
+        '200':
+          description: success message
+          content:
+            text/plain:
+              schema:
+                type: string
   /oauth/connect_callback/{client_name}:
     post:
       summary: connect callback
@@ -2624,7 +3321,7 @@ paths:
         - name: client_name
           in: path
           required: true
-          schema: *ref_20
+          schema: *ref_24
       requestBody:
         description: code endpoint
         required: true
@@ -2647,7 +3344,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_167
+                properties: &ref_191
                   access_token:
                     type: string
                   expires_in:
@@ -2658,7 +3355,7 @@ paths:
                     type: array
                     items:
                       type: string
-                required: &ref_168
+                required: &ref_192
                   - access_token
   /w/{workspace}/oauth/create_account:
     post:
@@ -2709,7 +3406,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: &ref_21
+          schema: &ref_25
             type: integer
       requestBody:
         description: variable path
@@ -2744,7 +3441,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_21
+          schema: *ref_25
       responses:
         '200':
           description: disconnected client
@@ -2787,7 +3484,14 @@ paths:
                   oauth:
                     type: array
                     items:
-                      type: string
+                      type: object
+                      properties:
+                        type:
+                          type: string
+                        display_name:
+                          type: string
+                      required:
+                        - type
                   saml:
                     type: string
                 required:
@@ -2804,16 +3508,36 @@ paths:
           content:
             application/json:
               schema:
-                additionalProperties:
-                  type: object
-                  properties:
-                    extra_params:
-                      additionalProperties:
-                        type: string
-                    scopes:
-                      type: array
-                      items:
-                        type: string
+                type: array
+                items:
+                  type: string
+  /oauth/get_connect/{client}:
+    get:
+      summary: get oauth connect
+      operationId: getOAuthConnect
+      tags:
+        - oauth
+      parameters:
+        - name: client
+          description: client name
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: get
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  extra_params:
+                    type: object
+                  scopes:
+                    type: array
+                    items:
+                      type: string
   /w/{workspace}/resources/create:
     post:
       summary: create resource
@@ -2836,7 +3560,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_136
+              properties: &ref_153
                 path:
                   type: string
                 value: {}
@@ -2844,7 +3568,7 @@ paths:
                   type: string
                 resource_type:
                   type: string
-              required: &ref_137
+              required: &ref_154
                 - path
                 - value
                 - resource_type
@@ -2869,7 +3593,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: resource deleted
@@ -2891,7 +3615,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       requestBody:
         description: updated resource
         required: true
@@ -2899,7 +3623,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_138
+              properties: &ref_155
                 path:
                   type: string
                 description:
@@ -2926,7 +3650,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       requestBody:
         description: updated resource
         required: true
@@ -2957,7 +3681,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: resource
@@ -2965,7 +3689,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_139
+                properties: &ref_156
                   workspace_id:
                     type: string
                   path:
@@ -2981,7 +3705,12 @@ paths:
                     type: object
                     additionalProperties:
                       type: boolean
-                required: &ref_140
+                  created_by:
+                    type: string
+                  edited_at:
+                    type: string
+                    format: date-time
+                required: &ref_157
                   - path
                   - resource_type
                   - is_oauth
@@ -2999,7 +3728,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
         - name: job_id
           description: job id
           in: query
@@ -3026,7 +3755,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: resource value
@@ -3047,7 +3776,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: does resource exists
@@ -3069,11 +3798,11 @@ paths:
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: *ref_3
+          schema: *ref_5
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: *ref_4
+          schema: *ref_6
         - name: resource_type
           description: resource_types to list from, separated by ',',
           in: query
@@ -3084,6 +3813,10 @@ paths:
           in: query
           schema:
             type: string
+        - name: path_start
+          in: query
+          schema:
+            type: string
       responses:
         '200':
           description: resource list
@@ -3093,7 +3826,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_141
+                  properties: &ref_158
                     workspace_id:
                       type: string
                     path:
@@ -3119,7 +3852,12 @@ paths:
                       type: boolean
                     account:
                       type: number
-                  required: &ref_142
+                    created_by:
+                      type: string
+                    edited_at:
+                      type: string
+                      format: date-time
+                  required: &ref_159
                     - path
                     - resource_type
                     - is_oauth
@@ -3166,7 +3904,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: &ref_80
+          schema: &ref_92
             type: string
       responses:
         '200':
@@ -3203,7 +3941,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_22
+              properties: &ref_26
                 workspace_id:
                   type: string
                 name:
@@ -3211,7 +3949,14 @@ paths:
                 schema: {}
                 description:
                   type: string
-              required: &ref_23
+                created_by:
+                  type: string
+                edited_at:
+                  type: string
+                  format: date-time
+                format_extension:
+                  type: string
+              required: &ref_27
                 - name
       responses:
         '201':
@@ -3220,6 +3965,23 @@ paths:
             text/plain:
               schema:
                 type: string
+  /w/{workspace}/resources/file_resource_type_to_file_ext_map:
+    get:
+      summary: get map from resource type to format extension
+      operationId: fileResourceTypeToFileExtMap
+      tags:
+        - resource
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      responses:
+        '200':
+          description: map from resource type to file ext
+          content:
+            application/json:
+              schema: {}
   /w/{workspace}/resources/type/delete/{path}:
     delete:
       summary: delete resource_type
@@ -3234,7 +3996,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: resource_type deleted
@@ -3256,7 +4018,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       requestBody:
         description: updated resource_type
         required: true
@@ -3264,7 +4026,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_143
+              properties: &ref_160
                 schema: {}
                 description:
                   type: string
@@ -3289,7 +4051,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: resource_type deleted
@@ -3297,8 +4059,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_22
-                required: *ref_23
+                properties: *ref_26
+                required: *ref_27
   /w/{workspace}/resources/type/exists/{path}:
     get:
       summary: does resource_type exists
@@ -3313,7 +4075,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: does resource_type exist
@@ -3341,8 +4103,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_22
-                  required: *ref_23
+                  properties: *ref_26
+                  required: *ref_27
   /w/{workspace}/resources/type/listnames:
     get:
       summary: list resource_types names
@@ -3481,7 +4243,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_24
+          schema: *ref_28
       responses:
         '200':
           description: flow
@@ -3492,51 +4254,51 @@ paths:
                 properties:
                   flow:
                     type: object
-                    properties: &ref_43
+                    properties: &ref_50
                       summary:
                         type: string
                       description:
                         type: string
                       value:
                         type: object
-                        properties: &ref_50
+                        properties: &ref_58
                           modules:
                             type: array
                             items:
                               type: object
-                              properties: &ref_27
+                              properties: &ref_31
                                 id:
                                   type: string
                                 value:
-                                  oneOf: &ref_206
+                                  oneOf: &ref_239
                                     - type: object
-                                      properties: &ref_192
+                                      properties: &ref_223
                                         input_transforms:
                                           type: object
                                           additionalProperties:
-                                            oneOf: &ref_25
+                                            oneOf: &ref_29
                                               - type: object
-                                                properties: &ref_188
+                                                properties: &ref_219
                                                   value: {}
                                                   type:
                                                     type: string
                                                     enum:
                                                       - javascript
-                                                required: &ref_189
+                                                required: &ref_220
                                                   - expr
                                                   - type
                                               - type: object
-                                                properties: &ref_190
+                                                properties: &ref_221
                                                   expr:
                                                     type: string
                                                   type:
                                                     type: string
                                                     enum:
                                                       - javascript
-                                                required: &ref_191
+                                                required: &ref_222
                                                   - expr
                                                   - type
-                                            discriminator: &ref_26
+                                            discriminator: &ref_30
                                               propertyName: type
                                               mapping:
                                                 static: '#/components/schemas/StaticTransform'
@@ -3559,6 +4321,7 @@ paths:
                                             - mssql
                                             - graphql
                                             - nativets
+                                            - php
                                         path:
                                           type: string
                                         lock:
@@ -3573,18 +4336,20 @@ paths:
                                           type: number
                                         concurrency_time_window_s:
                                           type: number
-                                      required: &ref_193
+                                        custom_concurrency_key:
+                                          type: string
+                                      required: &ref_224
                                         - type
                                         - content
                                         - language
                                         - input_transforms
                                     - type: object
-                                      properties: &ref_194
+                                      properties: &ref_225
                                         input_transforms:
                                           type: object
                                           additionalProperties:
-                                            oneOf: *ref_25
-                                            discriminator: *ref_26
+                                            oneOf: *ref_29
+                                            discriminator: *ref_30
                                         path:
                                           type: string
                                         hash:
@@ -3593,40 +4358,42 @@ paths:
                                           type: string
                                           enum:
                                             - script
-                                      required: &ref_195
+                                        tag_override:
+                                          type: string
+                                      required: &ref_226
                                         - type
                                         - path
                                         - input_transforms
                                     - type: object
-                                      properties: &ref_196
+                                      properties: &ref_227
                                         input_transforms:
                                           type: object
                                           additionalProperties:
-                                            oneOf: *ref_25
-                                            discriminator: *ref_26
+                                            oneOf: *ref_29
+                                            discriminator: *ref_30
                                         path:
                                           type: string
                                         type:
                                           type: string
                                           enum:
                                             - flow
-                                      required: &ref_197
+                                      required: &ref_228
                                         - type
                                         - path
                                         - input_transforms
                                     - type: object
-                                      properties: &ref_198
+                                      properties: &ref_229
                                         modules:
                                           type: array
                                           items:
                                             type: object
-                                            properties: *ref_27
-                                            required: &ref_28
+                                            properties: *ref_31
+                                            required: &ref_32
                                               - value
                                               - id
                                         iterator:
-                                          oneOf: *ref_25
-                                          discriminator: *ref_26
+                                          oneOf: *ref_29
+                                          discriminator: *ref_30
                                         skip_failures:
                                           type: boolean
                                         type:
@@ -3637,13 +4404,35 @@ paths:
                                           type: boolean
                                         parallelism:
                                           type: integer
-                                      required: &ref_199
+                                      required: &ref_230
                                         - modules
                                         - iterator
                                         - skip_failures
                                         - type
                                     - type: object
-                                      properties: &ref_200
+                                      properties: &ref_231
+                                        modules:
+                                          type: array
+                                          items:
+                                            type: object
+                                            properties: *ref_31
+                                            required: *ref_32
+                                        skip_failures:
+                                          type: boolean
+                                        type:
+                                          type: string
+                                          enum:
+                                            - forloopflow
+                                        parallel:
+                                          type: boolean
+                                        parallelism:
+                                          type: integer
+                                      required: &ref_232
+                                        - modules
+                                        - skip_failures
+                                        - type
+                                    - type: object
+                                      properties: &ref_233
                                         branches:
                                           type: array
                                           items:
@@ -3657,8 +4446,8 @@ paths:
                                                 type: array
                                                 items:
                                                   type: object
-                                                  properties: *ref_27
-                                                  required: *ref_28
+                                                  properties: *ref_31
+                                                  required: *ref_32
                                             required:
                                               - modules
                                               - expr
@@ -3666,20 +4455,20 @@ paths:
                                           type: array
                                           items:
                                             type: object
-                                            properties: *ref_27
-                                            required: *ref_28
+                                            properties: *ref_31
+                                            required: *ref_32
                                           required:
                                             - modules
                                         type:
                                           type: string
                                           enum:
                                             - branchone
-                                      required: &ref_201
+                                      required: &ref_234
                                         - branches
                                         - default
                                         - type
                                     - type: object
-                                      properties: &ref_202
+                                      properties: &ref_235
                                         branches:
                                           type: array
                                           items:
@@ -3693,8 +4482,8 @@ paths:
                                                 type: array
                                                 items:
                                                   type: object
-                                                  properties: *ref_27
-                                                  required: *ref_28
+                                                  properties: *ref_31
+                                                  required: *ref_32
                                             required:
                                               - modules
                                               - expr
@@ -3704,26 +4493,27 @@ paths:
                                             - branchall
                                         parallel:
                                           type: boolean
-                                      required: &ref_203
+                                      required: &ref_236
                                         - branches
                                         - type
                                     - type: object
-                                      properties: &ref_204
+                                      properties: &ref_237
                                         type:
                                           type: string
                                           enum:
                                             - identity
                                         flow:
                                           type: boolean
-                                      required: &ref_205
+                                      required: &ref_238
                                         - type
-                                  discriminator: &ref_207
+                                  discriminator: &ref_240
                                     propertyName: type
                                     mapping:
                                       rawscript: '#/components/schemas/RawScript'
                                       script: '#/components/schemas/PathScript'
                                       flow: '#/components/schemas/PathFlow'
                                       forloopflow: '#/components/schemas/ForloopFlow'
+                                      whileloopflow: '#/components/schemas/WhileloopFlow'
                                       branchone: '#/components/schemas/BranchOne'
                                       branchall: '#/components/schemas/BranchAll'
                                       identity: '#/components/schemas/Identity'
@@ -3736,9 +4526,25 @@ paths:
                                       type: string
                                   required:
                                     - expr
+                                stop_after_all_iters_if:
+                                  type: object
+                                  properties:
+                                    skip_if_stopped:
+                                      type: boolean
+                                    expr:
+                                      type: string
+                                  required:
+                                    - expr
+                                skip_if:
+                                  type: object
+                                  properties:
+                                    expr:
+                                      type: string
+                                  required:
+                                    - expr
                                 sleep:
-                                  oneOf: *ref_25
-                                  discriminator: *ref_26
+                                  oneOf: *ref_29
+                                  discriminator: *ref_30
                                 cache_ttl:
                                   type: number
                                 timeout:
@@ -3768,15 +4574,21 @@ paths:
                                     user_auth_required:
                                       type: boolean
                                     user_groups_required:
-                                      oneOf: *ref_25
-                                      discriminator: *ref_26
+                                      oneOf: *ref_29
+                                      discriminator: *ref_30
                                     self_approval_disabled:
                                       type: boolean
+                                    hide_cancel:
+                                      type: boolean
+                                    continue_on_disapprove_timeout:
+                                      type: boolean
                                 priority:
                                   type: number
+                                continue_on_error:
+                                  type: boolean
                                 retry:
                                   type: object
-                                  properties: &ref_77
+                                  properties: &ref_87
                                     constant:
                                       type: object
                                       properties:
@@ -3797,15 +4609,21 @@ paths:
                                           type: integer
                                           minimum: 0
                                           maximum: 100
-                              required: *ref_28
+                              required: *ref_32
                           failure_module:
                             type: object
-                            properties: *ref_27
-                            required: *ref_28
+                            properties: *ref_31
+                            required: *ref_32
+                          preprocessor_module:
+                            type: object
+                            properties: *ref_31
+                            required: *ref_32
                           same_worker:
                             type: boolean
                           concurrent_limit:
                             type: number
+                          concurrency_key:
+                            type: string
                           concurrency_time_window_s:
                             type: number
                           skip_expr:
@@ -3816,11 +4634,11 @@ paths:
                             type: number
                           early_return:
                             type: string
-                        required: &ref_51
+                        required: &ref_59
                           - modules
                       schema:
                         type: object
-                    required: &ref_44
+                    required: &ref_51
                       - summary
                       - value
   /apps/hub/list:
@@ -3873,7 +4691,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_24
+          schema: *ref_28
       responses:
         '200':
           description: app
@@ -3903,7 +4721,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: &ref_29
+          schema: &ref_33
             type: string
       responses:
         '200':
@@ -3922,7 +4740,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: script details
@@ -3993,7 +4811,7 @@ paths:
                           type: number
                         kind:
                           name: kind
-                          schema: &ref_30
+                          schema: &ref_34
                             type: string
                             enum:
                               - script
@@ -4066,7 +4884,7 @@ paths:
                       type: string
                     kind:
                       name: kind
-                      schema: *ref_30
+                      schema: *ref_34
                     score:
                       type: number
                   required:
@@ -4119,20 +4937,20 @@ paths:
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: *ref_3
+          schema: *ref_5
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: *ref_4
+          schema: *ref_6
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: &ref_41
+          schema: &ref_48
             type: boolean
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: &ref_42
+          schema: &ref_49
             type: string
         - name: path_start
           description: mask to filter matching starting path
@@ -4182,7 +5000,7 @@ paths:
           description: >
             (default false)
 
-            show also the archived files.
+            show only the archived files.
 
             when multiple archived hash share the same path, only the ones with
             the latest create_at
@@ -4193,6 +5011,20 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: include_without_main
+          description: |
+            (default false)
+            include scripts without an exported main function
+          in: query
+          schema:
+            type: boolean
+        - name: include_draft_only
+          description: |
+            (default false)
+            include scripts that have no deployed version
+          in: query
+          schema:
+            type: boolean
         - name: is_template
           description: |
             (default regardless)
@@ -4216,6 +5048,13 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: with_deployment_msg
+          description: |
+            (default false)
+            include deployment message
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: All scripts
@@ -4225,7 +5064,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_31
+                  properties: &ref_35
                     workspace_id:
                       type: string
                     hash:
@@ -4282,6 +5121,9 @@ paths:
                         - graphql
                         - nativets
                         - bun
+                        - php
+                        - rust
+                        - ansible
                     kind:
                       type: string
                       enum:
@@ -4306,6 +5148,8 @@ paths:
                       type: integer
                     concurrency_time_window_s:
                       type: integer
+                    concurrency_key:
+                      type: string
                     cache_ttl:
                       type: number
                     dedicated_worker:
@@ -4320,7 +5164,15 @@ paths:
                       type: integer
                     delete_after_use:
                       type: boolean
-                  required: &ref_32
+                    visible_to_runner_only:
+                      type: boolean
+                    no_main_func:
+                      type: boolean
+                    codebase:
+                      type: string
+                    has_preprocessor:
+                      type: boolean
+                  required: &ref_36
                     - hash
                     - path
                     - summary
@@ -4335,6 +5187,8 @@ paths:
                     - language
                     - kind
                     - starred
+                    - no_main_func
+                    - has_preprocessor
   /w/{workspace}/scripts/list_paths:
     get:
       summary: list all scripts paths
@@ -4416,7 +5270,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: draft deleted
@@ -4442,7 +5296,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_34
+              properties: &ref_40
                 path:
                   type: string
                 parent_hash:
@@ -4475,6 +5329,9 @@ paths:
                     - graphql
                     - nativets
                     - bun
+                    - php
+                    - rust
+                    - ansible
                 kind:
                   type: string
                   enum:
@@ -4513,7 +5370,15 @@ paths:
                   type: string
                 concurrency_key:
                   type: string
-              required: &ref_35
+                visible_to_runner_only:
+                  type: boolean
+                no_main_func:
+                  type: boolean
+                codebase:
+                  type: string
+                has_preprocessor:
+                  type: boolean
+              required: &ref_41
                 - path
                 - summary
                 - description
@@ -4540,7 +5405,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       requestBody:
         description: Workspace error handler enabled
         required: true
@@ -4617,7 +5482,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: script archived
@@ -4639,7 +5504,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: &ref_33
+          schema: &ref_37
             type: string
       responses:
         '200':
@@ -4648,8 +5513,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_31
-                required: *ref_32
+                properties: *ref_35
+                required: *ref_36
   /w/{workspace}/scripts/delete/h/{hash}:
     post:
       summary: delete script by hash (erase content but keep hash, require admin)
@@ -4664,7 +5529,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_33
+          schema: *ref_37
       responses:
         '200':
           description: script details
@@ -4672,8 +5537,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_31
-                required: *ref_32
+                properties: *ref_35
+                required: *ref_36
   /w/{workspace}/scripts/delete/p/{path}:
     post:
       summary: delete all scripts at a given path (require admin)
@@ -4688,7 +5553,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: script path
@@ -4710,7 +5575,11 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
+        - name: with_starred_info
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: script details
@@ -4718,8 +5587,70 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_31
-                required: *ref_32
+                properties: *ref_35
+                required: *ref_36
+  /w/{workspace}/scripts/get_triggers_count/{path}:
+    get:
+      summary: get triggers count of script
+      operationId: getTriggersCountOfScript
+      tags:
+        - script
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_33
+      responses:
+        '200':
+          description: triggers count
+          content:
+            application/json:
+              schema:
+                type: object
+                properties: &ref_53
+                  primary_schedule:
+                    type: object
+                    properties:
+                      schedule:
+                        type: string
+                  schedule_count:
+                    type: number
+                  http_routes_count:
+                    type: number
+                  webhook_count:
+                    type: number
+                  email_count:
+                    type: number
+  /w/{workspace}/scripts/list_tokens/{path}:
+    get:
+      summary: get tokens with script scope
+      operationId: listTokensOfScript
+      tags:
+        - script
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_33
+      responses:
+        '200':
+          description: tokens list
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: *ref_38
+                  required: *ref_39
   /w/{workspace}/scripts/get/draft/{path}:
     get:
       summary: get script by path with draft
@@ -4734,23 +5665,23 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: script details
           content:
             application/json:
               schema:
-                allOf: &ref_110
+                allOf: &ref_126
                   - type: object
-                    properties: *ref_34
-                    required: *ref_35
+                    properties: *ref_40
+                    required: *ref_41
                   - type: object
                     properties:
                       draft:
                         type: object
-                        properties: *ref_34
-                        required: *ref_35
+                        properties: *ref_40
+                        required: *ref_41
                       hash:
                         type: string
                     required:
@@ -4769,7 +5700,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: script history
@@ -4779,12 +5710,12 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_111
+                  properties: &ref_127
                     script_hash:
                       type: string
                     deployment_msg:
                       type: string
-                  required: &ref_112
+                  required: &ref_128
                     - script_hash
   /w/{workspace}/scripts/history_update/h/{hash}/p/{path}:
     post:
@@ -4800,11 +5731,11 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_33
+          schema: *ref_37
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       requestBody:
         description: Script deployment message
         required: true
@@ -4836,7 +5767,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: script content
@@ -4860,12 +5791,12 @@ paths:
         - name: token
           in: path
           required: true
-          schema: &ref_96
+          schema: &ref_115
             type: string
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: script content
@@ -4887,7 +5818,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: does it exists
@@ -4909,7 +5840,11 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_33
+          schema: *ref_37
+        - name: with_starred_info
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: script details
@@ -4917,8 +5852,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_31
-                required: *ref_32
+                properties: *ref_35
+                required: *ref_36
   /w/{workspace}/scripts/raw/h/{path}:
     get:
       summary: raw script by hash
@@ -4933,7 +5868,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: script content
@@ -4955,7 +5890,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_33
+          schema: *ref_37
       responses:
         '200':
           description: script details
@@ -4982,7 +5917,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
         - name: scheduled_for
           description: when to schedule this job (leave empty for immediate run)
           in: query
@@ -4994,18 +5929,30 @@ paths:
           in: query
           schema:
             type: integer
+        - name: skip_preprocessor
+          description: skip the preprocessor
+          in: query
+          schema:
+            type: boolean
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: &ref_36
+          schema: &ref_42
             type: string
             format: uuid
         - name: tag
           description: Override the tag to use
           in: query
-          schema: &ref_38
+          schema: &ref_44
+            type: string
+        - name: cache_ttl
+          description: >-
+            Override the cache time to live (in seconds). Can not be used to
+            disable caching, only override with a new cache ttl
+          in: query
+          schema: &ref_45
             type: string
         - name: job_id
           description: >-
@@ -5014,7 +5961,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: &ref_37
+          schema: &ref_43
             type: string
             format: uuid
         - name: invisible_to_owner
@@ -5029,7 +5976,7 @@ paths:
           application/json:
             schema:
               type: object
-              additionalProperties: *ref_14
+              additionalProperties: *ref_16
       responses:
         '201':
           description: job created
@@ -5052,13 +5999,13 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_36
+          schema: *ref_42
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -5066,7 +6013,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_37
+          schema: *ref_43
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -5075,14 +6022,14 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: &ref_39
+          schema: &ref_46
             type: string
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: &ref_40
+          schema: &ref_47
             type: string
       requestBody:
         description: script args
@@ -5091,7 +6038,7 @@ paths:
           application/json:
             schema:
               type: object
-              additionalProperties: *ref_14
+              additionalProperties: *ref_16
       responses:
         '200':
           description: job result
@@ -5112,17 +6059,23 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_36
+          schema: *ref_42
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_38
+          schema: *ref_44
+        - name: cache_ttl
+          description: >-
+            Override the cache time to live (in seconds). Can not be used to
+            disable caching, only override with a new cache ttl
+          in: query
+          schema: *ref_45
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -5130,7 +6083,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_37
+          schema: *ref_43
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -5139,13 +6092,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_39
+          schema: *ref_46
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_40
+          schema: *ref_47
       requestBody:
         description: script args
         required: true
@@ -5153,7 +6106,7 @@ paths:
           application/json:
             schema:
               type: object
-              additionalProperties: *ref_14
+              additionalProperties: *ref_16
       responses:
         '200':
           description: job result
@@ -5173,17 +6126,23 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_36
+          schema: *ref_42
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_38
+          schema: *ref_44
+        - name: cache_ttl
+          description: >-
+            Override the cache time to live (in seconds). Can not be used to
+            disable caching, only override with a new cache ttl
+          in: query
+          schema: *ref_45
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -5191,7 +6150,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_37
+          schema: *ref_43
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -5200,13 +6159,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_39
+          schema: *ref_46
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_40
+          schema: *ref_47
         - name: payload
           description: >
             The base64 encoded payload that has been encoded as a JSON. e.g how
@@ -5214,7 +6173,7 @@ paths:
 
             `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
           in: query
-          schema: &ref_76
+          schema: &ref_86
             type: string
       responses:
         '200':
@@ -5236,7 +6195,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -5245,13 +6204,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_39
+          schema: *ref_46
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_40
+          schema: *ref_47
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -5259,7 +6218,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_37
+          schema: *ref_43
       requestBody:
         description: script args
         required: true
@@ -5267,7 +6226,7 @@ paths:
           application/json:
             schema:
               type: object
-              additionalProperties: *ref_14
+              additionalProperties: *ref_16
       responses:
         '200':
           description: job result
@@ -5288,7 +6247,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -5297,13 +6256,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_39
+          schema: *ref_46
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_40
+          schema: *ref_47
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -5311,7 +6270,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_37
+          schema: *ref_43
       requestBody:
         description: script args
         required: true
@@ -5319,7 +6278,7 @@ paths:
           application/json:
             schema:
               type: object
-              additionalProperties: *ref_14
+              additionalProperties: *ref_16
       responses:
         '200':
           description: job result
@@ -5414,19 +6373,19 @@ paths:
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: *ref_3
+          schema: *ref_5
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: *ref_4
+          schema: *ref_6
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_41
+          schema: *ref_48
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_42
+          schema: *ref_49
         - name: path_start
           description: mask to filter matching starting path
           in: query
@@ -5441,7 +6400,7 @@ paths:
           description: >
             (default false)
 
-            show also the archived files.
+            show only the archived files.
 
             when multiple archived hash share the same path, only the ones with
             the latest create_at
@@ -5457,6 +6416,20 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: include_draft_only
+          description: |
+            (default false)
+            include items that have no deployed version
+          in: query
+          schema:
+            type: boolean
+        - name: with_deployment_msg
+          description: |
+            (default false)
+            include deployment message
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: All flow
@@ -5466,12 +6439,12 @@ paths:
                 type: array
                 items:
                   allOf:
-                    - allOf: &ref_45
+                    - allOf: &ref_52
                         - type: object
-                          properties: *ref_43
-                          required: *ref_44
+                          properties: *ref_50
+                          required: *ref_51
                         - type: object
-                          properties: &ref_155
+                          properties: &ref_177
                             workspace_id:
                               type: string
                             path:
@@ -5485,8 +6458,8 @@ paths:
                               type: boolean
                             extra_perms:
                               type: object
-                            additionalProperties:
-                              type: boolean
+                              additionalProperties: &ref_176
+                                type: boolean
                             starred:
                               type: boolean
                             draft_only:
@@ -5501,7 +6474,9 @@ paths:
                               type: boolean
                             timeout:
                               type: number
-                          required: &ref_156
+                            visible_to_runner_only:
+                              type: boolean
+                          required: &ref_178
                             - path
                             - edited_by
                             - edited_at
@@ -5513,6 +6488,109 @@ paths:
                           type: boolean
                         draft_only:
                           type: boolean
+  /w/{workspace}/flows/history/p/{path}:
+    get:
+      summary: get flow history by path
+      operationId: getFlowHistory
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_33
+      tags:
+        - flow
+      responses:
+        '200':
+          description: Flow history
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: &ref_189
+                    id:
+                      type: integer
+                    created_at:
+                      type: string
+                      format: date-time
+                    deployment_msg:
+                      type: string
+                  required: &ref_190
+                    - id
+                    - created_at
+  /w/{workspace}/flows/get/v/{version}/p/{path}:
+    get:
+      summary: get flow version
+      operationId: getFlowVersion
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - type: string
+          name: version
+          in: path
+          required: true
+          schema:
+            type: number
+        - name: path
+          in: path
+          required: true
+          schema: *ref_33
+      tags:
+        - flow
+      responses:
+        '200':
+          description: flow details
+          content:
+            application/json:
+              schema:
+                allOf: *ref_52
+  /w/{workspace}/flows/history_update/v/{version}/p/{path}:
+    post:
+      summary: update flow history
+      operationId: updateFlowHistory
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - type: string
+          name: version
+          in: path
+          required: true
+          schema:
+            type: number
+        - name: path
+          in: path
+          required: true
+          schema: *ref_33
+      requestBody:
+        description: Flow deployment message
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                deployment_msg:
+                  type: string
+              required:
+                - deployment_msg
+      tags:
+        - flow
+      responses:
+        '200':
+          description: success
+          content:
+            text/plain:
+              schema:
+                type: string
   /w/{workspace}/flows/get/{path}:
     get:
       summary: get flow by path
@@ -5527,14 +6605,67 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
+        - name: with_starred_info
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: flow details
           content:
             application/json:
               schema:
-                allOf: *ref_45
+                allOf: *ref_52
+  /w/{workspace}/flows/get_triggers_count/{path}:
+    get:
+      summary: get triggers count of flow
+      operationId: getTriggersCountOfFlow
+      tags:
+        - flow
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_33
+      responses:
+        '200':
+          description: triggers count
+          content:
+            application/json:
+              schema:
+                type: object
+                properties: *ref_53
+  /w/{workspace}/flows/list_tokens/{path}:
+    get:
+      summary: get tokens with flow scope
+      operationId: listTokensOfFlow
+      tags:
+        - flow
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_33
+      responses:
+        '200':
+          description: tokens list
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: *ref_38
+                  required: *ref_39
   /w/{workspace}/flows/toggle_workspace_error_handler/{path}:
     post:
       summary: Toggle ON and OFF the workspace error handler for a given flow
@@ -5549,7 +6680,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       requestBody:
         description: Workspace error handler enabled
         required: true
@@ -5581,7 +6712,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: flow details with draft
@@ -5589,11 +6720,11 @@ paths:
             application/json:
               schema:
                 allOf:
-                  - allOf: *ref_45
+                  - allOf: *ref_52
                   - type: object
                     properties:
                       draft:
-                        allOf: *ref_45
+                        allOf: *ref_52
   /w/{workspace}/flows/exists/{path}:
     get:
       summary: exists flow by path
@@ -5608,7 +6739,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: flow details
@@ -5634,10 +6765,10 @@ paths:
           application/json:
             schema:
               allOf:
-                - allOf: &ref_46
+                - allOf: &ref_54
                     - type: object
-                      properties: *ref_43
-                      required: *ref_44
+                      properties: *ref_50
+                      required: *ref_51
                     - type: object
                       properties:
                         path:
@@ -5652,6 +6783,8 @@ paths:
                           type: boolean
                         timeout:
                           type: number
+                        visible_to_runner_only:
+                          type: boolean
                       required:
                         - path
                 - type: object
@@ -5681,7 +6814,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       requestBody:
         description: Partially filled flow
         required: true
@@ -5689,7 +6822,7 @@ paths:
           application/json:
             schema:
               allOf:
-                - allOf: *ref_46
+                - allOf: *ref_54
                 - type: object
                   properties:
                     deployment_message:
@@ -5715,7 +6848,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       requestBody:
         description: archiveFlow
         required: true
@@ -5747,7 +6880,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: flow delete
@@ -5755,61 +6888,6 @@ paths:
             text/plain:
               schema:
                 type: string
-  /w/{workspace}/flows/input_history/p/{path}:
-    get:
-      summary: list inputs for previous completed flow jobs
-      operationId: getFlowInputHistoryByPath
-      tags:
-        - flow
-      parameters:
-        - name: workspace
-          in: path
-          required: true
-          schema: *ref_0
-        - name: path
-          in: path
-          required: true
-          schema: *ref_29
-        - name: page
-          description: which page to return (start at 1, default 1)
-          in: query
-          schema: *ref_3
-        - name: per_page
-          description: number of items to return for a given page (default 30, max 100)
-          in: query
-          schema: *ref_4
-      responses:
-        '200':
-          description: input history for completed jobs with this flow path
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  type: object
-                  properties: &ref_87
-                    id:
-                      type: string
-                    name:
-                      type: string
-                    args:
-                      type: object
-                    created_by:
-                      type: string
-                    created_at:
-                      type: string
-                      format: date-time
-                    is_public:
-                      type: boolean
-                    success:
-                      type: boolean
-                  required: &ref_88
-                    - id
-                    - name
-                    - args
-                    - created_by
-                    - created_at
-                    - is_public
   /w/{workspace}/raw_apps/list:
     get:
       summary: list all raw apps
@@ -5824,19 +6902,19 @@ paths:
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: *ref_3
+          schema: *ref_5
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: *ref_4
+          schema: *ref_6
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_41
+          schema: *ref_48
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_42
+          schema: *ref_49
         - name: path_start
           description: mask to filter matching starting path
           in: query
@@ -5863,7 +6941,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_162
+                  properties: &ref_184
                     workspace_id:
                       type: string
                     path:
@@ -5881,7 +6959,7 @@ paths:
                     edited_at:
                       type: string
                       format: date-time
-                  required: &ref_163
+                  required: &ref_185
                     - workspace_id
                     - path
                     - summary
@@ -5902,7 +6980,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: app exists
@@ -5924,12 +7002,12 @@ paths:
         - name: version
           in: path
           required: true
-          schema: &ref_95
+          schema: &ref_114
             type: number
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: app details
@@ -5978,19 +7056,19 @@ paths:
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: *ref_3
+          schema: *ref_5
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: *ref_4
+          schema: *ref_6
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_41
+          schema: *ref_48
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_42
+          schema: *ref_49
         - name: path_start
           description: mask to filter matching starting path
           in: query
@@ -6008,6 +7086,20 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: include_draft_only
+          description: |
+            (default false)
+            include items that have no deployed version
+          in: query
+          schema:
+            type: boolean
+        - name: with_deployment_msg
+          description: |
+            (default false)
+            include deployment message
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: All apps
@@ -6017,7 +7109,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_160
+                  properties: &ref_182
                     id:
                       type: integer
                     workspace_id:
@@ -6043,7 +7135,7 @@ paths:
                         - viewer
                         - publisher
                         - anonymous
-                  required: &ref_161
+                  required: &ref_183
                     - id
                     - workspace_id
                     - path
@@ -6078,11 +7170,15 @@ paths:
                   type: string
                 policy:
                   type: object
-                  properties: &ref_47
+                  properties: &ref_55
                     triggerables:
                       type: object
                       additionalProperties:
                         type: object
+                    triggerables_v2:
+                      type: object
+                      additionalProperties:
+                        type: object
                     execution_mode:
                       type: string
                       enum:
@@ -6123,7 +7219,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: app exists
@@ -6145,7 +7241,11 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
+        - name: with_starred_info
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: app details
@@ -6153,7 +7253,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_48
+                properties: &ref_56
                   id:
                     type: integer
                   workspace_id:
@@ -6171,10 +7271,11 @@ paths:
                   created_at:
                     type: string
                     format: date-time
-                  value: {}
+                  value:
+                    type: object
                   policy:
                     type: object
-                    properties: *ref_47
+                    properties: *ref_55
                   execution_mode:
                     type: string
                     enum:
@@ -6185,7 +7286,7 @@ paths:
                     type: object
                     additionalProperties:
                       type: boolean
-                required: &ref_49
+                required: &ref_57
                   - id
                   - workspace_id
                   - path
@@ -6211,17 +7312,17 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: app details with draft
           content:
             application/json:
               schema:
-                allOf: &ref_164
+                allOf: &ref_186
                   - type: object
-                    properties: *ref_48
-                    required: *ref_49
+                    properties: *ref_56
+                    required: *ref_57
                   - type: object
                     properties:
                       draft_only:
@@ -6241,7 +7342,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       responses:
         '200':
           description: app history
@@ -6251,12 +7352,12 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_165
+                  properties: &ref_187
                     version:
                       type: integer
                     deployment_msg:
                       type: string
-                  required: &ref_166
+                  required: &ref_188
                     - version
   /w/{workspace}/apps/history_update/a/{id}/v/{version}:
     post:
@@ -6272,11 +7373,11 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_24
+          schema: *ref_28
         - name: version
           in: path
           required: true
-          schema: &ref_97
+          schema: &ref_116
             type: integer
       requestBody:
         description: App deployment message
@@ -6309,7 +7410,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: app details
@@ -6317,8 +7418,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_48
-                required: *ref_49
+                properties: *ref_56
+                required: *ref_57
   /w/{workspace}/apps_u/public_resource/{path}:
     get:
       summary: get public resource
@@ -6333,7 +7434,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: resource value
@@ -6354,7 +7455,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: app secret
@@ -6376,7 +7477,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_24
+          schema: *ref_28
       responses:
         '200':
           description: app details
@@ -6384,8 +7485,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_48
-                required: *ref_49
+                properties: *ref_56
+                required: *ref_57
   /w/{workspace}/raw_apps/create:
     post:
       summary: create raw app
@@ -6436,7 +7537,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       requestBody:
         description: updateraw  app
         required: true
@@ -6472,7 +7573,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: app deleted
@@ -6494,7 +7595,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: app deleted
@@ -6516,7 +7617,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       requestBody:
         description: update app
         required: true
@@ -6532,7 +7633,7 @@ paths:
                 value: {}
                 policy:
                   type: object
-                  properties: *ref_47
+                  properties: *ref_55
                 deployment_message:
                   type: string
       responses:
@@ -6556,7 +7657,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
       requestBody:
         description: update app
         required: true
@@ -6579,6 +7680,8 @@ paths:
                       type: string
                     path:
                       type: string
+                    lock:
+                      type: string
                     cache_ttl:
                       type: integer
                   required:
@@ -6586,6 +7689,12 @@ paths:
                     - language
                 force_viewer_static_fields:
                   type: object
+                force_viewer_one_of_fields:
+                  type: object
+                force_viewer_allow_user_resources:
+                  type: array
+                  items:
+                    type: string
               required:
                 - args
                 - component
@@ -6610,7 +7719,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_29
+          schema: *ref_33
         - name: scheduled_for
           description: when to schedule this job (leave empty for immediate run)
           in: query
@@ -6622,16 +7731,21 @@ paths:
           in: query
           schema:
             type: integer
+        - name: skip_preprocessor
+          description: skip the preprocessor
+          in: query
+          schema:
+            type: boolean
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_36
+          schema: *ref_42
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_38
+          schema: *ref_44
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -6639,7 +7753,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_37
+          schema: *ref_43
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -6648,7 +7762,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_39
+          schema: *ref_46
         - name: invisible_to_owner
           description: make the run invisible to the the flow owner (default false)
           in: query
@@ -6661,7 +7775,7 @@ paths:
           application/json:
             schema:
               type: object
-              additionalProperties: *ref_14
+              additionalProperties: *ref_16
       responses:
         '201':
           description: job created
@@ -6684,7 +7798,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: &ref_73
+          schema: &ref_83
             type: string
             format: uuid
         - name: step_id
@@ -6717,11 +7831,11 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_36
+          schema: *ref_42
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_38
+          schema: *ref_44
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -6729,7 +7843,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_37
+          schema: *ref_43
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -6738,7 +7852,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_39
+          schema: *ref_46
         - name: invisible_to_owner
           description: make the run invisible to the the flow owner (default false)
           in: query
@@ -6751,7 +7865,7 @@ paths:
           application/json:
             schema:
               type: object
-              additionalProperties: *ref_14
+              additionalProperties: *ref_16
       responses:
         '201':
           description: job created
@@ -6774,7 +7888,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_33
+          schema: *ref_37
         - name: scheduled_for
           description: when to schedule this job (leave empty for immediate run)
           in: query
@@ -6786,16 +7900,27 @@ paths:
           in: query
           schema:
             type: integer
+        - name: skip_preprocessor
+          description: skip the preprocessor
+          in: query
+          schema:
+            type: boolean
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_36
+          schema: *ref_42
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_38
+          schema: *ref_44
+        - name: cache_ttl
+          description: >-
+            Override the cache time to live (in seconds). Can not be used to
+            disable caching, only override with a new cache ttl
+          in: query
+          schema: *ref_45
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -6803,7 +7928,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_37
+          schema: *ref_43
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -6812,7 +7937,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_39
+          schema: *ref_46
         - name: invisible_to_owner
           description: make the run invisible to the the script owner (default false)
           in: query
@@ -6852,7 +7977,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_39
+          schema: *ref_46
         - name: invisible_to_owner
           description: make the run invisible to the the script owner (default false)
           in: query
@@ -6865,7 +7990,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_37
+          schema: *ref_43
       requestBody:
         description: preview
         required: true
@@ -6873,14 +7998,14 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_134
+              properties: &ref_147
                 content:
                   type: string
                 path:
                   type: string
                 args:
                   type: object
-                  additionalProperties: *ref_14
+                  additionalProperties: *ref_16
                 language:
                   type: string
                   enum:
@@ -6897,6 +8022,9 @@ paths:
                     - graphql
                     - nativets
                     - bun
+                    - php
+                    - rust
+                    - ansible
                 tag:
                   type: string
                 kind:
@@ -6909,7 +8037,49 @@ paths:
                   type: boolean
                 lock:
                   type: string
-              required: &ref_135
+              required: &ref_148
+                - args
+      responses:
+        '201':
+          description: job created
+          content:
+            text/plain:
+              schema:
+                type: string
+                format: uuid
+  /w/{workspace}/jobs/workflow_as_code/{job_id}/{entrypoint}:
+    post:
+      summary: run code-workflow task
+      operationId: runCodeWorkflowTask
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: job_id
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: entrypoint
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        description: preview
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_149
+                args:
+                  type: object
+                  additionalProperties: *ref_16
+              required: &ref_150
                 - args
       responses:
         '201':
@@ -6942,7 +8112,7 @@ paths:
                   type: array
                   items:
                     type: object
-                    properties: &ref_184
+                    properties: &ref_208
                       raw_code:
                         type: string
                       path:
@@ -6963,7 +8133,10 @@ paths:
                           - graphql
                           - nativets
                           - bun
-                    required: &ref_185
+                          - php
+                          - rust
+                          - ansible
+                    required: &ref_209
                       - raw_code
                       - path
                       - language
@@ -7003,7 +8176,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_39
+          schema: *ref_46
         - name: invisible_to_owner
           description: make the run invisible to the the script owner (default false)
           in: query
@@ -7016,7 +8189,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_37
+          schema: *ref_43
       requestBody:
         description: preview
         required: true
@@ -7024,21 +8197,21 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_157
+              properties: &ref_179
                 value:
                   type: object
-                  properties: *ref_50
-                  required: *ref_51
+                  properties: *ref_58
+                  required: *ref_59
                 path:
                   type: string
                 args:
                   type: object
-                  additionalProperties: *ref_14
+                  additionalProperties: *ref_16
                 tag:
                   type: string
                 restarted_from:
                   type: object
-                  properties: &ref_159
+                  properties: &ref_181
                     flow_job_id:
                       type: string
                       format: uuid
@@ -7046,7 +8219,7 @@ paths:
                       type: string
                     branch_or_iteration_n:
                       type: integer
-              required: &ref_158
+              required: &ref_180
                 - value
                 - content
                 - args
@@ -7072,95 +8245,103 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_41
+          schema: *ref_48
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_42
+          schema: *ref_49
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_36
+          schema: *ref_42
         - name: script_path_exact
           description: mask to filter exact matching path
           in: query
-          schema: &ref_54
+          schema: &ref_62
             type: string
         - name: script_path_start
           description: mask to filter matching starting path
           in: query
-          schema: &ref_55
+          schema: &ref_63
             type: string
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: &ref_56
+          schema: &ref_64
             type: string
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: &ref_57
+          schema: &ref_65
             type: string
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: &ref_58
+          schema: &ref_66
             type: string
             format: date-time
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: &ref_59
+          schema: &ref_67
             type: string
             format: date-time
         - name: success
           description: filter on successful jobs
           in: query
-          schema: &ref_60
+          schema: &ref_68
             type: boolean
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: &ref_68
+          schema: &ref_69
             type: boolean
         - name: job_kinds
           description: >-
             filter on job kind (values 'preview', 'script', 'dependencies',
             'flow') separated by,
           in: query
-          schema: &ref_61
+          schema: &ref_70
             type: string
         - name: suspended
           description: filter on suspended jobs
           in: query
-          schema: &ref_100
+          schema: &ref_71
             type: boolean
         - name: running
           description: filter on running jobs
           in: query
-          schema: &ref_67
+          schema: &ref_72
             type: boolean
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: &ref_62
+          schema: &ref_73
             type: string
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: &ref_63
+          schema: &ref_74
             type: string
         - name: tag
           description: filter on jobs with a given tag/worker group
           in: query
-          schema: &ref_64
+          schema: &ref_75
             type: string
+        - name: page
+          description: which page to return (start at 1, default 1)
+          in: query
+          schema: *ref_5
+        - name: per_page
+          description: number of items to return for a given page (default 30, max 100)
+          in: query
+          schema: *ref_6
         - name: all_workspaces
           description: >-
             get jobs from all workspaces (only valid if request come from the
@@ -7168,6 +8349,11 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: is_not_schedule
+          description: is not a scheduled job
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: All queued jobs
@@ -7177,7 +8363,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_71
+                  properties: &ref_81
                     workspace_id:
                       type: string
                     id:
@@ -7205,7 +8391,7 @@ paths:
                       type: string
                     args:
                       type: object
-                      additionalProperties: *ref_14
+                      additionalProperties: *ref_16
                     logs:
                       type: string
                     raw_code:
@@ -7244,14 +8430,14 @@ paths:
                         by extension its DT_TOKEN.
                     flow_status:
                       type: object
-                      properties: &ref_65
+                      properties: &ref_76
                         step:
                           type: integer
                         modules:
                           type: array
                           items:
                             type: object
-                            properties: &ref_52
+                            properties: &ref_60
                               type:
                                 type: string
                                 enum:
@@ -7268,6 +8454,8 @@ paths:
                                 format: uuid
                               count:
                                 type: integer
+                              progress:
+                                type: integer
                               iterator:
                                 type: object
                                 properties:
@@ -7281,6 +8469,10 @@ paths:
                                 type: array
                                 items:
                                   type: string
+                              flow_jobs_success:
+                                type: array
+                                items:
+                                  type: boolean
                               branch_chosen:
                                 type: object
                                 properties:
@@ -7315,13 +8507,27 @@ paths:
                                   required:
                                     - resume_id
                                     - approver
-                            required: &ref_53
+                              failed_retries:
+                                type: array
+                                items:
+                                  type: string
+                                  format: uuid
+                              skipped:
+                                type: boolean
+                            required: &ref_61
                               - type
+                        user_states:
+                          additionalProperties: true
+                        preprocessor_module:
+                          allOf:
+                            - type: object
+                              properties: *ref_60
+                              required: *ref_61
                         failure_module:
                           allOf:
                             - type: object
-                              properties: *ref_52
-                              required: *ref_53
+                              properties: *ref_60
+                              required: *ref_61
                             - type: object
                               properties:
                                 parent_module:
@@ -7336,14 +8542,14 @@ paths:
                               items:
                                 type: string
                                 format: uuid
-                      required: &ref_66
+                      required: &ref_77
                         - step
                         - modules
                         - failure_module
                     raw_flow:
                       type: object
-                      properties: *ref_50
-                      required: *ref_51
+                      properties: *ref_58
+                      required: *ref_59
                     is_flow_step:
                       type: boolean
                     language:
@@ -7362,6 +8568,9 @@ paths:
                         - graphql
                         - nativets
                         - bun
+                        - php
+                        - rust
+                        - ansible
                     email:
                       type: string
                     visible_to_owner:
@@ -7372,7 +8581,13 @@ paths:
                       type: string
                     priority:
                       type: integer
-                  required: &ref_72
+                    self_wait_time_ms:
+                      type: number
+                    aggregate_wait_time_ms:
+                      type: number
+                    suspend:
+                      type: number
+                  required: &ref_82
                     - id
                     - running
                     - canceled
@@ -7410,6 +8625,8 @@ paths:
                 properties:
                   database_length:
                     type: integer
+                  suspended:
+                    type: integer
                 required:
                   - database_length
   /w/{workspace}/jobs/completed/count:
@@ -7435,10 +8652,10 @@ paths:
                     type: integer
                 required:
                   - database_length
-  /w/{workspace}/jobs/queue/cancel_all:
-    post:
-      summary: cancel all jobs
-      operationId: cancelAll
+  /w/{workspace}/jobs/queue/list_filtered_uuids:
+    get:
+      summary: get the ids of all jobs matching the given filters
+      operationId: listFilteredUuids
       tags:
         - job
       parameters:
@@ -7446,6 +8663,136 @@ paths:
           in: path
           required: true
           schema: *ref_0
+        - name: order_desc
+          description: order by desc order (default true)
+          in: query
+          schema: *ref_48
+        - name: created_by
+          description: mask to filter exact matching user creator
+          in: query
+          schema: *ref_49
+        - name: parent_job
+          description: >-
+            The parent job that is at the origin and responsible for the
+            execution of this script if any
+          in: query
+          schema: *ref_42
+        - name: script_path_exact
+          description: mask to filter exact matching path
+          in: query
+          schema: *ref_62
+        - name: script_path_start
+          description: mask to filter matching starting path
+          in: query
+          schema: *ref_63
+        - name: schedule_path
+          description: mask to filter by schedule path
+          in: query
+          schema: *ref_64
+        - name: script_hash
+          description: mask to filter exact matching path
+          in: query
+          schema: *ref_65
+        - name: started_before
+          description: filter on started before (inclusive) timestamp
+          in: query
+          schema: *ref_66
+        - name: started_after
+          description: filter on started after (exclusive) timestamp
+          in: query
+          schema: *ref_67
+        - name: success
+          description: filter on successful jobs
+          in: query
+          schema: *ref_68
+        - name: scheduled_for_before_now
+          description: filter on jobs scheduled_for before now (hence waitinf for a worker)
+          in: query
+          schema: *ref_69
+        - name: job_kinds
+          description: >-
+            filter on job kind (values 'preview', 'script', 'dependencies',
+            'flow') separated by,
+          in: query
+          schema: *ref_70
+        - name: suspended
+          description: filter on suspended jobs
+          in: query
+          schema: *ref_71
+        - name: running
+          description: filter on running jobs
+          in: query
+          schema: *ref_72
+        - name: args
+          description: >-
+            filter on jobs containing those args as a json subset (@> in
+            postgres)
+          in: query
+          schema: *ref_73
+        - name: result
+          description: >-
+            filter on jobs containing those result as a json subset (@> in
+            postgres)
+          in: query
+          schema: *ref_74
+        - name: tag
+          description: filter on jobs with a given tag/worker group
+          in: query
+          schema: *ref_75
+        - name: page
+          description: which page to return (start at 1, default 1)
+          in: query
+          schema: *ref_5
+        - name: per_page
+          description: number of items to return for a given page (default 30, max 100)
+          in: query
+          schema: *ref_6
+        - name: concurrency_key
+          in: query
+          required: false
+          schema:
+            type: string
+        - name: all_workspaces
+          description: >-
+            get jobs from all workspaces (only valid if request come from the
+            `admins` workspace)
+          in: query
+          schema:
+            type: boolean
+        - name: is_not_schedule
+          description: is not a scheduled job
+          in: query
+          schema:
+            type: boolean
+      responses:
+        '200':
+          description: uuids of jobs
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+  /w/{workspace}/jobs/queue/cancel_selection:
+    post:
+      summary: cancel jobs based on the given uuids
+      operationId: cancelSelection
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: uuids of the jobs to cancel
+        required: true
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                type: string
       responses:
         '200':
           description: uuids of canceled jobs
@@ -7469,67 +8816,83 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_41
+          schema: *ref_48
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_42
+          schema: *ref_49
+        - name: label
+          description: >-
+            mask to filter exact matching job's label (job labels are completed
+            jobs with as a result an object containing a string in the array at
+            key 'wm_labels')
+          in: query
+          schema: &ref_78
+            type: string
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_36
+          schema: *ref_42
         - name: script_path_exact
           description: mask to filter exact matching path
           in: query
-          schema: *ref_54
+          schema: *ref_62
         - name: script_path_start
           description: mask to filter matching starting path
           in: query
-          schema: *ref_55
+          schema: *ref_63
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_56
+          schema: *ref_64
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_57
+          schema: *ref_65
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_58
+          schema: *ref_66
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_59
+          schema: *ref_67
         - name: success
           description: filter on successful jobs
           in: query
-          schema: *ref_60
+          schema: *ref_68
         - name: job_kinds
           description: >-
             filter on job kind (values 'preview', 'script', 'dependencies',
             'flow') separated by,
           in: query
-          schema: *ref_61
+          schema: *ref_70
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_62
+          schema: *ref_73
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_63
+          schema: *ref_74
         - name: tag
           description: filter on jobs with a given tag/worker group
           in: query
-          schema: *ref_64
+          schema: *ref_75
+        - name: page
+          description: which page to return (start at 1, default 1)
+          in: query
+          schema: *ref_5
+        - name: per_page
+          description: number of items to return for a given page (default 30, max 100)
+          in: query
+          schema: *ref_6
         - name: is_skipped
           description: is the job skipped
           in: query
@@ -7540,6 +8903,16 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: has_null_parent
+          description: has null parent
+          in: query
+          schema:
+            type: boolean
+        - name: is_not_schedule
+          description: is not a scheduled job
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: All completed jobs
@@ -7549,7 +8922,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_69
+                  properties: &ref_79
                     workspace_id:
                       type: string
                     id:
@@ -7576,7 +8949,7 @@ paths:
                       type: string
                     args:
                       type: object
-                      additionalProperties: *ref_14
+                      additionalProperties: *ref_16
                     result: {}
                     logs:
                       type: string
@@ -7615,12 +8988,12 @@ paths:
                         by extension its DT_TOKEN.
                     flow_status:
                       type: object
-                      properties: *ref_65
-                      required: *ref_66
+                      properties: *ref_76
+                      required: *ref_77
                     raw_flow:
                       type: object
-                      properties: *ref_50
-                      required: *ref_51
+                      properties: *ref_58
+                      required: *ref_59
                     is_flow_step:
                       type: boolean
                     language:
@@ -7639,6 +9012,9 @@ paths:
                         - graphql
                         - nativets
                         - bun
+                        - php
+                        - rust
+                        - ansible
                     is_skipped:
                       type: boolean
                     email:
@@ -7651,7 +9027,15 @@ paths:
                       type: string
                     priority:
                       type: integer
-                  required: &ref_70
+                    labels:
+                      type: array
+                      items:
+                        type: string
+                    self_wait_time_ms:
+                      type: number
+                    aggregate_wait_time_ms:
+                      type: number
+                  required: &ref_80
                     - id
                     - created_by
                     - duration_ms
@@ -7680,59 +9064,87 @@ paths:
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_42
+          schema: *ref_49
+        - name: label
+          description: >-
+            mask to filter exact matching job's label (job labels are completed
+            jobs with as a result an object containing a string in the array at
+            key 'wm_labels')
+          in: query
+          schema: *ref_78
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_36
+          schema: *ref_42
         - name: script_path_exact
           description: mask to filter exact matching path
           in: query
-          schema: *ref_54
+          schema: *ref_62
         - name: script_path_start
           description: mask to filter matching starting path
           in: query
-          schema: *ref_55
+          schema: *ref_63
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_56
+          schema: *ref_64
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_57
+          schema: *ref_65
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_58
+          schema: *ref_66
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_59
+          schema: *ref_67
+        - name: created_before
+          description: filter on created before (inclusive) timestamp
+          in: query
+          schema: &ref_117
+            type: string
+            format: date-time
+        - name: created_after
+          description: filter on created after (exclusive) timestamp
+          in: query
+          schema: &ref_118
+            type: string
+            format: date-time
         - name: created_or_started_before
           description: >-
             filter on created_at for non non started job and started_at
             otherwise before (inclusive) timestamp
           in: query
-          schema: &ref_99
+          schema: &ref_111
             type: string
             format: date-time
         - name: running
           description: filter on running jobs
           in: query
-          schema: *ref_67
+          schema: *ref_72
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: *ref_68
+          schema: *ref_69
         - name: created_or_started_after
           description: >-
             filter on created_at for non non started job and started_at
             otherwise after (exclusive) timestamp
           in: query
-          schema: &ref_98
+          schema: &ref_112
+            type: string
+            format: date-time
+        - name: created_or_started_after_completed_jobs
+          description: >-
+            filter on created_at for non non started job and started_at
+            otherwise after (exclusive) timestamp but only for the completed
+            jobs
+          in: query
+          schema: &ref_113
             type: string
             format: date-time
         - name: job_kinds
@@ -7740,23 +9152,35 @@ paths:
             filter on job kind (values 'preview', 'script', 'dependencies',
             'flow') separated by,
           in: query
-          schema: *ref_61
+          schema: *ref_70
+        - name: suspended
+          description: filter on suspended jobs
+          in: query
+          schema: *ref_71
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_62
+          schema: *ref_73
         - name: tag
           description: filter on jobs with a given tag/worker group
           in: query
-          schema: *ref_64
+          schema: *ref_75
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_63
+          schema: *ref_74
+        - name: page
+          description: which page to return (start at 1, default 1)
+          in: query
+          schema: *ref_5
+        - name: per_page
+          description: number of items to return for a given page (default 30, max 100)
+          in: query
+          schema: *ref_6
         - name: is_skipped
           description: is the job skipped
           in: query
@@ -7767,6 +9191,11 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: has_null_parent
+          description: has null parent
+          in: query
+          schema:
+            type: boolean
         - name: success
           description: filter on successful jobs
           in: query
@@ -7779,6 +9208,11 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: is_not_schedule
+          description: is not a scheduled job
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: All jobs
@@ -7787,22 +9221,28 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: &ref_74
-                    - oneOf:
+                  oneOf: &ref_84
+                    - allOf:
                         - type: object
-                          properties: *ref_69
-                          required: *ref_70
+                          properties: *ref_79
+                          required: *ref_80
                         - type: object
-                          properties: *ref_71
-                          required: *ref_72
-                    - type: object
-                      properties:
-                        type:
-                          type: string
-                          enum:
-                            - CompletedJob
-                            - QueuedJob
-                  discriminator: &ref_75
+                          properties:
+                            type:
+                              type: string
+                              enum:
+                                - CompletedJob
+                    - allOf:
+                        - type: object
+                          properties: *ref_81
+                          required: *ref_82
+                        - type: object
+                          properties:
+                            type:
+                              type: string
+                              enum:
+                                - QueuedJob
+                  discriminator: &ref_85
                     propertyName: type
   /jobs/db_clock:
     get:
@@ -7817,6 +9257,44 @@ paths:
             application/json:
               schema:
                 type: integer
+  /jobs/completed/count_by_tag:
+    get:
+      summary: Count jobs by tag
+      operationId: countJobsByTag
+      tags:
+        - job
+      parameters:
+        - name: horizon_secs
+          in: query
+          description: >-
+            Past Time horizon in seconds (when to start the count = now -
+            horizon) (default is 3600)
+          required: false
+          schema:
+            type: integer
+        - name: workspace_id
+          in: query
+          description: Specific workspace ID to filter results (optional)
+          required: false
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Job counts by tag
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    tag:
+                      type: string
+                    count:
+                      type: integer
+                  required:
+                    - tag
+                    - count
   /w/{workspace}/jobs_u/get/{id}:
     get:
       summary: get job
@@ -7831,15 +9309,19 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
+        - name: no_logs
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: job details
           content:
             application/json:
               schema:
-                allOf: *ref_74
-                discriminator: *ref_75
+                oneOf: *ref_84
+                discriminator: *ref_85
   /w/{workspace}/jobs_u/get_root_job_id/{id}:
     get:
       summary: get root job id
@@ -7854,7 +9336,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
       responses:
         '200':
           description: get root job id
@@ -7876,7 +9358,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
       responses:
         '200':
           description: job details
@@ -7884,6 +9366,27 @@ paths:
             text/plain:
               schema:
                 type: string
+  /w/{workspace}/jobs_u/get_args/{id}:
+    get:
+      summary: get job args
+      operationId: getJobArgs
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: id
+          in: path
+          required: true
+          schema: *ref_83
+      responses:
+        '200':
+          description: job args
+          content:
+            application/json:
+              schema: {}
   /w/{workspace}/jobs_u/getupdate/{id}:
     get:
       summary: get job updates
@@ -7898,7 +9401,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
         - name: running
           in: query
           schema:
@@ -7907,6 +9410,10 @@ paths:
           in: query
           schema:
             type: integer
+        - name: get_progress
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: job details
@@ -7921,8 +9428,49 @@ paths:
                     type: boolean
                   new_logs:
                     type: string
+                  log_offset:
+                    type: integer
                   mem_peak:
                     type: integer
+                  progress:
+                    type: integer
+                  flow_status:
+                    type: object
+                    additionalProperties: &ref_151
+                      type: object
+                      properties: &ref_152
+                        scheduled_for:
+                          type: string
+                          format: date-time
+                        started_at:
+                          type: string
+                          format: date-time
+                        duration_ms:
+                          type: number
+                        name:
+                          type: string
+  /w/{workspace}/jobs_u/get_log_file/{path}:
+    get:
+      summary: get log file from object store
+      operationId: getLogFileFromStore
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: job log
+          content:
+            text/plain:
+              type: string
   /w/{workspace}/jobs_u/get_flow_debug_info/{id}:
     get:
       summary: get flow debug info
@@ -7937,7 +9485,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
       responses:
         '200':
           description: flow debug info details
@@ -7958,7 +9506,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
       responses:
         '200':
           description: job details
@@ -7966,8 +9514,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_69
-                required: *ref_70
+                properties: *ref_79
+                required: *ref_80
   /w/{workspace}/jobs_u/completed/get_result/{id}:
     get:
       summary: get completed job result
@@ -7982,7 +9530,23 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
+        - name: suspended_job
+          in: query
+          schema:
+            type: string
+        - name: resume_id
+          in: query
+          schema:
+            type: integer
+        - name: secret
+          in: query
+          schema:
+            type: string
+        - name: approver
+          in: query
+          schema:
+            type: string
       responses:
         '200':
           description: result
@@ -8003,10 +9567,10 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
         - name: get_started
           in: query
-          schema: &ref_108
+          schema: &ref_124
             type: boolean
       responses:
         '200':
@@ -8040,7 +9604,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
       responses:
         '200':
           description: job details
@@ -8048,11 +9612,11 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_69
-                required: *ref_70
+                properties: *ref_79
+                required: *ref_80
   /w/{workspace}/jobs_u/queue/cancel/{id}:
     post:
-      summary: cancel queued job
+      summary: cancel queued or running job
       operationId: cancelQueuedJob
       tags:
         - job
@@ -8064,7 +9628,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
       requestBody:
         description: reason
         required: true
@@ -8096,7 +9660,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       requestBody:
         description: reason
         required: true
@@ -8128,7 +9692,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
       requestBody:
         description: reason
         required: true
@@ -8160,7 +9724,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
         - name: resume_id
           in: path
           required: true
@@ -8191,7 +9755,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
         - name: resume_id
           in: path
           required: true
@@ -8233,7 +9797,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
         - name: payload
           description: >
             The base64 encoded payload that has been encoded as a JSON. e.g how
@@ -8241,7 +9805,7 @@ paths:
 
             `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
           in: query
-          schema: *ref_76
+          schema: *ref_86
         - name: resume_id
           in: path
           required: true
@@ -8276,7 +9840,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
         - name: resume_id
           in: path
           required: true
@@ -8304,6 +9868,64 @@ paths:
             text/plain:
               schema:
                 type: string
+  /w/{workspace}/jobs/flow/user_states/{id}/{key}:
+    post:
+      summary: set flow user state at a given key
+      operationId: setFlowUserState
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: id
+          in: path
+          required: true
+          schema: *ref_83
+        - name: key
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        description: new value
+        required: true
+        content:
+          application/json:
+            schema: {}
+      responses:
+        '200':
+          description: flow user state updated
+          content:
+            text/plain:
+              schema:
+                type: string
+    get:
+      summary: get flow user state at a given key
+      operationId: getFlowUserState
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: id
+          in: path
+          required: true
+          schema: *ref_83
+        - name: key
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: flow user state updated
+          content:
+            application/json:
+              schema: {}
   /w/{workspace}/jobs/flow/resume/{id}:
     post:
       summary: resume a job for a suspended flow as an owner
@@ -8318,7 +9940,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
       requestBody:
         required: true
         content:
@@ -8346,7 +9968,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
         - name: resume_id
           in: path
           required: true
@@ -8381,7 +10003,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
         - name: resume_id
           in: path
           required: true
@@ -8423,7 +10045,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
         - name: resume_id
           in: path
           required: true
@@ -8447,8 +10069,8 @@ paths:
                 type: object
                 properties:
                   job:
-                    allOf: *ref_74
-                    discriminator: *ref_75
+                    oneOf: *ref_84
+                    discriminator: *ref_85
                   approvers:
                     type: array
                     items:
@@ -8513,7 +10135,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_145
+              properties: &ref_162
                 path:
                   type: string
                 schedule:
@@ -8526,7 +10148,7 @@ paths:
                   type: boolean
                 args:
                   type: object
-                  additionalProperties: *ref_14
+                  additionalProperties: *ref_16
                 enabled:
                   type: boolean
                 on_failure:
@@ -8537,26 +10159,34 @@ paths:
                   type: boolean
                 on_failure_extra_args:
                   type: object
-                  additionalProperties: *ref_14
+                  additionalProperties: *ref_16
                 on_recovery:
                   type: string
                 on_recovery_times:
                   type: number
                 on_recovery_extra_args:
                   type: object
-                  additionalProperties: *ref_14
+                  additionalProperties: *ref_16
+                on_success:
+                  type: string
+                on_success_extra_args:
+                  type: object
+                  additionalProperties: *ref_16
                 ws_error_handler_muted:
                   type: boolean
                 retry:
                   type: object
-                  properties: *ref_77
+                  properties: *ref_87
                 no_flow_overlap:
                   type: boolean
                 summary:
                   type: string
                 tag:
                   type: string
-              required: &ref_146
+                paused_until:
+                  type: string
+                  format: date-time
+              required: &ref_163
                 - path
                 - schedule
                 - timezone
@@ -8584,7 +10214,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       requestBody:
         description: updated schedule
         required: true
@@ -8592,14 +10222,14 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_147
+              properties: &ref_164
                 schedule:
                   type: string
                 timezone:
                   type: string
                 args:
                   type: object
-                  additionalProperties: *ref_14
+                  additionalProperties: *ref_16
                 on_failure:
                   type: string
                 on_failure_times:
@@ -8608,26 +10238,34 @@ paths:
                   type: boolean
                 on_failure_extra_args:
                   type: object
-                  additionalProperties: *ref_14
+                  additionalProperties: *ref_16
                 on_recovery:
                   type: string
                 on_recovery_times:
                   type: number
                 on_recovery_extra_args:
                   type: object
-                  additionalProperties: *ref_14
+                  additionalProperties: *ref_16
+                on_success:
+                  type: string
+                on_success_extra_args:
+                  type: object
+                  additionalProperties: *ref_16
                 ws_error_handler_muted:
                   type: boolean
                 retry:
                   type: object
-                  properties: *ref_77
+                  properties: *ref_87
                 no_flow_overlap:
                   type: boolean
                 summary:
                   type: string
                 tag:
                   type: string
-              required: &ref_148
+                paused_until:
+                  type: string
+                  format: date-time
+              required: &ref_165
                 - schedule
                 - timezone
                 - script_path
@@ -8654,7 +10292,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       requestBody:
         description: updated schedule enable
         required: true
@@ -8688,7 +10326,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: schedule deleted
@@ -8710,7 +10348,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: schedule deleted
@@ -8718,7 +10356,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_78
+                properties: &ref_88
                   path:
                     type: string
                   edited_by:
@@ -8738,7 +10376,7 @@ paths:
                     type: boolean
                   args:
                     type: object
-                    additionalProperties: *ref_14
+                    additionalProperties: *ref_16
                   extra_perms:
                     type: object
                     additionalProperties:
@@ -8755,26 +10393,34 @@ paths:
                     type: boolean
                   on_failure_extra_args:
                     type: object
-                    additionalProperties: *ref_14
+                    additionalProperties: *ref_16
                   on_recovery:
                     type: string
                   on_recovery_times:
                     type: number
                   on_recovery_extra_args:
                     type: object
-                    additionalProperties: *ref_14
+                    additionalProperties: *ref_16
+                  on_success:
+                    type: string
+                  on_success_extra_args:
+                    type: object
+                    additionalProperties: *ref_16
                   ws_error_handler_muted:
                     type: boolean
                   retry:
                     type: object
-                    properties: *ref_77
+                    properties: *ref_87
                   summary:
                     type: string
                   no_flow_overlap:
                     type: boolean
                   tag:
                     type: string
-                required: &ref_79
+                  paused_until:
+                    type: string
+                    format: date-time
+                required: &ref_89
                   - path
                   - edited_by
                   - edited_at
@@ -8799,7 +10445,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: schedule exists
@@ -8821,11 +10467,17 @@ paths:
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: *ref_3
+          schema: *ref_5
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: *ref_4
+          schema: *ref_6
+        - name: args
+          description: >-
+            filter on jobs containing those args as a json subset (@> in
+            postgres)
+          in: query
+          schema: *ref_73
         - name: path
           description: filter by path
           in: query
@@ -8835,6 +10487,10 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: path_start
+          in: query
+          schema:
+            type: string
       responses:
         '200':
           description: schedule list
@@ -8844,8 +10500,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_78
-                  required: *ref_79
+                  properties: *ref_88
+                  required: *ref_89
   /w/{workspace}/schedules/list_with_jobs:
     get:
       summary: list schedules with last 20 jobs
@@ -8860,11 +10516,11 @@ paths:
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: *ref_3
+          schema: *ref_5
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: *ref_4
+          schema: *ref_6
       responses:
         '200':
           description: schedule list
@@ -8873,10 +10529,10 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: &ref_144
+                  allOf: &ref_161
                     - type: object
-                      properties: *ref_78
-                      required: *ref_79
+                      properties: *ref_88
+                      required: *ref_89
                     - type: object
                       properties:
                         jobs:
@@ -8918,6 +10574,7 @@ paths:
                   enum:
                     - error
                     - recovery
+                    - success
                 override_existing:
                   type: boolean
                 path:
@@ -8936,6 +10593,332 @@ paths:
       responses:
         '201':
           description: default error handler set
+  /w/{workspace}/http_triggers/create:
+    post:
+      summary: create http trigger
+      operationId: createHttpTrigger
+      tags:
+        - http_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: new http trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_166
+                path:
+                  type: string
+                script_path:
+                  type: string
+                route_path:
+                  type: string
+                is_flow:
+                  type: boolean
+                http_method:
+                  type: string
+                  enum:
+                    - get
+                    - post
+                    - put
+                    - delete
+                    - patch
+                is_async:
+                  type: boolean
+                requires_auth:
+                  type: boolean
+              required: &ref_167
+                - path
+                - script_path
+                - route_path
+                - is_flow
+                - is_async
+                - requires_auth
+                - http_method
+      responses:
+        '201':
+          description: http trigger created
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/http_triggers/update/{path}:
+    post:
+      summary: update http trigger
+      operationId: updateHttpTrigger
+      tags:
+        - http_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_21
+      requestBody:
+        description: updated trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_168
+                path:
+                  type: string
+                script_path:
+                  type: string
+                route_path:
+                  type: string
+                is_flow:
+                  type: boolean
+                http_method:
+                  type: string
+                  enum:
+                    - get
+                    - post
+                    - put
+                    - delete
+                    - patch
+                is_async:
+                  type: boolean
+                requires_auth:
+                  type: boolean
+              required: &ref_169
+                - path
+                - script_path
+                - is_flow
+                - kind
+                - is_async
+                - requires_auth
+                - http_method
+      responses:
+        '200':
+          description: http trigger updated
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/http_triggers/delete/{path}:
+    delete:
+      summary: delete http trigger
+      operationId: deleteHttpTrigger
+      tags:
+        - http_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_21
+      responses:
+        '200':
+          description: http trigger deleted
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/http_triggers/get/{path}:
+    get:
+      summary: get http trigger
+      operationId: getHttpTrigger
+      tags:
+        - http_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_21
+      responses:
+        '200':
+          description: http trigger deleted
+          content:
+            application/json:
+              schema:
+                type: object
+                properties: &ref_90
+                  path:
+                    type: string
+                  edited_by:
+                    type: string
+                  edited_at:
+                    type: string
+                    format: date-time
+                  script_path:
+                    type: string
+                  route_path:
+                    type: string
+                  is_flow:
+                    type: boolean
+                  extra_perms:
+                    type: object
+                    additionalProperties:
+                      type: boolean
+                  email:
+                    type: string
+                  workspace_id:
+                    type: string
+                  http_method:
+                    type: string
+                    enum:
+                      - get
+                      - post
+                      - put
+                      - delete
+                      - patch
+                  is_async:
+                    type: boolean
+                  requires_auth:
+                    type: boolean
+                required: &ref_91
+                  - path
+                  - edited_by
+                  - edited_at
+                  - script_path
+                  - route_path
+                  - extra_perms
+                  - is_flow
+                  - email
+                  - workspace_id
+                  - is_async
+                  - requires_auth
+                  - http_method
+  /w/{workspace}/http_triggers/list:
+    get:
+      summary: list http triggers
+      operationId: listHttpTriggers
+      tags:
+        - http_trigger
+      parameters:
+        - required: true
+          name: workspace
+          in: path
+          schema: *ref_0
+        - name: page
+          description: which page to return (start at 1, default 1)
+          in: query
+          schema: *ref_5
+        - name: per_page
+          description: number of items to return for a given page (default 30, max 100)
+          in: query
+          schema: *ref_6
+        - name: path
+          description: filter by path
+          in: query
+          schema:
+            type: string
+        - name: is_flow
+          in: query
+          schema:
+            type: boolean
+        - name: path_start
+          in: query
+          schema:
+            type: string
+      responses:
+        '200':
+          description: http trigger list
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: *ref_90
+                  required: *ref_91
+  /w/{workspace}/http_triggers/exists/{path}:
+    get:
+      summary: does http trigger exists
+      operationId: existsHttpTrigger
+      tags:
+        - http_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_21
+      responses:
+        '200':
+          description: http trigger exists
+          content:
+            application/json:
+              schema:
+                type: boolean
+  /w/{workspace}/http_triggers/route_exists:
+    post:
+      summary: does route exists
+      operationId: existsRoute
+      tags:
+        - http_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: route exists request
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                route_path:
+                  type: string
+                http_method:
+                  type: string
+                  enum:
+                    - get
+                    - post
+                    - put
+                    - delete
+                    - patch
+              required:
+                - kind
+                - route_path
+                - http_method
+      responses:
+        '200':
+          description: route exists
+          content:
+            application/json:
+              schema:
+                type: boolean
+  /w/{workspace}/http_triggers/used:
+    get:
+      summary: whether http triggers are used
+      operationId: used
+      tags:
+        - http_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      responses:
+        '200':
+          description: whether http triggers are used
+          content:
+            application/json:
+              schema:
+                type: boolean
   /groups/list:
     get:
       summary: list instance groups
@@ -8951,7 +10934,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_81
+                  properties: &ref_93
                     name:
                       type: string
                     summary:
@@ -8960,7 +10943,7 @@ paths:
                       type: array
                       items:
                         type: string
-                  required: &ref_82
+                  required: &ref_94
                     - name
   /groups/get/{name}:
     get:
@@ -8972,7 +10955,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       responses:
         '200':
           description: instance group
@@ -8980,8 +10963,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_81
-                required: *ref_82
+                properties: *ref_93
+                required: *ref_94
   /groups/create:
     post:
       summary: create instance group
@@ -9019,7 +11002,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       requestBody:
         description: update instance group
         required: true
@@ -9049,7 +11032,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       responses:
         '200':
           description: instance group deleted
@@ -9067,7 +11050,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       requestBody:
         description: user to add to instance group
         required: true
@@ -9097,7 +11080,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       requestBody:
         description: user to remove from instance group
         required: true
@@ -9117,6 +11100,62 @@ paths:
             text/plain:
               schema:
                 type: string
+  /groups/export:
+    get:
+      summary: export instance groups
+      operationId: exportInstanceGroups
+      tags:
+        - group
+      responses:
+        '200':
+          description: exported instance groups
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: &ref_95
+                    name:
+                      type: string
+                    summary:
+                      type: string
+                    emails:
+                      type: array
+                      items:
+                        type: string
+                    id:
+                      type: string
+                    scim_display_name:
+                      type: string
+                    external_id:
+                      type: string
+                  required: &ref_96
+                    - name
+  /groups/overwrite:
+    post:
+      summary: overwrite instance groups
+      operationId: overwriteInstanceGroups
+      tags:
+        - group
+      requestBody:
+        description: overwrite instance groups
+        required: true
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                type: object
+                properties: *ref_95
+                required: *ref_96
+      responses:
+        '200':
+          description: success message
+          content:
+            text/plain:
+              schema:
+                type: string
   /w/{workspace}/groups/list:
     get:
       summary: list groups
@@ -9131,11 +11170,11 @@ paths:
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: *ref_3
+          schema: *ref_5
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: *ref_4
+          schema: *ref_6
       responses:
         '200':
           description: group list
@@ -9145,7 +11184,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_83
+                  properties: &ref_97
                     name:
                       type: string
                     summary:
@@ -9158,7 +11197,7 @@ paths:
                       type: object
                       additionalProperties:
                         type: boolean
-                  required: &ref_84
+                  required: &ref_98
                     - name
   /w/{workspace}/groups/listnames:
     get:
@@ -9231,7 +11270,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       requestBody:
         description: updated group
         required: true
@@ -9263,7 +11302,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       responses:
         '200':
           description: group deleted
@@ -9285,7 +11324,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       responses:
         '200':
           description: group
@@ -9293,8 +11332,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_83
-                required: *ref_84
+                properties: *ref_97
+                required: *ref_98
   /w/{workspace}/groups/adduser/{name}:
     post:
       summary: add user to group
@@ -9309,7 +11348,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       requestBody:
         description: added user to group
         required: true
@@ -9341,7 +11380,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       requestBody:
         description: added user to group
         required: true
@@ -9373,11 +11412,11 @@ paths:
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: *ref_3
+          schema: *ref_5
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: *ref_4
+          schema: *ref_6
       responses:
         '200':
           description: folder list
@@ -9387,7 +11426,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_85
+                  properties: &ref_99
                     name:
                       type: string
                     owners:
@@ -9398,7 +11437,14 @@ paths:
                       type: object
                       additionalProperties:
                         type: boolean
-                  required: &ref_86
+                    summary:
+                      type: string
+                    created_by:
+                      type: string
+                    edited_at:
+                      type: string
+                      format: date-time
+                  required: &ref_100
                     - name
                     - owners
                     - extra_perms
@@ -9448,6 +11494,8 @@ paths:
               properties:
                 name:
                   type: string
+                summary:
+                  type: string
                 owners:
                   type: array
                   items:
@@ -9478,7 +11526,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       requestBody:
         description: update folder
         required: true
@@ -9487,6 +11535,8 @@ paths:
             schema:
               type: object
               properties:
+                summary:
+                  type: string
                 owners:
                   type: array
                   items:
@@ -9515,7 +11565,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       responses:
         '200':
           description: folder deleted
@@ -9537,7 +11587,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       responses:
         '200':
           description: folder
@@ -9545,8 +11595,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_85
-                required: *ref_86
+                properties: *ref_99
+                required: *ref_100
   /w/{workspace}/folders/getusage/{name}:
     get:
       summary: get folder usage
@@ -9561,7 +11611,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       responses:
         '200':
           description: folder
@@ -9603,7 +11653,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       requestBody:
         description: owner user to folder
         required: true
@@ -9614,6 +11664,8 @@ paths:
               properties:
                 owner:
                   type: string
+              required:
+                - owner
       responses:
         '200':
           description: owner added to folder
@@ -9635,7 +11687,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       requestBody:
         description: added owner to folder
         required: true
@@ -9646,6 +11698,10 @@ paths:
               properties:
                 owner:
                   type: string
+                write:
+                  type: boolean
+              required:
+                - owner
       responses:
         '200':
           description: owner removed from folder
@@ -9663,11 +11719,11 @@ paths:
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: *ref_3
+          schema: *ref_5
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: *ref_4
+          schema: *ref_6
         - name: ping_since
           in: query
           required: false
@@ -9685,7 +11741,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_149
+                  properties: &ref_170
                     worker:
                       type: string
                     worker_instance:
@@ -9707,7 +11763,27 @@ paths:
                       type: string
                     wm_version:
                       type: string
-                  required: &ref_150
+                    last_job_id:
+                      type: string
+                    last_job_workspace_id:
+                      type: string
+                    occupancy_rate:
+                      type: number
+                    occupancy_rate_15s:
+                      type: number
+                    occupancy_rate_5m:
+                      type: number
+                    occupancy_rate_30m:
+                      type: number
+                    memory:
+                      type: number
+                    vcpus:
+                      type: number
+                    memory_usage:
+                      type: number
+                    wm_memory_usage:
+                      type: number
+                  required: &ref_171
                     - worker
                     - worker_instance
                     - ping_at
@@ -9735,6 +11811,39 @@ paths:
             application/json:
               schema:
                 type: boolean
+  /workers/queue_metrics:
+    get:
+      summary: get queue metrics
+      operationId: getQueueMetrics
+      tags:
+        - worker
+      responses:
+        '200':
+          description: metrics
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    id:
+                      type: string
+                    values:
+                      type: array
+                      items:
+                        type: object
+                        properties:
+                          created_at:
+                            type: string
+                          value:
+                            type: number
+                        required:
+                          - created_at
+                          - value
+                  required:
+                    - id
+                    - values
   /configs/list_worker_groups:
     get:
       summary: list worker groups
@@ -9767,7 +11876,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       responses:
         '200':
           description: a config
@@ -9784,7 +11893,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       requestBody:
         description: worker group
         required: true
@@ -9807,7 +11916,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_80
+          schema: *ref_92
       responses:
         '200':
           description: Delete config
@@ -9815,6 +11924,28 @@ paths:
             text/plain:
               schema:
                 type: string
+  /configs/list:
+    get:
+      summary: list configs
+      operationId: listConfigs
+      tags:
+        - config
+      responses:
+        '200':
+          description: list of configs
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: &ref_216
+                    name:
+                      type: string
+                    config:
+                      type: object
+                  required: &ref_217
+                    - name
   /w/{workspace}/acls/get/{kind}/{path}:
     get:
       summary: get granular acls
@@ -9829,7 +11960,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
         - name: kind
           in: path
           required: true
@@ -9845,6 +11976,7 @@ paths:
               - folder
               - app
               - raw_app
+              - http_trigger
       responses:
         '200':
           description: acls
@@ -9868,7 +12000,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
         - name: kind
           in: path
           required: true
@@ -9884,6 +12016,7 @@ paths:
               - folder
               - app
               - raw_app
+              - http_trigger
       requestBody:
         description: acl to add
         required: true
@@ -9919,7 +12052,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
         - name: kind
           in: path
           required: true
@@ -9935,6 +12068,7 @@ paths:
               - folder
               - app
               - raw_app
+              - http_trigger
       requestBody:
         description: acl to add
         required: true
@@ -9968,7 +12102,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '204':
           description: flow preview captured
@@ -9986,7 +12120,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '201':
           description: flow preview capture created
@@ -10003,7 +12137,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
       responses:
         '200':
           description: captured flow preview
@@ -10083,24 +12217,24 @@ paths:
           schema: *ref_0
         - name: runnable_id
           in: query
-          schema: &ref_89
+          schema: &ref_101
             type: string
         - name: runnable_type
           in: query
-          schema: &ref_90
+          schema: &ref_102
             type: string
-            enum: &ref_117
+            enum: &ref_133
               - ScriptHash
               - ScriptPath
               - FlowPath
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: *ref_3
+          schema: *ref_5
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: *ref_4
+          schema: *ref_6
       responses:
         '200':
           description: Input history for completed jobs
@@ -10110,8 +12244,57 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_87
-                  required: *ref_88
+                  properties: &ref_103
+                    id:
+                      type: string
+                    name:
+                      type: string
+                    created_by:
+                      type: string
+                    created_at:
+                      type: string
+                      format: date-time
+                    is_public:
+                      type: boolean
+                    success:
+                      type: boolean
+                  required: &ref_104
+                    - id
+                    - name
+                    - args
+                    - created_by
+                    - created_at
+                    - is_public
+  /w/{workspace}/inputs/{jobOrInputId}/args:
+    get:
+      summary: Get args from history or saved input
+      operationId: getArgsFromHistoryOrSavedInput
+      tags:
+        - input
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: jobOrInputId
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: input
+          in: query
+          schema:
+            type: boolean
+        - name: allow_large
+          in: query
+          schema:
+            type: boolean
+      responses:
+        '200':
+          description: args
+          content:
+            application/json:
+              schema: {}
   /w/{workspace}/inputs/list:
     get:
       summary: List saved Inputs for a Runnable
@@ -10125,18 +12308,18 @@ paths:
           schema: *ref_0
         - name: runnable_id
           in: query
-          schema: *ref_89
+          schema: *ref_101
         - name: runnable_type
           in: query
-          schema: *ref_90
+          schema: *ref_102
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
-          schema: *ref_3
+          schema: *ref_5
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
-          schema: *ref_4
+          schema: *ref_6
       responses:
         '200':
           description: Saved Inputs for a Runnable
@@ -10146,8 +12329,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_87
-                  required: *ref_88
+                  properties: *ref_103
+                  required: *ref_104
   /w/{workspace}/inputs/create:
     post:
       summary: Create an Input for future use in a script or flow
@@ -10161,10 +12344,10 @@ paths:
           schema: *ref_0
         - name: runnable_id
           in: query
-          schema: *ref_89
+          schema: *ref_101
         - name: runnable_type
           in: query
-          schema: *ref_90
+          schema: *ref_102
       requestBody:
         description: Input
         required: true
@@ -10172,12 +12355,12 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_113
+              properties: &ref_129
                 name:
                   type: string
                 args:
                   type: object
-              required: &ref_114
+              required: &ref_130
                 - name
                 - args
                 - created_by
@@ -10207,14 +12390,14 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_115
+              properties: &ref_131
                 id:
                   type: string
                 name:
                   type: string
                 is_public:
                   type: boolean
-              required: &ref_116
+              required: &ref_132
                 - id
                 - name
                 - is_public
@@ -10240,7 +12423,7 @@ paths:
         - name: input
           in: path
           required: true
-          schema: &ref_107
+          schema: &ref_123
             type: string
       responses:
         '200':
@@ -10273,7 +12456,7 @@ paths:
               properties:
                 s3_resource:
                   type: object
-                  properties: &ref_91
+                  properties: &ref_105
                     bucket:
                       type: string
                     region:
@@ -10288,7 +12471,7 @@ paths:
                       type: string
                     pathStyle:
                       type: boolean
-                  required: &ref_92
+                  required: &ref_106
                     - bucket
                     - region
                     - endPoint
@@ -10364,8 +12547,8 @@ paths:
               properties:
                 s3_resource:
                   type: object
-                  properties: *ref_91
-                  required: *ref_92
+                  properties: *ref_105
+                  required: *ref_106
       responses:
         '200':
           description: Connection settings
@@ -10386,10 +12569,10 @@ paths:
                     type: boolean
                   client_kwargs:
                     type: object
-                    properties: &ref_93
+                    properties: &ref_107
                       region_name:
                         type: string
-                    required: &ref_94
+                    required: &ref_108
                       - region_name
                 required:
                   - endpoint_url
@@ -10444,8 +12627,8 @@ paths:
                         type: boolean
                       client_kwargs:
                         type: object
-                        properties: *ref_93
-                        required: *ref_94
+                        properties: *ref_107
+                        required: *ref_108
                     required:
                       - endpoint_url
                       - use_ssl
@@ -10503,11 +12686,11 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_91
-                required: *ref_92
+                properties: *ref_105
+                required: *ref_106
   /w/{workspace}/job_helpers/test_connection:
     get:
-      summary: Test connection to the workspace datasets storage
+      summary: Test connection to the workspace object storage
       operationId: datasetStorageTestConnection
       tags:
         - helpers
@@ -10516,6 +12699,10 @@ paths:
           in: path
           required: true
           schema: *ref_0
+        - name: storage
+          in: query
+          schema:
+            type: string
       responses:
         '200':
           description: Connection settings
@@ -10524,7 +12711,7 @@ paths:
               schema: {}
   /w/{workspace}/job_helpers/list_stored_files:
     get:
-      summary: List the file keys available in the workspace files storage (S3)
+      summary: List the file keys available in a workspace object storage
       operationId: listStoredFiles
       tags:
         - helpers
@@ -10546,6 +12733,10 @@ paths:
           in: query
           schema:
             type: string
+        - name: storage
+          in: query
+          schema:
+            type: string
       responses:
         '200':
           description: List of file keys
@@ -10560,10 +12751,10 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties: &ref_169
+                      properties: &ref_193
                         s3:
                           type: string
-                      required: &ref_170
+                      required: &ref_194
                         - s3
                   restricted_access:
                     type: boolean
@@ -10585,6 +12776,10 @@ paths:
           required: true
           schema:
             type: string
+        - name: storage
+          in: query
+          schema:
+            type: string
       responses:
         '200':
           description: FileMetadata
@@ -10592,7 +12787,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_171
+                properties: &ref_195
                   mime_type:
                     type: string
                   size_in_bytes:
@@ -10645,6 +12840,10 @@ paths:
           in: query
           schema:
             type: integer
+        - name: storage
+          in: query
+          schema:
+            type: string
       responses:
         '200':
           description: FilePreview
@@ -10652,7 +12851,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_172
+                properties: &ref_196
                   msg:
                     type: string
                   content:
@@ -10664,7 +12863,7 @@ paths:
                       - Csv
                       - Parquet
                       - Unknown
-                required: &ref_173
+                required: &ref_197
                   - content_type
   /w/{workspace}/job_helpers/load_parquet_preview/{path}:
     get:
@@ -10680,7 +12879,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_17
+          schema: *ref_21
         - name: offset
           in: query
           schema:
@@ -10705,12 +12904,106 @@ paths:
           in: query
           schema:
             type: string
+        - name: storage
+          in: query
+          schema:
+            type: string
       responses:
         '200':
           description: Parquet Preview
           content:
             application/json:
               schema: {}
+  /w/{workspace}/job_helpers/load_table_count/{path}:
+    get:
+      summary: Load the table row count
+      operationId: loadTableRowCount
+      tags:
+        - helpers
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_21
+        - name: search_col
+          in: query
+          schema:
+            type: string
+        - name: search_term
+          in: query
+          schema:
+            type: string
+        - name: storage
+          in: query
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Table count
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  count:
+                    type: number
+  /w/{workspace}/job_helpers/load_csv_preview/{path}:
+    get:
+      summary: Load a preview of a csv file
+      operationId: loadCsvPreview
+      tags:
+        - helpers
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_21
+        - name: offset
+          in: query
+          schema:
+            type: number
+        - name: limit
+          in: query
+          schema:
+            type: number
+        - name: sort_col
+          in: query
+          schema:
+            type: string
+        - name: sort_desc
+          in: query
+          schema:
+            type: boolean
+        - name: search_col
+          in: query
+          schema:
+            type: string
+        - name: search_term
+          in: query
+          schema:
+            type: string
+        - name: storage
+          in: query
+          schema:
+            type: string
+        - name: csv_separator
+          in: query
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Csv Preview
+          content:
+            application/json:
+              schema: {}
   /w/{workspace}/job_helpers/delete_s3_file:
     delete:
       summary: Permanently delete file from S3
@@ -10727,6 +13020,10 @@ paths:
           required: true
           schema:
             type: string
+        - name: storage
+          in: query
+          schema:
+            type: string
       responses:
         '200':
           description: Confirmation
@@ -10754,6 +13051,10 @@ paths:
           required: true
           schema:
             type: string
+        - name: storage
+          in: query
+          schema:
+            type: string
       responses:
         '200':
           description: Confirmation
@@ -10791,6 +13092,10 @@ paths:
           required: false
           schema:
             type: string
+        - name: storage
+          in: query
+          schema:
+            type: string
       requestBody:
         description: File content
         required: true
@@ -10837,6 +13142,10 @@ paths:
           required: false
           schema:
             type: string
+        - name: storage
+          in: query
+          schema:
+            type: string
       responses:
         '200':
           description: Chunk of the downloaded file
@@ -10845,6 +13154,39 @@ paths:
               schema:
                 type: string
                 format: binary
+  /w/{workspace}/job_helpers/download_s3_parquet_file_as_csv:
+    get:
+      summary: Download file to S3 bucket
+      operationId: fileDownloadParquetAsCsv
+      tags:
+        - helpers
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: file_key
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: s3_resource_path
+          in: query
+          required: false
+          schema:
+            type: string
+        - name: resource_type
+          in: query
+          required: false
+          schema:
+            type: string
+      responses:
+        '200':
+          description: The downloaded file
+          content:
+            text/csv:
+              schema:
+                type: string
   /w/{workspace}/job_metrics/get/{id}:
     post:
       summary: get job metrics
@@ -10859,7 +13201,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_73
+          schema: *ref_83
       requestBody:
         description: parameters for statistics retrieval
         required: true
@@ -10888,48 +13230,175 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties: &ref_176
+                      properties: &ref_200
                         id:
                           type: string
                         name:
                           type: string
-                      required: &ref_177
+                      required: &ref_201
                         - id
                   scalar_metrics:
                     type: array
                     items:
                       type: object
-                      properties: &ref_178
+                      properties: &ref_202
                         metric_id:
                           type: string
                         value:
                           type: number
-                      required: &ref_179
+                      required: &ref_203
                         - id
                         - value
                   timeseries_metrics:
                     type: array
                     items:
                       type: object
-                      properties: &ref_180
+                      properties: &ref_204
                         metric_id:
                           type: string
                         values:
                           type: array
                           items:
                             type: object
-                            properties: &ref_182
+                            properties: &ref_206
                               timestamp:
                                 type: string
                                 format: date-time
                               value:
                                 type: number
-                            required: &ref_183
+                            required: &ref_207
                               - timestamp
                               - value
-                      required: &ref_181
+                      required: &ref_205
                         - id
                         - values
+  /w/{workspace}/job_metrics/set_progress/{id}:
+    post:
+      summary: set job metrics
+      operationId: setJobProgress
+      tags:
+        - metrics
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: id
+          in: path
+          required: true
+          schema: *ref_83
+      requestBody:
+        description: parameters for statistics retrieval
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                percent:
+                  type: integer
+                flow_job_id:
+                  type: string
+                  format: uuid
+      responses:
+        '200':
+          description: Job progress updated
+          content:
+            application/json:
+              schema: {}
+  /w/{workspace}/job_metrics/get_progress/{id}:
+    get:
+      summary: get job progress
+      operationId: getJobProgress
+      tags:
+        - metrics
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: id
+          in: path
+          required: true
+          schema: *ref_83
+      responses:
+        '200':
+          description: job progress between 0 and 99
+          content:
+            application/json:
+              schema:
+                type: integer
+  /service_logs/list_files:
+    get:
+      summary: list log files ordered by timestamp
+      operationId: listLogFiles
+      tags:
+        - service_logs
+      parameters:
+        - name: before
+          description: filter on started before (inclusive) timestamp
+          in: query
+          schema: *ref_109
+        - name: after
+          description: filter on created after (exclusive) timestamp
+          in: query
+          schema: *ref_110
+        - name: with_error
+          in: query
+          required: false
+          schema:
+            type: boolean
+      responses:
+        '200':
+          description: time
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    hostname:
+                      type: string
+                    mode:
+                      type: string
+                    worker_group:
+                      type: string
+                    log_ts:
+                      type: string
+                      format: date-time
+                    file_path:
+                      type: string
+                    ok_lines:
+                      type: integer
+                    err_lines:
+                      type: integer
+                    json_fmt:
+                      type: boolean
+                  required:
+                    - hostname
+                    - mode
+                    - log_ts
+                    - file_path
+                    - json_fmt
+  /service_logs/get_log_file/{path}:
+    get:
+      summary: get log file by path
+      operationId: getLogFile
+      tags:
+        - service_logs
+      parameters:
+        - name: path
+          in: path
+          required: true
+          schema: *ref_21
+      responses:
+        '200':
+          description: log stream
+          content:
+            text/plain:
+              schema:
+                type: string
   /concurrency_groups/list:
     get:
       summary: List all concurrency groups
@@ -10945,17 +13414,15 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_186
-                    concurrency_id:
+                  properties: &ref_210
+                    concurrency_key:
                       type: string
-                    job_uuids:
-                      type: array
-                      items:
-                        type: string
-                  required: &ref_187
-                    - concurrency_id
-                    - job_uuids
-  /concurrency_groups/{concurrency_id}:
+                    total_running:
+                      type: number
+                  required: &ref_211
+                    - concurrency_key
+                    - total_running
+  /concurrency_groups/prune/{concurrency_id}:
     delete:
       summary: Delete concurrency group
       operationId: deleteConcurrencyGroup
@@ -10965,7 +13432,7 @@ paths:
         - name: concurrency_id
           in: path
           required: true
-          schema: &ref_109
+          schema: &ref_125
             type: string
       responses:
         '200':
@@ -10975,6 +13442,251 @@ paths:
               schema:
                 type: object
                 properties: {}
+  /concurrency_groups/{id}/key:
+    get:
+      summary: Get the concurrency key for a job that has concurrency limits enabled
+      operationId: getConcurrencyKey
+      tags:
+        - concurrencyGroups
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema: *ref_83
+      responses:
+        '200':
+          description: concurrency key for given job
+          content:
+            application/json:
+              schema:
+                type: string
+  /w/{workspace}/concurrency_groups/list_jobs:
+    get:
+      summary: Get intervals of job runtime concurrency
+      operationId: listExtendedJobs
+      tags:
+        - concurrencyGroups
+        - job
+      parameters:
+        - name: concurrency_key
+          in: query
+          required: false
+          schema:
+            type: string
+        - name: row_limit
+          in: query
+          required: false
+          schema:
+            type: number
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: created_by
+          description: mask to filter exact matching user creator
+          in: query
+          schema: *ref_49
+        - name: label
+          description: >-
+            mask to filter exact matching job's label (job labels are completed
+            jobs with as a result an object containing a string in the array at
+            key 'wm_labels')
+          in: query
+          schema: *ref_78
+        - name: parent_job
+          description: >-
+            The parent job that is at the origin and responsible for the
+            execution of this script if any
+          in: query
+          schema: *ref_42
+        - name: script_path_exact
+          description: mask to filter exact matching path
+          in: query
+          schema: *ref_62
+        - name: script_path_start
+          description: mask to filter matching starting path
+          in: query
+          schema: *ref_63
+        - name: schedule_path
+          description: mask to filter by schedule path
+          in: query
+          schema: *ref_64
+        - name: script_hash
+          description: mask to filter exact matching path
+          in: query
+          schema: *ref_65
+        - name: started_before
+          description: filter on started before (inclusive) timestamp
+          in: query
+          schema: *ref_66
+        - name: started_after
+          description: filter on started after (exclusive) timestamp
+          in: query
+          schema: *ref_67
+        - name: created_or_started_before
+          description: >-
+            filter on created_at for non non started job and started_at
+            otherwise before (inclusive) timestamp
+          in: query
+          schema: *ref_111
+        - name: running
+          description: filter on running jobs
+          in: query
+          schema: *ref_72
+        - name: scheduled_for_before_now
+          description: filter on jobs scheduled_for before now (hence waitinf for a worker)
+          in: query
+          schema: *ref_69
+        - name: created_or_started_after
+          description: >-
+            filter on created_at for non non started job and started_at
+            otherwise after (exclusive) timestamp
+          in: query
+          schema: *ref_112
+        - name: created_or_started_after_completed_jobs
+          description: >-
+            filter on created_at for non non started job and started_at
+            otherwise after (exclusive) timestamp but only for the completed
+            jobs
+          in: query
+          schema: *ref_113
+        - name: job_kinds
+          description: >-
+            filter on job kind (values 'preview', 'script', 'dependencies',
+            'flow') separated by,
+          in: query
+          schema: *ref_70
+        - name: args
+          description: >-
+            filter on jobs containing those args as a json subset (@> in
+            postgres)
+          in: query
+          schema: *ref_73
+        - name: tag
+          description: filter on jobs with a given tag/worker group
+          in: query
+          schema: *ref_75
+        - name: result
+          description: >-
+            filter on jobs containing those result as a json subset (@> in
+            postgres)
+          in: query
+          schema: *ref_74
+        - name: page
+          description: which page to return (start at 1, default 1)
+          in: query
+          schema: *ref_5
+        - name: per_page
+          description: number of items to return for a given page (default 30, max 100)
+          in: query
+          schema: *ref_6
+        - name: is_skipped
+          description: is the job skipped
+          in: query
+          schema:
+            type: boolean
+        - name: is_flow_step
+          description: is the job a flow step
+          in: query
+          schema:
+            type: boolean
+        - name: has_null_parent
+          description: has null parent
+          in: query
+          schema:
+            type: boolean
+        - name: success
+          description: filter on successful jobs
+          in: query
+          schema:
+            type: boolean
+        - name: all_workspaces
+          description: >-
+            get jobs from all workspaces (only valid if request come from the
+            `admins` workspace)
+          in: query
+          schema:
+            type: boolean
+        - name: is_not_schedule
+          description: is not a scheduled job
+          in: query
+          schema:
+            type: boolean
+      responses:
+        '200':
+          description: time
+          content:
+            application/json:
+              schema:
+                type: object
+                properties: &ref_212
+                  jobs:
+                    type: array
+                    items:
+                      oneOf: *ref_84
+                      discriminator: *ref_85
+                  obscured_jobs:
+                    type: array
+                    items:
+                      type: object
+                      properties: &ref_134
+                        typ:
+                          type: string
+                        started_at:
+                          type: string
+                          format: date-time
+                        duration_ms:
+                          type: number
+                  omitted_obscured_jobs:
+                    description: >-
+                      Obscured jobs omitted for security because of too specific
+                      filtering
+                    type: boolean
+                required: &ref_213
+                  - jobs
+                  - obscured_jobs
+  /srch/w/{workspace}/index/search/job:
+    get:
+      summary: Search through jobs with a string query
+      operationId: searchJobsIndex
+      tags:
+        - indexSearch
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: search_query
+          in: query
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: search results
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  query_parse_errors:
+                    description: >-
+                      a list of the terms that couldn't be parsed (and thus
+                      ignored)
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        dancer:
+                          type: string
+                  hits:
+                    description: the jobs that matched the query
+                    type: array
+                    items:
+                      type: object
+                      properties: &ref_218
+                        dancer:
+                          type: string
 components:
   securitySchemes:
     bearerAuth:
@@ -10989,7 +13701,7 @@ components:
       name: key
       in: path
       required: true
-      schema: *ref_7
+      schema: *ref_9
     WorkspaceId:
       name: workspace
       in: path
@@ -10999,89 +13711,104 @@ components:
       name: version
       in: path
       required: true
-      schema: *ref_95
+      schema: *ref_114
     Token:
       name: token
       in: path
       required: true
-      schema: *ref_96
+      schema: *ref_115
     AccountId:
       name: id
       in: path
       required: true
-      schema: *ref_21
+      schema: *ref_25
     ClientName:
       name: client_name
       in: path
       required: true
-      schema: *ref_20
+      schema: *ref_24
     ScriptPath:
       name: path
       in: path
       required: true
-      schema: *ref_29
+      schema: *ref_33
     ScriptHash:
       name: hash
       in: path
       required: true
-      schema: *ref_33
+      schema: *ref_37
     JobId:
       name: id
       in: path
       required: true
-      schema: *ref_73
+      schema: *ref_83
     Path:
       name: path
       in: path
       required: true
-      schema: *ref_17
+      schema: *ref_21
     PathId:
       name: id
       in: path
       required: true
-      schema: *ref_24
+      schema: *ref_28
     PathVersion:
       name: version
       in: path
       required: true
-      schema: *ref_97
+      schema: *ref_116
     Name:
       name: name
       in: path
       required: true
-      schema: *ref_80
+      schema: *ref_92
     Page:
       name: page
       description: which page to return (start at 1, default 1)
       in: query
-      schema: *ref_3
+      schema: *ref_5
     PerPage:
       name: per_page
       description: number of items to return for a given page (default 30, max 100)
       in: query
-      schema: *ref_4
+      schema: *ref_6
     OrderDesc:
       name: order_desc
       description: order by desc order (default true)
       in: query
-      schema: *ref_41
+      schema: *ref_48
     CreatedBy:
       name: created_by
       description: mask to filter exact matching user creator
       in: query
-      schema: *ref_42
+      schema: *ref_49
+    Label:
+      name: label
+      description: >-
+        mask to filter exact matching job's label (job labels are completed jobs
+        with as a result an object containing a string in the array at key
+        'wm_labels')
+      in: query
+      schema: *ref_78
     ParentJob:
       name: parent_job
       description: >-
         The parent job that is at the origin and responsible for the execution
         of this script if any
       in: query
-      schema: *ref_36
+      schema: *ref_42
     WorkerTag:
       name: tag
       description: Override the tag to use
       in: query
-      schema: *ref_38
+      schema: *ref_44
+    CacheTtl:
+      name: cache_ttl
+      description: >-
+        Override the cache time to live (in seconds). Can not be used to disable
+        caching, only override with a new cache ttl
+      in: query
+      schema: *ref_45
     NewJobId:
       name: job_id
       description: >-
@@ -11089,7 +13816,7 @@ components:
         randomly using the ULID scheme. If a job id already exists in the queue
         or as a completed job, the request to create one will fail (Bad Request)
       in: query
-      schema: *ref_37
+      schema: *ref_43
     IncludeHeader:
       name: include_header
       description: >
@@ -11099,14 +13826,14 @@ components:
         Header's key lowercased and '-'' replaced to '_' such that
         'Content-Type' becomes the 'content_type' arg key
       in: query
-      schema: *ref_39
+      schema: *ref_46
     QueueLimit:
       name: queue_limit
       description: >
         The maximum size of the queue for which the request would get rejected
         if that job would push it above that limit
       in: query
-      schema: *ref_40
+      schema: *ref_47
     Payload:
       name: payload
       description: >
@@ -11115,233 +13842,249 @@ components:
 
         `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
       in: query
-      schema: *ref_76
+      schema: *ref_86
     ScriptStartPath:
       name: script_path_start
       description: mask to filter matching starting path
       in: query
-      schema: *ref_55
+      schema: *ref_63
     SchedulePath:
       name: schedule_path
       description: mask to filter by schedule path
       in: query
-      schema: *ref_56
+      schema: *ref_64
     ScriptExactPath:
       name: script_path_exact
       description: mask to filter exact matching path
       in: query
-      schema: *ref_54
+      schema: *ref_62
     ScriptExactHash:
       name: script_hash
       description: mask to filter exact matching path
       in: query
-      schema: *ref_57
+      schema: *ref_65
+    CreatedBefore:
+      name: created_before
+      description: filter on created before (inclusive) timestamp
+      in: query
+      schema: *ref_117
+    CreatedAfter:
+      name: created_after
+      description: filter on created after (exclusive) timestamp
+      in: query
+      schema: *ref_118
     StartedBefore:
       name: started_before
       description: filter on started before (inclusive) timestamp
       in: query
-      schema: *ref_58
+      schema: *ref_66
     StartedAfter:
       name: started_after
       description: filter on started after (exclusive) timestamp
       in: query
-      schema: *ref_59
+      schema: *ref_67
+    Before:
+      name: before
+      description: filter on started before (inclusive) timestamp
+      in: query
+      schema: *ref_109
     CreatedOrStartedAfter:
       name: created_or_started_after
       description: >-
         filter on created_at for non non started job and started_at otherwise
         after (exclusive) timestamp
       in: query
-      schema: *ref_98
+      schema: *ref_112
+    CreatedOrStartedAfterCompletedJob:
+      name: created_or_started_after_completed_jobs
+      description: >-
+        filter on created_at for non non started job and started_at otherwise
+        after (exclusive) timestamp but only for the completed jobs
+      in: query
+      schema: *ref_113
     CreatedOrStartedBefore:
       name: created_or_started_before
       description: >-
         filter on created_at for non non started job and started_at otherwise
         before (inclusive) timestamp
       in: query
-      schema: *ref_99
+      schema: *ref_111
     Success:
       name: success
       description: filter on successful jobs
       in: query
-      schema: *ref_60
+      schema: *ref_68
     ScheduledForBeforeNow:
       name: scheduled_for_before_now
       description: filter on jobs scheduled_for before now (hence waitinf for a worker)
       in: query
-      schema: *ref_68
+      schema: *ref_69
     Suspended:
       name: suspended
       description: filter on suspended jobs
       in: query
-      schema: *ref_100
+      schema: *ref_71
     Running:
       name: running
       description: filter on running jobs
       in: query
-      schema: *ref_67
+      schema: *ref_72
     ArgsFilter:
       name: args
       description: filter on jobs containing those args as a json subset (@> in postgres)
       in: query
-      schema: *ref_62
+      schema: *ref_73
     Tag:
       name: tag
       description: filter on jobs with a given tag/worker group
       in: query
-      schema: *ref_64
+      schema: *ref_75
     ResultFilter:
       name: result
       description: filter on jobs containing those result as a json subset (@> in postgres)
       in: query
-      schema: *ref_63
+      schema: *ref_74
     After:
       name: after
       description: filter on created after (exclusive) timestamp
       in: query
-      schema: *ref_101
-    Before:
-      name: before
-      description: filter on created before (exclusive) timestamp
-      in: query
-      schema: *ref_102
+      schema: *ref_110
     Username:
       name: username
       description: filter on exact username of user
       in: query
-      schema: *ref_103
+      schema: *ref_119
     Operation:
       name: operation
       description: filter on exact or prefix name of operation
       in: query
-      schema: *ref_104
+      schema: *ref_120
     ResourceName:
       name: resource
       description: filter on exact or prefix name of resource
       in: query
-      schema: *ref_105
+      schema: *ref_121
     ActionKind:
       name: action_kind
       description: filter on type of operation
       in: query
-      schema: *ref_106
+      schema: *ref_122
     JobKinds:
       name: job_kinds
       description: >-
         filter on job kind (values 'preview', 'script', 'dependencies', 'flow')
         separated by,
       in: query
-      schema: *ref_61
+      schema: *ref_70
     RunnableId:
       name: runnable_id
       in: query
-      schema: *ref_89
+      schema: *ref_101
     RunnableTypeQuery:
       name: runnable_type
       in: query
-      schema: *ref_90
+      schema: *ref_102
     InputId:
       name: input
       in: path
       required: true
-      schema: *ref_107
+      schema: *ref_123
     GetStarted:
       name: get_started
       in: query
-      schema: *ref_108
+      schema: *ref_124
     ConcurrencyId:
       name: concurrency_id
       in: path
       required: true
-      schema: *ref_109
+      schema: *ref_125
   schemas:
     Script:
       type: object
-      properties: *ref_31
-      required: *ref_32
+      properties: *ref_35
+      required: *ref_36
     NewScript:
       type: object
-      properties: *ref_34
-      required: *ref_35
+      properties: *ref_40
+      required: *ref_41
     NewScriptWithDraft:
-      allOf: *ref_110
+      allOf: *ref_126
     ScriptHistory:
-      type: object
-      properties: *ref_111
-      required: *ref_112
-    ScriptArgs:
-      type: object
-      additionalProperties: *ref_14
-    Input:
-      type: object
-      properties: *ref_87
-      required: *ref_88
-    CreateInput:
-      type: object
-      properties: *ref_113
-      required: *ref_114
-    UpdateInput:
-      type: object
-      properties: *ref_115
-      required: *ref_116
-    RunnableType:
-      type: string
-      enum: *ref_117
-    QueuedJob:
-      type: object
-      properties: *ref_71
-      required: *ref_72
-    CompletedJob:
-      type: object
-      properties: *ref_69
-      required: *ref_70
-    Job:
-      allOf: *ref_74
-      discriminator: *ref_75
-    User:
-      type: object
-      properties: *ref_8
-      required: *ref_9
-    Usage:
-      type: object
-      properties: *ref_118
-    Login:
-      type: object
-      properties: *ref_119
-      required: *ref_120
-    NewUser:
-      type: object
-      properties: *ref_121
-      required: *ref_122
-    EditWorkspaceUser:
-      type: object
-      properties: *ref_123
-    TruncatedToken:
-      type: object
-      properties: *ref_124
-      required: *ref_125
-    NewToken:
-      type: object
-      properties: *ref_126
-    NewTokenImpersonate:
       type: object
       properties: *ref_127
       required: *ref_128
-    ListableVariable:
+    ScriptArgs:
       type: object
-      properties: *ref_18
-      required: *ref_19
-    ContextualVariable:
+      additionalProperties: *ref_16
+    Input:
+      type: object
+      properties: *ref_103
+      required: *ref_104
+    CreateInput:
       type: object
       properties: *ref_129
       required: *ref_130
-    CreateVariable:
+    UpdateInput:
       type: object
       properties: *ref_131
       required: *ref_132
+    RunnableType:
+      type: string
+      enum: *ref_133
+    QueuedJob:
+      type: object
+      properties: *ref_81
+      required: *ref_82
+    CompletedJob:
+      type: object
+      properties: *ref_79
+      required: *ref_80
+    ObscuredJob:
+      type: object
+      properties: *ref_134
+    Job:
+      oneOf: *ref_84
+      discriminator: *ref_85
+    User:
+      type: object
+      properties: *ref_10
+      required: *ref_11
+    UserUsage:
+      type: object
+      properties: *ref_135
+    Login:
+      type: object
+      properties: *ref_136
+      required: *ref_137
+    EditWorkspaceUser:
+      type: object
+      properties: *ref_138
+    TruncatedToken:
+      type: object
+      properties: *ref_38
+      required: *ref_39
+    NewToken:
+      type: object
+      properties: *ref_139
+    NewTokenImpersonate:
+      type: object
+      properties: *ref_140
+      required: *ref_141
+    ListableVariable:
+      type: object
+      properties: *ref_22
+      required: *ref_23
+    ContextualVariable:
+      type: object
+      properties: *ref_142
+      required: *ref_143
+    CreateVariable:
+      type: object
+      properties: *ref_144
+      required: *ref_145
     EditVariable:
       type: object
-      properties: *ref_133
+      properties: *ref_146
     AuditLog:
       type: object
       properties: *ref_1
@@ -11457,124 +14200,164 @@ components:
             required:
               - name
               - typ
+        no_main_func:
+          type: boolean
+          nullable: true
+        has_preprocessor:
+          type: boolean
+          nullable: true
       required:
         - star_args
         - start_kwargs
         - args
         - type
         - error
+        - no_main_func
+        - has_preprocessor
     Preview:
-      type: object
-      properties: *ref_134
-      required: *ref_135
-    CreateResource:
-      type: object
-      properties: *ref_136
-      required: *ref_137
-    EditResource:
-      type: object
-      properties: *ref_138
-    Resource:
-      type: object
-      properties: *ref_139
-      required: *ref_140
-    ListableResource:
-      type: object
-      properties: *ref_141
-      required: *ref_142
-    ResourceType:
-      type: object
-      properties: *ref_22
-      required: *ref_23
-    EditResourceType:
-      type: object
-      properties: *ref_143
-    Schedule:
-      type: object
-      properties: *ref_78
-      required: *ref_79
-    ScheduleWJobs:
-      allOf: *ref_144
-    NewSchedule:
-      type: object
-      properties: *ref_145
-      required: *ref_146
-    EditSchedule:
       type: object
       properties: *ref_147
       required: *ref_148
-    Group:
-      type: object
-      properties: *ref_83
-      required: *ref_84
-    InstanceGroup:
-      type: object
-      properties: *ref_81
-      required: *ref_82
-    Folder:
-      type: object
-      properties: *ref_85
-      required: *ref_86
-    WorkerPing:
+    WorkflowTask:
       type: object
       properties: *ref_149
       required: *ref_150
-    UserWorkspaceList:
+    WorkflowStatusRecord:
       type: object
-      properties: *ref_151
-      required: *ref_152
-    CreateWorkspace:
+      additionalProperties: *ref_151
+    WorkflowStatus:
+      type: object
+      properties: *ref_152
+    CreateResource:
       type: object
       properties: *ref_153
       required: *ref_154
-    Workspace:
-      type: object
-      properties: *ref_5
-      required: *ref_6
-    WorkspaceInvite:
-      type: object
-      properties: *ref_12
-      required: *ref_13
-    GlobalUserInfo:
-      type: object
-      properties: *ref_10
-      required: *ref_11
-    Flow:
-      allOf: *ref_45
-    FlowMetadata:
+    EditResource:
       type: object
       properties: *ref_155
-      required: *ref_156
-    OpenFlowWPath:
-      allOf: *ref_46
-    FlowPreview:
+    Resource:
       type: object
-      properties: *ref_157
-      required: *ref_158
-    RestartedFrom:
+      properties: *ref_156
+      required: *ref_157
+    ListableResource:
       type: object
-      properties: *ref_159
-    Policy:
+      properties: *ref_158
+      required: *ref_159
+    ResourceType:
       type: object
-      properties: *ref_47
-    ListableApp:
+      properties: *ref_26
+      required: *ref_27
+    EditResourceType:
       type: object
       properties: *ref_160
-      required: *ref_161
-    ListableRawApp:
+    Schedule:
+      type: object
+      properties: *ref_88
+      required: *ref_89
+    ScheduleWJobs:
+      allOf: *ref_161
+    NewSchedule:
       type: object
       properties: *ref_162
       required: *ref_163
+    EditSchedule:
+      type: object
+      properties: *ref_164
+      required: *ref_165
+    HttpTrigger:
+      type: object
+      properties: *ref_90
+      required: *ref_91
+    NewHttpTrigger:
+      type: object
+      properties: *ref_166
+      required: *ref_167
+    EditHttpTrigger:
+      type: object
+      properties: *ref_168
+      required: *ref_169
+    TriggersCount:
+      type: object
+      properties: *ref_53
+    Group:
+      type: object
+      properties: *ref_97
+      required: *ref_98
+    InstanceGroup:
+      type: object
+      properties: *ref_93
+      required: *ref_94
+    Folder:
+      type: object
+      properties: *ref_99
+      required: *ref_100
+    WorkerPing:
+      type: object
+      properties: *ref_170
+      required: *ref_171
+    UserWorkspaceList:
+      type: object
+      properties: *ref_172
+      required: *ref_173
+    CreateWorkspace:
+      type: object
+      properties: *ref_174
+      required: *ref_175
+    Workspace:
+      type: object
+      properties: *ref_7
+      required: *ref_8
+    WorkspaceInvite:
+      type: object
+      properties: *ref_14
+      required: *ref_15
+    GlobalUserInfo:
+      type: object
+      properties: *ref_12
+      required: *ref_13
+    Flow:
+      allOf: *ref_52
+    ExtraPerms:
+      type: object
+      additionalProperties: *ref_176
+    FlowMetadata:
+      type: object
+      properties: *ref_177
+      required: *ref_178
+    OpenFlowWPath:
+      allOf: *ref_54
+    FlowPreview:
+      type: object
+      properties: *ref_179
+      required: *ref_180
+    RestartedFrom:
+      type: object
+      properties: *ref_181
+    Policy:
+      type: object
+      properties: *ref_55
+    ListableApp:
+      type: object
+      properties: *ref_182
+      required: *ref_183
+    ListableRawApp:
+      type: object
+      properties: *ref_184
+      required: *ref_185
     AppWithLastVersion:
       type: object
-      properties: *ref_48
-      required: *ref_49
+      properties: *ref_56
+      required: *ref_57
     AppWithLastVersionWDraft:
-      allOf: *ref_164
+      allOf: *ref_186
     AppHistory:
       type: object
-      properties: *ref_165
-      required: *ref_166
+      properties: *ref_187
+      required: *ref_188
+    FlowVersion:
+      type: object
+      properties: *ref_189
+      required: *ref_190
     SlackToken:
       type: object
       properties:
@@ -11596,40 +14379,46 @@ components:
         - bot
     TokenResponse:
       type: object
-      properties: *ref_167
-      required: *ref_168
+      properties: *ref_191
+      required: *ref_192
     HubScriptKind:
       name: kind
-      schema: *ref_30
+      schema: *ref_34
     PolarsClientKwargs:
       type: object
-      properties: *ref_93
-      required: *ref_94
+      properties: *ref_107
+      required: *ref_108
     LargeFileStorage:
       type: object
-      properties: *ref_15
+      properties: *ref_17
     WindmillLargeFile:
       type: object
-      properties: *ref_169
-      required: *ref_170
+      properties: *ref_193
+      required: *ref_194
     WindmillFileMetadata:
       type: object
-      properties: *ref_171
+      properties: *ref_195
     WindmillFilePreview:
       type: object
-      properties: *ref_172
-      required: *ref_173
+      properties: *ref_196
+      required: *ref_197
     S3Resource:
       type: object
-      properties: *ref_91
-      required: *ref_92
+      properties: *ref_105
+      required: *ref_106
     WorkspaceGitSyncSettings:
       type: object
-      properties: *ref_16
+      properties: *ref_18
+    WorkspaceDeployUISettings:
+      type: object
+      properties: *ref_19
+    WorkspaceDefaultScripts:
+      type: object
+      properties: *ref_20
     GitRepositorySettings:
       type: object
-      properties: *ref_174
-      required: *ref_175
+      properties: *ref_198
+      required: *ref_199
     UploadFilePart:
       type: object
       properties:
@@ -11641,91 +14430,118 @@ components:
         - part_number
         - tag
     MetricMetadata:
-      type: object
-      properties: *ref_176
-      required: *ref_177
-    ScalarMetric:
-      type: object
-      properties: *ref_178
-      required: *ref_179
-    TimeseriesMetric:
-      type: object
-      properties: *ref_180
-      required: *ref_181
-    MetricDataPoint:
-      type: object
-      properties: *ref_182
-      required: *ref_183
-    RawScriptForDependencies:
-      type: object
-      properties: *ref_184
-      required: *ref_185
-    ConcurrencyGroup:
-      type: object
-      properties: *ref_186
-      required: *ref_187
-    StaticTransform:
-      type: object
-      properties: *ref_188
-      required: *ref_189
-    JavascriptTransform:
-      type: object
-      properties: *ref_190
-      required: *ref_191
-    InputTransform:
-      oneOf: *ref_25
-      discriminator: *ref_26
-    RawScript:
-      type: object
-      properties: *ref_192
-      required: *ref_193
-    PathScript:
-      type: object
-      properties: *ref_194
-      required: *ref_195
-    PathFlow:
-      type: object
-      properties: *ref_196
-      required: *ref_197
-    FlowModule:
-      type: object
-      properties: *ref_27
-      required: *ref_28
-    ForloopFlow:
-      type: object
-      properties: *ref_198
-      required: *ref_199
-    BranchOne:
       type: object
       properties: *ref_200
       required: *ref_201
-    BranchAll:
+    ScalarMetric:
       type: object
       properties: *ref_202
       required: *ref_203
-    Identity:
+    TimeseriesMetric:
       type: object
       properties: *ref_204
       required: *ref_205
+    MetricDataPoint:
+      type: object
+      properties: *ref_206
+      required: *ref_207
+    RawScriptForDependencies:
+      type: object
+      properties: *ref_208
+      required: *ref_209
+    ConcurrencyGroup:
+      type: object
+      properties: *ref_210
+      required: *ref_211
+    ExtendedJobs:
+      type: object
+      properties: *ref_212
+      required: *ref_213
+    ExportedUser:
+      type: object
+      properties: *ref_3
+      required: *ref_4
+    GlobalSetting:
+      type: object
+      properties: *ref_214
+      required: *ref_215
+    Config:
+      type: object
+      properties: *ref_216
+      required: *ref_217
+    ExportedInstanceGroup:
+      type: object
+      properties: *ref_95
+      required: *ref_96
+    JobSearchHit:
+      type: object
+      properties: *ref_218
+    StaticTransform:
+      type: object
+      properties: *ref_219
+      required: *ref_220
+    JavascriptTransform:
+      type: object
+      properties: *ref_221
+      required: *ref_222
+    InputTransform:
+      oneOf: *ref_29
+      discriminator: *ref_30
+    RawScript:
+      type: object
+      properties: *ref_223
+      required: *ref_224
+    PathScript:
+      type: object
+      properties: *ref_225
+      required: *ref_226
+    PathFlow:
+      type: object
+      properties: *ref_227
+      required: *ref_228
+    FlowModule:
+      type: object
+      properties: *ref_31
+      required: *ref_32
+    ForloopFlow:
+      type: object
+      properties: *ref_229
+      required: *ref_230
+    WhileloopFlow:
+      type: object
+      properties: *ref_231
+      required: *ref_232
+    BranchOne:
+      type: object
+      properties: *ref_233
+      required: *ref_234
+    BranchAll:
+      type: object
+      properties: *ref_235
+      required: *ref_236
+    Identity:
+      type: object
+      properties: *ref_237
+      required: *ref_238
     FlowModuleValue:
-      oneOf: *ref_206
-      discriminator: *ref_207
+      oneOf: *ref_239
+      discriminator: *ref_240
     Retry:
       type: object
-      properties: *ref_77
+      properties: *ref_87
     FlowValue:
+      type: object
+      properties: *ref_58
+      required: *ref_59
+    OpenFlow:
       type: object
       properties: *ref_50
       required: *ref_51
-    OpenFlow:
-      type: object
-      properties: *ref_43
-      required: *ref_44
     FlowStatusModule:
       type: object
-      properties: *ref_52
-      required: *ref_53
+      properties: *ref_60
+      required: *ref_61
     FlowStatus:
       type: object
-      properties: *ref_65
-      required: *ref_66
+      properties: *ref_76
+      required: *ref_77
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index c8c30a7db1..eebb8fd0a9 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.402.3
+  version: 1.416.2
   title: Windmill API
 
   contact:
@@ -1467,6 +1467,11 @@ paths:
       parameters:
         - $ref: "#/components/parameters/Page"
         - $ref: "#/components/parameters/PerPage"
+        - name: active_only
+          in: query
+          description: filter only active users
+          schema:
+            type: boolean
       responses:
         "200":
           description: user
@@ -2162,6 +2167,30 @@ paths:
               schema:
                 type: number
 
+  /w/{workspace}/workspaces/used_triggers:
+    get:
+      summary: get used triggers
+      operationId: getUsedTriggers
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+      responses:
+        "200":
+          description: status
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  http_routes_used:
+                    type: boolean
+                  websocket_used:
+                    type: boolean
+                required:
+                  - http_routes_used
+                  - websocket_used
+
   /w/{workspace}/users/list:
     get:
       summary: list users
@@ -2789,7 +2818,14 @@ paths:
                   oauth:
                     type: array
                     items:
-                      type: string
+                      type: object
+                      properties:
+                        type:
+                          type: string
+                        display_name:
+                          type: string
+                      required:
+                        - type
                   saml:
                     type: string
                 required:
@@ -4013,6 +4049,42 @@ paths:
               schema:
                 $ref: "#/components/schemas/Script"
 
+  /w/{workspace}/scripts/get_triggers_count/{path}:
+    get:
+      summary: get triggers count of script
+      operationId: getTriggersCountOfScript
+      tags:
+        - script
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/ScriptPath"
+      responses:
+        "200":
+          description: triggers count
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/TriggersCount"
+
+  /w/{workspace}/scripts/list_tokens/{path}:
+    get:
+      summary: get tokens with script scope
+      operationId: listTokensOfScript
+      tags:
+        - script
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/ScriptPath"
+      responses:
+        "200":
+          description: tokens list
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/TruncatedToken"
+
   /w/{workspace}/scripts/get/draft/{path}:
     get:
       summary: get script by path with draft
@@ -4049,6 +4121,26 @@ paths:
                 items:
                   $ref: "#/components/schemas/ScriptHistory"
 
+  /w/{workspace}/scripts/get_latest_version/{path}:
+    get:
+      summary: get scripts's latest version (hash)
+      operationId: getScriptLatestVersion
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/ScriptPath"
+      tags:
+        - script
+      responses:
+        "200":
+          description: Script version/hash
+          content:
+            application/json:
+
+              required: false
+
+              schema:
+                $ref: "#/components/schemas/ScriptHistory"
+
   /w/{workspace}/scripts/history_update/h/{hash}/p/{path}:
     post:
       summary: update history of a script
@@ -4537,6 +4629,25 @@ paths:
                 items:
                   $ref: "#/components/schemas/FlowVersion"
 
+  /w/{workspace}/flows/get_latest_version/{path}:
+    get:
+      summary: get flow's latest version
+      operationId: getFlowLatestVersion
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/ScriptPath"
+      tags:
+        - flow
+      responses:
+        "200":
+          description: Flow version
+          content:
+            application/json:
+              required: false
+
+              schema:
+                $ref: "#/components/schemas/FlowVersion"
+
   /w/{workspace}/flows/get/v/{version}/p/{path}:
     get:
       summary: get flow version
@@ -4617,6 +4728,43 @@ paths:
               schema:
                 $ref: "#/components/schemas/Flow"
 
+  /w/{workspace}/flows/get_triggers_count/{path}:
+    get:
+      summary: get triggers count of flow
+      operationId: getTriggersCountOfFlow
+      tags:
+        - flow
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/ScriptPath"
+      responses:
+        "200":
+          description: triggers count
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/TriggersCount"
+
+  /w/{workspace}/flows/list_tokens/{path}:
+    get:
+      summary: get tokens with flow scope
+      operationId: listTokensOfFlow
+      tags:
+        - flow
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/ScriptPath"
+      responses:
+        "200":
+          description: tokens list
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/TruncatedToken"
+
+
   /w/{workspace}/flows/toggle_workspace_error_handler/{path}:
     post:
       summary: Toggle ON and OFF the workspace error handler for a given flow
@@ -5054,6 +5202,24 @@ paths:
                 items:
                   $ref: "#/components/schemas/AppHistory"
 
+  /w/{workspace}/apps/get_latest_version/{path}:
+    get:
+      summary: get apps's latest version
+      operationId: getAppLatestVersion
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/ScriptPath"
+      tags:
+        - app
+      responses:
+        "200":
+          description: App version
+          content:
+            application/json:
+              required: false
+              schema:
+                $ref: "#/components/schemas/AppHistory"
+
   /w/{workspace}/apps/history_update/a/{id}/v/{version}:
     post:
       summary: update app history
@@ -7072,22 +7238,170 @@ paths:
               schema:
                 type: boolean
 
-  /w/{workspace}/http_triggers/used:
-    get:
-      summary: whether http triggers are used
-      operationId: used
+  /w/{workspace}/websocket_triggers/create:
+    post:
+      summary: create websocket trigger
+      operationId: createWebsocketTrigger
       tags:
-        - http_trigger
+        - websocket_trigger
       parameters:
         - $ref: "#/components/parameters/WorkspaceId"
+      requestBody:
+        description: new websocket trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/NewWebsocketTrigger"
+      responses:
+        "201":
+          description: websocket trigger created
+          content:
+            text/plain:
+              schema:
+                type: string
+
+  /w/{workspace}/websocket_triggers/update/{path}:
+    post:
+      summary: update websocket trigger
+      operationId: updateWebsocketTrigger
+      tags:
+        - websocket_trigger
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/Path"
+      requestBody:
+        description: updated trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/EditWebsocketTrigger"
       responses:
         "200":
-          description: whether http triggers are used
+          description: websocket trigger updated
+          content:
+            text/plain:
+              schema:
+                type: string
+
+  /w/{workspace}/websocket_triggers/delete/{path}:
+    delete:
+      summary: delete websocket trigger
+      operationId: deleteWebsocketTrigger
+      tags:
+        -  websocket_trigger
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/Path"
+      responses:
+        "200":
+          description: websocket trigger deleted
+          content:
+            text/plain:
+              schema:
+                type: string
+
+  /w/{workspace}/websocket_triggers/get/{path}:
+    get:
+      summary: get websocket trigger
+      operationId: getWebsocketTrigger
+      tags:
+        - websocket_trigger
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/Path"
+      responses:
+        "200":
+          description: websocket trigger deleted
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/WebsocketTrigger"
+
+  
+  /w/{workspace}/websocket_triggers/list:
+    get:
+      summary: list websocket triggers
+      operationId: listWebsocketTriggers
+      tags:
+        - websocket_trigger
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+          required: true
+        - $ref: "#/components/parameters/Page"
+        - $ref: "#/components/parameters/PerPage"
+        - name: path
+          description: filter by path
+          in: query
+          schema:
+            type: string
+        - name: is_flow
+          in: query
+          schema:
+            type: boolean
+        - name: path_start
+          in: query
+          schema:
+            type: string
+      responses:
+        "200":
+          description: websocket trigger list
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/WebsocketTrigger"
+
+  
+  /w/{workspace}/websocket_triggers/exists/{path}:
+    get:
+      summary: does websocket trigger exists
+      operationId: existsWebsocketTrigger
+      tags:
+        - websocket_trigger
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/Path"
+      responses:
+        "200":
+          description: websocket trigger exists
           content:
             application/json:
               schema:
                 type: boolean
 
+  /w/{workspace}/websocket_triggers/setenabled/{path}:
+    post:
+      summary: set enabled websocket trigger
+      operationId: setWebsocketTriggerEnabled
+      tags:
+        - websocket_trigger
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/Path"
+      requestBody:
+        description: updated websocket trigger enable
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                enabled:
+                  type: boolean
+              required:
+                - enabled
+      responses:
+        "200":
+          description: websocket trigger enabled set
+          content:
+            text/plain:
+              schema:
+                type: string
+
+
   /groups/list:
     get:
       summary: list instance groups
@@ -7889,6 +8203,29 @@ paths:
                 items:
                   $ref: "#/components/schemas/Config"
 
+  /configs/list_autoscaling_events/{worker_group}:
+    get:
+      summary: List autoscaling events
+      operationId: listAutoscalingEvents
+      tags:
+        - config
+      parameters:
+        - name: worker_group
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          description: List of autoscaling events
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/AutoscalingEvent"
+
+
   /w/{workspace}/acls/get/{kind}/{path}:
     get:
       summary: get granular acls
@@ -7915,6 +8252,7 @@ paths:
                 app,
                 raw_app,
                 http_trigger,
+                websocket_trigger,
               ]
       responses:
         "200":
@@ -7952,6 +8290,7 @@ paths:
                 app,
                 raw_app,
                 http_trigger,
+                websocket_trigger,
               ]
       requestBody:
         description: acl to add
@@ -8000,6 +8339,7 @@ paths:
                 app,
                 raw_app,
                 http_trigger,
+                websocket_trigger,
               ]
       requestBody:
         description: acl to add
@@ -10247,6 +10587,8 @@ components:
           type: array
           items:
             type: string
+        email:
+          type: string
       required:
         - token_prefix
         - created_at
@@ -10264,6 +10606,8 @@ components:
           type: array
           items:
             type: string
+        workspace_id:
+          type: string
 
     NewTokenImpersonate:
       type: object
@@ -10275,6 +10619,8 @@ components:
           format: date-time
         impersonate_email:
           type: string
+        workspace_id:
+          type: string
       required:
         - impersonate_email
 
@@ -10417,6 +10763,7 @@ components:
             - "users.delete"
             - "users.update"
             - "users.login"
+            - "users.login_failure"
             - "users.logout"
             - "users.accept_invite"
             - "users.decline_invite"
@@ -10428,6 +10775,7 @@ components:
             - "users.impersonate"
             - "users.leave_workspace"
             - "oauth.login"
+            - "oauth.login_failure"
             - "oauth.signup"
             - "variables.create"
             - "variables.delete"
@@ -11111,6 +11459,145 @@ components:
         - requires_auth
         - http_method
 
+    TriggersCount:
+      type: object
+      properties:
+        primary_schedule:
+          type: object
+          properties:
+            schedule:
+              type: string
+        schedule_count:
+          type: number
+        http_routes_count:
+          type: number
+        webhook_count:
+          type: number
+        email_count:
+          type: number
+        websocket_count:
+          type: number
+
+    WebsocketTrigger:
+      type: object
+      properties:
+        path:
+          type: string
+        edited_by:
+          type: string
+        edited_at:
+          type: string
+          format: date-time
+        script_path:
+          type: string
+        url:
+          type: string
+        is_flow:
+          type: boolean
+        extra_perms:
+          type: object
+          additionalProperties:
+            type: boolean
+        email:
+          type: string
+        workspace_id:
+          type: string
+        server_id:
+          type: string
+        last_server_ping:
+          type: string
+          format: date-time
+        error:
+          type: string
+        enabled:
+          type: boolean
+        filters:
+          type: array
+          items:
+            type: object
+            properties:
+              key:
+                type: string
+              value: {}
+            required:
+              - key
+              - value
+        
+      required:
+        - path
+        - edited_by
+        - edited_at
+        - script_path
+        - url
+        - extra_perms
+        - is_flow
+        - email
+        - workspace_id
+        - enabled
+        - filters
+
+    NewWebsocketTrigger:
+      type: object
+      properties:
+        path:
+          type: string
+        script_path:
+          type: string
+        is_flow:
+          type: boolean
+        url:
+          type: string
+        enabled:
+          type: boolean
+        filters:
+          type: array
+          items:
+            type: object
+            properties:
+              key:
+                type: string
+              value: {}
+            required:
+              - key
+              - value
+        
+      required:
+        - path
+        - script_path
+        - url
+        - is_flow
+        - filters
+
+    EditWebsocketTrigger:
+      type: object
+      properties:
+        url:
+          type: string
+        path:
+          type: string
+        script_path:
+          type: string
+        is_flow:
+          type: boolean
+        filters:
+          type: array
+          items:
+            type: object
+            properties:
+              key:
+                type: string
+              value: {}
+            required:
+              - key
+              - value
+              
+      required:
+        - path
+        - script_path
+        - url
+        - is_flow
+        - filters
+
     Group:
       type: object
       properties:
@@ -11309,6 +11796,8 @@ components:
           type: string
         username:
           type: string
+        operator_only:
+          type: boolean
 
       required:
         - email
@@ -12010,3 +12499,21 @@ components:
       properties:
         dancer:
           type: string
+
+    AutoscalingEvent:
+      type: object
+      properties:
+        id:
+          type: integer
+          format: int64
+        worker_group:
+          type: string
+        event_type:
+          type: string
+        desired_workers:
+          type: integer
+        reason:
+          type: string
+        applied_at:
+          type: string
+          format: date-time
diff --git a/backend/windmill-api/src/apps.rs b/backend/windmill-api/src/apps.rs
index 7bed72c50e..cd65136a2a 100644
--- a/backend/windmill-api/src/apps.rs
+++ b/backend/windmill-api/src/apps.rs
@@ -62,6 +62,7 @@ pub fn workspaced_service() -> Router {
         .route("/delete/*path", delete(delete_app))
         .route("/create", post(create_app))
         .route("/history/p/*path", get(get_app_history))
+        .route("/get_latest_version/*path", get(get_latest_version))
         .route("/history_update/a/:id/v/:version", post(update_app_history))
 }
 
@@ -427,6 +428,38 @@ async fn get_app_history(
     return Ok(Json(result));
 }
 
+async fn get_latest_version(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path((w_id, path)): Path<(String, StripPath)>,
+
+) -> JsonResult<Option<AppHistory>> {
+
+    let mut tx = user_db.begin(&authed).await?;
+    let row = sqlx::query!(
+        "SELECT a.id as app_id, av.id as version_id, dm.deployment_msg as deployment_msg
+        FROM app a LEFT JOIN app_version av ON a.id = av.app_id LEFT JOIN deployment_metadata dm ON av.id = dm.app_version
+        WHERE a.workspace_id = $1 AND a.path = $2
+        ORDER BY created_at DESC",
+        w_id,
+        path.to_path(),
+    ).fetch_optional(&mut *tx).await?;
+    tx.commit().await?;
+
+    if let Some(row) = row {
+        let result = AppHistory {
+            app_id: row.app_id,
+            version: row.version_id,
+            deployment_msg: row.deployment_msg,
+        };
+
+        return Ok(Json(Some(result)));
+    } else {
+        return Ok(Json(None));
+    }
+
+}
+
 async fn update_app_history(
     authed: ApiAuthed,
     Extension(user_db): Extension<UserDB>,
diff --git a/backend/windmill-api/src/configs.rs b/backend/windmill-api/src/configs.rs
index 64c8a1884f..81b65216e0 100644
--- a/backend/windmill-api/src/configs.rs
+++ b/backend/windmill-api/src/configs.rs
@@ -29,6 +29,10 @@ pub fn global_service() -> Router {
         .route("/update/:name", post(update_config).delete(delete_config))
         .route("/get/:name", get(get_config))
         .route("/list", get(list_configs))
+        .route(
+            "/list_autoscaling_events/:worker_group",
+            get(list_autoscaling_events),
+        )
 }
 
 #[derive(Serialize, Deserialize, FromRow)]
@@ -177,6 +181,30 @@ async fn delete_config(
     Ok(format!("Deleted config {name}"))
 }
 
+#[derive(Serialize, Deserialize, FromRow)]
+struct AutoscalingEvent {
+    id: i64,
+    worker_group: String,
+    event_type: Option<String>,
+    desired_workers: i32,
+    reason: Option<String>,
+    applied_at: chrono::NaiveDateTime,
+}
+
+async fn list_autoscaling_events(
+    Extension(db): Extension<DB>,
+    Path(worker_group): Path<String>,
+) -> error::JsonResult<Vec<AutoscalingEvent>> {
+    let events = sqlx::query_as!(
+        AutoscalingEvent,
+        "SELECT id, worker_group, event_type::text, desired_workers, reason, applied_at FROM autoscaling_event WHERE worker_group = $1 ORDER BY applied_at DESC LIMIT 5",
+        worker_group
+    )
+    .fetch_all(&db)
+    .await?;
+    Ok(Json(events))
+}
+
 #[cfg(feature = "enterprise")]
 async fn list_configs(
     authed: ApiAuthed,
diff --git a/backend/windmill-api/src/db.rs b/backend/windmill-api/src/db.rs
index 470a21bccc..6186b0ada1 100644
--- a/backend/windmill-api/src/db.rs
+++ b/backend/windmill-api/src/db.rs
@@ -15,6 +15,7 @@ use sqlx::{
     PgConnection, Pool, Postgres,
 };
 use windmill_audit::audit_ee::{AuditAuthor, AuditAuthorable};
+use windmill_common::utils::generate_lock_id;
 use windmill_common::{
     db::{Authable, Authed},
     error::Error,
@@ -29,13 +30,6 @@ async fn current_database(conn: &mut PgConnection) -> Result<String, MigrateErro
         .await?)
 }
 
-// inspired from rails: https://github.com/rails/rails/blob/6e49cc77ab3d16c06e12f93158eaf3e507d4120e/activerecord/lib/active_record/migration.rb#L1308
-fn generate_lock_id(database_name: &str) -> i64 {
-    const CRC_IEEE: crc::Crc<u32> = crc::Crc::<u32>::new(&crc::CRC_32_ISO_HDLC);
-    // 0x3d32ad9e chosen by fair dice roll
-    0x3d32ad9e * (CRC_IEEE.checksum(database_name.as_bytes()) as i64)
-}
-
 struct CustomMigrator {
     inner: PoolConnection<Postgres>,
 }
@@ -136,9 +130,30 @@ impl Migrate for CustomMigrator {
                 migration.version,
                 migration.description
             );
-            let r = self.inner.apply(migration).await;
-            tracing::info!("Finished applying migration {}", migration.version);
-            r
+            if migration.version == 20221207103910 {
+                tracing::info!("Skipping migration 20221207103910 to avoid using md5");
+                self.inner
+                    .execute(include_str!(
+                        "../../custom_migrations/create_workspace_without_md5.sql"
+                    ))
+                    .await?;
+                let _ = sqlx::query(
+                    r#"
+                INSERT INTO _sqlx_migrations ( version, description, success, checksum, execution_time )
+                VALUES ( $1, $2, TRUE, $3, -1 ) ON CONFLICT DO NOTHING
+                            "#,
+                )
+                .bind(migration.version)
+                .bind(&*migration.description)
+                .bind(&*migration.checksum)
+                .execute(&mut *self.inner)
+                .await?;
+                return Ok(std::time::Duration::from_secs(0));
+            } else {
+                let r = self.inner.apply(migration).await;
+                tracing::info!("Finished applying migration {}", migration.version);
+                return r;
+            }
         }
         .boxed()
     }
@@ -158,17 +173,6 @@ pub async fn migrate(db: &DB) -> Result<(), Error> {
     let migrator = db.acquire().await?;
     let mut custom_migrator = CustomMigrator { inner: migrator };
 
-    if let Err(err) = fix_flow_versioning_migration(&mut custom_migrator, db).await {
-        tracing::error!("Could not apply flow versioning fix migration: {err:#}");
-    }
-
-    let db2 = db.clone();
-    let _ = tokio::task::spawn(async move {
-        if let Err(err) = fix_job_completed_index(&db2).await {
-            tracing::error!("Could not apply job completed index fix migration: {err:#}");
-        }
-    });
-
     match sqlx::migrate!("../migrations")
         .run_direct(&mut custom_migrator)
         .await
@@ -184,11 +188,17 @@ pub async fn migrate(db: &DB) -> Result<(), Error> {
         Err(err) => Err(err),
     }?;
 
-    #[cfg(feature = "enterprise")]
-    if let Err(e) = windmill_migrations(&mut custom_migrator, db).await {
-        tracing::error!("Could not apply windmill custom migrations: {e:#}")
+    if let Err(err) = fix_flow_versioning_migration(&mut custom_migrator, db).await {
+        tracing::error!("Could not apply flow versioning fix migration: {err:#}");
     }
 
+    let db2 = db.clone();
+    let _ = tokio::task::spawn(async move {
+        if let Err(err) = fix_job_completed_index(&db2).await {
+            tracing::error!("Could not apply job completed index fix migration: {err:#}");
+        }
+    });
+
     Ok(())
 }
 
@@ -292,7 +302,7 @@ macro_rules! run_windmill_migration {
                     .await?;
                     tracing::info!("Finished applying {migration_job_name} migration");
                 } else {
-                    tracing::info!("migration {migration_job_name} already done");
+                    tracing::debug!("migration {migration_job_name} already done");
                 }
 
                 let _ = sqlx::query("SELECT pg_advisory_unlock(4242)")
@@ -301,7 +311,7 @@ macro_rules! run_windmill_migration {
                 tx.commit().await?;
                 tracing::info!("released lock for {migration_job_name}");
             } else {
-                tracing::info!("migration {migration_job_name} already done");
+                tracing::debug!("migration {migration_job_name} already done");
 
             }
         }
@@ -482,33 +492,6 @@ async fn fix_job_completed_index(db: &DB) -> Result<(), Error> {
     Ok(())
 }
 
-#[cfg(feature = "enterprise")]
-async fn windmill_migrations(migrator: &mut CustomMigrator, db: &DB) -> Result<(), Error> {
-    if std::env::var("MIGRATION_NO_BYPASSRLS").is_ok() {
-        migrator.lock().await?;
-        let has_done_migration = sqlx::query_scalar!(
-            "SELECT EXISTS(SELECT name FROM windmill_migrations WHERE name = 'bypassrls_1-2')",
-        )
-        .fetch_one(db)
-        .await?
-        .unwrap_or(false);
-
-        if !has_done_migration {
-            let query = include_str!("../../custom_migrations/bypassrls_1.sql");
-            tracing::info!("Applying bypassrls_1.sql");
-            let mut tx: sqlx::Transaction<'_, Postgres> = db.begin().await?;
-            tx.execute(query).await?;
-            tracing::info!("Applied bypassrls_1.sql");
-            sqlx::query!("INSERT INTO windmill_migrations (name) VALUES ('bypassrls_1-2')")
-                .execute(&mut *tx)
-                .await?;
-            tx.commit().await?;
-        }
-        migrator.unlock().await?;
-    }
-    Ok(())
-}
-
 #[derive(Clone, Debug)]
 pub struct ApiAuthed {
     pub email: String,
diff --git a/backend/windmill-api/src/ee.rs b/backend/windmill-api/src/ee.rs
index b20521e8b4..cddb639e95 100644
--- a/backend/windmill-api/src/ee.rs
+++ b/backend/windmill-api/src/ee.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 #[cfg(feature = "enterprise")]
 use tokio::sync::RwLock;
 
-pub async fn validate_license_key(_license_key: String) -> anyhow::Result<String> {
+pub async fn validate_license_key(_license_key: String) -> anyhow::Result<(String, bool)> {
     // Implementation is not open source
     Err(anyhow!("License can't be validated in Windmill CE"))
 }
diff --git a/backend/windmill-api/src/embeddings.rs b/backend/windmill-api/src/embeddings.rs
index 5cc7226753..fd222bdbfa 100644
--- a/backend/windmill-api/src/embeddings.rs
+++ b/backend/windmill-api/src/embeddings.rs
@@ -53,6 +53,7 @@ use crate::{resources::ResourceType, HTTP_CLIENT};
 lazy_static::lazy_static! {
     pub static ref EMBEDDINGS_DB: Arc<RwLock<Option<EmbeddingsDb>>> = Arc::new(RwLock::new(None));
     pub static ref MODEL_INSTANCE: Arc<RwLock<Option<Arc<ModelInstance>>>> = Arc::new(RwLock::new(None));
+    pub static ref HUB_EMBEDDINGS_PULLING_INTERVAL_SECS: u64 = std::env::var("HUB_EMBEDDINGS_PULLING_INTERVAL_SECS").ok().map(|x| x.parse::<u64>().ok()).flatten().unwrap_or(3600 * 24);
 }
 
 #[cfg(feature = "embedding")]
@@ -607,7 +608,10 @@ pub fn load_embeddings_db(db: &Pool<Postgres>) -> () {
                 drop(model_instance_lock);
                 loop {
                     update_embeddings_db(&db_clone).await;
-                    tokio::time::sleep(std::time::Duration::from_secs(3600 * 24)).await;
+                    tokio::time::sleep(std::time::Duration::from_secs(
+                        *HUB_EMBEDDINGS_PULLING_INTERVAL_SECS,
+                    ))
+                    .await;
                 }
             } else {
                 tracing::error!(
diff --git a/backend/windmill-api/src/flows.rs b/backend/windmill-api/src/flows.rs
index 0b5082c6e0..4fc9ce514f 100644
--- a/backend/windmill-api/src/flows.rs
+++ b/backend/windmill-api/src/flows.rs
@@ -9,6 +9,9 @@
 use std::collections::HashMap;
 
 use crate::db::ApiAuthed;
+use crate::triggers::{
+    get_triggers_count_internal, list_tokens_internal, TriggersCount, TruncatedTokenWithEmail,
+};
 use crate::utils::WithStarredInfoQuery;
 use crate::{
     db::DB,
@@ -53,11 +56,14 @@ pub fn workspaced_service() -> Router {
         .route("/update/*path", post(update_flow))
         .route("/archive/*path", post(archive_flow_by_path))
         .route("/delete/*path", delete(delete_flow_by_path))
+        .route("/get_triggers_count/*path", get(get_triggers_count))
+        .route("/list_tokens/*path", get(list_tokens))
         .route("/get/*path", get(get_flow_by_path))
         .route("/get/draft/*path", get(get_flow_by_path_w_draft))
         .route("/exists/*path", get(exists_flow_by_path))
         .route("/list_paths", get(list_paths))
         .route("/history/p/*path", get(get_flow_history))
+        .route("/get_latest_version/*path", get(get_latest_version))
         .route(
             "/history_update/v/:version/p/*path",
             post(update_flow_history),
@@ -533,6 +539,30 @@ async fn get_flow_history(
     Ok(Json(flows))
 }
 
+async fn get_latest_version(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path((w_id, path)): Path<(String, StripPath)>,
+) -> JsonResult<Option<FlowVersion>> {
+    let path = path.to_path();
+    let mut tx = user_db.begin(&authed).await?;
+
+    let version = sqlx::query_as!(
+        FlowVersion,
+        "SELECT flow_version.id, flow_version.created_at, deployment_metadata.deployment_msg FROM flow_version 
+        LEFT JOIN deployment_metadata ON flow_version.id = deployment_metadata.flow_version
+        WHERE flow_version.path = $1 AND flow_version.workspace_id = $2 
+        ORDER BY flow_version.created_at DESC",
+        path,
+        w_id
+    )
+    .fetch_optional(&mut *tx)
+    .await?;
+    tx.commit().await?;
+
+    Ok(Json(version))
+}
+
 async fn get_flow_version(
     authed: ApiAuthed,
     Extension(user_db): Extension<UserDB>,
@@ -874,6 +904,22 @@ async fn update_flow(
     Ok(nf.path.to_string())
 }
 
+async fn get_triggers_count(
+    Extension(db): Extension<DB>,
+    Path((w_id, path)): Path<(String, StripPath)>,
+) -> JsonResult<TriggersCount> {
+    let path = path.to_path();
+    get_triggers_count_internal(&db, &w_id, &path, true).await
+}
+
+async fn list_tokens(
+    Extension(db): Extension<DB>,
+    Path((w_id, path)): Path<(String, StripPath)>,
+) -> JsonResult<Vec<TruncatedTokenWithEmail>> {
+    let path = path.to_path();
+    list_tokens_internal(&db, &w_id, &path, true).await
+}
+
 async fn get_flow_by_path(
     authed: ApiAuthed,
     Extension(user_db): Extension<UserDB>,
@@ -1176,6 +1222,7 @@ mod tests {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
                 FlowModule {
                     id: "b".to_string(),
@@ -1205,6 +1252,7 @@ mod tests {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
                 FlowModule {
                     id: "c".to_string(),
@@ -1232,6 +1280,7 @@ mod tests {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
             ],
             failure_module: Some(Box::new(FlowModule {
@@ -1258,6 +1307,7 @@ mod tests {
                 priority: None,
                 delete_after_use: None,
                 continue_on_error: None,
+                skip_if: None,
             })),
             preprocessor_module: None,
             same_worker: false,
@@ -1282,7 +1332,6 @@ mod tests {
                   },
                 "type": "script",
                 "path": "test",
-                "tag_override": Option::<String>::None,
               },
             },
             {
@@ -1326,14 +1375,12 @@ mod tests {
               "input_transforms": {},
               "type": "script",
               "path": "test",
-              "tag_override": Option::<String>::None,
             },
             "stop_after_if": {
                 "expr": "previous.isEmpty()",
                 "skip_if_stopped": false
             }
           },
-          "preprocessor_module": Option::<String>::None
         });
         assert_eq!(dbg!(serde_json::json!(fv)), dbg!(expect));
     }
diff --git a/backend/windmill-api/src/folders.rs b/backend/windmill-api/src/folders.rs
index fef5b7fe07..c9b69836c6 100644
--- a/backend/windmill-api/src/folders.rs
+++ b/backend/windmill-api/src/folders.rs
@@ -275,8 +275,10 @@ pub fn require_is_owner(authed: &ApiAuthed, name: &str) -> Result<()> {
 
 async fn update_folder(
     authed: ApiAuthed,
+    Extension(db): Extension<DB>,
     Extension(user_db): Extension<UserDB>,
     Extension(webhook): Extension<WebhookShared>,
+    Extension(rsmq): Extension<Option<rsmq_async::MultiplexedRsmq>>,
     Path((w_id, name)): Path<(String, String)>,
     Json(mut ng): Json<UpdateFolder>,
 ) -> Result<String> {
@@ -367,6 +369,18 @@ async fn update_folder(
         }
     }
 
+    handle_deployment_metadata(
+        &authed.email,
+        &authed.username,
+        &db,
+        &w_id,
+        DeployedObject::Folder { path: format!("f/{}", name) },
+        Some(format!("Folder '{}' updated", name)),
+        rsmq,
+        true,
+    )
+    .await?;
+
     audit_log(
         &mut *tx,
         &authed,
diff --git a/backend/windmill-api/src/http_triggers.rs b/backend/windmill-api/src/http_triggers.rs
index 9e30743fbc..61757cb164 100644
--- a/backend/windmill-api/src/http_triggers.rs
+++ b/backend/windmill-api/src/http_triggers.rs
@@ -12,10 +12,8 @@ use std::collections::HashMap;
 use tower_http::cors::CorsLayer;
 use windmill_audit::{audit_ee::audit_log, ActionKind};
 use windmill_common::{
-    auth::fetch_authed_from_permissioned_as,
     db::UserDB,
     error::{self, JsonResult},
-    users::username_to_permissioned_as,
     utils::{not_found_if_none, paginate, require_admin, Pagination, StripPath},
     worker::{to_raw_value, CLOUD_HOSTED},
 };
@@ -27,7 +25,7 @@ use crate::{
         run_flow_by_path_inner, run_script_by_path_inner, run_wait_result_flow_by_path_internal,
         run_wait_result_script_by_path_internal, RunJobQuery,
     },
-    users::OptAuthed,
+    users::{fetch_api_authed, OptAuthed},
 };
 
 lazy_static::lazy_static! {
@@ -66,7 +64,6 @@ pub fn workspaced_service() -> Router {
         .route("/update/*path", post(update_trigger))
         .route("/delete/*path", delete(delete_trigger))
         .route("/exists/*path", get(exists_trigger))
-        .route("/used", get(used))
         .route("/route_exists", post(exists_route))
 }
 
@@ -346,17 +343,6 @@ async fn delete_trigger(
     Ok(format!("HTTP trigger {path} deleted"))
 }
 
-async fn used(Extension(db): Extension<DB>, Path(w_id): Path<String>) -> JsonResult<bool> {
-    let used = sqlx::query_scalar!(
-        r#"SELECT EXISTS(SELECT 1 FROM http_trigger WHERE workspace_id = $1)"#,
-        w_id,
-    )
-    .fetch_one(&db)
-    .await?
-    .unwrap_or(false);
-    Ok(Json(used))
-}
-
 async fn exists_trigger(
     Extension(db): Extension<DB>,
     Path((w_id, path)): Path<(String, StripPath)>,
@@ -421,28 +407,6 @@ struct TriggerRoute {
     http_method: HttpMethod,
 }
 
-async fn fetch_api_authed(
-    username: String,
-    email: String,
-    w_id: &str,
-    db: &DB,
-    username_override: String,
-) -> error::Result<ApiAuthed> {
-    let permissioned_as = username_to_permissioned_as(username.as_str());
-    let authed =
-        fetch_authed_from_permissioned_as(permissioned_as, email.clone(), w_id, db).await?;
-    Ok(ApiAuthed {
-        username: username,
-        email: email,
-        is_admin: authed.is_admin,
-        is_operator: authed.is_operator,
-        groups: authed.groups,
-        folders: authed.folders,
-        scopes: authed.scopes,
-        username_override: Some(username_override),
-    })
-}
-
 async fn get_http_route_trigger(
     route_path: &str,
     opt_authed: Option<ApiAuthed>,
diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs
index 156be41b26..7244b2be17 100644
--- a/backend/windmill-api/src/jobs.rs
+++ b/backend/windmill-api/src/jobs.rs
@@ -11,7 +11,6 @@ use axum::http::HeaderValue;
 use quick_cache::sync::Cache;
 use serde_json::value::RawValue;
 use sqlx::Pool;
-use windmill_common::error::JsonResult;
 use std::collections::HashMap;
 #[cfg(feature = "prometheus")]
 use std::sync::atomic::Ordering;
@@ -19,12 +18,13 @@ use tokio::io::AsyncReadExt;
 #[cfg(feature = "prometheus")]
 use tokio::time::Instant;
 use tower::ServiceBuilder;
+use windmill_common::error::JsonResult;
 use windmill_common::flow_status::{JobResult, RestartedFrom};
 use windmill_common::jobs::{
     format_completed_job_result, format_result, CompletedJobWithFormattedResult, FormattedResult,
     ENTRYPOINT_OVERRIDE,
 };
-use windmill_common::worker::TMP_DIR;
+use windmill_common::worker::{CLOUD_HOSTED, TMP_DIR};
 
 #[cfg(all(feature = "enterprise", feature = "parquet"))]
 use windmill_common::scripts::PREVIEW_IS_CODEBASE_HASH;
@@ -70,7 +70,10 @@ use windmill_common::{
     oauth2::HmacSha256,
     scripts::{ScriptHash, ScriptLang},
     users::username_to_permissioned_as,
-    utils::{not_found_if_none, now_from_db, paginate, paginate_without_limits, require_admin, Pagination, StripPath},
+    utils::{
+        not_found_if_none, now_from_db, paginate, paginate_without_limits, require_admin,
+        Pagination, StripPath,
+    },
 };
 
 #[cfg(all(feature = "enterprise", feature = "parquet"))]
@@ -81,7 +84,7 @@ use windmill_common::{METRICS_DEBUG_ENABLED, METRICS_ENABLED};
 use windmill_common::{get_latest_deployed_hash_for_path, BASE_URL};
 use windmill_queue::{
     cancel_job, get_queued_job, get_result_by_id_from_running_flow, job_is_complete, push,
-    DecodeQueries, PushArgs, PushArgsOwned, PushIsolationLevel, QueueTransaction,
+    DecodeQueries, PushArgs, PushArgsOwned, PushIsolationLevel,
 };
 
 #[cfg(feature = "prometheus")]
@@ -293,11 +296,8 @@ pub fn workspace_unauthed_service() -> Router {
 
 pub fn global_root_service() -> Router {
     Router::new()
-    .route("/db_clock", get(get_db_clock))
-    .route(
-        "/completed/count_by_tag",
-        get(count_by_tag),
-    )
+        .route("/db_clock", get(get_db_clock))
+        .route("/completed/count_by_tag", get(count_by_tag))
 }
 
 #[derive(Deserialize)]
@@ -547,8 +547,8 @@ pub async fn get_path_for_hash<'c>(
     Ok(path)
 }
 
-pub async fn get_path_tag_limits_cache_for_hash<'c, R: rsmq_async::RsmqConnection + Send>(
-    tx: &mut QueueTransaction<'c, R>,
+pub async fn get_path_tag_limits_cache_for_hash(
+    tx: &DB,
     w_id: &str,
     hash: i64,
 ) -> error::Result<(
@@ -1472,6 +1472,8 @@ async fn cancel_jobs(
         }
     }
 
+    uuids.extend(trivial_jobs);
+
     Ok(Json(uuids))
 }
 
@@ -2813,8 +2815,6 @@ pub async fn run_flow_by_path_inner(
     let flow_path = flow_path.to_path();
     check_scopes(&authed, || format!("run:flow/{flow_path}"))?;
 
-    let mut tx: QueueTransaction<'_, _> = (rsmq, user_db.begin(&authed).await?).into();
-
     let (tag, dedicated_worker, has_preprocessor) = sqlx::query!(
         "SELECT tag, dedicated_worker, flow_version.value->>'preprocessor_module' IS NOT NULL as has_preprocessor 
         FROM flow 
@@ -2824,7 +2824,7 @@ pub async fn run_flow_by_path_inner(
         flow_path,
         w_id
     )
-    .fetch_optional(&mut tx)
+    .fetch_optional(&db)
     .await?
     .map(|x| (x.tag, x.dedicated_worker, x.has_preprocessor))
     .ok_or_else(|| {
@@ -2837,7 +2837,7 @@ pub async fn run_flow_by_path_inner(
 
     check_tag_available_for_workspace(&w_id, &tag).await?;
     let scheduled_for = run_query.get_scheduled_for(&db).await?;
-    let tx = PushIsolationLevel::Transaction(tx);
+    let tx = PushIsolationLevel::Isolated(user_db, authed.clone().into(), rsmq);
     let (uuid, tx) = push(
         &db,
         tx,
@@ -2909,14 +2909,12 @@ pub async fn restart_flow(
 ) -> error::Result<(StatusCode, String)> {
     check_license_key_valid().await?;
 
-    let mut tx: QueueTransaction<'_, _> = (rsmq, user_db.begin(&authed).await?).into();
-
     let completed_job = sqlx::query_as::<_, CompletedJob>(
         "SELECT *, result->'wm_labels' as labels from completed_job WHERE id = $1 and workspace_id = $2",
     )
     .bind(job_id)
     .bind(&w_id)
-    .fetch_optional(&mut tx)
+    .fetch_optional(&db)
     .await?
     .with_context(|| "Unable to find completed job with the given job UUID")?;
 
@@ -2934,7 +2932,7 @@ pub async fn restart_flow(
 
     let scheduled_for = run_query.get_scheduled_for(&db).await?;
 
-    let tx = PushIsolationLevel::Transaction(tx);
+    let tx = PushIsolationLevel::Isolated(user_db, authed.clone().into(), rsmq);
 
     let (uuid, tx) = push(
         &db,
@@ -3010,16 +3008,14 @@ pub async fn run_script_by_path_inner(
 
     check_scopes(&authed, || format!("run:script/{script_path}"))?;
 
-    let mut tx: QueueTransaction<'_, _> = (rsmq, user_db.begin(&authed).await?).into();
-
     let (job_payload, tag, _delete_after_use, timeout) =
-        script_path_to_payload(script_path, &mut tx, &w_id, run_query.skip_preprocessor).await?;
+        script_path_to_payload(script_path, &db, &w_id, run_query.skip_preprocessor).await?;
     let scheduled_for = run_query.get_scheduled_for(&db).await?;
 
     let tag = run_query.tag.clone().or(tag);
     check_tag_available_for_workspace(&w_id, &tag).await?;
 
-    let tx = PushIsolationLevel::Transaction(tx);
+    let tx = PushIsolationLevel::Isolated(user_db, authed.clone().into(), rsmq);
 
     let (uuid, tx) = push(
         &db,
@@ -3052,6 +3048,11 @@ pub async fn run_script_by_path_inner(
     Ok((StatusCode::CREATED, uuid.to_string()))
 }
 
+#[derive(Deserialize)]
+pub struct WorkflowAsCodeQuery {
+    pub skip_update: Option<bool>,
+}
+
 pub async fn run_workflow_as_code(
     authed: ApiAuthed,
     Extension(db): Extension<DB>,
@@ -3059,15 +3060,32 @@ pub async fn run_workflow_as_code(
     Extension(rsmq): Extension<Option<rsmq_async::MultiplexedRsmq>>,
     Path((w_id, job_id, entrypoint)): Path<(String, Uuid, String)>,
     Query(run_query): Query<RunJobQuery>,
+    Query(wkflow_query): Query<WorkflowAsCodeQuery>,
     Json(task): Json<WorkflowTask>,
 ) -> error::Result<(StatusCode, String)> {
+    let mut i = 1;
+
+    if *CLOUD_HOSTED {
+        tracing::info!("workflow_as_code_tracing id {i} ");
+        i += 1;
+    }
+
     #[cfg(feature = "enterprise")]
     check_license_key_valid().await?;
     check_tag_available_for_workspace(&w_id, &run_query.tag).await?;
 
-    let mut tx: QueueTransaction<'_, _> = (rsmq, user_db.begin(&authed).await?).into();
+    if *CLOUD_HOSTED {
+        tracing::info!("workflow_as_code_tracing id {i} ");
+        i += 1;
+    }
 
     let job = get_queued_job(&job_id, &w_id, &db).await?;
+
+    if *CLOUD_HOSTED {
+        tracing::info!("workflow_as_code_tracing id {i} ");
+        i += 1;
+    }
+
     let job = not_found_if_none(job, "Queued Job", &job_id.to_string())?;
     let (job_payload, tag, _delete_after_use, timeout) = match job.job_kind {
         JobKind::Preview => (
@@ -3090,17 +3108,17 @@ pub async fn run_workflow_as_code(
             run_query.timeout,
         ),
         JobKind::Script => {
-            script_path_to_payload(
-                job.script_path(),
-                &mut tx,
-                &w_id,
-                run_query.skip_preprocessor,
-            )
-            .await?
+            script_path_to_payload(job.script_path(), &db, &w_id, run_query.skip_preprocessor)
+                .await?
         }
         _ => return Err(anyhow::anyhow!("Not supported").into()),
     };
 
+    if *CLOUD_HOSTED {
+        tracing::info!("workflow_as_code_tracing id {i} ");
+        i += 1;
+    }
+
     let mut extra = HashMap::new();
     extra.insert(ENTRYPOINT_OVERRIDE.to_string(), to_raw_value(&entrypoint));
 
@@ -3109,7 +3127,17 @@ pub async fn run_workflow_as_code(
 
     let tag = run_query.tag.clone().or(tag).or(Some(job.tag));
 
-    let tx = PushIsolationLevel::Transaction(tx);
+    if *CLOUD_HOSTED {
+        tracing::info!("workflow_as_code_tracing id {i} ");
+        i += 1;
+    }
+
+    let tx = PushIsolationLevel::Isolated(user_db, authed.clone().into(), rsmq);
+
+    if *CLOUD_HOSTED {
+        tracing::info!("workflow_as_code_tracing id {i} ");
+        i += 1;
+    }
 
     let (uuid, mut tx) = push(
         &db,
@@ -3136,14 +3164,35 @@ pub async fn run_workflow_as_code(
         Some(&authed.clone().into()),
     )
     .await?;
-    sqlx::query!(
-        "UPDATE queue SET flow_status = jsonb_set(COALESCE(flow_status, '{}'::jsonb), array[$1], jsonb_set(jsonb_set('{}'::jsonb, '{scheduled_for}', to_jsonb(now()::text)), '{name}', to_jsonb($4::text))) WHERE id = $2 AND workspace_id = $3",
-        uuid.to_string(),
-        job_id,
-        w_id,
-        entrypoint
-    ).execute(&mut tx).await?;
+
+    if *CLOUD_HOSTED {
+        tracing::info!("workflow_as_code_tracing id {i} ");
+        i += 1;
+    }
+
+    if !wkflow_query.skip_update.unwrap_or(false) {
+        sqlx::query!(
+            "UPDATE queue SET flow_status = jsonb_set(COALESCE(flow_status, '{}'::jsonb), array[$1], jsonb_set(jsonb_set('{}'::jsonb, '{scheduled_for}', to_jsonb(now()::text)), '{name}', to_jsonb($4::text))) WHERE id = $2 AND workspace_id = $3",
+            uuid.to_string(),
+            job_id,
+            w_id,
+            entrypoint
+        ).execute(&mut tx).await?;
+    } else {
+        tracing::info!("Skipping update of flow status for job {job_id} in workspace {w_id}");
+    }
+
+    if *CLOUD_HOSTED {
+        tracing::info!("workflow_as_code_tracing id {i} ");
+        i += 1;
+    }
+
     tx.commit().await?;
+
+    if *CLOUD_HOSTED {
+        tracing::info!("workflow_as_code_tracing id {i} ");
+    }
+
     Ok((StatusCode::CREATED, uuid.to_string()))
 }
 
@@ -3507,15 +3556,13 @@ pub async fn run_wait_result_job_by_path_get(
     let script_path = script_path.to_path();
     check_scopes(&authed, || format!("run:script/{script_path}"))?;
 
-    let mut tx: QueueTransaction<'_, _> = (rsmq, user_db.begin(&authed).await?).into();
-
     let (job_payload, tag, delete_after_use, timeout) =
-        script_path_to_payload(script_path, &mut tx, &w_id, run_query.skip_preprocessor).await?;
+        script_path_to_payload(script_path, &db, &w_id, run_query.skip_preprocessor).await?;
 
     let tag = run_query.tag.clone().or(tag);
     check_tag_available_for_workspace(&w_id, &tag).await?;
 
-    let tx = PushIsolationLevel::Transaction(tx);
+    let tx = PushIsolationLevel::Isolated(user_db, authed.clone().into(), rsmq);
 
     let (uuid, tx) = push(
         &db,
@@ -3632,15 +3679,13 @@ pub async fn run_wait_result_script_by_path_internal(
     let script_path = script_path.to_path();
     check_scopes(&authed, || format!("run:script/{script_path}"))?;
 
-    let mut tx: QueueTransaction<'_, _> = (rsmq, user_db.begin(&authed).await?).into();
-
     let (job_payload, tag, delete_after_use, timeout) =
-        script_path_to_payload(script_path, &mut tx, &w_id, run_query.skip_preprocessor).await?;
+        script_path_to_payload(script_path, &db, &w_id, run_query.skip_preprocessor).await?;
 
     let tag = run_query.tag.clone().or(tag);
     check_tag_available_for_workspace(&w_id, &tag).await?;
 
-    let tx = PushIsolationLevel::Transaction(tx);
+    let tx = PushIsolationLevel::Isolated(user_db, authed.clone().into(), rsmq);
 
     let (uuid, tx) = push(
         &db,
@@ -3692,8 +3737,6 @@ pub async fn run_wait_result_script_by_hash(
 
     check_queue_too_long(&db, run_query.queue_limit).await?;
 
-    let mut tx: QueueTransaction<'_, _> = (rsmq, user_db.begin(&authed).await?).into();
-
     let hash = script_hash.0;
     let (
         path,
@@ -3708,7 +3751,7 @@ pub async fn run_wait_result_script_by_hash(
         delete_after_use,
         timeout,
         has_preprocessor,
-    ) = get_path_tag_limits_cache_for_hash(&mut tx, &w_id, hash).await?;
+    ) = get_path_tag_limits_cache_for_hash(&db, &w_id, hash).await?;
     if let Some(run_query_cache_ttl) = run_query.cache_ttl {
         cache_ttl = Some(run_query_cache_ttl);
     }
@@ -3717,7 +3760,7 @@ pub async fn run_wait_result_script_by_hash(
     let tag = run_query.tag.clone().or(tag);
     check_tag_available_for_workspace(&w_id, &tag).await?;
 
-    let tx = PushIsolationLevel::Transaction(tx);
+    let tx = PushIsolationLevel::Isolated(user_db, authed.clone().into(), rsmq);
 
     let (uuid, tx) = push(
         &db,
@@ -3799,8 +3842,6 @@ pub async fn run_wait_result_flow_by_path_internal(
     let flow_path = flow_path.to_path();
     check_scopes(&authed, || format!("run:flow/{flow_path}"))?;
 
-    let mut tx: QueueTransaction<'_, _> = (rsmq, user_db.begin(&authed).await?).into();
-
     let scheduled_for = run_query.get_scheduled_for(&db).await?;
 
     let (tag, dedicated_worker, early_return, has_preprocessor) = sqlx::query!(
@@ -3812,7 +3853,7 @@ pub async fn run_wait_result_flow_by_path_internal(
         flow_path,
         w_id
     )
-    .fetch_optional(&mut tx)
+    .fetch_optional(&db)
     .await?
     .map(|x| (x.tag, x.dedicated_worker, x.early_return, x.has_preprocessor))
     .ok_or_else(|| {
@@ -3824,7 +3865,7 @@ pub async fn run_wait_result_flow_by_path_internal(
     let tag = run_query.tag.clone().or(tag);
     check_tag_available_for_workspace(&w_id, &tag).await?;
 
-    let tx = PushIsolationLevel::Transaction(tx);
+    let tx = PushIsolationLevel::Isolated(user_db, authed.clone().into(), rsmq);
 
     let (uuid, tx) = push(
         &db,
@@ -4130,10 +4171,10 @@ async fn run_dependencies_job(
             JsonRawValue::from_string("true".to_string()).unwrap(),
         );
         if language == ScriptLang::Bun {
-            let annotation = windmill_common::worker::get_annotation(&raw_code);
+            let annotation = windmill_common::worker::TypeScriptAnnotations::parse(&raw_code);
             hm.insert(
                 "npm_mode".to_string(),
-                JsonRawValue::from_string(annotation.npm_mode.to_string()).unwrap(),
+                JsonRawValue::from_string(annotation.npm.to_string()).unwrap(),
             );
         }
         (PushArgs { extra: Some(hm), args: &ehm }, deps)
@@ -4296,8 +4337,6 @@ async fn add_batch_jobs(
             }
         }
         "flow" => {
-            let mut tx = PushIsolationLevel::IsolatedRoot(db.clone(), rsmq);
-
             let mut uuids: Vec<Uuid> = Vec::new();
             let payload = if let Some(ref fv) = batch_info.flow_value {
                 JobPayload::RawFlow { value: fv.clone(), path: None, restarted_from: None }
@@ -4314,6 +4353,7 @@ async fn add_batch_jobs(
                     ))?
                 }
             };
+            let mut tx = PushIsolationLevel::IsolatedRoot(db.clone(), rsmq);
             for _ in 0..n {
                 let ehm = HashMap::new();
                 let (uuid, ntx) = push(
@@ -4514,8 +4554,6 @@ pub async fn run_job_by_hash_inner(
     #[cfg(feature = "enterprise")]
     check_license_key_valid().await?;
 
-    let mut tx: QueueTransaction<'_, _> = (rsmq, user_db.begin(&authed).await?).into();
-
     let hash = script_hash.0;
     let (
         path,
@@ -4530,7 +4568,7 @@ pub async fn run_job_by_hash_inner(
         _delete_after_use, // not taken into account in async endpoints
         timeout,
         has_preprocessor,
-    ) = get_path_tag_limits_cache_for_hash(&mut tx, &w_id, hash).await?;
+    ) = get_path_tag_limits_cache_for_hash(&db, &w_id, hash).await?;
     check_scopes(&authed, || format!("run:script/{path}"))?;
     if let Some(run_query_cache_ttl) = run_query.cache_ttl {
         cache_ttl = Some(run_query_cache_ttl);
@@ -4539,7 +4577,7 @@ pub async fn run_job_by_hash_inner(
     let tag = run_query.tag.clone().or(tag);
 
     check_tag_available_for_workspace(&w_id, &tag).await?;
-    let tx = PushIsolationLevel::Transaction(tx);
+    let tx = PushIsolationLevel::Isolated(user_db, authed.clone().into(), rsmq);
 
     let (uuid, tx) = push(
         &db,
@@ -4683,13 +4721,12 @@ async fn get_job_update(
     .fetch_optional(&db)
     .await?;
 
-    let progress: Option<i32> = if get_progress == Some(true){
-         sqlx::query_scalar!(
+    let progress: Option<i32> = if get_progress == Some(true) {
+        sqlx::query_scalar!(
                 "SELECT scalar_int FROM job_stats WHERE workspace_id = $1 AND job_id = $2 AND metric_id = $3",
                 &w_id,
                  job_id,
                 "progress_perc"
-                
             )
             .fetch_optional(&db)
             .await?.and_then(|inner| inner)
@@ -5115,8 +5152,6 @@ async fn get_completed_job_result(
     Ok(Json(result).into_response())
 }
 
-
-
 #[derive(Deserialize)]
 struct CountByTagQuery {
     horizon_secs: Option<i64>,
@@ -5130,7 +5165,7 @@ struct TagCount {
 }
 
 async fn count_by_tag(
-    ApiAuthed { email, ..}: ApiAuthed,
+    ApiAuthed { email, .. }: ApiAuthed,
     Extension(db): Extension<DB>,
     Query(query): Query<CountByTagQuery>,
 ) -> JsonResult<Vec<TagCount>> {
diff --git a/backend/windmill-api/src/lib.rs b/backend/windmill-api/src/lib.rs
index 97d2865e2e..3ea78ffd6d 100644
--- a/backend/windmill-api/src/lib.rs
+++ b/backend/windmill-api/src/lib.rs
@@ -39,9 +39,8 @@ use tower_http::{
     trace::TraceLayer,
 };
 use windmill_common::db::UserDB;
-use windmill_common::utils::rd_string;
-use windmill_common::worker::ALL_TAGS;
-use windmill_common::BASE_URL;
+use windmill_common::worker::{ALL_TAGS, CLOUD_HOSTED};
+use windmill_common::{BASE_URL, INSTANCE_NAME};
 
 use crate::scim_ee::has_scim_token;
 use windmill_common::error::AppError;
@@ -83,12 +82,16 @@ pub mod smtp_server_ee;
 mod static_assets;
 mod stripe_ee;
 mod tracing_init;
+mod triggers;
 mod users;
+mod users_ee;
 mod utils;
 mod variables;
 mod webhook_util;
+mod websocket_triggers;
 mod workers;
 mod workspaces;
+mod workspaces_ee;
 
 pub const GIT_VERSION: &str =
     git_version!(args = ["--tag", "--always"], fallback = "unknown-version");
@@ -225,7 +228,7 @@ pub async fn run_server(
             db: db.clone(),
             user_db: user_db,
             auth_cache: auth_cache.clone(),
-            rsmq: rsmq,
+            rsmq: rsmq.clone(),
             base_internal_url: base_internal_url.clone(),
         });
         if let Err(err) = smtp_server.start_listener_thread(addr).await {
@@ -245,6 +248,11 @@ pub async fn run_server(
         }
     };
 
+    if !*CLOUD_HOSTED {
+        let ws_killpill_rx = rx.resubscribe();
+        websocket_triggers::start_websockets(db.clone(), rsmq, ws_killpill_rx).await;
+    }
+
     // build our application with a route
     let app = Router::new()
         .nest(
@@ -285,7 +293,11 @@ pub async fn run_server(
                         .nest("/variables", variables::workspaced_service())
                         .nest("/workspaces", workspaces::workspaced_service())
                         .nest("/oidc", oidc_ee::workspaced_service())
-                        .nest("/http_triggers", http_triggers::workspaced_service()),
+                        .nest("/http_triggers", http_triggers::workspaced_service())
+                        .nest(
+                            "/websocket_triggers",
+                            websocket_triggers::workspaced_service(),
+                        ),
                 )
                 .nest("/workspaces", workspaces::global_service())
                 .nest(
@@ -373,8 +385,6 @@ pub async fn run_server(
         )
     };
 
-    let instance_name = rd_string(5);
-
     let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
     let port = listener.local_addr().map(|x| x.port()).unwrap_or(8000);
     let ip = listener
@@ -385,7 +395,7 @@ pub async fn run_server(
     let server = axum::serve(listener, app.into_make_service());
 
     tracing::info!(
-        instance = %instance_name,
+        instance = %*INSTANCE_NAME,
         "server started on port={} and addr={}",
         port,
         ip
@@ -448,9 +458,13 @@ async fn ee_license() -> &'static str {
 
 #[cfg(feature = "enterprise")]
 async fn ee_license() -> String {
-    use windmill_common::ee::LICENSE_KEY_ID;
+    use windmill_common::ee::{LICENSE_KEY_ID, LICENSE_KEY_VALID};
 
-    LICENSE_KEY_ID.read().await.clone()
+    if *LICENSE_KEY_VALID.read().await {
+        LICENSE_KEY_ID.read().await.clone()
+    } else {
+        "".to_string()
+    }
 }
 
 async fn openapi() -> &'static str {
diff --git a/backend/windmill-api/src/resources.rs b/backend/windmill-api/src/resources.rs
index 1fb5b12259..bb881d5369 100644
--- a/backend/windmill-api/src/resources.rs
+++ b/backend/windmill-api/src/resources.rs
@@ -58,7 +58,10 @@ pub fn workspaced_service() -> Router {
         .route("/type/exists/:name", get(exists_resource_type))
         .route("/type/update/:name", post(update_resource_type))
         .route("/type/delete/:name", delete(delete_resource_type))
-        .route("/file_resource_type_to_file_ext_map", get(file_resource_ext_to_resource_type))
+        .route(
+            "/file_resource_type_to_file_ext_map",
+            get(file_resource_ext_to_resource_type),
+        )
         .route("/type/create", post(create_resource_type))
 }
 
diff --git a/backend/windmill-api/src/scripts.rs b/backend/windmill-api/src/scripts.rs
index bcede4f5e2..56b991713f 100644
--- a/backend/windmill-api/src/scripts.rs
+++ b/backend/windmill-api/src/scripts.rs
@@ -9,6 +9,9 @@
 use crate::{
     db::{ApiAuthed, DB},
     schedule::clear_schedule,
+    triggers::{
+        get_triggers_count_internal, list_tokens_internal, TriggersCount, TruncatedTokenWithEmail,
+    },
     users::{maybe_refresh_folders, require_owner_of_path, AuthCache},
     utils::WithStarredInfoQuery,
     webhook_util::{WebhookMessage, WebhookShared},
@@ -53,7 +56,7 @@ use windmill_common::{
     utils::{
         not_found_if_none, paginate, query_elems_from_hub, require_admin, Pagination, StripPath,
     },
-    worker::{get_annotation, to_raw_value},
+    worker::to_raw_value,
     HUB_BASE_URL,
 };
 use windmill_git_sync::{handle_deployment_metadata, DeployedObject};
@@ -132,6 +135,8 @@ pub fn workspaced_service() -> Router {
         .route("/archive/p/*path", post(archive_script_by_path))
         .route("/get/draft/*path", get(get_script_by_path_w_draft))
         .route("/get/p/*path", get(get_script_by_path))
+        .route("/get_triggers_count/*path", get(get_triggers_count))
+        .route("/list_tokens/*path", get(list_tokens))
         .route("/raw/p/*path", get(raw_script_by_path))
         .route("/raw_unpinned/p/*path", get(raw_script_by_path_unpinned))
         .route("/exists/p/*path", get(exists_script_by_path))
@@ -147,6 +152,7 @@ pub fn workspaced_service() -> Router {
             post(toggle_workspace_error_handler),
         )
         .route("/history/p/*path", get(get_script_history))
+        .route("/get_latest_version/*path", get(get_latest_version))
         .route(
             "/history_update/h/:hash/p/*path",
             post(update_script_history),
@@ -601,8 +607,8 @@ async fn create_script_internal<'c>(
     };
 
     let lang = if &ns.language == &ScriptLang::Bun || &ns.language == &ScriptLang::Bunnative {
-        let anns = get_annotation(&ns.content);
-        if anns.native_mode {
+        let anns = windmill_common::worker::TypeScriptAnnotations::parse(&ns.content);
+        if anns.native {
             ScriptLang::Bunnative
         } else {
             ScriptLang::Bun
@@ -874,6 +880,22 @@ async fn get_script_by_path(
     Ok(Json(script))
 }
 
+async fn list_tokens(
+    Extension(db): Extension<DB>,
+    Path((w_id, path)): Path<(String, StripPath)>,
+) -> JsonResult<Vec<TruncatedTokenWithEmail>> {
+    let path = path.to_path();
+    list_tokens_internal(&db, &w_id, &path, false).await
+}
+
+async fn get_triggers_count(
+    Extension(db): Extension<DB>,
+    Path((w_id, path)): Path<(String, StripPath)>,
+) -> JsonResult<TriggersCount> {
+    let path = path.to_path();
+    get_triggers_count_internal(&db, &w_id, &path, false).await
+}
+
 async fn get_script_by_path_w_draft(
     authed: ApiAuthed,
     Extension(user_db): Extension<UserDB>,
@@ -927,6 +949,38 @@ async fn get_script_history(
     return Ok(Json(result));
 }
 
+async fn get_latest_version(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path((w_id, path)): Path<(String, StripPath)>,
+) -> JsonResult<Option<ScriptHistory>> {
+    let mut tx = user_db.begin(&authed).await?;
+    let row_o = sqlx::query!(
+
+        "SELECT s.hash as hash, dm.deployment_msg as deployment_msg 
+        FROM script s LEFT JOIN deployment_metadata dm ON s.hash = dm.script_hash
+        WHERE s.workspace_id = $1 AND s.path = $2
+        ORDER by created_at DESC",
+        w_id,
+        path.to_path(),
+    )
+
+    .fetch_optional(&mut *tx)
+    .await?;
+    tx.commit().await?;
+
+    if let Some(row) = row_o {
+        let result = ScriptHistory {
+            script_hash: ScriptHash(row.hash),
+            deployment_msg: row.deployment_msg, //
+        };
+        return Ok(Json(Some(result)));
+    } else {
+        return Ok(Json(None));
+    }
+
+}
+
 async fn update_script_history(
     authed: ApiAuthed,
     Extension(user_db): Extension<UserDB>,
diff --git a/backend/windmill-api/src/settings.rs b/backend/windmill-api/src/settings.rs
index 395387ebd6..0299145a38 100644
--- a/backend/windmill-api/src/settings.rs
+++ b/backend/windmill-api/src/settings.rs
@@ -24,17 +24,17 @@ use axum::{
 #[cfg(feature = "enterprise")]
 use axum::extract::Query;
 
+use serde::Deserialize;
 #[cfg(feature = "enterprise")]
 use windmill_common::ee::{send_critical_alert, CriticalAlertKind, CriticalErrorChannel};
-use serde::Deserialize;
 use windmill_common::{
+    email_ee::send_email,
     error::{self, JsonResult, Result},
     global_settings::{
         AUTOMATE_USERNAME_CREATION_SETTING, EMAIL_DOMAIN_SETTING, ENV_SETTINGS,
-        HUB_BASE_URL_SETTING,
+        HUB_ACCESSIBLE_URL_SETTING, HUB_BASE_URL_SETTING,
     },
     server::Smtp,
-    utils::send_email,
 };
 
 #[cfg(feature = "parquet")]
@@ -163,8 +163,13 @@ pub async fn test_license_key(
     Json(TestKey { license_key }): Json<TestKey>,
 ) -> error::Result<String> {
     require_super_admin(&db, &authed.email).await?;
-    validate_license_key(license_key).await?;
-    Ok("Sent test email".to_string())
+    let (_, expired) = validate_license_key(license_key).await?;
+
+    if expired {
+        Err(error::Error::BadRequest("Expired license key".to_string()))
+    } else {
+        Ok("Valid license key".to_string())
+    }
 }
 
 pub async fn get_local_settings(
@@ -257,6 +262,7 @@ pub async fn get_global_setting(
         && !key.starts_with("default_success_handler_")
         && key != AUTOMATE_USERNAME_CREATION_SETTING
         && key != HUB_BASE_URL_SETTING
+        && key != HUB_ACCESSIBLE_URL_SETTING
         && key != EMAIL_DOMAIN_SETTING
     {
         require_super_admin(&db, &authed.email).await?;
@@ -298,7 +304,12 @@ async fn list_global_settings() -> JsonResult<String> {
 
 pub async fn send_stats(Extension(db): Extension<DB>, authed: ApiAuthed) -> Result<String> {
     require_super_admin(&db, &authed.email).await?;
-    windmill_common::stats_ee::send_stats(&"manual".to_string(), &HTTP_CLIENT, &db).await?;
+    windmill_common::stats_ee::send_stats(
+        &HTTP_CLIENT,
+        &db,
+        windmill_common::stats_ee::SendStatsReason::Manual,
+    )
+    .await?;
 
     Ok("Sent stats".to_string())
 }
@@ -357,8 +368,13 @@ pub async fn renew_license_key(
     authed: ApiAuthed,
 ) -> Result<String> {
     require_super_admin(&db, &authed.email).await?;
-    windmill_common::stats_ee::send_stats(&"manual".to_string(), &HTTP_CLIENT, &db).await?;
-    let result = windmill_common::ee::renew_license_key(&HTTP_CLIENT, &db, license_key, true).await;
+    let result = windmill_common::ee::renew_license_key(
+        &HTTP_CLIENT,
+        &db,
+        license_key,
+        windmill_common::ee::RenewReason::Manual,
+    )
+    .await;
 
     if result != "success" {
         return Err(error::Error::BadRequest(format!(
diff --git a/backend/windmill-api/src/static_assets.rs b/backend/windmill-api/src/static_assets.rs
index aa9870907e..783732b1c0 100644
--- a/backend/windmill-api/src/static_assets.rs
+++ b/backend/windmill-api/src/static_assets.rs
@@ -48,7 +48,10 @@ fn serve_path(path: &str) -> Response<Body> {
             let mut res = Response::builder()
                 .header(header::CONTENT_TYPE, mime.as_ref())
                 .header(header::ACCESS_CONTROL_ALLOW_ORIGIN, "*");
-            if mime.as_ref() == mime::APPLICATION_JAVASCRIPT || path.ends_with(".wasm") {
+            if mime.as_ref() == mime::APPLICATION_JAVASCRIPT
+                || mime.as_ref() == mime::TEXT_JAVASCRIPT
+                || path.ends_with(".wasm")
+            {
                 res = res.header(header::CACHE_CONTROL, "max-age=31536000");
             } else if (mime.type_(), mime.subtype()) == (mime::TEXT, mime::CSS) {
                 res = res.header(header::CACHE_CONTROL, "max-age=31536000");
diff --git a/backend/windmill-api/src/tracing_init.rs b/backend/windmill-api/src/tracing_init.rs
index 1f93b941cb..60dab73810 100644
--- a/backend/windmill-api/src/tracing_init.rs
+++ b/backend/windmill-api/src/tracing_init.rs
@@ -9,6 +9,7 @@
 use ::tracing::{field, Span};
 use hyper::Response;
 use tower_http::trace::{MakeSpan, OnFailure, OnResponse};
+use uuid::Uuid;
 
 lazy_static::lazy_static! {
     static ref LOG_REQUESTS: bool = std::env::var("LOG_REQUESTS")
@@ -45,17 +46,28 @@ impl<B> OnFailure<B> for MyOnFailure {
         // tracing::error!(latency = latency.as_millis(), "response")
     }
 }
+
+lazy_static::lazy_static! {
+    static ref TRACING_HEADER: String = std::env::var("TRACING_HEADER")
+    .ok().unwrap_or_else(|| "x-tracing-id".to_string());
+}
 #[derive(Clone)]
 pub struct MyMakeSpan {}
 
 impl<B> MakeSpan<B> for MyMakeSpan {
     fn make_span(&mut self, request: &hyper::Request<B>) -> Span {
+        let tracing_id = request
+            .headers()
+            .get(TRACING_HEADER.as_str())
+            .and_then(|x| x.to_str().map(|x| x.to_string()).ok())
+            .unwrap_or(Uuid::new_v4().to_string());
         tracing::info_span!(
             "request",
             method = %request.method(),
             uri = %request.uri(),
             username = field::Empty,
             workspace_id = field::Empty,
+            trace_id = tracing_id,
             email = field::Empty,
         )
     }
diff --git a/backend/windmill-api/src/triggers.rs b/backend/windmill-api/src/triggers.rs
new file mode 100644
index 0000000000..337a20364b
--- /dev/null
+++ b/backend/windmill-api/src/triggers.rs
@@ -0,0 +1,143 @@
+use axum::Json;
+use serde::{Deserialize, Serialize};
+use sqlx::FromRow;
+use windmill_common::error::JsonResult;
+
+use crate::db::DB;
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct TriggerPrimarySchedule {
+    schedule: String,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct TriggersCount {
+    primary_schedule: Option<TriggerPrimarySchedule>,
+    schedule_count: i64,
+    http_routes_count: i64,
+    webhook_count: i64,
+    email_count: i64,
+    websocket_count: i64,
+}
+pub(crate) async fn get_triggers_count_internal(
+    db: &DB,
+    w_id: &str,
+    path: &str,
+    is_flow: bool,
+) -> JsonResult<TriggersCount> {
+    let primary_schedule = sqlx::query_scalar!(
+        "SELECT schedule FROM schedule WHERE path = $1 AND script_path = $1 AND is_flow = $2 AND workspace_id = $3",
+        path,
+        is_flow,
+        w_id
+    )
+    .fetch_optional(db)
+    .await?;
+
+    let schedule_count = sqlx::query_scalar!(
+        "SELECT COUNT(*) FROM schedule WHERE script_path = $1 AND is_flow = $2 AND workspace_id = $3",
+        path,
+        is_flow,
+        w_id
+    )
+    .fetch_one(db)
+    .await?
+    .unwrap_or(0);
+
+    let http_routes_count = sqlx::query_scalar!(
+        "SELECT COUNT(*) FROM http_trigger WHERE script_path = $1 AND is_flow = $2 AND workspace_id = $3",
+        path,
+        is_flow,
+        w_id
+    )
+    .fetch_one(db)
+    .await?
+    .unwrap_or(0);
+
+    let websocket_count = sqlx::query_scalar!(
+        "SELECT COUNT(*) FROM websocket_trigger WHERE script_path = $1 AND is_flow = $2 AND workspace_id = $3",
+        path,
+        is_flow,
+        w_id
+    )
+    .fetch_one(db)
+    .await?
+    .unwrap_or(0);
+
+    let webhook_count = (if is_flow {
+        sqlx::query_scalar!(
+            "SELECT COUNT(*) FROM token WHERE label LIKE 'webhook-%' AND workspace_id = $1 AND scopes @> ARRAY['run:flow/' || $2]::text[]",
+            w_id,
+            path,
+        )
+
+    } else {
+        sqlx::query_scalar!(
+            "SELECT COUNT(*) FROM token WHERE label LIKE 'webhook-%' AND workspace_id = $1 AND scopes @> ARRAY['run:' || $2]::text[]",
+            w_id,
+            path,
+        )
+    }).fetch_one(db)
+    .await?
+    .unwrap_or(0);
+
+    let email_count = (if is_flow {
+        sqlx::query_scalar!(
+            "SELECT COUNT(*) FROM token WHERE label LIKE 'email-%' AND workspace_id = $1 AND scopes @> ARRAY['run:flow/' || $2]::text[]",
+            w_id,
+            path,
+        )
+
+    } else {
+        sqlx::query_scalar!(
+            "SELECT COUNT(*) FROM token WHERE label LIKE 'email-%' AND workspace_id = $1 AND scopes @> ARRAY['run:script/' || $2]::text[]",
+            w_id,
+            path,
+        )
+    }).fetch_one(db)
+    .await?
+    .unwrap_or(0);
+
+    Ok(Json(TriggersCount {
+        primary_schedule: primary_schedule.map(|s| TriggerPrimarySchedule { schedule: s }),
+        schedule_count,
+        http_routes_count,
+        webhook_count,
+        email_count,
+        websocket_count,
+    }))
+}
+
+#[derive(FromRow, Serialize)]
+pub struct TruncatedTokenWithEmail {
+    pub label: Option<String>,
+    pub token_prefix: Option<String>,
+    pub expiration: Option<chrono::DateTime<chrono::Utc>>,
+    pub created_at: chrono::DateTime<chrono::Utc>,
+    pub last_used_at: chrono::DateTime<chrono::Utc>,
+    pub scopes: Option<Vec<String>>,
+    pub email: Option<String>,
+}
+
+pub async fn list_tokens_internal(
+    db: &DB,
+    w_id: &str,
+    path: &str,
+    is_flow: bool,
+) -> JsonResult<Vec<TruncatedTokenWithEmail>> {
+    let tokens = if is_flow {
+        sqlx::query_as!(
+        TruncatedTokenWithEmail,
+        "SELECT label, concat(substring(token for 10)) as token_prefix, expiration, created_at, last_used_at, scopes, email FROM token WHERE workspace_id = $1 AND scopes @> ARRAY['run:flow/' || $2]::text[]",
+        w_id, path).fetch_all(db)
+        .await?
+    } else {
+        sqlx::query_as!(
+            TruncatedTokenWithEmail,
+            "SELECT label, concat(substring(token for 10)) as token_prefix, expiration, created_at, last_used_at, scopes, email FROM token WHERE workspace_id = $1 AND scopes @> ARRAY['run:script/' || $2]::text[]",
+            w_id, path)
+        .fetch_all(db)
+        .await?
+    };
+    Ok(Json(tokens))
+}
diff --git a/backend/windmill-api/src/users.rs b/backend/windmill-api/src/users.rs
new file mode 100644
index 0000000000..c9a812c4a0
--- /dev/null
+++ b/backend/windmill-api/src/users.rs
@@ -0,0 +1,3169 @@
+/*
+ * Author: Ruben Fiszel
+ * Copyright: Windmill Labs, Inc 2022
+ * This file and its contents are licensed under the AGPLv3 License.
+ * Please see the included NOTICE for copyright information and
+ * LICENSE-AGPL for a copy of the license.
+ */
+
+#![allow(non_snake_case)]
+
+use std::sync::atomic::{AtomicBool, AtomicI64, AtomicU64, Ordering};
+use std::sync::Arc;
+
+use crate::db::ApiAuthed;
+
+#[cfg(feature = "enterprise")]
+use crate::ee::ExternalJwks;
+use crate::oauth2_ee::InstanceEvent;
+use crate::utils::{
+    generate_instance_wide_unique_username, get_instance_username_or_create_pending,
+};
+use crate::{
+    db::DB, utils::require_super_admin, webhook_util::WebhookShared, COOKIE_DOMAIN, IS_SECURE,
+};
+use argon2::{Argon2, PasswordHash, PasswordVerifier};
+use axum::{
+    async_trait,
+    extract::{Extension, FromRequestParts, OriginalUri, Path, Query},
+    http::request::Parts,
+    response::{IntoResponse, Response},
+    routing::{delete, get, post},
+    Json, Router,
+};
+use chrono::TimeZone;
+use hyper::{header::LOCATION, StatusCode};
+use lazy_static::lazy_static;
+use quick_cache::sync::Cache;
+use regex::Regex;
+use serde::{Deserialize, Serialize};
+use sqlx::FromRow;
+use time::OffsetDateTime;
+#[cfg(feature = "enterprise")]
+use tokio::sync::RwLock;
+use tower_cookies::{Cookie, Cookies};
+use tracing::{Instrument, Span};
+use windmill_audit::audit_ee::{audit_log, AuditAuthor};
+use windmill_audit::ActionKind;
+use windmill_common::auth::fetch_authed_from_permissioned_as;
+use windmill_common::global_settings::AUTOMATE_USERNAME_CREATION_SETTING;
+use windmill_common::users::{truncate_token, username_to_permissioned_as};
+use windmill_common::utils::paginate;
+use windmill_common::worker::CLOUD_HOSTED;
+use windmill_common::{
+    auth::{get_folders_for_user, get_groups_for_user, JWTAuthClaims, JWT_SECRET},
+    db::UserDB,
+    error::{self, Error, JsonResult, Result},
+    users::SUPERADMIN_SECRET_EMAIL,
+    utils::{not_found_if_none, rd_string, require_admin, Pagination, StripPath},
+};
+use windmill_git_sync::handle_deployment_metadata;
+
+pub const TTL_TOKEN_DB_H: u32 = 72;
+
+const COOKIE_NAME: &str = "token";
+const COOKIE_PATH: &str = "/";
+
+pub fn workspaced_service() -> Router {
+    Router::new()
+        .route("/list", get(list_users))
+        .route("/list_usage", get(list_user_usage))
+        .route("/list_usernames", get(list_usernames))
+        .route("/exists", post(exists_username))
+        .route("/get/:user", get(get_workspace_user))
+        .route("/update/:user", post(update_workspace_user))
+        .route("/delete/:user", delete(delete_workspace_user))
+        .route("/is_owner/*path", get(is_owner_of_path))
+        .route("/whois/:username", get(whois))
+        .route("/whoami", get(whoami))
+        .route("/leave", post(leave_workspace))
+        .route("/username_to_email/:username", get(username_to_email))
+}
+
+pub fn global_service() -> Router {
+    Router::new()
+        .route("/exists/:email", get(exists_email))
+        .route("/email", get(get_email))
+        .route("/whoami", get(global_whoami))
+        .route("/list_invites", get(list_invites))
+        .route("/decline_invite", post(decline_invite))
+        .route("/accept_invite", post(accept_invite))
+        .route("/list_as_super_admin", get(list_users_as_super_admin))
+        .route("/setpassword", post(set_password))
+        .route("/create", post(create_user))
+        .route("/update/:user", post(update_user))
+        .route("/delete/:user", delete(delete_user))
+        .route("/username_info/:user", get(get_instance_username_info))
+        .route("/rename/:user", post(rename_user))
+        .route("/tokens/create", post(create_token))
+        .route("/tokens/delete/:token_prefix", delete(delete_token))
+        .route("/tokens/list", get(list_tokens))
+        .route("/tokens/impersonate", post(impersonate))
+        .route("/usage", get(get_usage))
+        .route("/all_runnables", get(get_all_runnables))
+        .route("/refresh_token", get(refresh_token))
+        .route(
+            "/tutorial_progress",
+            post(update_tutorial_progress).get(get_tutorial_progress),
+        )
+        .route("/leave_instance", post(leave_instance))
+        .route("/export", get(export_global_users))
+        .route("/overwrite", post(overwrite_global_users))
+
+    // .route("/list_invite_codes", get(list_invite_codes))
+    // .route("/create_invite_code", post(create_invite_code))
+    // .route("/signup", post(signup))
+    // .route("/lost_password", post(lost_password))
+    // .route("/use_magic_link", get(use_magic_link))
+}
+
+pub fn make_unauthed_service() -> Router {
+    Router::new()
+        .route("/login", post(login))
+        .route("/logout", post(logout).get(logout))
+        .route("/is_first_time_setup", get(is_first_time_setup))
+}
+
+fn username_override_from_label(label: Option<String>) -> Option<String> {
+    match label {
+        Some(label)
+            if label.starts_with("webhook-")
+                || label.starts_with("http-")
+                || label.starts_with("email-") =>
+        {
+            Some(label)
+        }
+        Some(label) if label.starts_with("ephemeral-script-end-user-") => Some(
+            label
+                .trim_start_matches("ephemeral-script-end-user-")
+                .to_string(),
+        ),
+        Some(label) if label == "Ephemeral lsp token" => Some("lsp".to_string()),
+        Some(label) if label != "ephemeral-script" && label != "session" && !label.is_empty() => {
+            Some(format!("label-{label}"))
+        }
+        _ => None,
+    }
+}
+
+#[derive(Clone)]
+pub struct ExpiringAuthCache {
+    pub authed: ApiAuthed,
+    pub expiry: chrono::DateTime<chrono::Utc>,
+}
+
+pub struct AuthCache {
+    cache: Cache<(String, String), ExpiringAuthCache>,
+    db: DB,
+    superadmin_secret: Option<String>,
+    #[cfg(feature = "enterprise")]
+    ext_jwks: Option<Arc<RwLock<ExternalJwks>>>,
+}
+
+impl AuthCache {
+    pub fn new(
+        db: DB,
+        superadmin_secret: Option<String>,
+        #[cfg(feature = "enterprise")] ext_jwks: Option<Arc<RwLock<ExternalJwks>>>,
+    ) -> Self {
+        AuthCache {
+            cache: Cache::new(300),
+            db,
+            superadmin_secret,
+            #[cfg(feature = "enterprise")]
+            ext_jwks,
+        }
+    }
+
+    pub async fn invalidate(&self, w_id: &str, token: String) {
+        self.cache.remove(&(w_id.to_string(), token));
+    }
+
+    pub async fn get_authed(&self, w_id: Option<String>, token: &str) -> Option<ApiAuthed> {
+        let key = (
+            w_id.as_ref().unwrap_or(&"".to_string()).to_string(),
+            token.to_string(),
+        );
+        let s = self.cache.get(&key).map(|c| c.to_owned());
+        match s {
+            Some(ExpiringAuthCache { authed, expiry }) if expiry > chrono::Utc::now() => {
+                Some(authed)
+            }
+            #[cfg(feature = "enterprise")]
+            _ if token.starts_with("jwt_ext_") => {
+                let authed_and_exp = match crate::ee::jwt_ext_auth(
+                    w_id.as_ref(),
+                    token.trim_start_matches("jwt_ext_"),
+                    self.ext_jwks.clone(),
+                )
+                .await
+                {
+                    Ok(r) => Some(r),
+                    Err(e) => {
+                        tracing::error!("JWT_EXT auth error: {:?}", e);
+                        None
+                    }
+                };
+
+                if let Some((authed, exp)) = authed_and_exp.clone() {
+                    self.cache.insert(
+                        key,
+                        ExpiringAuthCache {
+                            authed: authed.clone(),
+                            expiry: chrono::Utc.timestamp_nanos(exp as i64 * 1_000_000_000),
+                        },
+                    );
+
+                    Some(authed)
+                } else {
+                    None
+                }
+            }
+            _ if token.starts_with("jwt_") => {
+                let jwt_secret = JWT_SECRET.read().await;
+                if !jwt_secret.is_empty() {
+                    let jwt_token = token.trim_start_matches("jwt_");
+
+                    let jwt_result = jsonwebtoken::decode::<JWTAuthClaims>(
+                        jwt_token,
+                        &jsonwebtoken::DecodingKey::from_secret(jwt_secret.as_bytes()),
+                        &jsonwebtoken::Validation::new(jsonwebtoken::Algorithm::HS256),
+                    );
+
+                    match jwt_result {
+                        Ok(payload) => {
+                            if w_id.is_some_and(|w_id| w_id != payload.claims.workspace_id) {
+                                tracing::error!("JWT auth error: workspace_id mismatch");
+                                return None;
+                            }
+
+                            let username_override =
+                                username_override_from_label(payload.claims.label);
+                            let authed = crate::db::ApiAuthed {
+                                email: payload.claims.email,
+                                username: payload.claims.username,
+                                is_admin: payload.claims.is_admin,
+                                is_operator: payload.claims.is_operator,
+                                groups: payload.claims.groups,
+                                folders: payload.claims.folders,
+                                scopes: None,
+                                username_override,
+                            };
+
+                            self.cache.insert(
+                                key,
+                                ExpiringAuthCache {
+                                    authed: authed.clone(),
+                                    expiry: chrono::Utc
+                                        .timestamp_nanos(payload.claims.exp as i64 * 1_000_000_000),
+                                },
+                            );
+
+                            Some(authed)
+                        }
+                        Err(err) => {
+                            tracing::error!("JWT auth error: {:?}", err);
+                            None
+                        }
+                    }
+                } else {
+                    tracing::error!("JWT auth error: no jwt secret set");
+                    None
+                }
+            }
+            _ => {
+                let user_o = sqlx::query_as::<_, (Option<String>, Option<String>, bool, Option<Vec<String>>, Option<String>)>(
+                    "UPDATE token SET last_used_at = now() WHERE token = $1 AND (expiration > NOW() \
+                     OR expiration IS NULL) AND (workspace_id IS NULL OR workspace_id = $2) RETURNING owner, email, super_admin, scopes, label",
+                )
+                .bind(token)
+                .bind(w_id.as_ref())
+                .fetch_optional(&self.db)
+                .await
+                .ok()
+                .flatten();
+
+                if let Some(user) = user_o {
+                    let authed_o = {
+                        match user {
+                            (Some(owner), Some(email), super_admin, _, label) if w_id.is_some() => {
+                                let username_override = username_override_from_label(label);
+                                if let Some((prefix, name)) = owner.split_once('/') {
+                                    if prefix == "u" {
+                                        let (is_admin, is_operator) = if super_admin {
+                                            (true, false)
+                                        } else {
+                                            let r = sqlx::query!(
+                                                "SELECT is_admin, operator FROM usr where username = $1 AND \
+                                                 workspace_id = $2 AND disabled = false",
+                                                name,
+                                                &w_id.as_ref().unwrap()
+                                            )
+                                            .fetch_one(&self.db)
+                                            .await
+                                            .ok();
+                                            if let Some(r) = r {
+                                                (r.is_admin, r.operator)
+                                            } else {
+                                                (false, true)
+                                            }
+                                        };
+
+                                        let w_id = &w_id.unwrap();
+                                        let groups =
+                                            get_groups_for_user(w_id, &name, &email, &self.db)
+                                                .await
+                                                .ok()
+                                                .unwrap_or_default();
+
+                                        let folders =
+                                            get_folders_for_user(w_id, &name, &groups, &self.db)
+                                                .await
+                                                .ok()
+                                                .unwrap_or_default();
+
+                                        Some(ApiAuthed {
+                                            email: email,
+                                            username: name.to_string(),
+                                            is_admin,
+                                            is_operator,
+                                            groups,
+                                            folders,
+                                            scopes: None,
+                                            username_override,
+                                        })
+                                    } else {
+                                        let groups = vec![name.to_string()];
+                                        let folders = get_folders_for_user(
+                                            &w_id.unwrap(),
+                                            "",
+                                            &groups,
+                                            &self.db,
+                                        )
+                                        .await
+                                        .ok()
+                                        .unwrap_or_default();
+                                        Some(ApiAuthed {
+                                            email: email,
+                                            username: format!("group-{name}"),
+                                            is_admin: false,
+                                            groups,
+                                            is_operator: false,
+                                            folders,
+                                            scopes: None,
+                                            username_override,
+                                        })
+                                    }
+                                } else {
+                                    let groups = vec![];
+                                    let folders = vec![];
+                                    Some(ApiAuthed {
+                                        email: email,
+                                        username: owner,
+                                        is_admin: super_admin,
+                                        is_operator: true,
+                                        groups,
+                                        folders,
+                                        scopes: None,
+                                        username_override,
+                                    })
+                                }
+                            }
+                            (_, Some(email), super_admin, scopes, label) => {
+                                let username_override = username_override_from_label(label);
+                                if w_id.is_some() {
+                                    let row_o = sqlx::query_as::<_, (String, bool, bool)>(
+                                        "SELECT username, is_admin, operator FROM usr where email = $1 AND \
+                                         workspace_id = $2 AND disabled = false",
+                                    )
+                                    .bind(&email)
+                                    .bind(&w_id.as_ref().unwrap())
+                                    .fetch_optional(&self.db)
+                                    .await
+                                    .unwrap_or(Some(("error".to_string(), false, false)));
+
+                                    match row_o {
+                                        Some((username, is_admin, is_operator)) => {
+                                            let groups = get_groups_for_user(
+                                                &w_id.as_ref().unwrap(),
+                                                &username,
+                                                &email,
+                                                &self.db,
+                                            )
+                                            .await
+                                            .ok()
+                                            .unwrap_or_default();
+
+                                            let folders = get_folders_for_user(
+                                                &w_id.unwrap(),
+                                                &username,
+                                                &groups,
+                                                &self.db,
+                                            )
+                                            .await
+                                            .ok()
+                                            .unwrap_or_default();
+                                            Some(ApiAuthed {
+                                                email,
+                                                username,
+                                                is_admin: is_admin || super_admin,
+                                                is_operator,
+                                                groups,
+                                                folders,
+                                                scopes,
+                                                username_override,
+                                            })
+                                        }
+                                        None if super_admin => Some(ApiAuthed {
+                                            email: email.clone(),
+                                            username: email,
+                                            is_admin: super_admin,
+                                            is_operator: false,
+                                            groups: vec![],
+                                            folders: vec![],
+                                            scopes,
+                                            username_override,
+                                        }),
+                                        None => None,
+                                    }
+                                } else {
+                                    Some(ApiAuthed {
+                                        email: email.to_string(),
+                                        username: email,
+                                        is_admin: super_admin,
+                                        is_operator: true,
+                                        groups: Vec::new(),
+                                        folders: Vec::new(),
+                                        scopes,
+                                        username_override,
+                                    })
+                                }
+                            }
+                            _ => None,
+                        }
+                    };
+                    if let Some(authed) = authed_o.as_ref() {
+                        self.cache.insert(
+                            key,
+                            ExpiringAuthCache {
+                                authed: authed.clone(),
+                                expiry: chrono::Utc::now()
+                                    + chrono::Duration::try_seconds(120).unwrap(),
+                            },
+                        );
+                    }
+                    authed_o
+                } else if self
+                    .superadmin_secret
+                    .as_ref()
+                    .map(|x| x == token)
+                    .unwrap_or(false)
+                {
+                    Some(ApiAuthed {
+                        email: SUPERADMIN_SECRET_EMAIL.to_string(),
+                        username: "superadmin_secret".to_string(),
+                        is_admin: true,
+                        is_operator: false,
+                        groups: Vec::new(),
+                        folders: Vec::new(),
+                        scopes: None,
+                        username_override: None,
+                    })
+                } else {
+                    None
+                }
+            }
+        }
+    }
+}
+
+async fn extract_token<S: Send + Sync>(parts: &mut Parts, state: &S) -> Option<String> {
+    let auth_header = parts
+        .headers
+        .get(http::header::AUTHORIZATION)
+        .and_then(|value| value.to_str().ok())
+        .and_then(|s| s.strip_prefix("Bearer "));
+
+    let from_cookie = match auth_header {
+        Some(x) => Some(x.to_owned()),
+        None => Extension::<Cookies>::from_request_parts(parts, state)
+            .await
+            .ok()
+            .and_then(|cookies| cookies.get(COOKIE_NAME).map(|c| c.value().to_owned())),
+    };
+
+    #[derive(Deserialize)]
+    struct Token {
+        token: Option<String>,
+    }
+    match from_cookie {
+        Some(token) => Some(token),
+        None => Query::<Token>::from_request_parts(parts, state)
+            .await
+            .ok()
+            .and_then(|token| token.token.clone()),
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct Tokened {
+    pub token: String,
+}
+
+struct BruteForceCounter {
+    counter: AtomicU64,
+    last_reset: AtomicI64,
+}
+
+lazy_static! {
+    static ref BRUTE_FORCE_COUNTER: BruteForceCounter =
+        BruteForceCounter { last_reset: AtomicI64::new(0), counter: AtomicU64::new(0) };
+}
+
+impl BruteForceCounter {
+    async fn increment(&self) {
+        let now = time::OffsetDateTime::now_utc().unix_timestamp();
+        if self.counter.fetch_add(1, Ordering::Relaxed) > 10000 {
+            tracing::error!(
+                "Brute force attack to find valid token detected, sleeping unauthorized response for 2 seconds"
+            );
+            tokio::time::sleep(std::time::Duration::from_secs(2)).await;
+        }
+        if now - self.last_reset.load(Ordering::Relaxed) > 60 {
+            self.counter.store(0, Ordering::Relaxed);
+            self.last_reset.store(now, Ordering::Relaxed);
+        }
+    }
+}
+
+#[async_trait]
+impl<S> FromRequestParts<S> for Tokened
+where
+    S: Send + Sync,
+{
+    type Rejection = (StatusCode, String);
+
+    async fn from_request_parts(
+        parts: &mut Parts,
+        state: &S,
+    ) -> std::result::Result<Self, Self::Rejection> {
+        if parts.method == http::Method::OPTIONS {
+            return Ok(Tokened { token: "".to_string() });
+        };
+        let already_tokened = parts.extensions.get::<Tokened>();
+        if let Some(tokened) = already_tokened {
+            Ok(tokened.clone())
+        } else {
+            let token_o = extract_token(parts, state).await;
+            if let Some(token) = token_o {
+                let tokened = Self { token };
+                parts.extensions.insert(tokened.clone());
+                Ok(tokened)
+            } else {
+                BRUTE_FORCE_COUNTER.increment().await;
+                Err((StatusCode::UNAUTHORIZED, "Unauthorized".to_owned()))
+            }
+        }
+    }
+}
+
+pub async fn maybe_refresh_folders(
+    path: &str,
+    w_id: &str,
+    authed: ApiAuthed,
+    db: &DB,
+) -> ApiAuthed {
+    if authed.is_admin {
+        return authed;
+    }
+    let splitted = path.split('/').collect::<Vec<_>>();
+    if splitted.len() >= 2
+        && splitted[0] == "f"
+        && !authed.folders.iter().any(|(f, _, _)| f == splitted[1])
+    {
+        let name = &authed.username;
+        let groups = get_groups_for_user(w_id, name, &authed.email, db)
+            .await
+            .ok()
+            .unwrap_or_default();
+
+        let folders = get_folders_for_user(w_id, name, &groups, db)
+            .await
+            .ok()
+            .unwrap_or_default();
+        ApiAuthed { folders, ..authed }
+    } else {
+        authed
+    }
+}
+
+#[async_trait]
+impl<S> FromRequestParts<S> for ApiAuthed
+where
+    S: Send + Sync,
+{
+    type Rejection = (StatusCode, String);
+
+    async fn from_request_parts(
+        parts: &mut Parts,
+        state: &S,
+    ) -> std::result::Result<Self, Self::Rejection> {
+        if parts.method == http::Method::OPTIONS {
+            return Ok(ApiAuthed {
+                email: "".to_owned(),
+                username: "".to_owned(),
+                is_admin: false,
+                is_operator: false,
+                groups: Vec::new(),
+                folders: Vec::new(),
+                scopes: None,
+                username_override: None,
+            });
+        };
+        let already_authed = parts.extensions.get::<ApiAuthed>();
+        if let Some(authed) = already_authed {
+            Ok(authed.clone())
+        } else {
+            let already_tokened = parts.extensions.get::<Tokened>();
+            let token_o = if let Some(token) = already_tokened {
+                Some(token.token.clone())
+            } else {
+                extract_token(parts, state).await
+            };
+            let original_uri = OriginalUri::from_request_parts(parts, state)
+                .await
+                .ok()
+                .map(|x| x.0)
+                .unwrap_or_default();
+            let path_vec: Vec<&str> = original_uri.path().split("/").collect();
+
+            let workspace_id = if path_vec.len() >= 4 && path_vec[0] == "" && path_vec[2] == "w" {
+                Some(path_vec[3].to_owned())
+            } else {
+                if path_vec.len() >= 5
+                    && path_vec[0] == ""
+                    && path_vec[2] == "srch"
+                    && path_vec[3] == "w"
+                {
+                    Some(path_vec[4].to_string())
+                } else {
+                    None
+                }
+            };
+            if let Some(token) = token_o {
+                if let Ok(Extension(cache)) =
+                    Extension::<Arc<AuthCache>>::from_request_parts(parts, state).await
+                {
+                    if let Some(authed) = cache.get_authed(workspace_id.clone(), &token).await {
+                        parts.extensions.insert(authed.clone());
+                        if authed.scopes.as_ref().is_some_and(|scopes| {
+                            scopes
+                                .iter()
+                                .any(|s| s.starts_with("jobs:") || s.starts_with("run:"))
+                        }) && (path_vec.len() < 3
+                            || (path_vec[4] != "jobs" && path_vec[4] != "jobs_u"))
+                        {
+                            BRUTE_FORCE_COUNTER.increment().await;
+                            return Err((
+                                StatusCode::UNAUTHORIZED,
+                                format!("Unauthorized scoped token: {:?}", authed.scopes),
+                            ));
+                        }
+                        Span::current().record("username", &authed.username.as_str());
+                        Span::current().record("email", &authed.email);
+
+                        if let Some(workspace_id) = workspace_id {
+                            Span::current().record("workspace_id", &workspace_id);
+                        }
+                        return Ok(authed);
+                    }
+                }
+            }
+            BRUTE_FORCE_COUNTER.increment().await;
+            Err((StatusCode::UNAUTHORIZED, "Unauthorized".to_owned()))
+        }
+    }
+}
+
+pub fn check_scopes<F>(authed: &ApiAuthed, required: F) -> error::Result<()>
+where
+    F: FnOnce() -> String,
+{
+    if authed.scopes.as_ref().is_some_and(|scopes| {
+        scopes
+            .iter()
+            .any(|s| s.starts_with("jobs:") || s.starts_with("run:"))
+    }) {
+        let req = &required();
+        if !authed.scopes.as_ref().unwrap().contains(req) {
+            return Err(Error::BadRequest(format!("missing required scope: {req}")));
+        }
+    }
+    Ok(())
+}
+
+pub fn get_scope_tags(authed: &ApiAuthed) -> Option<Vec<&str>> {
+    authed.scopes.as_ref()?.iter().find_map(|s| {
+        if s.starts_with("if_jobs:filter_tags:") {
+            Some(
+                s.trim_start_matches("if_jobs:filter_tags:")
+                    .split(",")
+                    .collect::<Vec<_>>(),
+            )
+        } else {
+            None
+        }
+    })
+}
+
+#[derive(Clone, Debug)]
+pub struct OptAuthed(pub Option<ApiAuthed>);
+
+#[async_trait]
+impl<S> FromRequestParts<S> for OptAuthed
+where
+    S: Send + Sync,
+{
+    type Rejection = (StatusCode, String);
+
+    async fn from_request_parts(
+        parts: &mut Parts,
+        state: &S,
+    ) -> std::result::Result<Self, Self::Rejection> {
+        ApiAuthed::from_request_parts(parts, state)
+            .await
+            .map(|authed| Self(Some(authed)))
+            .or_else(|_| Ok(Self(None)))
+    }
+}
+
+pub async fn fetch_api_authed(
+    username: String,
+    email: String,
+    w_id: &str,
+    db: &DB,
+    username_override: String,
+) -> error::Result<ApiAuthed> {
+    let permissioned_as = username_to_permissioned_as(username.as_str());
+    let authed =
+        fetch_authed_from_permissioned_as(permissioned_as, email.clone(), w_id, db).await?;
+    Ok(ApiAuthed {
+        username: username,
+        email: email,
+        is_admin: authed.is_admin,
+        is_operator: authed.is_operator,
+        groups: authed.groups,
+        folders: authed.folders,
+        scopes: authed.scopes,
+        username_override: Some(username_override),
+    })
+}
+
+#[derive(FromRow, Serialize)]
+pub struct User {
+    pub workspace_id: String,
+    pub email: String,
+    pub username: String,
+    pub is_admin: bool,
+    pub created_at: chrono::DateTime<chrono::Utc>,
+    pub operator: bool,
+    pub disabled: bool,
+    pub role: Option<String>,
+}
+
+#[derive(Serialize)]
+pub struct UserWithUsage {
+    pub email: String,
+    pub executions: Option<i64>,
+}
+
+#[derive(FromRow, Serialize, Debug)]
+pub struct GlobalUserInfo {
+    email: String,
+    login_type: Option<String>,
+    super_admin: bool,
+    verified: bool,
+    name: Option<String>,
+    company: Option<String>,
+    username: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    operator_only: Option<bool>,
+}
+
+#[derive(Serialize, Debug)]
+pub struct UserInfo {
+    pub workspace_id: String,
+    pub email: String,
+    pub username: String,
+    pub is_admin: bool,
+    pub is_super_admin: bool,
+    pub created_at: chrono::DateTime<chrono::Utc>,
+    pub groups: Vec<String>,
+    pub operator: bool,
+    pub disabled: bool,
+    pub role: Option<String>,
+    pub folders_read: Vec<String>,
+    pub folders: Vec<String>,
+    pub folders_owners: Vec<String>,
+}
+
+#[derive(FromRow, Serialize)]
+pub struct WorkspaceInvite {
+    pub workspace_id: String,
+    pub email: String,
+    pub is_admin: bool,
+    pub operator: bool,
+}
+
+#[allow(dead_code)]
+#[derive(Deserialize)]
+pub struct NewUser {
+    pub email: String,
+    pub password: String,
+    pub super_admin: bool,
+    pub name: Option<String>,
+    pub company: Option<String>,
+}
+
+#[derive(Deserialize)]
+pub struct AcceptInvite {
+    pub workspace_id: String,
+    pub username: Option<String>,
+}
+
+#[derive(Deserialize)]
+pub struct DeclineInvite {
+    pub workspace_id: String,
+}
+
+#[derive(Deserialize)]
+pub struct EditUser {
+    pub is_super_admin: Option<bool>,
+    pub name: Option<String>,
+}
+
+#[derive(Deserialize)]
+pub struct EditWorkspaceUser {
+    pub is_admin: Option<bool>,
+    pub operator: Option<bool>,
+    pub disabled: Option<bool>,
+}
+
+#[allow(dead_code)]
+#[derive(Deserialize)]
+pub struct EditPassword {
+    pub password: String,
+}
+
+#[derive(FromRow, Serialize)]
+pub struct TruncatedToken {
+    pub label: Option<String>,
+    pub token_prefix: Option<String>,
+    pub expiration: Option<chrono::DateTime<chrono::Utc>>,
+    pub created_at: chrono::DateTime<chrono::Utc>,
+    pub last_used_at: chrono::DateTime<chrono::Utc>,
+    pub scopes: Option<Vec<String>>,
+}
+
+#[derive(Deserialize)]
+pub struct NewToken {
+    pub label: Option<String>,
+    pub expiration: Option<chrono::DateTime<chrono::Utc>>,
+    pub impersonate_email: Option<String>,
+    pub scopes: Option<Vec<String>>,
+    pub workspace_id: Option<String>,
+}
+
+#[derive(Deserialize)]
+pub struct Login {
+    pub email: String,
+    pub password: String,
+}
+
+lazy_static::lazy_static! {
+    static ref FIRST_TIME_SETUP: Arc<AtomicBool> = Arc::new(AtomicBool::new(true));
+}
+
+pub async fn is_first_time_setup(Extension(db): Extension<DB>) -> JsonResult<bool> {
+    if !FIRST_TIME_SETUP.load(std::sync::atomic::Ordering::Relaxed) {
+        return Ok(Json(false));
+    }
+    let single_user = sqlx::query_scalar!("SELECT 1 FROM password LIMIT 2")
+        .fetch_all(&db)
+        .await
+        .ok()
+        .unwrap_or_default()
+        .len()
+        == 1;
+    if single_user {
+        let user_is_admin_and_password_changeme = sqlx::query_scalar!(
+            "SELECT 1 FROM password WHERE email = 'admin@windmill.dev' AND password_hash = '$argon2id$v=19$m=4096,t=3,p=1$oLJo/lPn/gezXCuFOEyaNw$i0T2tCkw3xUFsrBIKZwr8jVNHlIfoxQe+HfDnLtd12I'"
+        ).fetch_all(&db)
+        .await
+        .ok()
+        .unwrap_or_default()
+        .len() == 1;
+        if user_is_admin_and_password_changeme {
+            let base_url_is_not_set =
+                sqlx::query_scalar!("SELECT COUNT(*) FROM global_settings WHERE name = 'base_url'")
+                    .fetch_optional(&db)
+                    .await
+                    .ok()
+                    .flatten()
+                    .flatten()
+                    .unwrap_or(0)
+                    == 0;
+            if base_url_is_not_set {
+                return Ok(Json(true));
+            }
+        }
+    }
+    FIRST_TIME_SETUP.store(false, std::sync::atomic::Ordering::Relaxed);
+    Ok(Json(false))
+}
+
+#[derive(Deserialize)]
+struct WorkspaceUsername {
+    pub username: String,
+}
+
+async fn exists_username(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path(w_id): Path<String>,
+    Json(WorkspaceUsername { username }): Json<WorkspaceUsername>,
+) -> JsonResult<bool> {
+    let mut tx = user_db.begin(&authed).await?;
+    let exists = sqlx::query_scalar!(
+        "SELECT EXISTS(SELECT 1 FROM usr WHERE workspace_id = $1 AND username = $2)",
+        &w_id,
+        &username
+    )
+    .fetch_one(&mut *tx)
+    .await?
+    .unwrap_or(false);
+    tx.commit().await?;
+    Ok(Json(exists))
+}
+
+async fn list_users(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path(w_id): Path<String>,
+) -> JsonResult<Vec<User>> {
+    if *CLOUD_HOSTED && w_id == "demo" {
+        require_admin(authed.is_admin, &authed.username)?;
+    }
+    let mut tx = user_db.begin(&authed).await?;
+    let rows = sqlx::query_as!(
+        User,
+        "
+        SELECT *
+          FROM usr
+         WHERE workspace_id = $1
+         ",
+        w_id
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+    tx.commit().await?;
+    Ok(Json(rows))
+}
+
+async fn list_user_usage(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path(w_id): Path<String>,
+) -> JsonResult<Vec<UserWithUsage>> {
+    if *CLOUD_HOSTED && w_id == "demo" {
+        require_admin(authed.is_admin, &authed.username)?;
+    }
+    let mut tx = user_db.begin(&authed).await?;
+    let rows = sqlx::query_as!(
+        UserWithUsage,
+        "
+    SELECT usr.email, usage.executions
+        FROM usr
+            , LATERAL (
+            SELECT COALESCE(SUM(duration_ms + 1000)/1000 , 0)::BIGINT executions
+                FROM completed_job
+                WHERE workspace_id = $1
+                AND job_kind NOT IN ('flow', 'flowpreview')
+                AND email = usr.email
+                AND now() - '1 week'::interval < created_at 
+            ) usage
+        WHERE workspace_id = $1
+        ",
+        w_id
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+    tx.commit().await?;
+    Ok(Json(rows))
+}
+
+#[derive(Deserialize)]
+struct ActiveUsersOnly {
+    active_only: Option<bool>,
+}
+
+async fn list_users_as_super_admin(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Query(pagination): Query<Pagination>,
+    Query(ActiveUsersOnly { active_only }): Query<ActiveUsersOnly>,
+) -> JsonResult<Vec<GlobalUserInfo>> {
+    require_super_admin(&db, &authed.email).await?;
+    let per_page = pagination.per_page.unwrap_or(10000).max(1);
+    let offset = (pagination.page.unwrap_or(1).max(1) - 1) * per_page;
+
+    let rows = if active_only.is_some_and(|x| x) {
+        sqlx::query_as!(
+            GlobalUserInfo,
+            "WITH active_users AS (SELECT distinct username as email FROM audit WHERE timestamp > NOW() - INTERVAL '1 month' AND (operation = 'users.login' OR operation = 'oauth.login')),
+            authors as (SELECT distinct email FROM usr WHERE usr.operator IS false)
+            SELECT email, email NOT IN (SELECT email FROM authors) as operator_only, login_type::text, verified, super_admin, name, company, username
+            FROM password
+            WHERE email IN (SELECT email FROM active_users)
+            ORDER BY super_admin DESC
+            LIMIT $1 OFFSET $2",
+            per_page as i32,
+            offset as i32
+        )
+        .fetch_all(&db)
+        .await?
+    } else {
+        sqlx::query_as!(
+            GlobalUserInfo,
+            "SELECT email, login_type::text, verified, super_admin, name, company, username, NULL::bool as operator_only FROM password ORDER BY super_admin DESC, email LIMIT \
+            $1 OFFSET $2",
+            per_page as i32,
+            offset as i32
+        )
+        .fetch_all(&db)
+        .await?
+    };
+
+    Ok(Json(rows))
+}
+
+#[derive(Serialize, Deserialize)]
+struct Progress {
+    progress: u64,
+}
+async fn get_tutorial_progress(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+) -> JsonResult<Progress> {
+    let res = sqlx::query_scalar!(
+        "SELECT progress::bigint FROM tutorial_progress WHERE email = $1",
+        authed.email
+    )
+    .fetch_optional(&db)
+    .await?
+    .flatten()
+    .unwrap_or_default() as u64;
+    Ok(Json(Progress { progress: res }))
+}
+
+async fn update_tutorial_progress(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Json(progress): Json<Progress>,
+) -> Result<String> {
+    sqlx::query_scalar!(
+        "INSERT INTO tutorial_progress VALUES ($2, $1::bigint::bit(64)) ON CONFLICT (email) DO UPDATE SET progress = $1::bigint::bit(64)",
+        progress.progress as i64,
+        authed.email
+    )
+    .execute(&db)
+    .await?;
+    Ok("tutorial progress updated".to_string())
+}
+
+async fn list_usernames(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path(w_id): Path<String>,
+) -> JsonResult<Vec<String>> {
+    if *CLOUD_HOSTED && w_id == "demo" {
+        return Ok(Json(vec![
+            authed.username,
+            "other_usernames_redacted_in_demo_workspace".to_string(),
+        ]));
+    }
+    let mut tx = user_db.begin(&authed).await?;
+    let rows = sqlx::query_scalar!("SELECT username from usr WHERE workspace_id = $1", &w_id)
+        .fetch_all(&mut *tx)
+        .await?;
+    tx.commit().await?;
+    Ok(Json(rows))
+}
+
+async fn list_invites(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+) -> JsonResult<Vec<WorkspaceInvite>> {
+    let mut tx = db.begin().await?;
+    let rows = sqlx::query_as!(
+        WorkspaceInvite,
+        "SELECT * from workspace_invite WHERE email = $1",
+        authed.email
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+    tx.commit().await?;
+    Ok(Json(rows))
+}
+
+#[derive(Deserialize)]
+struct LogoutQuery {
+    rd: Option<String>,
+}
+async fn logout(
+    Tokened { token }: Tokened,
+    cookies: Cookies,
+    Extension(db): Extension<DB>,
+    Query(LogoutQuery { rd }): Query<LogoutQuery>,
+) -> Result<Response> {
+    let mut cookie = Cookie::new(COOKIE_NAME, "");
+    cookie.set_path(COOKIE_PATH);
+    if COOKIE_DOMAIN.is_some() {
+        cookie.set_domain(COOKIE_DOMAIN.clone().unwrap());
+    }
+    cookies.remove(cookie);
+    let mut tx = db.begin().await?;
+    let email = sqlx::query_scalar!("DELETE FROM token WHERE token = $1 RETURNING email", token)
+        .fetch_optional(&mut *tx)
+        .await?;
+    if let Some(email) = email {
+        let email = email.unwrap_or("noemail".to_string());
+        audit_log(
+            &mut *tx,
+            &AuditAuthor { email: email.clone(), username: email, username_override: None },
+            "users.logout",
+            ActionKind::Delete,
+            "global",
+            Some(&truncate_token(&token)),
+            None,
+        )
+        .await?;
+    }
+    tx.commit().await?;
+    if let Some(rd) = rd {
+        Ok((StatusCode::TEMPORARY_REDIRECT, [(LOCATION, rd)]).into_response())
+    } else {
+        Ok((StatusCode::OK, "logged out successfully".to_string()).into_response())
+    }
+}
+
+async fn whoami(
+    Extension(db): Extension<DB>,
+    Path(w_id): Path<String>,
+    ApiAuthed { username, email, is_admin, groups, folders, .. }: ApiAuthed,
+) -> JsonResult<UserInfo> {
+    let user = get_user(&w_id, &username, &db).await?;
+    if let Some(user) = user {
+        Ok(Json(user))
+    } else {
+        Ok(Json(UserInfo {
+            workspace_id: w_id,
+            email: email.clone(),
+            username: email,
+            is_admin,
+            is_super_admin: is_admin,
+            created_at: chrono::Utc::now(),
+            groups: groups,
+            operator: false,
+            disabled: false,
+            role: Some("superadmin".to_string()),
+            folders_read: folders.clone().into_iter().map(|x| x.0).collect(),
+            folders: folders
+                .clone()
+                .into_iter()
+                .filter_map(|x| if x.1 { Some(x.0) } else { None })
+                .collect(),
+            folders_owners: folders
+                .into_iter()
+                .filter_map(|x| if x.2 { Some(x.0) } else { None })
+                .collect(),
+        }))
+    }
+}
+
+async fn global_whoami(
+    Extension(db): Extension<DB>,
+    ApiAuthed { email, .. }: ApiAuthed,
+    Tokened { token }: Tokened,
+) -> JsonResult<GlobalUserInfo> {
+    let user = sqlx::query_as!(
+        GlobalUserInfo,
+        "SELECT email, login_type::TEXT, super_admin, verified, name, company, username, NULL::bool as operator_only FROM password WHERE \
+         email = $1",
+        email
+    )
+    .fetch_one(&db)
+    .await
+    .map_err(|e| Error::InternalErr(format!("fetching global identity: {e:#}")));
+
+    if let Ok(user) = user {
+        Ok(Json(user))
+    } else if std::env::var("SUPERADMIN_SECRET").ok() == Some(token) {
+        Ok(Json(GlobalUserInfo {
+            email: email.clone(),
+            login_type: Some("superadmin_secret".to_string()),
+            super_admin: true,
+            verified: true,
+            name: None,
+            company: None,
+            username: None,
+            operator_only: None,
+        }))
+    } else {
+        Err(user.unwrap_err())
+    }
+}
+
+async fn exists_email(Extension(db): Extension<DB>, Path(email): Path<String>) -> JsonResult<bool> {
+    let exists = sqlx::query_scalar!(
+        "SELECT EXISTS(SELECT 1 FROM password WHERE email = $1)",
+        email
+    )
+    .fetch_one(&db)
+    .await?
+    .unwrap_or(false);
+    Ok(Json(exists))
+}
+
+async fn get_email(ApiAuthed { email, .. }: ApiAuthed) -> Result<String> {
+    Ok(email)
+}
+
+async fn get_usage(
+    Extension(db): Extension<DB>,
+    ApiAuthed { email, .. }: ApiAuthed,
+) -> Result<String> {
+    let usage = sqlx::query_scalar!(
+        "
+    SELECT usage.usage FROM usage 
+    WHERE is_workspace = false 
+    AND month_ = EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date)
+    AND id = $1",
+        email
+    )
+    .fetch_optional(&db)
+    .await?
+    .unwrap_or(0);
+    Ok(usage.to_string())
+}
+
+async fn get_user(w_id: &str, username: &str, db: &DB) -> Result<Option<UserInfo>> {
+    let user = sqlx::query_as!(
+        User,
+        "SELECT * FROM usr where username = $1 AND workspace_id = $2",
+        username,
+        w_id
+    )
+    .fetch_optional(db)
+    .await?;
+    let is_super_admin = sqlx::query_scalar!(
+        "SELECT super_admin FROM password WHERE email = $1",
+        user.as_ref().map(|x| &x.email)
+    )
+    .fetch_optional(db)
+    .await?
+    .unwrap_or(false);
+    let groups = get_groups_for_user(
+        &w_id,
+        username,
+        &user
+            .as_ref()
+            .map(|x| x.email.to_string())
+            .unwrap_or_else(|| "".to_string()),
+        db,
+    )
+    .await?;
+    let folders = get_folders_for_user(&w_id, username, &groups, db).await?;
+
+    Ok(user.map(|usr| UserInfo {
+        groups,
+        workspace_id: usr.workspace_id,
+        email: usr.email,
+        username: usr.username,
+        is_admin: usr.is_admin,
+        is_super_admin,
+        created_at: usr.created_at,
+        operator: usr.operator,
+        disabled: usr.disabled,
+        role: usr.role,
+        folders_read: folders.clone().into_iter().map(|x| x.0).collect(),
+        folders: folders
+            .clone()
+            .into_iter()
+            .filter_map(|x| if x.1 { Some(x.0) } else { None })
+            .collect(),
+        folders_owners: folders
+            .into_iter()
+            .filter_map(|x| if x.2 { Some(x.0) } else { None })
+            .collect(),
+    }))
+}
+
+pub async fn is_owner_of_path(
+    authed: ApiAuthed,
+    Path((_w_id, path)): Path<(String, StripPath)>,
+) -> JsonResult<bool> {
+    let path = path.to_path();
+    if authed.is_admin {
+        Ok(Json(true))
+    } else {
+        Ok(Json(require_owner_of_path(&authed, path).is_ok()))
+    }
+}
+
+pub fn require_owner_of_path(authed: &ApiAuthed, path: &str) -> Result<()> {
+    if authed.is_admin {
+        return Ok(());
+    }
+    if !path.is_empty() {
+        let splitted = path.split("/").collect::<Vec<&str>>();
+        if splitted[0] == "u" {
+            if splitted[1] == authed.username {
+                Ok(())
+            } else {
+                Err(Error::BadRequest(format!(
+                    "only the owner {} is authorized to perform this operation",
+                    splitted[1]
+                )))
+            }
+        } else if splitted[0] == "f" {
+            crate::folders::require_is_owner(authed, splitted[1])
+        } else {
+            Err(Error::BadRequest(format!(
+                "Not recognized path kind: {}",
+                path
+            )))
+        }
+    } else {
+        Err(Error::BadRequest(format!(
+            "Cannot be owner of an empty path"
+        )))
+    }
+}
+
+pub fn get_perm_in_extra_perms_for_authed(
+    v: serde_json::Value,
+    authed: &ApiAuthed,
+) -> Option<bool> {
+    match v {
+        serde_json::Value::Object(obj) => {
+            let mut keys = vec![format!("u/{}", authed.username)];
+            for g in authed.groups.iter() {
+                keys.push(format!("g/{}", g));
+            }
+            let mut res = None;
+            for k in keys {
+                if let Some(v) = obj.get(&k) {
+                    if let Some(v) = v.as_bool() {
+                        if v {
+                            return Some(true);
+                        }
+                        res = Some(v);
+                    }
+                }
+            }
+            res
+        }
+        _ => None,
+    }
+}
+
+pub async fn require_is_writer(
+    authed: &ApiAuthed,
+    path: &str,
+    w_id: &str,
+    db: DB,
+    query: &str,
+    kind: &str,
+) -> Result<()> {
+    if authed.is_admin {
+        return Ok(());
+    }
+    if !path.is_empty() {
+        if require_owner_of_path(authed, path).is_ok() {
+            return Ok(());
+        }
+        if path.starts_with("f/") && path.split('/').count() >= 2 {
+            let folder = path.split('/').nth(1).unwrap();
+            let extra_perms = sqlx::query_scalar!(
+                "SELECT extra_perms FROM folder WHERE name = $1 AND workspace_id = $2",
+                folder,
+                w_id
+            )
+            .fetch_optional(&db)
+            .await?;
+            if let Some(perms) = extra_perms {
+                let is_folder_writer =
+                    get_perm_in_extra_perms_for_authed(perms, authed).unwrap_or(false);
+                if is_folder_writer {
+                    return Ok(());
+                }
+            }
+        }
+        let extra_perms = sqlx::query_scalar(query)
+            .bind(path)
+            .bind(w_id)
+            .fetch_optional(&db)
+            .await?;
+        if let Some(perms) = extra_perms {
+            let perm = get_perm_in_extra_perms_for_authed(perms, authed);
+            match perm {
+                Some(true) => Ok(()),
+                Some(false) => Err(Error::BadRequest(format!(
+                    "User {} is not a writer of {kind} path {path}",
+                    authed.username
+                ))),
+                None => Err(Error::BadRequest(format!(
+                    "User {} has neither read or write permission on {kind} {path}",
+                    authed.username
+                ))),
+            }
+        } else {
+            Err(Error::BadRequest(format!(
+                "{path} does not exist yet and user {} is not an owner of the parent folder",
+                authed.username
+            )))
+        }
+    } else {
+        Err(Error::BadRequest(format!(
+            "Cannot be writer of an empty path"
+        )))
+    }
+}
+async fn whois(
+    Extension(db): Extension<DB>,
+    Path((w_id, username)): Path<(String, String)>,
+) -> JsonResult<UserInfo> {
+    let user_o = get_user(&w_id, &username, &db).await?;
+    let user = not_found_if_none(user_o, "User", username)?;
+    Ok(Json(user))
+}
+
+// async fn create_invite_code(
+//     ApiAuthed { email, .. }: ApiAuthed,
+//     Extension(db): Extension<DB>,
+//     Json(nu): Json<NewInviteCode>,
+// ) -> Result<(StatusCode, String)> {
+
+//     let mut tx = db.begin().await?;
+//     require_super_admin(&mut tx, email).await?;
+
+//     sqlx::query!(
+//         "INSERT INTO invite_code
+//             (code, seats_left)
+//             VALUES ($1, $2)",
+//         nu.code,
+//         nu.seats
+//     )
+//     .execute(&mut tx)
+//     .await?;
+
+//     tx.commit().await?;
+
+//     Ok((
+//         StatusCode::CREATED,
+//         format!("new invite code {}", nu.code),
+//     ))
+// }
+
+async fn decline_invite(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Json(nu): Json<DeclineInvite>,
+) -> Result<(StatusCode, String)> {
+    let mut tx = db.begin().await?;
+
+    let is_admin = sqlx::query_scalar!(
+        "DELETE FROM workspace_invite WHERE workspace_id = $1 AND email = $2 RETURNING is_admin",
+        nu.workspace_id,
+        authed.email,
+    )
+    .fetch_optional(&mut *tx)
+    .await?;
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "users.decline_invite",
+        ActionKind::Delete,
+        &nu.workspace_id,
+        Some(&authed.email),
+        None,
+    )
+    .await?;
+    tx.commit().await?;
+
+    if is_admin.is_some() {
+        Ok((
+            StatusCode::OK,
+            format!(
+                "user {} declined invite to workspace {}",
+                &authed.email, nu.workspace_id
+            ),
+        ))
+    } else {
+        Err(Error::NotFound(format!(
+            "invite for {} not found",
+            authed.email
+        )))
+    }
+}
+
+lazy_static! {
+    pub static ref VALID_USERNAME: Regex = Regex::new(r#"^[a-zA-Z][a-zA-Z_0-9]*$"#).unwrap();
+}
+
+async fn accept_invite(
+    authed: ApiAuthed,
+    Extension(webhook): Extension<WebhookShared>,
+    Extension(db): Extension<DB>,
+    Extension(rsmq): Extension<Option<rsmq_async::MultiplexedRsmq>>,
+    Json(nu): Json<AcceptInvite>,
+) -> Result<(StatusCode, String)> {
+    let mut tx = db.begin().await?;
+
+    let r = sqlx::query!(
+        "DELETE FROM workspace_invite WHERE workspace_id = $1 AND email = $2 RETURNING is_admin, operator",
+        nu.workspace_id,
+        authed.email,
+    )
+    .fetch_optional(&mut *tx)
+    .await?;
+
+    if let Some(r) = r {
+        let already_in_workspace = sqlx::query_scalar!(
+            "SELECT EXISTS(SELECT 1 FROM usr WHERE workspace_id = $1 AND email = $2)",
+            &nu.workspace_id,
+            &authed.email,
+        )
+        .fetch_one(&mut *tx)
+        .await?
+        .unwrap_or(false);
+
+        if already_in_workspace {
+            tx.commit().await?;
+            return Ok((
+                StatusCode::CREATED,
+                format!(
+                    "user {} accepted invite to workspace {}",
+                    &authed.email, nu.workspace_id
+                ),
+            ));
+        }
+        let username;
+        (tx, username) = join_workspace(
+            &nu.workspace_id,
+            &authed,
+            nu.username,
+            r.is_admin,
+            r.operator,
+            tx,
+        )
+        .await?;
+
+        audit_log(
+            &mut *tx,
+            &ApiAuthed { username: username.clone(), ..authed.clone() },
+            "users.accept_invite",
+            ActionKind::Create,
+            &nu.workspace_id,
+            Some(&authed.email),
+            None,
+        )
+        .await?;
+        tx.commit().await?;
+
+        handle_deployment_metadata(
+            &authed.email,
+            &username,
+            &db,
+            &nu.workspace_id,
+            windmill_git_sync::DeployedObject::User { email: authed.email.clone() },
+            Some(format!("User '{}' accepted invite", &authed.email)),
+            rsmq,
+            true,
+        )
+        .await?;
+        webhook.send_instance_event(InstanceEvent::UserJoinedWorkspace {
+            email: authed.email.clone(),
+            workspace: nu.workspace_id.clone(),
+            username: username,
+        });
+        Ok((
+            StatusCode::CREATED,
+            format!(
+                "user {} accepted invite to workspace {}",
+                &authed.email, nu.workspace_id
+            ),
+        ))
+    } else {
+        Err(Error::NotFound(format!(
+            "invite for {} not found",
+            authed.email
+        )))
+    }
+}
+
+async fn join_workspace<'c>(
+    w_id: &str,
+    authed: &ApiAuthed,
+    username: Option<String>,
+    is_admin: bool,
+    operator: bool,
+    mut tx: sqlx::Transaction<'c, sqlx::Postgres>,
+) -> error::Result<(sqlx::Transaction<'c, sqlx::Postgres>, String)> {
+    let automate_username_creation = sqlx::query_scalar!(
+        "SELECT value FROM global_settings WHERE name = $1",
+        AUTOMATE_USERNAME_CREATION_SETTING,
+    )
+    .fetch_optional(&mut *tx)
+    .await?
+    .map(|v| v.as_bool())
+    .flatten()
+    .unwrap_or(false);
+
+    let username = if automate_username_creation {
+        if username.is_some() && username.unwrap().len() > 0 {
+            return Err(Error::BadRequest(
+                "username is not allowed when username creation is automated".to_string(),
+            ));
+        }
+        get_instance_username_or_create_pending(&mut tx, &authed.email).await?
+    } else {
+        let username = username.ok_or(Error::BadRequest("username is required".to_string()))?;
+        let already_exists_username = sqlx::query_scalar!(
+            "SELECT EXISTS(SELECT 1 FROM usr WHERE workspace_id = $1 AND username = $2)",
+            &w_id,
+            username,
+        )
+        .fetch_one(&mut *tx)
+        .await?
+        .unwrap_or(false);
+
+        if already_exists_username {
+            return Err(Error::BadRequest(format!(
+                "user with username {} already exists in workspace {}",
+                username, w_id
+            )));
+        }
+
+        if !VALID_USERNAME.is_match(&username) {
+            return Err(windmill_common::error::Error::BadRequest(format!(
+                "Usermame can only contain alphanumeric characters and underscores and must start with a letter"
+            )));
+        }
+        username.to_string()
+    };
+
+    let already_exists_email = sqlx::query_scalar!(
+        "SELECT EXISTS(SELECT 1 FROM usr WHERE workspace_id = $1 AND email = $2)",
+        &w_id,
+        authed.email,
+    )
+    .fetch_one(&mut *tx)
+    .await?
+    .unwrap_or(false);
+
+    if already_exists_email {
+        return Err(Error::BadRequest(format!(
+            "user with email {} already exists in workspace {}",
+            authed.email, w_id
+        )));
+    }
+
+    sqlx::query!(
+        "INSERT INTO usr
+            (workspace_id, email, username, is_admin, operator)
+            VALUES ($1, $2, $3, $4, $5)",
+        &w_id,
+        authed.email,
+        username,
+        is_admin,
+        operator
+    )
+    .execute(&mut *tx)
+    .await?;
+    sqlx::query_as!(
+        Group,
+        "INSERT INTO usr_to_group (workspace_id, usr, group_) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING",
+        &w_id,
+        username,
+        "all",
+    )
+    .execute(&mut *tx)
+    .await?;
+    audit_log(
+        &mut *tx,
+        &AuditAuthor { username: username.clone(), ..authed.into() },
+        "users.add_to_workspace",
+        ActionKind::Create,
+        &w_id,
+        Some(&authed.email),
+        None,
+    )
+    .await?;
+    Ok((tx, username))
+}
+
+async fn leave_instance(Extension(db): Extension<DB>, authed: ApiAuthed) -> Result<String> {
+    let mut tx = db.begin().await?;
+    sqlx::query!("DELETE FROM password WHERE email = $1", &authed.email)
+        .execute(&mut *tx)
+        .await?;
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "workspaces.leave",
+        ActionKind::Delete,
+        "global",
+        Some(&authed.email),
+        None,
+    )
+    .await?;
+    tx.commit().await?;
+
+    Ok(format!("Left instance",))
+}
+
+async fn get_workspace_user(
+    ApiAuthed { username, is_admin, .. }: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path((w_id, username_to_update)): Path<(String, String)>,
+) -> Result<Json<User>> {
+    require_admin(is_admin, &username)?;
+
+    let user = sqlx::query_as!(
+        User,
+        "SELECT * FROM usr WHERE username = $1 AND workspace_id = $2",
+        &username_to_update,
+        &w_id
+    )
+    .fetch_optional(&db)
+    .await?;
+
+    let user = not_found_if_none(user, "User", username_to_update)?;
+
+    Ok(Json(user))
+}
+
+async fn update_workspace_user(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Extension(rsmq): Extension<Option<rsmq_async::MultiplexedRsmq>>,
+    Path((w_id, username_to_update)): Path<(String, String)>,
+    Json(eu): Json<EditWorkspaceUser>,
+) -> Result<String> {
+    let mut tx = db.begin().await?;
+
+    require_admin(authed.is_admin, &authed.username)?;
+
+    if let Some(a) = eu.is_admin {
+        sqlx::query_scalar!(
+            "UPDATE usr SET is_admin = $1 WHERE username = $2 AND workspace_id = $3",
+            a,
+            &username_to_update,
+            &w_id
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+
+    if let Some(a) = eu.operator {
+        sqlx::query_scalar!(
+            "UPDATE usr SET operator = $1 WHERE username = $2 AND workspace_id = $3",
+            a,
+            &username_to_update,
+            &w_id
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+
+    if let Some(a) = eu.disabled {
+        sqlx::query_scalar!(
+            "UPDATE usr SET disabled = $1 WHERE username = $2 AND workspace_id = $3",
+            a,
+            &username_to_update,
+            &w_id
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "users.update",
+        ActionKind::Update,
+        &w_id,
+        Some(&username_to_update),
+        None,
+    )
+    .await?;
+
+    let user_email = sqlx::query_scalar!(
+        "SELECT email FROM usr WHERE username = $1 AND workspace_id = $2",
+        &username_to_update,
+        &w_id
+    )
+    .fetch_one(&mut *tx)
+    .await?;
+
+    tx.commit().await?;
+
+    handle_deployment_metadata(
+        &authed.email,
+        &authed.username,
+        &db,
+        &w_id,
+        windmill_git_sync::DeployedObject::User { email: user_email.clone() },
+        Some(format!("Updated user '{}'", &user_email)),
+        rsmq,
+        true,
+    )
+    .await?;
+
+    Ok(format!("user {} updated", user_email))
+}
+
+async fn update_user(
+    authed: ApiAuthed,
+    Path(email_to_update): Path<String>,
+    Extension(db): Extension<DB>,
+    Json(eu): Json<EditUser>,
+) -> Result<String> {
+    require_super_admin(&db, &authed.email).await?;
+    let mut tx = db.begin().await?;
+
+    if let Some(sa) = eu.is_super_admin {
+        sqlx::query_scalar!(
+            "UPDATE password SET super_admin = $1 WHERE email = $2",
+            sa,
+            &email_to_update
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+
+    if let Some(n) = eu.name {
+        sqlx::query_scalar!(
+            "UPDATE password SET name = $1 WHERE email = $2",
+            n,
+            &email_to_update
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "users.update",
+        ActionKind::Update,
+        "global",
+        Some(&email_to_update),
+        None,
+    )
+    .await?;
+    tx.commit().await?;
+    Ok(format!("email {} updated", &email_to_update))
+}
+
+async fn delete_user(
+    authed: ApiAuthed,
+    Path(email_to_delete): Path<String>,
+    Extension(db): Extension<DB>,
+) -> Result<String> {
+    require_super_admin(&db, &authed.email).await?;
+    let mut tx = db.begin().await?;
+
+    sqlx::query!("DELETE FROM password WHERE email = $1", &email_to_delete)
+        .execute(&mut *tx)
+        .await?;
+
+    let usernames = sqlx::query_scalar!(
+        "DELETE FROM usr WHERE email = $1 RETURNING username",
+        &email_to_delete
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+
+    for username in usernames {
+        sqlx::query!("DELETE FROM password WHERE email = $1", &email_to_delete)
+            .execute(&mut *tx)
+            .await?;
+
+        sqlx::query!("DELETE FROM usr_to_group WHERE usr = $1", &username)
+            .execute(&mut *tx)
+            .await?;
+
+        sqlx::query!(
+            "DELETE FROM workspace_invite WHERE email = $1",
+            &email_to_delete
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+    audit_log(
+        &mut *tx,
+        &authed,
+        "users.delete",
+        ActionKind::Delete,
+        "global",
+        Some(&email_to_delete),
+        None,
+    )
+    .await?;
+    tx.commit().await?;
+    Ok(format!("email {} deleted", &email_to_delete))
+}
+
+lazy_static::lazy_static! {
+    pub static ref NEW_USER_WEBHOOK: Option<String> = std::env::var("NEW_USER_WEBHOOK").ok();
+
+}
+
+async fn create_user(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Extension(webhook): Extension<WebhookShared>,
+    Extension(argon2): Extension<Arc<Argon2<'_>>>,
+    Extension(rsmq): Extension<Option<rsmq_async::MultiplexedRsmq>>,
+    Json(nu): Json<NewUser>,
+) -> Result<(StatusCode, String)> {
+    crate::users_ee::create_user(authed, db, webhook, argon2, rsmq, nu).await
+}
+
+async fn delete_workspace_user(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Extension(rsmq): Extension<Option<rsmq_async::MultiplexedRsmq>>,
+    Path((w_id, username_to_delete)): Path<(String, String)>,
+) -> Result<String> {
+    let mut tx = db.begin().await?;
+
+    require_admin(authed.is_admin, &authed.username)?;
+
+    let email_to_delete_o = sqlx::query_scalar!(
+        "SELECT email FROM usr where username = $1 AND workspace_id = $2",
+        username_to_delete,
+        &w_id,
+    )
+    .fetch_optional(&db)
+    .await?;
+
+    let email_to_delete = not_found_if_none(email_to_delete_o, "User", &username_to_delete)?;
+
+    sqlx::query_scalar!(
+        "DELETE FROM usr WHERE email = $1 AND workspace_id = $2",
+        email_to_delete,
+        &w_id
+    )
+    .execute(&mut *tx)
+    .await?;
+
+    sqlx::query!(
+        "DELETE FROM usr_to_group WHERE usr = $1 AND workspace_id = $2",
+        &username_to_delete,
+        &w_id
+    )
+    .execute(&mut *tx)
+    .await?;
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "users.delete",
+        ActionKind::Delete,
+        &w_id,
+        Some(&username_to_delete),
+        None,
+    )
+    .await?;
+    tx.commit().await?;
+
+    handle_deployment_metadata(
+        &authed.email,
+        &authed.username,
+        &db,
+        &w_id,
+        windmill_git_sync::DeployedObject::User { email: email_to_delete.clone() },
+        Some(format!(
+            "Removed user '{}' from workspace",
+            &email_to_delete
+        )),
+        rsmq,
+        true,
+    )
+    .await?;
+
+    Ok(format!("username {} deleted", username_to_delete))
+}
+
+async fn set_password(
+    Extension(db): Extension<DB>,
+    Extension(argon2): Extension<Arc<Argon2<'_>>>,
+    authed: ApiAuthed,
+    Json(ep): Json<EditPassword>,
+) -> Result<String> {
+    crate::users_ee::set_password(db, argon2, authed, ep).await
+}
+
+async fn login(
+    cookies: Cookies,
+    Extension(db): Extension<DB>,
+    Extension(argon2): Extension<Arc<Argon2<'_>>>,
+    Json(Login { email, password }): Json<Login>,
+) -> Result<String> {
+    let mut tx = db.begin().await?;
+    let email = email.to_lowercase();
+    let audit_author =
+        AuditAuthor { email: email.clone(), username: email.clone(), username_override: None };
+    let email_w_h: Option<(String, String, bool, bool)> = sqlx::query_as(
+        "SELECT email, password_hash, super_admin, first_time_user FROM password WHERE email = $1 AND login_type = \
+         'password'",
+    )
+    .bind(&email)
+    .fetch_optional(&mut *tx)
+    .await?;
+
+    if let Some((email, hash, super_admin, first_time_user)) = email_w_h {
+        let parsed_hash =
+            PasswordHash::new(&hash).map_err(|e| Error::InternalErr(e.to_string()))?;
+        if argon2
+            .verify_password(password.as_bytes(), &parsed_hash)
+            .is_err()
+        {
+            audit_log(
+                &mut *tx,
+                &audit_author,
+                "users.login_failure",
+                ActionKind::Create,
+                "global",
+                None,
+                None,
+            )
+            .await?;
+            Err(Error::BadRequest("Invalid login".to_string()))
+        } else {
+            if first_time_user {
+                sqlx::query_scalar!(
+                    "UPDATE password SET first_time_user = false WHERE email = $1",
+                    &email
+                )
+                .execute(&mut *tx)
+                .await?;
+                let mut c = Cookie::new("first_time", "1");
+                if let Some(domain) = COOKIE_DOMAIN.as_ref() {
+                    c.set_domain(domain);
+                }
+                c.set_secure(false);
+                c.set_expires(time::OffsetDateTime::now_utc() + time::Duration::minutes(15));
+                c.set_http_only(false);
+                c.set_path("/");
+
+                cookies.add(c);
+            }
+
+            let token = create_session_token(&email, super_admin, &mut tx, cookies).await?;
+
+            audit_log(
+                &mut *tx,
+                &audit_author,
+                "users.login",
+                ActionKind::Create,
+                "global",
+                Some(&truncate_token(&token)),
+                None,
+            )
+            .await?;
+
+            tx.commit().await?;
+            Ok(token)
+        }
+    } else {
+        audit_log(
+            &mut *tx,
+            &audit_author,
+            "users.login_failure",
+            ActionKind::Create,
+            "global",
+            None,
+            None,
+        )
+        .await?;
+        Err(Error::BadRequest("Invalid login".to_string()))
+    }
+}
+
+async fn refresh_token(
+    Extension(db): Extension<DB>,
+    authed: ApiAuthed,
+    cookies: Cookies,
+) -> Result<String> {
+    let mut tx = db.begin().await?;
+
+    let super_admin = sqlx::query_scalar!(
+        "SELECT super_admin FROM password WHERE email = $1",
+        &authed.email
+    )
+    .fetch_optional(&mut *tx)
+    .await?
+    .unwrap_or(false);
+
+    let _ = create_session_token(&authed.email, super_admin, &mut tx, cookies).await?;
+
+    tx.commit().await?;
+    Ok("token refreshed".to_string())
+}
+
+pub async fn create_session_token<'c>(
+    email: &str,
+    super_admin: bool,
+    tx: &mut sqlx::Transaction<'c, sqlx::Postgres>,
+    cookies: Cookies,
+) -> Result<String> {
+    let token = rd_string(32);
+    sqlx::query!(
+        "INSERT INTO token
+            (token, email, label, expiration, super_admin)
+            VALUES ($1, $2, $3, now() + ($4 || ' hours')::interval, $5)",
+        token,
+        email,
+        "session",
+        TTL_TOKEN_DB_H.to_string(),
+        super_admin
+    )
+    .execute(&mut **tx)
+    .await?;
+    let mut cookie = Cookie::new(COOKIE_NAME, token.clone());
+    cookie.set_secure(IS_SECURE.read().await.clone());
+    cookie.set_same_site(Some(tower_cookies::cookie::SameSite::Lax));
+    cookie.set_http_only(true);
+    cookie.set_path(COOKIE_PATH);
+    if COOKIE_DOMAIN.is_some() {
+        cookie.set_domain(COOKIE_DOMAIN.clone().unwrap());
+    }
+    let mut expire: OffsetDateTime = time::OffsetDateTime::now_utc();
+    expire += time::Duration::days(3);
+    cookie.set_expires(expire);
+    cookies.add(cookie);
+    Ok(token)
+}
+
+async fn create_token(
+    Extension(db): Extension<DB>,
+    authed: ApiAuthed,
+    Json(new_token): Json<NewToken>,
+) -> Result<(StatusCode, String)> {
+    let token = rd_string(32);
+    let mut tx = db.begin().await?;
+
+    let is_super_admin = sqlx::query_scalar!(
+        "SELECT super_admin FROM password WHERE email = $1",
+        authed.email
+    )
+    .fetch_optional(&mut *tx)
+    .await?
+    .unwrap_or(false);
+    sqlx::query!(
+        "INSERT INTO token
+            (token, email, label, expiration, super_admin, scopes, workspace_id)
+            VALUES ($1, $2, $3, $4, $5, $6, $7)",
+        token,
+        authed.email,
+        new_token.label,
+        new_token.expiration,
+        is_super_admin,
+        new_token.scopes.as_ref().map(|x| x.as_slice()),
+        new_token.workspace_id,
+    )
+    .execute(&mut *tx)
+    .await?;
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "users.token.create",
+        ActionKind::Create,
+        &"global",
+        Some(&token[0..10]),
+        None,
+    )
+    .instrument(tracing::info_span!("token", email = &authed.email))
+    .await?;
+    tx.commit().await?;
+    Ok((StatusCode::CREATED, token))
+}
+
+async fn impersonate(
+    Extension(db): Extension<DB>,
+    authed: ApiAuthed,
+    Json(new_token): Json<NewToken>,
+) -> Result<(StatusCode, String)> {
+    let token = rd_string(32);
+    require_super_admin(&db, &authed.email).await?;
+
+    if new_token.impersonate_email.is_none() {
+        return Err(Error::BadRequest(
+            "impersonate_username is required".to_string(),
+        ));
+    }
+
+    let impersonated = new_token.impersonate_email.unwrap();
+
+    let is_super_admin = sqlx::query_scalar!(
+        "SELECT super_admin FROM password WHERE email = $1",
+        impersonated
+    )
+    .fetch_optional(&db)
+    .await?
+    .unwrap_or(false);
+    let mut tx = db.begin().await?;
+
+    sqlx::query!(
+        "INSERT INTO token
+            (token, email, label, expiration, super_admin)
+            VALUES ($1, $2, $3, $4, $5)",
+        token,
+        impersonated,
+        new_token.label,
+        new_token.expiration,
+        is_super_admin
+    )
+    .execute(&mut *tx)
+    .await?;
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "users.impersonate",
+        ActionKind::Delete,
+        &"global",
+        Some(&token[0..10]),
+        Some([("impersonated", &format!("{impersonated}")[..])].into()),
+    )
+    .instrument(tracing::info_span!("token", email = &impersonated))
+    .await?;
+    tx.commit().await?;
+    Ok((StatusCode::CREATED, token))
+}
+
+#[derive(Deserialize)]
+struct ListTokenQuery {
+    exclude_ephemeral: Option<bool>,
+}
+
+async fn list_tokens(
+    Extension(db): Extension<DB>,
+    ApiAuthed { email, .. }: ApiAuthed,
+    Query(query): Query<ListTokenQuery>,
+    Query(pagination): Query<Pagination>,
+) -> JsonResult<Vec<TruncatedToken>> {
+    let (per_page, offset) = paginate(pagination);
+    let rows = if query.exclude_ephemeral.unwrap_or(false) {
+        sqlx::query_as!(
+            TruncatedToken,
+            "SELECT label, concat(substring(token for 10)) as token_prefix, expiration, created_at, \
+             last_used_at, scopes FROM token WHERE email = $1 AND label != 'ephemeral-script'
+             ORDER BY created_at DESC LIMIT $2 OFFSET $3",
+            email,
+            per_page as i64,
+            offset as i64,
+        )
+        .fetch_all(&db)
+        .await?
+    } else {
+        sqlx::query_as!(
+            TruncatedToken,
+            "SELECT label, concat(substring(token for 10)) as token_prefix, expiration, created_at, \
+            last_used_at, scopes FROM token WHERE email = $1
+            ORDER BY created_at DESC LIMIT $2 OFFSET $3",
+            email,
+            per_page as i64,
+            offset as i64,
+        )
+        .fetch_all(&db)
+        .await?
+    };
+    Ok(Json(rows))
+}
+
+async fn delete_token(
+    Extension(db): Extension<DB>,
+    authed: ApiAuthed,
+    Path(token_prefix): Path<String>,
+) -> Result<String> {
+    let mut tx = db.begin().await?;
+
+    let tokens_deleted: Vec<String> = sqlx::query_scalar(
+        "DELETE FROM token
+               WHERE email = $1
+                 AND token LIKE concat($2::text, '%')
+           RETURNING concat(substring(token for 10), '*****')",
+    )
+    .bind(&authed.email)
+    .bind(&token_prefix)
+    .fetch_all(&mut *tx)
+    .await?;
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "users.token.delete",
+        ActionKind::Delete,
+        &"global",
+        Some(&token_prefix),
+        None,
+    )
+    .await?;
+    tx.commit().await?;
+
+    Ok(format!(
+        "deleted {} tokens {:?} with prefix {}",
+        tokens_deleted.len(),
+        tokens_deleted,
+        token_prefix
+    ))
+}
+
+async fn leave_workspace(
+    Extension(db): Extension<DB>,
+    Path(w_id): Path<String>,
+    authed: ApiAuthed,
+) -> Result<String> {
+    let mut tx = db.begin().await?;
+    sqlx::query!(
+        "DELETE FROM usr WHERE workspace_id = $1 AND username = $2",
+        &w_id,
+        authed.username
+    )
+    .execute(&mut *tx)
+    .await?;
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "users.leave_workspace",
+        ActionKind::Delete,
+        &w_id,
+        None,
+        None,
+    )
+    .await?;
+    tx.commit().await?;
+
+    Ok(format!("left workspace {w_id}"))
+}
+
+#[derive(Serialize)]
+struct Runnable {
+    workspace: String,
+    endpoint_async: String,
+    endpoint_sync: String,
+    endpoint_openai_sync: String,
+    summary: String,
+    description: String,
+    schema: Option<serde_json::Value>,
+    kind: String,
+    path: String,
+}
+
+async fn get_all_runnables(
+    Extension(db): Extension<UserDB>,
+    authed: ApiAuthed,
+    Tokened { token }: Tokened,
+    Extension(cache): Extension<Arc<AuthCache>>,
+) -> JsonResult<Vec<Runnable>> {
+    let mut tx = db.clone().begin(&authed).await?;
+    let mut runnables = Vec::new();
+    let workspaces = sqlx::query_scalar!(
+        "SELECT workspace.id as id FROM workspace, usr WHERE usr.workspace_id = workspace.id AND \
+         usr.email = $1 AND deleted = false",
+        authed.email
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+    tx.commit().await?;
+
+    for workspace in workspaces {
+        let nauthed = cache
+            .get_authed(Some(workspace.clone()), &token)
+            .await
+            .ok_or_else(|| {
+                Error::BadRequest(format!("not authorized to access workspace: {workspace}"))
+            })?;
+        let mut tx = db.clone().begin(&nauthed).await?;
+        let flows = sqlx::query!(
+            "SELECT flow.workspace_id as workspace, flow.path, summary, description, flow_version.schema 
+            FROM flow 
+            LEFT JOIN flow_version ON flow_version.id = flow.versions[array_upper(flow.versions, 1)]
+            WHERE flow.workspace_id = $1",
+            workspace
+        )
+        .fetch_all(&mut *tx)
+        .await?;
+        runnables.extend(
+            flows
+                .into_iter()
+                .map(|f| Runnable {
+                    workspace: f.workspace.clone(),
+                    endpoint_async: format!("/w/{}/jobs/run/f/{}", &f.workspace, &f.path),
+                    endpoint_sync: format!(
+                        "/w/{}/jobs/run_wait_result/f/{}",
+                        &f.workspace, &f.path
+                    ),
+                    endpoint_openai_sync: format!(
+                        "/w/{}/jobs/openai_sync/f/{}",
+                        &f.workspace, &f.path
+                    ),
+                    summary: f.summary,
+                    description: f.description,
+                    schema: f.schema,
+                    kind: "flow".to_string(),
+                    path: f.path,
+                })
+                .collect::<Vec<_>>(),
+        );
+        let scripts = sqlx::query!(
+        "SELECT workspace_id as workspace, path, summary, description, schema FROM script as o WHERE created_at = (select max(created_at) from script where o.path = path and workspace_id = $1) and workspace_id = $1", workspace
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+        runnables.extend(
+            scripts
+                .into_iter()
+                .map(|s| Runnable {
+                    workspace: s.workspace.clone(),
+                    endpoint_async: format!("/w/{}/jobs/run/p/{}", &s.workspace, &s.path),
+                    endpoint_sync: format!(
+                        "/w/{}/jobs/run_wait_result/p/{}",
+                        &s.workspace, &s.path
+                    ),
+                    endpoint_openai_sync: format!(
+                        "/w/{}/jobs/openai_sync/p/{}",
+                        &s.workspace, &s.path
+                    ),
+                    summary: s.summary,
+                    description: s.description,
+                    schema: s.schema,
+                    kind: "script".to_string(),
+                    path: s.path,
+                })
+                .collect::<Vec<_>>(),
+        );
+        tx.commit().await?;
+    }
+    Ok(Json(runnables))
+}
+
+//used by oauth
+#[allow(dead_code)]
+#[derive(Deserialize, Debug, Clone)]
+pub struct LoginUserInfo {
+    pub email: Option<String>,
+    pub name: Option<String>,
+    pub company: Option<String>,
+
+    pub displayName: Option<String>,
+}
+
+#[derive(Serialize)]
+struct InstanceUsernameInfo {
+    username: String,
+    workspace_usernames: Vec<WorkspaceUsernameInfo>,
+}
+
+#[derive(Serialize)]
+struct WorkspaceUsernameInfo {
+    workspace_id: String,
+    username: String,
+}
+async fn get_instance_username_info(
+    ApiAuthed { email, .. }: ApiAuthed,
+    Path(user_email): Path<String>,
+    Extension(db): Extension<DB>,
+) -> JsonResult<InstanceUsernameInfo> {
+    require_super_admin(&db, &email).await?;
+    let mut tx = db.begin().await?;
+    let instance_username = match sqlx::query_scalar!(
+        "SELECT username FROM password WHERE email = $1",
+        &user_email
+    )
+    .fetch_one(&mut *tx)
+    .await?
+    {
+        Some(username) => username,
+        None => generate_instance_wide_unique_username(&mut tx, &user_email).await?,
+    };
+
+    let workspace_usernames = sqlx::query_as!(
+        WorkspaceUsernameInfo,
+        "SELECT workspace_id, username FROM usr WHERE email = $1",
+        &user_email
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+
+    Ok(Json(InstanceUsernameInfo {
+        username: instance_username,
+        workspace_usernames: workspace_usernames,
+    }))
+}
+
+async fn username_to_email(
+    Path((w_id, username)): Path<(String, String)>,
+    Extension(db): Extension<DB>,
+) -> Result<String> {
+    let email = sqlx::query_scalar!(
+        "SELECT email FROM usr WHERE username = $1 AND workspace_id = $2",
+        &username,
+        &w_id
+    )
+    .fetch_optional(&db)
+    .await?;
+
+    let email = not_found_if_none(email, "user", username)?;
+
+    Ok(email)
+}
+
+#[cfg(feature = "enterprise")]
+#[derive(Serialize, Deserialize)]
+struct ExportedGlobalUser {
+    email: String,
+    password_hash: Option<String>,
+    login_type: String,
+    super_admin: bool,
+    verified: bool,
+    name: Option<String>,
+    company: Option<String>,
+    first_time_user: bool,
+    username: Option<String>,
+}
+
+#[cfg(feature = "enterprise")]
+async fn export_global_users(
+    Extension(db): Extension<DB>,
+    authed: ApiAuthed,
+) -> JsonResult<Vec<ExportedGlobalUser>> {
+    require_super_admin(&db, &authed.email).await?;
+    let mut tx = db.begin().await?;
+    let users = sqlx::query_as!(
+        ExportedGlobalUser,
+        "SELECT email, password_hash, login_type, super_admin, verified, name, company, first_time_user, username FROM password"
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "users.export_export",
+        ActionKind::Execute,
+        "global",
+        None,
+        None,
+    )
+    .await?;
+
+    tx.commit().await?;
+
+    Ok(Json(users))
+}
+
+#[cfg(not(feature = "enterprise"))]
+async fn export_global_users() -> JsonResult<String> {
+    Err(Error::BadRequest(
+        "This feature is only available in the enterprise version".to_string(),
+    ))
+}
+
+#[cfg(feature = "enterprise")]
+async fn overwrite_global_users(
+    Extension(db): Extension<DB>,
+    authed: ApiAuthed,
+    Json(users): Json<Vec<ExportedGlobalUser>>,
+) -> Result<String> {
+    require_super_admin(&db, &authed.email).await?;
+    let mut tx = db.begin().await?;
+    sqlx::query!("DELETE FROM password")
+        .execute(&mut *tx)
+        .await?;
+    for user in users {
+        sqlx::query!(
+            "INSERT INTO password(email, password_hash, login_type, super_admin, verified, name, company, first_time_user, username)
+            VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)",
+            user.email,
+            user.password_hash,
+            user.login_type,
+            user.super_admin,
+            user.verified,
+            user.name,
+            user.company,
+            user.first_time_user,
+            user.username
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+    audit_log(
+        &mut *tx,
+        &authed,
+        "users.import_global",
+        ActionKind::Create,
+        "global",
+        None,
+        None,
+    )
+    .await?;
+    tx.commit().await?;
+    Ok("loaded global users".to_string())
+}
+
+#[cfg(not(feature = "enterprise"))]
+async fn overwrite_global_users() -> JsonResult<String> {
+    Err(Error::BadRequest(
+        "This feature is only available in the enterprise version".to_string(),
+    ))
+}
+
+#[derive(Deserialize)]
+struct RenameUser {
+    new_username: String,
+}
+
+async fn rename_user(
+    authed: ApiAuthed,
+    Path(user_email): Path<String>,
+    Extension(db): Extension<DB>,
+    Json(ru): Json<RenameUser>,
+) -> Result<String> {
+    require_super_admin(&db, &authed.email).await?;
+
+    let mut tx = db.begin().await?;
+
+    let username_conflict = sqlx::query_scalar!(
+        "SELECT EXISTS(SELECT 1 FROM usr WHERE username = $1 and email != $2 UNION SELECT 1 FROM password WHERE username = $1 UNION SELECT 1 FROM pending_user WHERE username = $1)",
+        &ru.new_username,
+        &user_email
+    )
+    .fetch_one(&mut *tx)
+    .await?
+    .unwrap_or(false);
+
+    if username_conflict {
+        return Err(Error::BadRequest(format!(
+            "username {} already used by another user",
+            &ru.new_username
+        )));
+    }
+
+    if !VALID_USERNAME.is_match(&ru.new_username) {
+        return Err(windmill_common::error::Error::BadRequest(format!(
+            "Usermame can only contain alphanumeric characters and underscores and must start with a letter"
+        )));
+    }
+
+    sqlx::query!(
+        "UPDATE password SET username = $1 WHERE email = $2",
+        ru.new_username,
+        user_email
+    )
+    .execute(&mut *tx)
+    .await?;
+
+    let workspace_usernames = sqlx::query!(
+        "SELECT workspace_id, username FROM usr WHERE email = $1",
+        &user_email
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+
+    for w_u in workspace_usernames {
+        if ru.new_username == w_u.username {
+            continue;
+        }
+        update_username_in_workpsace(
+            &mut tx,
+            &user_email,
+            &w_u.username,
+            &ru.new_username,
+            &w_u.workspace_id,
+        )
+        .await?;
+    }
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "users.rename",
+        ActionKind::Update,
+        "global",
+        Some(&user_email),
+        None,
+    )
+    .await?;
+    tx.commit().await?;
+    Ok(format!(
+        "updated username of user {} to {}",
+        &user_email, &ru.new_username
+    ))
+}
+
+async fn update_username_in_workpsace<'c>(
+    tx: &mut sqlx::Transaction<'c, sqlx::Postgres>,
+    email: &str,
+    old_username: &str,
+    new_username: &str,
+    w_id: &str,
+) -> error::Result<()> {
+    // ---- instance and workspace users ----
+    sqlx::query!(
+        "UPDATE usr SET username = $1 WHERE email = $2",
+        new_username,
+        email
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "UPDATE usr_to_group SET usr = $1 WHERE usr = $2",
+        new_username,
+        old_username
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    // ---- queue ----
+    sqlx::query!(
+        r#"UPDATE queue SET script_path = REGEXP_REPLACE(script_path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1') WHERE script_path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    ).execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        r#"UPDATE queue SET schedule_path = REGEXP_REPLACE(schedule_path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1') WHERE schedule_path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    ).execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "UPDATE queue SET permissioned_as = ('u/' || $1) WHERE permissioned_as = ('u/' || $2) AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "UPDATE queue SET canceled_by = $1 WHERE canceled_by = $2 AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await
+    .unwrap();
+
+    sqlx::query!(
+        "UPDATE queue SET created_by = $1 WHERE created_by = $2 AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await
+    .unwrap();
+
+    // ---- completed_job ----
+    sqlx::query!(
+        r#"UPDATE completed_job SET script_path = REGEXP_REPLACE(script_path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1') WHERE script_path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    ).execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        r#"UPDATE completed_job SET schedule_path = REGEXP_REPLACE(schedule_path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1') WHERE schedule_path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    ).execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "UPDATE completed_job SET permissioned_as = ('u/' || $1) WHERE permissioned_as = ('u/' || $2) AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "UPDATE completed_job SET created_by = $1 WHERE created_by = $2 AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await
+    .unwrap();
+
+    sqlx::query!(
+        "UPDATE completed_job SET canceled_by = $1 WHERE canceled_by = $2 AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await
+    .unwrap();
+
+    // ---- resources----
+    sqlx::query!(
+        r#"UPDATE resource SET created_by = $1 WHERE created_by = $2 AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        r#"UPDATE resource_type SET created_by = $1 WHERE created_by = $2 AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        r#"UPDATE resource SET path = REGEXP_REPLACE(path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1') WHERE path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    ).execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "UPDATE resource SET extra_perms = extra_perms - ('u/' || $2) || jsonb_build_object(('u/' || $1), extra_perms->('u/' || $2)) WHERE extra_perms ? ('u/' || $2) AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    // ---- variables ----
+
+    sqlx::query!(
+        r#"UPDATE variable SET path = REGEXP_REPLACE(path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1') WHERE path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    ).execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "UPDATE variable SET extra_perms = extra_perms - ('u/' || $2) || jsonb_build_object(('u/' || $1), extra_perms->('u/' || $2)) WHERE extra_perms ? ('u/' || $2) AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    // ---- scripts ----
+    sqlx::query!(
+        r#"UPDATE script SET path = REGEXP_REPLACE(path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1') WHERE path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "UPDATE script SET created_by = $1 WHERE created_by = $2 AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await
+    .unwrap();
+
+    sqlx::query!(
+        "UPDATE script SET extra_perms = extra_perms - ('u/' || $2) || jsonb_build_object(('u/' || $1), extra_perms->('u/' || $2)) WHERE extra_perms ? ('u/' || $2) AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    // ---- flows ----
+    sqlx::query!(
+        r#"INSERT INTO flow
+            (workspace_id, path, summary, description, archived, extra_perms, dependency_job, draft_only, tag, ws_error_handler_muted, dedicated_worker, timeout, visible_to_runner_only, concurrency_key, versions, value, schema, edited_by, edited_at) 
+        SELECT workspace_id, REGEXP_REPLACE(path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1'), summary, description, archived, extra_perms, dependency_job, draft_only, tag, ws_error_handler_muted, dedicated_worker, timeout, visible_to_runner_only, concurrency_key, versions, value, schema, edited_by, edited_at
+            FROM flow 
+            WHERE path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    ).execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        r#"UPDATE flow_version SET path = REGEXP_REPLACE(path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1') WHERE path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "DELETE FROM flow WHERE path LIKE ('u/' || $1 || '/%') AND workspace_id = $2",
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "UPDATE flow SET extra_perms = extra_perms - ('u/' || $2) || jsonb_build_object(('u/' || $1), extra_perms->('u/' || $2)) WHERE extra_perms ? ('u/' || $2) AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    // ---- draft ----
+    sqlx::query!(
+        r#"UPDATE draft SET path = REGEXP_REPLACE(path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1') WHERE path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        r#"UPDATE draft SET value = to_json(jsonb_set(to_jsonb(value), ARRAY['path'], to_jsonb(REGEXP_REPLACE(value->>'path','u/' || $2 || '/(.*)','u/' || $1 || '/\1')))) WHERE value->>'path' LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    ).execute(&mut **tx)
+    .await?;
+
+    // ---- app ----
+    sqlx::query!(
+        r#"UPDATE app SET path = REGEXP_REPLACE(path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1') WHERE path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "UPDATE app SET policy = jsonb_set(policy, ARRAY['on_behalf_of'], to_jsonb('u/' || $1)) WHERE policy->>'on_behalf_of' = ('u/' || $2) AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "UPDATE app SET extra_perms = extra_perms - ('u/' || $2) || jsonb_build_object(('u/' || $1), extra_perms->('u/' || $2)) WHERE extra_perms ? ('u/' || $2) AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    // ---- app_version ----
+
+    sqlx::query!(
+        "UPDATE app_version SET created_by = $1 WHERE created_by = $2 AND EXISTS (SELECT 1 FROM app WHERE workspace_id = $3 AND app.id = app_version.app_id)",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    // ---- schedules ----
+
+    sqlx::query!(
+        r#"UPDATE schedule SET path = REGEXP_REPLACE(path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1') WHERE path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        r#"UPDATE schedule SET script_path = REGEXP_REPLACE(script_path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1') WHERE script_path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "UPDATE schedule SET edited_by = $1 WHERE edited_by = $2 AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await
+    .unwrap();
+
+    sqlx::query!(
+        "UPDATE schedule SET extra_perms = extra_perms - ('u/' || $2) || jsonb_build_object(('u/' || $1), extra_perms->('u/' || $2)) WHERE extra_perms ? ('u/' || $2) AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    // ---- group_ ----
+
+    sqlx::query!(
+        "UPDATE group_ SET extra_perms = extra_perms - ('u/' || $2) || jsonb_build_object(('u/' || $1), extra_perms->('u/' || $2)) WHERE extra_perms ? ('u/' || $2) AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    // ---- folders ----
+
+    sqlx::query!(
+        "UPDATE folder SET created_by = $1 WHERE created_by = $2 AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "UPDATE folder SET owners = ARRAY_REPLACE(owners, 'u/' || $2, 'u/' || $1) WHERE  ('u/' || $2) = ANY(owners) AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    sqlx::query!(
+        "UPDATE folder SET extra_perms = extra_perms - ('u/' || $2) || jsonb_build_object(('u/' || $1), extra_perms->('u/' || $2)) WHERE extra_perms ? ('u/' || $2) AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    // ---- input ----
+
+    sqlx::query!(
+        "UPDATE input SET created_by = $1 WHERE created_by = $2 AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await
+    .unwrap();
+
+    // ---- favorite ----
+
+    sqlx::query!(
+        "UPDATE favorite SET usr = $1 WHERE usr = $2 AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await
+    .unwrap();
+
+    // ---- capture ----
+
+    sqlx::query!(
+        "UPDATE capture SET created_by = $1 WHERE created_by = $2 AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await
+    .unwrap();
+
+    // ---- token ----
+
+    sqlx::query!(
+        "UPDATE token SET owner = ('u/' || $1) WHERE owner = ('u/' || $2) AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await
+    .unwrap();
+
+    sqlx::query!(
+        r#"UPDATE token SET scopes = array(select regexp_replace(unnest(scopes), 'run:([^/]+)/u/' || $2 || '/(.+)', 'run:\1/u/' || $1 || '/\2')) WHERE EXISTS (SELECT 1 FROM UNNEST(scopes) scope WHERE scope LIKE ('run:%/u/' || $2 || '/%')) AND workspace_id = $3"#,
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    // ---- raw_app ----
+
+    sqlx::query!(
+        "UPDATE raw_app SET extra_perms = extra_perms - ('u/' || $2) || jsonb_build_object(('u/' || $1), extra_perms->('u/' || $2)) WHERE extra_perms ? ('u/' || $2) AND workspace_id = $3",
+        new_username,
+        old_username,
+        w_id
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    Ok(())
+}
diff --git a/backend/windmill-api/src/users_ee.rs b/backend/windmill-api/src/users_ee.rs
new file mode 100644
index 0000000000..e0f15a9317
--- /dev/null
+++ b/backend/windmill-api/src/users_ee.rs
@@ -0,0 +1,41 @@
+use std::sync::Arc;
+
+use crate::db::ApiAuthed;
+
+use crate::users::{EditPassword, NewUser};
+use crate::{db::DB, webhook_util::WebhookShared};
+use argon2::Argon2;
+
+use http::StatusCode;
+
+use windmill_common::error::{Error, Result};
+
+pub async fn create_user(
+    _authed: ApiAuthed,
+    _db: DB,
+    _webhook: WebhookShared,
+    _argon2: Arc<Argon2<'_>>,
+    _rsmq: Option<rsmq_async::MultiplexedRsmq>,
+    mut _nu: NewUser,
+) -> Result<(StatusCode, String)> {
+    Err(Error::InternalErr(
+        "Not implemented in Windmill's Open Source repository".to_string(),
+    ))
+}
+
+pub async fn set_password(
+    _db: DB,
+    _argon2: Arc<Argon2<'_>>,
+    _authed: ApiAuthed,
+    _ep: EditPassword,
+) -> Result<String> {
+    Err(Error::InternalErr(
+        "Not implemented in Windmill's Open Source repository".to_string(),
+    ))
+}
+
+pub fn send_email_if_possible(_subject: &str, _content: &str, _to: &str) {
+    tracing::warn!(
+        "send_email_if_possible is not implemented in Windmill's Open Source repository"
+    );
+}
diff --git a/backend/windmill-api/src/utils.rs b/backend/windmill-api/src/utils.rs
index d8a81ab741..ea4fccc160 100644
--- a/backend/windmill-api/src/utils.rs
+++ b/backend/windmill-api/src/utils.rs
@@ -155,25 +155,6 @@ pub async fn get_instance_username_or_create_pending<'c>(
     }
 }
 
-pub async fn get_and_delete_pending_username_or_generate<'c>(
-    tx: &mut Transaction<'c, Postgres>,
-    email: &str,
-) -> error::Result<String> {
-    let username = sqlx::query_scalar!("SELECT username FROM pending_user WHERE email = $1", email)
-        .fetch_optional(&mut **tx)
-        .await?;
-
-    if let Some(username) = username {
-        sqlx::query!("DELETE FROM pending_user WHERE email = $1", email)
-            .execute(&mut **tx)
-            .await?;
-        Ok(username)
-    } else {
-        let username = generate_instance_wide_unique_username(&mut *tx, email).await?;
-        Ok(username)
-    }
-}
-
 pub fn content_plain(body: Body) -> Response {
     use axum::http::header;
     Response::builder()
diff --git a/backend/windmill-api/src/websocket_triggers.rs b/backend/windmill-api/src/websocket_triggers.rs
new file mode 100644
index 0000000000..b94ed85461
--- /dev/null
+++ b/backend/windmill-api/src/websocket_triggers.rs
@@ -0,0 +1,684 @@
+use axum::{
+    extract::{Path, Query},
+    routing::{delete, get, post},
+    Extension, Json, Router,
+};
+use futures::StreamExt;
+use http::StatusCode;
+use itertools::Itertools;
+use rand::seq::SliceRandom;
+use serde::{
+    de::{self, MapAccess, Visitor},
+    Deserialize, Deserializer, Serialize,
+};
+use serde_json::Value;
+use sql_builder::{bind::Bind, SqlBuilder};
+use sqlx::prelude::FromRow;
+use std::{collections::HashMap, fmt};
+use tokio_tungstenite::connect_async;
+use windmill_audit::{audit_ee::audit_log, ActionKind};
+use windmill_common::{
+    db::UserDB,
+    error::{self, JsonResult},
+    utils::{not_found_if_none, paginate, require_admin, Pagination, StripPath},
+    worker::{to_raw_value, CLOUD_HOSTED},
+    INSTANCE_NAME,
+};
+use windmill_queue::PushArgsOwned;
+
+use crate::{
+    db::{ApiAuthed, DB},
+    jobs::{
+        run_wait_result_flow_by_path_internal, run_wait_result_script_by_path_internal, RunJobQuery,
+    },
+    users::fetch_api_authed,
+};
+
+pub fn workspaced_service() -> Router {
+    Router::new()
+        .route("/create", post(create_websocket_trigger))
+        .route("/list", get(list_websocket_triggers))
+        .route("/get/*path", get(get_websocket_trigger))
+        .route("/update/*path", post(update_websocket_trigger))
+        .route("/delete/*path", delete(delete_websocket_trigger))
+        .route("/exists/*path", get(exists_websocket_trigger))
+        .route("/setenabled/*path", post(set_enabled))
+}
+
+#[derive(Deserialize)]
+struct NewWebsocketTrigger {
+    path: String,
+    url: String,
+    script_path: String,
+    is_flow: bool,
+    enabled: Option<bool>,
+    filters: Vec<serde_json::Value>,
+}
+
+#[derive(FromRow, Serialize, Clone)]
+pub struct WebsocketTrigger {
+    workspace_id: String,
+    path: String,
+    url: String,
+    script_path: String,
+    is_flow: bool,
+    edited_by: String,
+    email: String,
+    edited_at: chrono::DateTime<chrono::Utc>,
+    server_id: Option<String>,
+    last_server_ping: Option<chrono::DateTime<chrono::Utc>>,
+    extra_perms: serde_json::Value,
+    error: Option<String>,
+    enabled: bool,
+    filters: Vec<serde_json::Value>,
+}
+
+#[derive(Deserialize)]
+struct EditWebsocketTrigger {
+    path: String,
+    url: String,
+    script_path: String,
+    is_flow: bool,
+    filters: Vec<serde_json::Value>,
+}
+
+#[derive(Deserialize)]
+pub struct ListWebsocketTriggerQuery {
+    pub page: Option<usize>,
+    pub per_page: Option<usize>,
+    pub path: Option<String>,
+    pub is_flow: Option<bool>,
+    pub path_start: Option<String>,
+}
+
+async fn list_websocket_triggers(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path(w_id): Path<String>,
+    Query(lst): Query<ListWebsocketTriggerQuery>,
+) -> error::JsonResult<Vec<WebsocketTrigger>> {
+    let mut tx = user_db.begin(&authed).await?;
+    let (per_page, offset) = paginate(Pagination { per_page: lst.per_page, page: lst.page });
+    let mut sqlb = SqlBuilder::select_from("websocket_trigger")
+        .field("*")
+        .order_by("edited_at", true)
+        .and_where("workspace_id = ?".bind(&w_id))
+        .offset(offset)
+        .limit(per_page)
+        .clone();
+    if let Some(path) = lst.path {
+        sqlb.and_where_eq("script_path", "?".bind(&path));
+    }
+    if let Some(is_flow) = lst.is_flow {
+        sqlb.and_where_eq("is_flow", "?".bind(&is_flow));
+    }
+    if let Some(path_start) = &lst.path_start {
+        sqlb.and_where_like_left("path", path_start);
+    }
+    let sql = sqlb
+        .sql()
+        .map_err(|e| error::Error::InternalErr(e.to_string()))?;
+    let rows = sqlx::query_as::<_, WebsocketTrigger>(&sql)
+        .fetch_all(&mut *tx)
+        .await?;
+    tx.commit().await?;
+
+    Ok(Json(rows))
+}
+
+async fn get_websocket_trigger(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path((w_id, path)): Path<(String, StripPath)>,
+) -> error::JsonResult<WebsocketTrigger> {
+    let mut tx = user_db.begin(&authed).await?;
+    let path = path.to_path();
+    let trigger = sqlx::query_as!(
+        WebsocketTrigger,
+        r#"SELECT *
+          FROM websocket_trigger
+          WHERE workspace_id = $1 AND path = $2"#,
+        w_id,
+        path,
+    )
+    .fetch_optional(&mut *tx)
+    .await?;
+    tx.commit().await?;
+
+    let trigger = not_found_if_none(trigger, "Trigger", path)?;
+
+    Ok(Json(trigger))
+}
+
+async fn create_websocket_trigger(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path(w_id): Path<String>,
+    Json(ct): Json<NewWebsocketTrigger>,
+) -> error::Result<(StatusCode, String)> {
+    if *CLOUD_HOSTED {
+        return Err(error::Error::BadRequest(
+            "Websocket triggers are not supported on multi-tenant cloud, use dedicated cloud or self-host".to_string(),
+        ));
+    }
+    require_admin(authed.is_admin, &authed.username)?;
+
+    let mut tx = user_db.begin(&authed).await?;
+    sqlx::query_as!(
+        WebsocketTrigger,
+      "INSERT INTO websocket_trigger (workspace_id, path, url, script_path, is_flow, enabled, filters, edited_by, email, edited_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, now()) RETURNING *",
+      w_id,
+      ct.path,
+      ct.url,
+      ct.script_path,
+      ct.is_flow,
+      ct.enabled.unwrap_or(true),
+      &ct.filters,
+      &authed.username,
+      &authed.email
+    )
+    .fetch_one(&mut *tx).await?;
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "websocket_triggers.create",
+        ActionKind::Create,
+        &w_id,
+        Some(ct.path.as_str()),
+        None,
+    )
+    .await?;
+
+    tx.commit().await?;
+
+    Ok((StatusCode::CREATED, format!("{}", ct.path)))
+}
+
+async fn update_websocket_trigger(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path((w_id, path)): Path<(String, StripPath)>,
+    Json(ct): Json<EditWebsocketTrigger>,
+) -> error::Result<String> {
+    let path = path.to_path();
+    let mut tx = user_db.begin(&authed).await?;
+
+    // important to update server_id, last_server_ping and error to NULL to stop current websocket listener
+    sqlx::query!(
+        "UPDATE websocket_trigger SET url = $1, script_path = $2, path = $3, is_flow = $4, filters = $5, edited_by = $6, email = $7, edited_at = now(), server_id = NULL, last_server_ping = NULL, error = NULL
+            WHERE workspace_id = $8 AND path = $9",
+        ct.url,
+        ct.script_path,
+        ct.path,
+        ct.is_flow,
+        &ct.filters,
+        &authed.username,
+        &authed.email,
+        w_id,
+        path,
+    )
+    .execute(&mut *tx).await?;
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "websocket_triggers.update",
+        ActionKind::Create,
+        &w_id,
+        Some(path),
+        None,
+    )
+    .await?;
+
+    tx.commit().await?;
+
+    Ok(path.to_string())
+}
+
+#[derive(Deserialize)]
+pub struct SetEnabled {
+    pub enabled: bool,
+}
+
+pub async fn set_enabled(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path((w_id, path)): Path<(String, StripPath)>,
+    Json(payload): Json<SetEnabled>,
+) -> error::Result<String> {
+    let mut tx = user_db.begin(&authed).await?;
+    let path = path.to_path();
+
+    // important to set server_id, last_server_ping and error to NULL to stop current websocket listener
+    let one_o = sqlx::query_scalar!(
+        "UPDATE websocket_trigger SET enabled = $1, email = $2, edited_by = $3, edited_at = now(), server_id = NULL, last_server_ping = NULL, error = NULL
+        WHERE path = $4 AND workspace_id = $5 RETURNING 1",
+        payload.enabled,
+        &authed.email,
+        &authed.username,
+        path,
+        w_id,
+    ).fetch_optional(&mut *tx).await?;
+
+    not_found_if_none(one_o.flatten(), "Websocket trigger", path)?;
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "websocket_triggers.setenabled",
+        ActionKind::Update,
+        &w_id,
+        Some(path),
+        Some([("enabled", payload.enabled.to_string().as_ref())].into()),
+    )
+    .await?;
+
+    tx.commit().await?;
+
+    Ok(format!(
+        "succesfully updated websocket trigger at path {} to status {}",
+        path, payload.enabled
+    ))
+}
+
+async fn delete_websocket_trigger(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path((w_id, path)): Path<(String, StripPath)>,
+) -> error::Result<String> {
+    require_admin(authed.is_admin, &authed.username)?;
+    let path = path.to_path();
+    let mut tx = user_db.begin(&authed).await?;
+    sqlx::query!(
+        "DELETE FROM websocket_trigger WHERE workspace_id = $1 AND path = $2",
+        w_id,
+        path,
+    )
+    .execute(&mut *tx)
+    .await?;
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "websocket_triggers.delete",
+        ActionKind::Delete,
+        &w_id,
+        Some(path),
+        None,
+    )
+    .await?;
+
+    tx.commit().await?;
+
+    Ok(format!("Websocket trigger {path} deleted"))
+}
+
+async fn exists_websocket_trigger(
+    Extension(db): Extension<DB>,
+    Path((w_id, path)): Path<(String, StripPath)>,
+) -> JsonResult<bool> {
+    let path = path.to_path();
+    let exists = sqlx::query_scalar!(
+        "SELECT EXISTS(SELECT 1 FROM websocket_trigger WHERE path = $1 AND workspace_id = $2)",
+        path,
+        w_id,
+    )
+    .fetch_one(&db)
+    .await?
+    .unwrap_or(false);
+    Ok(Json(exists))
+}
+
+async fn listen_to_unlistened_websockets(
+    db: &DB,
+    rsmq: &Option<rsmq_async::MultiplexedRsmq>,
+    killpill_rx: &tokio::sync::broadcast::Receiver<()>,
+) -> () {
+    match sqlx::query_as!(
+        WebsocketTrigger,
+        r#"SELECT *
+            FROM websocket_trigger
+            WHERE enabled IS TRUE AND (server_id IS NULL OR last_server_ping IS NULL OR last_server_ping < now() - interval '15 seconds')"#
+    )
+    .fetch_all(db)
+    .await
+    {
+        Ok(mut triggers) => {
+            triggers.shuffle(&mut rand::thread_rng());
+            for trigger in triggers {
+                maybe_listen_to_websocket(trigger, db.clone(), rsmq.clone(), killpill_rx.resubscribe()).await;
+            }
+        }
+        Err(err) => {
+            tracing::error!("Error fetching websocket triggers: {:?}", err);
+        }
+    };
+}
+
+pub async fn start_websockets(
+    db: DB,
+    rsmq: Option<rsmq_async::MultiplexedRsmq>,
+    mut killpill_rx: tokio::sync::broadcast::Receiver<()>,
+) -> () {
+    tokio::spawn(async move {
+        listen_to_unlistened_websockets(&db, &rsmq, &killpill_rx).await;
+        loop {
+            tokio::select! {
+                biased;
+                _ = killpill_rx.recv() => {
+                    return;
+                }
+                _ = tokio::time::sleep(tokio::time::Duration::from_secs(15)) => {
+                    listen_to_unlistened_websockets(&db, &rsmq, &killpill_rx).await;
+                }
+            }
+        }
+    });
+}
+
+async fn maybe_listen_to_websocket(
+    ws_trigger: WebsocketTrigger,
+    db: DB,
+    rsmq: Option<rsmq_async::MultiplexedRsmq>,
+    killpill_rx: tokio::sync::broadcast::Receiver<()>,
+) -> () {
+    match sqlx::query_scalar!(
+        "UPDATE websocket_trigger SET server_id = $1, last_server_ping = now() WHERE enabled IS TRUE AND workspace_id = $2 AND path = $3 AND (server_id IS NULL OR last_server_ping IS NULL OR last_server_ping < now() - interval '15 seconds') RETURNING true",
+        *INSTANCE_NAME,
+        ws_trigger.workspace_id,
+        ws_trigger.path,
+    ).fetch_optional(&db).await {
+        Ok(has_lock) => {
+            if has_lock.flatten().unwrap_or(false) {
+                tokio::spawn(listen_to_websocket(ws_trigger, db, rsmq, killpill_rx));
+            } else {
+                tracing::info!("Websocket {} already being listened to", ws_trigger.url);
+            }
+        },
+        Err(err) => {
+            tracing::error!("Error acquiring lock for websocket {}: {:?}", ws_trigger.path, err);
+        }
+    };
+}
+
+struct SupersetVisitor<'a> {
+    key: &'a str,
+    value_to_check: &'a Value,
+}
+
+impl<'de, 'a> Visitor<'de> for SupersetVisitor<'a> {
+    type Value = bool;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("a JSON object with a specific key at the top level")
+    }
+
+    fn visit_map<V>(self, mut map: V) -> Result<Self::Value, V::Error>
+    where
+        V: MapAccess<'de>,
+    {
+        while let Some(key) = map.next_key::<String>()? {
+            if key == self.key {
+                // Deserialize the value for the key and check if it's a superset
+                let json_value: Value = map.next_value()?;
+                tracing::info!("json_value: {:?}", json_value);
+                tracing::info!("value_to_check: {:?}", self.value_to_check);
+                return Ok(is_superset(&json_value, self.value_to_check));
+            } else {
+                // Skip the value if it's not the one we're interested in
+                let _ = map.next_value::<de::IgnoredAny>()?;
+            }
+        }
+        // If the key was not found, return false
+        Ok(false)
+    }
+}
+
+// Function to check if json_value is a superset of value_to_check
+fn is_superset(json_value: &Value, value_to_check: &Value) -> bool {
+    match (json_value, value_to_check) {
+        (Value::Object(json_map), Value::Object(check_map)) => {
+            // Check that all keys and values in check_map exist and match in json_map
+            check_map.iter().all(|(k, v)| {
+                json_map
+                    .get(k)
+                    .map_or(false, |json_val| is_superset(json_val, v))
+            })
+        }
+        (Value::Array(json_array), Value::Array(check_array)) => {
+            // Check that all elements in check_array exist in json_array
+            check_array.iter().all(|check_item| {
+                json_array
+                    .iter()
+                    .any(|json_item| is_superset(json_item, check_item))
+            })
+        }
+        _ => json_value == value_to_check,
+    }
+}
+
+// A function to deserialize and check if the value at the given key is a superset of a passed value
+fn is_value_superset<'a, 'de, D>(
+    deserializer: D,
+    key: &'a str,
+    value_to_check: &'a Value,
+) -> Result<bool, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    deserializer.deserialize_map(SupersetVisitor { key, value_to_check })
+}
+
+async fn listen_to_websocket(
+    ws_trigger: WebsocketTrigger,
+    db: DB,
+    rsmq: Option<rsmq_async::MultiplexedRsmq>,
+    mut killpill_rx: tokio::sync::broadcast::Receiver<()>,
+) -> () {
+    async fn update_ping(db: DB, ws_trigger: &WebsocketTrigger, error: Option<&str>) -> Option<()> {
+        match sqlx::query_scalar!(
+            "UPDATE websocket_trigger SET last_server_ping = now(), error = $1 WHERE workspace_id = $2 AND path = $3 AND server_id = $4 AND enabled IS TRUE RETURNING 1",
+            error,
+            ws_trigger.workspace_id,
+            ws_trigger.path,
+            *INSTANCE_NAME
+        ).fetch_optional(&db).await {
+            Ok(updated) => {
+                if updated.flatten().is_none() {
+                    tracing::info!("Websocket {} changed, disabled, or deleted, stopping...", ws_trigger.url); 
+                    return None;
+                }
+            },
+            Err(err) => {
+                tracing::warn!("Error updating ping of websocket {}: {:?}", ws_trigger.url, err);
+            }
+        };
+
+        Some(())
+    }
+
+    let url = ws_trigger.url.as_str();
+
+    #[derive(Deserialize)]
+    struct JsonFilter {
+        key: String,
+        value: serde_json::Value,
+    }
+
+    #[derive(Deserialize)]
+    #[serde(untagged)]
+    enum Filter {
+        JsonFilter(JsonFilter),
+    }
+    let filters: Vec<Filter> = ws_trigger
+        .filters
+        .iter()
+        .filter_map(|m| serde_json::from_value(m.clone()).ok())
+        .collect_vec();
+
+    loop {
+        tokio::select! {
+            biased;
+            _ = killpill_rx.recv() => {
+                return;
+            },
+            connection = connect_async(url) => {
+                match connection {
+                    Ok((ws_stream, _)) => {
+                        tracing::info!("Listening to websocket {}", url);
+                        if let None = update_ping(db.clone(), &ws_trigger, None).await {
+                            return;
+                        }
+                        let mut last_ping = tokio::time::Instant::now();
+                        let (_, mut read) = ws_stream.split();
+                        loop {
+                            tokio::select! {
+                                biased;
+                                _ = killpill_rx.recv() => {
+                                    return;
+                                }
+                                msg = read.next() => {
+                                    if let Some(msg) = msg {
+                                        if last_ping.elapsed() > tokio::time::Duration::from_secs(5) {
+                                            if let None = update_ping(db.clone(), &ws_trigger, None).await {
+                                                return;
+                                            }
+                                            last_ping = tokio::time::Instant::now();
+                                        }
+                                        match msg {
+                                            Ok(msg) => {
+                                                match msg {
+                                                    tokio_tungstenite::tungstenite::Message::Text(text) => {
+                                                        let mut should_handle = true;
+                                                        for filter in &filters {
+                                                            match filter {
+                                                                Filter::JsonFilter(JsonFilter { key, value }) => {
+                                                                    let mut deserializer = serde_json::Deserializer::from_str(text.as_str());
+                                                                    should_handle = match is_value_superset(&mut deserializer, key, &value) {
+                                                                        Ok(filter_match) => {
+                                                                            filter_match
+                                                                        },
+                                                                        Err(err) => {
+                                                                            tracing::warn!("Error deserializing filter for websocket {}: {:?}", url, err);
+                                                                            false
+                                                                        }
+                                                                    };
+                                                                }
+                                                            }
+                                                            if !should_handle {
+                                                                break;
+                                                            }
+                                                        }
+                                                        if should_handle {
+                                                            let db_ = db.clone();
+                                                            let rsmq_ = rsmq.clone();
+                                                            let ws_trigger_ = ws_trigger.clone();
+                                                            tokio::spawn(async move {
+                                                                let url = ws_trigger_.url.clone();
+                                                                if let Err(err) = run_job(db_, rsmq_, ws_trigger_, text).await {
+                                                                    tracing::error!("Error running job on websocket {}: {:?}", url, err);
+                                                                };
+                                                            });
+                                                        }
+                                                    },
+                                                    _ => {}
+                                                }
+                                            },
+                                            Err(err) => {
+                                                tracing::error!("Error reading from websocket {}: {:?}", url, err);
+                                            }
+                                        }
+                                    } else {
+                                        tracing::error!("Websocket {} closed", url);
+                                        if let None =
+                                            update_ping(db.clone(), &ws_trigger, Some("Websocket closed")).await
+                                        {
+                                            return;
+                                        }
+                                        tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
+                                        break;
+                                    }
+                                },
+                                _ = tokio::time::sleep(tokio::time::Duration::from_secs(5)) => {
+                                    if let None = update_ping(db.clone(), &ws_trigger, None).await {
+                                        return;
+                                    }
+                                    last_ping = tokio::time::Instant::now();
+                                },
+                            }
+                        }
+                    }
+                    Err(err) => {
+                        tracing::error!("Error connecting to websocket {}: {:?}", url, err);
+                        if let None =
+                            update_ping(db.clone(), &ws_trigger, Some(err.to_string().as_str())).await
+                        {
+                            return;
+                        }
+                        tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
+                    }
+                }
+            }
+        }
+    }
+}
+
+async fn run_job(
+    db: DB,
+    rsmq: Option<rsmq_async::MultiplexedRsmq>,
+    trigger: WebsocketTrigger,
+    msg: String,
+) -> anyhow::Result<()> {
+    let args = PushArgsOwned {
+        args: HashMap::from([("msg".to_string(), to_raw_value(&msg))]),
+        extra: Some(HashMap::from([(
+            "wm_trigger".to_string(),
+            to_raw_value(&serde_json::json!({"kind": "websocket"})),
+        )])),
+    };
+    let label_prefix = Some(format!("ws-{}-", trigger.path));
+
+    let authed = fetch_api_authed(
+        trigger.edited_by.clone(),
+        trigger.email.clone(),
+        &trigger.workspace_id,
+        &db,
+        "anonymous".to_string(),
+    )
+    .await?;
+
+    let user_db = UserDB::new(db.clone());
+
+    let run_query = RunJobQuery::default();
+
+    if trigger.is_flow {
+        run_wait_result_flow_by_path_internal(
+            db,
+            run_query,
+            StripPath(trigger.script_path.to_owned()),
+            authed,
+            rsmq,
+            user_db,
+            args,
+            trigger.workspace_id.clone(),
+            label_prefix,
+        )
+        .await?;
+    } else {
+        run_wait_result_script_by_path_internal(
+            db,
+            run_query,
+            StripPath(trigger.script_path.to_owned()),
+            authed,
+            rsmq,
+            user_db,
+            trigger.workspace_id.clone(),
+            args,
+            label_prefix,
+        )
+        .await?;
+    }
+
+    Ok(())
+}
diff --git a/backend/windmill-api/src/workspaces.rs b/backend/windmill-api/src/workspaces.rs
index 95cd97fad0..018ac8de5f 100644
--- a/backend/windmill-api/src/workspaces.rs
+++ b/backend/windmill-api/src/workspaces.rs
@@ -9,14 +9,15 @@
 use std::collections::HashMap;
 
 use crate::db::ApiAuthed;
-use crate::utils::{get_instance_username_or_create_pending, INVALID_USERNAME_CHARS};
+use crate::users_ee::send_email_if_possible;
+use crate::utils::get_instance_username_or_create_pending;
 use crate::BASE_URL;
 use crate::{
     apps::AppWithLastVersion,
     db::DB,
     folders::Folder,
     resources::{Resource, ResourceType},
-    users::{send_email_if_possible, WorkspaceInvite, VALID_USERNAME},
+    users::{WorkspaceInvite, VALID_USERNAME},
     utils::require_super_admin,
     webhook_util::WebhookShared,
 };
@@ -34,7 +35,7 @@ use itertools::Itertools;
 use regex::Regex;
 
 use uuid::Uuid;
-use windmill_audit::audit_ee::{audit_log, AuditAuthor, AuditAuthorable};
+use windmill_audit::audit_ee::audit_log;
 use windmill_audit::ActionKind;
 use windmill_common::db::UserDB;
 use windmill_common::s3_helpers::LargeFileStorage;
@@ -116,7 +117,8 @@ pub fn workspaced_service() -> Router {
         .route("/get_workspace_name", get(get_workspace_name))
         .route("/change_workspace_name", post(change_workspace_name))
         .route("/change_workspace_id", post(change_workspace_id))
-        .route("/usage", get(get_usage));
+        .route("/usage", get(get_usage))
+        .route("/used_triggers", get(get_used_triggers));
 
     #[cfg(feature = "stripe")]
     {
@@ -217,11 +219,12 @@ struct EditDeployTo {
     deploy_to: Option<String>,
 }
 
+#[allow(dead_code)]
 #[derive(Deserialize)]
-struct EditAutoInvite {
-    operator: Option<bool>,
-    invite_all: Option<bool>,
-    auto_add: Option<bool>,
+pub struct EditAutoInvite {
+    pub operator: Option<bool>,
+    pub invite_all: Option<bool>,
+    pub auto_add: Option<bool>,
 }
 
 #[derive(Deserialize)]
@@ -572,250 +575,21 @@ async fn edit_deploy_to() -> Result<String> {
     ));
 }
 
-const BANNED_DOMAINS: &str = include_str!("../banned_domains.txt");
+pub const BANNED_DOMAINS: &str = include_str!("../banned_domains.txt");
 
 async fn is_allowed_auto_domain(ApiAuthed { email, .. }: ApiAuthed) -> JsonResult<bool> {
     let domain = email.split('@').last().unwrap();
     return Ok(Json(!BANNED_DOMAINS.contains(domain)));
 }
 
-async fn auto_add_user(
-    email: &str,
-    w_id: &str,
-    operator: &bool,
-    tx: &mut Transaction<'_, Postgres>,
-    authorable: &impl AuditAuthorable,
-) -> Result<String> {
-    let automate_username_creation = sqlx::query_scalar!(
-        "SELECT value FROM global_settings WHERE name = $1",
-        AUTOMATE_USERNAME_CREATION_SETTING,
-    )
-    .fetch_optional(&mut **tx)
-    .await?
-    .map(|v| v.as_bool())
-    .flatten()
-    .unwrap_or(false);
-
-    let username = if automate_username_creation {
-        get_instance_username_or_create_pending(&mut *tx, &email).await?
-    } else {
-        let mut username = email
-            .split('@')
-            .next()
-            .unwrap()
-            .to_string()
-            .replace(".", "");
-
-        username = INVALID_USERNAME_CHARS
-            .replace_all(&mut username, "")
-            .to_string();
-
-        if username.is_empty() {
-            username = "user".to_string()
-        }
-
-        let base_username = username.clone();
-        let mut username_conflict = true;
-        let mut i = 1;
-        while username_conflict {
-            if i > 1000 {
-                return Err(Error::InternalErr(format!(
-                    "too many username conflicts for {}",
-                    email
-                )));
-            }
-            if i > 1 {
-                username = format!("{}{}", base_username, i)
-            }
-            username_conflict = sqlx::query_scalar!(
-                "SELECT EXISTS(SELECT 1 FROM usr WHERE username = $1 AND workspace_id = $2)",
-                &username,
-                &w_id
-            )
-            .fetch_one(&mut **tx)
-            .await?
-            .unwrap_or(false);
-            i += 1;
-        }
-        username
-    };
-
-    sqlx::query!(
-        "INSERT INTO usr (workspace_id, username, email, is_admin, operator) VALUES ($1, $2, $3, false, $4) ON CONFLICT DO NOTHING",
-        &w_id,
-        &username,
-        &email,
-        &operator
-    )
-    .execute(&mut **tx)
-    .await?;
-
-    sqlx::query_as!(
-        Group,
-        "INSERT INTO usr_to_group (workspace_id, usr, group_) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING",
-        &w_id,
-        username,
-        "all",
-    )
-    .execute(&mut **tx)
-    .await?;
-    let audit_author = if authorable.username() == authorable.email() && authorable.email() == email
-    {
-        // if the user is auto adding themselves (e.g. by joining the instance), we use their newly created workspace username for audit logs
-        AuditAuthor {
-            username: username.clone(),
-            email: email.to_string(),
-            username_override: None,
-        }
-    } else {
-        AuditAuthor {
-            username: authorable.username().to_string(),
-            email: authorable.email().to_string(),
-            username_override: authorable.username_override().map(|x| x.to_string()),
-        }
-    };
-    audit_log(
-        &mut **tx,
-        &audit_author,
-        "users.auto_invite_add",
-        ActionKind::Create,
-        &w_id,
-        Some(email),
-        None,
-    )
-    .await?;
-    Ok(username)
-}
-
 async fn edit_auto_invite(
     authed: ApiAuthed,
     Extension(db): Extension<DB>,
     Extension(rsmq): Extension<Option<rsmq_async::MultiplexedRsmq>>,
     Path(w_id): Path<String>,
-    ApiAuthed { is_admin, email, username, .. }: ApiAuthed,
     Json(ea): Json<EditAutoInvite>,
 ) -> Result<String> {
-    require_admin(is_admin, &username)?;
-
-    // #[cfg(not(feature = "enterprise"))]
-    // {
-    //     return Err(Error::BadRequest(
-    //         "Auto-invite is only available on enterprise".to_string(),
-    //     ));
-    // }
-
-    let domain = if ea.invite_all.is_some_and(|x| x) {
-        if *CLOUD_HOSTED {
-            return Err(Error::BadRequest(
-                "invite_all is only available locally".to_string(),
-            ));
-        } else {
-            "*"
-        }
-    } else {
-        email.split('@').last().unwrap()
-    };
-
-    let mut tx = db.begin().await?;
-
-    let mut users_to_auto_add = Option::None;
-
-    if let (Some(operator), Some(auto_add)) = (ea.operator, ea.auto_add) {
-        if BANNED_DOMAINS.contains(domain) {
-            return Err(Error::BadRequest(format!(
-                "Domain {} is not allowed",
-                domain
-            )));
-        }
-
-        sqlx::query!(
-            "UPDATE workspace_settings SET auto_invite_domain = $1, auto_invite_operator = $2, auto_add = $4 WHERE workspace_id = $3",
-            domain,
-            operator,
-            &w_id,
-            auto_add,
-        )
-        .execute(&mut *tx)
-        .await?;
-
-        if auto_add {
-            users_to_auto_add = Some(sqlx::query!(
-                "SELECT email FROM password WHERE ($2::text = '*' OR email LIKE CONCAT('%', $2::text)) AND NOT EXISTS (
-                    SELECT 1 FROM usr WHERE workspace_id = $1::text AND email = password.email
-                )",
-                &w_id,
-                domain
-            )
-            .fetch_all(&mut *tx).await?);
-
-            for user in users_to_auto_add.as_ref().unwrap() {
-                auto_add_user(&user.email, &w_id, &operator, &mut tx, &authed).await?;
-                send_email_if_possible(
-                    &format!("Added to Windmill's workspace: {w_id}"),
-                    &format!(
-                        "You have been granted access to Windmill's workspace {w_id} by {email}.
-                        
-                        Access the workspace at {}/?workspace={w_id}",
-                        BASE_URL.read().await.clone()
-                    ),
-                    &user.email,
-                );
-            }
-        } else {
-            sqlx::query!(
-                "INSERT INTO workspace_invite
-            (workspace_id, email, is_admin, operator)
-            SELECT $1::text, email, false, $3 FROM password WHERE ($2::text = '*' OR email LIKE CONCAT('%', $2::text)) AND NOT EXISTS (
-                SELECT 1 FROM usr WHERE workspace_id = $1::text AND email = password.email
-            )
-            ON CONFLICT DO NOTHING",
-                &w_id,
-                domain,
-                operator
-            )
-            .execute(&mut *tx)
-            .await?;
-        }
-    } else {
-        sqlx::query!(
-            "UPDATE workspace_settings SET auto_invite_domain = NULL, auto_invite_operator = NULL, auto_add = NULL WHERE workspace_id = $1",
-            &w_id,
-        )
-        .execute(&mut *tx)
-        .await?;
-    }
-    audit_log(
-        &mut *tx,
-        &authed,
-        "workspaces.edit_auto_invite_domain",
-        ActionKind::Update,
-        &w_id,
-        Some(&authed.email),
-        Some([("operator", &format!("{:?}", ea.operator)[..])].into()),
-    )
-    .await?;
-    tx.commit().await?;
-
-    if let Some(users) = users_to_auto_add {
-        for user in users {
-            handle_deployment_metadata(
-                &email,
-                &username,
-                &db,
-                &w_id,
-                windmill_git_sync::DeployedObject::User { email: user.email.clone() },
-                Some(format!("Auto-added user '{}' to workspace", &user.email)),
-                rsmq.clone(),
-                true,
-            )
-            .await?;
-        }
-    }
-
-    Ok(format!(
-        "Edit auto-invite for workspace {} to {}",
-        &w_id, domain
-    ))
+    crate::workspaces_ee::edit_auto_invite(authed, db, rsmq, w_id, ea).await
 }
 
 async fn edit_webhook(
@@ -1488,6 +1262,30 @@ async fn set_encryption_key(
     return Ok(());
 }
 
+#[derive(Serialize)]
+struct UsedTriggers {
+    pub websocket_used: bool,
+    pub http_routes_used: bool,
+}
+
+async fn get_used_triggers(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path(w_id): Path<String>,
+) -> JsonResult<UsedTriggers> {
+    let mut tx = user_db.begin(&authed).await?;
+    let websocket_used = sqlx::query_as!(
+        UsedTriggers,
+        r#"SELECT EXISTS(SELECT 1 FROM websocket_trigger WHERE workspace_id = $1) as "websocket_used!", EXISTS(SELECT 1 FROM http_trigger WHERE workspace_id = $1) as "http_routes_used!""#,
+        w_id,
+    )
+    .fetch_one(&mut *tx)
+    .await?;
+    tx.commit().await?;
+
+    Ok(Json(websocket_used))
+}
+
 async fn list_workspaces_as_super_admin(
     authed: ApiAuthed,
     Extension(db): Extension<DB>,
@@ -1976,61 +1774,6 @@ async fn delete_workspace(
     Ok(format!("Deleted workspace {}", &w_id))
 }
 
-pub async fn invite_user_to_all_auto_invite_worspaces(
-    db: &DB,
-    email: &str,
-    rsmq: Option<rsmq_async::MultiplexedRsmq>,
-    authorable: &impl AuditAuthorable,
-) -> Result<()> {
-    let mut tx = db.begin().await?;
-    let domain = email.split('@').last().unwrap();
-    let workspaces = sqlx::query!(
-        "SELECT workspace_id, auto_invite_operator, auto_add FROM workspace_settings ws WHERE (auto_invite_domain = $1 OR auto_invite_domain = '*') AND NOT EXISTS (SELECT 1 FROM usr WHERE workspace_id = ws.workspace_id AND email = $2)",
-        domain,
-        email
-    )
-    .fetch_all(&mut *tx)
-    .await?;
-    let mut auto_added_workspace_usernames: Vec<(String, String)> = vec![];
-    for r in workspaces {
-        if r.auto_add.is_some() && r.auto_add.unwrap() {
-            let operator = r.auto_invite_operator.unwrap_or(false);
-            let username =
-                auto_add_user(email, &r.workspace_id, &operator, &mut tx, authorable).await?;
-            auto_added_workspace_usernames.push((r.workspace_id, username));
-        } else {
-            sqlx::query!(
-                "INSERT INTO workspace_invite
-                    (workspace_id, email, is_admin, operator)
-                    VALUES ($1, $2, false, $3)
-                    ON CONFLICT DO NOTHING",
-                r.workspace_id,
-                email,
-                r.auto_invite_operator
-            )
-            .execute(&mut *tx)
-            .await?;
-        }
-    }
-    tx.commit().await?;
-
-    for workspace_username_tuple in auto_added_workspace_usernames {
-        let (w_id, username) = workspace_username_tuple;
-        handle_deployment_metadata(
-            &email,
-            &username,
-            db,
-            &w_id,
-            windmill_git_sync::DeployedObject::User { email: email.to_string() },
-            Some(format!("Auto-added user '{}' to workspace", email)),
-            rsmq.clone(),
-            true,
-        )
-        .await?;
-    }
-    Ok(())
-}
-
 async fn invite_user(
     ApiAuthed { username, is_admin, .. }: ApiAuthed,
     Extension(db): Extension<DB>,
diff --git a/backend/windmill-api/src/workspaces_ee.rs b/backend/windmill-api/src/workspaces_ee.rs
new file mode 100644
index 0000000000..565a53b174
--- /dev/null
+++ b/backend/windmill-api/src/workspaces_ee.rs
@@ -0,0 +1,16 @@
+use crate::{
+    db::{ApiAuthed, DB},
+    workspaces::EditAutoInvite,
+};
+
+pub async fn edit_auto_invite(
+    _authed: ApiAuthed,
+    _db: DB,
+    _rsmq: Option<rsmq_async::MultiplexedRsmq>,
+    _w_id: String,
+    _ea: EditAutoInvite,
+) -> windmill_common::error::Result<String> {
+    Err(windmill_common::error::Error::InternalErr(
+        "Not implemented on OSS".to_string(),
+    ))
+}
diff --git a/backend/windmill-autoscaling/Cargo.toml b/backend/windmill-autoscaling/Cargo.toml
new file mode 100644
index 0000000000..7aada6f904
--- /dev/null
+++ b/backend/windmill-autoscaling/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "windmill-autoscaling"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+
+[lib]
+name = "windmill_autoscaling"
+path = "./src/lib.rs"
+
+[features]
+enterprise = ["windmill-queue/enterprise", "windmill-common/enterprise"]
+default = []
+
+[dependencies]
+uuid.workspace = true
+serde.workspace = true
+sqlx.workspace = true
+serde_json.workspace = true
+tracing.workspace = true
+windmill-common = { workspace = true, default-features = false }
+windmill-queue.workspace = true
+rsmq_async.workspace = true
+anyhow.workspace = true
\ No newline at end of file
diff --git a/backend/windmill-autoscaling/src/autoscaling_ee.rs b/backend/windmill-autoscaling/src/autoscaling_ee.rs
new file mode 100644
index 0000000000..1c9defbede
--- /dev/null
+++ b/backend/windmill-autoscaling/src/autoscaling_ee.rs
@@ -0,0 +1,6 @@
+use windmill_common::DB;
+
+pub async fn apply_all_autoscaling(_db: &DB) -> anyhow::Result<()> {
+    // Autoscaling is an ee feature
+    Ok(())
+}
diff --git a/backend/windmill-autoscaling/src/lib.rs b/backend/windmill-autoscaling/src/lib.rs
new file mode 100644
index 0000000000..28b9319244
--- /dev/null
+++ b/backend/windmill-autoscaling/src/lib.rs
@@ -0,0 +1,2 @@
+mod autoscaling_ee;
+pub use autoscaling_ee::*;
diff --git a/backend/windmill-common/Cargo.toml b/backend/windmill-common/Cargo.toml
index 09acf22157..f3adbfde84 100644
--- a/backend/windmill-common/Cargo.toml
+++ b/backend/windmill-common/Cargo.toml
@@ -56,6 +56,8 @@ mail-send.workspace = true
 futures-core.workspace = true
 async-stream.workspace = true
 const_format.workspace = true
+crc.workspace = true
+windmill-macros.workspace = true
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemalloc-ctl = { optional = true, workspace = true }
diff --git a/backend/windmill-common/src/ee.rs b/backend/windmill-common/src/ee.rs
index 2f32756e45..e25d36bee1 100644
--- a/backend/windmill-common/src/ee.rs
+++ b/backend/windmill-common/src/ee.rs
@@ -48,8 +48,20 @@ pub async fn send_critical_alert(
 }
 
 #[cfg(feature = "enterprise")]
-pub async fn schedule_key_renewal(_http_client: &reqwest::Client, _db: &crate::db::DB) -> () {
+pub async fn maybe_renew_license_key_on_start(
+    _http_client: &reqwest::Client,
+    _db: &crate::db::DB,
+    force_renew_now: bool,
+) -> bool {
     // Implementation is not open source
+    force_renew_now
+}
+
+#[cfg(feature = "enterprise")]
+pub enum RenewReason {
+    Manual,
+    Schedule,
+    OnStart,
 }
 
 #[cfg(feature = "enterprise")]
@@ -57,7 +69,7 @@ pub async fn renew_license_key(
     _http_client: &reqwest::Client,
     _db: &crate::db::DB,
     _key: Option<String>,
-    _manual: bool,
+    _reason: RenewReason,
 ) -> String {
     // Implementation is not open source
     "".to_string()
@@ -74,3 +86,6 @@ pub async fn create_customer_portal_session(
 
 #[cfg(feature = "enterprise")]
 pub async fn worker_groups_alerts(_db: &DB) {}
+
+#[cfg(feature = "enterprise")]
+pub async fn jobs_waiting_alerts(_db: &DB) {}
diff --git a/backend/windmill-common/src/ee.rs~main b/backend/windmill-common/src/ee.rs~main
deleted file mode 100644
index 482b61a0fe..0000000000
--- a/backend/windmill-common/src/ee.rs~main
+++ /dev/null
@@ -1,73 +0,0 @@
-#[cfg(feature = "enterprise")]
-use crate::db::DB;
-use crate::ee::LicensePlan::Community;
-#[cfg(feature = "enterprise")]
-use crate::error;
-use serde::Deserialize;
-use std::sync::Arc;
-use tokio::sync::RwLock;
-
-lazy_static::lazy_static! {
-  pub static ref LICENSE_KEY_VALID: Arc<RwLock<bool>> = Arc::new(RwLock::new(true));
-  pub static ref LICENSE_KEY_ID: Arc<RwLock<String>> = Arc::new(RwLock::new("".to_string()));
-  pub static ref LICENSE_KEY: Arc<RwLock<String>> = Arc::new(RwLock::new("".to_string()));
-}
-
-pub enum LicensePlan {
-    Community,
-    Pro,
-    Enterprise,
-}
-
-pub async fn get_license_plan() -> LicensePlan {
-    // Implementation is not open source
-    return Community;
-}
-
-#[derive(Deserialize)]
-#[serde(untagged)]
-pub enum CriticalErrorChannel {}
-
-pub enum CriticalAlertKind {
-    #[cfg(feature = "enterprise")]
-    CriticalError,
-    #[cfg(feature = "enterprise")]
-    RecoveredCriticalError,
-}
-
-#[cfg(feature = "enterprise")]
-pub async fn send_critical_alert(
-    _error_message: String,
-    _db: &DB,
-    _kind: CriticalAlertKind,
-    _channels: Option<Vec<CriticalErrorChannel>>,
-) {
-}
-
-#[cfg(feature = "enterprise")]
-pub async fn schedule_key_renewal(_http_client: &reqwest::Client, _db: &crate::db::DB) -> () {
-    // Implementation is not open source
-}
-
-#[cfg(feature = "enterprise")]
-pub async fn renew_license_key(
-    _http_client: &reqwest::Client,
-    _db: &crate::db::DB,
-    _key: Option<String>,
-    _manual: bool,
-) -> String {
-    // Implementation is not open source
-    "".to_string()
-}
-
-#[cfg(feature = "enterprise")]
-pub async fn create_customer_portal_session(
-    _http_client: &reqwest::Client,
-    _key: Option<String>,
-) -> error::Result<String> {
-    // Implementation is not open source
-    Ok("".to_string())
-}
-
-#[cfg(feature = "enterprise")]
-pub async fn worker_groups_alerts(_db: &DB) {}
diff --git a/backend/windmill-common/src/ee.rs~main_0 b/backend/windmill-common/src/ee.rs~main_0
deleted file mode 100644
index 2f32756e45..0000000000
--- a/backend/windmill-common/src/ee.rs~main_0
+++ /dev/null
@@ -1,76 +0,0 @@
-#[cfg(feature = "enterprise")]
-use crate::db::DB;
-use crate::ee::LicensePlan::Community;
-#[cfg(feature = "enterprise")]
-use crate::error;
-use serde::Deserialize;
-use std::sync::Arc;
-use tokio::sync::RwLock;
-
-lazy_static::lazy_static! {
-  pub static ref LICENSE_KEY_VALID: Arc<RwLock<bool>> = Arc::new(RwLock::new(true));
-  pub static ref LICENSE_KEY_ID: Arc<RwLock<String>> = Arc::new(RwLock::new("".to_string()));
-  pub static ref LICENSE_KEY: Arc<RwLock<String>> = Arc::new(RwLock::new("".to_string()));
-}
-
-pub enum LicensePlan {
-    Community,
-    Pro,
-    Enterprise,
-}
-
-pub async fn get_license_plan() -> LicensePlan {
-    // Implementation is not open source
-    return Community;
-}
-
-#[derive(Deserialize)]
-#[serde(untagged)]
-pub enum CriticalErrorChannel {
-    Email { email: String },
-    Slack { slack_channel: String },
-}
-
-pub enum CriticalAlertKind {
-    #[cfg(feature = "enterprise")]
-    CriticalError,
-    #[cfg(feature = "enterprise")]
-    RecoveredCriticalError,
-}
-
-#[cfg(feature = "enterprise")]
-pub async fn send_critical_alert(
-    _error_message: String,
-    _db: &DB,
-    _kind: CriticalAlertKind,
-    _channels: Option<Vec<CriticalErrorChannel>>,
-) {
-}
-
-#[cfg(feature = "enterprise")]
-pub async fn schedule_key_renewal(_http_client: &reqwest::Client, _db: &crate::db::DB) -> () {
-    // Implementation is not open source
-}
-
-#[cfg(feature = "enterprise")]
-pub async fn renew_license_key(
-    _http_client: &reqwest::Client,
-    _db: &crate::db::DB,
-    _key: Option<String>,
-    _manual: bool,
-) -> String {
-    // Implementation is not open source
-    "".to_string()
-}
-
-#[cfg(feature = "enterprise")]
-pub async fn create_customer_portal_session(
-    _http_client: &reqwest::Client,
-    _key: Option<String>,
-) -> error::Result<String> {
-    // Implementation is not open source
-    Ok("".to_string())
-}
-
-#[cfg(feature = "enterprise")]
-pub async fn worker_groups_alerts(_db: &DB) {}
diff --git a/backend/windmill-common/src/email_ee.rs b/backend/windmill-common/src/email_ee.rs
new file mode 100644
index 0000000000..42aebbeec3
--- /dev/null
+++ b/backend/windmill-common/src/email_ee.rs
@@ -0,0 +1,11 @@
+use crate::server::Smtp;
+
+pub async fn send_email(
+    _subject: &str,
+    _content: &str,
+    _to: Vec<String>,
+    _smtp: Smtp,
+    _client_timeout: Option<tokio::time::Duration>,
+) -> crate::error::Result<()> {
+    Ok(())
+}
diff --git a/backend/windmill-common/src/flow_status.rs b/backend/windmill-common/src/flow_status.rs
index 035cadecd8..a5c509d6ef 100644
--- a/backend/windmill-common/src/flow_status.rs
+++ b/backend/windmill-common/src/flow_status.rs
@@ -128,6 +128,7 @@ struct UntaggedFlowStatusModule {
     while_loop: Option<bool>,
     approvers: Option<Vec<Approval>>,
     failed_retries: Option<Vec<Uuid>>,
+    skipped: Option<bool>,
 }
 
 #[derive(Serialize, Debug, Clone)]
@@ -179,6 +180,7 @@ pub enum FlowStatusModule {
         approvers: Vec<Approval>,
         #[serde(skip_serializing_if = "Vec::is_empty")]
         failed_retries: Vec<Uuid>,
+        skipped: bool,
     },
     Failure {
         id: String,
@@ -255,6 +257,7 @@ impl<'de> Deserialize<'de> for FlowStatusModule {
                 branch_chosen: untagged.branch_chosen,
                 approvers: untagged.approvers.unwrap_or_default(),
                 failed_retries: untagged.failed_retries.unwrap_or_default(),
+                skipped: untagged.skipped.unwrap_or(false),
             }),
             "Failure" => Ok(FlowStatusModule::Failure {
                 id: untagged
diff --git a/backend/windmill-common/src/flows.rs b/backend/windmill-common/src/flows.rs
index a5040a9da3..9b66cc65ac 100644
--- a/backend/windmill-common/src/flows.rs
+++ b/backend/windmill-common/src/flows.rs
@@ -101,6 +101,7 @@ pub struct FlowValue {
     #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(default)]
     pub failure_module: Option<Box<FlowModule>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(default)]
     pub preprocessor_module: Option<Box<FlowModule>>,
     #[serde(default)]
@@ -269,6 +270,13 @@ pub struct FlowModule {
     pub delete_after_use: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub continue_on_error: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skip_if: Option<SkipIf>,
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+pub struct SkipIf {
+    pub expr: String,
 }
 
 #[derive(Deserialize)]
@@ -416,6 +424,7 @@ pub enum FlowModuleValue {
         path: String,
         #[serde(skip_serializing_if = "Option::is_none")]
         hash: Option<ScriptHash>,
+        #[serde(skip_serializing_if = "Option::is_none")]
         tag_override: Option<String>,
     },
     Flow {
@@ -631,6 +640,7 @@ pub fn add_virtual_items_if_necessary(modules: &mut Vec<FlowModule>) {
             priority: None,
             delete_after_use: None,
             continue_on_error: None,
+            skip_if: None,
         });
     }
 }
diff --git a/backend/windmill-common/src/global_settings.rs b/backend/windmill-common/src/global_settings.rs
index 36b80c9fd7..b0420ca248 100644
--- a/backend/windmill-common/src/global_settings.rs
+++ b/backend/windmill-common/src/global_settings.rs
@@ -27,6 +27,7 @@ pub const OBJECT_STORE_CACHE_CONFIG_SETTING: &str = "object_store_cache_config";
 
 pub const AUTOMATE_USERNAME_CREATION_SETTING: &str = "automate_username_creation";
 pub const HUB_BASE_URL_SETTING: &str = "hub_base_url";
+pub const HUB_ACCESSIBLE_URL_SETTING: &str = "hub_accessible_url";
 pub const CRITICAL_ERROR_CHANNELS_SETTING: &str = "critical_error_channels";
 pub const DEV_INSTANCE_SETTING: &str = "dev_instance";
 pub const JWT_SECRET_SETTING: &str = "jwt_secret";
diff --git a/backend/windmill-common/src/jobs.rs b/backend/windmill-common/src/jobs.rs
index f7cfe1c9ee..6feceb8d51 100644
--- a/backend/windmill-common/src/jobs.rs
+++ b/backend/windmill-common/src/jobs.rs
@@ -640,9 +640,7 @@ pub async fn get_logs_from_store(
 
     if log_offset > 0 {
         if let Some(file_index) = log_file_index.clone() {
-            tracing::debug!("Getting logs from store: {file_index:?}");
             if let Some(os) = OBJECT_STORE_CACHE_SETTINGS.read().await.clone() {
-                tracing::debug!("object store client present, streaming from there");
 
                 let logs = logs.to_string();
                 let stream = async_stream::stream! {
diff --git a/backend/windmill-common/src/lib.rs b/backend/windmill-common/src/lib.rs
index cd8059251e..ad96594ac8 100644
--- a/backend/windmill-common/src/lib.rs
+++ b/backend/windmill-common/src/lib.rs
@@ -17,10 +17,12 @@ use scripts::ScriptLang;
 use sqlx::{Pool, Postgres};
 
 pub mod apps;
+pub mod auth;
 #[cfg(feature = "benchmark")]
 pub mod bench;
 pub mod db;
 pub mod ee;
+pub mod email_ee;
 pub mod error;
 pub mod external_ip;
 pub mod flow_status;
@@ -32,9 +34,8 @@ pub mod job_s3_helpers_ee;
 pub mod jobs;
 pub mod more_serde;
 pub mod oauth2;
+pub mod queue;
 pub mod s3_helpers;
-
-pub mod auth;
 pub mod schedule;
 pub mod scripts;
 pub mod server;
@@ -95,6 +96,8 @@ lazy_static::lazy_static! {
 
     pub static ref JOB_RETENTION_SECS: Arc<RwLock<i64>> = Arc::new(RwLock::new(0));
 
+    pub static ref INSTANCE_NAME: String = rd_string(5);
+
 }
 
 pub async fn shutdown_signal(
@@ -141,6 +144,7 @@ pub async fn shutdown_signal(
 use tokio::sync::RwLock;
 #[cfg(feature = "prometheus")]
 use tokio::task::JoinHandle;
+use utils::rd_string;
 
 #[cfg(feature = "prometheus")]
 pub async fn serve_metrics(
diff --git a/backend/windmill-common/src/queue.rs b/backend/windmill-common/src/queue.rs
new file mode 100644
index 0000000000..6cbb5611c5
--- /dev/null
+++ b/backend/windmill-common/src/queue.rs
@@ -0,0 +1,16 @@
+use std::collections::HashMap;
+
+use sqlx::{Pool, Postgres};
+
+pub async fn get_queue_counts(db: &Pool<Postgres>) -> HashMap<String, u32> {
+    sqlx::query_as::<_, (String, i64)>(
+        "SELECT tag, count(*) as count FROM queue WHERE
+            scheduled_for <= now() - ('3 seconds')::interval AND running = false
+            GROUP BY tag",
+    )
+    .fetch_all(db)
+    .await
+    .ok()
+    .map(|v| v.into_iter().map(|(k, v)| (k, v as u32)).collect())
+    .unwrap_or_else(|| HashMap::new())
+}
diff --git a/backend/windmill-common/src/s3_helpers.rs b/backend/windmill-common/src/s3_helpers.rs
index 198283db2d..4547c29d51 100644
--- a/backend/windmill-common/src/s3_helpers.rs
+++ b/backend/windmill-common/src/s3_helpers.rs
@@ -117,10 +117,10 @@ pub struct S3Object {
 
 #[cfg(feature = "parquet")]
 pub async fn get_etag_or_empty(
-    object_store_resource: &ObjectStoreResource,
+    object_store_resource: &mut ObjectStoreResource,
     s3_object: S3Object,
 ) -> Option<String> {
-    let object_store_client = build_object_store_client(object_store_resource);
+    let object_store_client = build_object_store_client(object_store_resource).await;
     if object_store_client.is_err() {
         return None;
     }
@@ -166,11 +166,11 @@ pub fn render_endpoint(
 }
 
 #[cfg(feature = "parquet")]
-pub fn build_object_store_client(
+pub async fn build_object_store_client(
     resource_ref: &ObjectStoreResource,
 ) -> error::Result<Arc<dyn ObjectStore>> {
     match resource_ref {
-        ObjectStoreResource::S3(s3_resource_ref) => build_s3_client(&s3_resource_ref, None),
+        ObjectStoreResource::S3(s3_resource_ref) => build_s3_client(&s3_resource_ref).await,
         ObjectStoreResource::Azure(azure_blob_resource_ref) => {
             build_azure_blob_client(&azure_blob_resource_ref)
         }
@@ -225,10 +225,21 @@ use aws_config::{default_provider::credentials::DefaultCredentialsChain, Region}
 use object_store::CredentialProvider;
 
 #[cfg(feature = "parquet")]
-pub fn build_s3_client(
-    s3_resource_ref: &S3Resource,
-    credential_providers: Option<DefaultCredentialsChain>,
-) -> error::Result<Arc<dyn ObjectStore>> {
+pub async fn build_s3_client(s3_resource_ref: &S3Resource) -> error::Result<Arc<dyn ObjectStore>> {
+    let static_creds = s3_resource_ref.access_key.as_ref().is_some_and(|x| x != "")
+        || s3_resource_ref.secret_key.as_ref().is_some_and(|x| x != "");
+
+    let credentials_provider = if !static_creds {
+        Some(
+            DefaultCredentialsChain::builder()
+                .region(Region::new(s3_resource_ref.region.clone()))
+                .build()
+                .await,
+        )
+    } else {
+        None
+    };
+
     let s3_resource = s3_resource_ref.clone();
     let endpoint = render_endpoint(
         s3_resource.endpoint,
@@ -244,7 +255,7 @@ pub fn build_s3_client(
         .with_bucket_name(s3_resource.bucket)
         .with_endpoint(endpoint);
 
-    if let Some(credentials_provider) = credential_providers {
+    if let Some(credentials_provider) = credentials_provider {
         store_builder = store_builder.with_credentials(Arc::new(AwsCredentialAdapter {
             inner: credentials_provider,
         }));
@@ -399,18 +410,7 @@ pub async fn build_s3_client_from_settings(
 ) -> error::Result<Arc<dyn ObjectStore>> {
     let region = none_if_empty(settings.region)
         .unwrap_or_else(|| std::env::var("AWS_REGION").unwrap_or_else(|_| "us-east-1".to_string()));
-    let access_key = none_if_empty(settings.access_key);
-    let secret_key = none_if_empty(settings.secret_key);
-    let credentials_provider = if access_key.is_none() && secret_key.is_none() {
-        Some(
-            DefaultCredentialsChain::builder()
-                .region(Region::new(region.clone()))
-                .build()
-                .await,
-        )
-    } else {
-        None
-    };
+
     let s3_resource = S3Resource {
         endpoint: none_if_empty(settings.endpoint).unwrap_or_else(|| {
             std::env::var("S3_ENDPOINT").unwrap_or_else(|_| format!("s3.{region}.amazonaws.com"))
@@ -419,15 +419,15 @@ pub async fn build_s3_client_from_settings(
             std::env::var("S3_CACHE_BUCKET").unwrap_or_else(|_| "missingbucket".to_string())
         }),
         region,
-        access_key,
-        secret_key,
+        access_key: settings.access_key,
+        secret_key: settings.secret_key,
         use_ssl: !settings.allow_http.unwrap_or(true),
         path_style: settings.path_style,
         port: settings.port,
         token: None,
     };
 
-    build_s3_client(&s3_resource, credentials_provider)
+    build_s3_client(&s3_resource).await
 }
 
 #[cfg(feature = "parquet")]
diff --git a/backend/windmill-common/src/stats_ee.rs b/backend/windmill-common/src/stats_ee.rs
index 48845d5f51..5d2dc82b82 100644
--- a/backend/windmill-common/src/stats_ee.rs
+++ b/backend/windmill-common/src/stats_ee.rs
@@ -8,11 +8,7 @@ pub async fn get_disable_stats_setting(_db: &DB) -> bool {
     false
 }
 
-pub async fn schedule_stats(
-    _instance_name: String,
-    _db: &DB,
-    _http_client: &reqwest::Client,
-) -> () {
+pub async fn schedule_stats(_db: &DB, _http_client: &reqwest::Client) -> () {
     // stats details are closed source
 }
 
@@ -23,10 +19,16 @@ struct JobsUsage {
     count: i64,
 }
 
+pub enum SendStatsReason {
+    Manual,
+    Schedule,
+    OnStart,
+}
+
 pub async fn send_stats(
-    _instance_name: &String,
     _http_client: &reqwest::Client,
     _db: &DB,
+    _reason: SendStatsReason,
 ) -> Result<()> {
     // stats details are closed source
     Ok(())
diff --git a/backend/windmill-common/src/utils.rs b/backend/windmill-common/src/utils.rs
index 8676878352..04f95a3406 100644
--- a/backend/windmill-common/src/utils.rs
+++ b/backend/windmill-common/src/utils.rs
@@ -11,13 +11,11 @@ use crate::ee::LICENSE_KEY_ID;
 use crate::ee::{send_critical_alert, CriticalAlertKind};
 use crate::error::{to_anyhow, Error, Result};
 use crate::global_settings::UNIQUE_ID_SETTING;
-use crate::server::Smtp;
 use crate::DB;
 use anyhow::Context;
 use gethostname::gethostname;
 use git_version::git_version;
-use mail_send::mail_builder::MessageBuilder;
-use mail_send::SmtpClientBuilder;
+
 use rand::{distributions::Alphanumeric, thread_rng, Rng};
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
@@ -189,7 +187,7 @@ pub fn calculate_hash(s: &str) -> String {
     format!("{:x}", hasher.finalize())
 }
 
-pub async fn get_uid(db: &DB) -> Result<String> {
+pub async fn get_uid<'c, E: sqlx::Executor<'c, Database = Postgres>>(db: E) -> Result<String> {
     let mut uid = LICENSE_KEY_ID.read().await.clone();
 
     if uid == "" {
@@ -206,6 +204,14 @@ pub async fn get_uid(db: &DB) -> Result<String> {
     Ok(uid)
 }
 
+pub fn map_string_to_number(s: &str, max_number: u64) -> u64 {
+    use std::collections::hash_map::DefaultHasher;
+    use std::hash::{Hash, Hasher};
+    let mut hasher = DefaultHasher::new();
+    s.hash(&mut hasher);
+    hasher.finish() % (max_number + 1)
+}
+
 #[derive(Serialize, Deserialize, PartialEq, Clone)]
 #[serde(rename_all = "lowercase")]
 pub enum Mode {
@@ -228,56 +234,11 @@ impl std::fmt::Display for Mode {
     }
 }
 
-pub async fn send_email(
-    subject: &str,
-    content: &str,
-    to: Vec<String>,
-    smtp: Smtp,
-    client_timeout: Option<tokio::time::Duration>,
-) -> Result<()> {
-    let mut client = SmtpClientBuilder::new(smtp.host, smtp.port)
-        .implicit_tls(smtp.tls_implicit.unwrap_or(false));
-    if std::env::var("ACCEPT_INVALID_CERTS").is_ok() {
-        client = client.allow_invalid_certs();
-    }
-    let client = if let (Some(username), Some(password)) = (smtp.username, smtp.password) {
-        if !username.is_empty() {
-            client.credentials((username, password))
-        } else {
-            client
-        }
-    } else {
-        client
-    };
-    let message = MessageBuilder::new()
-        .from(("Windmill", smtp.from.as_str()))
-        .to(to.clone())
-        .subject(subject)
-        .text_body(content);
-
-    match client_timeout {
-        Some(timeout) => {
-            tokio::time::timeout(timeout, client.connect())
-                .await
-                .map_err(to_anyhow)?
-                .map_err(to_anyhow)?
-                .send(message)
-                .await
-                .map_err(to_anyhow)?;
-        }
-        None => {
-            client
-                .connect()
-                .await
-                .map_err(to_anyhow)?
-                .send(message)
-                .await
-                .map_err(to_anyhow)?;
-        }
-    }
-    tracing::info!("Sent email to {:#?}: {subject}", to);
-
-    return Ok(());
+// inspired from rails: https://github.com/rails/rails/blob/6e49cc77ab3d16c06e12f93158eaf3e507d4120e/activerecord/lib/active_record/migration.rb#L1308
+pub fn generate_lock_id(database_name: &str) -> i64 {
+    const CRC_IEEE: crc::Crc<u32> = crc::Crc::<u32>::new(&crc::CRC_32_ISO_HDLC);
+    // 0x3d32ad9e chosen by fair dice roll
+    0x3d32ad9e * (CRC_IEEE.checksum(database_name.as_bytes()) as i64)
 }
 
 pub async fn report_critical_error(error_message: String, _db: DB) -> () {
diff --git a/backend/windmill-common/src/worker.rs b/backend/windmill-common/src/worker.rs
index 9464eccdcc..37ae61c8d6 100644
--- a/backend/windmill-common/src/worker.rs
+++ b/backend/windmill-common/src/worker.rs
@@ -13,6 +13,7 @@ use std::{
     sync::{atomic::AtomicBool, Arc},
 };
 use tokio::sync::RwLock;
+use windmill_macros::annotations;
 
 use crate::{error, global_settings::CUSTOM_TAGS_SETTING, server::Smtp, DB};
 
@@ -303,46 +304,25 @@ fn parse_file<T: FromStr>(path: &str) -> Option<T> {
         .flatten()
 }
 
-pub struct Annotations {
-    pub npm_mode: bool,
-    pub nodejs_mode: bool,
-    pub native_mode: bool,
+#[annotations("#")]
+pub struct PythonAnnotations {
+    pub no_cache: bool,
+    pub no_uv: bool,
+}
+
+#[annotations("//")]
+pub struct TypeScriptAnnotations {
+    pub npm: bool,
+    pub nodejs: bool,
+    pub native: bool,
     pub nobundling: bool,
 }
 
-pub fn get_annotation(inner_content: &str) -> Annotations {
-    let annotations = inner_content
-        .lines()
-        .take_while(|x| x.starts_with("//"))
-        .map(|x| x.to_string().replace("//", "").trim().to_string())
-        .collect_vec();
-    let nodejs_mode: bool = annotations.contains(&"nodejs".to_string());
-    let npm_mode: bool = annotations.contains(&"npm".to_string());
-    let native_mode: bool = annotations.contains(&"native".to_string());
-
-    //TODO: remove || npm_mode when bun build is more powerful
-    let nobundling: bool =
-        annotations.contains(&"nobundling".to_string()) || nodejs_mode || *DISABLE_BUNDLING;
-
-    Annotations { npm_mode, nodejs_mode, native_mode, nobundling }
-}
-
+#[annotations("--")]
 pub struct SqlAnnotations {
     pub return_last_result: bool,
 }
 
-pub fn get_sql_annotations(inner_content: &str) -> SqlAnnotations {
-    let annotations = inner_content
-        .lines()
-        .take_while(|x| x.starts_with("--"))
-        .map(|x| x.to_string().replace("--", "").trim().to_string())
-        .collect_vec();
-
-    let return_last_result: bool = annotations.contains(&"return_last_result".to_string());
-
-    SqlAnnotations { return_last_result }
-}
-
 pub async fn load_cache(bin_path: &str, _remote_path: &str) -> (bool, String) {
     if tokio::fs::metadata(&bin_path).await.is_ok() {
         (true, format!("loaded from local cache: {}\n", bin_path))
@@ -449,10 +429,13 @@ pub async fn save_cache(
 fn write_binary_file(main_path: &str, byts: &mut bytes::Bytes) -> error::Result<()> {
     use std::fs::{File, Permissions};
     use std::io::Write;
+
+    #[cfg(unix)]
     use std::os::unix::fs::PermissionsExt;
 
     let mut file = File::create(main_path)?;
     file.write_all(byts)?;
+    #[cfg(unix)]
     file.set_permissions(Permissions::from_mode(0o755))?;
     file.flush()?;
     Ok(())
diff --git a/backend/windmill-indexer/Cargo.toml b/backend/windmill-indexer/Cargo.toml
index fa88503511..b345e02917 100644
--- a/backend/windmill-indexer/Cargo.toml
+++ b/backend/windmill-indexer/Cargo.toml
@@ -29,3 +29,4 @@ tempfile.workspace = true
 bytes.workspace = true
 object_store = { workspace = true, optional = true}
 tokio-tar.workspace = true
+lazy_static.workspace = true
diff --git a/backend/windmill-indexer/src/indexer_ee.rs b/backend/windmill-indexer/src/indexer_ee.rs
index 79bcbcff77..da92ff0ef8 100644
--- a/backend/windmill-indexer/src/indexer_ee.rs
+++ b/backend/windmill-indexer/src/indexer_ee.rs
@@ -1,6 +1,6 @@
+use anyhow::anyhow;
 use sqlx::{Pool, Postgres};
 use windmill_common::error::Error;
-use anyhow::anyhow;
 
 #[derive(Clone)]
 pub struct IndexReader;
diff --git a/backend/windmill-macros/Cargo.toml b/backend/windmill-macros/Cargo.toml
new file mode 100644
index 0000000000..100b4678d3
--- /dev/null
+++ b/backend/windmill-macros/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "windmill-macros"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+
+[lib]
+proc-macro = true
+
+[dependencies]
+proc-macro2.workspace = true
+quote.workspace = true
+syn.workspace = true
+
+# Dependencies for tests
+[dev-dependencies]
+# tests/annotation.rs
+lazy_static.workspace = true
+itertools.workspace = true
+regex.workspace = true
diff --git a/backend/windmill-macros/src/lib.rs b/backend/windmill-macros/src/lib.rs
new file mode 100644
index 0000000000..25ff8cbaa2
--- /dev/null
+++ b/backend/windmill-macros/src/lib.rs
@@ -0,0 +1,95 @@
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{parse_macro_input, Ident, ItemStruct, Lit};
+
+#[proc_macro_attribute]
+pub fn annotations(attr: TokenStream, item: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(item as ItemStruct);
+    let name = input.ident.clone();
+    let fields = input
+        .fields
+        .iter()
+        .map(|f| f.ident.clone().unwrap())
+        .collect::<Vec<Ident>>();
+
+    // Match on the literal to extract the string value
+    let comm_lit = match parse_macro_input!(attr as Lit) {
+        Lit::Str(lit_str) => lit_str.value(), // This will give "#" without quotes
+        _ => panic!("Expected a string literal"),
+    };
+
+    // Generate regex
+    let mut reg = format!("^{}|", &comm_lit);
+    {
+        for field in fields.iter() {
+            reg.push_str(&(field.to_string()));
+            reg.push_str("\\b");
+        }
+
+        reg.push_str(r#"|\w+"#);
+    }
+    // Example of generated regex:
+    // ^#
+    // |ann1\b|ann2\b|ann3\b|ann4\b
+    // |\w+
+
+    TokenStream::from(quote! {
+        #[derive(Default, Debug)]
+        #input
+
+        impl std::ops::BitOrAssign for #name{
+            fn bitor_assign(&mut self, rhs: Self) {
+                // Unfold fields
+                // Read more: https://docs.rs/quote/latest/quote/macro.quote.html#interpolation
+                #( self.#fields |= rhs.#fields; )*
+            }
+        }
+
+        impl #name {
+            /// Autogenerated by windmill-macros
+            pub fn parse(inner_content: &str) -> Self{
+                let mut res = Self::default();
+                lazy_static::lazy_static! {
+                    static ref RE: regex::Regex = regex::Regex::new(#reg).unwrap();
+                }
+                // Create lines stream
+                let mut lines = inner_content.lines();
+                'outer: while let Some(line) = lines.next() {
+                    // If comment sign(s) on the right place
+                    let mut comms = false;
+                    // New instance
+                    // We will apply it if in line only annotations
+                    let mut new = Self::default();
+
+                    'inner: for (i, mat) in RE.find_iter(line).enumerate() {
+
+                        match mat.as_str(){
+                            #comm_lit if i == 0 => {
+                                comms = true;
+                                continue 'inner;
+                            },
+
+                            // Will expand into something like:
+                            //            "ann1"   => new.ann1    = true,
+                            //            "ann2"   => new.ann2    = true,
+                            //            "ann3"   => new.ann3    = true,
+                            #( stringify!(#fields) => new.#fields = true, )*
+                            // Non annotations
+                            _ => continue 'outer,
+                        };
+                    }
+
+                    if !comms {
+                        // We dont want to continue if line does not start with #
+                        return res;
+                    }
+
+                    // Apply changes
+                    res |= new;
+                }
+
+                res
+            }
+        }
+    })
+}
diff --git a/backend/windmill-macros/tests/annotations.rs b/backend/windmill-macros/tests/annotations.rs
new file mode 100644
index 0000000000..fd430dfaeb
--- /dev/null
+++ b/backend/windmill-macros/tests/annotations.rs
@@ -0,0 +1,169 @@
+#[cfg(test)]
+mod annotations_tests {
+
+    extern crate windmill_macros;
+    use itertools::Itertools;
+    use windmill_macros::annotations;
+
+    // Previous implementation.
+    // We have to make sure that new one works the same as old one
+    fn old(inner_content: &str) -> Annotations {
+        let annotations = inner_content
+            .lines()
+            .take_while(|x| x.starts_with("#"))
+            .map(|x| x.to_string().replace("#", "").trim().to_string())
+            .collect_vec();
+
+        let ann1: bool = annotations.contains(&"ann1".to_string());
+        let ann2: bool = annotations.contains(&"ann2".to_string());
+        let ann3: bool = annotations.contains(&"ann3".to_string());
+        let ann4: bool = annotations.contains(&"ann4".to_string());
+        let ann5: bool = annotations.contains(&"ann5".to_string());
+
+        Annotations { ann1, ann2, ann3, ann4, ann5 }
+    }
+
+    #[annotations("#")]
+    #[derive(Eq, PartialEq, Copy, Clone)]
+    pub struct Annotations {
+        pub ann1: bool,
+        pub ann2: bool,
+        pub ann3: bool,
+        pub ann4: bool,
+        pub ann5: bool,
+    }
+
+    #[annotations("//")]
+    #[derive(Eq, PartialEq, Copy, Clone)]
+    pub struct SlashedAnnotations {
+        pub ann1: bool,
+        pub ann2: bool,
+        pub ann3: bool,
+        pub ann4: bool,
+    }
+
+    #[annotations("--")]
+    #[derive(Eq, PartialEq, Copy, Clone)]
+    pub struct MinusedAnnotations {
+        pub ann1: bool,
+        pub ann2: bool,
+    }
+
+    // e.g. rust, TS and JS
+    #[test]
+    fn slashed_annotations() {
+        let cont = "// ann1
+// ann2
+//ann3";
+        assert_eq!(
+            SlashedAnnotations { ann1: true, ann2: true, ann3: true, ann4: false },
+            SlashedAnnotations::parse(cont)
+        );
+    }
+
+    // e.g. Haskell, SQL
+    #[test]
+    fn minused_annotations() {
+        let cont = "-- ann1
+-- ann2";
+        assert_eq!(
+            MinusedAnnotations { ann1: true, ann2: true },
+            MinusedAnnotations::parse(cont)
+        );
+    }
+
+    #[test]
+    fn simple_integration() {
+        let cont = "# ann1";
+        let expected = Annotations { ann1: true, ..Default::default() };
+        assert_eq!(expected, old(cont));
+        assert_eq!(expected, Annotations::parse(cont));
+    }
+
+    #[test]
+    fn multiline_integration() {
+        let cont = "# ann2
+# ann3
+# ann4
+# ann5
+            ";
+        let expected = Annotations {
+            ann1: false,
+            ann2: true,
+            ann3: true,
+            ann4: true,
+            ann5: true,
+            //
+        };
+        assert_eq!(expected, old(cont));
+        assert_eq!(expected, Annotations::parse(cont));
+    }
+
+    #[test]
+    fn spacing_integration() {
+        // First line is ignored and not used
+        {
+            let cont = "
+# ann2";
+            let expected = Annotations { ..Default::default() };
+            assert_eq!(expected, old(cont));
+            assert_eq!(expected, Annotations::parse(cont));
+        }
+        // Wrong spacing for ann3
+        {
+            let cont = "# ann2
+                        # ann3";
+
+            let expected = Annotations { ann2: true, ..Default::default() };
+            assert_eq!(expected, old(cont));
+            assert_eq!(expected, Annotations::parse(cont));
+        }
+
+        // Drunk but valid spacing
+        {
+            let cont = "#ann1
+#                        ann2";
+            let expected = Annotations { ann2: true, ann1: true, ..Default::default() };
+            assert_eq!(expected, old(cont));
+            assert_eq!(expected, Annotations::parse(cont));
+        }
+    }
+
+    #[test]
+    fn comments_inbetween_integration() {
+        let cont = "# ann2
+# Just comment, has nothing to do with annotations
+# Another comment: ann1 ann2 ann3
+# ann4 is not valid annotation
+# Actual annotation next line:
+# ann5
+
+# Should be ignored
+# ann3
+            ";
+        let expected = Annotations { ann2: true, ann5: true, ..Default::default() };
+        assert_eq!(expected, old(cont));
+        assert_eq!(expected, Annotations::parse(cont));
+    }
+
+    #[test]
+    fn hash_collision() {
+        // TODO
+    }
+    #[test]
+    fn non_matching_integration() {
+        {
+            let cont = r#" "ann1", ann2 "#;
+            let expected = Annotations::default();
+            assert_eq!(expected, old(cont));
+            assert_eq!(expected, Annotations::parse(cont));
+        }
+        // Empty
+        {
+            let cont = "";
+            let expected = Annotations::default();
+            assert_eq!(expected, old(cont));
+            assert_eq!(expected, Annotations::parse(cont));
+        }
+    }
+}
diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs
index eca874aa63..c0235c9b26 100644
--- a/backend/windmill-queue/src/jobs.rs
+++ b/backend/windmill-queue/src/jobs.rs
@@ -482,6 +482,7 @@ where
     }
 }
 
+#[cfg(feature = "enterprise")]
 #[derive(Deserialize)]
 struct RawFlowFailureModule {
     #[cfg(feature = "enterprise")]
@@ -3535,6 +3536,7 @@ pub async fn push<'c, 'd, R: rsmq_async::RsmqConnection + Send + 'c>(
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 }],
                 same_worker: false,
                 failure_module: None,
diff --git a/backend/windmill-worker/Cargo.toml b/backend/windmill-worker/Cargo.toml
index c05bc26fc3..e5b47b7a81 100644
--- a/backend/windmill-worker/Cargo.toml
+++ b/backend/windmill-worker/Cargo.toml
@@ -18,6 +18,7 @@ parquet = ["windmill-common/parquet", "dep:object_store"]
 flow_testing = []
 cloud = []
 sqlx = []
+deno_core = ["dep:deno_fetch", "dep:deno_webidl", "dep:deno_web", "dep:deno_net", "dep:deno_console", "dep:deno_url", "dep:deno_core", "dep:deno_ast", "dep:deno_tls"]
 
 [dependencies]
 windmill-queue.workspace = true
@@ -59,15 +60,15 @@ once_cell.workspace = true
 rsmq_async.workspace = true
 tokio-postgres.workspace = true
 bit-vec.workspace = true
-deno_fetch.workspace = true
-deno_webidl.workspace = true
-deno_web.workspace = true
-deno_net.workspace = true
-deno_console.workspace = true
-deno_url.workspace = true
-deno_core.workspace = true
-deno_ast.workspace = true
-deno_tls.workspace = true
+deno_fetch = { workspace = true, optional = true }
+deno_webidl = { workspace = true, optional = true }
+deno_web = { workspace = true, optional = true }
+deno_net = { workspace = true, optional = true }
+deno_console = { workspace = true, optional = true }
+deno_url = { workspace = true, optional = true }
+deno_core = { workspace = true, optional = true }
+deno_ast = { workspace = true, optional = true }
+deno_tls = { workspace = true, optional = true }
 postgres-native-tls.workspace = true
 native-tls.workspace = true
 mysql_async.workspace = true
@@ -89,13 +90,17 @@ tar.workspace = true
 object_store = { workspace = true, optional = true}
 convert_case.workspace = true
 yaml-rust.workspace = true
+swc_ecma_parser.workspace = true
+
 
 [build-dependencies]
-deno_fetch.workspace = true
-deno_webidl.workspace = true
-deno_web.workspace = true
-deno_console.workspace = true
-deno_url.workspace = true
-deno_core.workspace = true
-deno_net.workspace = true
+deno_fetch = { workspace = true, optional = true }
+deno_webidl = { workspace = true, optional = true }
+deno_web = { workspace = true, optional = true }
+deno_net = { workspace = true, optional = true }
+deno_console = { workspace = true, optional = true }
+deno_url = { workspace = true, optional = true }
+deno_core = { workspace = true, optional = true }
+deno_ast = { workspace = true, optional = true }
+deno_tls = { workspace = true, optional = true }
 zstd.workspace = true
diff --git a/backend/windmill-worker/build.rs b/backend/windmill-worker/build.rs
index 8fa581fd5c..6bbc3fd75f 100644
--- a/backend/windmill-worker/build.rs
+++ b/backend/windmill-worker/build.rs
@@ -1,13 +1,24 @@
+#[cfg(feature = "deno_core")]
 use deno_fetch::FetchPermissions;
+#[cfg(feature = "deno_core")]
 use deno_net::NetPermissions;
+#[cfg(feature = "deno_core")]
 use deno_web::{BlobStore, TimersPermission};
+#[cfg(feature = "deno_core")]
+use std::borrow::Cow;
+#[cfg(feature = "deno_core")]
 use std::env;
+#[cfg(feature = "deno_core")]
 use std::io::Write;
-use std::path::PathBuf;
+#[cfg(feature = "deno_core")]
+use std::path::{Path, PathBuf};
+#[cfg(feature = "deno_core")]
 use std::sync::Arc;
 
+// #[cfg(feature = "deno_core")]
 pub struct PermissionsContainer;
 
+#[cfg(feature = "deno_core")]
 impl FetchPermissions for PermissionsContainer {
     #[inline(always)]
     fn check_net_url(
@@ -15,19 +26,20 @@ impl FetchPermissions for PermissionsContainer {
         _url: &deno_core::url::Url,
         _api_name: &str,
     ) -> Result<(), deno_core::error::AnyError> {
-        Ok(())
+        unreachable!("snapshotting")
     }
 
     #[inline(always)]
-    fn check_read(
+    fn check_read<'a>(
         &mut self,
-        _p: &std::path::Path,
+        _p: &'a std::path::Path,
         _api_name: &str,
-    ) -> Result<(), deno_core::error::AnyError> {
-        Ok(())
+    ) -> Result<Cow<'a, Path>, deno_core::error::AnyError> {
+        unreachable!("snapshotting")
     }
 }
 
+#[cfg(feature = "deno_core")]
 impl TimersPermission for PermissionsContainer {
     #[inline(always)]
     fn allow_hrtime(&mut self) -> bool {
@@ -35,21 +47,22 @@ impl TimersPermission for PermissionsContainer {
     }
 }
 
+#[cfg(feature = "deno_core")]
 impl NetPermissions for PermissionsContainer {
-    fn check_read(
+    fn check_read<'a>(
         &mut self,
-        _p: &std::path::Path,
+        _p: &'a str,
         _api_name: &str,
-    ) -> Result<(), deno_core::error::AnyError> {
-        Ok(())
+    ) -> Result<PathBuf, deno_core::error::AnyError> {
+        unreachable!("snapshotting")
     }
 
-    fn check_write(
+    fn check_write<'a>(
         &mut self,
-        _p: &std::path::Path,
+        _p: &'a str,
         _api_name: &str,
-    ) -> Result<(), deno_core::error::AnyError> {
-        Ok(())
+    ) -> Result<PathBuf, deno_core::error::AnyError> {
+        unreachable!("snapshotting")
     }
 
     fn check_net<T: AsRef<str>>(
@@ -57,16 +70,26 @@ impl NetPermissions for PermissionsContainer {
         _host: &(T, Option<u16>),
         _api_name: &str,
     ) -> Result<(), deno_core::error::AnyError> {
-        Ok(())
+        unreachable!("snapshotting")
+    }
+
+    fn check_write_path<'a>(
+        &mut self,
+        _: &'a Path,
+        _: &str,
+    ) -> Result<Cow<'a, Path>, deno_core::anyhow::Error> {
+        todo!()
     }
 }
 
+#[cfg(feature = "deno_core")]
 deno_core::extension!(
     fetch,
     esm_entry_point = "ext:fetch/src/runtime.js",
     esm = ["src/runtime.js"],
 );
 
+#[cfg(feature = "deno_core")]
 fn main() {
     println!("cargo:rustc-env=TARGET={}", env::var("TARGET").unwrap());
     println!("cargo:rustc-env=PROFILE={}", env::var("PROFILE").unwrap());
@@ -122,3 +145,6 @@ fn main() {
         println!("cargo:rerun-if-changed={}", path.display());
     }
 }
+
+#[cfg(not(feature = "deno_core"))]
+fn main() {}
diff --git a/backend/windmill-worker/loader.bun.js b/backend/windmill-worker/loader.bun.js
index b6efb68774..ce75cbfc15 100644
--- a/backend/windmill-worker/loader.bun.js
+++ b/backend/windmill-worker/loader.bun.js
@@ -8,29 +8,65 @@ const p = {
       "localhost",
       "127.0.0.1"
     );
+
     const w_id = "W_ID";
     const current_path = "CURRENT_PATH";
+    const token = "TOKEN";
+
+    const cdir = resolve("./");
+    const cdirNoPrivate = cdir.replace(/^\/private/, ""); // for macos
+    const filterResolve = new RegExp(
+      `^(?!\\.\/main\\.ts)(?!${cdir}\/main\\.ts)(?!(?:/private)?${cdirNoPrivate}\/wrapper\\.mjs).*\\.ts$`
+    );
+
+    let cdirNodeModules = `${cdir}/node_modules/`;
+
+    const filterLoad = new RegExp(`^${cdir}\/main\\.ts$`);
+    const transpiler = new Bun.Transpiler({
+      loader: "tsx",
+    });
+
+    function replaceRelativeImports(code) {
+      const imports = transpiler.scanImports(code);
+      for (const imp of imports) {
+        if (imp.kind == "import-statement") {
+          if (imp.path.startsWith(".") && !imp.path.endsWith(".ts")) {
+            code = code.replaceAll(imp.path, imp.path + ".ts");
+          }
+        }
+      }
+      return {
+        contents: code,
+      };
+    }
+
+    build.onLoad({ filter: filterLoad }, async (args) => {
+      const code = readFileSync(args.path, "utf8");
+      return replaceRelativeImports(code);
+    });
 
     build.onLoad({ filter: /.*\.url$/ }, async (args) => {
       const url = readFileSync(args.path, "utf8");
-      const contents = await (
-        await fetch(url, {
-          method: "GET",
-          headers: { Authorization: "Bearer TOKEN" },
-        })
-      ).text();
+      const req = await fetch(url, {
+        method: "GET",
+        headers: {
+          Authorization: "Bearer " + token,
+        },
+      });
+      if (!req.ok) {
+        throw new Error(
+          `Failed to find relative import at ${url}`,
+          req.statusText
+        );
+      }
+      const contents = await req.text();
       return {
-        contents,
+        contents: replaceRelativeImports(contents).contents,
         loader: "tsx",
       };
     });
-    const cdir = resolve("./");
-    const cdirNoPrivate = cdir.replace(/^\/private/, ""); // for macos
-    const filter = new RegExp(
-      `^(?!\\.\/main\\.ts)(?!${cdir}\/main\\.ts)(?!(?:/private)?${cdirNoPrivate}\/wrapper\\.mjs).*\\.ts$`
-    );
-    let cdirNodeModules = `${cdir}/node_modules/`;
-    build.onResolve({ filter }, (args) => {
+
+    build.onResolve({ filter: filterResolve }, (args) => {
       if (args.importer?.startsWith(cdirNodeModules)) {
         return undefined;
       }
@@ -41,9 +77,10 @@ const p = {
 
       const isRelative = !args.path.startsWith("/");
 
+      let endExt = args.path.endsWith(".ts") ? "" : ".ts";
       const url = isRelative
-        ? `${base_internal_url}/api/w/${w_id}/scripts/RAW_GET_ENDPOINT/p/${file_path}/../${args.path}`
-        : `${base_internal_url}/api/w/${w_id}/scripts/RAW_GET_ENDPOINT/p/${args.path}`;
+        ? `${base_internal_url}/api/w/${w_id}/scripts/raw_unpinned/p/${file_path}/../${args.path}${endExt}`
+        : `${base_internal_url}/api/w/${w_id}/scripts/raw_unpinned/p/${args.path}${endExt}`;
       const file = isRelative
         ? resolve("./" + file_path + "/../" + args.path + ".url")
         : resolve("./" + args.path + ".url");
diff --git a/backend/windmill-worker/nsjail/run.python3.config.proto b/backend/windmill-worker/nsjail/run.python3.config.proto
index bbdf5ed306..06ced731c3 100644
--- a/backend/windmill-worker/nsjail/run.python3.config.proto
+++ b/backend/windmill-worker/nsjail/run.python3.config.proto
@@ -97,6 +97,13 @@ mount {
 	is_bind: true
 }
 
+mount {
+    dst: "/dev/shm"
+    fstype: "tmpfs"
+    rw: true
+    is_bind: false
+}
+
 mount {
     src: "/dev/random"
     dst: "/dev/random"
diff --git a/backend/windmill-worker/src/ansible_executor.rs b/backend/windmill-worker/src/ansible_executor.rs
index 6639189f61..abd9b68415 100644
--- a/backend/windmill-worker/src/ansible_executor.rs
+++ b/backend/windmill-worker/src/ansible_executor.rs
@@ -1,3 +1,4 @@
+#[cfg(unix)]
 use std::{
     collections::HashMap,
     os::unix::fs::PermissionsExt,
@@ -5,6 +6,13 @@ use std::{
     process::Stdio,
 };
 
+#[cfg(windows)]
+use std::{
+    collections::HashMap,
+    path::{Path, PathBuf},
+    process::Stdio,
+};
+
 use anyhow::anyhow;
 use itertools::Itertools;
 use serde_json::value::RawValue;
@@ -15,7 +23,7 @@ use windmill_common::{
     jobs::QueuedJob,
     worker::{to_raw_value, write_file, write_file_at_user_defined_location, WORKER_CONFIG},
 };
-use windmill_parser_yaml::AnsibleRequirements;
+use windmill_parser_yaml::{AnsibleRequirements, ResourceOrVariablePath};
 use windmill_queue::{append_logs, CanceledBy};
 
 use crate::{
@@ -25,9 +33,9 @@ use crate::{
         OccupancyMetrics,
     },
     handle_child::handle_child,
-    python_executor::{create_dependencies_dir, handle_python_reqs, pip_compile},
+    python_executor::{create_dependencies_dir, handle_python_reqs, uv_pip_compile},
     AuthedClientBackgroundTask, DISABLE_NSJAIL, DISABLE_NUSER, HOME_ENV, NSJAIL_PATH, PATH_ENV,
-    TZ_ENV,
+    PROXY_ENVS, TZ_ENV,
 };
 
 lazy_static::lazy_static! {
@@ -72,7 +80,7 @@ async fn handle_ansible_python_deps(
             if requirements.is_empty() {
                 "".to_string()
             } else {
-                pip_compile(
+                uv_pip_compile(
                     job_id,
                     &requirements,
                     mem_peak,
@@ -82,6 +90,8 @@ async fn handle_ansible_python_deps(
                     worker_name,
                     w_id,
                     &mut Some(occupancy_metrics),
+                    false,
+                    false,
                 )
                 .await
                 .map_err(|e| {
@@ -137,6 +147,7 @@ async fn install_galaxy_collections(
     galaxy_command
         .current_dir(job_dir)
         .env_clear()
+        .envs(PROXY_ENVS.clone())
         .env("PATH", PATH_ENV.as_str())
         .env("TZ", TZ_ENV.as_str())
         // .env("BASE_INTERNAL_URL", base_internal_url)
@@ -175,7 +186,7 @@ async fn install_galaxy_collections(
 #[cfg(not(feature = "enterprise"))]
 fn check_ansible_exists() -> Result<(), error::Error> {
     if !Path::new(ANSIBLE_PLAYBOOK_PATH.as_str()).exists() {
-        let msg = format!("Couldn't find ansible-playbook at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full` for your instance in order to run rust jobs.", ANSIBLE_PLAYBOOK_PATH.as_str());
+        let msg = format!("Couldn't find ansible-playbook at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full` for your instance in order to run Ansible jobs.", ANSIBLE_PLAYBOOK_PATH.as_str());
         return Err(error::Error::NotFound(msg));
     }
     Ok(())
@@ -184,7 +195,7 @@ fn check_ansible_exists() -> Result<(), error::Error> {
 #[cfg(feature = "enterprise")]
 fn check_ansible_exists() -> Result<(), error::Error> {
     if !Path::new(ANSIBLE_PLAYBOOK_PATH.as_str()).exists() {
-        let msg = format!("Couldn't find ansible-playbook at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full-ee` for your instance in order to run rust jobs.", ANSIBLE_PLAYBOOK_PATH.as_str());
+        let msg = format!("Couldn't find ansible-playbook at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-ee-full` for your instance in order to run Ansible jobs.", ANSIBLE_PLAYBOOK_PATH.as_str());
         return Err(error::Error::NotFound(msg));
     }
     Ok(())
@@ -378,12 +389,14 @@ fi
 
         let file = write_file(job_dir, "wrapper.sh", &wrapper)?;
 
+        #[cfg(unix)]
         file.metadata()?.permissions().set_mode(0o777);
         // let mut nsjail_cmd = Command::new(NSJAIL_PATH.as_str());
         let mut nsjail_cmd = Command::new(NSJAIL_PATH.as_str());
         nsjail_cmd
             .current_dir(job_dir)
             .env_clear()
+            .envs(PROXY_ENVS.clone())
             // inject PYTHONPATH here - for some reason I had to do it in nsjail conf
             .envs(reserved_variables)
             .env("PATH", PATH_ENV.as_str())
@@ -545,22 +558,12 @@ async fn create_file_resources(
     }
 
     for file_res in &r.file_resources {
-        let r = client
-            .get_resource_value_interpolated::<serde_json::Value>(
-                &file_res.resource_path,
-                Some(job_id.to_string()),
-            )
-            .await?;
+        let r =
+            get_resource_or_variable_content(client, &file_res.resource_path, job_id.to_string())
+                .await?;
         let path = file_res.target_path.clone();
-        let validated_path = write_file_at_user_defined_location(
-            job_dir,
-            path.as_str(),
-            r.get("content").and_then(|v| v.as_str()).ok_or(anyhow!(
-                "Invalid text file resource {}, `content` field absent or invalid",
-                &file_res.resource_path
-            ))?,
-        )
-        .map_err(|e| anyhow!("Couldn't write text file at {}: {}", path, e))?;
+        let validated_path = write_file_at_user_defined_location(job_dir, path.as_str(), &r)
+            .map_err(|e| anyhow!("Couldn't write text file at {}: {}", path, e))?;
 
         nsjail_mounts.push(
             define_nsjail_mount(job_dir, &validated_path)
@@ -568,7 +571,7 @@ async fn create_file_resources(
         );
 
         logs.push_str(&format!(
-            "\nCreated {} from {}",
+            "\nCreated {} from {:?}",
             file_res.target_path, file_res.resource_path
         ));
     }
@@ -576,3 +579,26 @@ async fn create_file_resources(
 
     Ok(nsjail_mounts)
 }
+
+async fn get_resource_or_variable_content(
+    client: &crate::AuthedClient,
+    path: &ResourceOrVariablePath,
+    job_id: String,
+) -> anyhow::Result<String> {
+    Ok(match path {
+        ResourceOrVariablePath::Resource(p) => {
+            let r = client
+                .get_resource_value_interpolated::<serde_json::Value>(&p, Some(job_id))
+                .await?;
+
+            r.get("content")
+                .and_then(|v| v.as_str())
+                .ok_or(anyhow!(
+                    "Invalid text file resource {}, `content` field absent or invalid",
+                    p
+                ))?
+                .to_string()
+        }
+        ResourceOrVariablePath::Variable(p) => client.get_variable_value(&p).await?,
+    })
+}
diff --git a/backend/windmill-worker/src/bash_executor.rs b/backend/windmill-worker/src/bash_executor.rs
index e9b135d277..2c4c46ab7d 100644
--- a/backend/windmill-worker/src/bash_executor.rs
+++ b/backend/windmill-worker/src/bash_executor.rs
@@ -29,9 +29,12 @@ use crate::{
     },
     handle_child::handle_child,
     AuthedClientBackgroundTask, DISABLE_NSJAIL, DISABLE_NUSER, HOME_ENV, NSJAIL_PATH, PATH_ENV,
-    POWERSHELL_CACHE_DIR, POWERSHELL_PATH, TZ_ENV,
+    POWERSHELL_CACHE_DIR, POWERSHELL_PATH, PROXY_ENVS, TZ_ENV,
 };
 
+#[cfg(windows)]
+use crate::SYSTEM_ROOT;
+
 lazy_static::lazy_static! {
 
     pub static ref ANSI_ESCAPE_RE: Regex = Regex::new(r"\x1b\[[0-9;]*m").unwrap();
@@ -56,11 +59,42 @@ pub async fn handle_bash_job(
     append_logs(&job.id, &job.workspace_id, logs1, db).await;
 
     write_file(job_dir, "main.sh", &format!("set -e\n{content}"))?;
-    write_file(
-        job_dir,
-        "wrapper.sh",
-        &format!("set -o pipefail\nset -e\nmkfifo bp\ncat bp | tail -1 > ./result2.out &\n {bash} ./main.sh \"$@\" 2>&1 | tee bp\nwait $!", bash = BIN_BASH.as_str()),
-    )?;
+    let script = format!(
+        r#"
+set -o pipefail
+set -e
+
+# Function to kill child processes
+cleanup() {{
+    echo "Terminating child processes..."
+
+    # Ignore SIGTERM and SIGINT
+    trap '' SIGTERM SIGINT
+
+    # Kill the process group of the script (negative PID value)
+    pkill -P $$
+    exit
+}}
+
+
+# Trap SIGTERM (or other signals) and call cleanup function
+trap cleanup SIGTERM SIGINT
+
+# Create a named pipe
+mkfifo bp
+
+# Start background processes
+cat bp | tail -1 >> ./result2.out &
+
+# Run main.sh in the same process group
+{bash} ./main.sh "$@" 2>&1 | tee bp &
+
+# Wait for all background processes to finish
+wait
+"#,
+        bash = BIN_BASH.as_str(),
+    );
+    write_file(job_dir, "wrapper.sh", &script)?;
 
     let token = client.get_token().await;
     let mut reserved_variables = get_reserved_variables(job, &token, db).await?;
@@ -109,6 +143,7 @@ pub async fn handle_bash_job(
             .current_dir(job_dir)
             .env_clear()
             .envs(reserved_variables)
+            .envs(PROXY_ENVS.clone())
             .env("PATH", PATH_ENV.as_str())
             .env("BASE_INTERNAL_URL", base_internal_url)
             .args(cmd_args)
@@ -226,13 +261,19 @@ pub async fn handle_powershell_job(
             .collect::<Vec<_>>()
     };
 
+    #[cfg(windows)]
+    let split_char = '\\';
+
+    #[cfg(unix)]
+    let split_char = '/';
+
     let installed_modules = fs::read_dir(POWERSHELL_CACHE_DIR)?
         .filter_map(|x| {
             x.ok().map(|x| {
                 x.path()
                     .display()
                     .to_string()
-                    .split('/')
+                    .split(split_char)
                     .last()
                     .unwrap_or_default()
                     .to_lowercase()
@@ -289,34 +330,83 @@ pub async fn handle_powershell_job(
     append_logs(&job.id, &job.workspace_id, logs2, db).await;
 
     // make sure default (only allhostsallusers) modules are loaded, disable autoload (cache can be large to explore especially on cloud) and add /tmp/windmill/cache to PSModulePath
+    #[cfg(unix)]
     let profile = format!(
         "$PSModuleAutoloadingPreference = 'None'
 $PSModulePathBackup = $env:PSModulePath
-$env:PSModulePath = ($Env:PSModulePath -split ':')[-1]
+$env:PSModulePath = \"$PSHome/Modules\"
 Get-Module -ListAvailable | Import-Module
 $env:PSModulePath = \"{}:$PSModulePathBackup\"",
         POWERSHELL_CACHE_DIR
     );
+
+    #[cfg(windows)]
+    let profile = format!(
+        "$PSModuleAutoloadingPreference = 'None'
+$PSModulePathBackup = $env:PSModulePath
+$env:PSModulePath = \"C:\\Program Files\\PowerShell\\7\\Modules\"
+Get-Module -ListAvailable | Import-Module
+$env:PSModulePath = \"{};$PSModulePathBackup\"",
+        POWERSHELL_CACHE_DIR
+    );
+
+    // NOTE: powershell error handling / termination is quite tricky compared to bash
+    // here we're trying to catch terminating errors and propagate the exit code
+    // to the caller such that the job will be marked as failed. It's up to the user
+    // to catch specific errors in their script not caught by the below as there is no
+    // generic set -eu as in bash
+    let strict_termination_start = "$ErrorActionPreference = 'Stop'\n\
+        Set-StrictMode -Version Latest\n\
+        try {\n";
+
+    let strict_termination_end = "\n\
+        } catch {\n\
+            Write-Output \"An error occurred:\n\"\
+            Write-Output $_
+            exit 1\n\
+        }\n";
+
     // make sure param() is first
     let param_match = windmill_parser_bash::RE_POWERSHELL_PARAM.find(&content);
     let content: String = if let Some(param_match) = param_match {
         let param_match = param_match.as_str();
         format!(
-            "{}\n{}\n{}",
+            "{}\n{}\n{}\n{}\n{}",
             param_match,
             profile,
-            content.replace(param_match, "")
+            strict_termination_start,
+            content.replace(param_match, ""),
+            strict_termination_end
         )
     } else {
         format!("{}\n{}", profile, content)
     };
 
     write_file(job_dir, "main.ps1", content.as_str())?;
+
+    #[cfg(unix)]
     write_file(
         job_dir,
         "wrapper.sh",
         &format!("set -o pipefail\nset -e\nmkfifo bp\ncat bp | tail -1 > ./result2.out &\n{} -F ./main.ps1 \"$@\" 2>&1 | tee bp\nwait $!", POWERSHELL_PATH.as_str()),
     )?;
+
+    #[cfg(windows)]
+    write_file(
+        job_dir,
+        "wrapper.ps1",
+        &format!(
+            "param([string[]]$args)\n\
+    $ErrorActionPreference = 'Stop'\n\
+    $pipe = New-TemporaryFile\n\
+    & \"{}\" -File ./main.ps1 @args 2>&1 | Tee-Object -FilePath $pipe\n\
+    Get-Content -Path $pipe | Select-Object -Last 1 | Set-Content -Path './result2.out'\n\
+    Remove-Item $pipe\n\
+    exit $LASTEXITCODE\n",
+            POWERSHELL_PATH.as_str()
+        ),
+    )?;
+
     let token = client.get_token().await;
     let mut reserved_variables = get_reserved_variables(job, &token, db).await?;
     reserved_variables.insert("RUST_LOG".to_string(), "info".to_string());
@@ -346,6 +436,7 @@ $env:PSModulePath = \"{}:$PSModulePathBackup\"",
         Command::new(NSJAIL_PATH.as_str())
             .current_dir(job_dir)
             .env_clear()
+            .envs(PROXY_ENVS.clone())
             .envs(reserved_variables)
             .env("TZ", TZ_ENV.as_str())
             .env("PATH", PATH_ENV.as_str())
@@ -355,10 +446,24 @@ $env:PSModulePath = \"{}:$PSModulePathBackup\"",
             .stderr(Stdio::piped())
             .spawn()?
     } else {
-        let mut cmd_args = vec!["wrapper.sh"];
-        cmd_args.extend(pwsh_args.iter().map(|x| x.as_str()));
-        Command::new(BIN_BASH.as_str())
-            .current_dir(job_dir)
+        let mut cmd;
+        let mut cmd_args;
+
+        #[cfg(unix)]
+        {
+            cmd_args = vec!["wrapper.sh"];
+            cmd_args.extend(pwsh_args.iter().map(|x| x.as_str()));
+            cmd = Command::new(BIN_BASH.as_str());
+        }
+
+        #[cfg(windows)]
+        {
+            cmd_args = vec![r".\wrapper.ps1".to_string()];
+            cmd_args.extend(pwsh_args.iter().map(|x| x.replace("--", "-")));
+            cmd = Command::new(POWERSHELL_PATH.as_str());
+        }
+
+        cmd.current_dir(job_dir)
             .env_clear()
             .envs(envs)
             .envs(reserved_variables)
@@ -366,11 +471,53 @@ $env:PSModulePath = \"{}:$PSModulePathBackup\"",
             .env("PATH", PATH_ENV.as_str())
             .env("BASE_INTERNAL_URL", base_internal_url)
             .env("HOME", HOME_ENV.as_str())
-            .args(cmd_args)
+            .args(&cmd_args)
             .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .spawn()?
+            .stderr(Stdio::piped());
+
+        #[cfg(windows)]
+        {
+            cmd.env("SystemRoot", SYSTEM_ROOT.as_str())
+                .env(
+                    "LOCALAPPDATA",
+                    std::env::var("LOCALAPPDATA")
+                        .unwrap_or_else(|_| format!("{}\\AppData\\Local", HOME_ENV.as_str())),
+                )
+                .env(
+                    "ProgramData",
+                    std::env::var("ProgramData")
+                        .unwrap_or_else(|_| String::from("C:\\ProgramData")),
+                )
+                .env(
+                    "ProgramFiles",
+                    std::env::var("ProgramFiles")
+                        .unwrap_or_else(|_| String::from("C:\\Program Files")),
+                )
+                .env(
+                    "ProgramFiles(x86)",
+                    std::env::var("ProgramFiles(x86)")
+                        .unwrap_or_else(|_| String::from("C:\\Program Files (x86)")),
+                )
+                .env(
+                    "ProgramW6432",
+                    std::env::var("ProgramW6432")
+                        .unwrap_or_else(|_| String::from("C:\\Program Files")),
+                )
+                .env(
+                    "TMP",
+                    std::env::var("TMP").unwrap_or_else(|_| String::from("/tmp")),
+                )
+                .env(
+                    "PATHEXT",
+                    std::env::var("PATHEXT").unwrap_or_else(|_| {
+                        String::from(".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.CPL")
+                    }),
+                );
+        }
+
+        cmd.spawn()?
     };
+
     handle_child(
         &job.id,
         db,
diff --git a/backend/windmill-worker/src/bigquery_executor.rs b/backend/windmill-worker/src/bigquery_executor.rs
index 1552686b79..2438392680 100644
--- a/backend/windmill-worker/src/bigquery_executor.rs
+++ b/backend/windmill-worker/src/bigquery_executor.rs
@@ -5,7 +5,6 @@ use futures::{FutureExt, TryFutureExt};
 use serde_json::{json, value::RawValue, Value};
 use windmill_common::error::to_anyhow;
 use windmill_common::jobs::QueuedJob;
-use windmill_common::worker::get_sql_annotations;
 use windmill_common::{error::Error, worker::to_raw_value};
 use windmill_parser_sql::{
     parse_bigquery_sig, parse_db_resource, parse_sql_blocks, parse_sql_statement_named_params,
@@ -238,7 +237,7 @@ pub async fn do_bigquery(
         return Err(Error::BadRequest("Missing database argument".to_string()));
     };
 
-    let annotations = get_sql_annotations(query);
+    let annotations = windmill_common::worker::SqlAnnotations::parse(query);
 
     let service_account = CustomServiceAccount::from_json(&database)
         .map_err(|e| Error::ExecutionErr(e.to_string()))?;
diff --git a/backend/windmill-worker/src/bun_executor.rs b/backend/windmill-worker/src/bun_executor.rs
index e17f140b32..5b7c2a06c0 100644
--- a/backend/windmill-worker/src/bun_executor.rs
+++ b/backend/windmill-worker/src/bun_executor.rs
@@ -1,8 +1,14 @@
-use std::{collections::HashMap, fs, io, path::Path, process::Stdio, time::Instant};
+#[cfg(feature = "deno_core")]
+use std::time::Instant;
+use std::{collections::HashMap, fs, io, path::Path, process::Stdio};
 
 use base64::Engine;
 use itertools::Itertools;
+
+#[cfg(not(feature = "deno_core"))]
+use serde_json::value::to_raw_value;
 use serde_json::value::RawValue;
+
 use sha2::Digest;
 use uuid::Uuid;
 use windmill_parser_ts::remove_pinned_imports;
@@ -20,9 +26,12 @@ use crate::{
     handle_child::handle_child,
     AuthedClientBackgroundTask, BUNFIG_INSTALL_SCOPES, BUN_BUNDLE_CACHE_DIR, BUN_CACHE_DIR,
     BUN_DEPSTAR_CACHE_DIR, BUN_PATH, DISABLE_NSJAIL, DISABLE_NUSER, HOME_ENV, NODE_BIN_PATH,
-    NODE_PATH, NPM_CONFIG_REGISTRY, NPM_PATH, NSJAIL_PATH, PATH_ENV, TZ_ENV,
+    NODE_PATH, NPM_CONFIG_REGISTRY, NPM_PATH, NSJAIL_PATH, PATH_ENV, PROXY_ENVS, TZ_ENV,
 };
 
+#[cfg(windows)]
+use crate::SYSTEM_ROOT;
+
 use tokio::{fs::File, process::Command};
 
 use tokio::io::AsyncReadExt;
@@ -38,7 +47,7 @@ use windmill_common::{
     get_latest_hash_for_path,
     jobs::{QueuedJob, PREPROCESSOR_FAKE_ENTRYPOINT},
     scripts::ScriptLang,
-    worker::{exists_in_cache, get_annotation, save_cache, write_file},
+    worker::{exists_in_cache, save_cache, write_file},
     DB,
 };
 
@@ -54,8 +63,26 @@ const RELATIVE_BUN_BUILDER: &str = include_str!("../loader_builder.bun.js");
 const NSJAIL_CONFIG_RUN_BUN_CONTENT: &str = include_str!("../nsjail/run.bun.config.proto");
 
 pub const BUN_LOCKB_SPLIT: &str = "\n//bun.lockb\n";
+pub const BUN_LOCKB_SPLIT_WINDOWS: &str = "\r\n//bun.lockb\r\n";
+
 pub const EMPTY_FILE: &str = "<empty>";
 
+fn split_lockfile(lockfile: &str) -> (&str, Option<&str>, bool) {
+    if let Some(index) = lockfile.find(BUN_LOCKB_SPLIT) {
+        // Split using "\n//bun.lockb\n"
+        let (before, after_with_sep) = lockfile.split_at(index);
+        let after = &after_with_sep[BUN_LOCKB_SPLIT.len()..];
+        (before, Some(after), after == EMPTY_FILE)
+    } else if let Some(index) = lockfile.find(BUN_LOCKB_SPLIT_WINDOWS) {
+        // Split using "\r\n//bun.lockb\r\n"
+        let (before, after_with_sep) = lockfile.split_at(index);
+        let after = &after_with_sep[BUN_LOCKB_SPLIT_WINDOWS.len()..];
+        (before, Some(after), after == EMPTY_FILE)
+    } else {
+        (lockfile, None, false)
+    }
+}
+
 pub async fn gen_bun_lockfile(
     mem_peak: &mut i32,
     canceled_by: &mut Option<CanceledBy>,
@@ -112,6 +139,9 @@ pub async fn gen_bun_lockfile(
             .stdout(Stdio::piped())
             .stderr(Stdio::piped());
 
+        #[cfg(windows)]
+        child_cmd.env("SystemRoot", SYSTEM_ROOT.as_str());
+
         let mut child_process = start_child_process(child_cmd, &*BUN_PATH).await?;
 
         if let Some(db) = db {
@@ -168,7 +198,12 @@ pub async fn gen_bun_lockfile(
             file.read_to_string(&mut content).await?;
         }
         if !npm_mode {
+            #[cfg(any(target_os = "linux", target_os = "macos"))]
             content.push_str(BUN_LOCKB_SPLIT);
+
+            #[cfg(target_os = "windows")]
+            content.push_str(BUN_LOCKB_SPLIT_WINDOWS);
+
             {
                 let file = format!("{job_dir}/bun.lockb");
                 if !empty_deps && tokio::fs::metadata(&file).await.is_ok() {
@@ -240,11 +275,15 @@ pub async fn install_bun_lockfile(
     child_cmd
         .current_dir(job_dir)
         .env_clear()
+        .envs(PROXY_ENVS.clone())
         .envs(common_bun_proc_envs)
         .args(vec!["install"])
         .stdout(Stdio::piped())
         .stderr(Stdio::piped());
 
+    #[cfg(windows)]
+    child_cmd.env("SystemRoot", SYSTEM_ROOT.as_str());
+
     let mut npm_logs = if npm_mode {
         "NPM mode\n".to_string()
     } else {
@@ -453,6 +492,10 @@ pub async fn generate_wrapper_mjs(
         .args(vec!["run", "node_builder.ts"])
         .stdout(Stdio::piped())
         .stderr(Stdio::piped());
+
+    #[cfg(windows)]
+    child.env("SystemRoot", SYSTEM_ROOT.as_str());
+
     let child_process = start_child_process(child, &*BUN_PATH).await?;
     handle_child(
         job_id,
@@ -487,7 +530,7 @@ pub async fn generate_bun_bundle(
     mem_peak: &mut i32,
     canceled_by: &mut Option<CanceledBy>,
     common_bun_proc_envs: &HashMap<String, String>,
-    occupancy_metrics: &mut OccupancyMetrics,
+    occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
 ) -> Result<()> {
     let mut child = Command::new(&*BUN_PATH);
     child
@@ -498,6 +541,10 @@ pub async fn generate_bun_bundle(
         .args(vec!["run", "node_builder.ts"])
         .stdout(Stdio::piped())
         .stderr(Stdio::piped());
+
+    #[cfg(windows)]
+    child.env("SystemRoot", SYSTEM_ROOT.as_str());
+
     let mut child_process = start_child_process(child, &*BUN_PATH).await?;
     if let Some(db) = db {
         handle_child(
@@ -512,7 +559,7 @@ pub async fn generate_bun_bundle(
             "bun build",
             timeout,
             false,
-            &mut Some(occupancy_metrics),
+            occupancy_metrics,
         )
         .await?;
     } else {
@@ -540,7 +587,11 @@ pub async fn pull_codebase(w_id: &str, id: &str, job_dir: &str) -> Result<()> {
         if is_tar {
             extract_tar(fs::read(bun_cache_path)?.into(), job_dir).await?;
         } else {
+            #[cfg(unix)]
             tokio::fs::symlink(&bun_cache_path, dst).await?;
+
+            #[cfg(windows)]
+            std::os::windows::fs::symlink_dir(&bun_cache_path, &dst)?;
         }
     } else if let Some(os) = windmill_common::s3_helpers::OBJECT_STORE_CACHE_SETTINGS
         .read()
@@ -553,7 +604,11 @@ pub async fn pull_codebase(w_id: &str, id: &str, job_dir: &str) -> Result<()> {
         if is_tar {
             extract_tar(bytes, job_dir).await?;
         } else {
+            #[cfg(unix)]
             tokio::fs::symlink(bun_cache_path, dst).await?;
+
+            #[cfg(windows)]
+            std::os::windows::fs::symlink_dir(&bun_cache_path, &dst)?;
         }
 
         // extract_tar(bytes, job_dir).await?;
@@ -619,7 +674,7 @@ pub async fn prebundle_bun_script(
     base_internal_url: &str,
     worker_name: &str,
     token: &str,
-    occupancy_metrics: &mut OccupancyMetrics,
+    occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
 ) -> Result<()> {
     let (local_path, remote_path) = compute_bundle_local_and_remote_path(
         inner_content,
@@ -632,7 +687,7 @@ pub async fn prebundle_bun_script(
     if exists_in_cache(&local_path, &remote_path).await {
         return Ok(());
     }
-    let annotation = get_annotation(inner_content);
+    let annotation = windmill_common::worker::TypeScriptAnnotations::parse(inner_content);
     if annotation.nobundling {
         return Ok(());
     }
@@ -645,9 +700,9 @@ pub async fn prebundle_bun_script(
         &token,
         w_id,
         script_path,
-        if annotation.nodejs_mode {
+        if annotation.nodejs {
             LoaderMode::NodeBundle
-        } else if annotation.native_mode {
+        } else if annotation.native {
             LoaderMode::BrowserBundle
         } else {
             LoaderMode::BunBundle
@@ -722,17 +777,24 @@ async fn compute_bundle_local_and_remote_path(
 
     let hash = windmill_common::utils::calculate_hash(&input_src);
     let local_path = format!("{BUN_BUNDLE_CACHE_DIR}/{hash}");
+
+    #[cfg(windows)]
+    let local_path = local_path.replace("/tmp", r"C:\tmp").replace("/", r"\");
+
     let remote_path = format!("{BUN_BUNDLE_OBJECT_STORE_PREFIX}{hash}");
     (local_path, remote_path)
 }
 
 pub async fn prepare_job_dir(reqs: &str, job_dir: &str) -> Result<()> {
-    let splitted = reqs.split(BUN_LOCKB_SPLIT).collect::<Vec<&str>>();
-    let _ = write_file(job_dir, "package.json", &splitted[0])?;
+    let (pkg, lock, empty) = split_lockfile(reqs);
+    let _ = write_file(job_dir, "package.json", pkg)?;
 
-    if splitted[1] != EMPTY_FILE {
-        let _ = write_lockb(splitted[1], job_dir).await?;
+    if !empty {
+        if let Some(lock) = lock {
+            let _ = write_lockb(lock, job_dir).await?;
+        }
     }
+
     Ok(())
 }
 async fn write_lockb(splitted_lockb_2: &str, job_dir: &str) -> Result<()> {
@@ -765,7 +827,7 @@ pub async fn handle_bun_job(
     new_args: &mut Option<HashMap<String, Box<RawValue>>>,
     occupancy_metrics: &mut OccupancyMetrics,
 ) -> error::Result<Box<RawValue>> {
-    let mut annotation = windmill_common::worker::get_annotation(inner_content);
+    let mut annotation = windmill_common::worker::TypeScriptAnnotations::parse(inner_content);
 
     let (mut has_bundle_cache, cache_logs, local_path, remote_path) =
         if requirements_o.is_some() && !annotation.nobundling && codebase.is_none() {
@@ -787,7 +849,7 @@ pub async fn handle_bun_job(
 
     if !codebase.is_some() && !has_bundle_cache {
         let _ = write_file(job_dir, "main.ts", inner_content)?;
-    } else if !annotation.native_mode && codebase.is_none() {
+    } else if !annotation.native && codebase.is_none() {
         let _ = write_file(job_dir, "package.json", r#"{ "type": "module" }"#)?;
     };
 
@@ -795,7 +857,7 @@ pub async fn handle_bun_job(
         get_common_bun_proc_envs(Some(&base_internal_url)).await;
 
     if codebase.is_some() {
-        annotation.nodejs_mode = true
+        annotation.nodejs = true
     }
     let (main_override, apply_preprocessor) = match get_main_override(job.args.as_ref()) {
         Some(main_override) => {
@@ -809,16 +871,29 @@ pub async fn handle_bun_job(
     };
 
     #[cfg(not(feature = "enterprise"))]
-    if annotation.nodejs_mode || annotation.npm_mode {
+    if annotation.nodejs || annotation.npm {
         return Err(error::Error::ExecutionErr(
             "Nodejs / npm mode is an EE feature".to_string(),
         ));
     }
 
-    let mut gbuntar_name = None;
+    let mut gbuntar_name: Option<String> = None;
     if has_bundle_cache {
-        let target = format!("{job_dir}/main.js");
-        std::os::unix::fs::symlink(&local_path, &target).map_err(|e| {
+        let target;
+        let symlink;
+
+        #[cfg(unix)]
+        {
+            target = format!("{job_dir}/main.js");
+            symlink = std::os::unix::fs::symlink(&local_path, &target);
+        }
+        #[cfg(windows)]
+        {
+            target = format!("{job_dir}\\main.js");
+            symlink = std::os::windows::fs::symlink_dir(&local_path, &target);
+        }
+
+        symlink.map_err(|e| {
             error::Error::ExecutionErr(format!(
                 "could not copy cached binary from {local_path} to {job_dir}/main: {e:?}"
             ))
@@ -826,22 +901,23 @@ pub async fn handle_bun_job(
     } else if let Some(codebase) = codebase.as_ref() {
         pull_codebase(&job.workspace_id, codebase, job_dir).await?;
     } else if let Some(reqs) = requirements_o.as_ref() {
-        let splitted = reqs.split(BUN_LOCKB_SPLIT).collect::<Vec<&str>>();
-        if splitted.len() != 2 && !annotation.npm_mode {
+        let (pkg, lock, empty) = split_lockfile(reqs);
+
+        if lock.is_none() && !annotation.npm {
             return Err(error::Error::ExecutionErr(
                 format!("Invalid requirements, expected to find //bun.lockb split pattern in reqs. Found: |{reqs}|")
             ));
         }
 
-        let _ = write_file(job_dir, "package.json", &splitted[0])?;
-        let lockb = if annotation.npm_mode { "" } else { splitted[1] };
-        if lockb != EMPTY_FILE {
+        let _ = write_file(job_dir, "package.json", pkg)?;
+        let lockb = if annotation.npm { "" } else { lock.unwrap() };
+        if !empty {
             let mut skip_install = false;
             let mut create_buntar = false;
             let mut buntar_path = "".to_string();
 
-            if !annotation.npm_mode {
-                let _ = write_lockb(&splitted[1], job_dir).await?;
+            if !annotation.npm {
+                let _ = write_lockb(lockb, job_dir).await?;
 
                 let mut sha_path = sha2::Sha256::new();
                 sha_path.update(lockb.as_bytes());
@@ -873,7 +949,7 @@ pub async fn handle_bun_job(
                     job_dir,
                     worker_name,
                     common_bun_proc_envs.clone(),
-                    annotation.npm_mode,
+                    annotation.npm,
                     &mut Some(occupancy_metrics),
                 )
                 .await?;
@@ -915,7 +991,7 @@ pub async fn handle_bun_job(
             worker_name,
             false,
             None,
-            annotation.npm_mode,
+            annotation.npm,
             &mut Some(occupancy_metrics),
         )
         .await?;
@@ -923,19 +999,19 @@ pub async fn handle_bun_job(
         // }
     }
 
-    let mut init_logs = if annotation.native_mode {
+    let mut init_logs = if annotation.native {
         "\n\n--- NATIVE CODE EXECUTION ---\n".to_string()
     } else if has_bundle_cache {
-        if annotation.nodejs_mode {
+        if annotation.nodejs {
             "\n\n--- NODE BUNDLE SNAPSHOT EXECUTION ---\n".to_string()
         } else {
             "\n\n--- BUN BUNDLE SNAPSHOT EXECUTION ---\n".to_string()
         }
     } else if codebase.is_some() {
         "\n\n--- NODE CODEBASE SNAPSHOT EXECUTION ---\n".to_string()
-    } else if annotation.native_mode {
+    } else if annotation.native {
         "\n\n--- NATIVE CODE EXECUTION ---\n".to_string()
-    } else if annotation.nodejs_mode {
+    } else if annotation.nodejs {
         write_file(job_dir, "main.ts", &remove_pinned_imports(inner_content)?)?;
         "\n\n--- NODE CODE EXECUTION ---\n".to_string()
     } else {
@@ -955,7 +1031,7 @@ pub async fn handle_bun_job(
     }
 
     let write_wrapper_f = async {
-        if !has_bundle_cache && annotation.native_mode {
+        if !has_bundle_cache && annotation.native {
             return Ok(()) as error::Result<()>;
         }
         // let mut start = Instant::now();
@@ -1057,6 +1133,16 @@ try {{
     if (step_id) {{
         err["step_id"] = step_id;
     }}
+    const extra = {{}};
+    Object.getOwnPropertyNames(e).forEach((key) => {{
+        if (['line', 'name', 'stack', 'column', 'message', 'sourceURL', 'originalLine', 'originalColumn'].includes(key)) {{
+            return;
+        }}
+        extra[key] = e[key];
+    }});
+    if (Object.keys(extra).length > 0) {{
+        err["extra"] = extra;
+    }}
     await fs.writeFile("result.json", JSON.stringify(err));
     process.exit(1);
 }}
@@ -1068,7 +1154,7 @@ try {{
 
     let reserved_variables_args_out_f = async {
         let args_and_out_f = async {
-            if !annotation.native_mode {
+            if !annotation.native {
                 create_args_and_out_file(&client, job, job_dir, db).await?;
             }
             Ok(()) as Result<()>
@@ -1085,7 +1171,7 @@ try {{
     let build_cache = !has_bundle_cache
         && !annotation.nobundling
         && !codebase.is_some()
-        && (requirements_o.is_some() || annotation.native_mode);
+        && (requirements_o.is_some() || annotation.native);
 
     let write_loader_f = async {
         if build_cache {
@@ -1095,9 +1181,9 @@ try {{
                 &client.get_token().await,
                 &job.workspace_id,
                 &job.script_path(),
-                if annotation.nodejs_mode {
+                if annotation.nodejs {
                     LoaderMode::NodeBundle
-                } else if annotation.native_mode {
+                } else if annotation.native {
                     LoaderMode::BrowserBundle
                 } else {
                     LoaderMode::BunBundle
@@ -1113,7 +1199,7 @@ try {{
                 &client.get_token().await,
                 &job.workspace_id,
                 &job.script_path(),
-                if annotation.nodejs_mode {
+                if annotation.nodejs {
                     LoaderMode::Node
                 } else {
                     LoaderMode::Bun
@@ -1142,7 +1228,7 @@ try {{
                 mem_peak,
                 canceled_by,
                 &common_bun_proc_envs,
-                occupancy_metrics,
+                &mut Some(occupancy_metrics),
             )
             .await?;
             if !local_path.is_empty() {
@@ -1159,7 +1245,7 @@ try {{
                     }
                 }
             }
-            if !annotation.native_mode {
+            if !annotation.native {
                 let ex_wrapper = read_file_content(&format!("{job_dir}/wrapper.mjs")).await?;
                 write_file(
                     job_dir,
@@ -1173,7 +1259,7 @@ try {{
             }
             fs::remove_file(format!("{job_dir}/main.ts"))?;
             has_bundle_cache = true;
-        } else if annotation.nodejs_mode {
+        } else if annotation.nodejs {
             generate_wrapper_mjs(
                 job_dir,
                 &job.workspace_id,
@@ -1189,52 +1275,64 @@ try {{
             .await?;
         }
     }
-    if annotation.native_mode {
-        let env_code = format!(
+    if annotation.native {
+        #[cfg(not(feature = "deno_core"))]
+        {
+            tracing::error!(
+                r#""deno_core" feature is not activated, but "//native" annotation used. Returning empty value..."#
+            );
+            return Ok(to_raw_value("").unwrap());
+        }
+
+        #[cfg(feature = "deno_core")]
+        {
+            let env_code = format!(
             "const process = {{ env: {{}} }};\nconst BASE_URL = '{base_internal_url}';\nconst BASE_INTERNAL_URL = '{base_internal_url}';\nprocess.env['BASE_URL'] = BASE_URL;process.env['BASE_INTERNAL_URL'] = BASE_INTERNAL_URL;\n{}",
             reserved_variables
                 .iter()
                 .map(|(k, v)| format!("process.env['{}'] = '{}';\n", k, v))
                 .collect::<Vec<String>>()
                 .join("\n"));
-        let js_code = read_file_content(&format!("{job_dir}/main.js")).await?;
-        let started_at = Instant::now();
-        let args = crate::common::build_args_map(job, client, db)
-            .await?
-            .map(sqlx::types::Json);
-        let job_args = if args.is_some() {
-            args.as_ref()
-        } else {
-            job.args.as_ref()
-        };
-        let result = crate::js_eval::eval_fetch_timeout(
-            env_code,
-            inner_content.clone(),
-            js_code,
-            job_args,
-            job.id,
-            job.timeout,
-            db,
-            mem_peak,
-            canceled_by,
-            worker_name,
-            &job.workspace_id,
-            false,
-            occupancy_metrics,
-        )
-        .await?;
-        tracing::info!(
-            "Executed native code in {}ms",
-            started_at.elapsed().as_millis()
-        );
-        append_logs(
-            &job.id,
-            &job.workspace_id,
-            format!("{}\n{}", init_logs, result.1),
-            db,
-        )
-        .await;
-        return Ok(result.0);
+            let js_code = read_file_content(&format!("{job_dir}/main.js")).await?;
+            let started_at = Instant::now();
+            let args = crate::common::build_args_map(job, client, db)
+                .await?
+                .map(sqlx::types::Json);
+            let job_args = if args.is_some() {
+                args.as_ref()
+            } else {
+                job.args.as_ref()
+            };
+
+            let result = crate::js_eval::eval_fetch_timeout(
+                env_code,
+                inner_content.clone(),
+                js_code,
+                job_args,
+                job.id,
+                job.timeout,
+                db,
+                mem_peak,
+                canceled_by,
+                worker_name,
+                &job.workspace_id,
+                false,
+                occupancy_metrics,
+            )
+            .await?;
+            tracing::info!(
+                "Executed native code in {}ms",
+                started_at.elapsed().as_millis()
+            );
+            append_logs(
+                &job.id,
+                &job.workspace_id,
+                format!("{}\n{}", init_logs, result.1),
+                db,
+            )
+            .await;
+            return Ok(result.0);
+        }
     }
     append_logs(&job.id, &job.workspace_id, init_logs, db).await;
 
@@ -1244,14 +1342,7 @@ try {{
             job_dir,
             "run.config.proto",
             &NSJAIL_CONFIG_RUN_BUN_CONTENT
-                .replace(
-                    "{LANG}",
-                    if annotation.nodejs_mode {
-                        "nodejs"
-                    } else {
-                        "bun"
-                    },
-                )
+                .replace("{LANG}", if annotation.nodejs { "nodejs" } else { "bun" })
                 .replace("{JOB_DIR}", job_dir)
                 .replace("{CACHE_DIR}", BUN_CACHE_DIR)
                 .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string())
@@ -1259,7 +1350,7 @@ try {{
                     "{SHARED_MOUNT}",
                     &shared_mount.replace(
                         "/tmp/shared",
-                        if annotation.nodejs_mode {
+                        if annotation.nodejs {
                             "/tmp/nodejs/shared"
                         } else {
                             "/tmp/bun/shared"
@@ -1269,7 +1360,7 @@ try {{
         )?;
 
         let mut nsjail_cmd = Command::new(NSJAIL_PATH.as_str());
-        let args = if annotation.nodejs_mode {
+        let args = if annotation.nodejs {
             vec![
                 "--config",
                 "run.config.proto",
@@ -1313,7 +1404,7 @@ try {{
             .stderr(Stdio::piped());
         start_child_process(nsjail_cmd, NSJAIL_PATH.as_str()).await?
     } else {
-        let cmd = if annotation.nodejs_mode {
+        let cmd = if annotation.nodejs {
             let script_path = format!("{job_dir}/wrapper.mjs");
 
             let mut bun_cmd = Command::new(&*NODE_BIN_PATH);
@@ -1326,6 +1417,10 @@ try {{
                 .args(vec!["--preserve-symlinks", &script_path])
                 .stdout(Stdio::piped())
                 .stderr(Stdio::piped());
+
+            #[cfg(windows)]
+            bun_cmd.env("SystemRoot", SYSTEM_ROOT.as_str());
+
             bun_cmd
         } else {
             let script_path = format!("{job_dir}/wrapper.mjs");
@@ -1352,11 +1447,16 @@ try {{
                 .args(args)
                 .stdout(Stdio::piped())
                 .stderr(Stdio::piped());
+
+            #[cfg(windows)]
+            bun_cmd.env("SystemRoot", SYSTEM_ROOT.as_str());
+
             bun_cmd
         };
+
         start_child_process(
             cmd,
-            if annotation.nodejs_mode {
+            if annotation.nodejs {
                 &*NODE_BIN_PATH
             } else {
                 &*BUN_PATH
@@ -1371,7 +1471,7 @@ try {{
         mem_peak,
         canceled_by,
         child,
-        false,
+        !*DISABLE_NSJAIL,
         worker_name,
         &job.workspace_id,
         "bun run",
@@ -1461,10 +1561,10 @@ pub async fn start_worker(
     let common_bun_proc_envs: HashMap<String, String> =
         get_common_bun_proc_envs(Some(&base_internal_url)).await;
 
-    let mut annotation = windmill_common::worker::get_annotation(inner_content);
+    let mut annotation = windmill_common::worker::TypeScriptAnnotations::parse(inner_content);
 
     //TODO: remove this when bun dedicated workers work without issues
-    annotation.nodejs_mode = true;
+    annotation.nodejs = true;
 
     let context = variables::get_reserved_variables(
         db,
@@ -1489,20 +1589,20 @@ pub async fn start_worker(
     if let Some(codebase) = codebase.as_ref() {
         pull_codebase(w_id, codebase, job_dir).await?;
     } else if let Some(reqs) = requirements_o {
-        let splitted = reqs.split(BUN_LOCKB_SPLIT).collect::<Vec<&str>>();
-        if splitted.len() != 2 {
+        let (pkg, lock, empty) = split_lockfile(&reqs);
+        if lock.is_none() {
             return Err(error::Error::ExecutionErr(
                 format!("Invalid requirements, expected to find //bun.lockb split pattern in reqs. Found: |{reqs}|")
             ));
         }
-        let _ = write_file(job_dir, "package.json", &splitted[0])?;
-        let lockb = splitted[1];
-        if lockb != EMPTY_FILE {
+        let _ = write_file(job_dir, "package.json", pkg)?;
+        let lockb = lock.unwrap();
+        if !empty {
             let _ = write_file_binary(
                 job_dir,
                 "bun.lockb",
                 &base64::engine::general_purpose::STANDARD
-                    .decode(&splitted[1])
+                    .decode(lockb)
                     .map_err(|_| {
                         error::Error::InternalErr("Could not decode bun.lockb".to_string())
                     })?,
@@ -1518,7 +1618,7 @@ pub async fn start_worker(
                 job_dir,
                 worker_name,
                 common_bun_proc_envs.clone(),
-                annotation.npm_mode,
+                annotation.npm,
                 &mut None,
             )
             .await?;
@@ -1539,7 +1639,7 @@ pub async fn start_worker(
             worker_name,
             false,
             None,
-            annotation.npm_mode,
+            annotation.npm,
             &mut None,
         )
         .await?;
@@ -1617,7 +1717,7 @@ for await (const line of Readline.createInterface({{ input: process.stdin }})) {
             token,
             w_id,
             script_path,
-            if annotation.nodejs_mode {
+            if annotation.nodejs {
                 LoaderMode::Node
             } else {
                 LoaderMode::Bun
@@ -1626,7 +1726,7 @@ for await (const line of Readline.createInterface({{ input: process.stdin }})) {
         .await?;
     }
 
-    if annotation.nodejs_mode && !codebase.is_some() {
+    if annotation.nodejs && !codebase.is_some() {
         generate_wrapper_mjs(
             job_dir,
             w_id,
@@ -1642,7 +1742,7 @@ for await (const line of Readline.createInterface({{ input: process.stdin }})) {
         .await?;
     }
 
-    if annotation.nodejs_mode {
+    if annotation.nodejs {
         let script_path = format!("{job_dir}/wrapper.mjs");
 
         handle_dedicated_process(
diff --git a/backend/windmill-worker/src/common.rs b/backend/windmill-worker/src/common.rs
index 406f128917..e22f9be54c 100644
--- a/backend/windmill-worker/src/common.rs
+++ b/backend/windmill-worker/src/common.rs
@@ -736,8 +736,8 @@ async fn arg_value_hash_additions(
                 .await;
         storage = s3_object.storage.clone();
 
-        if let Some(s3_resource) = s3_resource_opt.ok().flatten() {
-            let etag = get_etag_or_empty(&s3_resource, s3_object.clone()).await;
+        if let Some(mut s3_resource) = s3_resource_opt.ok().flatten() {
+            let etag = get_etag_or_empty(&mut s3_resource, s3_object.clone()).await;
             tracing::warn!("Enriching s3 arg value with etag: {:?}", etag);
             result.insert(s3_object.s3.clone(), etag.unwrap_or_default()); // TODO: maybe inject a random value to invalidate the cache?
         }
@@ -793,9 +793,9 @@ pub async fn get_cached_resource_value_if_valid(
                 return None;
             }
             for (s3_file_key, s3_file_etag) in s3_etags {
-                if let Some(object_store_resource) = object_store_resource_opt.clone() {
+                if let Some(mut object_store_resource) = object_store_resource_opt.clone() {
                     let etag = get_etag_or_empty(
-                        &object_store_resource,
+                        &mut object_store_resource,
                         S3Object {
                             s3: s3_file_key.clone(),
                             storage: cached_resource.storage.clone(),
diff --git a/backend/windmill-worker/src/dedicated_worker.rs b/backend/windmill-worker/src/dedicated_worker.rs
index da3e25a699..1a332e76ef 100644
--- a/backend/windmill-worker/src/dedicated_worker.rs
+++ b/backend/windmill-worker/src/dedicated_worker.rs
@@ -77,7 +77,7 @@ pub async fn handle_dedicated_process(
 ) -> std::result::Result<(), error::Error> {
     //do not cache local dependencies
 
-    use crate::handle_child::process_status;
+    use crate::{handle_child::process_status, PROXY_ENVS};
 
     let mut child = {
         let mut cmd = Command::new(command_path);
@@ -85,6 +85,7 @@ pub async fn handle_dedicated_process(
             .env_clear()
             .envs(context_envs)
             .envs(envs)
+            .envs(PROXY_ENVS.clone())
             .envs(
                 reserved_variables
                     .iter()
diff --git a/backend/windmill-worker/src/deno_executor.rs b/backend/windmill-worker/src/deno_executor.rs
index fbb875a012..2a33bba2b5 100644
--- a/backend/windmill-worker/src/deno_executor.rs
+++ b/backend/windmill-worker/src/deno_executor.rs
@@ -125,7 +125,8 @@ pub async fn generate_deno_lock(
             "--unstable-worker-options",
             "--unstable-http",
             "--lock=lock.json",
-            "--lock-write",
+            "--frozen=false",
+            "--allow-import",
             "--import-map",
             &import_map_path,
             "main.ts",
@@ -156,10 +157,13 @@ pub async fn generate_deno_lock(
     }
 
     let path_lock = format!("{job_dir}/lock.json");
-    let mut file = File::open(path_lock).await?;
-    let mut req_content = "".to_string();
-    file.read_to_string(&mut req_content).await?;
-    Ok(req_content)
+    if let Ok(mut file) = File::open(path_lock).await {
+        let mut req_content = "".to_string();
+        file.read_to_string(&mut req_content).await?;
+        Ok(req_content)
+    } else {
+        Ok("".to_string())
+    }
 }
 
 #[tracing::instrument(level = "trace", skip_all)]
@@ -366,10 +370,10 @@ try {{
         } else if !*DISABLE_NSJAIL {
             args.push("--allow-net");
             args.push("--allow-sys");
-            args.push("--allow-hrtime");
             args.push(allow_read.as_str());
             args.push("--allow-write=./");
             args.push("--allow-env");
+            args.push("--allow-import");
             args.push("--allow-run=git,/usr/bin/chromium");
         } else {
             args.push("-A");
diff --git a/backend/windmill-worker/src/go_executor.rs b/backend/windmill-worker/src/go_executor.rs
index b139859005..470e647383 100644
--- a/backend/windmill-worker/src/go_executor.rs
+++ b/backend/windmill-worker/src/go_executor.rs
@@ -1,3 +1,4 @@
+use crate::PROXY_ENVS;
 use std::{collections::HashMap, fs::DirBuilder, process::Stdio};
 
 use itertools::Itertools;
@@ -189,6 +190,7 @@ func Run(req Req) (interface{{}}, error){{
             .env("BASE_INTERNAL_URL", base_internal_url)
             .env("GOPATH", GO_CACHE_DIR)
             .env("HOME", HOME_ENV.as_str())
+            .envs(PROXY_ENVS.clone())
             .args(vec!["build", "main.go"])
             .stdout(Stdio::piped())
             .stderr(Stdio::piped());
@@ -225,7 +227,12 @@ func Run(req Req) (interface{{}}, error){{
         }
     } else {
         let target = format!("{job_dir}/main");
-        std::os::unix::fs::symlink(&bin_path, &target).map_err(|e| {
+        #[cfg(unix)]
+        let symlink = std::os::unix::fs::symlink(&bin_path, &target);
+        #[cfg(windows)]
+        let symlink = std::os::windows::fs::symlink_dir(&bin_path, &target);
+
+        symlink.map_err(|e| {
             Error::ExecutionErr(format!(
                 "could not copy cached binary from {bin_path} to {job_dir}/main: {e:?}"
             ))
diff --git a/backend/windmill-worker/src/handle_child.rs b/backend/windmill-worker/src/handle_child.rs
index d588ea8fc4..6e7520daf8 100644
--- a/backend/windmill-worker/src/handle_child.rs
+++ b/backend/windmill-worker/src/handle_child.rs
@@ -6,7 +6,11 @@ use nix::sys::signal::{self, Signal};
 use nix::unistd::Pid;
 
 use sqlx::{Pool, Postgres};
+#[cfg(windows)]
+use std::process::Stdio;
 use tokio::fs::File;
+#[cfg(windows)]
+use tokio::process::Command;
 use windmill_common::error::to_anyhow;
 
 use windmill_common::error::{self, Error};
@@ -49,6 +53,33 @@ use crate::{MAX_RESULT_SIZE, MAX_WAIT_FOR_SIGINT, MAX_WAIT_FOR_SIGTERM};
 lazy_static::lazy_static! {
     pub static ref SLOW_LOGS: bool = std::env::var("SLOW_LOGS").ok().is_some_and(|x| x == "1" || x == "true");
 }
+
+//  - kill windows process along with all child processes
+#[cfg(windows)]
+async fn kill_process_tree(pid: Option<u32>) -> Result<(), String> {
+    let pid = match pid {
+        Some(pid) => pid,
+        None => return Err("No PID provided to kill.".to_string()),
+    };
+
+    let output = Command::new("cmd")
+        .args(&["/C", "taskkill", "/PID", &pid.to_string(), "/T", "/F"])
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .output()
+        .await
+        .map_err(|e| format!("Failed to execute taskkill: {}", e))?;
+
+    if output.status.success() {
+        Ok(())
+    } else {
+        Err(format!(
+            "Failed to kill process tree. Error: {}",
+            String::from_utf8_lossy(&output.stderr)
+        ))
+    }
+}
+
 /// - wait until child exits and return with exit status
 /// - read lines from stdout and stderr and append them to the "queue"."logs"
 ///   quitting early if output exceedes MAX_LOG_SIZE characters (not bytes)
@@ -196,9 +227,26 @@ pub async fn handle_child(
                 }
             }
         }
-        /* send SIGKILL and reap child process */
-        let (_, kill) = future::join(set_reason, child.kill()).await;
-        kill.map(|()| Err(kill_reason))
+        #[cfg(windows)]
+        {
+            let pid_to_kill = child.id();
+            match kill_process_tree(pid_to_kill).await {
+                Ok(_) => tracing::debug!(
+                    "successfully killed process tree with PID: {:?}",
+                    pid_to_kill
+                ),
+                Err(e) => tracing::error!("failed to kill process tree: {:?}", e),
+            };
+            set_reason.await;
+            return Ok(Err(kill_reason));
+        }
+
+        #[cfg(unix)]
+        {
+            /* send SIGKILL and reap child process */
+            let (_, kill) = future::join(set_reason, child.kill()).await;
+            kill.map(|()| Err(kill_reason))
+        }
     };
 
     /* a future that reads output from the child and appends to the database */
@@ -366,9 +414,30 @@ async fn get_mem_peak(pid: Option<u32>, nsjail: bool) -> i32 {
         return -1;
     }
     let pid = if nsjail {
-        // This is a bit hacky, but the process id of the nsjail process is the pid of nsjail + 1.
-        // Ideally, we would get the number from fork() itself. This works in MOST cases.
-        pid.unwrap() + 1
+        // Read /proc/<nsjail_pid>/task/<nsjail_pid>/children and extract pid
+        let nsjail_pid = pid.unwrap();
+        let children_path = format!("/proc/{}/task/{}/children", nsjail_pid, nsjail_pid);
+        if let Ok(mut file) = File::open(children_path).await {
+            let mut contents = String::new();
+            if tokio::io::AsyncReadExt::read_to_string(&mut file, &mut contents)
+                .await
+                .is_ok()
+            {
+                if let Some(child_pid) = contents.split_whitespace().next() {
+                    if let Ok(child_pid) = child_pid.parse::<u32>() {
+                        child_pid
+                    } else {
+                        return -1;
+                    }
+                } else {
+                    return -1;
+                }
+            } else {
+                return -1;
+            }
+        } else {
+            return -1;
+        }
     } else {
         pid.unwrap()
     };
diff --git a/backend/windmill-worker/src/job_logger.rs b/backend/windmill-worker/src/job_logger.rs
index 5193fe79aa..05b9e5812b 100644
--- a/backend/windmill-worker/src/job_logger.rs
+++ b/backend/windmill-worker/src/job_logger.rs
@@ -1,5 +1,5 @@
-use deno_ast::swc::parser::lexer::util::CharExt;
 use itertools::Itertools;
+use swc_ecma_parser::lexer::util::CharExt;
 
 #[cfg(all(feature = "enterprise", feature = "parquet"))]
 use object_store::path::Path;
diff --git a/backend/windmill-worker/src/js_eval.rs b/backend/windmill-worker/src/js_eval.rs
index 24f83c86af..da4eda39ef 100644
--- a/backend/windmill-worker/src/js_eval.rs
+++ b/backend/windmill-worker/src/js_eval.rs
@@ -6,56 +6,74 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
+#[cfg(feature = "deno_core")]
 use std::{
+    borrow::Cow,
     cell::RefCell,
-    collections::HashMap,
     env,
     io::{self, BufReader},
+    path::PathBuf,
     rc::Rc,
-    sync::Arc,
 };
 
+use std::{collections::HashMap, sync::Arc};
+
+#[cfg(feature = "deno_core")]
 use deno_ast::ParseParams;
+#[cfg(feature = "deno_core")]
 use deno_core::{
     error::AnyError,
     op2, serde_v8, url,
     v8::{self, IsolateHandle},
     Extension, JsRuntime, OpState, PollEventLoopOptions, RuntimeOptions,
 };
+#[cfg(feature = "deno_core")]
 use deno_fetch::FetchPermissions;
+#[cfg(feature = "deno_core")]
 use deno_net::NetPermissions;
+#[cfg(feature = "deno_core")]
 use deno_tls::{rustls::RootCertStore, rustls_pemfile};
+#[cfg(feature = "deno_core")]
 use deno_web::{BlobStore, TimersPermission};
+#[cfg(feature = "deno_core")]
 use itertools::Itertools;
 use lazy_static::lazy_static;
 use regex::Regex;
 use serde_json::value::RawValue;
 use sqlx::types::Json;
+
+#[cfg(feature = "deno_core")]
 use tokio::{
     sync::{mpsc, oneshot},
     time::timeout,
 };
 use uuid::Uuid;
-use windmill_common::{error::Error, flow_status::JobResult, DB};
+
+#[cfg(feature = "deno_core")]
+use windmill_common::error::Error;
+
+use windmill_common::{flow_status::JobResult, DB};
 use windmill_queue::CanceledBy;
 
-use crate::{
-    common::{unsafe_raw, OccupancyMetrics},
-    handle_child::run_future_with_polling_update_job_poller,
-    AuthedClient,
-};
+use crate::{common::OccupancyMetrics, AuthedClient};
+
+#[cfg(feature = "deno_core")]
+use crate::{common::unsafe_raw, handle_child::run_future_with_polling_update_job_poller};
 
 #[derive(Debug, Clone)]
 pub struct IdContext {
     pub flow_job: Uuid,
+    #[allow(dead_code)]
     pub steps_results: HashMap<String, JobResult>,
     pub previous_id: String,
 }
 
+#[cfg(feature = "deno_core")]
 pub struct ContainerRootCertStoreProvider {
     root_cert_store: RootCertStore,
 }
 
+#[cfg(feature = "deno_core")]
 impl ContainerRootCertStoreProvider {
     fn new() -> ContainerRootCertStoreProvider {
         return ContainerRootCertStoreProvider {
@@ -73,14 +91,17 @@ impl ContainerRootCertStoreProvider {
     }
 }
 
+#[cfg(feature = "deno_core")]
 impl deno_tls::RootCertStoreProvider for ContainerRootCertStoreProvider {
     fn get_or_try_init(&self) -> Result<&RootCertStore, AnyError> {
         Ok(&self.root_cert_store)
     }
 }
 
+#[cfg(feature = "deno_core")]
 pub struct PermissionsContainer;
 
+#[cfg(feature = "deno_core")]
 impl FetchPermissions for PermissionsContainer {
     #[inline(always)]
     fn check_net_url(
@@ -92,15 +113,16 @@ impl FetchPermissions for PermissionsContainer {
     }
 
     #[inline(always)]
-    fn check_read(
+    fn check_read<'a>(
         &mut self,
-        _p: &std::path::Path,
+        p: &'a std::path::Path,
         _api_name: &str,
-    ) -> Result<(), deno_core::error::AnyError> {
-        Ok(())
+    ) -> Result<Cow<'a, std::path::Path>, anyhow::Error> {
+        Ok(Cow::Borrowed(p))
     }
 }
 
+#[cfg(feature = "deno_core")]
 impl TimersPermission for PermissionsContainer {
     #[inline(always)]
     fn allow_hrtime(&mut self) -> bool {
@@ -108,21 +130,22 @@ impl TimersPermission for PermissionsContainer {
     }
 }
 
+#[cfg(feature = "deno_core")]
 impl NetPermissions for PermissionsContainer {
-    fn check_read(
+    fn check_read<'a>(
         &mut self,
-        _p: &std::path::Path,
+        p: &'a str,
         _api_name: &str,
-    ) -> Result<(), deno_core::error::AnyError> {
-        Ok(())
+    ) -> Result<PathBuf, deno_core::error::AnyError> {
+        Ok(PathBuf::from(p))
     }
 
-    fn check_write(
+    fn check_write<'a>(
         &mut self,
-        _p: &std::path::Path,
+        p: &'a str,
         _api_name: &str,
-    ) -> Result<(), deno_core::error::AnyError> {
-        Ok(())
+    ) -> Result<PathBuf, deno_core::error::AnyError> {
+        Ok(PathBuf::from(p))
     }
 
     fn check_net<T: AsRef<str>>(
@@ -132,8 +155,17 @@ impl NetPermissions for PermissionsContainer {
     ) -> Result<(), deno_core::error::AnyError> {
         Ok(())
     }
+
+    fn check_write_path<'a>(
+        &mut self,
+        p: &'a std::path::Path,
+        _api_name: &str,
+    ) -> Result<std::borrow::Cow<'a, std::path::Path>, AnyError> {
+        Ok(Cow::Borrowed(p))
+    }
 }
 
+#[cfg(feature = "deno_core")]
 pub struct OptAuthedClient(Option<AuthedClient>);
 
 pub async fn eval_timeout(
@@ -142,7 +174,7 @@ pub async fn eval_timeout(
     flow_input: Option<mappable_rc::Marc<HashMap<String, Box<RawValue>>>>,
     authed_client: Option<&AuthedClient>,
     by_id: Option<IdContext>,
-    ctx: Option<Vec<(String, String)>>,
+    #[allow(unused_variables)] ctx: Option<Vec<(String, String)>>,
 ) -> anyhow::Result<Box<RawValue>> {
     let expr = expr.trim().to_string();
 
@@ -212,121 +244,133 @@ pub async fn eval_timeout(
         }
     }
 
-    let expr2 = expr.clone();
-    let (sender, mut receiver) = oneshot::channel::<IsolateHandle>();
-    let has_client = authed_client.is_some();
-    let authed_client = authed_client.cloned();
-    timeout(
-        std::time::Duration::from_millis(10000),
-        tokio::task::spawn_blocking(move || {
-            let mut ops = vec![op_get_context()];
+    #[cfg(not(feature = "deno_core"))]
+    {
+        #[allow(unreachable_code)]
+        return Err(anyhow::anyhow!("Deno core is not enabled".to_string()).into());
+    }
 
-            if authed_client.is_some() {
-                ops.extend([
-                    // An op for summing an array of numbers
-                    // The op-layer automatically deserializes inputs
-                    // and serializes the returned Result & value
-                    op_variable(),
-                    op_resource(),
-                ])
-            }
+    #[cfg(feature = "deno_core")]
+    {
+        let expr2 = expr.clone();
+        let (sender, mut receiver) = oneshot::channel::<IsolateHandle>();
+        let has_client = authed_client.is_some();
+        let authed_client = authed_client.cloned();
+        return timeout(
+            std::time::Duration::from_millis(10000),
+            tokio::task::spawn_blocking(move || {
+                let mut ops = vec![op_get_context()];
 
-            if by_id.is_some() && authed_client.is_some() {
-                ops.push(op_get_result());
-                ops.push(op_get_id());
-            }
-
-            let ext = Extension { name: "js_eval", ops: ops.into(), ..Default::default() };
-            let exts = vec![ext];
-            // Use our snapshot to provision our new runtime
-            let options = RuntimeOptions {
-                extensions: exts,
-                //                startup_snapshot: Some(Snapshot::Static(buffer)),
-                ..Default::default()
-            };
-
-            let mut context_keys = transform_context
-                .keys()
-                .filter(|x| expr.contains(&x.to_string()))
-                .map(|x| x.clone())
-                .collect_vec();
-
-            if !context_keys.contains(&"previous_result".to_string())
-                && (p_ids.is_some() && p_ids.as_ref().unwrap().iter().any(|x| expr.contains(x)))
-                || expr.contains("error")
-            {
-                // tracing::error!("PREVIOUS_RESULT");
-                context_keys.push("previous_result".to_string());
-            }
-            let has_flow_input = expr.contains("flow_input");
-            if has_flow_input {
-                context_keys.push("flow_input".to_string())
-            }
-
-            let mut js_runtime = JsRuntime::new(options);
-            {
-                let op_state = js_runtime.op_state();
-                let mut op_state = op_state.borrow_mut();
-                let mut client = authed_client.clone();
-                if let Some(client) = client.as_mut() {
-                    client.force_client = Some(
-                        reqwest::ClientBuilder::new()
-                            .user_agent("windmill/beta")
-                            .danger_accept_invalid_certs(
-                                std::env::var("ACCEPT_INVALID_CERTS").is_ok(),
-                            )
-                            .build()
-                            .unwrap(),
-                    );
+                if authed_client.is_some() {
+                    ops.extend([
+                        // An op for summing an array of numbers
+                        // The op-layer automatically deserializes inputs
+                        // and serializes the returned Result & value
+                        op_variable(),
+                        op_resource(),
+                    ])
                 }
-                op_state.put(OptAuthedClient(client));
-                op_state.put(TransformContext {
-                    flow_input: if has_flow_input { flow_input } else { None },
-                    envs: transform_context
-                        .into_iter()
-                        .filter(|(a, _)| context_keys.contains(a))
-                        .collect(),
-                })
-            }
 
-            sender
-                .send(js_runtime.v8_isolate().thread_safe_handle())
-                .map_err(|_| Error::ExecutionErr("impossible to send v8 isolate".to_string()))?;
+                if by_id.is_some() && authed_client.is_some() {
+                    ops.push(op_get_result());
+                    ops.push(op_get_id());
+                }
 
-            let runtime = tokio::runtime::Builder::new_current_thread()
-                .enable_all()
-                .build()?;
+                let ext = Extension { name: "js_eval", ops: ops.into(), ..Default::default() };
+                let exts = vec![ext];
+                // Use our snapshot to provision our new runtime
+                let options = RuntimeOptions {
+                    extensions: exts,
+                    //                startup_snapshot: Some(Snapshot::Static(buffer)),
+                    ..Default::default()
+                };
 
-            // pretty frail but this it to make the expr more user friendly and not require the user to write await
-            let expr = ["variable", "resource"]
-                .into_iter()
-                .fold(expr, replace_with_await);
+                let mut context_keys = transform_context
+                    .keys()
+                    .filter(|x| expr.contains(&x.to_string()))
+                    .map(|x| x.clone())
+                    .collect_vec();
 
-            let expr = replace_with_await_result(expr);
+                if !context_keys.contains(&"previous_result".to_string())
+                    && (p_ids.is_some() && p_ids.as_ref().unwrap().iter().any(|x| expr.contains(x)))
+                    || expr.contains("error")
+                {
+                    // tracing::error!("PREVIOUS_RESULT");
+                    context_keys.push("previous_result".to_string());
+                }
+                let has_flow_input = expr.contains("flow_input");
+                if has_flow_input {
+                    context_keys.push("flow_input".to_string())
+                }
 
-            let r = runtime.block_on(eval(
-                &mut js_runtime,
-                &expr,
-                context_keys,
-                by_id,
-                has_client,
-                ctx,
-            ))?;
+                let mut js_runtime = JsRuntime::new(options);
+                {
+                    let op_state = js_runtime.op_state();
+                    let mut op_state = op_state.borrow_mut();
+                    let mut client = authed_client.clone();
+                    if let Some(client) = client.as_mut() {
+                        client.force_client = Some(
+                            reqwest::ClientBuilder::new()
+                                .user_agent("windmill/beta")
+                                .danger_accept_invalid_certs(
+                                    std::env::var("ACCEPT_INVALID_CERTS").is_ok(),
+                                )
+                                .build()
+                                .unwrap(),
+                        );
+                    }
+                    op_state.put(OptAuthedClient(client));
+                    op_state.put(TransformContext {
+                        flow_input: if has_flow_input { flow_input } else { None },
+                        envs: transform_context
+                            .into_iter()
+                            .filter(|(a, _)| context_keys.contains(a))
+                            .collect(),
+                    })
+                }
 
-            Ok(r) as anyhow::Result<Box<RawValue>>
-        }),
-    )
-    .await
-    .map_err(|_| {
-        if let Ok(isolate) = receiver.try_recv() {
-            isolate.terminate_execution();
-        };
-        Error::ExecutionErr(format!(
-            "The expression of evaluation `{expr2}` took too long to execute (>10000ms)"
-        ))
-    })??
+                sender
+                    .send(js_runtime.v8_isolate().thread_safe_handle())
+                    .map_err(|_| {
+                        Error::ExecutionErr("impossible to send v8 isolate".to_string())
+                    })?;
+
+                let runtime = tokio::runtime::Builder::new_current_thread()
+                    .enable_all()
+                    .build()?;
+
+                // pretty frail but this it to make the expr more user friendly and not require the user to write await
+                let expr = ["variable", "resource"]
+                    .into_iter()
+                    .fold(expr, replace_with_await);
+
+                let expr = replace_with_await_result(expr);
+
+                let r = runtime.block_on(eval(
+                    &mut js_runtime,
+                    &expr,
+                    context_keys,
+                    by_id,
+                    has_client,
+                    ctx,
+                ))?;
+
+                Ok(r) as anyhow::Result<Box<RawValue>>
+            }),
+        )
+        .await
+        .map_err(|_| {
+            if let Ok(isolate) = receiver.try_recv() {
+                isolate.terminate_execution();
+            };
+            Error::ExecutionErr(format!(
+                "The expression of evaluation `{expr2}` took too long to execute (>10000ms)"
+            ))
+        })??;
+    }
 }
 
+#[cfg(feature = "deno_core")]
 fn replace_with_await(expr: String, fn_name: &str) -> String {
     let sep = format!("{}(", fn_name);
     let mut split = expr.split(&sep);
@@ -345,10 +389,12 @@ lazy_static! {
         Regex::new(r"^(https?)://(([^:@\s]+):([^:@\s]+)@)?([^:@\s]+)(:(\d+))?$").unwrap();
 }
 
+#[cfg(feature = "deno_core")]
 fn replace_with_await_result(expr: String) -> String {
     RE.replace_all(&expr, "(await $r)").to_string()
 }
 
+#[cfg(feature = "deno_core")]
 fn add_closing_bracket(s: &str) -> String {
     let mut s = s.to_string();
     let mut level = 1;
@@ -368,6 +414,7 @@ fn add_closing_bracket(s: &str) -> String {
     s
 }
 
+#[cfg(feature = "deno_core")]
 async fn eval(
     context: &mut JsRuntime,
     expr: &str,
@@ -508,6 +555,7 @@ function get_from_env(name) {{
 // }
 
 // TODO: Can we a) share the api configuration here somehow or b) just implement this natively in deno, via the deno client?
+#[cfg(feature = "deno_core")]
 #[op2(async)]
 #[string]
 async fn op_variable(
@@ -522,6 +570,7 @@ async fn op_variable(
     }
 }
 
+#[cfg(feature = "deno_core")]
 #[op2(async)]
 #[string]
 async fn op_get_result(
@@ -540,6 +589,7 @@ async fn op_get_result(
     }
 }
 
+#[cfg(feature = "deno_core")]
 #[op2(async)]
 #[string]
 async fn op_get_id(
@@ -563,6 +613,7 @@ async fn op_get_id(
     }
 }
 
+#[cfg(feature = "deno_core")]
 #[op2(async)]
 #[string]
 async fn op_resource(
@@ -580,11 +631,13 @@ async fn op_resource(
     }
 }
 
+#[cfg(feature = "deno_core")]
 pub struct TransformContext {
     pub envs: HashMap<String, Arc<Box<RawValue>>>,
     pub flow_input: Option<mappable_rc::Marc<HashMap<String, Box<RawValue>>>>,
 }
 
+#[cfg(feature = "deno_core")]
 #[op2]
 #[string]
 fn op_get_context(op_state: Rc<RefCell<OpState>>, #[string] id: &str) -> String {
@@ -605,6 +658,7 @@ fn op_get_context(op_state: Rc<RefCell<OpState>>, #[string] id: &str) -> String
     }
 }
 
+#[cfg(feature = "deno_core")]
 pub fn transpile_ts(expr: String) -> anyhow::Result<String> {
     let parsed = deno_ast::parse_module(ParseParams {
         specifier: url::Url::parse("file:///eval.ts")?,
@@ -621,21 +675,30 @@ pub fn transpile_ts(expr: String) -> anyhow::Result<String> {
         .text)
 }
 
+#[cfg(not(feature = "deno_core"))]
+pub fn transpile_ts(_expr: String) -> anyhow::Result<String> {
+    Ok("require deno".to_string())
+}
+
+#[cfg(feature = "deno_core")]
 static RUNTIME_SNAPSHOT: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/FETCH_SNAPSHOT.bin"));
 
+#[cfg(feature = "deno_core")]
 pub struct MainArgs {
     args: Vec<Option<Box<RawValue>>>,
 }
 
+#[cfg(feature = "deno_core")]
 pub struct LogString {
     pub s: String,
 }
 
+#[cfg(feature = "deno_core")]
 pub struct NativeAnnotation {
     pub useragent: Option<String>,
     pub proxy: Option<(String, Option<(String, String)>)>,
 }
-
+#[cfg(feature = "deno_core")]
 pub fn get_annotation(inner_content: &str) -> NativeAnnotation {
     let mut res = NativeAnnotation { useragent: None, proxy: None };
 
@@ -655,6 +718,7 @@ pub fn get_annotation(inner_content: &str) -> NativeAnnotation {
     res
 }
 
+#[cfg(feature = "deno_core")]
 fn capture_proxy(s: &str) -> Option<(String, Option<(String, String)>)> {
     RE_PROXY.captures(s).map(|x| {
         (
@@ -675,7 +739,27 @@ fn capture_proxy(s: &str) -> Option<(String, Option<(String, String)>)> {
         )
     })
 }
+#[cfg(not(feature = "deno_core"))]
+pub async fn eval_fetch_timeout(
+    _env_code: String,
+    _ts_expr: String,
+    _js_expr: String,
+    _args: Option<&Json<HashMap<String, Box<RawValue>>>>,
+    _job_id: Uuid,
+    _job_timeout: Option<i32>,
+    _db: &DB,
+    _mem_peak: &mut i32,
+    _canceled_by: &mut Option<CanceledBy>,
+    _worker_name: &str,
+    _w_id: &str,
+    _load_client: bool,
+    _occupation_metrics: &mut OccupancyMetrics,
+) -> anyhow::Result<(Box<RawValue>, String)> {
+    use serde_json::value::to_raw_value;
+    Ok((to_raw_value("require deno_core").unwrap(), "".to_string()))
+}
 
+#[cfg(feature = "deno_core")]
 pub async fn eval_fetch_timeout(
     env_code: String,
     ts_expr: String,
@@ -851,8 +935,10 @@ pub async fn eval_fetch_timeout(
     Ok((res, format!("{extra_logs}{logs}")))
 }
 
+#[cfg(feature = "deno_core")]
 const WINDMILL_CLIENT: &str = include_str!("./windmill-client.js");
 
+#[cfg(feature = "deno_core")]
 async fn eval_fetch(
     js_runtime: &mut JsRuntime,
     expr: &str,
@@ -898,6 +984,7 @@ import("file:///eval.ts").then((module) => module.main(...args)).then(JSON.strin
     Ok(unsafe_raw(r.unwrap_or_else(|| "null".to_string())))
 }
 
+#[cfg(feature = "deno_core")]
 #[op2]
 #[serde]
 fn op_get_static_args(op_state: Rc<RefCell<OpState>>) -> Vec<Option<String>> {
@@ -910,6 +997,7 @@ fn op_get_static_args(op_state: Rc<RefCell<OpState>>) -> Vec<Option<String>> {
         .collect_vec()
 }
 
+#[cfg(feature = "deno_core")]
 #[op2(fast)]
 fn op_log(op_state: Rc<RefCell<OpState>>, #[string] log: &str) {
     // tracing::error!("log: |{}|", log);
@@ -920,6 +1008,7 @@ fn op_log(op_state: Rc<RefCell<OpState>>, #[string] log: &str) {
         .push_str(log);
 }
 
+#[cfg(feature = "deno_core")]
 #[cfg(test)]
 mod tests {
 
diff --git a/backend/windmill-worker/src/lib.rs b/backend/windmill-worker/src/lib.rs
index f1c5bc3926..b790eb3faf 100644
--- a/backend/windmill-worker/src/lib.rs
+++ b/backend/windmill-worker/src/lib.rs
@@ -34,5 +34,7 @@ pub use worker::*;
 
 pub use result_processor::handle_job_error;
 
-pub use bun_executor::{get_common_bun_proc_envs, install_bun_lockfile, prepare_job_dir};
+pub use bun_executor::{
+    get_common_bun_proc_envs, install_bun_lockfile, prebundle_bun_script, prepare_job_dir,
+};
 pub use deno_executor::generate_deno_lock;
diff --git a/backend/windmill-worker/src/mssql_executor.rs b/backend/windmill-worker/src/mssql_executor.rs
index f50bad4619..7c4724418c 100644
--- a/backend/windmill-worker/src/mssql_executor.rs
+++ b/backend/windmill-worker/src/mssql_executor.rs
@@ -9,7 +9,7 @@ use tokio::net::TcpStream;
 use tokio_util::compat::TokioAsyncWriteCompatExt;
 use uuid::Uuid;
 use windmill_common::error::{self, Error};
-use windmill_common::worker::{get_sql_annotations, to_raw_value};
+use windmill_common::worker::to_raw_value;
 use windmill_common::{error::to_anyhow, jobs::QueuedJob};
 use windmill_parser_sql::{parse_db_resource, parse_mssql_sig};
 use windmill_queue::{append_logs, CanceledBy};
@@ -68,7 +68,7 @@ pub async fn do_mssql(
         return Err(Error::BadRequest("Missing database argument".to_string()));
     };
 
-    let annotations = get_sql_annotations(query);
+    let annotations = windmill_common::worker::SqlAnnotations::parse(query);
 
     let mut config = Config::new();
 
diff --git a/backend/windmill-worker/src/mysql_executor.rs b/backend/windmill-worker/src/mysql_executor.rs
index 03cde1d508..3ed6a9bf34 100644
--- a/backend/windmill-worker/src/mysql_executor.rs
+++ b/backend/windmill-worker/src/mysql_executor.rs
@@ -13,7 +13,7 @@ use tokio::sync::Mutex;
 use windmill_common::{
     error::{to_anyhow, Error},
     jobs::QueuedJob,
-    worker::{get_sql_annotations, to_raw_value},
+    worker::to_raw_value,
 };
 use windmill_parser_sql::{
     parse_db_resource, parse_mysql_sig, parse_sql_blocks, parse_sql_statement_named_params,
@@ -148,7 +148,7 @@ pub async fn do_mysql(
         return Err(Error::BadRequest("Missing database argument".to_string()));
     };
 
-    let annotations = get_sql_annotations(query);
+    let annotations = windmill_common::worker::SqlAnnotations::parse(query);
 
     let opts = OptsBuilder::default()
         .db_name(Some(database.database))
diff --git a/backend/windmill-worker/src/pg_executor.rs b/backend/windmill-worker/src/pg_executor.rs
index 7c4192cf66..55f5abea31 100644
--- a/backend/windmill-worker/src/pg_executor.rs
+++ b/backend/windmill-worker/src/pg_executor.rs
@@ -18,19 +18,15 @@ use serde_json::value::RawValue;
 use serde_json::Map;
 use serde_json::Value;
 use tokio::sync::Mutex;
-use tokio_postgres::types::IsNull;
 use tokio_postgres::Client;
-use tokio_postgres::{
-    types::{to_sql_checked, ToSql},
-    NoTls, Row,
-};
+use tokio_postgres::{types::ToSql, NoTls, Row};
 use tokio_postgres::{
     types::{FromSql, Type},
     Column,
 };
 use uuid::Uuid;
 use windmill_common::error::{self, Error};
-use windmill_common::worker::{get_sql_annotations, to_raw_value, CLOUD_HOSTED};
+use windmill_common::worker::{to_raw_value, CLOUD_HOSTED};
 use windmill_common::{error::to_anyhow, jobs::QueuedJob};
 use windmill_parser::{Arg, Typ};
 use windmill_parser_sql::{
@@ -41,7 +37,7 @@ use windmill_queue::CanceledBy;
 use crate::common::{build_args_values, sizeof_val, OccupancyMetrics};
 use crate::handle_child::run_future_with_polling_update_job_poller;
 use crate::{AuthedClientBackgroundTask, MAX_RESULT_SIZE};
-use bytes::{Buf, BytesMut};
+use bytes::Buf;
 use lazy_static::lazy_static;
 use urlencoding::encode;
 
@@ -85,7 +81,7 @@ fn do_postgresql_inner<'a>(
             let arg_t = arg
                 .otyp
                 .as_ref()
-                .ok_or_else(|| anyhow::anyhow!("Missing otyp for pg arg"))?;
+                .ok_or_else(|| anyhow::anyhow!("Missing otzyp for pg arg"))?;
             let typ = &arg.typ;
             let param = convert_val(value, arg_t, typ)?;
             query_params.push(param);
@@ -98,6 +94,11 @@ fn do_postgresql_inner<'a>(
 
         let mut res: Vec<serde_json::Value> = vec![];
 
+        let query_params = query_params
+            .iter()
+            .map(|p| &**p as &(dyn ToSql + Sync))
+            .collect_vec();
+
         if skip_collect {
             client
                 .execute_raw(&query, query_params)
@@ -191,7 +192,7 @@ pub async fn do_postgresql(
         return Err(Error::BadRequest("Missing database argument".to_string()));
     };
 
-    let annotations = get_sql_annotations(query);
+    let annotations = windmill_common::worker::SqlAnnotations::parse(query);
 
     let sslmode = match database.sslmode.as_deref() {
         Some("allow") => "prefer".to_string(),
@@ -414,133 +415,176 @@ pub async fn do_postgresql(
     return Ok(raw_result);
 }
 
-#[derive(Debug)]
-enum PgType {
-    String(String),
-    Bool(bool),
-    I8(i8),
-    I16(i16),
-    I32(i32),
-    I64(i64),
-    U32(u32),
-    F32(f32),
-    F64(f64),
-    Uuid(Uuid),
-    Decimal(Decimal),
-    Date(chrono::NaiveDate),
-    Time(chrono::NaiveTime),
-    Timestamp(chrono::NaiveDateTime),
-    None(Option<bool>),
-    Array(Vec<PgType>),
-    Json(serde_json::Value),
-    Bytea(Vec<u8>),
+fn map_as_single_type<T>(
+    vec: &Vec<Value>,
+    f: impl Fn(&Value) -> Option<T>,
+) -> anyhow::Result<Vec<Option<T>>> {
+    vec.into_iter()
+        .map(|v| {
+            // allow nulls in arrays
+            if matches!(v, Value::Null) {
+                Some(None)
+            } else {
+                f(v).map(Some)
+            }
+        })
+        .collect::<Option<Vec<Option<T>>>>()
+        .ok_or_else(|| anyhow::anyhow!("Mixed types in array"))
 }
 
-impl ToSql for PgType {
-    fn to_sql(
-        &self,
-        ty: &Type,
-        out: &mut BytesMut,
-    ) -> Result<IsNull, Box<dyn std::error::Error + Sync + Send>> {
-        match *self {
-            PgType::String(ref val) => val.to_sql(ty, out),
-            PgType::Bool(ref val) => val.to_sql(ty, out),
-            PgType::I8(ref val) => val.to_sql(ty, out),
-            PgType::I16(ref val) => val.to_sql(ty, out),
-            PgType::I32(ref val) => val.to_sql(ty, out),
-            PgType::I64(ref val) => val.to_sql(ty, out),
-            PgType::U32(ref val) => val.to_sql(ty, out),
-            PgType::F32(ref val) => val.to_sql(ty, out),
-            PgType::F64(ref val) => val.to_sql(ty, out),
-            PgType::Uuid(ref val) => val.to_sql(ty, out),
-            PgType::Decimal(ref val) => val.to_sql(ty, out),
-            PgType::Date(ref val) => val.to_sql(ty, out),
-            PgType::Time(ref val) => val.to_sql(ty, out),
-            PgType::Timestamp(ref val) => val.to_sql(ty, out),
-            PgType::None(ref val) => val.to_sql(ty, out),
-            PgType::Array(ref val) => val.to_sql(ty, out),
-            PgType::Json(ref val) => val.to_sql(ty, out),
-            PgType::Bytea(ref val) => val.to_sql(ty, out),
+fn convert_vec_val(
+    vec: &Vec<Value>,
+    arg_t: &String,
+) -> windmill_common::error::Result<Box<dyn ToSql + Sync + Send>> {
+    match arg_t.as_str() {
+        "bool" | "boolean" => Ok(Box::new(map_as_single_type(vec, |v| v.as_bool())?)),
+        "char" | "character" => Ok(Box::new(map_as_single_type(vec, |v| {
+            v.as_i64().map(|x| x as i8)
+        })?)),
+        "smallint" | "smallserial" | "int2" | "serial2" => {
+            Ok(Box::new(map_as_single_type(vec, |v| {
+                v.as_i64().map(|x| x as i16)
+            })?))
         }
+        "int" | "integer" | "int4" | "serial" => Ok(Box::new(map_as_single_type(vec, |v| {
+            v.as_i64().map(|x| x as i32)
+        })?)),
+        "numeric" | "decimal" => Ok(Box::new(map_as_single_type(vec, |v| {
+            if v.is_i64() {
+                Decimal::from_i64(v.as_i64().unwrap())
+            } else if v.is_f64() {
+                Decimal::from_f64(v.as_f64().unwrap())
+            } else {
+                None
+            }
+        })?)),
+        "oid" => Ok(Box::new(map_as_single_type(vec, |v| {
+            v.as_u64().map(|x| x as u32)
+        })?)),
+        "bigint" | "bigserial" | "int8" | "serial8" => {
+            Ok(Box::new(map_as_single_type(vec, |v| {
+                v.as_u64().map(|x| x as i64)
+            })?))
+        }
+        "real" | "float4" => Ok(Box::new(map_as_single_type(vec, |v| {
+            v.as_f64().map(|x| x as f32)
+        })?)),
+        "double" | "float8" => Ok(Box::new(map_as_single_type(vec, |v| v.as_f64())?)),
+        "uuid" => Ok(Box::new(map_as_single_type(vec, |v| {
+            v.as_str().map(|x| Uuid::parse_str(x).ok()).flatten()
+        })?)),
+        "date" => Ok(Box::new(map_as_single_type(vec, |v| {
+            v.as_str().map(|x| {
+                chrono::NaiveDate::parse_from_str(x, "%Y-%m-%dT%H:%M:%S.%3fZ").unwrap_or_default()
+            })
+        })?)),
+        "time" | "timetz" => Ok(Box::new(map_as_single_type(vec, |v| {
+            v.as_str().map(|x| {
+                chrono::NaiveTime::parse_from_str(x, "%Y-%m-%dT%H:%M:%S.%3fZ").unwrap_or_default()
+            })
+        })?)),
+        "timestamp" | "timestamptz" => Ok(Box::new(map_as_single_type(vec, |v| {
+            v.as_str().map(|x| {
+                chrono::NaiveDateTime::parse_from_str(x, "%Y-%m-%dT%H:%M:%S.%3fZ")
+                    .unwrap_or_default()
+            })
+        })?)),
+        "jsonb" | "json" => Ok(Box::new(vec.clone().into_iter().map(Some).collect_vec())),
+        "bytea" => Ok(Box::new(map_as_single_type(vec, |v| {
+            v.as_str().map(|x| {
+                engine::general_purpose::STANDARD
+                    .decode(x)
+                    .unwrap_or(vec![])
+            })
+        })?)),
+        "text" | "varchar" => Ok(Box::new(map_as_single_type(vec, |v| {
+            v.as_str().map(|x| x.to_string())
+        })?)),
+        _ => Err(anyhow::anyhow!("Unsupported JSON array type"))?,
     }
-
-    fn accepts(_: &Type) -> bool {
-        true
-    }
-
-    to_sql_checked!();
 }
 
-fn convert_val(value: &Value, arg_t: &String, typ: &Typ) -> windmill_common::error::Result<PgType> {
+fn convert_val(
+    value: &Value,
+    arg_t: &String,
+    typ: &Typ,
+) -> windmill_common::error::Result<Box<dyn ToSql + Sync + Send>> {
     match value {
         Value::Array(vec) if arg_t.ends_with("[]") => {
             let arg_t = arg_t.trim_end_matches("[]").to_string();
-            let mut result = vec![];
-            for val in vec {
-                result.push(convert_val(val, &arg_t, typ)?);
-            }
-            Ok(PgType::Array(result))
+            convert_vec_val(vec, &arg_t)
         }
-        Value::Null => Ok(PgType::None(None::<bool>)),
-        Value::Bool(b) => Ok(PgType::Bool(b.clone())),
-        Value::Number(n) if matches!(typ, Typ::Str(_)) => Ok(PgType::String(n.to_string())),
-        Value::Number(n) if n.is_i64() && arg_t == "char" => {
-            Ok(PgType::I8(n.as_i64().unwrap() as i8))
-        }
-        Value::Number(n) if n.is_i64() && (arg_t == "smallint" || arg_t == "smallserial") => {
-            Ok(PgType::I16(n.as_i64().unwrap() as i16))
+        Value::Null => Ok(Box::new(None::<bool>)),
+        Value::Bool(b) => Ok(Box::new(b.clone())),
+        Value::Number(n) if matches!(typ, Typ::Str(_)) => Ok(Box::new(n.to_string())),
+        Value::Number(n) if arg_t == "char" && n.is_i64() => {
+            Ok(Box::new(n.as_i64().unwrap() as i8))
         }
         Value::Number(n)
-            if n.is_i64()
-                && (arg_t == "int"
-                    || arg_t == "integer"
-                    || arg_t == "int4"
-                    || arg_t == "serial") =>
+            if (arg_t == "smallint"
+                || arg_t == "smallserial"
+                || arg_t == "int2"
+                || arg_t == "serial2")
+                && n.is_i64() =>
         {
-            Ok(PgType::I32(n.as_i64().unwrap() as i32))
+            Ok(Box::new(n.as_i64().unwrap() as i16))
         }
-        Value::Number(n) if n.is_i64() && (arg_t == "numeric" || arg_t == "decimal") => Ok(
-            PgType::Decimal(Decimal::from_i64(n.as_i64().unwrap()).unwrap()),
+        Value::Number(n)
+            if (arg_t == "int" || arg_t == "integer" || arg_t == "int4" || arg_t == "serial")
+                && n.is_i64() =>
+        {
+            Ok(Box::new(n.as_i64().unwrap() as i32))
+        }
+        Value::Number(n) if (arg_t == "real" || arg_t == "float4") && n.as_f64().is_some() => {
+            Ok(Box::new(n.as_f64().unwrap() as f32))
+        }
+        Value::Number(n) if (arg_t == "double" || arg_t == "float8") && n.as_f64().is_some() => {
+            Ok(Box::new(n.as_f64().unwrap()))
+        }
+        Value::Number(n) if (arg_t == "numeric" || arg_t == "decimal") && n.is_i64() => Ok(
+            Box::new(Decimal::from_i64(n.as_i64().unwrap()).unwrap_or_default()),
         ),
-        Value::Number(n) if n.is_i64() => Ok(PgType::I64(n.as_i64().unwrap())),
-        Value::Number(n) if n.is_u64() && arg_t == "oid" => {
-            Ok(PgType::U32(n.as_u64().unwrap() as u32))
-        }
-        Value::Number(n) if n.is_u64() && (arg_t == "bigint" || arg_t == "bigserial") => {
-            Ok(PgType::I64(n.as_u64().unwrap() as i64))
-        }
-        Value::Number(n) if n.is_f64() && arg_t == "real" => {
-            Ok(PgType::F32(n.as_f64().unwrap() as f32))
-        }
-        Value::Number(n) if n.is_f64() && arg_t == "double" => Ok(PgType::F64(n.as_f64().unwrap())),
-        Value::Number(n) if n.is_f64() && (arg_t == "numeric" || arg_t == "decimal") => Ok(
-            PgType::Decimal(Decimal::from_f64(n.as_f64().unwrap()).unwrap()),
+        Value::Number(n) if (arg_t == "numeric" || arg_t == "decimal") && n.is_f64() => Ok(
+            Box::new(Decimal::from_f64(n.as_f64().unwrap()).unwrap_or_default()),
         ),
-        Value::Number(n) => Ok(PgType::F64(n.as_f64().unwrap())),
-        Value::String(s) if arg_t == "uuid" => Ok(PgType::Uuid(Uuid::parse_str(s)?)),
+        Value::Number(n) if arg_t == "oid" && n.is_u64() => {
+            Ok(Box::new(n.as_u64().unwrap() as u32))
+        }
+        Value::Number(n)
+            if (arg_t == "bigint"
+                || arg_t == "bigserial"
+                || arg_t == "int8"
+                || arg_t == "serial8")
+                && n.is_u64() =>
+        {
+            Ok(Box::new(n.as_u64().unwrap() as i64))
+        }
+        Value::Number(n) if n.is_i64() => Ok(Box::new(n.as_i64().unwrap())),
+        Value::Number(n) => Ok(Box::new(n.as_f64().unwrap())),
+        Value::String(s) if arg_t == "uuid" => Ok(Box::new(Uuid::parse_str(s)?)),
         Value::String(s) if arg_t == "date" => {
             let date =
                 chrono::NaiveDate::parse_from_str(s, "%Y-%m-%dT%H:%M:%S.%3fZ").unwrap_or_default();
-            Ok(PgType::Date(date))
+            Ok(Box::new(date))
         }
         Value::String(s) if arg_t == "time" || arg_t == "timetz" => {
             let time =
                 chrono::NaiveTime::parse_from_str(s, "%Y-%m-%dT%H:%M:%S.%3fZ").unwrap_or_default();
-            Ok(PgType::Time(time))
+            Ok(Box::new(time))
         }
         Value::String(s) if arg_t == "timestamp" || arg_t == "timestamptz" => {
             let datetime = chrono::NaiveDateTime::parse_from_str(s, "%Y-%m-%dT%H:%M:%S.%3fZ")
                 .unwrap_or_default();
-            Ok(PgType::Timestamp(datetime))
+            Ok(Box::new(datetime))
         }
         Value::String(s) if arg_t == "bytea" => {
             let bytes = engine::general_purpose::STANDARD
                 .decode(s)
                 .unwrap_or(vec![]);
-            Ok(PgType::Bytea(bytes))
+            Ok(Box::new(bytes))
         }
-        Value::Object(_) => Ok(PgType::Json(value.clone())),
-        Value::String(s) => Ok(PgType::String(s.clone())),
+        Value::Object(_) => Ok(Box::new(value.clone())),
+        Value::String(s) => Ok(Box::new(s.clone())),
         _ => Err(Error::ExecutionErr(format!(
             "Unsupported type in query: {:?} and signature {arg_t:?}",
             value
@@ -624,6 +668,9 @@ pub fn pg_cell_to_json_value(
         Type::TS_VECTOR => get_basic(row, column, column_i, |a: StringCollector| {
             Ok(JSONValue::String(a.0))
         })?,
+        Type::OID => get_basic(row, column, column_i, |a: u32| {
+            Ok(JSONValue::Number(serde_json::Number::from(a)))
+        })?,
         // array types
         Type::BOOL_ARRAY => get_array(row, column, column_i, |a: bool| Ok(JSONValue::Bool(a)))?,
         Type::BIT_ARRAY => get_array(row, column, column_i, |a: bit_vec::BitVec| match a.len() {
@@ -655,6 +702,10 @@ pub fn pg_cell_to_json_value(
         Type::FLOAT8_ARRAY => {
             get_array(row, column, column_i, |a: f64| Ok(f64_to_json_number(a)?))?
         }
+        Type::NUMERIC_ARRAY => get_array(row, column, column_i, |a: Decimal| {
+            Ok(serde_json::to_value(a)
+                .map_err(|_| anyhow::anyhow!("Cannot convert decimal to json"))?)
+        })?,
         // these types require a custom StringCollector struct as an intermediary (see struct at bottom)
         Type::TS_VECTOR_ARRAY => get_array(row, column, column_i, |a: StringCollector| {
             Ok(JSONValue::String(a.0))
@@ -766,7 +817,7 @@ fn get_array<'a, T: FromSql<'a>>(
     val_to_json_val: impl Fn(T) -> Result<JSONValue, Error>,
 ) -> Result<JSONValue, Error> {
     let raw_val_array = row
-        .try_get::<_, Option<Vec<T>>>(column_i)
+        .try_get::<_, Option<Vec<Option<T>>>>(column_i)
         .with_context(|| {
             format!(
                 "conversion issue for array at column_name `{}`",
@@ -777,7 +828,11 @@ fn get_array<'a, T: FromSql<'a>>(
         Some(val_array) => {
             let mut result = vec![];
             for val in val_array {
-                result.push(val_to_json_val(val)?);
+                result.push(
+                    val.map(|v| val_to_json_val(v))
+                        .transpose()?
+                        .unwrap_or(Value::Null),
+                );
             }
             JSONValue::Array(result)
         }
diff --git a/backend/windmill-worker/src/php_executor.rs b/backend/windmill-worker/src/php_executor.rs
index e62d96b3fd..194e621fe1 100644
--- a/backend/windmill-worker/src/php_executor.rs
+++ b/backend/windmill-worker/src/php_executor.rs
@@ -143,7 +143,7 @@ fn check_php_exists() -> error::Result<()> {
 #[cfg(feature = "enterprise")]
 fn check_php_exists() -> error::Result<()> {
     if !Path::new(PHP_PATH.as_str()).exists() {
-        let msg = format!("Couldn't find php at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full-ee` for your instance in order to run php jobs.", PHP_PATH.as_str());
+        let msg = format!("Couldn't find php at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-ee-full` for your instance in order to run php jobs.", PHP_PATH.as_str());
         return Err(error::Error::NotFound(msg));
     }
     Ok(())
@@ -345,7 +345,7 @@ try {{
         mem_peak,
         canceled_by,
         child,
-        false,
+        !*DISABLE_NSJAIL,
         worker_name,
         &job.workspace_id,
         "php run",
diff --git a/backend/windmill-worker/src/python_executor.rs b/backend/windmill-worker/src/python_executor.rs
index 87c1c829ae..112b3c84ca 100644
--- a/backend/windmill-worker/src/python_executor.rs
+++ b/backend/windmill-worker/src/python_executor.rs
@@ -29,6 +29,9 @@ lazy_static::lazy_static! {
     static ref PYTHON_PATH: String =
     std::env::var("PYTHON_PATH").unwrap_or_else(|_| "/usr/local/bin/python3".to_string());
 
+    static ref UV_PATH: String =
+    std::env::var("UV_PATH").unwrap_or_else(|_| "/usr/local/bin/uv".to_string());
+
     static ref FLOCK_PATH: String =
     std::env::var("FLOCK_PATH").unwrap_or_else(|_| "/usr/bin/flock".to_string());
     static ref NON_ALPHANUM_CHAR: Regex = regex::Regex::new(r"[^0-9A-Za-z=.-]").unwrap();
@@ -36,6 +39,9 @@ lazy_static::lazy_static! {
     static ref PIP_TRUSTED_HOST: Option<String> = std::env::var("PIP_TRUSTED_HOST").ok();
     static ref PIP_INDEX_CERT: Option<String> = std::env::var("PIP_INDEX_CERT").ok();
 
+    static ref USE_PIP_COMPILE: bool = std::env::var("USE_PIP_COMPILE")
+        .ok().map(|flag| flag == "true").unwrap_or(false);
+
 
     static ref RELATIVE_IMPORT_REGEX: Regex = Regex::new(r#"(import|from)\s(((u|f)\.)|\.)"#).unwrap();
 
@@ -59,11 +65,14 @@ use crate::{
         read_result, start_child_process, OccupancyMetrics,
     },
     handle_child::handle_child,
-    AuthedClientBackgroundTask, DISABLE_NSJAIL, DISABLE_NUSER, HOME_ENV, HTTPS_PROXY, HTTP_PROXY,
-    LOCK_CACHE_DIR, NO_PROXY, NSJAIL_PATH, PATH_ENV, PIP_CACHE_DIR, PIP_EXTRA_INDEX_URL,
-    PIP_INDEX_URL, TZ_ENV,
+    AuthedClientBackgroundTask, DISABLE_NSJAIL, DISABLE_NUSER, HOME_ENV, LOCK_CACHE_DIR,
+    NSJAIL_PATH, PATH_ENV, PIP_CACHE_DIR, PIP_EXTRA_INDEX_URL, PIP_INDEX_URL, PROXY_ENVS, TZ_ENV,
+    UV_CACHE_DIR,
 };
 
+#[cfg(windows)]
+use crate::SYSTEM_ROOT;
+
 pub async fn create_dependencies_dir(job_dir: &str) {
     DirBuilder::new()
         .recursive(true)
@@ -93,7 +102,7 @@ pub fn handle_ephemeral_token(x: String) -> String {
     x
 }
 
-pub async fn pip_compile(
+pub async fn uv_pip_compile(
     job_id: &Uuid,
     requirements: &str,
     mem_peak: &mut i32,
@@ -103,6 +112,10 @@ pub async fn pip_compile(
     worker_name: &str,
     w_id: &str,
     occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
+    // Fallback to pip-compile. Will be removed in future
+    mut no_uv: bool,
+    // Debug-only flag
+    no_cache: bool,
 ) -> error::Result<String> {
     let mut logs = String::new();
     logs.push_str(&format!("\nresolving dependencies..."));
@@ -139,83 +152,184 @@ pub async fn pip_compile(
     #[cfg(feature = "enterprise")]
     let requirements = replace_pip_secret(db, w_id, &requirements, worker_name, job_id).await?;
 
-    let req_hash = format!("py-{}", calculate_hash(&requirements));
-    if let Some(cached) = sqlx::query_scalar!(
-        "SELECT lockfile FROM pip_resolution_cache WHERE hash = $1",
-        req_hash
-    )
-    .fetch_optional(db)
-    .await?
-    {
-        logs.push_str(&format!("\nfound cached resolution: {req_hash}"));
-        return Ok(cached);
+    let mut req_hash = format!("py-{}", calculate_hash(&requirements));
+
+    if no_uv || *USE_PIP_COMPILE {
+        logs.push_str(&format!("\nFallback to pip-compile (Deprecated!)"));
+        // Set no_uv if not setted
+        no_uv = true;
+        // Make sure that if we put #no_uv (switch to pip-compile) to python code or used `USE_PIP_COMPILE=true` variable.
+        // Windmill will recalculate lockfile using pip-compile and dont take potentially broken lockfile (generated by uv) from cache (our db).
+        // It will recalculate lockfile even if inputs have not been changed.
+        req_hash.push_str("-no_uv");
+        // Will be in format:
+        //     py-000..000-no_uv
+    }
+    if !no_cache {
+        if let Some(cached) = sqlx::query_scalar!(
+            "SELECT lockfile FROM pip_resolution_cache WHERE hash = $1",
+            req_hash
+        )
+        .fetch_optional(db)
+        .await?
+        {
+            logs.push_str(&format!("\nfound cached resolution: {req_hash}"));
+            return Ok(cached);
+        }
     }
     let file = "requirements.in";
 
     write_file(job_dir, file, &requirements)?;
 
-    let mut args = vec![
-        "-q",
-        "--no-header",
-        file,
-        "--resolver=backtracking",
-        "--strip-extras",
-    ];
-    let mut pip_args = vec![];
-    let pip_extra_index_url = PIP_EXTRA_INDEX_URL
-        .read()
-        .await
-        .clone()
-        .map(handle_ephemeral_token);
-    if let Some(url) = pip_extra_index_url.as_ref() {
-        args.extend(["--extra-index-url", url, "--no-emit-index-url"]);
-        pip_args.push(format!("--extra-index-url {}", url));
-    }
-    let pip_index_url = PIP_INDEX_URL
-        .read()
-        .await
-        .clone()
-        .map(handle_ephemeral_token);
-    if let Some(url) = pip_index_url.as_ref() {
-        args.extend(["--index-url", url, "--no-emit-index-url"]);
-        pip_args.push(format!("--index-url {}", url));
-    }
-    if let Some(host) = PIP_TRUSTED_HOST.as_ref() {
-        args.extend(["--trusted-host", host]);
-    }
-    if let Some(cert_path) = PIP_INDEX_CERT.as_ref() {
-        args.extend(["--cert", cert_path]);
-    }
-    let pip_args_str = pip_args.join(" ");
-    if pip_args.len() > 0 {
-        args.extend(["--pip-args", &pip_args_str]);
-    }
-    tracing::debug!("pip-compile args: {:?}", args);
+    // Fallback pip-compile. Will be removed in future
+    if no_uv {
+        tracing::debug!("Fallback to pip-compile");
+
+        let mut args = vec![
+            "-q",
+            "--no-header",
+            file,
+            "--resolver=backtracking",
+            "--strip-extras",
+        ];
+        let mut pip_args = vec![];
+        let pip_extra_index_url = PIP_EXTRA_INDEX_URL
+            .read()
+            .await
+            .clone()
+            .map(handle_ephemeral_token);
+        if let Some(url) = pip_extra_index_url.as_ref() {
+            args.extend(["--extra-index-url", url, "--no-emit-index-url"]);
+            pip_args.push(format!("--extra-index-url {}", url));
+        }
+        let pip_index_url = PIP_INDEX_URL
+            .read()
+            .await
+            .clone()
+            .map(handle_ephemeral_token);
+        if let Some(url) = pip_index_url.as_ref() {
+            args.extend(["--index-url", url, "--no-emit-index-url"]);
+            pip_args.push(format!("--index-url {}", url));
+        }
+        if let Some(host) = PIP_TRUSTED_HOST.as_ref() {
+            args.extend(["--trusted-host", host]);
+        }
+        if let Some(cert_path) = PIP_INDEX_CERT.as_ref() {
+            args.extend(["--cert", cert_path]);
+        }
+        let pip_args_str = pip_args.join(" ");
+        if pip_args.len() > 0 {
+            args.extend(["--pip-args", &pip_args_str]);
+        }
+        tracing::debug!("pip-compile args: {:?}", args);
+
+        let mut child_cmd = Command::new("pip-compile");
+        child_cmd
+            .current_dir(job_dir)
+            .args(args)
+            .stdout(Stdio::piped())
+            .stderr(Stdio::piped());
+        let child_process = start_child_process(child_cmd, "pip-compile").await?;
+        append_logs(&job_id, &w_id, logs, db).await;
+        handle_child(
+            job_id,
+            db,
+            mem_peak,
+            canceled_by,
+            child_process,
+            false,
+            worker_name,
+            &w_id,
+            "pip-compile",
+            None,
+            false,
+            occupancy_metrics,
+        )
+        .await
+        .map_err(|e| Error::ExecutionErr(format!("Lock file generation failed: {e:?}")))?;
+    } else {
+        let mut args = vec![
+            "pip",
+            "compile",
+            "-q",
+            "--no-header",
+            file,
+            "--strip-extras",
+            "-o",
+            "requirements.txt",
+            // Prefer main index over extra
+            // https://docs.astral.sh/uv/pip/compatibility/#packages-that-exist-on-multiple-indexes
+            // TODO: Use env variable that can be toggled from UI
+            "--index-strategy",
+            "unsafe-best-match",
+            // Target to /tmp/windmill/cache/uv
+            "--cache-dir",
+            UV_CACHE_DIR,
+            // We dont want UV to manage python installations
+            "--python-preference",
+            "only-system",
+            "--no-python-downloads",
+        ];
+        if no_cache {
+            args.extend(["--no-cache"]);
+        }
+        let pip_extra_index_url = PIP_EXTRA_INDEX_URL
+            .read()
+            .await
+            .clone()
+            .map(handle_ephemeral_token);
+        if let Some(url) = pip_extra_index_url.as_ref() {
+            args.extend(["--extra-index-url", url]);
+        }
+        let pip_index_url = PIP_INDEX_URL
+            .read()
+            .await
+            .clone()
+            .map(handle_ephemeral_token);
+        if let Some(url) = pip_index_url.as_ref() {
+            args.extend(["--index-url", url]);
+        }
+        if let Some(host) = PIP_TRUSTED_HOST.as_ref() {
+            args.extend(["--trusted-host", host]);
+        }
+        if let Some(cert_path) = PIP_INDEX_CERT.as_ref() {
+            args.extend(["--cert", cert_path]);
+        }
+        tracing::debug!("uv args: {:?}", args);
+
+        #[cfg(windows)]
+        let uv_cmd = "uv";
+
+        #[cfg(unix)]
+        let uv_cmd = UV_PATH.as_str();
+
+        let mut child_cmd = Command::new(uv_cmd);
+        child_cmd
+            .current_dir(job_dir)
+            .args(args)
+            .stdout(Stdio::piped())
+            .stderr(Stdio::piped());
+        let child_process = start_child_process(child_cmd, "/usr/local/bin/uv").await?;
+        append_logs(&job_id, &w_id, logs, db).await;
+        handle_child(
+            job_id,
+            db,
+            mem_peak,
+            canceled_by,
+            child_process,
+            false,
+            worker_name,
+            &w_id,
+            // TODO: Rename to uv-pip-compile?
+            "uv",
+            None,
+            false,
+            occupancy_metrics,
+        )
+        .await
+        .map_err(|e| Error::ExecutionErr(format!("Lock file generation failed: {e:?}")))?;
+    }
 
-    let mut child_cmd = Command::new("pip-compile");
-    child_cmd
-        .current_dir(job_dir)
-        .args(args)
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped());
-    let child_process = start_child_process(child_cmd, "pip-compile").await?;
-    append_logs(&job_id, &w_id, logs, db).await;
-    handle_child(
-        job_id,
-        db,
-        mem_peak,
-        canceled_by,
-        child_process,
-        false,
-        worker_name,
-        &w_id,
-        "pip-compile",
-        None,
-        false,
-        occupancy_metrics,
-    )
-    .await
-    .map_err(|e| Error::ExecutionErr(format!("Lock file generation failed: {e:?}")))?;
     let path_lock = format!("{job_dir}/requirements.txt");
     let mut file = File::open(path_lock).await?;
     let mut req_content = "".to_string();
@@ -384,7 +498,10 @@ except BaseException as e:
     exc_type, exc_value, exc_traceback = sys.exc_info()
     tb = traceback.format_tb(exc_traceback)
     with open(result_json, 'w') as f:
-        err = {{ "message": str(e), "name": e.__class__.__name__, "stack": '\n'.join(tb[1:])  }}
+        err = {{ "message": str(e), "name": e.__class__.__name__, "stack": '\n'.join(tb[1:]) }}
+        extra = e.__dict__ 
+        if extra and len(extra) > 0:
+            err['extra'] = extra
         flow_node_id = os.environ.get('WM_FLOW_STEP_ID')
         if flow_node_id:
             err['step_id'] = flow_node_id
@@ -399,6 +516,9 @@ except BaseException as e:
     let mut reserved_variables = get_reserved_variables(job, &client.token, db).await?;
     let additional_python_paths_folders = additional_python_paths.iter().join(":");
 
+    #[cfg(windows)]
+    let additional_python_paths_folders = additional_python_paths_folders.replace(":", ";");
+
     if !*DISABLE_NSJAIL {
         let shared_deps = additional_python_paths
             .into_iter()
@@ -445,6 +565,7 @@ mount {{
             .env_clear()
             // inject PYTHONPATH here - for some reason I had to do it in nsjail conf
             .envs(reserved_variables)
+            .envs(PROXY_ENVS.clone())
             .env("PATH", PATH_ENV.as_str())
             .env("TZ", TZ_ENV.as_str())
             .env("BASE_INTERNAL_URL", base_internal_url)
@@ -475,6 +596,10 @@ mount {{
             .args(vec!["-u", "-m", "wrapper"])
             .stdout(Stdio::piped())
             .stderr(Stdio::piped());
+
+        #[cfg(windows)]
+        python_cmd.env("SystemRoot", SYSTEM_ROOT.as_str());
+
         start_child_process(python_cmd, PYTHON_PATH.as_str()).await?
     };
 
@@ -774,6 +899,7 @@ async fn handle_python_deps(
     let requirements = match requirements_o {
         Some(r) => r,
         None => {
+            let annotation = windmill_common::worker::PythonAnnotations::parse(inner_content);
             let mut already_visited = vec![];
 
             let requirements = windmill_parser_py_imports::parse_python_imports(
@@ -788,7 +914,7 @@ async fn handle_python_deps(
             if requirements.is_empty() {
                 "".to_string()
             } else {
-                pip_compile(
+                uv_pip_compile(
                     job_id,
                     &requirements,
                     mem_peak,
@@ -798,6 +924,8 @@ async fn handle_python_deps(
                     worker_name,
                     w_id,
                     occupancy_metrics,
+                    annotation.no_uv,
+                    annotation.no_cache,
                 )
                 .await
                 .map_err(|e| {
@@ -876,15 +1004,6 @@ pub async fn handle_python_reqs(
         if let Some(host) = PIP_TRUSTED_HOST.as_ref() {
             vars.push(("TRUSTED_HOST", host));
         }
-        if let Some(http_proxy) = HTTP_PROXY.as_ref() {
-            vars.push(("HTTP_PROXY", http_proxy));
-        }
-        if let Some(https_proxy) = HTTPS_PROXY.as_ref() {
-            vars.push(("HTTPS_PROXY", https_proxy));
-        }
-        if let Some(no_proxy) = NO_PROXY.as_ref() {
-            vars.push(("NO_PROXY", no_proxy));
-        }
 
         let _ = write_file(
             job_dir,
@@ -899,6 +1018,9 @@ pub async fn handle_python_reqs(
     let mut req_with_penv: Vec<(String, String)> = vec![];
 
     for req in requirements {
+        if req.starts_with('#') {
+            continue;
+        }
         let venv_p = format!(
             "{PIP_CACHE_DIR}/{}",
             req.replace(' ', "").replace('/', "").replace(':', "")
@@ -1010,13 +1132,19 @@ pub async fn handle_python_reqs(
                 .current_dir(job_dir)
                 .env_clear()
                 .envs(vars)
+                .envs(PROXY_ENVS.clone())
                 .args(vec!["--config", "download.config.proto"])
                 .stdout(Stdio::piped())
                 .stderr(Stdio::piped());
             start_child_process(nsjail_cmd, NSJAIL_PATH.as_str()).await?
         } else {
             let fssafe_req = NON_ALPHANUM_CHAR.replace_all(&req, "_").to_string();
+            #[cfg(unix)]
             let req = format!("'{}'", req);
+
+            #[cfg(windows)]
+            let req = format!("{}", req);
+
             let mut command_args = vec![
                 PYTHON_PATH.as_str(),
                 "-m",
@@ -1058,33 +1186,42 @@ pub async fn handle_python_reqs(
             }
 
             let mut envs = vec![("PATH", PATH_ENV.as_str())];
-            if let Some(http_proxy) = HTTP_PROXY.as_ref() {
-                envs.push(("HTTP_PROXY", http_proxy));
-            }
-            if let Some(https_proxy) = HTTPS_PROXY.as_ref() {
-                envs.push(("HTTPS_PROXY", https_proxy));
-            }
-            if let Some(no_proxy) = NO_PROXY.as_ref() {
-                envs.push(("NO_PROXY", no_proxy));
-            }
 
             envs.push(("HOME", HOME_ENV.as_str()));
 
             tracing::debug!("pip install command: {:?}", command_args);
 
-            let mut flock_cmd = Command::new(FLOCK_PATH.as_str());
-            flock_cmd
-                .env_clear()
-                .envs(envs)
-                .args([
-                    "-x",
-                    &format!("{}/pip-{}.lock", LOCK_CACHE_DIR, fssafe_req),
-                    "--command",
-                    &command_args.join(" "),
-                ])
-                .stdout(Stdio::piped())
-                .stderr(Stdio::piped());
-            start_child_process(flock_cmd, FLOCK_PATH.as_str()).await?
+            #[cfg(unix)]
+            {
+                let mut flock_cmd = Command::new(FLOCK_PATH.as_str());
+                flock_cmd
+                    .env_clear()
+                    .envs(PROXY_ENVS.clone())
+                    .envs(envs)
+                    .args([
+                        "-x",
+                        &format!("{}/pip-{}.lock", LOCK_CACHE_DIR, fssafe_req),
+                        "--command",
+                        &command_args.join(" "),
+                    ])
+                    .stdout(Stdio::piped())
+                    .stderr(Stdio::piped());
+                start_child_process(flock_cmd, FLOCK_PATH.as_str()).await?
+            }
+
+            #[cfg(windows)]
+            {
+                let mut pip_cmd = Command::new(PYTHON_PATH.as_str());
+                pip_cmd
+                    .env_clear()
+                    .envs(envs)
+                    .envs(PROXY_ENVS.clone())
+                    .env("SystemRoot", SYSTEM_ROOT.as_str())
+                    .args(&command_args[1..])
+                    .stdout(Stdio::piped())
+                    .stderr(Stdio::piped());
+                start_child_process(pip_cmd, PYTHON_PATH.as_str()).await?
+            }
         };
 
         let child = handle_child(
diff --git a/backend/windmill-worker/src/rust_executor.rs b/backend/windmill-worker/src/rust_executor.rs
index ab6fdd247f..9391fd9a69 100644
--- a/backend/windmill-worker/src/rust_executor.rs
+++ b/backend/windmill-worker/src/rust_executor.rs
@@ -20,15 +20,31 @@ use crate::{
     },
     handle_child::handle_child,
     AuthedClientBackgroundTask, DISABLE_NSJAIL, DISABLE_NUSER, HOME_ENV, NSJAIL_PATH, PATH_ENV,
-    RUST_CACHE_DIR, TZ_ENV,
+    PROXY_ENVS, RUST_CACHE_DIR, TZ_ENV,
 };
 
+#[cfg(windows)]
+use crate::SYSTEM_ROOT;
+
 const NSJAIL_CONFIG_RUN_RUST_CONTENT: &str = include_str!("../nsjail/run.rust.config.proto");
 
 lazy_static::lazy_static! {
-    static ref CARGO_HOME: String = std::env::var("CARGO_HOME").unwrap_or_else(|_| "/usr/local/cargo".to_string());
-    static ref RUSTUP_HOME: String = std::env::var("RUSTUP_HOME").unwrap_or_else(|_| "/usr/local/rustup".to_string());
-    static ref CARGO_PATH: String = format!("{}/bin/cargo", std::env::var("CARGO_HOME").unwrap_or("/usr/local/cargo/bin/cargo".to_string()));
+    static ref HOME_DIR: String = std::env::var("HOME").expect("Could not find the HOME environment variable");
+    static ref CARGO_HOME: String = std::env::var("CARGO_HOME").unwrap_or_else(|_| { CARGO_HOME_DEFAULT.clone() });
+    static ref RUSTUP_HOME: String = std::env::var("RUSTUP_HOME").unwrap_or_else(|_| { RUSTUP_HOME_DEFAULT.clone() });
+    static ref CARGO_PATH: String = format!("{}/bin/cargo", CARGO_HOME.as_str());
+}
+
+#[cfg(windows)]
+lazy_static::lazy_static! {
+    static ref CARGO_HOME_DEFAULT: String = format!("{}\\.cargo", *HOME_DIR);
+    static ref RUSTUP_HOME_DEFAULT: String = format!("{}\\.rustup", *HOME_DIR);
+}
+
+#[cfg(unix)]
+lazy_static::lazy_static! {
+    static ref CARGO_HOME_DEFAULT: String = "/usr/local/cargo".to_string();
+    static ref RUSTUP_HOME_DEFAULT: String = "/usr/local/rustup".to_string();
 }
 
 const RUST_OBJECT_STORE_PREFIX: &str = "rustbin/";
@@ -126,6 +142,14 @@ pub async fn generate_cargo_lockfile(
         .args(vec!["generate-lockfile"])
         .stdout(Stdio::piped())
         .stderr(Stdio::piped());
+    #[cfg(windows)]
+    {
+        gen_lockfile_cmd.env("SystemRoot", SYSTEM_ROOT.as_str());
+        gen_lockfile_cmd.env(
+            "TMP",
+            std::env::var("TMP").unwrap_or_else(|_| "C:\\tmp".to_string()),
+        );
+    }
     let gen_lockfile_process = start_child_process(gen_lockfile_cmd, CARGO_PATH.as_str()).await?;
     handle_child(
         job_id,
@@ -168,6 +192,7 @@ pub async fn build_rust_crate(
     build_rust_cmd
         .current_dir(job_dir)
         .env_clear()
+        .envs(PROXY_ENVS.clone())
         .env("PATH", PATH_ENV.as_str())
         .env("BASE_INTERNAL_URL", base_internal_url)
         .env("HOME", HOME_ENV.as_str())
@@ -176,6 +201,16 @@ pub async fn build_rust_crate(
         .args(vec!["build", "--release"])
         .stdout(Stdio::piped())
         .stderr(Stdio::piped());
+
+    #[cfg(windows)]
+    {
+        build_rust_cmd.env("SystemRoot", SYSTEM_ROOT.as_str());
+        build_rust_cmd.env(
+            "TMP",
+            std::env::var("TMP").unwrap_or_else(|_| "C:\\tmp".to_string()),
+        );
+    }
+
     let build_rust_process = start_child_process(build_rust_cmd, CARGO_PATH.as_str()).await?;
     handle_child(
         job_id,
@@ -247,7 +282,7 @@ fn check_cargo_exists() -> Result<(), Error> {
 #[cfg(feature = "enterprise")]
 fn check_cargo_exists() -> Result<(), Error> {
     if !Path::new(CARGO_PATH.as_str()).exists() {
-        let msg = format!("Couldn't find cargo at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full-ee` for your instance in order to run rust jobs.", CARGO_PATH.as_str());
+        let msg = format!("Couldn't find cargo at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-ee-full` for your instance in order to run rust jobs.", CARGO_PATH.as_str());
         return Err(Error::NotFound(msg));
     }
     Ok(())
@@ -279,7 +314,13 @@ pub async fn handle_rust_job(
 
     let cache_logs = if cache {
         let target = format!("{job_dir}/main");
-        std::os::unix::fs::symlink(&bin_path, &target).map_err(|e| {
+
+        #[cfg(unix)]
+        let symlink = std::os::unix::fs::symlink(&bin_path, &target);
+        #[cfg(windows)]
+        let symlink = std::os::windows::fs::symlink_dir(&bin_path, &target);
+
+        symlink.map_err(|e| {
             Error::ExecutionErr(format!(
                 "could not copy cached binary from {bin_path} to {job_dir}/main: {e:?}"
             ))
@@ -360,6 +401,9 @@ pub async fn handle_rust_job(
             .stdout(Stdio::piped())
             .stderr(Stdio::piped());
 
+        #[cfg(windows)]
+        run_rust.env("SystemRoot", SYSTEM_ROOT.as_str());
+
         start_child_process(run_rust, compiled_executable_name).await?
     };
     handle_child(
diff --git a/backend/windmill-worker/src/snowflake_executor.rs b/backend/windmill-worker/src/snowflake_executor.rs
index bf9dae41ff..f89b29832a 100644
--- a/backend/windmill-worker/src/snowflake_executor.rs
+++ b/backend/windmill-worker/src/snowflake_executor.rs
@@ -9,7 +9,6 @@ use serde_json::{json, value::RawValue, Value};
 use sha2::{Digest, Sha256};
 use std::collections::HashMap;
 use windmill_common::error::to_anyhow;
-use windmill_common::worker::get_sql_annotations;
 
 use windmill_common::jobs::QueuedJob;
 use windmill_common::{error::Error, worker::to_raw_value};
@@ -266,7 +265,7 @@ pub async fn do_snowflake(
         return Err(Error::BadRequest("Missing database argument".to_string()));
     };
 
-    let annotations = get_sql_annotations(query);
+    let annotations = windmill_common::worker::SqlAnnotations::parse(query);
 
     let qualified_username = format!(
         "{}.{}",
diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index 6c0fce3d3b..f4d78bf0ef 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -237,6 +237,7 @@ pub const ROOT_CACHE_NOMOUNT_DIR: &str = concatcp!(TMP_DIR, "/cache_nomount/");
 
 pub const LOCK_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "lock");
 pub const PIP_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "pip");
+pub const UV_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "uv");
 pub const TAR_PIP_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "tar/pip");
 pub const DENO_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "deno");
 pub const DENO_CACHE_DIR_DEPS: &str = concatcp!(ROOT_CACHE_DIR, "deno/deps");
@@ -323,6 +324,20 @@ lazy_static::lazy_static! {
     pub static ref NO_PROXY: Option<String> = std::env::var("no_proxy").ok().or(std::env::var("NO_PROXY").ok());
     pub static ref HTTP_PROXY: Option<String> = std::env::var("http_proxy").ok().or(std::env::var("HTTP_PROXY").ok());
     pub static ref HTTPS_PROXY: Option<String> = std::env::var("https_proxy").ok().or(std::env::var("HTTPS_PROXY").ok());
+
+    pub static ref PROXY_ENVS: Vec<(&'static str, String)> = {
+        let mut proxy_env = Vec::new();
+        if let Some(no_proxy) = NO_PROXY.as_ref() {
+            proxy_env.push(("NO_PROXY", no_proxy.to_string()));
+        }
+        if let Some(http_proxy) = HTTP_PROXY.as_ref() {
+            proxy_env.push(("HTTP_PROXY", http_proxy.to_string()));
+        }
+        if let Some(https_proxy) = HTTPS_PROXY.as_ref() {
+            proxy_env.push(("HTTPS_PROXY", https_proxy.to_string()));
+        }
+        proxy_env
+    };
     pub static ref DENO_PATH: String = std::env::var("DENO_PATH").unwrap_or_else(|_| "/usr/bin/deno".to_string());
     pub static ref BUN_PATH: String = std::env::var("BUN_PATH").unwrap_or_else(|_| "/usr/bin/bun".to_string());
     pub static ref NPM_PATH: String = std::env::var("NPM_PATH").unwrap_or_else(|_| "/usr/bin/npm".to_string());
@@ -348,7 +363,6 @@ lazy_static::lazy_static! {
     pub static ref PIP_INDEX_URL: Arc<RwLock<Option<String>>> = Arc::new(RwLock::new(None));
     pub static ref JOB_DEFAULT_TIMEOUT: Arc<RwLock<Option<i32>>> = Arc::new(RwLock::new(None));
 
-
     static ref MAX_TIMEOUT: u64 = std::env::var("TIMEOUT")
         .ok()
         .and_then(|x| x.parse::<u64>().ok())
@@ -389,6 +403,12 @@ lazy_static::lazy_static! {
 
 
 }
+
+#[cfg(windows)]
+lazy_static::lazy_static! {
+    pub static ref SYSTEM_ROOT: String = std::env::var("SystemRoot").unwrap_or_else(|_| "C:\\Windows".to_string());
+}
+
 //only matter if CLOUD_HOSTED
 pub const MAX_RESULT_SIZE: usize = 1024 * 1024 * 2; // 2MB
 
@@ -1267,16 +1287,16 @@ pub async fn run_worker<R: rsmq_async::RsmqConnection + Send + Sync + Clone + 's
             }
         };
 
-        #[cfg(feature = "prometheus")]
-        if let Some(wb) = worker_busy.as_ref() {
-            wb.set(1);
-            tracing::debug!("set worker busy to 1");
-        }
-
-        occupancy_metrics.running_job_started_at = Some(Instant::now());
-
         match next_job {
             Ok(Some(job)) => {
+                #[cfg(feature = "prometheus")]
+                if let Some(wb) = worker_busy.as_ref() {
+                    wb.set(1);
+                    tracing::debug!("set worker busy to 1");
+                }
+
+                occupancy_metrics.running_job_started_at = Some(Instant::now());
+
                 last_executed_job = None;
                 jobs_executed += 1;
 
@@ -2061,15 +2081,10 @@ pub fn build_envs(
         hm
     };
 
-    if let Some(ref env) = *HTTPS_PROXY {
-        envs.insert("HTTPS_PROXY".to_string(), env.to_string());
-    }
-    if let Some(ref env) = *HTTP_PROXY {
-        envs.insert("HTTP_PROXY".to_string(), env.to_string());
-    }
-    if let Some(ref env) = *NO_PROXY {
-        envs.insert("NO_PROXY".to_string(), env.to_string());
+    for (k, v) in PROXY_ENVS.iter() {
+        envs.insert(k.to_string(), v.to_string());
     }
+
     Ok(envs)
 }
 
diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index 6474af6d46..a1a4fd9904 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -561,6 +561,7 @@ pub async fn update_flow_status_after_job_completion_internal<
                             branch_chosen: None,
                             approvers: vec![],
                             failed_retries: vec![],
+                            skipped: false,
                         }
                     } else {
                         success = false;
@@ -698,6 +699,20 @@ pub async fn update_flow_status_after_job_completion_internal<
                     }
                 }
                 if success || (flow_jobs.is_some() && (skip_loop_failures || skip_branch_failure)) {
+                    let is_skipped = if current_module.as_ref().is_some_and(|m| m.skip_if.is_some()) {
+                        sqlx::query_scalar!(
+                            "SELECT job_kind = 'identity' FROM completed_job WHERE id = $1",
+                            job_id_for_status
+                        )
+                        .fetch_one(db)
+                        .await
+                        .map_err(|e| {
+                            Error::InternalErr(format!("error during skip check: {e:#}"))
+                        })?
+                        .unwrap_or(false)
+                    } else {
+                        false
+                    };
                     success = true;
                     (
                         true,
@@ -709,6 +724,7 @@ pub async fn update_flow_status_after_job_completion_internal<
                             branch_chosen,
                             approvers: vec![],
                             failed_retries: old_status.retry.failed_jobs.clone(),
+                            skipped: is_skipped,
                         }),
                     )
                 } else {
@@ -2210,6 +2226,23 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
 
     drop(resume_messages);
 
+    let is_skipped = if let Some(skip_if) = &module.skip_if {
+        let idcontext = get_transform_context(&flow_job, previous_id.as_str(), &status).await?;
+        compute_bool_from_expr(
+            skip_if.expr.to_string(),
+            arc_flow_job_args.clone(),
+            arc_last_job_result.clone(),
+            None,
+            Some(idcontext.clone()),
+            Some(client),
+            Some((resumes.clone(), resume.clone(), approvers.clone())),
+            None,
+        )
+        .await?
+    } else {
+        false
+    };
+
     let args: windmill_common::error::Result<_> =
         if module.mock.is_some() && module.mock.as_ref().unwrap().enabled {
             let mut hm = HashMap::new();
@@ -2249,7 +2282,16 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
             );
             Ok(Marc::new(hm))
         } else {
-            match &module.get_value() {
+            let value = module.get_value();
+            match &value {
+                Ok(_) if matches!(value, Ok(FlowModuleValue::Identity)) || is_skipped => serde_json::from_str(
+                    &serde_json::to_string(&PreviousResult {
+                        previous_result: Some(&arc_last_job_result),
+                    })
+                    .unwrap(),
+                )
+                .map(Marc::new)
+                .map_err(|e| error::Error::InternalErr(format!("identity: {e:#}"))),
                 Ok(
                     FlowModuleValue::Script { input_transforms, .. }
                     | FlowModuleValue::RawScript { input_transforms, .. }
@@ -2270,16 +2312,7 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
                     )
                     .await
                     .map(Marc::new)
-                }
-                Ok(FlowModuleValue::Identity) => serde_json::from_str(
-                    &serde_json::to_string(&PreviousResult {
-                        previous_result: Some(&arc_last_job_result),
-                    })
-                    .unwrap(),
-                )
-                .map(Marc::new)
-                .map_err(|e| error::Error::InternalErr(format!("identity: {e:#}"))),
-
+                },
                 Ok(_) => Ok(arc_flow_job_args.clone()),
                 Err(e) => {
                     return Err(error::Error::InternalErr(format!(
@@ -2305,6 +2338,7 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
         resumes.clone(),
         resume.clone(),
         approvers.clone(),
+        is_skipped,
     )
     .await?;
     tracing::info!(id = %flow_job.id, root_id = %job_root, "next flow transform computed");
@@ -2326,6 +2360,7 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
                 branch_chosen: None,
                 approvers: vec![],
                 failed_retries: vec![],
+                skipped: false,
             }))
             .bind(flow_job.id)
             .execute(db)
@@ -2368,15 +2403,15 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
         }
         tracing::debug!(id = %flow_job.id, root_id = %job_root, "pushing job {i} of {len}");
         let payload_tag = match &job_payloads {
-            ContinuePayload::SingleJob(payload) => payload.clone(),
-            ContinuePayload::BranchAllJobs(payloads) => payloads[i].clone(),
+            ContinuePayload::SingleJob(payload) => payload,
+            ContinuePayload::BranchAllJobs(payloads) => &payloads[i],
             ContinuePayload::ForloopJobs { flow_value, delete_after_use, .. } => {
                 let mut fv = flow_value.clone();
 
                 if let Some(failure_module) = fv.failure_module.as_mut() {
                     failure_module.id_append(&format!("{}-{i}", &status.step.to_string()));
                 }
-                JobPayloadWithTag {
+                &JobPayloadWithTag {
                     payload: JobPayload::RawFlow {
                         value: fv,
                         path: Some(format!("{}/forloop-{i}", flow_job.script_path())),
@@ -2555,13 +2590,17 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
         };
 
         tracing::debug!(id = %flow_job.id, root_id = %job_root, "computed perms for job {i} of {len}");
-
+        let tag = if flow_job.tag == "flow" || flow_job.tag == format!("flow-{}", flow_job.workspace_id) {
+            payload_tag.tag.clone()
+        } else {
+            Some(flow_job.tag.clone())
+        };
         let tx2 = PushIsolationLevel::Transaction(tx);
         let (uuid, mut inner_tx) = push(
             &db,
             tx2,
             &flow_job.workspace_id,
-            payload_tag.payload,
+            payload_tag.payload.clone(),
             push_args,
             &flow_job.created_by,
             &flow_job.email,
@@ -2575,11 +2614,7 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
             continue_on_same_worker,
             err,
             flow_job.visible_to_owner,
-            if flow_job.tag == "flow" || flow_job.tag == format!("flow-{}", flow_job.workspace_id) {
-                payload_tag.tag
-            } else {
-                Some(flow_job.tag.clone())
-            },
+            tag,
             payload_tag.timeout,
             Some(module.id.clone()),
             new_job_priority_override,
@@ -2971,6 +3006,7 @@ async fn compute_next_flow_transform(
     resumes: Arc<Box<RawValue>>,
     resume: Arc<Box<RawValue>>,
     approvers: Arc<Box<RawValue>>,
+    is_skipped: bool,
 ) -> error::Result<NextFlowTransform> {
     if module.mock.is_some() && module.mock.as_ref().unwrap().enabled {
         return Ok(NextFlowTransform::Continue(
@@ -2997,6 +3033,9 @@ async fn compute_next_flow_transform(
     let delete_after_use = module.delete_after_use.unwrap_or(false);
 
     tracing::debug!(id = %flow_job.id, "computing next flow transform for {:?}", &module.value);
+    if is_skipped {
+        return trivial_next_job(JobPayload::Identity);
+    }
     match &module.get_value()? {
         FlowModuleValue::Identity => trivial_next_job(JobPayload::Identity),
         FlowModuleValue::Flow { path, .. } => {
@@ -3490,6 +3529,7 @@ fn is_simple_modules(modules: &Vec<FlowModule>, flow: &FlowValue) -> bool {
         && modules[0].retry.is_none()
         && modules[0].stop_after_if.is_none()
         && modules[0].stop_after_all_iters_if.is_none()
+        && modules[0].skip_if.is_none()
         && (modules[0].mock.is_none() || modules[0].mock.as_ref().is_some_and(|m| !m.enabled))
         && flow.failure_module.is_none();
     is_simple
@@ -3721,6 +3761,11 @@ async fn script_to_payload(
     module: &FlowModule,
     tag_override: &Option<String>,
 ) -> Result<JobPayloadWithTag, Error> {
+    let tag_override = if tag_override.as_ref().is_some_and(|x| x.trim().is_empty()) {
+        None
+    } else {
+        tag_override.clone()
+    };
     let (payload, tag, delete_after_use, script_timeout) = if script_hash.is_none() {
         let (jp, tag, delete_after_use, script_timeout) =
             script_path_to_payload(script_path, db, &flow_job.workspace_id, Some(true)).await?;
diff --git a/backend/windmill-worker/src/worker_lockfiles.rs b/backend/windmill-worker/src/worker_lockfiles.rs
index 6f25ec606b..f71c73f618 100644
--- a/backend/windmill-worker/src/worker_lockfiles.rs
+++ b/backend/windmill-worker/src/worker_lockfiles.rs
@@ -12,7 +12,7 @@ use windmill_common::flows::{FlowModule, FlowModuleValue};
 use windmill_common::get_latest_deployed_hash_for_path;
 use windmill_common::jobs::JobPayload;
 use windmill_common::scripts::ScriptHash;
-use windmill_common::worker::{get_annotation, to_raw_value, to_raw_value_owned, write_file};
+use windmill_common::worker::{to_raw_value, to_raw_value_owned, write_file};
 use windmill_common::{
     error::{self, to_anyhow},
     flows::FlowValue,
@@ -26,7 +26,7 @@ use windmill_parser_ts::parse_expr_for_imports;
 use windmill_queue::{append_logs, CanceledBy, PushIsolationLevel};
 
 use crate::common::OccupancyMetrics;
-use crate::python_executor::{create_dependencies_dir, handle_python_reqs, pip_compile};
+use crate::python_executor::{create_dependencies_dir, handle_python_reqs, uv_pip_compile};
 use crate::rust_executor::{build_rust_crate, compute_rust_hash, generate_cargo_lockfile};
 use crate::{
     bun_executor::gen_bun_lockfile,
@@ -291,7 +291,7 @@ pub async fn handle_dependency_job<R: rsmq_async::RsmqConnection + Send + Sync +
             let hash = job.script_hash.unwrap_or(ScriptHash(0));
             let w_id = &job.workspace_id;
             sqlx::query!(
-                "UPDATE script SET lock = $1, created_at = now() WHERE hash = $2 AND workspace_id = $3",
+                "UPDATE script SET lock = $1 WHERE hash = $2 AND workspace_id = $3",
                 &content,
                 &hash.0,
                 w_id
@@ -953,10 +953,10 @@ async fn lock_modules<'c>(
                 }
 
                 if language == ScriptLang::Bun || language == ScriptLang::Bunnative {
-                    let anns = get_annotation(&content);
-                    if anns.native_mode && language == ScriptLang::Bun {
+                    let anns = windmill_common::worker::TypeScriptAnnotations::parse(&content);
+                    if anns.native && language == ScriptLang::Bun {
                         language = ScriptLang::Bunnative;
-                    } else if !anns.native_mode && language == ScriptLang::Bunnative {
+                    } else if !anns.native && language == ScriptLang::Bunnative {
                         language = ScriptLang::Bun;
                     };
                 }
@@ -1003,10 +1003,10 @@ async fn lock_modules<'c>(
 
 fn skip_creating_new_lock(language: &ScriptLang, content: &str) -> bool {
     if language == &ScriptLang::Bun || language == &ScriptLang::Bunnative {
-        let anns = get_annotation(&content);
-        if anns.native_mode && language == &ScriptLang::Bun {
+        let anns = windmill_common::worker::TypeScriptAnnotations::parse(&content);
+        if anns.native && language == &ScriptLang::Bun {
             return false;
-        } else if !anns.native_mode && language == &ScriptLang::Bunnative {
+        } else if !anns.native && language == &ScriptLang::Bunnative {
             return false;
         };
     }
@@ -1077,11 +1077,13 @@ async fn lock_modules_app(
                             match new_lock {
                                 Ok(new_lock) => {
                                     append_logs(&job.id, &job.workspace_id, logs, db).await;
-                                    let anns = get_annotation(&content);
-                                    let nlang = if anns.native_mode && language == ScriptLang::Bun {
+                                    let anns =
+                                        windmill_common::worker::TypeScriptAnnotations::parse(
+                                            &content,
+                                        );
+                                    let nlang = if anns.native && language == ScriptLang::Bun {
                                         Some(ScriptLang::Bunnative)
-                                    } else if !anns.native_mode && language == ScriptLang::Bunnative
-                                    {
+                                    } else if !anns.native && language == ScriptLang::Bunnative {
                                         Some(ScriptLang::Bun)
                                     } else {
                                         None
@@ -1280,7 +1282,7 @@ async fn python_dep(
     occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
 ) -> std::result::Result<String, Error> {
     create_dependencies_dir(job_dir).await;
-    let req: std::result::Result<String, Error> = pip_compile(
+    let req: std::result::Result<String, Error> = uv_pip_compile(
         job_id,
         &reqs,
         mem_peak,
@@ -1290,6 +1292,8 @@ async fn python_dep(
         worker_name,
         w_id,
         occupancy_metrics,
+        false,
+        false,
     )
     .await;
     // install the dependencies to pre-fill the cache
@@ -1434,8 +1438,9 @@ async fn capture_dependency_job(
             .await
         }
         ScriptLang::Bun | ScriptLang::Bunnative => {
-            let npm_mode = npm_mode
-                .unwrap_or_else(|| windmill_common::worker::get_annotation(job_raw_code).npm_mode);
+            let npm_mode = npm_mode.unwrap_or_else(|| {
+                windmill_common::worker::TypeScriptAnnotations::parse(job_raw_code).npm
+            });
             if !raw_deps {
                 let _ = write_file(job_dir, "main.ts", job_raw_code)?;
             }
@@ -1472,7 +1477,7 @@ async fn capture_dependency_job(
                     base_internal_url,
                     worker_name,
                     &token,
-                    occupancy_metrics,
+                    &mut Some(occupancy_metrics),
                 )
                 .await?;
             }
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 2d88e6abed..3a229dc1e8 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.402.3";
+export const VERSION = "v1.416.2";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/apps.ts b/cli/apps.ts
index 1330c3ba80..ca966e2112 100644
--- a/cli/apps.ts
+++ b/cli/apps.ts
@@ -1,6 +1,6 @@
 // deno-lint-ignore-file no-explicit-any
 import { requireLogin, resolveWorkspace, validatePath } from "./context.ts";
-import { colors, Command, log, SEP, Table, yamlParse } from "./deps.ts";
+import { colors, Command, log, SEP, Table, yamlParseFile } from "./deps.ts";
 import * as wmill from "./gen/services.gen.ts";
 import { ListableApp, Policy } from "./gen/types.gen.ts";
 
@@ -25,7 +25,7 @@ export async function pushApp(
     return;
   }
   alreadySynced.push(localPath);
-  remotePath.replaceAll(SEP, "/");
+  remotePath = remotePath.replaceAll(SEP, "/");
   let app: any = undefined;
   // deleting old app if it exists in raw mode
   try {
@@ -40,8 +40,8 @@ export async function pushApp(
   if (!localPath.endsWith(SEP)) {
     localPath += SEP;
   }
-  const localAppRaw = await Deno.readTextFile(localPath + "app.yaml");
-  const localApp = yamlParse(localAppRaw) as AppFile;
+  const path = localPath + "app.yaml";
+  const localApp = (await yamlParseFile(path)) as AppFile;
 
   function replaceInlineScripts(rec: any) {
     if (!rec) {
diff --git a/cli/conf.ts b/cli/conf.ts
index fa18de880b..eab154fec9 100644
--- a/cli/conf.ts
+++ b/cli/conf.ts
@@ -1,4 +1,4 @@
-import { log, yamlParse } from "./deps.ts";
+import { log, yamlParseFile } from "./deps.ts";
 
 export interface SyncOptions {
   stateful?: boolean;
@@ -40,9 +40,7 @@ export interface Codebase {
 
 export async function readConfigFile(): Promise<SyncOptions> {
   try {
-    const conf = yamlParse(
-      await Deno.readTextFile("wmill.yaml")
-    ) as SyncOptions;
+    const conf = (await yamlParseFile("wmill.yaml")) as SyncOptions;
     if (conf?.defaultTs == undefined) {
       log.warn(
         "No defaultTs defined in your wmill.yaml. Using 'bun' as default."
diff --git a/cli/deps.ts b/cli/deps.ts
index a8e14f0d3d..53e96a4f9c 100644
--- a/cli/deps.ts
+++ b/cli/deps.ts
@@ -21,7 +21,29 @@ export { copy } from "jsr:@std/io/copy";
 export { readAll } from "jsr:@std/io/read-all";
 
 export * as log from "jsr:@std/log";
-export { stringify as yamlStringify, parse as yamlParse } from "jsr:@std/yaml";
+export { stringify as yamlStringify } from "jsr:@std/yaml";
+
+import { parse as yamlParse, ParseOptions } from "jsr:@std/yaml";
+
+export async function yamlParseFile(path: string, options: ParseOptions = {}) {
+  try {
+    return yamlParse(await Deno.readTextFile(path), options);
+  } catch (e) {
+    throw new Error(`Error parsing yaml ${path}`, { cause: e });
+  }
+}
+
+export function yamlParseContent(
+  path: string,
+  content: string,
+  options: ParseOptions = {}
+) {
+  try {
+    return yamlParse(content, options);
+  } catch (e) {
+    throw new Error(`Error parsing yaml ${path}`, { cause: e });
+  }
+}
 
 // other
 
diff --git a/cli/flow.ts b/cli/flow.ts
index 601f0be0bc..edca024f66 100644
--- a/cli/flow.ts
+++ b/cli/flow.ts
@@ -1,7 +1,7 @@
 // deno-lint-ignore-file no-explicit-any
 import { GlobalOptions, isSuperset } from "./types.ts";
 import { Confirm, SEP, log, yamlStringify } from "./deps.ts";
-import { colors, Command, Table, yamlParse } from "./deps.ts";
+import { colors, Command, Table, yamlParseFile } from "./deps.ts";
 import * as wmill from "./gen/services.gen.ts";
 
 import { requireLogin, resolveWorkspace, validatePath } from "./context.ts";
@@ -29,21 +29,23 @@ export function replaceInlineScripts(
 ) {
   modules.forEach((m) => {
     if (m.value.type == "rawscript") {
-      const path = m.value.content.split(" ")[1];
-      m.value.content = Deno.readTextFileSync(localPath + path);
-      const lock = m.value.lock;
-      if (removeLocks && removeLocks.includes(path)) {
-        m.value.lock = undefined;
-      } else if (
-        lock &&
-        typeof lock == "string" &&
-        lock.trimStart().startsWith("!inline ")
-      ) {
-        const path = lock.split(" ")[1];
-        try {
-          m.value.lock = readInlinePathSync(localPath + path);
-        } catch {
-          log.error(`Lock file ${path} not found`);
+      if (m.value.content.startsWith("!inline")) {
+        const path = m.value.content.split(" ")[1];
+        m.value.content = Deno.readTextFileSync(localPath + path);
+        const lock = m.value.lock;
+        if (removeLocks && removeLocks.includes(path)) {
+          m.value.lock = undefined;
+        } else if (
+          lock &&
+          typeof lock == "string" &&
+          lock.trimStart().startsWith("!inline ")
+        ) {
+          const path = lock.split(" ")[1];
+          try {
+            m.value.lock = readInlinePathSync(localPath + path);
+          } catch {
+            log.error(`Lock file ${path} not found`);
+          }
         }
       }
     } else if (m.value.type == "forloopflow") {
@@ -87,8 +89,7 @@ export async function pushFlow(
   if (!localPath.endsWith(SEP)) {
     localPath += SEP;
   }
-  const localFlowRaw = await Deno.readTextFile(localPath + "flow.yaml");
-  const localFlow = yamlParse(localFlowRaw) as FlowFile;
+  const localFlow = (await yamlParseFile(localPath + "flow.yaml")) as FlowFile;
 
   replaceInlineScripts(localFlow.value.modules, localPath, undefined);
 
@@ -120,6 +121,7 @@ export async function pushFlow(
       });
     } catch (e) {
       throw new Error(
+        //@ts-ignore
         `Failed to create flow ${remotePath}: ${e.body ?? e.message}`
       );
     }
diff --git a/cli/folder.ts b/cli/folder.ts
index 0820cc0c9d..5cf2812670 100644
--- a/cli/folder.ts
+++ b/cli/folder.ts
@@ -73,6 +73,7 @@ export async function pushFolder(
         },
       });
     } catch (e) {
+      //@ts-ignore
       console.error(e.body);
       throw e;
     }
@@ -87,6 +88,7 @@ export async function pushFolder(
         },
       });
     } catch (e) {
+      //@ts-ignore
       throw Error(`Failed to create folder ${name}: ${e.body ?? e.message}`);
     }
   }
diff --git a/cli/gen/core/OpenAPI.ts b/cli/gen/core/OpenAPI.ts
index 6af5246be2..cddc3f88de 100644
--- a/cli/gen/core/OpenAPI.ts
+++ b/cli/gen/core/OpenAPI.ts
@@ -54,7 +54,7 @@ export const OpenAPI: OpenAPIConfig = {
 	PASSWORD: undefined,
 	TOKEN: getEnv("WM_TOKEN"),
 	USERNAME: undefined,
-	VERSION: '1.401.0',
+	VERSION: '1.407.2',
 	WITH_CREDENTIALS: true,
 	interceptors: {
 		request: new Interceptors(),
diff --git a/cli/gen/types.gen.ts b/cli/gen/types.gen.ts
index 92bfe933d9..fe297f8bde 100644
--- a/cli/gen/types.gen.ts
+++ b/cli/gen/types.gen.ts
@@ -1015,6 +1015,9 @@ export type FlowModule = {
         skip_if_stopped?: boolean;
         expr: string;
     };
+    skip_if?: {
+        expr: string;
+    };
     sleep?: InputTransform;
     cache_ttl?: number;
     timeout?: number;
@@ -1176,6 +1179,7 @@ export type FlowStatusModule = {
         approver: string;
     }>;
     failed_retries?: Array<(string)>;
+    skipped?: boolean;
 };
 
 export type type4 = 'WaitingForPriorSteps' | 'WaitingForEvents' | 'WaitingForExecutor' | 'InProgress' | 'Success' | 'Failure';
diff --git a/cli/instance.ts b/cli/instance.ts
index cf2d5f5b02..1e86282d1a 100644
--- a/cli/instance.ts
+++ b/cli/instance.ts
@@ -3,7 +3,7 @@ import {
   path,
   Confirm,
   yamlStringify,
-  yamlParse,
+  yamlParseFile,
   Command,
   setClient,
   Table,
@@ -25,8 +25,8 @@ import {
 import {
   add as workspaceSetup,
   addWorkspace,
-  allWorkspaces,
   removeWorkspace,
+  setActiveWorkspace,
 } from "./workspace.ts";
 import {
   pushInstanceSettings,
@@ -35,8 +35,9 @@ import {
   pushInstanceConfigs,
   type SimplifiedSettings,
 } from "./settings.ts";
-import { sleep, deepEqual } from "./utils.ts";
+import { deepEqual } from "./utils.ts";
 import { GlobalOptions } from "./types.ts";
+import { getActiveWorkspace } from "./workspace.ts";
 
 export interface Instance {
   remote: string;
@@ -180,18 +181,44 @@ export type InstanceSyncOptions = {
   instance?: string;
   baseUrl?: string;
   token?: string;
+  folderPerInstance?: boolean;
   yes?: boolean;
+  prefix?: string;
 };
 
-export async function pickInstance(opts: InstanceSyncOptions, allowNew: boolean) {
+export async function pickInstance(
+  opts: InstanceSyncOptions,
+  allowNew: boolean
+) {
   const instances = await allInstances();
+  if (opts.baseUrl && opts.token && opts.instance) {
+    log.info("Using instance defined by --instance, --base-url and --token");
+
+    setClient(
+      opts.token,
+      opts.baseUrl.endsWith("/") ? opts.baseUrl.slice(0, -1) : opts.baseUrl
+    );
+
+    return {
+      name: opts.instance,
+      remote: opts.baseUrl,
+      token: opts.token,
+      prefix: opts.prefix ?? opts.instance,
+    };
+  }
   if (opts.baseUrl && opts.token) {
-    log.info("Using instance fully defined by --base-url and --token")
+    log.info("Using instance fully defined by --base-url and --token");
+
+    setClient(
+      opts.token,
+      opts.baseUrl.endsWith("/") ? opts.baseUrl.slice(0, -1) : opts.baseUrl
+    );
+
     return {
       name: "custom",
       remote: opts.baseUrl,
       token: opts.token,
-      prefix: "custom",
+      prefix: opts.prefix ?? "custom",
     };
   }
   if (!allowNew && instances.length < 1) {
@@ -284,23 +311,25 @@ async function instancePull(opts: GlobalOptions & InstanceSyncOptions) {
     log.info("No instance-level changes to apply");
   }
 
-  sleep(1000);
-
   if (opts.includeWorkspaces) {
     log.info("\nPulling all workspaces");
+    const rootDir = Deno.cwd();
+    const localWorkspaces = await getLocalWorkspaces(
+      rootDir,
+      instance.prefix,
+      opts.folderPerInstance
+    );
+
+    const previousActiveWorkspace = await getActiveWorkspace(undefined);
     const remoteWorkspaces = await wmill.listWorkspacesAsSuperAdmin({
       page: 1,
       perPage: 1000,
     });
-    let localWorkspaces = await allWorkspaces();
-    localWorkspaces = localWorkspaces.filter((w) =>
-      w.name.startsWith(instance.prefix + "_")
-    );
-    const rootDir = Deno.cwd();
     for (const remoteWorkspace of remoteWorkspaces) {
       log.info("\nPulling workspace " + remoteWorkspace.id);
-      sleep(1000);
-      const workspaceName = instance.prefix + "_" + remoteWorkspace.id;
+      const workspaceName = opts?.folderPerInstance
+        ? instance.prefix + "/" + remoteWorkspace.id
+        : instance.prefix + "_" + remoteWorkspace.id;
       await Deno.mkdir(path.join(rootDir, workspaceName), {
         recursive: true,
       });
@@ -327,31 +356,37 @@ async function instancePull(opts: GlobalOptions & InstanceSyncOptions) {
         includeSettings: true,
         includeUsers: true,
         includeKey: true,
+        yes: opts.yes,
       });
     }
 
     const localWorkspacesToDelete = localWorkspaces.filter(
-      (w) => !remoteWorkspaces.find((r) => r.id === w.workspaceId)
+      (w) => !remoteWorkspaces.find((r) => r.id === w.id)
     );
 
     if (localWorkspacesToDelete.length > 0) {
-      const confirmDelete = await Confirm.prompt({
-        message:
-          "Do you want to delete the local copy of workspaces that don't exist anymore on the instance?\n" +
-          localWorkspacesToDelete.map((w) => w.workspaceId).join(", "),
-        default: true,
-      });
+      const confirmDelete =
+        opts.yes ||
+        (await Confirm.prompt({
+          message:
+            "Do you want to delete the local copy of workspaces that don't exist anymore on the instance?\n" +
+            localWorkspacesToDelete.map((w) => w).join(", "),
+          default: true,
+        }));
 
       if (confirmDelete) {
         for (const workspace of localWorkspacesToDelete) {
-          await removeWorkspace(workspace.name, false, {});
-          await Deno.remove(path.join(rootDir, workspace.name), {
+          await removeWorkspace(workspace.id, false, {});
+          await Deno.remove(path.join(rootDir, workspace.dir), {
             recursive: true,
           });
         }
       }
     }
 
+    if (previousActiveWorkspace) {
+      await setActiveWorkspace(previousActiveWorkspace?.name);
+    }
     log.info(colors.green.underline.bold("All workspaces pulled"));
   }
 }
@@ -409,37 +444,46 @@ async function instancePush(opts: GlobalOptions & InstanceSyncOptions) {
     log.info("No instance-level changes to apply");
   }
 
-  sleep(1000);
-
   if (opts.includeWorkspaces) {
     instances = await allInstances();
-    const localPrefix = (await Select.prompt({
-      message: "What is the prefix of the local workspaces you want to sync?",
-      options: [
-        ...instances.map((i) => ({
-          name: `${i.prefix} (${i.name} - ${i.remote})`,
-          value: i.prefix,
-        })),
-      ],
-      default: instance.prefix as unknown,
-    })) as unknown as string;
+    const rootDir = Deno.cwd();
+
+    let localPrefix;
+    if (opts.prefix) {
+      localPrefix = opts.prefix;
+    } else {
+      localPrefix = (await Select.prompt({
+        message: "What is the prefix of the local workspaces you want to sync?",
+        options: [
+          ...instances.map((i) => ({
+            name: `${i.prefix} (${i.name} - ${i.remote})`,
+            value: i.prefix,
+          })),
+        ],
+        default: instance.prefix as unknown,
+      })) as unknown as string;
+    }
 
     const remoteWorkspaces = await wmill.listWorkspacesAsSuperAdmin({
       page: 1,
       perPage: 1000,
     });
-    let localWorkspaces = await allWorkspaces();
-    localWorkspaces = localWorkspaces.filter((w) =>
-      w.name.startsWith(localPrefix + "_")
+
+    const previousActiveWorkspace = await getActiveWorkspace(undefined);
+
+    const localWorkspaces = await getLocalWorkspaces(
+      rootDir,
+      localPrefix,
+      opts.folderPerInstance
     );
 
-    log.info("\nPushing all workspaces");
-    const rootDir = Deno.cwd();
+    log.info(
+      `\nPushing all workspaces: ${localWorkspaces.map((x) => x.id).join(", ")}`
+    );
     for (const localWorkspace of localWorkspaces) {
-      log.info("\nPushing workspace " + localWorkspace.workspaceId);
-      sleep(1000);
+      log.info("\nPushing workspace " + localWorkspace.id);
       try {
-        await Deno.chdir(path.join(rootDir, localWorkspace.name));
+        await Deno.chdir(path.join(rootDir, localWorkspace.dir));
       } catch (_) {
         throw new Error(
           "Workspace folder not found, are you in the right directory?"
@@ -447,9 +491,9 @@ async function instancePush(opts: GlobalOptions & InstanceSyncOptions) {
       }
 
       try {
-        const workspaceSettings = yamlParse(
-          await Deno.readTextFile("settings.yaml")
-        ) as SimplifiedSettings;
+        const workspaceSettings = (await yamlParseFile(
+          "settings.yaml"
+        )) as SimplifiedSettings;
         await workspaceSetup(
           {
             token: instance.token,
@@ -459,8 +503,8 @@ async function instancePush(opts: GlobalOptions & InstanceSyncOptions) {
             createWorkspaceName: workspaceSettings.name,
             createUsername: undefined,
           },
-          localWorkspace.name,
-          localWorkspace.workspaceId,
+          localWorkspace.dir,
+          localWorkspace.id,
           instance.remote
         );
       } catch (_) {
@@ -470,7 +514,7 @@ async function instancePush(opts: GlobalOptions & InstanceSyncOptions) {
         continue;
       }
       await push({
-        workspace: localWorkspace.name,
+        workspace: localWorkspace.dir,
         token: undefined,
         baseUrl: undefined,
         includeGroups: true,
@@ -478,19 +522,22 @@ async function instancePush(opts: GlobalOptions & InstanceSyncOptions) {
         includeSettings: true,
         includeUsers: true,
         includeKey: true,
+        yes: opts.yes,
       });
     }
 
     const workspacesToDelete = remoteWorkspaces.filter(
-      (w) => !localWorkspaces.find((l) => l.workspaceId === w.id)
+      (w) => !localWorkspaces.find((l) => l.id === w.id)
     );
     if (workspacesToDelete.length > 0) {
-      const confirmDelete = await Confirm.prompt({
-        message:
-          "Do you want to delete the following remote workspaces that don't exist locally?\n" +
-          workspacesToDelete.map((w) => w.id).join(", "),
-        default: true,
-      });
+      const confirmDelete =
+        opts.yes ||
+        (await Confirm.prompt({
+          message:
+            "Do you want to delete the following remote workspaces that don't exist locally?\n" +
+            workspacesToDelete.map((w) => w.id).join(", "),
+          default: true,
+        }));
 
       if (confirmDelete) {
         for (const workspace of workspacesToDelete) {
@@ -499,10 +546,46 @@ async function instancePush(opts: GlobalOptions & InstanceSyncOptions) {
         }
       }
     }
+    if (previousActiveWorkspace) {
+      await setActiveWorkspace(previousActiveWorkspace?.name);
+    }
     log.info(colors.green.underline.bold("All workspaces pushed"));
   }
 }
 
+async function getLocalWorkspaces(
+  rootDir: string,
+  localPrefix: string,
+  folderPerInstance?: boolean
+) {
+  const localWorkspaces: { dir: string; id: string }[] = [];
+
+  if (!(await Deno.stat(localPrefix).catch(() => null))) {
+    await Deno.mkdir(localPrefix);
+  }
+  if (folderPerInstance) {
+    for await (const dir of Deno.readDir(rootDir + "/" + localPrefix)) {
+      const dirName = dir.name;
+      localWorkspaces.push({
+        dir: localPrefix + "/" + dirName,
+        id: dirName,
+      });
+    }
+    log.info(localWorkspaces);
+  } else {
+    for await (const dir of Deno.readDir(rootDir)) {
+      const dirName = dir.name;
+      if (dirName.startsWith(localPrefix + "_")) {
+        localWorkspaces.push({
+          dir: dirName,
+          id: dirName.substring(localPrefix.length + 1),
+        });
+      }
+    }
+  }
+  return localWorkspaces;
+}
+
 async function switchI(opts: {}, instanceName: string) {
   const all = await allInstances();
   if (all.findIndex((x) => x.name === instanceName) === -1) {
@@ -544,7 +627,10 @@ async function whoami(opts: {}) {
     log.info(colors.green.underline(`global whoami infos:`));
     log.info(JSON.stringify(whoamiInfo, null, 2));
   } catch (error) {
-    log.error(colors.red(`Failed to retrieve whoami information: ${error.message}`));
+    log.error(
+      //@ts-ignore
+      colors.red(`Failed to retrieve whoami information: ${error.message}`)
+    );
   }
 }
 
@@ -585,7 +671,7 @@ const command = new Command()
   .description("Remove an instance")
   .complete("instance", async () => (await allInstances()).map((x) => x.name))
   .arguments("<instance:string:instance>")
-  .action(async (instance) => {
+  .action(async (instance: any) => {
     const instances = await allInstances();
 
     const choice = (await Select.prompt({
@@ -614,6 +700,15 @@ const command = new Command()
   .option("--skip-configs", "Skip pulling configs (worker groups and SMTP)")
   .option("--skip-groups", "Skip pulling instance groups")
   .option("--include-workspaces", "Also pull workspaces")
+  .option("--folder-per-instance", "Create a folder per instance")
+  .option(
+    "--instance <instance:string>",
+    "Name of the instance to pull from, override the active instance"
+  )
+  .option(
+    "--prefix <prefix:string>",
+    "Prefix of the local workspaces to pull, used to create the folders when using --include-workspaces"
+  )
 
   .action(instancePull as any)
   .command("push")
@@ -626,13 +721,14 @@ const command = new Command()
   .option("--skip-configs", "Skip pushing configs (worker groups and SMTP)")
   .option("--skip-groups", "Skip pushing instance groups")
   .option("--include-workspaces", "Also push workspaces")
+  .option("--folder-per-instance", "Create a folder per instance")
   .option(
-    "--instance",
+    "--instance <instance:string>",
     "Name of the instance to push to, override the active instance"
   )
   .option(
-    "--base-url",
-    "If used with --token, will be used as the base url for the instance"
+    "--prefix <prefix:string>",
+    "Prefix of the local workspaces folders to push"
   )
   .action(instancePush as any)
   .command("whoami")
diff --git a/cli/local_encryption.ts b/cli/local_encryption.ts
new file mode 100644
index 0000000000..4277093f8f
--- /dev/null
+++ b/cli/local_encryption.ts
@@ -0,0 +1,101 @@
+import crypto from "node:crypto";
+
+// Helper function to convert strings to Uint8Array (binary)
+function encode(input: string): Uint8Array {
+  return new TextEncoder().encode(input);
+}
+
+// Helper function to convert Uint8Array (binary) to base64
+function toBase64(arr: Uint8Array): string {
+  return btoa(String.fromCharCode(...arr));
+}
+
+// Helper function to convert base64 to Uint8Array (binary)
+function fromBase64(base64: string): Uint8Array {
+  return new Uint8Array(
+    atob(base64)
+      .split("")
+      .map((char) => char.charCodeAt(0))
+  );
+}
+
+// Function to derive a 256-bit key from any input string using SHA-256
+async function deriveKey(
+  keyString: string
+): Promise<crypto.webcrypto.CryptoKey> {
+  const keyMaterial = encode(keyString);
+  const keyHash = await crypto.subtle.digest("SHA-256", keyMaterial); // Generate SHA-256 hash
+  // Import the hash as a CryptoKey for AES-GCM
+  return crypto.subtle.importKey("raw", keyHash, { name: "AES-GCM" }, false, [
+    "encrypt",
+    "decrypt",
+  ]);
+}
+
+// Encrypt function
+export async function encrypt(
+  plaintext: string,
+  keyString: string
+): Promise<string> {
+  const key = await deriveKey(keyString); // Derive a 256-bit AES key from any input string
+  const iv = crypto.getRandomValues(new Uint8Array(12)); // AES-GCM needs a 12-byte IV
+  const encrypted = await crypto.subtle.encrypt(
+    {
+      name: "AES-GCM",
+      iv,
+      tagLength: 128,
+    },
+    key,
+    encode(plaintext) // convert plaintext to binary
+  );
+
+  // Concatenate IV and encrypted data
+  const combined = new Uint8Array(iv.length + encrypted.byteLength);
+  combined.set(iv, 0); // first part is the IV
+  combined.set(new Uint8Array(encrypted), iv.length); // second part is the ciphertext
+
+  // Convert to base64 for storage/transmission
+  return toBase64(combined);
+}
+
+// Decrypt function
+export async function decrypt(
+  combinedCiphertext: string,
+  keyString: string
+): Promise<string> {
+  const key = await deriveKey(keyString); // Derive the same 256-bit AES key from the input string
+  const combined = fromBase64(combinedCiphertext); // decode base64 to binary
+
+  // Split the IV and the ciphertext
+  const iv = combined.slice(0, 12); // First 12 bytes are the IV
+  const ciphertext = combined.slice(12); // The rest is the encrypted data
+  console.log();
+
+  // log.info({keyString, key, ciphertext})
+  // Perform decryption
+  const decrypted = await crypto.subtle.decrypt(
+    {
+      name: "AES-GCM",
+      iv,
+      tagLength: 128,
+    },
+    key,
+    ciphertext
+  );
+
+  // Convert decrypted data from binary to string
+  return new TextDecoder().decode(decrypted);
+}
+
+//   // Example usage:
+//   const key = "any-length-key-you-want"; // Now can be any length
+//   const message = "This is a secret message.";
+
+//   encrypt(message, key).then((combinedCiphertext) => {
+//     console.log("Encrypted message:", combinedCiphertext);
+
+//     // Now decrypt it
+//     decrypt(combinedCiphertext, key).then((decryptedMessage) => {
+//       console.log("Decrypted message:", decryptedMessage);
+//     });
+//   });
diff --git a/cli/main.ts b/cli/main.ts
index c1aa86cf3e..562c3fde45 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.402.3";
+export const VERSION = "1.416.2";
 
 const command = new Command()
   .name("wmill")
@@ -101,9 +101,13 @@ const command = new Command()
       "wmill.yaml",
       yamlStringify({
         defaultTs: "bun",
-        includes: ["**"],
+        includes: ["f/**"],
         excludes: [],
         codebases: [],
+        skipVariables: true,
+        skipResources: true,
+        skipSecrets: true,
+        includeSchedules: false,
       })
     );
     log.info(colors.green("wmill.yaml created"));
@@ -213,9 +217,11 @@ function isMain() {
     const isMain = import.meta.main;
     if (isMain) {
       if (!Deno.args.includes("completions")) {
-        log.warn(
-          "Using the deno runtime for the Windmill CLI is deprecated, you can now use node: deno uninstall wmill && npm install -g windmill-cli"
-        );
+        if (Deno.env.get("SKIP_DENO_DEPRECATION_WARNING") !== "true") {
+          log.warn(
+            "Using the deno runtime for the Windmill CLI is deprecated, you can now use node: deno uninstall wmill && npm install -g windmill-cli. To skip this warning set SKIP_DENO_DEPRECATION_WARNING=true"
+          );
+        }
       }
     }
     return isMain;
diff --git a/cli/metadata.ts b/cli/metadata.ts
index a3b4738cb7..92ac7dfc4b 100644
--- a/cli/metadata.ts
+++ b/cli/metadata.ts
@@ -1,6 +1,13 @@
 // deno-lint-ignore-file no-explicit-any
 import { GlobalOptions } from "./types.ts";
-import { SEP, colors, log, path, yamlParse, yamlStringify } from "./deps.ts";
+import {
+  SEP,
+  colors,
+  log,
+  path,
+  yamlParseFile,
+  yamlStringify,
+} from "./deps.ts";
 import {
   ScriptMetadata,
   defaultScriptMetadata,
@@ -119,9 +126,9 @@ export async function generateFlowLockInternal(
     return remote_path;
   }
 
-  const flowValue = yamlParse(
-    await Deno.readTextFile(folder! + SEP + "flow.yaml")
-  ) as FlowFile;
+  const flowValue = (await yamlParseFile(
+    folder! + SEP + "flow.yaml"
+  )) as FlowFile;
 
   if (!justUpdateMetadataLock) {
     const changedScripts = [];
@@ -798,7 +805,7 @@ export async function parseMetadataFile(
     try {
       metadataFilePath = scriptPath + ".script.yaml";
       await Deno.stat(metadataFilePath);
-      const payload: any = yamlParse(await Deno.readTextFile(metadataFilePath));
+      const payload: any = await yamlParseFile(metadataFilePath);
       replaceLock(payload);
 
       return {
@@ -840,9 +847,9 @@ export async function parseMetadataFile(
             codebases,
             false
           );
-          scriptInitialMetadata = yamlParse(
-            await Deno.readTextFile(metadataFilePath)
-          ) as ScriptMetadata;
+          scriptInitialMetadata = (await yamlParseFile(
+            metadataFilePath
+          )) as ScriptMetadata;
           replaceLock(scriptInitialMetadata);
         } catch (e) {
           log.info(
@@ -868,8 +875,7 @@ interface Lock {
 const WMILL_LOCKFILE = "wmill-lock.yaml";
 export async function readLockfile(): Promise<Lock> {
   try {
-    const lockfile = await Deno.readTextFile(WMILL_LOCKFILE);
-    const read = yamlParse(lockfile);
+    const read = await yamlParseFile(WMILL_LOCKFILE);
     if (typeof read == "object") {
       return read as Lock;
     } else {
diff --git a/cli/schedule.ts b/cli/schedule.ts
index fe2db1af19..25ffdd5b49 100644
--- a/cli/schedule.ts
+++ b/cli/schedule.ts
@@ -1,5 +1,5 @@
 // deno-lint-ignore-file no-explicit-any
-import { colors, Command, log, Table } from "./deps.ts";
+import { colors, Command, log, SEP, Table } from "./deps.ts";
 import { requireLogin, resolveWorkspace, validatePath } from "./context.ts";
 import * as wmill from "./gen/services.gen.ts";
 
@@ -42,8 +42,7 @@ export async function pushSchedule(
   schedule: Schedule | ScheduleFile | undefined,
   localSchedule: ScheduleFile
 ): Promise<void> {
-  path = removeType(path, "schedule");
-
+  path = removeType(path, "schedule").replaceAll(SEP, "/");
   log.debug(`Processing local schedule ${path}`);
 
   // deleting old app if it exists in raw mode
diff --git a/cli/settings.ts b/cli/settings.ts
index b3a1b6a272..f9dbac1fa6 100644
--- a/cli/settings.ts
+++ b/cli/settings.ts
@@ -1,7 +1,7 @@
 import { yamlStringify } from "./deps.ts";
 import { Confirm } from "./deps.ts";
 import { colors } from "./deps.ts";
-import { yamlParse } from "./deps.ts";
+import { yamlParseFile } from "./deps.ts";
 import { log } from "./deps.ts";
 import { compareInstanceObjects } from "./instance.ts";
 import { isSuperset } from "./types.ts";
@@ -9,6 +9,7 @@ import { deepEqual } from "./utils.ts";
 import * as wmill from "./gen/services.gen.ts";
 import { Config, GlobalSetting } from "./gen/types.gen.ts";
 import { removeWorkerPrefix } from "./worker_groups.ts";
+import process from "node:process";
 
 export interface SimplifiedSettings {
   // slack_team_id?: string;
@@ -112,10 +113,10 @@ export async function pushWorkspaceSettings(
         workspace,
         requestBody: localSettings.auto_invite_enabled
           ? {
-              operator: localSettings.auto_invite_as === "operator",
-              invite_all: true,
-              auto_add: localSettings.auto_invite_mode === "add",
-            }
+            operator: localSettings.auto_invite_as === "operator",
+            invite_all: true,
+            auto_add: localSettings.auto_invite_mode === "add",
+          }
           : {},
       });
     } catch (_) {
@@ -127,10 +128,10 @@ export async function pushWorkspaceSettings(
         workspace,
         requestBody: localSettings.auto_invite_enabled
           ? {
-              operator: localSettings.auto_invite_as === "operator",
-              invite_all: false,
-              auto_add: localSettings.auto_invite_mode === "add",
-            }
+            operator: localSettings.auto_invite_as === "operator",
+            invite_all: false,
+            auto_add: localSettings.auto_invite_mode === "add",
+          }
           : {},
       });
     }
@@ -155,7 +156,7 @@ export async function pushWorkspaceSettings(
       settings.error_handler_extra_args
     ) ||
     localSettings.error_handler_muted_on_cancel !==
-      settings.error_handler_muted_on_cancel
+    settings.error_handler_muted_on_cancel
   ) {
     log.debug(`Updating error handler...`);
     await wmill.editErrorHandler({
@@ -259,20 +260,69 @@ export async function pushWorkspaceKey(
   }
 }
 
+const INSTANCE_SETTINGS_PATH = "instance_settings.yaml";
+
+export async function readInstanceSettings() {
+  let localSettings: GlobalSetting[] = [];
+
+  try {
+    localSettings = (await yamlParseFile(INSTANCE_SETTINGS_PATH)) as GlobalSetting[];
+  } catch {
+    log.warn(`No ${INSTANCE_SETTINGS_PATH} found`);
+  }
+  return localSettings;
+}
+
+
+import { decrypt, encrypt } from "./local_encryption.ts";
+
+const SENSITIVE_FIELD: string[] = ["license_key", "jwt_secret"]
+
+async function processInstanceSettings(settings: GlobalSetting[], mode: "encode" | "decode"): Promise<GlobalSetting[]> {
+  const encKey = process.env.WMILL_INSTANCE_LOCAL_ENCRYPTION_KEY;
+  if (encKey) {
+    const res: GlobalSetting[] = []
+
+    for (const s of settings) {
+      if (SENSITIVE_FIELD.includes(s.name) && typeof s.value === "string") {
+        res.push(await processField(s, "value", encKey, mode) as GlobalSetting);
+      } else if (s.name == "oauths") {
+        if (typeof s.value === "object") {
+          const oauths = s.value as { [key: string]: any };
+          for (const [k, v] of Object.entries(oauths)) {
+            oauths[k] = await processField(v, "secret", encKey, mode);
+          }
+          res.push(s);
+        } else {
+          log.warn(`Unexpected oauths value type: ${typeof s.value}`);
+          res.push(s);
+        }
+      } else {
+        res.push(s);
+      }
+    }
+    return res;
+  } else {
+    log.warn("No encryption key found, skipping encryption. Recommend setting WMILL_INSTANCE_LOCAL_ENCRYPTION_KEY");
+  }
+  return settings;
+}
+
+async function processField(obj: { [key: string]: any }, field: string, encKey: string, mode: "encode" | "decode"): Promise<{ [key: string]: any }> {
+  return {
+    ...obj,
+    [field]: mode === "encode" ? await encrypt(obj[field], encKey) : await decrypt(obj[field], encKey) as any,
+  }
+}
+
 export async function pullInstanceSettings(preview = false) {
   const remoteSettings = await wmill.listGlobalSettings();
 
   if (preview) {
-    let localSettings: GlobalSetting[] = [];
-
-    try {
-      localSettings = yamlParse(
-        await Deno.readTextFile("instance_settings.yaml")
-      ) as GlobalSetting[];
-    } catch {}
-
+    const localSettings: GlobalSetting[] = await readInstanceSettings();
+    const processedSettings = await processInstanceSettings(remoteSettings, "encode");
     return compareInstanceObjects(
-      remoteSettings,
+      processedSettings,
       localSettings,
       "name",
       "setting"
@@ -280,12 +330,13 @@ export async function pullInstanceSettings(preview = false) {
   } else {
     log.info("Pulling settings from instance");
 
+    const processedSettings = await processInstanceSettings(remoteSettings, "encode");
     await Deno.writeTextFile(
-      "instance_settings.yaml",
-      yamlStringify(remoteSettings as any)
+      INSTANCE_SETTINGS_PATH,
+      yamlStringify(processedSettings)
     );
 
-    log.info(colors.green("Settings written to instance_settings.yaml"));
+    log.info(colors.green(`Settings written to ${INSTANCE_SETTINGS_PATH}`));
   }
 }
 
@@ -294,9 +345,8 @@ export async function pushInstanceSettings(
   baseUrl?: string
 ) {
   const remoteSettings = await wmill.listGlobalSettings();
-  let localSettings = (await Deno.readTextFile("instance_settings.yaml")
-    .then((raw) => yamlParse(raw))
-    .catch(() => [])) as GlobalSetting[];
+  let localSettings: GlobalSetting[] = await readInstanceSettings();
+  localSettings = await processInstanceSettings(localSettings, "decode");
 
   if (baseUrl) {
     localSettings = localSettings.filter((s) => s.name !== "base_url");
@@ -354,6 +404,17 @@ export async function pushInstanceSettings(
   }
 }
 
+export async function readLocalConfigs() {
+  let localConfigs: Config[] = [];
+
+  try {
+    localConfigs = (await yamlParseFile("instance_configs.yaml")) as Config[];
+  } catch {
+    log.warn("No instance_configs.yaml found");
+  }
+  return localConfigs;
+}
+
 export async function pullInstanceConfigs(preview = false) {
   const remoteConfigs = (await wmill.listConfigs()).map((x) => {
     return {
@@ -363,12 +424,7 @@ export async function pullInstanceConfigs(preview = false) {
   });
 
   if (preview) {
-    let localConfigs: Config[] = [];
-    try {
-      localConfigs = yamlParse(
-        await Deno.readTextFile("instance_configs.yaml")
-      ) as Config[];
-    } catch {}
+    const localConfigs: Config[] = await readLocalConfigs();
 
     return compareInstanceObjects(
       remoteConfigs,
@@ -395,9 +451,7 @@ export async function pushInstanceConfigs(preview: boolean = false) {
       name: removeWorkerPrefix(x.name),
     };
   });
-  const localConfigs = (await Deno.readTextFile("instance_configs.yaml")
-    .then((raw) => yamlParse(raw))
-    .catch(() => [])) as Config[];
+  const localConfigs = await readLocalConfigs();
 
   if (preview) {
     return compareInstanceObjects(
@@ -415,7 +469,9 @@ export async function pushInstanceConfigs(preview: boolean = false) {
       }
       try {
         await wmill.updateConfig({
-          name: config.name.startsWith('worker__') ? config.name : `worker__${config.name}`,
+          name: config.name.startsWith("worker__")
+            ? config.name
+            : `worker__${config.name}`,
           requestBody: config.config,
         });
       } catch (err) {
diff --git a/cli/sync.ts b/cli/sync.ts
index 088571362d..342dda3162 100644
--- a/cli/sync.ts
+++ b/cli/sync.ts
@@ -9,7 +9,7 @@ import {
   path,
   log,
   yamlStringify,
-  yamlParse,
+  yamlParseContent,
   SEP,
 } from "./deps.ts";
 import * as wmill from "./gen/services.gen.ts";
@@ -112,7 +112,7 @@ async function addCodebaseDigestIfRelevant(
   if (isTs) {
     const c = findCodebase(path, codebases);
     if (c) {
-      const parsed: any = yamlParse(content);
+      const parsed: any = yamlParseContent(path, content);
       if (parsed && typeof parsed == "object") {
         parsed["codebase"] = c.digest;
         parsed["lock"] = undefined;
@@ -504,7 +504,7 @@ function ZipFSElement(
 
       if (formatExtension) {
         const fileContent: string = parsed["value"]["content"];
-        if (typeof(fileContent) === "string") {
+        if (typeof fileContent === "string") {
           r.push({
             isDirectory: false,
             path:
@@ -618,8 +618,8 @@ export async function elementsToMap(
   for await (const entry of readDirRecursiveWithIgnore(ignore, els)) {
     if (entry.isDirectory || entry.ignored) continue;
     const path = entry.path;
-    if (json && path.endsWith(".yaml")) continue;
-    if (!json && path.endsWith(".json")) continue;
+    if (json && path.endsWith(".yaml") && !isFileResource(path)) continue;
+    if (!json && path.endsWith(".json") && !isFileResource(path)) continue;
     const ext = json ? ".json" : ".yaml";
     if (!skips.includeSchedules && path.endsWith(".schedule" + ext)) continue;
     if (!skips.includeUsers && path.endsWith(".user" + ext)) continue;
@@ -660,7 +660,7 @@ export async function elementsToMap(
         if (json) {
           o = JSON.parse(content);
         } else {
-          o = yamlParse(content);
+          o = yamlParseContent(path, content);
         }
         if (o["is_secret"]) {
           continue;
@@ -704,7 +704,7 @@ async function compareDynFSElement(
 
   function parseYaml(k: string, v: string) {
     if (k.endsWith(".script.yaml")) {
-      const o: any = yamlParse(v);
+      const o: any = yamlParseContent(k, v);
       if (typeof o == "object") {
         if (Array.isArray(o?.["lock"])) {
           o["lock"] = o["lock"].join("\n");
@@ -715,7 +715,7 @@ async function compareDynFSElement(
       }
       return o;
     } else if (k.endsWith(".app.yaml")) {
-      const o: any = yamlParse(v);
+      const o: any = yamlParseContent(k, v);
       const o2 = o["policy"];
 
       if (typeof o2 == "object") {
@@ -728,7 +728,7 @@ async function compareDynFSElement(
       }
       return o;
     } else {
-      return yamlParse(v);
+      return yamlParseContent(k, v);
     }
   }
   for (const [k, v] of Object.entries(m1)) {
@@ -948,7 +948,7 @@ export async function pull(opts: GlobalOptions & SyncOptions) {
     if (
       !opts.yes &&
       !(await Confirm.prompt({
-        message: `Do you want to apply these ${changes.length} changes?`,
+        message: `Do you want to apply these ${changes.length} changes to your local files?`,
         default: true,
       }))
     ) {
@@ -1251,7 +1251,7 @@ export async function push(opts: GlobalOptions & SyncOptions) {
     if (
       !opts.yes &&
       !(await Confirm.prompt({
-        message: `Do you want to apply these ${changes.length} changes?`,
+        message: `Do you want to apply these ${changes.length} changes to the remote?`,
         default: true,
       }))
     ) {
diff --git a/cli/types.ts b/cli/types.ts
index 84691a37e2..e264521cb7 100644
--- a/cli/types.ts
+++ b/cli/types.ts
@@ -6,7 +6,7 @@ import {
   colors,
   log,
   path,
-  yamlParse,
+  yamlParseContent,
   yamlStringify,
 } from "./deps.ts";
 import { pushApp } from "./apps.ts";
@@ -115,7 +115,7 @@ export async function pushObj(
   newObj: any,
   plainSecrets: boolean,
   alreadySynced: string[],
-  message?: string,
+  message?: string
 ) {
   const typeEnding = getTypeStrFromPath(p);
 
@@ -155,7 +155,7 @@ export async function pushObj(
 
 export function parseFromPath(p: string, content: string): any {
   return p.endsWith(".yaml")
-    ? yamlParse(content)
+    ? yamlParseContent(p, content)
     : p.endsWith(".json")
     ? JSON.parse(content)
     : content;
@@ -164,7 +164,7 @@ export function parseFromFile(p: string): any {
   if (p.endsWith(".json")) {
     return JSON.parse(Deno.readTextFileSync(p));
   } else if (p.endsWith(".yaml") || p.endsWith(".yml")) {
-    return yamlParse(Deno.readTextFileSync(p));
+    return yamlParseContent(p, Deno.readTextFileSync(p));
   } else {
     throw new Error("Could not read file " + p);
   }
@@ -227,7 +227,7 @@ export function getTypeStrFromPath(
     return typeEnding;
   } else {
     if (isFileResource(p)) {
-      return "resource"
+      return "resource";
     }
     throw new Error("Could not infer type of path " + JSON.stringify(parsed));
   }
diff --git a/cli/user.ts b/cli/user.ts
index f95747306a..2ddeb997c9 100644
--- a/cli/user.ts
+++ b/cli/user.ts
@@ -13,7 +13,7 @@ import {
   log,
   Table,
   yamlStringify,
-  yamlParse,
+  yamlParseFile,
 } from "./deps.ts";
 import * as wmill from "./gen/services.gen.ts";
 import {
@@ -170,6 +170,7 @@ export async function pushWorkspaceUser(
         },
       });
     } catch (e) {
+      //@ts-ignore
       console.error(e.body);
       throw e;
     }
@@ -189,6 +190,7 @@ export async function pushWorkspaceUser(
         },
       });
     } catch (e) {
+      //@ts-ignore
       console.error(e.body);
       throw e;
     }
@@ -251,6 +253,7 @@ export async function pushGroup(
         },
       });
     } catch (e) {
+      //@ts-ignore
       console.error(e.body);
       throw e;
     }
@@ -301,6 +304,7 @@ export async function pushGroup(
           });
         }
       } catch (e) {
+        //@ts-ignore
         console.error(e.body);
         throw e;
       }
@@ -329,6 +333,7 @@ export async function pushGroup(
             },
           });
         } catch (e) {
+          //@ts-ignore
           console.error(e.body);
           throw e;
         }
@@ -368,11 +373,13 @@ export async function pushGroup(
             });
           }
         } catch (e) {
+          //@ts-ignore
           console.error(e.body);
           throw e;
         }
       }
     } catch (e) {
+      //@ts-ignore
       console.error(e.body);
       throw e;
     }
@@ -383,11 +390,7 @@ export async function pullInstanceUsers(preview: boolean = false) {
   const remoteUsers = await wmill.globalUsersExport();
 
   if (preview) {
-    let localUsers: ExportedUser[] = [];
-    try {
-      const raw = await Deno.readTextFile("instance_users.yaml");
-      localUsers = yamlParse(raw) as ExportedUser[];
-    } catch {}
+    const localUsers: ExportedUser[] = await readInstanceUsers();
     return compareInstanceObjects(remoteUsers, localUsers, "email", "user");
   } else {
     log.info("Pulling users from instance...");
@@ -399,11 +402,31 @@ export async function pullInstanceUsers(preview: boolean = false) {
   }
 }
 
+export async function readInstanceUsers() {
+  let localUsers: ExportedUser[] = [];
+  try {
+    localUsers = (await yamlParseFile("instance_users.yaml")) as ExportedUser[];
+  } catch {
+    log.warn("No instance_users.yaml file found");
+  }
+  return localUsers;
+}
+
+export async function readInstanceGroups() {
+  let localGroups: InstanceGroup[] = [];
+  try {
+    localGroups = (await yamlParseFile(
+      "instance_groups.yaml"
+    )) as ExportedInstanceGroup[];
+  } catch {
+    log.warn("No instance_groups.yaml file found");
+  }
+  return localGroups;
+}
+
 export async function pushInstanceUsers(preview: boolean = false) {
   const remoteUsers = await wmill.globalUsersExport();
-  const localUsers = (await Deno.readTextFile("instance_users.yaml")
-    .then((raw) => yamlParse(raw))
-    .catch(() => [])) as ExportedUser[];
+  const localUsers: ExportedUser[] = await readInstanceUsers();
 
   if (preview) {
     return compareInstanceObjects(localUsers, remoteUsers, "email", "user");
@@ -421,11 +444,7 @@ export async function pullInstanceGroups(preview = false) {
   const remoteGroups = await wmill.exportInstanceGroups();
 
   if (preview) {
-    let localGroups: InstanceGroup[] = [];
-    try {
-      const raw = await Deno.readTextFile("instance_groups.yaml");
-      localGroups = yamlParse(raw) as InstanceGroup[];
-    } catch {}
+    const localGroups = await readInstanceGroups();
     return compareInstanceObjects(remoteGroups, localGroups, "name", "group");
   } else {
     log.info("Pulling groups from instance...");
@@ -441,9 +460,7 @@ export async function pullInstanceGroups(preview = false) {
 
 export async function pushInstanceGroups(preview: boolean = false) {
   const remoteGroups = await wmill.exportInstanceGroups();
-  const localGroups = (await Deno.readTextFile("instance_groups.yaml")
-    .then((raw) => yamlParse(raw))
-    .catch(() => [])) as ExportedInstanceGroup[];
+  const localGroups = await readInstanceGroups();
 
   if (preview) {
     return compareInstanceObjects(localGroups, remoteGroups, "name", "group");
diff --git a/cli/utils.ts b/cli/utils.ts
index 5f2de77f6b..fcb07bea9e 100644
--- a/cli/utils.ts
+++ b/cli/utils.ts
@@ -55,7 +55,10 @@ export function deepEqual<T>(a: T, b: T): boolean {
     if (a.valueOf !== Object.prototype.valueOf) {
       return a.valueOf() === b.valueOf();
     }
-    if (a.toString !== Object.prototype.toString) {
+    if (
+      a.toString !== Object.prototype.toString &&
+      typeof a.toString == "function"
+    ) {
       return a.toString() === b.toString();
     }
 
diff --git a/cli/workspace.ts b/cli/workspace.ts
index face504183..4338e21cfe 100644
--- a/cli/workspace.ts
+++ b/cli/workspace.ts
@@ -34,10 +34,10 @@ export async function allWorkspaces(): Promise<Workspace[]> {
 }
 
 async function getActiveWorkspaceName(
-  opts: GlobalOptions
+  opts: GlobalOptions | undefined
 ): Promise<string | undefined> {
-  if (opts.workspace) {
-    return opts.workspace;
+  if (opts?.workspace) {
+    return opts?.workspace;
   }
   try {
     return await Deno.readTextFile((await getRootStore()) + "/activeWorkspace");
@@ -47,7 +47,7 @@ async function getActiveWorkspaceName(
 }
 
 export async function getActiveWorkspace(
-  opts: GlobalOptions
+  opts: GlobalOptions | undefined
 ): Promise<Workspace | undefined> {
   const name = await getActiveWorkspaceName(opts);
   if (!name) {
@@ -115,7 +115,12 @@ async function switchC(opts: GlobalOptions, workspaceName: string) {
     return;
   }
 
-  return await Deno.writeTextFile(
+  await setActiveWorkspace(workspaceName);
+  return;
+}
+
+export async function setActiveWorkspace(workspaceName: string) {
+  await Deno.writeTextFile(
     (await getRootStore()) + "/activeWorkspace",
     workspaceName
   );
@@ -241,10 +246,8 @@ export async function add(
     },
     opts
   );
-  await Deno.writeTextFile(
-    (await getRootStore()) + "/activeWorkspace",
-    workspaceName
-  );
+  await setActiveWorkspace(workspaceName);
+
   log.info(
     colors.green.underline(
       `Added workspace ${workspaceName} for ${workspaceId} on ${remote}!`
diff --git a/docker/DockerfileSlim b/docker/DockerfileSlim
index b94bdec85e..16c2361a0d 100644
--- a/docker/DockerfileSlim
+++ b/docker/DockerfileSlim
@@ -11,13 +11,16 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - 
-RUN apt-get -y update && apt-get install -y curl nodejs awscli
+RUN apt-get -y update && apt-get install -y curl procps nodejs awscli
 
 ENV TZ=Etc/UTC
 
 RUN /usr/local/bin/python3 -m pip install pip-tools
 
-COPY --from=oven/bun:1.1.27 /usr/local/bin/bun /usr/bin/bun
+# Install UV
+RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.4.18/uv-installer.sh | sh && mv /root/.cargo/bin/uv /usr/local/bin/uv
+
+COPY --from=oven/bun:1.1.32 /usr/local/bin/bun /usr/bin/bun
 
 # add the docker client to call docker from a worker if enabled
 COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/
diff --git a/docker/DockerfileSlimEe b/docker/DockerfileSlimEe
index b94bdec85e..65c6b55a19 100644
--- a/docker/DockerfileSlimEe
+++ b/docker/DockerfileSlimEe
@@ -11,13 +11,15 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - 
-RUN apt-get -y update && apt-get install -y curl nodejs awscli
+RUN apt-get -y update && apt-get install -y curl procps nodejs awscli
 
 ENV TZ=Etc/UTC
 
 RUN /usr/local/bin/python3 -m pip install pip-tools
+# Install UV
+RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.4.18/uv-installer.sh | sh && mv /root/.cargo/bin/uv /usr/local/bin/uv
 
-COPY --from=oven/bun:1.1.27 /usr/local/bin/bun /usr/bin/bun
+COPY --from=oven/bun:1.1.32 /usr/local/bin/bun /usr/bin/bun
 
 # add the docker client to call docker from a worker if enabled
 COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/
diff --git a/docker/RHEL9/Dockerfile b/docker/RHEL9/Dockerfile
index 3a9ed24bb6..10e0f01096 100644
--- a/docker/RHEL9/Dockerfile
+++ b/docker/RHEL9/Dockerfile
@@ -4,11 +4,13 @@ ARG PYTHON_IMAGE=python:3.11.10-slim-bookworm
 
 FROM ${RUST_IMAGE} AS rust_base
 
-RUN yum install -y rust-toolset
-
 RUN yum update -y && \
     yum install -y git openssl-devel npm nodejs rustfmt
 
+# Install rust manually
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 RUN CARGO_NET_GIT_FETCH_WITH_CLI=true cargo install cargo-chef --version ^0.1
 
 WORKDIR /windmill
@@ -35,7 +37,7 @@ COPY /backend/parsers/windmill-parser-wasm/pkg/ /backend/parsers/windmill-parser
 COPY /typescript-client/docs/ /frontend/static/tsdocs/
 
 RUN npm run generate-backend-client
-ENV NODE_OPTIONS "--max-old-space-size=8192"
+ENV NODE_OPTIONS "--max-old-space-size=10240"
 RUN npm run build
 
 
diff --git a/docker/RHEL9/README.md b/docker/RHEL9/README.md
index af858d8be5..17d39b86ca 100644
--- a/docker/RHEL9/README.md
+++ b/docker/RHEL9/README.md
@@ -3,17 +3,16 @@
 This directory contains the Dockerfiles for building Windmill binaries for Red Hat Linux 9.
 
 We build Windmill on the Red Hat Universal Base Image 9. Windmill requires the xmlsec1-devel package which is not available in the default UBI9 repositories. It is however included in the CodeReady Builder for RHEL9 repository which requires a RedHat subscription.
-Moreover, only rust v1.75 is supported on Red Hat Linux 9. To make Windmill compatible with Rust v1.75, you need to pin the following libraries:
-```
-aws-config = "=1.4.0"
-aws-sdk-sts = "=1.25.0"
-aws-sdk-ssooidc = "=1.25.0"
-aws-sdk-sso = "=1.25.0"
-```
-
-Make sure to include `aws-sdk-ssooidc` and `aws-sdk-sso` in the Cargo.toml of windmill-common as well to enforce the correct versions of the nested dependencies. Make them optional and include them in the `parquet` feature.
-It's also possible that you need to add `#[async_recursion]` to the `lock_modules` function in the `backend/windmill-worker/src/worker_lockfiles.rs` file for it to compile.
 
 Once the image is built, you can simply copy the binary on any Red Hat Linux 9 machine and run it. You will just need to install the xmlsec1 package which can be installed directly using `yum/dnf install xmlsec1`.
 
-
+## Notes
+ - you will need to register on Red Hat and have an individual developer subscription and pass the username and password to docker build:
+    ```
+    docker build \
+        -f docker/RHEL9/Dockerfile \
+        --build-arg features="$features" \
+        --secret id=rh_username,src=/path/to/rh_username \
+        --secret id=rh_password,src=/path/to/rh_password \
+        .
+    ```
\ No newline at end of file
diff --git a/frontend/openapi-ts-error-1726231138297.log b/frontend/openapi-ts-error-1726231138297.log
deleted file mode 100644
index f78fbf5b1c..0000000000
--- a/frontend/openapi-ts-error-1726231138297.log
+++ /dev/null
@@ -1,28 +0,0 @@
-Error parsing /git/windmill/backend/windmill-api/openapi.yaml: duplicated mapping key (8350:3)
-
- 8347 |             application/json:
- 8348 |               schema: {}
- 8349 | 
- 8350 |   /w/{workspace}/job_helpers/loa ...
-----------^
- 8351 |     get:
- 8352 |       summary: Load a preview of ...
-ParserError: Error parsing /git/windmill/backend/windmill-api/openapi.yaml: duplicated mapping key (8350:3)
-
- 8347 |             application/json:
- 8348 |               schema: {}
- 8349 | 
- 8350 |   /w/{workspace}/job_helpers/loa ...
-----------^
- 8351 |     get:
- 8352 |       summary: Load a preview of ...
-    at Object.parse (/git/windmill/frontend/node_modules/@apidevtools/json-schema-ref-parser/dist/lib/parsers/yaml.js:44:23)
-    at getResult (/git/windmill/frontend/node_modules/@apidevtools/json-schema-ref-parser/dist/lib/util/plugins.js:116:22)
-    at runNextPlugin (/git/windmill/frontend/node_modules/@apidevtools/json-schema-ref-parser/dist/lib/util/plugins.js:64:32)
-    at /git/windmill/frontend/node_modules/@apidevtools/json-schema-ref-parser/dist/lib/util/plugins.js:55:9
-    at new Promise (<anonymous>)
-    at Object.run (/git/windmill/frontend/node_modules/@apidevtools/json-schema-ref-parser/dist/lib/util/plugins.js:54:12)
-    at parseFile (/git/windmill/frontend/node_modules/@apidevtools/json-schema-ref-parser/dist/lib/parse.js:130:38)
-    at parse (/git/windmill/frontend/node_modules/@apidevtools/json-schema-ref-parser/dist/lib/parse.js:56:30)
-    at async $RefParser.parse (/git/windmill/frontend/node_modules/@apidevtools/json-schema-ref-parser/dist/lib/index.js:115:28)
-    at async $RefParser.resolve (/git/windmill/frontend/node_modules/@apidevtools/json-schema-ref-parser/dist/lib/index.js:145:13)
\ No newline at end of file
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index fbfe82be4e..028ac3e356 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.402.3",
+	"version": "1.416.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.402.3",
+			"version": "1.416.2",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index b85fc1caba..9c4f3a2a7d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.402.3",
+	"version": "1.416.2",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
@@ -177,6 +177,11 @@
 			"svelte": "./package/components/icons/WindmillIcon.svelte",
 			"default": "./package/components/icons/WindmillIcon.svelte"
 		},
+		"./components/icons/WindmillIcon2.svelte": {
+			"types": "./package/components/icons/WindmillIcon2.d.ts",
+			"svelte": "./package/components/icons/WindmillIcon2.svelte",
+			"default": "./package/components/icons/WindmillIcon2.svelte"
+		},
 		"./components/IconedResourceType.svelte": {
 			"types": "./package/components/IconedResourceType.svelte.d.ts",
 			"svelte": "./package/components/IconedResourceType.svelte",
@@ -295,6 +300,14 @@
 			"types": "./package/utils.d.ts",
 			"default": "./package/utils.js"
 		},
+		"./components/icons/store": {
+			"types": "./package/components/icons/store.d.ts",
+			"default": "./package/components/icons/store.js"
+		},
+		"./script_helpers": {
+			"types": "./package/script_helpers.d.ts",
+			"default": "./package/script_helpers.js"
+		},
 		"./infer": {
 			"types": "./package/infer.d.ts",
 			"default": "./package/infer.js"
@@ -336,6 +349,11 @@
 			"types": "./package/components/DropdownV2.svelte.d.ts",
 			"svelte": "./package/components/DropdownV2.svelte",
 			"default": "./package/components/DropdownV2.svelte"
+		},
+		"./components/flows/FlowHistoryInner.svelte": {
+			"types": "./package/components/flows/FlowHistoryInner.svelte.d.ts",
+			"svelte": "./package/components/flows/FlowHistoryInner.svelte",
+			"default": "./package/components/flows/FlowHistoryInner.svelte"
 		}
 	},
 	"files": [
@@ -358,6 +376,9 @@
 			"components/icons/WindmillIcon.svelte": [
 				"./package/components/icons/WindmillIcon.svelte.d.ts"
 			],
+			"components/icons/WindmillIcon2.svelte": [
+				"./package/components/icons/WindmillIcon2.svelte.d.ts"
+			],
 			"components/scriptEditor/LogPanel.svelte": [
 				"./package/components/scriptEditor/LogPanel.svelte.d.ts"
 			],
@@ -418,6 +439,9 @@
 			"components/EditableSchemaWrapper.svelte": [
 				"./package/components/schema/EditableSchemaWrapper.svelte.d.ts"
 			],
+			"components/flows/FlowHistoryInner.svelte": [
+				"./package/components/flows/FlowHistoryInner.svelte.d.ts"
+			],
 			"utils": [
 				"./package/utils.d.ts"
 			],
@@ -453,6 +477,12 @@
 			],
 			"components/DropdownV2.svelte": [
 				"./package/components/DropdownV2.svelte.d.ts"
+			],
+			"script_helpers": [
+				"./package/script_helpers.d.ts"
+			],
+			"components/icons/store": [
+				"./package/components/icons/store.d.ts"
 			]
 		}
 	},
diff --git a/frontend/src/lib/assets/app.css b/frontend/src/lib/assets/app.css
index 99bc17ae8e..6a386c559d 100644
--- a/frontend/src/lib/assets/app.css
+++ b/frontend/src/lib/assets/app.css
@@ -145,3 +145,23 @@ svelte-virtual-list-contents > * + * {
 		rgba(255, 69, 58, 0.2) 20px
 	);
 }
+
+.bg-draggedover {
+	background-image: repeating-linear-gradient(
+		-45deg,
+		rgba(0, 0, 128, 0.2),
+		rgba(0, 0, 192, 0.2) 10px,
+		rgba(0, 0, 128, 0.2) 10px,
+		rgba(0, 0, 192, 0.2) 20px
+	);
+}
+
+.bg-draggedover-dark {
+	background-image: repeating-linear-gradient(
+		-45deg,
+		rgba(0, 0, 128, 0.6),
+		rgba(0, 0, 192, 0.6) 10px,
+		rgba(0, 0, 128, 0.6) 10px,
+		rgba(0, 0, 192, 0.6) 20px
+	);
+}
diff --git a/frontend/src/lib/ata/index.ts b/frontend/src/lib/ata/index.ts
index 3af147b45c..5414df8b18 100644
--- a/frontend/src/lib/ata/index.ts
+++ b/frontend/src/lib/ata/index.ts
@@ -120,11 +120,16 @@ export const setupTypeAcquisition = (config: ATABootstrapConfig) => {
 					? f.raw
 					: '/' + config.scriptPath + (f.raw.startsWith('../') ? '/../' : '/.') + f.raw
 				let url = config.root + path
-				// console.log('FOO', config.scriptPath, path, f.raw)
-				console.log('fetching local file', url, f.raw)
+				let localPath = f.raw
+				if (f.raw.startsWith('.') && !f.raw.endsWith('.ts')) {
+					url += '.ts'
+					localPath += '.ts'
+				}
+
+				console.log('fetching local file', url, f.raw, localPath)
 				const res = await fetch(url)
 				if (res.ok) {
-					config.delegate.localFile?.(await res.text(), f.raw)
+					config.delegate.localFile?.(await res.text(), localPath)
 				}
 			})
 		}
diff --git a/frontend/src/lib/components/AppConnectDrawer.svelte b/frontend/src/lib/components/AppConnectDrawer.svelte
index 28cb801616..4f30737736 100644
--- a/frontend/src/lib/components/AppConnectDrawer.svelte
+++ b/frontend/src/lib/components/AppConnectDrawer.svelte
@@ -6,7 +6,7 @@
 	import AppConnectInner from './AppConnectInner.svelte'
 	import DarkModeObserver from './DarkModeObserver.svelte'
 
-	let expressOAuthSetup = false
+	export let expressOAuthSetup = false
 
 	let drawer: Drawer
 	let resourceType = ''
@@ -18,8 +18,7 @@
 	let appConnectInner: AppConnectInner | undefined = undefined
 
 	let rtToLoad: string | undefined = ''
-	export async function open(rt?: string, express?: boolean) {
-		expressOAuthSetup = express ?? false
+	export async function open(rt?: string) {
 		rtToLoad = rt
 		drawer.openDrawer?.()
 	}
@@ -27,7 +26,7 @@
 	$: appConnectInner && onRtToLoadChange(rtToLoad)
 
 	function onRtToLoadChange(rtToLoad: string | undefined) {
-		appConnectInner?.open(rtToLoad, expressOAuthSetup)
+		appConnectInner?.open(rtToLoad)
 	}
 
 	const dispatch = createEventDispatcher()
@@ -60,6 +59,7 @@
 			bind:manual
 			on:close={drawer?.closeDrawer}
 			on:refresh
+			express={expressOAuthSetup}
 		/>
 		<div slot="actions" class="flex gap-1">
 			{#if step > 1}
diff --git a/frontend/src/lib/components/AppConnectInner.svelte b/frontend/src/lib/components/AppConnectInner.svelte
index dbe162fd64..e568589b49 100644
--- a/frontend/src/lib/components/AppConnectInner.svelte
+++ b/frontend/src/lib/components/AppConnectInner.svelte
@@ -31,6 +31,7 @@
 	export let isGoogleSignin = false
 	export let disabled = false
 	export let manual = true
+	export let express = false
 
 	let isValid = true
 
@@ -81,10 +82,7 @@
 
 	let pathError = ''
 
-	let expressOAuthSetup = false
-
-	export async function open(rt?: string, express?: boolean) {
-		expressOAuthSetup = express ?? false
+	export async function open(rt?: string) {
 		if (!rt) {
 			loadResourceTypes()
 		}
@@ -95,12 +93,12 @@
 		valueToken = undefined
 		await loadConnects()
 		manual = !connects?.includes(resourceType)
-		if (manual && expressOAuthSetup) {
+		if (manual && express) {
 			dispatch('error', 'Express OAuth setup is not available for non OAuth resource types')
 			return
 		}
 		if (rt) {
-			if (!manual && expressOAuthSetup) {
+			if (!manual && express) {
 				await getScopesAndParams()
 				step = 2
 			}
@@ -171,7 +169,6 @@
 	}
 
 	function popupListener(event) {
-		console.log('popupListener', event.data, event.origin, window.location.origin)
 		let data = event.data
 		if (event.origin == null || event.origin !== window.location.origin) {
 			return
@@ -187,7 +184,7 @@
 			value = data.res.access_token!
 			valueToken = data.res
 			step = 4
-			if (expressOAuthSetup) {
+			if (express) {
 				path = `u/${$userStore?.username}/${resourceType}_${new Date().getTime()}`
 				next()
 			}
@@ -329,252 +326,254 @@
 	let editScopes = false
 </script>
 
-<SearchItems
-	{filter}
-	items={connects
-		? connects
-				.sort((a, b) => a.localeCompare(b))
-				.map((key) => ({
-					key
-				}))
-		: undefined}
-	bind:filteredItems={filteredConnects}
-	f={(x) => x.key}
-/>
-<SearchItems
-	{filter}
-	items={connectsManual?.sort((a, b) => a[0].localeCompare(b[0]))}
-	bind:filteredItems={filteredConnectsManual}
-	f={(x) => x[0]}
-/>
-{#if step == 1}
-	<div class="w-12/12 pb-2 flex flex-row my-1 gap-1">
-		<input
-			type="text"
-			placeholder="Search resource type"
-			bind:value={filter}
-			class="text-2xl grow"
-		/>
-	</div>
-
-	<h2 class="mb-4">OAuth APIs</h2>
-	<div class="grid sm:grid-cols-2 md:grid-cols-3 gap-x-2 gap-y-1 items-center mb-2">
-		{#if filteredConnects}
-			{#each filteredConnects as { key }}
-				<Button
-					size="sm"
-					variant="border"
-					color={key === resourceType ? 'blue' : 'light'}
-					btnClasses={key === resourceType ? '!border-2' : 'm-[1px]'}
-					on:click={() => {
-						manual = false
-						resourceType = key
-						next()
-					}}
-				>
-					<IconedResourceType name={key} after={true} width="20px" height="20px" />
-				</Button>
-			{/each}
-		{:else}
-			{#each new Array(3) as _}
-				<Skeleton layout={[[2]]} />
-			{/each}
-		{/if}
-	</div>
-	{#if connects && connects.length == 0}
-		<div class="text-secondary text-sm w-full"
-			>No OAuth APIs has been setup on the instance. To add oauth APIs, first sync the resource
-			types with the hub, then add oauth configuration. See <a
-				href="https://www.windmill.dev/docs/misc/setup_oauth">documentation</a
-			>
-		</div>
-	{/if}
-
-	<h2 class="mt-8 mb-4">Others</h2>
-
-	{#if connectsManual && connectsManual?.length < 10}
-		<div class="text-secondary p-2">
-			Resource Types have not been synced with the hub. Go to the admins workspace to sync them (and
-			add a schedule to do daily):
-			<p class="mt-4"
-				>1. Go to the "admins" workspaces:
-				<img src="{base}/sync_resource_types.png" alt="sync resource types" class="mt-2" />
-			</p>
-			<p class="mt-4">
-				2: Run the synchronization script:
-				<img src="{base}/sync_resource_types2.png" alt="sync resource types" class="mt-2" />
-			</p>
-		</div>
-	{/if}
-
-	<div class="grid sm:grid-cols-2 md:grid-cols-3 gap-x-2 gap-y-1 items-center mb-2">
-		{#if filteredConnectsManual}
-			{#each filteredConnectsManual as [key, _]}
-				{#if nativeLanguagesCategory.includes(key)}
-					<Button
-						size="sm"
-						variant="border"
-						color={key === resourceType ? 'blue' : 'light'}
-						btnClasses={key === resourceType ? '!border-2' : 'm-[1px]'}
-						on:click={() => {
-							manual = true
-							resourceType = key
-							next()
-						}}
-					>
-						<IconedResourceType name={key} after={true} width="20px" height="20px" />
-					</Button>
-				{/if}
-			{/each}
-		{/if}
-	</div>
-
-	<div class="mt-8 mb-4" />
-	<div class="grid sm:grid-cols-2 md:grid-cols-3 gap-x-2 gap-y-1 items-center mb-2">
-		{#if filteredConnectsManual}
-			{#each filteredConnectsManual as [key, _]}
-				{#if !nativeLanguagesCategory.includes(key)}
-					<!-- Exclude specific items -->
-					<Button
-						size="sm"
-						variant="border"
-						color={key === resourceType ? 'blue' : 'light'}
-						btnClasses={key === resourceType ? '!border-2' : 'm-[1px]'}
-						on:click={() => {
-							manual = true
-							resourceType = key
-							next()
-						}}
-					>
-						<IconedResourceType name={key} after={true} width="20px" height="20px" />
-					</Button>
-				{/if}
-			{/each}
-		{:else}
-			{#each new Array(9) as _}
-				<Skeleton layout={[[2]]} />
-			{/each}
-		{/if}
-	</div>
-{:else if step == 2 && manual}
-	<Path
-		bind:error={pathError}
-		bind:path
-		initialPath=""
-		namePlaceholder={resourceType}
-		kind="resource"
+{#if !express}
+	<SearchItems
+		{filter}
+		items={connects
+			? connects
+					.sort((a, b) => a.localeCompare(b))
+					.map((key) => ({
+						key
+					}))
+			: undefined}
+		bind:filteredItems={filteredConnects}
+		f={(x) => x.key}
 	/>
-
-	{#if apiTokenApps[resourceType]}
-		<h2 class="mt-4 mb-2">Instructions</h2>
-		<div class="pl-10">
-			<ol class="list-decimal">
-				{#each apiTokenApps[resourceType].instructions as step}
-					<li>
-						{@html step}
-					</li>
-				{/each}
-			</ol>
-		</div>
-		{#if apiTokenApps[resourceType].img}
-			<div class="mt-4 w-full overflow-hidden">
-				<img class="m-auto max-h-60" alt="connect" src={base + apiTokenApps[resourceType].img} />
-			</div>
-		{/if}
-	{:else if !emptyString(resourceTypeInfo?.description)}
-		<h4 class="mt-8 mb-2">{resourceTypeInfo?.name} description</h4>
-		<div class="text-sm">
-			<Markdown md={urlize(resourceTypeInfo?.description ?? '', 'md')} />
-		</div>
-	{/if}
-	{#if resourceType == 'postgresql' || resourceType == 'mysql' || resourceType == 'mongodb'}
-		<WhitelistIp />
-	{/if}
-
-	<h4 class="mt-8 inline-flex items-center gap-4"
-		>Resource description <Required required={false} />
-		<div class="flex gap-1 items-center">
-			<Toggle size="xs" bind:checked={renderDescription} />
-			<Pen size={14} />
-		</div>
-	</h4>
-	{#if renderDescription}
-		<div>
-			<div class="flex flex-row-reverse text-2xs text-tertiary -mt-1">GH Markdown</div>
-			<textarea use:autosize bind:value={description} placeholder={'Resource description'} />
-		</div>
-	{:else if description == undefined || description == ''}
-		<div class="text-sm text-tertiary">No description provided</div>
-	{:else}
-		<div class="mt-2" />
-		<GfmMarkdown md={description} />
-	{/if}
-	<div class="mt-12">
-		{#key resourceTypeInfo}
-			<ApiConnectForm
-				bind:linkedSecret
-				{linkedSecretCandidates}
-				{resourceType}
-				{resourceTypeInfo}
-				bind:args
-				bind:isValid
+	<SearchItems
+		{filter}
+		items={connectsManual?.sort((a, b) => a[0].localeCompare(b[0]))}
+		bind:filteredItems={filteredConnectsManual}
+		f={(x) => x[0]}
+	/>
+	{#if step == 1}
+		<div class="w-12/12 pb-2 flex flex-row my-1 gap-1">
+			<input
+				type="text"
+				placeholder="Search resource type"
+				bind:value={filter}
+				class="text-2xl grow"
 			/>
-		{/key}
-	</div>
-{:else if step == 2 && !manual}
-	{#if manual == false && resourceType != ''}
-		<h1 class="mb-4">{resourceType}</h1>
-		<div class="my-4 text-secondary"
-			>Click connect to create a resource backed by an oauth connection, whose token is fetched from
-			the external services and refreshed automatically if needed before expiration (using its
-			refresh token)</div
-		>
-		<h4 class="mb-2">Description</h4>
-		<div class="text-sm mb-8">
-			<Markdown md={urlize(resourceTypeInfo?.description ?? '', 'md')} />
 		</div>
-		<h3 class="mb-4 flex gap-4"
-			>Scopes <button
-				on:click={() => {
-					editScopes = !editScopes
-				}}><Pen size={14} /></button
-			></h3
-		>
 
-		{#if editScopes}
-			<OauthScopes bind:scopes />
-		{:else}
-			<div class="flex flex-col gap-1">
-				{#each scopes as scope}
-					<div class="py-0.5 pl-2 text-xs">- {scope}</div>
+		<h2 class="mb-4">OAuth APIs</h2>
+		<div class="grid sm:grid-cols-2 md:grid-cols-3 gap-x-2 gap-y-1 items-center mb-2">
+			{#if filteredConnects}
+				{#each filteredConnects as { key }}
+					<Button
+						size="sm"
+						variant="border"
+						color={key === resourceType ? 'blue' : 'light'}
+						btnClasses={key === resourceType ? '!border-2' : 'm-[1px]'}
+						on:click={() => {
+							manual = false
+							resourceType = key
+							next()
+						}}
+					>
+						<IconedResourceType name={key} after={true} width="20px" height="20px" />
+					</Button>
 				{/each}
+			{:else}
+				{#each new Array(3) as _}
+					<Skeleton layout={[[2]]} />
+				{/each}
+			{/if}
+		</div>
+		{#if connects && connects.length == 0}
+			<div class="text-secondary text-sm w-full"
+				>No OAuth APIs has been setup on the instance. To add oauth APIs, first sync the resource
+				types with the hub, then add oauth configuration. See <a
+					href="https://www.windmill.dev/docs/misc/setup_oauth">documentation</a
+				>
 			</div>
 		{/if}
-	{/if}
-{:else if step == 3 && !manual}
-	Finish connection in popup window
-{:else}
-	<Path
-		initialPath=""
-		namePlaceholder={resourceType}
-		bind:error={pathError}
-		bind:path
-		kind="resource"
-	/>
-	{#if apiTokenApps[resourceType] || !manual}
-		<ul class="mt-10">
-			<li>
-				1. A secret variable containing the {apiTokenApps[resourceType]?.linkedSecret ?? 'token'}
-				<span class="font-bold">{truncateRev(value, 5, '*****')}</span>
-				will be stored a
-				<span class="font-mono whitespace-nowrap">{path}</span>.
-			</li>
-			<li class="mt-4">
-				2. The resource containing that token will be stored at the same path <span
-					class="font-mono whitespace-nowrap">{path}</span
-				>. The Variable and Resource will be "linked together", they will be deleted and renamed
-				together.
-			</li></ul
-		>
+
+		<h2 class="mt-8 mb-4">Others</h2>
+
+		{#if connectsManual && connectsManual?.length < 10}
+			<div class="text-secondary p-2">
+				Resource Types have not been synced with the hub. Go to the admins workspace to sync them
+				(and add a schedule to do daily):
+				<p class="mt-4"
+					>1. Go to the "admins" workspaces:
+					<img src="{base}/sync_resource_types.png" alt="sync resource types" class="mt-2" />
+				</p>
+				<p class="mt-4">
+					2: Run the synchronization script:
+					<img src="{base}/sync_resource_types2.png" alt="sync resource types" class="mt-2" />
+				</p>
+			</div>
+		{/if}
+
+		<div class="grid sm:grid-cols-2 md:grid-cols-3 gap-x-2 gap-y-1 items-center mb-2">
+			{#if filteredConnectsManual}
+				{#each filteredConnectsManual as [key, _]}
+					{#if nativeLanguagesCategory.includes(key)}
+						<Button
+							size="sm"
+							variant="border"
+							color={key === resourceType ? 'blue' : 'light'}
+							btnClasses={key === resourceType ? '!border-2' : 'm-[1px]'}
+							on:click={() => {
+								manual = true
+								resourceType = key
+								next()
+							}}
+						>
+							<IconedResourceType name={key} after={true} width="20px" height="20px" />
+						</Button>
+					{/if}
+				{/each}
+			{/if}
+		</div>
+
+		<div class="mt-8 mb-4" />
+		<div class="grid sm:grid-cols-2 md:grid-cols-3 gap-x-2 gap-y-1 items-center mb-2">
+			{#if filteredConnectsManual}
+				{#each filteredConnectsManual as [key, _]}
+					{#if !nativeLanguagesCategory.includes(key)}
+						<!-- Exclude specific items -->
+						<Button
+							size="sm"
+							variant="border"
+							color={key === resourceType ? 'blue' : 'light'}
+							btnClasses={key === resourceType ? '!border-2' : 'm-[1px]'}
+							on:click={() => {
+								manual = true
+								resourceType = key
+								next()
+							}}
+						>
+							<IconedResourceType name={key} after={true} width="20px" height="20px" />
+						</Button>
+					{/if}
+				{/each}
+			{:else}
+				{#each new Array(9) as _}
+					<Skeleton layout={[[2]]} />
+				{/each}
+			{/if}
+		</div>
+	{:else if step == 2 && manual}
+		<Path
+			bind:error={pathError}
+			bind:path
+			initialPath=""
+			namePlaceholder={resourceType}
+			kind="resource"
+		/>
+
+		{#if apiTokenApps[resourceType]}
+			<h2 class="mt-4 mb-2">Instructions</h2>
+			<div class="pl-10">
+				<ol class="list-decimal">
+					{#each apiTokenApps[resourceType].instructions as step}
+						<li>
+							{@html step}
+						</li>
+					{/each}
+				</ol>
+			</div>
+			{#if apiTokenApps[resourceType].img}
+				<div class="mt-4 w-full overflow-hidden">
+					<img class="m-auto max-h-60" alt="connect" src={base + apiTokenApps[resourceType].img} />
+				</div>
+			{/if}
+		{:else if !emptyString(resourceTypeInfo?.description)}
+			<h4 class="mt-8 mb-2">{resourceTypeInfo?.name} description</h4>
+			<div class="text-sm">
+				<Markdown md={urlize(resourceTypeInfo?.description ?? '', 'md')} />
+			</div>
+		{/if}
+		{#if resourceType == 'postgresql' || resourceType == 'mysql' || resourceType == 'mongodb'}
+			<WhitelistIp />
+		{/if}
+
+		<h4 class="mt-8 inline-flex items-center gap-4"
+			>Resource description <Required required={false} />
+			<div class="flex gap-1 items-center">
+				<Toggle size="xs" bind:checked={renderDescription} />
+				<Pen size={14} />
+			</div>
+		</h4>
+		{#if renderDescription}
+			<div>
+				<div class="flex flex-row-reverse text-2xs text-tertiary -mt-1">GH Markdown</div>
+				<textarea use:autosize bind:value={description} placeholder={'Resource description'} />
+			</div>
+		{:else if description == undefined || description == ''}
+			<div class="text-sm text-tertiary">No description provided</div>
+		{:else}
+			<div class="mt-2" />
+			<GfmMarkdown md={description} />
+		{/if}
+		<div class="mt-12">
+			{#key resourceTypeInfo}
+				<ApiConnectForm
+					bind:linkedSecret
+					{linkedSecretCandidates}
+					{resourceType}
+					{resourceTypeInfo}
+					bind:args
+					bind:isValid
+				/>
+			{/key}
+		</div>
+	{:else if step == 2 && !manual}
+		{#if manual == false && resourceType != ''}
+			<h1 class="mb-4">{resourceType}</h1>
+			<div class="my-4 text-secondary"
+				>Click connect to create a resource backed by an oauth connection, whose token is fetched
+				from the external services and refreshed automatically if needed before expiration (using
+				its refresh token)</div
+			>
+			<h4 class="mb-2">Description</h4>
+			<div class="text-sm mb-8">
+				<Markdown md={urlize(resourceTypeInfo?.description ?? '', 'md')} />
+			</div>
+			<h3 class="mb-4 flex gap-4"
+				>Scopes <button
+					on:click={() => {
+						editScopes = !editScopes
+					}}><Pen size={14} /></button
+				></h3
+			>
+
+			{#if editScopes}
+				<OauthScopes bind:scopes />
+			{:else}
+				<div class="flex flex-col gap-1">
+					{#each scopes as scope}
+						<div class="py-0.5 pl-2 text-xs">- {scope}</div>
+					{/each}
+				</div>
+			{/if}
+		{/if}
+	{:else if step == 3 && !manual && !express}
+		Finish connection in popup window
+	{:else}
+		<Path
+			initialPath=""
+			namePlaceholder={resourceType}
+			bind:error={pathError}
+			bind:path
+			kind="resource"
+		/>
+		{#if apiTokenApps[resourceType] || !manual}
+			<ul class="mt-10">
+				<li>
+					1. A secret variable containing the {apiTokenApps[resourceType]?.linkedSecret ?? 'token'}
+					<span class="font-bold">{truncateRev(value, 5, '*****')}</span>
+					will be stored a
+					<span class="font-mono whitespace-nowrap">{path}</span>.
+				</li>
+				<li class="mt-4">
+					2. The resource containing that token will be stored at the same path <span
+						class="font-mono whitespace-nowrap">{path}</span
+					>. The Variable and Resource will be "linked together", they will be deleted and renamed
+					together.
+				</li></ul
+			>
+		{/if}
 	{/if}
 {/if}
diff --git a/frontend/src/lib/components/AppConnectLightweightResourcePicker.svelte b/frontend/src/lib/components/AppConnectLightweightResourcePicker.svelte
new file mode 100644
index 0000000000..75a01b9f03
--- /dev/null
+++ b/frontend/src/lib/components/AppConnectLightweightResourcePicker.svelte
@@ -0,0 +1,63 @@
+<script lang="ts">
+	import AppConnectInner from '$lib/components/AppConnectInner.svelte'
+	import DarkModeObserver from '$lib/components/DarkModeObserver.svelte'
+	import { Button } from '$lib/components/common'
+	import { workspaceStore } from '$lib/stores'
+	import { onMount } from 'svelte'
+
+	export let resourceType: string | undefined = undefined
+	export let workspace: string
+	export let express = false
+
+	let step = 1
+	let disabled = false
+	let manual = true
+
+	let appConnect: AppConnectInner | undefined = undefined
+
+	let darkMode: boolean = false
+
+	if (workspace) {
+		$workspaceStore = workspace
+	}
+
+	onMount(async () => {
+		if (resourceType) {
+			appConnect?.open(resourceType)
+		}
+	})
+</script>
+
+<DarkModeObserver bind:darkMode />
+
+<div>
+	{#if !express}
+		<div class="flex flex-row-reverse w-full pb-2">
+			<div class="flex gap-2">
+				{#if step > 2}
+					<Button variant="border" on:click={appConnect?.back}>Back</Button>
+				{/if}
+
+				<Button {disabled} on:click={appConnect?.next}>
+					{#if step == 2 && !manual}
+						Connect
+					{:else if step == 1}
+						Next
+					{:else}
+						Save
+					{/if}
+				</Button>
+			</div>
+		</div>
+	{/if}
+	<AppConnectInner
+		{express}
+		bind:this={appConnect}
+		bind:step
+		bind:resourceType
+		bind:disabled
+		bind:manual
+		on:error
+		on:refresh
+	/>
+</div>
diff --git a/frontend/src/lib/components/ArgInfo.svelte b/frontend/src/lib/components/ArgInfo.svelte
index fb214640bd..dc6f8e153d 100644
--- a/frontend/src/lib/components/ArgInfo.svelte
+++ b/frontend/src/lib/components/ArgInfo.svelte
@@ -75,16 +75,18 @@
 		}}>{value}</button
 	>
 {:else if typeof value !== 'object'}
-	{truncate(JSON.stringify(value), 100)}
-	{#if JSON.stringify(value).length > 100}
-		<button
-			class="text-xs text-blue-500"
-			on:click={() => {
-				jsonViewerContent = value
-				jsonViewer.toggleDrawer()
-			}}>See expanded</button
-		>
-	{/if}
+	<span>
+		{truncate(JSON.stringify(value), 80)}
+		{#if JSON.stringify(value).length > 80}
+			<button
+				class="text-xs text-blue-500"
+				on:click={() => {
+					jsonViewerContent = value
+					jsonViewer.toggleDrawer()
+				}}>See expanded</button
+			>
+		{/if}
+	</span>
 {:else}
 	<div class="relative">
 		{#if JSON.stringify(value).length > 120}
diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte
index 070a174688..80537e4d44 100644
--- a/frontend/src/lib/components/ArgInput.svelte
+++ b/frontend/src/lib/components/ArgInput.svelte
@@ -89,6 +89,7 @@
 	export let editor: SimpleEditor | undefined = undefined
 	export let orderEditable = false
 	export let shouldDispatchChanges: boolean = false
+	export let noDefaultOnSelectFirst: boolean = false
 	export let helperScript:
 		| { type: 'inline'; path?: string; lang: Script['language']; code: string }
 		| { type: 'hash'; hash: string }
@@ -140,6 +141,9 @@
 		defaultValue?: any,
 		nnullable?: boolean
 	) {
+		if (label == 'toString' && typeof value == 'function') {
+			value = undefined
+		}
 		if ((value == undefined || value == null) && !ignoreValueUndefined) {
 			value = defaultValue
 			if (defaultValue === undefined || defaultValue === null) {
@@ -537,11 +541,14 @@
 			{:else if inputCat == 'resource-object' && (resourceTypes == undefined || (format.split('-').length > 1 && resourceTypes.includes(format.substring('resource-'.length))))}
 				<ObjectResourceInput
 					{defaultValue}
-					selectFirst
+					selectFirst={!noDefaultOnSelectFirst}
 					{disablePortal}
 					{format}
 					bind:value
 					bind:editor
+					on:clear={() => {
+						defaultValue = null
+					}}
 					{showSchemaExplorer}
 				/>
 			{:else if inputCat == 'resource-object' && format.split('-').length > 1 && format
@@ -807,7 +814,7 @@
 				</div>
 			{:else if inputCat == 'resource-string'}
 				<ResourcePicker
-					selectFirst
+					selectFirst={noDefaultOnSelectFirst}
 					{disablePortal}
 					bind:value
 					initialValue={defaultValue}
diff --git a/frontend/src/lib/components/AssignableTags.svelte b/frontend/src/lib/components/AssignableTags.svelte
index a09aaab4db..ce58c61d67 100644
--- a/frontend/src/lib/components/AssignableTags.svelte
+++ b/frontend/src/lib/components/AssignableTags.svelte
@@ -6,6 +6,7 @@
 	import AssignableTagsInner from './AssignableTagsInner.svelte'
 
 	export let placement: 'bottom-end' | 'top-end' = 'bottom-end'
+	export let color: 'nord' | 'dark' = 'dark'
 </script>
 
 <Popup
@@ -13,7 +14,7 @@
 	containerClasses="border rounded-lg shadow-lg p-4 bg-surface"
 >
 	<svelte:fragment slot="button">
-		<Button color="dark" size="xs" nonCaptureEvent={true}>
+		<Button {color} size="xs" nonCaptureEvent={true}>
 			<div class="flex flex-row gap-1 items-center"
 				><Pen size={14} /> Custom Tags&nbsp;<Tooltip light
 					>Tags are assigned to scripts and flows. Workers only accept jobs that correspond to their
diff --git a/frontend/src/lib/components/AutheliaSetting.svelte b/frontend/src/lib/components/AutheliaSetting.svelte
index d97b54c7e7..3392b056b6 100644
--- a/frontend/src/lib/components/AutheliaSetting.svelte
+++ b/frontend/src/lib/components/AutheliaSetting.svelte
@@ -52,6 +52,10 @@
 				>
 				<input type="text" placeholder="yourorg" bind:value={org} />
 			</label>
+			<label class="block pb-2">
+				<span class="text-primary font-semibold text-sm">Custom Name</span>
+				<input type="text" placeholder="Custom Name" bind:value={value['display_name']} />
+			</label>
 			<label class="block pb-2">
 				<span class="text-primary font-semibold text-sm">Client Id</span>
 				<input type="text" placeholder="Client Id" bind:value={value['id']} />
diff --git a/frontend/src/lib/components/AuthentikSetting.svelte b/frontend/src/lib/components/AuthentikSetting.svelte
index 116eee2648..8936905a16 100644
--- a/frontend/src/lib/components/AuthentikSetting.svelte
+++ b/frontend/src/lib/components/AuthentikSetting.svelte
@@ -52,6 +52,10 @@
 				>
 				<input type="text" placeholder="yourorg" bind:value={org} />
 			</label>
+			<label class="block pb-2">
+				<span class="text-primary font-semibold text-sm">Custom Name</span>
+				<input type="text" placeholder="Custom Name" bind:value={value['display_name']} />
+			</label>
 			<label class="block pb-2">
 				<span class="text-primary font-semibold text-sm">Client Id</span>
 				<input type="text" placeholder="Client Id" bind:value={value['id']} />
diff --git a/frontend/src/lib/components/AutoscalingConfigEditor.svelte b/frontend/src/lib/components/AutoscalingConfigEditor.svelte
new file mode 100644
index 0000000000..3f763d835e
--- /dev/null
+++ b/frontend/src/lib/components/AutoscalingConfigEditor.svelte
@@ -0,0 +1,364 @@
+<script lang="ts">
+	import type { AutoscalingConfig } from './worker_group'
+	import Toggle from './Toggle.svelte'
+	import Section from './Section.svelte'
+	import Tooltip from './Tooltip.svelte'
+	import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte'
+	import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte'
+	import { Button } from './common'
+	import { ExternalLink } from 'lucide-svelte'
+	import { createEventDispatcher } from 'svelte'
+	import Label from './Label.svelte'
+	import MultiSelect from 'svelte-multiselect'
+
+	export let config: AutoscalingConfig | undefined
+	export let worker_tags: string[] | undefined
+
+	const dispatch = createEventDispatcher()
+	let test_input: number = 3
+</script>
+
+<div class="flex flex-row gap-16 pt-2">
+	<div class="space-y-4 flex flex-col gap-1 max-w-xs text-sm">
+		<h5>Rules</h5>
+		<Toggle
+			checked={config?.enabled ?? false}
+			options={{ right: 'Enabled' }}
+			on:change={(e) => {
+				dispatch('dirty')
+				if (e.detail) {
+					if (!config) {
+						config = {
+							enabled: true,
+							min_workers: 3,
+							max_workers: 10,
+							integration: { type: 'dryrun' }
+						}
+					} else {
+						config.enabled = true
+					}
+				} else {
+					config = {
+						...(config ?? {
+							min_workers: 3,
+							max_workers: 10,
+							integration: { type: 'dryrun' }
+						}),
+						enabled: false
+					}
+				}
+			}}
+		/>
+		<!-- svelte-ignore a11y-label-has-associated-control -->
+		<label>
+			Min # of Workers
+			{#if config !== undefined}
+				<input on:input={() => dispatch('dirty')} type="number" bind:value={config.min_workers} />
+				{#if config.min_workers !== undefined && config.min_workers != undefined && config.min_workers > config.max_workers}
+					<div class="text-red-600 text-xs whitespace-nowrap"
+						>Minimum cannot be {'>'} to Maximum</div
+					>
+				{/if}
+			{:else}
+				<input type="number" disabled />
+			{/if}
+		</label>
+		<!-- svelte-ignore a11y-label-has-associated-control -->
+		<label>
+			Max # of Workers
+			{#if config !== undefined}
+				<input on:input={() => dispatch('dirty')} type="number" bind:value={config.max_workers} />
+			{:else}
+				<input type="number" disabled />
+			{/if}
+		</label>
+		<div class="p-2">
+			<Section label="Advanced" small collapsable={true}>
+				<div class="flex flex-col gap-2 text-2xs">
+					<!-- svelte-ignore a11y-label-has-associated-control -->
+					<label>
+						Cooldown seconds after an incremental scale-in/out
+						{#if config !== undefined}
+							<input
+								on:input={() => dispatch('dirty')}
+								type="number"
+								step="1"
+								min="30"
+								placeholder="300"
+								bind:value={config.cooldown_seconds}
+							/>
+						{:else}
+							<input type="number" disabled />
+						{/if}
+					</label>
+					<!-- svelte-ignore a11y-label-has-associated-control -->
+					<label>
+						Cooldown seconds after a full scale out
+						{#if config !== undefined}
+							<input
+								on:input={() => dispatch('dirty')}
+								type="number"
+								step="1"
+								min="30"
+								placeholder="1500"
+								bind:value={config.full_scale_cooldown_seconds}
+							/>
+						{:else}
+							<input type="number" disabled />
+						{/if}
+					</label>
+					<!-- svelte-ignore a11y-label-has-associated-control -->
+					<label>
+						Num jobs waiting to trigger an incremental scale-out
+						{#if config !== undefined}
+							<input
+								on:input={() => dispatch('dirty')}
+								type="number"
+								bind:value={config.inc_scale_num_jobs_waiting}
+								placeholder="1"
+							/>
+						{:else}
+							<input type="number" disabled />
+						{/if}
+					</label>
+
+					<!-- svelte-ignore a11y-label-has-associated-control -->
+					<label>
+						Num jobs waiting to trigger a full scale out <Tooltip
+							>Default: max_workers, full scale out = scale out to max workers</Tooltip
+						>
+						{#if config !== undefined}
+							<input
+								on:input={() => dispatch('dirty')}
+								type="number"
+								placeholder="max workers"
+								bind:value={config.full_scale_jobs_waiting}
+							/>
+						{:else}
+							<input type="number" disabled />
+						{/if}
+					</label>
+					<!-- svelte-ignore a11y-label-has-associated-control -->
+					<label>
+						Occupancy rate % threhsold to go below to trigger a scale-in (decrease) <Tooltip
+							>Default: 25%, need to go below average of all of 15s, 5m and 30m occupancy rates</Tooltip
+						>
+						{#if config !== undefined}
+							<input
+								on:input={() => dispatch('dirty')}
+								type="number"
+								step="1"
+								min="0"
+								max="100"
+								placeholder="25"
+								bind:value={config.dec_scale_occupancy_rate}
+							/>
+						{:else}
+							<input type="number" step="0.01" disabled />
+						{/if}
+					</label>
+					<!-- svelte-ignore a11y-label-has-associated-control -->
+					<label>
+						Occupancy rate threshold to exceed to trigger an incremental scale-out (increase) <Tooltip
+							>Default: 75%, need to exceed average of all of 15s, 5m and 30m occupancy rates</Tooltip
+						>
+						{#if config !== undefined}
+							<input
+								on:input={() => dispatch('dirty')}
+								type="number"
+								step="1"
+								min="0"
+								max="100"
+								placeholder="75"
+								bind:value={config.inc_scale_occupancy_rate}
+							/>
+						{:else}
+							<input type="number" step="0.01" disabled />
+						{/if}
+					</label>
+					<!-- svelte-ignore a11y-label-has-associated-control -->
+					<label>
+						Num workers to scale-in/out by when incremental <Tooltip
+							>Default: (max_workers - min_workers) / 5</Tooltip
+						>
+						{#if config !== undefined}
+							<input
+								on:input={() => dispatch('dirty')}
+								type="number"
+								step="1"
+								min="1"
+								placeholder="(max_workers - min_workers) / 5"
+								bind:value={config.inc_num_workers}
+							/>
+						{:else}
+							<input type="number" disabled />
+						{/if}
+					</label>
+
+					<Label label="Custom tags to autoscale on">
+						<svelte:fragment slot="header">
+							<Tooltip>
+								By default, autoscaling will apply to the tags the worker group is assigned to but
+								you can override this here.
+							</Tooltip>
+						</svelte:fragment>
+						{#if config}
+							{#if config.custom_tags}
+								<MultiSelect
+									outerDivClass="text-secondary !bg-surface-disabled !border-0"
+									selected={config.custom_tags}
+									on:change={(e) => {
+										console.log(e.detail.type, config?.custom_tags)
+										if (e.detail && config?.custom_tags) {
+											if (e.detail.type === 'add') {
+												config.custom_tags = [...config.custom_tags, e.detail.option]
+											} else if (e.detail.type === 'remove') {
+												config.custom_tags = config.custom_tags.filter((t) => t !== e.detail.option)
+												if (config?.custom_tags && config.custom_tags.length == 0) {
+													config.custom_tags = undefined
+												}
+											} else if (e.detail.type === 'removeAll') {
+												config.custom_tags = undefined
+											} else {
+												console.error(
+													`Priority tags multiselect - unknown event type: '${e.detail.type}'`
+												)
+											}
+											dispatch('dirty')
+										}
+									}}
+									on:clear={() => {
+										if (config) {
+											config.custom_tags = undefined
+										}
+										dispatch('dirty')
+									}}
+									options={worker_tags ?? []}
+									selectedOptionsDraggable={false}
+									ulOptionsClass={'!bg-surface-secondary'}
+									placeholder="Tags"
+								/>
+							{:else}
+								<Button
+									color="light"
+									size="xs"
+									variant="contained"
+									on:click={() => {
+										if (config) {
+											config.custom_tags = []
+											dispatch('dirty')
+										}
+									}}>Add custom tags</Button
+								>
+							{/if}
+						{/if}
+					</Label>
+				</div>
+			</Section>
+		</div>
+	</div>
+	<div class="flex flex-col gap-1 max-w-xs text-sm">
+		<h5>Integration</h5>
+		{#if config?.integration}
+			<ToggleButtonGroup
+				on:selected={(e) => dispatch('dirty')}
+				bind:selected={config.integration.type}
+				class="mb-4 mt-2"
+			>
+				<ToggleButton
+					value="dryrun"
+					size="sm"
+					label="Dry run"
+					tooltip="See autoscaling events but not actual scaling actions will be performed"
+				/>
+				<ToggleButton
+					value="script"
+					size="sm"
+					label="Custom Script"
+					tooltip="Run a custom script to scale your worker group"
+				/>
+				<ToggleButton position="center" disabled value="ecs" size="sm" label="ECS (soon)" />
+				<ToggleButton position="right" disabled value="nomad" size="sm" label="Nomad (soon)" />
+				<ToggleButton
+					position="right"
+					disabled
+					value="kubernetes"
+					size="sm"
+					label="Kubernetes (soon)"
+				/>
+			</ToggleButtonGroup>
+
+			{#if config.integration.type === 'script'}
+				<label>
+					Script path on the 'admins' workspace
+					<input
+						on:input={() => dispatch('dirty')}
+						type="text"
+						bind:value={config.integration.path}
+					/>
+				</label>
+
+				<label>
+					Custom tag for executing script (optional)
+					{#if config.integration.tag}
+						<input
+							on:input={() => dispatch('dirty')}
+							type="text"
+							bind:value={config.integration.tag}
+						/>
+					{:else}
+						<Button
+							color="light"
+							size="xs"
+							variant="contained"
+							on:click={() => {
+								if (config?.integration?.type === 'script') {
+									config.integration.tag = 'bash'
+									dispatch('dirty')
+								}
+							}}>Set tag</Button
+						>
+					{/if}
+				</label>
+
+				<div class="flex mt-6 gap-2">
+					<Button
+						color="dark"
+						target="_blank"
+						endIcon={{ icon: ExternalLink }}
+						href="/scripts/add?hub=hub%2F9204%2Fhelper%2FScale%20a%20worker%20group%20deployed%20as%20a%20kubernetes%20service&workspace=admins"
+						>Create from template</Button
+					>
+					<Button
+						color="dark"
+						target="_blank"
+						href={`/runs/${config.integration.path}?workspace=admins`}
+						endIcon={{ icon: ExternalLink }}
+					>
+						See jobs
+					</Button>
+				</div>
+				<div class="flex flex-row gap-2 mt-4">
+					<Button color="light" size="xs" variant="contained">Test scaling</Button>
+					<div class="flex text-xs flex-row gap-2 items-center">
+						<input class="!w-16" type="number" bind:value={test_input} />
+						workers
+					</div>
+				</div>
+			{/if}
+		{:else}
+			<ToggleButtonGroup selected={'script'} disabled class="mb-4 mt-2">
+				<ToggleButton value="dryrun" size="sm" label="Dry run" />
+				<ToggleButton value="script" size="sm" label="Custom Script" />
+				<ToggleButton position="center" value="ecs" size="sm" label="ECS (soon)" />
+				<ToggleButton position="right" value="nomad" size="sm" label="Nomad (soon)" />
+				<ToggleButton position="right" value="kubernetes" size="sm" label="Kubernetes (soon)" />
+			</ToggleButtonGroup>
+
+			<label>
+				Script path on the 'admins' workspace
+				<input type="text" disabled />
+			</label>
+		{/if}
+	</div>
+</div>
diff --git a/frontend/src/lib/components/AutoscalingEvents.svelte b/frontend/src/lib/components/AutoscalingEvents.svelte
new file mode 100644
index 0000000000..36240cef4c
--- /dev/null
+++ b/frontend/src/lib/components/AutoscalingEvents.svelte
@@ -0,0 +1,73 @@
+<script lang="ts">
+	import { ConfigService, type AutoscalingEvent } from '$lib/gen'
+	import { LoaderIcon, RefreshCw } from 'lucide-svelte'
+	import { Button, Skeleton } from './common'
+	import { twMerge } from 'tailwind-merge'
+	import TimeAgo from './TimeAgo.svelte'
+	import { enterpriseLicense } from '$lib/stores'
+
+	export let worker_group: string
+
+	let loading = true
+	let events: AutoscalingEvent[] | undefined = undefined
+
+	$: worker_group && loadEvents()
+
+	async function loadEvents() {
+		loading = true
+		try {
+			events = await ConfigService.listAutoscalingEvents({ workerGroup: worker_group })
+		} catch (e) {
+			events = []
+			console.error(e)
+		} finally {
+			loading = false
+		}
+	}
+</script>
+
+<div>
+	<h6
+		class={!$enterpriseLicense || (events != undefined && events.length == 0)
+			? 'text-tertiary'
+			: ''}
+		>Autoscaling events {#if $enterpriseLicense}<span class="text-xs text-tertiary">(5 last)</span>
+			<span class="inline-flex ml-6">
+				<Button
+					startIcon={{
+						icon: loading ? LoaderIcon : RefreshCw,
+						classes: twMerge(
+							loading ? 'animate-spin text-blue-800' : '',
+							'transition-all text-gray-500 dark:text-white'
+						)
+					}}
+					color="light"
+					size="xs2"
+					btnClasses={twMerge(loading ? ' bg-blue-100 dark:bg-blue-400' : '', 'transition-all')}
+					on:click={() => loadEvents()}
+					iconOnly
+				/>
+			</span>{/if}
+	</h6>
+	{#if !$enterpriseLicense}
+		<div class="text-xs pt-2 text-tertiary">Autoscaling is an EE feature</div>
+	{:else if loading}
+		<Skeleton layout={[[12], 1]} />
+	{:else if events}
+		{#if events.length == 0}
+			<div class="text-xs pt-2 text-tertiary"
+				>No events, is autoscaling set in the worker group config?</div
+			>
+		{:else}
+			<div class="flex flex-col gap-2 text-xs text-tertiary pt-4">
+				{#each events as event}
+					<div class="flex flex-row gap-4">
+						<div class="text-primary">{event.event_type} to {event.desired_workers}</div>
+						<div class="text-secondary">{event.reason}</div>
+						<div class="text-tertiary"><TimeAgo date={event.applied_at ?? ''} /></div>
+					</div>
+				{/each}
+			</div>
+		{/if}
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/CronInput.svelte b/frontend/src/lib/components/CronInput.svelte
index 73560e4937..42fc3fecc4 100644
--- a/frontend/src/lib/components/CronInput.svelte
+++ b/frontend/src/lib/components/CronInput.svelte
@@ -112,26 +112,26 @@
 		// If using the basic editor, set the cron string based on the selected options
 		if (executeEvery === 'second') {
 			if (seconds > 0) {
-				nschedule = `*/${seconds} * * * *`
+				nschedule = `*/${seconds} * * * * *`
 			} else {
-				nschedule = `* * * * *`
+				nschedule = `* * * * * *`
 			}
 		} else if (executeEvery === 'minute') {
 			if (minutes > 0) {
-				nschedule = `0 */${minutes} * * *`
+				nschedule = `0 */${minutes} * * * *`
 			} else {
-				nschedule = `* * * * *`
+				nschedule = `* * * * * *`
 			}
 		} else if (executeEvery === 'hour') {
 			if (hours > 0) {
-				nschedule = `0 0 */${hours} * *`
+				nschedule = `0 0 */${hours} * * *`
 			} else {
-				nschedule = `* * * * *`
+				nschedule = `* * * * * *`
 			}
 		} else if (executeEvery === 'day-month') {
-			nschedule = `0 ${s_AtUTCMinutes} ${s_AtUTCHours} ${s_daysOfMonth} *`
+			nschedule = `0 ${s_AtUTCMinutes} ${s_AtUTCHours} ${s_daysOfMonth} * *`
 		} else if (executeEvery === 'month') {
-			nschedule = `0 ${s_AtUTCMinutes} ${s_AtUTCHours} ${s_daysOfMonth} ${s_months}`
+			nschedule = `0 ${s_AtUTCMinutes} ${s_AtUTCHours} ${s_daysOfMonth} ${s_months} *`
 		} else if (executeEvery === 'day-week') {
 			nschedule = `0 ${s_AtUTCMinutes} ${s_AtUTCHours} * * ${s_daysOfWeek}`
 		}
@@ -203,7 +203,7 @@
 
 <div class="w-full flex space-x-8">
 	<div class="w-full flex flex-col gap-4">
-		<Label label="Cron">
+		<Label label="Cron" class="font-semibold" primary={true}>
 			<svelte:fragment slot="error">
 				{#if !validCRON}
 					<div class="text-red-600 text-xs"> Invalid cron syntax </div>
@@ -214,15 +214,15 @@
 				type="text"
 				id="cron-schedule"
 				name="cron-schedule"
-				placeholder="*/30 * * * *"
+				placeholder="0 0 */1 * * *"
 				bind:value={schedule}
 				{disabled}
 			/>
 		</Label>
-		<Label label="Timezone">
+		<Label label="Timezone" class="font-semibold" primary>
 			{#if disabled}
 				<div>
-					<Badge>{timezone}</Badge>
+					<Badge><span class="text-primary dark:text-primary-inverse">{timezone}</span></Badge>
 				</div>
 			{:else}
 				<Select
@@ -390,9 +390,8 @@
 	</div>
 
 	<div class="w-full flex flex-col space-y-2">
-		<div class="text-sm font-semibold leading-none">Execution summary</div>
+		<div class="text-sm font-semibold leading-none">Estimated upcoming events ({timezone})</div>
 		<div class="flex flex-col space-y-2">
-			<div class="text-sm">Estimated upcoming events ({timezone})</div>
 			<div class="flex flex-col rounded-md p-4 border text-tertiary bg-surface-secondary gap-0.5">
 				{#each preview as date}
 					<span class="text-sm">{dateFormatter(new Date(date))}</span>
diff --git a/frontend/src/lib/components/CustomPopover.svelte b/frontend/src/lib/components/CustomPopover.svelte
index b8330749c5..22d58b2813 100644
--- a/frontend/src/lib/components/CustomPopover.svelte
+++ b/frontend/src/lib/components/CustomPopover.svelte
@@ -9,6 +9,7 @@
 	export let disappearTimeout = 100
 	export let appearTimeout = 300
 	export let style: string | undefined = undefined
+	export let noPadding = false
 
 	export let focusEl: HTMLElement | undefined = undefined
 
@@ -67,13 +68,13 @@
 	</button>
 {/if}
 {#if showTooltip && !disablePopup}
-	<Portal>
+	<Portal name="custom-popover">
 		<!-- svelte-ignore a11y-no-static-element-interactions -->
 		<div
 			use:popperContent={popperOptions}
 			on:mouseenter={open}
 			on:mouseleave={close}
-			class="z-[5001] border rounded-lg shadow-lg p-4 bg-surface"
+			class="z-[5001] border rounded-lg shadow-lg {noPadding ? '' : 'p-4'} bg-surface"
 		>
 			<slot name="overlay" />
 		</div>
diff --git a/frontend/src/lib/components/DefaultScripts.svelte b/frontend/src/lib/components/DefaultScripts.svelte
index 4c6383c3fb..c53c590954 100644
--- a/frontend/src/lib/components/DefaultScripts.svelte
+++ b/frontend/src/lib/components/DefaultScripts.svelte
@@ -7,10 +7,14 @@
 	import DefaultScriptsInner from './DefaultScriptsInner.svelte'
 
 	let drawer: Drawer
+	export let placement: 'left' | 'right' = 'left'
+
+	export let size: 'xs3' | 'xs2' = 'xs2'
+	export let noText = false
 </script>
 
 {#if $userStore?.is_admin || $userStore?.is_super_admin}
-	<Drawer bind:this={drawer} placement="left">
+	<Drawer bind:this={drawer} {placement}>
 		<DrawerContent title="Edit Default Scripts" on:close={drawer.closeDrawer}>
 			<DefaultScriptsInner />
 		</DrawerContent>
@@ -19,8 +23,10 @@
 		on:click={drawer?.openDrawer}
 		startIcon={{ icon: SettingsIcon }}
 		color="light"
-		size="xs2"
+		{size}
 		btnClasses="!text-tertiary"
-		variant="contained">defaults</Button
+		variant="contained"
 	>
+		{noText ? '' : 'defaults'}
+	</Button>
 {/if}
diff --git a/frontend/src/lib/components/DefaultScriptsInner.svelte b/frontend/src/lib/components/DefaultScriptsInner.svelte
index db0dfa2500..62809c18e3 100644
--- a/frontend/src/lib/components/DefaultScriptsInner.svelte
+++ b/frontend/src/lib/components/DefaultScriptsInner.svelte
@@ -6,6 +6,7 @@
 	import { defaultScriptLanguages } from '$lib/scripts'
 	import Alert from './common/alert/Alert.svelte'
 
+	export let small = false
 	$: langs = computeLangs($defaultScripts)
 
 	function computeLangs(defaultScripts: WorkspaceDefaultScripts | undefined): Script['language'][] {
@@ -31,24 +32,32 @@
 	}
 </script>
 
-<Alert title="Global to workspace" type="info" class="mb-4">
+<Alert title="Global to workspace" type="info" class="mb-4" size={small ? 'xs' : 'sm'}>
 	This setting is only available to admins and will affect all users in the workspace.
 </Alert>
-<div class="h-full w-full flex-col gap-2 flex">
+<div class="h-full w-full flex-col {small ? 'gap-0' : 'gap-2'} flex">
 	{#each langs as lang, i (lang)}
 		<div
 			animate:flip={{ duration: 300 }}
-			class="w-full p-2 rounded border border-seconadry grid grid-cols-3"
-			><h3>{lang}</h3>
+			class="w-full p-2 rounded {small
+				? ''
+				: 'border border-secondary'} grid grid-cols-3 items-center"
+			><h3 class={small ? 'text-xs font-medium justify-center' : ''}>{lang}</h3>
 			<div>
 				{#if i > 0}
-					<button on:click={() => changePosition(i ?? 0, true)} class="text-lg mr-2">
+					<button
+						on:click={() => changePosition(i ?? 0, true)}
+						class={small ? 'mr-2 text-secondary text-sm' : 'text-lg mr-2'}
+						title="Move up"
+					>
 						&uparrow;</button
 					>
 				{/if}
 				{#if i < langs.length - 1}
-					<button on:click={() => changePosition(i ?? 0, false)} class="text-lg mr-2"
-						>&downarrow;</button
+					<button
+						on:click={() => changePosition(i ?? 0, false)}
+						class={small ? 'mr-2 text-secondary text-sm' : 'text-lg mr-2'}
+						title="Move down">&downarrow;</button
 					>
 				{/if}</div
 			>
diff --git a/frontend/src/lib/components/Dev.svelte b/frontend/src/lib/components/Dev.svelte
index 343291adb4..5e3b52d867 100644
--- a/frontend/src/lib/components/Dev.svelte
+++ b/frontend/src/lib/components/Dev.svelte
@@ -15,7 +15,8 @@
 		WorkspaceService,
 		type InputTransform,
 		type RawScript,
-		type PathScript
+		type PathScript,
+		type TriggersCount
 	} from '$lib/gen'
 	import { inferArgs } from '$lib/infer'
 	import { copilotInfo, userStore, workspaceStore } from '$lib/stores'
@@ -41,14 +42,13 @@
 	import { workspacedOpenai } from './copilot/lib'
 	import type { FlowCopilotContext, FlowCopilotModule } from './copilot/flow'
 	import { pickScript } from './flows/flowStateUtils'
-	import type { Schedule } from './flows/scheduleUtils'
 	import {
 		approximateFindPythonRelativePath,
 		isTypescriptRelativePath,
 		parseTypescriptDeps
 	} from '$lib/relative_imports'
 	import Tooltip from './Tooltip.svelte'
-
+	import type { ScheduleTrigger, TriggerContext } from './triggers'
 	$: token = $page.url.searchParams.get('wm_token') ?? undefined
 	$: workspace = $page.url.searchParams.get('workspace') ?? undefined
 	$: themeDarkRaw = $page.url.searchParams.get('activeColorTheme')
@@ -467,13 +467,7 @@
 	}
 
 	const flowStateStore = writable({} as FlowState)
-	const scheduleStore = writable<Schedule>({
-		args: {},
-		cron: '',
-		timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-		enabled: false,
-		summary: undefined
-	})
+
 	const previewArgsStore = writable<Record<string, any>>({})
 	const scriptEditorDrawer = writable(undefined)
 	const moving = writable<{ module: FlowModule; modules: FlowModule[] } | undefined>(undefined)
@@ -481,10 +475,19 @@
 
 	const testStepStore = writable<Record<string, any>>({})
 	const selectedIdStore = writable('settings-metadata')
+	const selectedTriggerStore = writable<
+		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets'
+	>('webhooks')
 
+	const primaryScheduleStore = writable<ScheduleTrigger | undefined | false>(undefined)
+	const triggersCount = writable<TriggersCount | undefined>(undefined)
+	setContext<TriggerContext>('TriggerContext', {
+		primarySchedule: primaryScheduleStore,
+		selectedTrigger: selectedTriggerStore,
+		triggersCount: triggersCount
+	})
 	setContext<FlowEditorContext>('FlowEditorContext', {
 		selectedId: selectedIdStore,
-		schedule: scheduleStore,
 		previewArgs: previewArgsStore,
 		scriptEditorDrawer,
 		moving,
@@ -496,7 +499,8 @@
 		saveDraft: () => {},
 		initialPath: '',
 		flowInputsStore: writable<FlowInput>({}),
-		customUi: {}
+		customUi: {},
+		insertButtonOpen: writable(false)
 	})
 
 	$: updateFlow($flowStore)
diff --git a/frontend/src/lib/components/DisplayResult.svelte b/frontend/src/lib/components/DisplayResult.svelte
index 3fec8d0941..b98263b002 100644
--- a/frontend/src/lib/components/DisplayResult.svelte
+++ b/frontend/src/lib/components/DisplayResult.svelte
@@ -559,6 +559,11 @@
 						<pre class="text-xs pt-2 whitespace-pre-wrap text-primary"
 							>{result.error.stack ?? ''}</pre
 						>
+						{#if result.error?.extra}
+							<pre class="text-xs pt-2 whitespace-pre-wrap text-primary"
+								>{JSON.stringify(result.error.extra, null, 4)}</pre
+							>
+						{/if}
 						<slot />
 					</div>
 					{#if language === 'bun'}
@@ -627,7 +632,7 @@
 									>
 								</button>
 							{:else if !result?.disable_download}
-								<FileDownload s3object={result} />
+								<FileDownload {workspaceId} s3object={result} />
 								<button
 									class="text-secondary underline text-2xs whitespace-nowrap"
 									on:click={() => {
@@ -854,7 +859,7 @@
 			</DrawerContent>
 		</Drawer>
 
-		<Portal>
+		<Portal name="s3filepicker">
 			<S3FilePicker bind:this={s3FileViewer} readOnlyMode={true} />
 		</Portal>
 	{/if}
diff --git a/frontend/src/lib/components/EditorBar.svelte b/frontend/src/lib/components/EditorBar.svelte
index e89584ea44..e3d09ee007 100644
--- a/frontend/src/lib/components/EditorBar.svelte
+++ b/frontend/src/lib/components/EditorBar.svelte
@@ -666,6 +666,7 @@ $res = json_decode(curl_exec($ch));`)
 	</div>
 
 	<div class="flex flex-row items-center gap-2">
+		<slot name="right" />
 		{#if scriptPath && !noHistory}
 			<Button
 				btnClasses="!font-medium text-tertiary"
diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index 5de1ecf251..b04fbdf8dc 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -9,7 +9,8 @@
 		ScriptService,
 		type OpenFlow,
 		type RawScript,
-		type InputTransform
+		type InputTransform,
+		type TriggersCount
 	} from '$lib/gen'
 	import { initHistory, push, redo, undo } from '$lib/history'
 	import {
@@ -24,10 +25,12 @@
 		encodeState,
 		formatCron,
 		orderedJsonStringify,
-		sleep
+		sleep,
+		type Value
 	} from '$lib/utils'
 	import { sendUserToast } from '$lib/toast'
 	import { Drawer } from '$lib/components/common'
+	import DeployOverrideConfirmationModal from '$lib/components/common/confirmationModal/DeployOverrideConfirmationModal.svelte'
 
 	import { setContext, tick, type ComponentType } from 'svelte'
 	import { writable, type Writable } from 'svelte/store'
@@ -40,7 +43,6 @@
 	import { dfs, getPreviousIds } from './flows/previousResults'
 	import FlowImportExportMenu from './flows/header/FlowImportExportMenu.svelte'
 	import FlowPreviewButtons from './flows/header/FlowPreviewButtons.svelte'
-	import { loadFlowSchedule, type Schedule } from './flows/scheduleUtils'
 	import type { FlowEditorContext, FlowInput } from './flows/types'
 	import { cleanInputs, emptyFlowModuleState } from './flows/utils'
 	import {
@@ -82,6 +84,7 @@
 	import Summary from './Summary.svelte'
 	import type { FlowBuilderWhitelabelCustomUi } from './custom_ui'
 	import FlowYamlEditor from './flows/header/FlowYamlEditor.svelte'
+	import { type TriggerContext, type ScheduleTrigger } from './triggers'
 
 	export let initialPath: string = ''
 	export let pathStoreInit: string | undefined = undefined
@@ -99,30 +102,77 @@
 	export let diffDrawer: DiffDrawer | undefined = undefined
 	export let customUi: FlowBuilderWhitelabelCustomUi = {}
 	export let disableAi: boolean = false
+	export let disabledFlowInputs = false
+	export let savedPrimarySchedule: ScheduleTrigger | undefined = undefined
+	export let version: number | undefined = undefined
+
+	// Used by multiplayer deploy collision warning
+	let deployedValue: Value | undefined = undefined // Value to diff against
+	let deployedBy: string | undefined = undefined // Author
+	let confirmCallback: () => void = () => {} // What happens when user clicks `override` in warning
+	let open: boolean = false // Is confirmation modal open
 
 	$: setContext('customUi', customUi)
 
+	let onLatest = true
+	async function compareVersions() {
+		if (version === undefined) {
+			return
+		}
+		try {
+			if (initialPath && initialPath != '') {
+				const flowVersion = await FlowService.getFlowLatestVersion({
+					workspace: $workspaceStore!,
+					path: initialPath
+				})
+
+				onLatest = version === flowVersion?.id
+			} else {
+				onLatest = true
+			}
+		} catch (err) {
+			console.error('Error comparing versions', err)
+			onLatest = true
+		}
+	}
+
 	const dispatch = createEventDispatcher()
 
-	async function createSchedule(path: string) {
-		const { cron, timezone, args, enabled, summary } = $scheduleStore
+	const primaryScheduleStore = writable<ScheduleTrigger | undefined | false>(savedPrimarySchedule)
+	const triggersCount = writable<TriggersCount | undefined>(
+		savedPrimarySchedule
+			? { schedule_count: 1, primary_schedule: { schedule: savedPrimarySchedule.cron } }
+			: undefined
+	)
 
-		try {
-			await ScheduleService.createSchedule({
-				workspace: $workspaceStore!,
-				requestBody: {
-					path: path,
-					schedule: formatCron(cron),
-					timezone,
-					script_path: path,
-					is_flow: true,
-					args,
-					enabled,
-					summary
-				}
-			})
-		} catch (err) {
-			sendUserToast(`The primary schedule could not be created: ${err}`, true)
+	export function setPrimarySchedule(schedule: ScheduleTrigger | undefined | false) {
+		primaryScheduleStore.set(schedule)
+		loadTriggers()
+	}
+
+	async function createSchedule(path: string) {
+		if ($primaryScheduleStore) {
+			const { cron, timezone, args, enabled, summary } = $primaryScheduleStore
+
+			try {
+				await ScheduleService.createSchedule({
+					workspace: $workspaceStore!,
+					requestBody: {
+						path: path,
+						schedule: formatCron(cron),
+						timezone,
+						script_path: path,
+						is_flow: true,
+						args,
+						enabled,
+						summary
+					}
+				})
+			} catch (err) {
+				sendUserToast(`The primary schedule could not be created: ${err}`, true)
+			}
+		} else {
+			sendUserToast('The primary schedule could not be created: no schedule data', true)
 		}
 	}
 
@@ -186,7 +236,8 @@
 					typ: 'flow',
 					value: {
 						...flow,
-						path: $pathStore
+						path: $pathStore,
+						primary_schedule: $primaryScheduleStore
 					}
 				}
 			})
@@ -233,6 +284,44 @@
 		)
 	}
 
+	async function handleSaveFlow(deploymentMsg?: string) {
+		await compareVersions()
+		if (onLatest || initialPath == '' || savedFlow?.draft_only) {
+			// Handle directly
+			await saveFlow(deploymentMsg)
+		} else {
+			// We need it for diff
+			await syncWithDeployed()
+
+			// Handle through confirmation modal
+			confirmCallback = async () => {
+				await saveFlow(deploymentMsg)
+			}
+			// Open confirmation modal
+			open = true
+		}
+	}
+	async function syncWithDeployed() {
+		const flow = await FlowService.getFlowByPath({
+			workspace: $workspaceStore!,
+			path: initialPath,
+			withStarredInfo: true
+		})
+		deployedValue = {
+			...flow,
+			starred: undefined,
+			id: undefined,
+			edited_at: undefined,
+			edited_by: undefined,
+			workspace_id: undefined,
+			archived: undefined,
+			same_worker: undefined,
+			visible_to_runner_only: undefined,
+			ws_error_handler_muted: undefined
+		}
+		deployedBy = flow.edited_by
+	}
+
 	async function saveFlow(deploymentMsg?: string): Promise<void> {
 		loadingSave = true
 		try {
@@ -240,7 +329,7 @@
 			// console.log('flow', computeUnlockedSteps(flow)) // del
 			// loadingSave = false // del
 			// return
-			const { cron, timezone, args, enabled, summary } = $scheduleStore
+
 			if (newFlow) {
 				try {
 					localStorage.removeItem('flow')
@@ -263,7 +352,7 @@
 						deployment_message: deploymentMsg || undefined
 					}
 				})
-				if (enabled) {
+				if ($primaryScheduleStore && $primaryScheduleStore.enabled) {
 					await createSchedule($pathStore)
 				}
 			} else {
@@ -283,31 +372,40 @@
 						workspace: $workspaceStore ?? '',
 						path: initialPath
 					})
-					if (
-						JSON.stringify(schedule.args) != JSON.stringify(args) ||
-						schedule.schedule != cron ||
-						schedule.timezone != timezone ||
-						schedule.summary != summary
-					) {
-						await ScheduleService.updateSchedule({
+					if ($primaryScheduleStore) {
+						const { cron, timezone, args, enabled, summary } = $primaryScheduleStore
+
+						if (
+							JSON.stringify(schedule.args) != JSON.stringify(args) ||
+							schedule.schedule != cron ||
+							schedule.timezone != timezone ||
+							schedule.summary != summary
+						) {
+							await ScheduleService.updateSchedule({
+								workspace: $workspaceStore ?? '',
+								path: initialPath,
+								requestBody: {
+									schedule: formatCron(cron),
+									timezone,
+									args,
+									summary
+								}
+							})
+						}
+						if (enabled != schedule.enabled) {
+							await ScheduleService.setScheduleEnabled({
+								workspace: $workspaceStore ?? '',
+								path: initialPath,
+								requestBody: { enabled }
+							})
+						}
+					} else if (scheduleExists && !$triggersCount?.primary_schedule) {
+						await ScheduleService.deleteSchedule({
 							workspace: $workspaceStore ?? '',
-							path: initialPath,
-							requestBody: {
-								schedule: formatCron(cron),
-								timezone,
-								args,
-								summary
-							}
+							path: $pathStore
 						})
 					}
-					if (enabled != schedule.enabled) {
-						await ScheduleService.setScheduleEnabled({
-							workspace: $workspaceStore ?? '',
-							path: initialPath,
-							requestBody: { enabled }
-						})
-					}
-				} else if (enabled) {
+				} else if ($primaryScheduleStore && $primaryScheduleStore.enabled) {
 					await createSchedule(initialPath)
 				}
 
@@ -358,7 +456,8 @@
 					encodeState({
 						flow: $flowStore,
 						path: $pathStore,
-						selectedId: $selectedIdStore
+						selectedId: $selectedIdStore,
+						primarySchedule: $primaryScheduleStore
 					})
 				)
 			} catch (err) {
@@ -368,18 +467,14 @@
 	}
 
 	const selectedIdStore = writable<string>(selectedId ?? 'settings-metadata')
+	const selectedTriggerStore = writable<
+		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets'
+	>('webhooks')
 
 	export function getSelectedId() {
 		return $selectedIdStore
 	}
 
-	const scheduleStore = writable<Schedule>({
-		summary: undefined,
-		args: {},
-		cron: '',
-		timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-		enabled: false
-	})
 	const previewArgsStore = writable<Record<string, any>>(initialArgs)
 	const scriptEditorDrawer = writable<ScriptEditorDrawer | undefined>(undefined)
 	const moving = writable<{ module: FlowModule; modules: FlowModule[] } | undefined>(undefined)
@@ -394,9 +489,16 @@
 		selectedIdStore.set(selectedId)
 	}
 
+	function selectTrigger(
+		selectedTrigger: 'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets'
+	) {
+		selectedTriggerStore.set(selectedTrigger)
+	}
+
+	let insertButtonOpen = writable<boolean>(false)
+
 	setContext<FlowEditorContext>('FlowEditorContext', {
 		selectedId: selectedIdStore,
-		schedule: scheduleStore,
 		previewArgs: previewArgsStore,
 		scriptEditorDrawer,
 		moving,
@@ -408,28 +510,35 @@
 		saveDraft,
 		initialPath,
 		flowInputsStore: writable<FlowInput>({}),
-		customUi
+		customUi,
+		insertButtonOpen
 	})
 
-	async function loadSchedule() {
-		loadFlowSchedule(initialPath, $workspaceStore!)
-			.then((schedule: Schedule) => {
-				scheduleStore.set(schedule)
-			})
-			.catch(() => {
-				scheduleStore.set({
-					summary: undefined,
-					cron: '0 */5 * * *',
-					timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-					args: {},
-					enabled: false
-				})
-			})
+	setContext<TriggerContext>('TriggerContext', {
+		selectedTrigger: selectedTriggerStore,
+		primarySchedule: primaryScheduleStore,
+		triggersCount
+	})
+
+	async function loadTriggers() {
+		$triggersCount = await FlowService.getTriggersCountOfFlow({
+			workspace: $workspaceStore!,
+			path: initialPath
+		})
+		if ($primaryScheduleStore && $triggersCount.primary_schedule == undefined) {
+			$triggersCount = {
+				...($triggersCount ?? {}),
+				schedule_count: ($triggersCount.schedule_count ?? 0) + 1,
+				primary_schedule: {
+					schedule: $primaryScheduleStore.cron
+				}
+			}
+		}
 	}
 
 	$: selectedId && select(selectedId)
 
-	$: initialPath && initialPath != '' && $workspaceStore && loadSchedule()
+	$: initialPath && initialPath != '' && $workspaceStore && loadTriggers()
 
 	function onKeyDown(event: KeyboardEvent) {
 		let classes = event.target?.['className']
@@ -461,20 +570,24 @@
 				}
 				break
 			case 'ArrowDown': {
-				let ids = generateIds()
-				let idx = ids.indexOf($selectedIdStore)
-				if (idx > -1 && idx < ids.length - 1) {
-					$selectedIdStore = ids[idx + 1]
-					event.preventDefault()
+				if (!$insertButtonOpen) {
+					let ids = generateIds()
+					let idx = ids.indexOf($selectedIdStore)
+					if (idx > -1 && idx < ids.length - 1) {
+						$selectedIdStore = ids[idx + 1]
+						event.preventDefault()
+					}
 				}
 				break
 			}
 			case 'ArrowUp': {
-				let ids = generateIds()
-				let idx = ids.indexOf($selectedIdStore)
-				if (idx > 0 && idx < ids.length) {
-					$selectedIdStore = ids[idx - 1]
-					event.preventDefault()
+				if (!$insertButtonOpen) {
+					let ids = generateIds()
+					let idx = ids.indexOf($selectedIdStore)
+					if (idx > 0 && idx < ids.length) {
+						$selectedIdStore = ids[idx - 1]
+						event.preventDefault()
+					}
 				}
 				break
 			}
@@ -561,6 +674,8 @@
 				kind: string
 				app: string
 				ask_id: number
+				id: number
+				version_id: number
 			}[]
 		} catch (err) {
 			if (err.name !== 'CancelError') throw err
@@ -690,10 +805,13 @@
 			}
 
 			if (module.type === 'trigger') {
-				if (!$scheduleStore.cron) {
-					$scheduleStore.cron = '0 */15 * * *'
+				$primaryScheduleStore = {
+					summary: 'Scheduled poll of flow',
+					args: {},
+					cron: '0 */15 * * *',
+					timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+					enabled: true
 				}
-				$scheduleStore.enabled = true
 			}
 
 			const flowModule: FlowModule & {
@@ -890,7 +1008,8 @@
 								const snakeKey = snakeCase(key)
 								if (
 									schemaProperty &&
-									(!$flowStore.schema || !(snakeKey in ($flowStore.schema.properties as any) ?? {})) // prevent overriding flow inputs
+									(!$flowStore.schema ||
+										!(snakeKey in ($flowStore?.schema?.properties ?? ({} as any)))) // prevent overriding flow inputs
 								) {
 									copilotFlowInputs[snakeKey] = schemaProperty
 									if (schema?.required.includes(snakeKey)) {
@@ -1074,6 +1193,15 @@
 
 <slot />
 
+<DeployOverrideConfirmationModal
+	bind:deployedBy
+	bind:confirmCallback
+	bind:open
+	{diffDrawer}
+	bind:deployedValue
+	currentValue={$flowStore}
+/>
+
 {#key renderCount}
 	{#if !$userStore?.operator}
 		<FlowCopilotDrawer {getHubCompletions} {genFlow} bind:flowCopilotMode />
@@ -1142,7 +1270,7 @@
 				</div>
 
 				<div class="gap-4 flex-row hidden md:flex w-full max-w-md">
-					{#if $scheduleStore.enabled}
+					{#if $primaryScheduleStore != undefined ? $primaryScheduleStore && $primaryScheduleStore?.enabled : $triggersCount?.primary_schedule}
 						<Button
 							btnClasses="hidden lg:inline-flex"
 							startIcon={{ icon: Calendar }}
@@ -1150,10 +1278,15 @@
 							color="light"
 							size="xs"
 							on:click={async () => {
-								select('settings-schedule')
+								select('triggers')
+								selectTrigger('schedules')
 							}}
 						>
-							{$scheduleStore.cron ?? ''}
+							{$primaryScheduleStore != undefined
+								? $primaryScheduleStore
+									? $primaryScheduleStore?.cron
+									: ''
+								: $triggersCount?.primary_schedule?.schedule}
 						</Button>
 					{/if}
 
@@ -1233,14 +1366,17 @@
 							color="light"
 							variant="border"
 							size="xs"
-							on:click={() => {
+							on:click={async () => {
 								if (!savedFlow) {
 									return
 								}
+
+								await syncWithDeployed()
+
 								diffDrawer?.openDrawer()
 								diffDrawer?.setDiff({
 									mode: 'normal',
-									deployed: savedFlow,
+									deployed: deployedValue ?? savedFlow,
 									draft: savedFlow['draft'],
 									current: { ...$flowStore, path: $pathStore }
 								})
@@ -1282,7 +1418,9 @@
 							loading={loadingSave}
 							size="xs"
 							startIcon={{ icon: Save }}
-							on:click={() => saveFlow()}
+							on:click={async () => {
+								await handleSaveFlow()
+							}}
 							dropdownItems={!newFlow ? dropdownItems : undefined}
 						>
 							Deploy
@@ -1293,16 +1431,16 @@
 									type="text"
 									placeholder="Deployment message"
 									bind:value={deploymentMsg}
-									on:keydown={(e) => {
+									on:keydown={async (e) => {
 										if (e.key === 'Enter') {
-											saveFlow(deploymentMsg)
+											await handleSaveFlow(deploymentMsg)
 										}
 									}}
 									bind:this={msgInput}
 								/>
 								<Button
 									size="xs"
-									on:click={() => saveFlow(deploymentMsg)}
+									on:click={async () => await handleSaveFlow(deploymentMsg)}
 									endIcon={{ icon: CornerDownLeft }}
 									loading={loadingSave}
 								>
@@ -1317,12 +1455,14 @@
 			<!-- metadata -->
 			{#if $flowStateStore}
 				<FlowEditor
+					{disabledFlowInputs}
 					disableAi={disableAi || customUi?.stepInputs?.ai == false}
 					disableSettings={customUi?.settingsPanel === false}
 					{loading}
 					on:reload={() => {
 						renderCount += 1
 					}}
+					{newFlow}
 				/>
 			{:else}
 				<CenteredPage>Loading...</CenteredPage>
diff --git a/frontend/src/lib/components/FlowGraphViewer.svelte b/frontend/src/lib/components/FlowGraphViewer.svelte
index ec5f4523dc..1ecef2943f 100644
--- a/frontend/src/lib/components/FlowGraphViewer.svelte
+++ b/frontend/src/lib/components/FlowGraphViewer.svelte
@@ -13,13 +13,14 @@
 		description?: string
 		value: FlowValue
 		schema?: any
+		path?: string
 	}
 
 	export let overflowAuto = false
 	export let noSide = false
 	export let download = false
 	export let noGraph = false
-
+	export let triggerNode = false
 	export let stepDetail: FlowModule | string | undefined = undefined
 
 	const dispatch = createEventDispatcher()
@@ -32,20 +33,26 @@
 			class:overflow-auto={overflowAuto}
 		>
 			<FlowGraphV2
+				{triggerNode}
+				path={flow?.path}
 				{download}
 				minHeight={400}
 				modules={flow?.value?.modules}
 				failureModule={flow?.value?.failure_module}
 				preprocessorModule={flow?.value?.preprocessor_module}
 				on:select={(e) => {
-					if (e?.detail === 'failure') {
+					let nodeId = e?.detail
+					if (nodeId === 'triggers') {
+						dispatch('triggerDetail')
+						return
+					} else if (nodeId === 'failure') {
 						stepDetail = flow?.value?.failure_module
-					} else if (e?.detail === 'preprocessor') {
+					} else if (nodeId === 'preprocessor') {
 						stepDetail = flow?.value?.preprocessor_module
 					} else {
 						stepDetail = dfs(flow?.value?.modules ?? [], (m) => m).find((m) => m?.id === e?.detail)
 					}
-					stepDetail = stepDetail ?? e?.detail
+					stepDetail = stepDetail ?? nodeId
 					dispatch('select', stepDetail)
 				}}
 			/>
diff --git a/frontend/src/lib/components/FlowGraphViewerStep.svelte b/frontend/src/lib/components/FlowGraphViewerStep.svelte
index b2b7b9d381..fe235c6455 100644
--- a/frontend/src/lib/components/FlowGraphViewerStep.svelte
+++ b/frontend/src/lib/components/FlowGraphViewerStep.svelte
@@ -133,8 +133,10 @@
 						Error handler
 					{:else if stepDetail.id === 'preprocessor'}
 						Preprocessor
-					{:else}
-						Anonymous step
+					{:else if stepDetail.value.type == 'rawscript'}
+						Inline {stepDetail.value.language} script
+					{:else if stepDetail.value.type == 'script'}
+						Workspace script
 					{/if}
 				</span>
 			</div>
diff --git a/frontend/src/lib/components/FlowInputViewer.svelte b/frontend/src/lib/components/FlowInputViewer.svelte
new file mode 100644
index 0000000000..94c25ffcc4
--- /dev/null
+++ b/frontend/src/lib/components/FlowInputViewer.svelte
@@ -0,0 +1,29 @@
+<script lang="ts">
+	import type { Schema } from '$lib/common'
+
+	import FieldHeader from './FieldHeader.svelte'
+
+	export let schema: Schema | { [key: string]: unknown } | undefined
+</script>
+
+<ul class="my-2">
+	{#if schema == undefined}
+		<li class="text-secondary text-xs italic mb-4">No inputs</li>
+	{:else}
+		{#each Object.entries(schema.properties ?? {}) as [inp, v]}
+			<li class="list-disc flex flex-row items-center">
+				<FieldHeader
+					label={inp}
+					required={Array.isArray(schema.required) && schema.required?.includes(inp)}
+					type={v?.type}
+					contentEncoding={v?.contentEncoding}
+					format={v?.format}
+				/><span class="ml-4 mt-1 text-xs"
+					>{v?.default != undefined && v?.default != ''
+						? 'default: ' + JSON.stringify(v?.default)
+						: ''}</span
+				>
+			</li>
+		{/each}
+	{/if}
+</ul>
diff --git a/frontend/src/lib/components/FlowJobResult.svelte b/frontend/src/lib/components/FlowJobResult.svelte
index 0f0e4eebc0..cd83372389 100644
--- a/frontend/src/lib/components/FlowJobResult.svelte
+++ b/frontend/src/lib/components/FlowJobResult.svelte
@@ -22,6 +22,7 @@
 	export let workspaceId: string | undefined = undefined
 	export let refreshLog: boolean = false
 	export let durationStates: Writable<Record<string, DurationStatus>> | undefined
+	export let downloadLogs = true
 
 	let lastJobId: string | undefined = undefined
 	let drawer: Drawer | undefined = undefined
@@ -40,7 +41,6 @@
 	let logOffset = 0
 	async function getLogs() {
 		if (jobId) {
-
 			const getUpdate = await JobService.getJobUpdates({
 				workspace: workspaceId ?? $workspaceStore!,
 				id: jobId,
@@ -85,6 +85,12 @@
 		<div class="absolute z-40 text-xs top-0 left-1"
 			><button class="" on:click={drawer.openDrawer}>explore all steps' logs</button></div
 		>
-		<LogViewer content={logs ?? ''} {jobId} isLoading={waitingForExecutor} {tag} />
+		<LogViewer
+			download={downloadLogs}
+			content={logs ?? ''}
+			{jobId}
+			isLoading={waitingForExecutor}
+			{tag}
+		/>
 	</div>
 </div>
diff --git a/frontend/src/lib/components/FlowMetadata.svelte b/frontend/src/lib/components/FlowMetadata.svelte
index 46e0a6fda9..3ab5d3d416 100644
--- a/frontend/src/lib/components/FlowMetadata.svelte
+++ b/frontend/src/lib/components/FlowMetadata.svelte
@@ -26,7 +26,7 @@
 			{#if job['success'] != undefined}
 				Received job: {displayDate(job.created_at ?? '')}
 			{:else}
-				Received job <TimeAgo withDate date={job.created_at ?? ''} />
+				Received job <TimeAgo date={job.created_at ?? ''} />
 			{/if}
 			<Tooltip small>{job?.created_at}</Tooltip>
 		</span>
@@ -35,7 +35,7 @@
 		<div class="flex flex-row gap-2 items-center text-sm">
 			<Clock size={SMALL_ICON_SIZE} class="text-secondary min-w-3.5" />
 			<span class="whitespace-nowrap">
-				Started <TimeAgo withDate agoOnlyIfRecent date={job.started_at ?? ''} />
+				Started <TimeAgo agoOnlyIfRecent date={job.started_at ?? ''} />
 				<Tooltip small>{job?.started_at}</Tooltip>
 			</span>
 		</div>
diff --git a/frontend/src/lib/components/FlowPreviewContent.svelte b/frontend/src/lib/components/FlowPreviewContent.svelte
index e87120ed01..e18bb80899 100644
--- a/frontend/src/lib/components/FlowPreviewContent.svelte
+++ b/frontend/src/lib/components/FlowPreviewContent.svelte
@@ -36,7 +36,7 @@
 		runPreview($previewArgs, undefined)
 	}
 
-	const { selectedId, previewArgs, flowStateStore, flowStore, pathStore, initialPath } =
+	const { selectedId, previewArgs, flowStateStore, flowStore, pathStore, initialPath, customUi } =
 		getContext<FlowEditorContext>('FlowEditorContext')
 	const dispatch = createEventDispatcher()
 
@@ -326,6 +326,7 @@
 		<div class="pt-4 flex flex-col grow">
 			{#if jobId}
 				<FlowStatusViewer
+					hideDownloadInGraph={customUi?.downloadLogs === false}
 					wideResults
 					{flowStateStore}
 					{jobId}
diff --git a/frontend/src/lib/components/FlowStatusViewer.svelte b/frontend/src/lib/components/FlowStatusViewer.svelte
index db0460a08c..b6eb933af7 100644
--- a/frontend/src/lib/components/FlowStatusViewer.svelte
+++ b/frontend/src/lib/components/FlowStatusViewer.svelte
@@ -18,6 +18,7 @@
 	export let hideDownloadInGraph = false
 	export let hideNodeDefinition = false
 	export let hideJobId = false
+	export let hideDownloadLogs = false
 
 	export let isOwner = false
 	export let wideResults = false
@@ -33,7 +34,8 @@
 		hideDownloadInGraph,
 		hideNodeDefinition,
 		hideTimeline,
-		hideJobId
+		hideJobId,
+		hideDownloadLogs
 	})
 
 	function loadOwner(path: string) {
diff --git a/frontend/src/lib/components/FlowStatusViewerInner.svelte b/frontend/src/lib/components/FlowStatusViewerInner.svelte
index 0232548183..e881dad539 100644
--- a/frontend/src/lib/components/FlowStatusViewerInner.svelte
+++ b/frontend/src/lib/components/FlowStatusViewerInner.svelte
@@ -38,7 +38,8 @@
 		suspendStatus,
 		hideDownloadInGraph,
 		hideTimeline,
-		hideNodeDefinition
+		hideNodeDefinition,
+		hideDownloadLogs
 	} = getContext<FlowStatusViewerContext>('FlowStatusViewer')
 
 	export let jobId: string
@@ -196,6 +197,7 @@
 								args: job?.args,
 								tag: job?.tag
 							}
+
 							setModuleState(mod.id ?? '', newState)
 						})
 						.catch((e) => {
@@ -206,7 +208,6 @@
 					(mod.type == 'Success' || mod.type == 'Failure') &&
 					!['Success', 'Failure'].includes($localModuleStates?.[mod.id ?? '']?.type)
 				) {
-					// console.log(mod.id, 'FOO')
 					setModuleState(
 						mod.id ?? '',
 						{
@@ -422,6 +423,11 @@
 					started_at
 				})
 			} else {
+				const parent_module = mod['parent_module']
+
+				// Delete existing failure node attached to the same parent module
+				removeFailureNode(mod.id, parent_module)
+
 				setModuleState(
 					mod.id,
 					{
@@ -431,17 +437,19 @@
 						result: job['result'],
 						job_id: job.id,
 						tag: job.tag,
-						parent_module: mod['parent_module'],
+						parent_module,
 						duration_ms: job['duration_ms'],
 						started_at: started_at,
 						flow_jobs: mod.flow_jobs,
 						flow_jobs_success: mod.flow_jobs_success,
 						iteration_total: mod.iterator?.itered?.length,
-						retries: mod?.failed_retries?.length
+						retries: mod?.failed_retries?.length,
+						skipped: mod.skipped
 						// retries: $flowStateStore?.raw_flow
 					},
 					force
 				)
+
 				setDurationStatusByJob(mod.id, job.id, {
 					created_at: job.created_at ? new Date(job.created_at).getTime() : undefined,
 					started_at,
@@ -606,6 +614,23 @@
 
 	let storedListJobs: Record<number, Job> = {}
 	let wrapperHeight: number = 0
+
+	function removeFailureNode(id: string, parent_module: any) {
+		if (id?.startsWith('failure-') && parent_module) {
+			;[...globalModuleStates, localModuleStates].forEach((stateMapStore) => {
+				stateMapStore.update((stateMap) => {
+					if (id) {
+						Object.keys(stateMap).forEach((key) => {
+							if (stateMap[key]?.parent_module == parent_module) {
+								delete stateMap[key]
+							}
+						})
+					}
+					return stateMap
+				})
+			})
+		}
+	}
 </script>
 
 {#if notAnonynmous}
@@ -668,6 +693,7 @@
 								result={job.result}
 								logs={job.logs}
 								durationStates={localDurationStatuses}
+								downloadLogs={!hideDownloadLogs}
 							/>
 						</div>
 					{/if}
@@ -854,7 +880,7 @@
 											{childFlow}
 											globalModuleStates={[localModuleStates, ...globalModuleStates]}
 											globalDurationStatuses={[localDurationStatuses, ...globalDurationStatuses]}
-											render={failedRetry == retry_selected}
+											render={failedRetry == retry_selected && render}
 											reducedPolling={false}
 											{workspaceId}
 											jobId={failedRetry}
@@ -942,6 +968,7 @@
 						</div>
 
 						<FlowGraphV2
+							triggerNode={true}
 							download={!hideDownloadInGraph}
 							minHeight={wrapperHeight}
 							success={jobId != undefined && isSuccess(job?.['success'])}
@@ -1025,6 +1052,7 @@
 											result={job['result']}
 											logs={job.logs ?? ''}
 											durationStates={localDurationStatuses}
+											downloadLogs={!hideDownloadLogs}
 										/>
 									{:else if selectedNode == 'start'}
 										{#if job.args}
@@ -1054,7 +1082,11 @@
 											<span class="pl-1 text-tertiary text-lg pt-4">Selected subflow</span>
 										{/if}
 										<div class="px-2 flex gap-2 min-w-0 w-full">
-											<ModuleStatus type={node.type} scheduled_for={node.scheduled_for} />
+											<ModuleStatus
+												type={node.type}
+												scheduled_for={node.scheduled_for}
+												skipped={node.skipped}
+											/>
 											{#if node.duration_ms}
 												<Badge>
 													<Hourglass class="mr-2" size={10} />
@@ -1096,6 +1128,7 @@
 											tag={node.tag}
 											logs={node.logs}
 											durationStates={localDurationStatuses}
+											downloadLogs={!hideDownloadLogs}
 										/>
 									{:else}
 										<p class="p-2 text-tertiary italic"
diff --git a/frontend/src/lib/components/FlowTutorials.svelte b/frontend/src/lib/components/FlowTutorials.svelte
index bf1a9bfc1b..ebcef75a66 100644
--- a/frontend/src/lib/components/FlowTutorials.svelte
+++ b/frontend/src/lib/components/FlowTutorials.svelte
@@ -1,28 +1,28 @@
 <script lang="ts">
 	import { skipAllTodos } from '$lib/tutorialUtils'
-	import FlowBranchAll from './tutorials/FlowBranchAll.svelte'
-	import FlowBranchOne from './tutorials/FlowBranchOne.svelte'
+	import FlowBuilderTutorialBranchAll from './tutorials/FlowBuilderTutorialBranchAll.svelte'
+	import FlowBuilderTutorialBranchOne from './tutorials/FlowBuilderTutorialBranchOne.svelte'
 	import FlowBuilderTutorialSimpleFlow from './tutorials/FlowBuilderTutorialSimpleFlow.svelte'
-	import FlowBuilderTutorialsForLoop from './tutorials/FlowBuilderTutorialsForLoop.svelte'
-	import FlowErrorHandler from './tutorials/FlowErrorHandler.svelte'
+	import FlowBuilderTutorialForLoop from './tutorials/FlowBuilderTutorialForLoop.svelte'
+	import FlowBuilderTutorialErrorHandler from './tutorials/FlowBuilderTutorialErrorHandler.svelte'
 
 	let flowBuilderTutorialSimpleFlow: FlowBuilderTutorialSimpleFlow | undefined = undefined
-	let flowBuilderTutorialsForLoop: FlowBuilderTutorialsForLoop | undefined = undefined
-	let flowBranchOne: FlowBranchOne | undefined = undefined
-	let flowBranchAll: FlowBranchAll | undefined = undefined
-	let flowErrorHandler: FlowErrorHandler | undefined = undefined
+	let flowBuilderTutorialForLoop: FlowBuilderTutorialForLoop | undefined = undefined
+	let flowBuilderTutorialBranchOne: FlowBuilderTutorialBranchOne | undefined = undefined
+	let flowBuilderTutorialBranchAll: FlowBuilderTutorialBranchAll | undefined = undefined
+	let flowBuilderTutorialErrorHandler: FlowBuilderTutorialErrorHandler | undefined = undefined
 
 	export function runTutorialById(id: string, indexToInsertAt?: number | undefined) {
 		if (id === 'forloop') {
-			flowBuilderTutorialsForLoop?.runTutorial(indexToInsertAt)
+			flowBuilderTutorialForLoop?.runTutorial(indexToInsertAt)
 		} else if (id === 'branchone') {
-			flowBranchOne?.runTutorial()
+			flowBuilderTutorialBranchOne?.runTutorial()
 		} else if (id === 'branchall') {
-			flowBranchAll?.runTutorial()
+			flowBuilderTutorialBranchAll?.runTutorial()
 		} else if (id === 'action') {
 			flowBuilderTutorialSimpleFlow?.runTutorial()
 		} else if (id === 'error-handler') {
-			flowErrorHandler?.runTutorial()
+			flowBuilderTutorialErrorHandler?.runTutorial()
 		}
 	}
 
@@ -37,12 +37,27 @@
 	on:skipAll={skipAll}
 	on:reload
 />
-<FlowBuilderTutorialsForLoop
-	bind:this={flowBuilderTutorialsForLoop}
+<FlowBuilderTutorialForLoop
+	bind:this={flowBuilderTutorialForLoop}
+	on:error
+	on:skipAll={skipAll}
+	on:reload
+/>
+<FlowBuilderTutorialBranchOne
+	bind:this={flowBuilderTutorialBranchOne}
+	on:error
+	on:skipAll={skipAll}
+	on:reload
+/>
+<FlowBuilderTutorialBranchAll
+	bind:this={flowBuilderTutorialBranchAll}
+	on:error
+	on:skipAll={skipAll}
+	on:reload
+/>
+<FlowBuilderTutorialErrorHandler
+	bind:this={flowBuilderTutorialErrorHandler}
 	on:error
 	on:skipAll={skipAll}
 	on:reload
 />
-<FlowBranchOne bind:this={flowBranchOne} on:error on:skipAll={skipAll} on:reload />
-<FlowBranchAll bind:this={flowBranchAll} on:error on:skipAll={skipAll} on:reload />
-<FlowErrorHandler bind:this={flowErrorHandler} on:error on:skipAll={skipAll} on:reload />
diff --git a/frontend/src/lib/components/FlowViewer.svelte b/frontend/src/lib/components/FlowViewer.svelte
index 66d37704bf..cc1350b75a 100644
--- a/frontend/src/lib/components/FlowViewer.svelte
+++ b/frontend/src/lib/components/FlowViewer.svelte
@@ -2,11 +2,11 @@
 	import type { FlowValue } from '$lib/gen'
 	import { Tab, Tabs, TabContent } from './common'
 	import SchemaViewer from './SchemaViewer.svelte'
-	import FieldHeader from './FieldHeader.svelte'
 	import FlowGraphViewer from './FlowGraphViewer.svelte'
 
 	import HighlightTheme from './HighlightTheme.svelte'
 	import FlowViewerInner from './FlowViewerInner.svelte'
+	import FlowInputViewer from './FlowInputViewer.svelte'
 
 	export let flow: {
 		summary: string
@@ -27,10 +27,6 @@
 	if (initialOpen) {
 		open[initialOpen] = true
 	}
-
-	function toAny(x: unknown): any {
-		return x as any
-	}
 </script>
 
 <HighlightTheme />
@@ -54,23 +50,7 @@
 					<span>Flow Input</span>
 				</p>
 				{#if flow.schema && flow.schema.properties && Object.keys(flow.schema.properties).length > 0 && flow.schema}
-					<ul class="my-2">
-						{#each Object.entries(flow.schema.properties) as [inp, v]}
-							<li class="list-disc flex flex-row">
-								<FieldHeader
-									label={inp}
-									required={flow.schema.required?.includes(inp)}
-									type={toAny(v)?.type}
-									contentEncoding={toAny(v)?.contentEncoding}
-									format={toAny(v)?.format}
-								/><span class="ml-4 mt-2 text-xs"
-									>{toAny(v)?.default != undefined
-										? 'default: ' + JSON.stringify(toAny(v)?.default)
-										: ''}</span
-								>
-							</li>
-						{/each}
-					</ul>
+					<FlowInputViewer schema={flow.schema} />
 				{:else}
 					<div class="text-secondary text-xs italic mb-4">No inputs</div>
 				{/if}
diff --git a/frontend/src/lib/components/FlowViewerInner.svelte b/frontend/src/lib/components/FlowViewerInner.svelte
index da71430825..e4bec76006 100644
--- a/frontend/src/lib/components/FlowViewerInner.svelte
+++ b/frontend/src/lib/components/FlowViewerInner.svelte
@@ -76,9 +76,8 @@
 					size="xs"
 					startIcon={{ icon: Clipboard }}
 					btnClasses="absolute top-2 right-2 w-min z-20"
-				>
-					Copy content
-				</Button>
+					iconOnly
+				/>
 
 				<div class={shouldDisplayLoadMore ? 'code-container' : ''}>
 					<Highlight
diff --git a/frontend/src/lib/components/IdEditorInput.svelte b/frontend/src/lib/components/IdEditorInput.svelte
index dae667c867..1f390d517a 100644
--- a/frontend/src/lib/components/IdEditorInput.svelte
+++ b/frontend/src/lib/components/IdEditorInput.svelte
@@ -47,7 +47,6 @@
 	<div class="flex w-full">
 		<input
 			bind:this={inputDiv}
-			autofocus
 			type="text"
 			bind:value
 			class="!w-auto grow"
diff --git a/frontend/src/lib/components/InstanceGroupEditor.svelte b/frontend/src/lib/components/InstanceGroupEditor.svelte
index 9b2ebf30fd..a5f90dd969 100644
--- a/frontend/src/lib/components/InstanceGroupEditor.svelte
+++ b/frontend/src/lib/components/InstanceGroupEditor.svelte
@@ -6,6 +6,7 @@
 	import Skeleton from './common/skeleton/Skeleton.svelte'
 	import TableCustom from './TableCustom.svelte'
 	import { sendUserToast } from '$lib/toast'
+	import { Loader2 } from 'lucide-svelte'
 
 	export let name: string
 
@@ -57,7 +58,12 @@
 				>
 			</div>
 		</div>
-		<h2>Members ({members?.length ?? 0})</h2>
+		<h2
+			>Members ({#if members?.length != undefined}{members?.length ?? 0}{:else}<Loader2
+					class="animate-spin"
+					size={10}
+				/>{/if})</h2
+		>
 		<div class="flex items-start">
 			<input type="text" placeholder="john@acme.com" bind:value={email} />
 			<Button
diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index a1ece19bf8..e5f4bb0b4d 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -13,7 +13,7 @@
 	import KeycloakSetting from './KeycloakSetting.svelte'
 	import Alert from './common/alert/Alert.svelte'
 	import { isCloudHosted } from '$lib/cloud'
-	import { capitalize, classNames } from '$lib/utils'
+	import { capitalize, classNames, sleep } from '$lib/utils'
 	import { enterpriseLicense } from '$lib/stores'
 	import CustomOauth from './CustomOauth.svelte'
 	import {
@@ -102,8 +102,8 @@
 		if (values['base_url'] == undefined) {
 			values['base_url'] = 'http://localhost'
 		}
-		if (values['smtp_connect'] == undefined) {
-			values['smtp_connect'] = {}
+		if (values['smtp_settings'] == undefined) {
+			values['smtp_settings'] = {}
 		}
 		loading = false
 
@@ -111,6 +111,7 @@
 	}
 
 	export async function saveSettings() {
+		let shouldReloadPage = false
 		if (values) {
 			const allSettings = Object.values(settings).flatMap((x) => Object.entries(x))
 			let licenseKeySet = false
@@ -129,6 +130,9 @@
 						if (x.key == 'license_key') {
 							licenseKeySet = true
 						}
+						if (x.requiresReloadOnChange) {
+							shouldReloadPage = true
+						}
 						return await SettingService.setGlobal({
 							key: x.key,
 							requestBody: { value: values?.[x.key] }
@@ -158,8 +162,14 @@
 		} else {
 			console.error('Values not loaded')
 		}
-		sendUserToast('Settings updated')
-		dispatch('saved')
+		if (shouldReloadPage) {
+			sendUserToast('Settings updated, reloading page...')
+			await sleep(1000)
+			window.location.reload()
+		} else {
+			sendUserToast('Settings updated')
+			dispatch('saved')
+		}
 	}
 
 	let oauths: Record<string, any> = {}
@@ -206,7 +216,8 @@
 		'basecamp',
 		'linkedin',
 		'quickbooks',
-		'visma'
+		'visma',
+		'spotify'
 	]
 
 	let oauth_name = undefined
@@ -274,22 +285,34 @@
 				<TabContent value={category}>
 					{#if category == 'SMTP'}
 						<div class="text-secondary pb-4 text-xs"
-							>Setting SMTP unlocks sending emails upon adding new users to the workspace or the instance or sending critical alerts.
-							<a target="_blank" href="https://www.windmill.dev/docs/misc/setup_smtp">Learn more</a></div
+							>Setting SMTP unlocks sending emails upon adding new users to the workspace or the
+							instance or sending critical alerts.
+							<a target="_blank" href="https://www.windmill.dev/docs/misc/setup_smtp">Learn more</a
+							></div
 						>
 					{:else if category == 'Registries'}
 						<div class="text-secondary pb-4 text-xs">
-							Add private registries for Pip, Bun and npm. <a target="_blank" href="https://www.windmill.dev/docs/advanced/imports">Learn more</a>
+							Add private registries for Pip, Bun and npm. <a
+								target="_blank"
+								href="https://www.windmill.dev/docs/advanced/imports">Learn more</a
+							>
 						</div>
 					{:else if category == 'Slack'}
 						<div class="text-secondary pb-4 text-xs">
-							Connecting your instance to a Slack workspace enables critical alerts to be sent to a Slack channel.
-							<a target="_blank" href="https://www.windmill.dev/docs/misc/saml_and_scim">Learn more</a>
+							Connecting your instance to a Slack workspace enables critical alerts to be sent to a
+							Slack channel.
+							<a target="_blank" href="https://www.windmill.dev/docs/misc/saml_and_scim"
+								>Learn more</a
+							>
 						</div>
 					{:else if category == 'SCIM/SAML'}
 						<div class="text-secondary pb-4 text-xs">
-							Setting up SAML and SCIM allows you to authenticate users using your identity provider.
-							<a target="_blank" href="https://www.windmill.dev/docs/advanced/instance_settings#slack">Learn more</a>
+							Setting up SAML and SCIM allows you to authenticate users using your identity
+							provider.
+							<a
+								target="_blank"
+								href="https://www.windmill.dev/docs/advanced/instance_settings#slack">Learn more</a
+							>
 						</div>
 					{:else if category == 'Debug'}
 						<div class="text-secondary pb-4 text-xs">
@@ -310,9 +333,11 @@
 							</ul>
 						</div>
 						{#if $enterpriseLicense}
-						<div class="text-secondary pb-4 text-xs">
-							On Enterprise Edition, you must send data to check that usage is in line with the terms of the subscription. You can either enable telemetry or regularly send usage data by clicking the button below.
-						</div>
+							<div class="text-secondary pb-4 text-xs">
+								On Enterprise Edition, you must send data to check that usage is in line with the
+								terms of the subscription. You can either enable telemetry or regularly send usage
+								data by clicking the button below.
+							</div>
 							<Button
 								on:click={sendStats}
 								variant="border"
@@ -340,12 +365,17 @@
 								{/if}
 
 								<div class="py-1" />
-									<div class="mb-2">
-										<span class="text-primary text-sm">When at least one of the below options is set, users will be able to login to
-											Windmill via their third-party account.
-											<br /> To test SSO, the recommended workflow is to to save the settings and try to
-											login in an incognito window. <a target="_blank" href="https://www.windmill.dev/docs/misc/setup_oauth#sso">Learn more</a></span>
-									</div>
+								<div class="mb-2">
+									<span class="text-primary text-sm"
+										>When at least one of the below options is set, users will be able to login to
+										Windmill via their third-party account.
+										<br /> To test SSO, the recommended workflow is to to save the settings and try
+										to login in an incognito window.
+										<a target="_blank" href="https://www.windmill.dev/docs/misc/setup_oauth#sso"
+											>Learn more</a
+										></span
+									>
+								</div>
 								<div class="flex flex-col gap-2 py-4">
 									<OAuthSetting name="google" bind:value={oauths['google']} />
 									<OAuthSetting name="microsoft" bind:value={oauths['microsoft']} />
@@ -372,6 +402,14 @@
 														/>
 													</div>
 													<div class="p-2 border rounded">
+														<label class="block pb-2">
+															<span class="text-primary font-semibold text-sm">Custom Name</span>
+															<input
+																type="text"
+																placeholder="Custom Name"
+																bind:value={oauths[k]['display_name']}
+															/>
+														</label>
 														<label class="block pb-2">
 															<span class="text-primary font-semibold text-sm">Client Id</span>
 															<input
@@ -425,12 +463,18 @@
 								</div>
 							{:else if ssoOrOauth === 'oauth'}
 								<div class="mb-2">
-									<span class="text-primary text-sm">When one of the below options is set, you will be able to create a specific
+									<span class="text-primary text-sm"
+										>When one of the below options is set, you will be able to create a specific
 										resource containing a token automatically generated by the third-party provider.
 										<br />
 										To test it after setting an oauth client, go to the Resources menu and create a new
-										one of the type of your oauth client (i.e. a 'github' resource if you set Github OAuth).
-										<br /><a target="_blank" href="https://www.windmill.dev/docs/misc/setup_oauth#oauth">Learn more</a></span>
+										one of the type of your oauth client (i.e. a 'github' resource if you set Github
+										OAuth).
+										<br /><a
+											target="_blank"
+											href="https://www.windmill.dev/docs/misc/setup_oauth#oauth">Learn more</a
+										></span
+									>
 								</div>
 								<div class="py-1" />
 								<OAuthSetting login={false} name="slack" bind:value={oauths['slack']} />
@@ -514,7 +558,7 @@
 					<div>
 						<div class="flex-col flex gap-2 pb-4">
 							{#each settings[category] as setting}
-								{#if (!setting.cloudonly || isCloudHosted()) && showSetting(setting.key, values)}
+								{#if (!setting.cloudonly || isCloudHosted()) && showSetting(setting.key, values) && !(setting.hiddenIfNull && values[setting.key] == null)}
 									{#if setting.ee_only != undefined && !$enterpriseLicense}
 										<div class="flex text-xs items-center gap-1 text-yellow-500 whitespace-nowrap">
 											<AlertTriangle size={16} />
@@ -545,6 +589,20 @@
 														: ''}
 													bind:value={values[setting.key]}
 												/>
+												{#if setting.advancedToggle}
+													<div class="mt-1">
+														<Toggle
+															size="xs"
+															options={{ right: setting.advancedToggle.label }}
+															checked={setting.advancedToggle.checked(values)}
+															on:change={() => {
+																if (setting.advancedToggle) {
+																	values = setting.advancedToggle.onChange(values)
+																}
+															}}
+														/>
+													</div>
+												{/if}
 											{:else if setting.fieldType == 'textarea'}
 												<textarea
 													rows="2"
@@ -617,24 +675,33 @@
 														{@const attemptedAt = new Date(
 															latestKeyRenewalAttempt.attempted_at
 														).toLocaleString()}
+														{@const isTrial =
+															latestKeyRenewalAttempt.result.startsWith('error: trial:')}
 														<div class="relative">
 															<Popover notClickable>
 																<div class="flex flex-row items-center gap-1">
 																	{#if latestKeyRenewalAttempt.result === 'success'}
 																		<BadgeCheck class="text-green-600" size={12} />
 																	{:else}
-																		<BadgeX class="text-red-600" size={12} />
+																		<BadgeX
+																			class={isTrial ? 'text-yellow-600' : 'text-red-600'}
+																			size={12}
+																		/>
 																	{/if}
 																	<span
 																		class={classNames(
 																			'text-xs',
 																			latestKeyRenewalAttempt.result === 'success'
 																				? 'text-green-600'
+																				: isTrial
+																				? 'text-yellow-600'
 																				: 'text-red-600'
 																		)}
 																	>
 																		{latestKeyRenewalAttempt.result === 'success'
 																			? 'Latest key renewal succeeded'
+																			: isTrial
+																			? 'Latest key renewal ignored because in trial'
 																			: 'Latest key renewal failed'}
 																		on {attemptedAt}
 																	</span>
@@ -644,6 +711,10 @@
 																		<span class="text-green-300">
 																			Latest key renewal succeeded on {attemptedAt}
 																		</span>
+																	{:else if isTrial}
+																		<span class="text-yellow-300">
+																			License key cannot be renewed during trial ({attemptedAt})
+																		</span>
 																	{:else}
 																		<span class="text-red-300">
 																			Latest key renewal failed on {attemptedAt}: {latestKeyRenewalAttempt.result.replace(
diff --git a/frontend/src/lib/components/JobArgs.svelte b/frontend/src/lib/components/JobArgs.svelte
index 8f97f08552..69c87e4cae 100644
--- a/frontend/src/lib/components/JobArgs.svelte
+++ b/frontend/src/lib/components/JobArgs.svelte
@@ -12,6 +12,7 @@
 	import Row from './table/Row.svelte'
 	import HighlightTheme from './HighlightTheme.svelte'
 	import { deepEqual } from 'fast-equals'
+	import { isWindmillTooBigObject } from './job_args'
 
 	export let id: string | undefined = undefined
 	export let args: any
@@ -63,7 +64,7 @@ ${Object.entries(args)
 	<div class="relative">
 		<DataTable size="sm">
 			<Head>
-				<tr>
+				<tr class="w-full">
 					<Cell head first>{argLabel ?? 'Arg'}</Cell>
 					<Cell head last>Value</Cell>
 				</tr>
@@ -79,7 +80,7 @@ ${Object.entries(args)
 				</svelte:fragment>
 			</Head>
 
-			<tbody class="divide-y">
+			<tbody class="divide-y w-full">
 				{#if args && Object.keys(args).length > 0}
 					{#each Object.entries(args).sort((a, b) => a[0].localeCompare(b[0])) as [arg, value]}
 						<Row>
@@ -137,7 +138,7 @@ ${Object.entries(args)
 				Copy to clipboard
 			</Button>
 		</svelte:fragment>
-		{#if jsonStr.length > 100000 || (id && workspace && args && typeof args === 'object' && deepEqual( Object.keys(args), ['reason'] ) && args['reason'] == 'WINDMILL_TOO_BIG')}
+		{#if jsonStr.length > 100000 || (id && workspace && args && isWindmillTooBigObject(args))}
 			<div class="text-sm mb-2 text-tertiary">
 				<a
 					download="windmill-args.json"
diff --git a/frontend/src/lib/components/KanidmSetting.svelte b/frontend/src/lib/components/KanidmSetting.svelte
index 4dae1733c9..c15ab6e022 100644
--- a/frontend/src/lib/components/KanidmSetting.svelte
+++ b/frontend/src/lib/components/KanidmSetting.svelte
@@ -61,6 +61,10 @@
 				>
 				<input type="text" placeholder="Base URL" bind:value={baseUrl} />
 			</label>
+			<label class="block pb-2">
+				<span class="text-primary font-semibold text-sm">Custom Name</span>
+				<input type="text" placeholder="Custom Name" bind:value={value['display_name']} />
+			</label>
 			<label class="block pb-2">
 				<span class="text-primary font-semibold text-sm">Client Id</span>
 				<input type="text" placeholder="Client Id" bind:value={value['id']} />
diff --git a/frontend/src/lib/components/KeycloakSetting.svelte b/frontend/src/lib/components/KeycloakSetting.svelte
index dcc347bb2d..214b26d288 100644
--- a/frontend/src/lib/components/KeycloakSetting.svelte
+++ b/frontend/src/lib/components/KeycloakSetting.svelte
@@ -52,6 +52,10 @@
 				>
 				<input type="text" placeholder="yourorg" bind:value={org} />
 			</label>
+			<label class="block pb-2">
+				<span class="text-primary font-semibold text-sm">Custom Name</span>
+				<input type="text" placeholder="Custom Name" bind:value={value['display_name']} />
+			</label>
 			<label class="block pb-2">
 				<span class="text-primary font-semibold text-sm">Client Id</span>
 				<input type="text" placeholder="Client Id" bind:value={value['id']} />
diff --git a/frontend/src/lib/components/Label.svelte b/frontend/src/lib/components/Label.svelte
index 16436ead5f..3d53070c6c 100644
--- a/frontend/src/lib/components/Label.svelte
+++ b/frontend/src/lib/components/Label.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
 	export let label: string | undefined = undefined
+	export let primary = false
 </script>
 
 <div class={$$props.class}>
 	<div class="flex flex-row justify-between items-center w-full">
 		<div class="flex flex-row items-center gap-1">
-			<span class="text-secondary text-sm leading-6">{label}</span>
+			<span class="{primary ? 'text-primary' : 'text-secondary'} text-sm leading-6">{label}</span>
 			<slot name="header" />
 		</div>
 		<slot name="error" />
diff --git a/frontend/src/lib/components/LightweightResourcePicker.svelte b/frontend/src/lib/components/LightweightResourcePicker.svelte
index c5b34f9af9..21954ac1ca 100644
--- a/frontend/src/lib/components/LightweightResourcePicker.svelte
+++ b/frontend/src/lib/components/LightweightResourcePicker.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { ResourceService } from '$lib/gen'
-	import { base } from '$lib/base'
 	import { workspaceStore } from '$lib/stores'
 	import { createEventDispatcher, getContext } from 'svelte'
 	import Select from './apps/svelte-select/lib/index'
@@ -8,7 +7,7 @@
 
 	import DarkModeObserver from './DarkModeObserver.svelte'
 	import { Button, Drawer, DrawerContent } from './common'
-	import { Plus } from 'lucide-svelte'
+	import { Plus, Loader2, Link2Off } from 'lucide-svelte'
 	import type { AppViewerContext } from './apps/types'
 	import { sendUserToast } from '$lib/toast'
 
@@ -31,26 +30,37 @@
 					value: value ?? initialValue,
 					label: value ?? initialValue
 			  }
-			: ''
+			: undefined
 
 	let collection = [valueSelect]
 
+	let loading = true
 	async function loadResources(resourceType: string | undefined) {
-		const nc = (
-			await ResourceService.listResource({
-				workspace: $workspaceStore!,
-				resourceType
-			})
-		).map((x) => ({
-			value: x.path,
-			label: x.path
-		}))
+		loading = true
+		try {
+			const nc = (
+				await ResourceService.listResource({
+					workspace: appViewerContext?.workspace ?? $workspaceStore,
+					resourceType
+				})
+			).map((x) => ({
+				value: x.path,
+				label: x.path
+			}))
 
-		// TODO check if this is needed
-		if (!nc.find((x) => x.value == value) && (initialValue || value)) {
-			nc.push({ value: value ?? initialValue!, label: value ?? initialValue! })
+			// TODO check if this is needed
+			if (!nc.find((x) => x.value == value) && (initialValue || value)) {
+				nc.push({ value: value ?? initialValue!, label: value ?? initialValue! })
+			}
+			collection = nc
+			console.log('collection', collection)
+			if (expressOAuthSetup && nc.length > 0) {
+				value = nc[0].value
+				valueSelect = nc[0]
+			}
+		} finally {
+			loading = false
 		}
-		collection = nc
 	}
 
 	$: $workspaceStore && loadResources(resourceType)
@@ -65,23 +75,6 @@
 		refreshCount += 1
 		open = true
 	}
-
-	function processEvent(event: MessageEvent) {
-		if (event.origin !== window.location.origin) {
-			return
-		}
-
-		if (event.data.type === 'error') {
-			sendUserToast(event.data.error, true)
-		}
-		if (event.data.type === 'refresh') {
-			window.removeEventListener('message', processEvent)
-			value = event.data.detail
-			valueSelect = { value, label: value }
-			drawer?.closeDrawer?.()
-			open = false
-		}
-	}
 </script>
 
 <DarkModeObserver bind:darkMode />
@@ -89,12 +82,23 @@
 {#if expressOAuthSetup}
 	{#if open}
 		{#key refreshCount}
-			<iframe
-				title="App connection"
-				class="w-full h-full hidden"
-				src="{base}/embed_connect?resource_type={resourceType}&workspace={appViewerContext?.workspace ??
-					$workspaceStore}&express=true"
-			/>
+			{#await import('./AppConnectLightweightResourcePicker.svelte') then Module}
+				<Module.default
+					workspace={appViewerContext?.workspace ?? $workspaceStore}
+					{resourceType}
+					express={true}
+					on:error={(e) => {
+						sendUserToast(e.detail, true)
+						open = false
+					}}
+					on:refresh={async (e) => {
+						await loadResources(resourceType)
+						value = e.detail
+						valueSelect = { value, label: value }
+						open = false
+					}}
+				/>
+			{/await}
 		{/key}
 	{/if}
 {:else}
@@ -105,55 +109,120 @@
 			tooltip="Resources represent connections to third party systems. Learn more on how to integrate external APIs."
 			documentationLink="https://www.windmill.dev/docs/integrations/integrations_on_windmill"
 		>
-			<iframe
+			{#await import('./AppConnectLightweightResourcePicker.svelte')}
+				<Loader2 class="animate-spin" />
+			{:then Module}
+				<Module.default
+					workspace={appViewerContext?.workspace ?? $workspaceStore}
+					{resourceType}
+					express={false}
+					on:error={(e) => {
+						sendUserToast(e.detail, true)
+					}}
+					on:refresh={async (e) => {
+						await loadResources(resourceType)
+						value = e.detail
+						valueSelect = { value, label: value }
+						drawer?.closeDrawer?.()
+						open = false
+					}}
+				/>
+			{/await}
+
+			<!-- <iframe
 				title="App connection"
 				class="w-full h-full"
 				src="{base}/embed_connect?resource_type={resourceType}&workspace={appViewerContext?.workspace ??
 					$workspaceStore}&express=false"
-			/>
+			/> -->
 		</DrawerContent>
 	</Drawer>
 {/if}
 
 <div class="flex flex-col w-full items-start">
-	<div class="flex flex-row gap-x-1 w-full">
-		<Select
-			{disabled}
-			portal={!disablePortal}
-			value={valueSelect}
-			on:change={(e) => {
-				value = e.detail.value
-				valueSelect = e.detail
-			}}
-			on:clear={() => {
-				value = undefined
-				valueSelect = ''
-			}}
-			items={collection}
-			class="text-clip grow min-w-0"
-			placeholder="{resourceType ?? 'any'} resource"
-			inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-			containerStyles={darkMode
-				? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-				: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
-		/>
-
-		{#if resourceType}
-			<Button
+	<div class="flex flex-row gap-x-1 w-full justify-between items-center">
+		{#if loading}
+			<Loader2 size={12} class="animate-spin" />
+		{:else if expressOAuthSetup && collection.length < 2}
+			{#if collection.length == 0}
+				<div class="text-2xs text-primary pr-2">Connect {resourceType}</div>
+			{:else if collection.length == 1 && value == collection[0]?.value}
+				<div class="text-2xs text-primary pr-2 flex items-center gap-1">
+					{resourceType} <div class="rounded-full w-2 h-2 bg-green-600 animate-pulse" />
+				</div>
+			{:else}
+				<Button
+					color="light"
+					size="sm"
+					on:click={() => {
+						const item = collection[0]
+						if (item) {
+							value = item.value
+							valueSelect = item
+						}
+					}}>Use existing</Button
+				>
+			{/if}
+		{:else}
+			<Select
 				{disabled}
-				color="light"
-				variant="border"
-				size="xs"
-				on:click={() => {
-					open = true
-					window.removeEventListener('message', processEvent)
-					window.addEventListener('message', processEvent)
-
-					drawer?.openDrawer?.()
+				portal={!disablePortal}
+				value={valueSelect}
+				on:change={(e) => {
+					value = e.detail.value
+					valueSelect = e.detail
 				}}
-				startIcon={{ icon: Plus }}
-				iconOnly
+				on:clear={() => {
+					value = undefined
+					valueSelect = undefined
+				}}
+				items={collection}
+				class="text-clip grow min-w-0"
+				placeholder="{resourceType ?? 'any'} resource"
+				inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
+				containerStyles={darkMode
+					? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
+					: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
 			/>
 		{/if}
+		<div class="flex gap-1 items-center">
+			{#if valueSelect && expressOAuthSetup}
+				<Button
+					{disabled}
+					color="light"
+					variant="contained"
+					size="sm"
+					btnClasses="w-8 px-0.5 py-1.5"
+					iconOnly
+					on:click={async () => {
+						if (valueSelect && valueSelect.label) {
+							value = undefined
+							await ResourceService.deleteResource({
+								workspace: appViewerContext?.workspace ?? $workspaceStore,
+								path: valueSelect.label
+							})
+							await loadResources(resourceType)
+							valueSelect = undefined
+						}
+					}}
+					startIcon={{ icon: Link2Off }}
+				/>
+			{/if}
+			{#if resourceType}
+				<Button
+					{disabled}
+					color="light"
+					variant="contained"
+					btnClasses="w-8 px-0.5 py-1.5"
+					size="sm"
+					on:click={() => {
+						open = true
+						drawer?.openDrawer?.()
+					}}
+					startIcon={{ icon: Plus }}
+					iconOnly
+				/>
+			{/if}
+		</div>
 	</div>
 </div>
diff --git a/frontend/src/lib/components/LogViewer.svelte b/frontend/src/lib/components/LogViewer.svelte
index 9f6ce7eecc..de78eefc52 100644
--- a/frontend/src/lib/components/LogViewer.svelte
+++ b/frontend/src/lib/components/LogViewer.svelte
@@ -28,6 +28,7 @@
 	export let drawerOpen = false
 	export let noMaxH = false
 	export let noAutoScroll = false
+	export let download = true
 
 	// @ts-ignore
 	const ansi_up = new AnsiUp()
@@ -93,7 +94,7 @@
 		loadedFromObjectStore: string,
 		limit: number
 	) {
-		let content = loadedFromObjectStore + jobContent ?? ''
+		let content = loadedFromObjectStore + (jobContent ?? '')
 		if (content.length > limit) {
 			return content.substring(content.length - limit)
 		}
@@ -148,7 +149,7 @@
 <Drawer bind:this={logViewer} bind:open={drawerOpen} size="900px">
 	<DrawerContent title="Expanded Logs" on:close={logViewer.closeDrawer}>
 		<svelte:fragment slot="actions">
-			{#if jobId}
+			{#if jobId && download}
 				<Button
 					href="{base}/api/w/{$workspaceStore}/jobs_u/get_logs/{jobId}"
 					download="windmill_logs_{jobId}.txt"
@@ -196,7 +197,7 @@
 	>
 		<div class="sticky z-10 top-0 right-0 w-full flex flex-row-reverse justify-between text-sm">
 			<div class="flex gap-2 pl-0.5 bg-surface-secondary">
-				{#if jobId}
+				{#if jobId && download}
 					<div class="flex items-center">
 						<a
 							class="text-primary pb-0.5"
diff --git a/frontend/src/lib/components/Login.svelte b/frontend/src/lib/components/Login.svelte
index 7b5699b93f..515470ca54 100644
--- a/frontend/src/lib/components/Login.svelte
+++ b/frontend/src/lib/components/Login.svelte
@@ -55,9 +55,14 @@
 	const providersType = providers.map((p) => p.type as string)
 
 	let showPassword = false
-	let logins: string[] | undefined = undefined
+	let logins: OAuthLogin[] | undefined = undefined
 	let saml: string | undefined = undefined
 
+	type OAuthLogin = {
+		type: string
+		displayName: string
+	}
+
 	async function login(): Promise<void> {
 		if (!email || !password) {
 			sendUserToast('Please fill in both email and password', true)
@@ -144,7 +149,10 @@
 
 	async function loadLogins() {
 		const allLogins = await OauthService.listOauthLogins()
-		logins = allLogins.oauth
+		logins = allLogins.oauth.map(login => ({
+			type: login.type,
+			displayName: login.display_name || login.type
+		}))
 		saml = allLogins.saml
 
 		showPassword = (logins.length == 0 && !saml) || (email != undefined && email.length > 0)
@@ -205,26 +213,26 @@
 				<Skeleton layout={[0.5, [2.375]]} />
 			{/each}
 		{:else}
-			{#each providers as { type, icon, name }}
-				{#if logins?.includes(type)}
+			{#each providers as { type, icon }}
+				{#if logins?.some(login => login.type === type)}
 					<Button
 						color="light"
 						variant="border"
 						startIcon={{ icon, classes: 'h-4' }}
 						on:click={() => storeRedirect(type)}
 					>
-						{name}
+						{logins.find(login => login.type === type)?.displayName}
 					</Button>
 				{/if}
 			{/each}
-			{#each logins.filter((x) => !providersType?.includes(x)) as login}
+			{#each logins.filter((login) => !providersType?.includes(login.type)) as login}
 				<Button
 					color="dark"
 					variant="border"
 					btnClasses="mt-2 w-full !border-gray-300"
-					on:click={() => storeRedirect(login)}
+					on:click={() => storeRedirect(login.type)}
 				>
-					{login}
+					{login.displayName}
 				</Button>
 			{/each}
 		{/if}
diff --git a/frontend/src/lib/components/ManualPopover.svelte b/frontend/src/lib/components/ManualPopover.svelte
index 084c706684..ddeadf79cc 100644
--- a/frontend/src/lib/components/ManualPopover.svelte
+++ b/frontend/src/lib/components/ManualPopover.svelte
@@ -27,7 +27,7 @@
 	<slot />
 </fragment>
 {#if showTooltip}
-	<Portal>
+	<Portal name="manual-popover">
 		<div
 			use:popperContent
 			class={twMerge('z-[901] rounded-lg shadow-md border p-4 bg-surface', $$props.class)}
diff --git a/frontend/src/lib/components/ModulePreview.svelte b/frontend/src/lib/components/ModulePreview.svelte
index d14cd5e5b0..dc6005c92a 100644
--- a/frontend/src/lib/components/ModulePreview.svelte
+++ b/frontend/src/lib/components/ModulePreview.svelte
@@ -32,7 +32,7 @@
 		getContext<FlowEditorContext>('FlowEditorContext')
 
 	// Test
-	let scriptProgress = undefined;
+	let scriptProgress = undefined
 	let testJobLoader: TestJobLoader
 	let testIsLoading = false
 	let testJob: Job | undefined = undefined
@@ -54,7 +54,7 @@
 
 	export async function runTest(args: any) {
 		// Not defined if JobProgressBar not loaded
-		if (jobProgressReset) jobProgressReset();
+		if (jobProgressReset) jobProgressReset()
 
 		const val = mod.value
 		// let jobId: string | undefined = undefined
@@ -75,7 +75,7 @@
 				script.content,
 				script.language,
 				args,
-				$flowStore?.tag ?? script.tag
+				$flowStore?.tag ?? (val.tag_override ? val.tag_override : script.tag)
 			)
 		} else if (val.type == 'flow') {
 			await testJobLoader?.abstractRun(() =>
@@ -103,8 +103,6 @@
 	let forceJson = false
 </script>
 
-
-
 <TestJobLoader
 	toastError={noEditor}
 	on:done={() => jobDone()}
@@ -158,9 +156,14 @@
 				/>
 			</Pane>
 			<Pane size={50} minSize={10} class="text-sm text-tertiary">
-			{#if scriptProgress}
-				<JobProgressBar job={testJob} bind:scriptProgress bind:reset={jobProgressReset} compact={true} />
-			{/if}
+				{#if scriptProgress}
+					<JobProgressBar
+						job={testJob}
+						bind:scriptProgress
+						bind:reset={jobProgressReset}
+						compact={true}
+					/>
+				{/if}
 				{#if testJob != undefined && 'result' in testJob && testJob.result != undefined}
 					<div class="break-words relative h-full p-2">
 						<DisplayResult
@@ -186,7 +189,7 @@
 					<div class="p-2">
 						{#if testIsLoading}
 							{#if !scriptProgress}
-							<Loader2 class="animate-spin" />
+								<Loader2 class="animate-spin" />
 							{/if}
 						{:else}
 							Test to see the result here
diff --git a/frontend/src/lib/components/ModuleStatus.svelte b/frontend/src/lib/components/ModuleStatus.svelte
index b5f4e8b230..c01e793454 100644
--- a/frontend/src/lib/components/ModuleStatus.svelte
+++ b/frontend/src/lib/components/ModuleStatus.svelte
@@ -7,6 +7,7 @@
 
 	export let type: FlowStatusModule['type']
 	export let scheduled_for: Date | undefined
+	export let skipped: boolean = false
 </script>
 
 {#if type == 'WaitingForEvents'}
@@ -28,6 +29,8 @@
 			Job is waiting for an executor
 		{/if}
 	</span>
+{:else if skipped}
+	<Badge color="blue">Skipped</Badge>
 {:else if type == 'Success'}
 	<Badge color="green">Success</Badge>
 {:else if type == 'Failure'}
diff --git a/frontend/src/lib/components/OAuthSetting.svelte b/frontend/src/lib/components/OAuthSetting.svelte
index 9e67ef787c..8277ddf396 100644
--- a/frontend/src/lib/components/OAuthSetting.svelte
+++ b/frontend/src/lib/components/OAuthSetting.svelte
@@ -3,6 +3,7 @@
 	import CollapseLink from './CollapseLink.svelte'
 	import IconedResourceType from './IconedResourceType.svelte'
 	import Toggle from './Toggle.svelte'
+	import { onMount } from 'svelte'
 
 	export let name: string
 	export let value: any
@@ -13,6 +14,21 @@
 	let tenant: string = ''
 	$: name == 'microsoft' && changeTenantId(tenant)
 
+	onMount(() => {
+		try {
+			if (
+				name == 'microsoft' &&
+				value &&
+				value['login_config'] &&
+				typeof value['login_config']['auth_url'] == 'string'
+			) {
+				tenant = value['login_config']['auth_url'].split('/')[3]
+			}
+		} catch (e) {
+			console.error('Could not set tenantId', e)
+		}
+	})
+
 	function changeTenantId(tenant: string) {
 		if (value && tenant) {
 			if (tenant != '') {
@@ -50,6 +66,12 @@
 	>
 	{#if enabled}
 		<div class="p-2 rounded border">
+			{#if name != 'slack'}
+				<label class="block pb-2">
+					<span class="text-primary font-semibold text-sm">Custom Name</span>
+					<input type="text" placeholder="Custom Name" bind:value={value['display_name']} />
+				</label>
+			{/if}
 			<label class="block pb-2">
 				<span class="text-primary font-semibold text-sm">Client Id</span>
 				<input type="text" placeholder="Client Id" bind:value={value['id']} />
@@ -75,14 +97,19 @@
 									bind:value={domain}
 									on:keyup={(e) => {
 										if (domain == '') {
-											value['allowed_domains'] = value['allowed_domains'].filter((d) => d != domain)
+											value['allowed_domains'] = value['allowed_domains']?.filter(
+												(d) => d != domain
+											)
 										}
 									}}
 								/>
 								<button
 									class="text-primary text-xs rounded hover:bg-surface-hover"
 									on:click={() => {
-										value['allowed_domains'] = value['allowed_domains'].filter((d) => d != domain)
+										value['allowed_domains'] = value['allowed_domains']?.filter((d) => d != domain)
+										if (value['allowed_domains'].length == 0) {
+											value['allowed_domains'] = undefined
+										}
 									}}
 								>
 									<X size={14} />
diff --git a/frontend/src/lib/components/ObjectResourceInput.svelte b/frontend/src/lib/components/ObjectResourceInput.svelte
index 305dd4d4dc..90320705e9 100644
--- a/frontend/src/lib/components/ObjectResourceInput.svelte
+++ b/frontend/src/lib/components/ObjectResourceInput.svelte
@@ -11,7 +11,6 @@
 	export let selectFirst = false
 	export let defaultValue: any
 	export let editor: SimpleEditor | undefined = undefined
-
 	function isString(value: any) {
 		return typeof value === 'string' || value instanceof String
 	}
@@ -19,7 +18,7 @@
 	export let path: string = ''
 
 	function resourceToValue() {
-		if (path) {
+		if (path && path != '') {
 			value = `$res:${path}`
 		} else {
 			value = undefined
@@ -50,8 +49,11 @@
 				path = e.detail
 				resourceToValue()
 			}}
+			on:clear
 			bind:value={path}
-			initialValue={defaultValue}
+			initialValue={typeof defaultValue == 'string' && defaultValue.startsWith('$res:')
+				? defaultValue.substr('$res:'.length)
+				: defaultValue}
 			resourceType={format.split('-').length > 1 ? format.substring('resource-'.length) : undefined}
 			{showSchemaExplorer}
 		/>
diff --git a/frontend/src/lib/components/OktaSetting.svelte b/frontend/src/lib/components/OktaSetting.svelte
index 1b01f14173..437a24db64 100644
--- a/frontend/src/lib/components/OktaSetting.svelte
+++ b/frontend/src/lib/components/OktaSetting.svelte
@@ -66,6 +66,10 @@
 					</div>
 				</div>
 			</label>
+			<label class="block pb-2">
+				<span class="text-primary font-semibold text-sm">Custom Name</span>
+				<input type="text" placeholder="Custom Name" bind:value={value['display_name']} />
+			</label>
 			<label class="block pb-2">
 				<span class="text-primary font-semibold text-sm"
 					>Client Id <Tooltip
diff --git a/frontend/src/lib/components/PageHeader.svelte b/frontend/src/lib/components/PageHeader.svelte
index a8ecc28d00..b3c9e10004 100644
--- a/frontend/src/lib/components/PageHeader.svelte
+++ b/frontend/src/lib/components/PageHeader.svelte
@@ -7,10 +7,10 @@
 	export let primary: boolean = true
 </script>
 
-<div class="flex flex-row flex-wrap justify-between pt-6 pb-2 my-4">
+<div class="flex flex-row flex-wrap justify-between pb-2 my-4 mr-2">
 	{#if primary}
 		<span class="flex items-center gap-2">
-			<h1 class="!text-2xl font-semibold leading-6 tracking-tight">{title}</h1>
+			<h1 class="!text-2xl font-semibold whitespace-nowrap leading-6 tracking-tight">{title}</h1>
 			{#if tooltip != '' || documentationLink}
 				<Tooltip {documentationLink}>
 					{tooltip}
diff --git a/frontend/src/lib/components/Path.svelte b/frontend/src/lib/components/Path.svelte
index 0b0314d696..2d112387af 100644
--- a/frontend/src/lib/components/Path.svelte
+++ b/frontend/src/lib/components/Path.svelte
@@ -13,7 +13,8 @@
 		ScheduleService,
 		ScriptService,
 		HttpTriggerService,
-		VariableService
+		VariableService,
+		WebsocketTriggerService
 	} from '$lib/gen'
 	import { superadmin, userStore, workspaceStore } from '$lib/stores'
 	import { createEventDispatcher, getContext } from 'svelte'
@@ -24,8 +25,6 @@
 	import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import FolderEditor from './FolderEditor.svelte'
 	import { random_adj } from './random_positive_adjetive'
-	import Required from './Required.svelte'
-	import Tooltip from './Tooltip.svelte'
 	import { Eye, Folder, Plus, SearchCode, User } from 'lucide-svelte'
 
 	type PathKind =
@@ -37,6 +36,7 @@
 		| 'app'
 		| 'raw_app'
 		| 'http_trigger'
+		| 'websocket_trigger'
 	let meta: Meta | undefined = undefined
 	export let fullNamePlaceholder: string | undefined = undefined
 	export let namePlaceholder = ''
@@ -162,7 +162,7 @@
 				.map((x) => ({
 					name: x,
 					write:
-						($userStore?.folders?.includes(x) == true ?? false) ||
+						$userStore?.folders?.includes(x) == true ||
 						($userStore?.is_admin ?? false) ||
 						($userStore?.is_super_admin ?? false)
 				}))
@@ -220,6 +220,11 @@
 				workspace: $workspaceStore!,
 				path: path
 			})
+		} else if (kind == 'websocket_trigger') {
+			return await WebsocketTriggerService.existsWebsocketTrigger({
+				workspace: $workspaceStore!,
+				path: path
+			})
 		} else {
 			return false
 		}
@@ -233,10 +238,10 @@
 			error = 'This name is not valid'
 			return false
 		} else if (meta.owner == '' && meta.ownerKind == 'folder') {
-			error = 'Folder need to be chosen'
+			error = 'Folder needs to be chosen'
 			return false
 		} else if (meta.owner == '' && meta.ownerKind == 'group') {
-			error = 'Group need to be chosen'
+			error = 'Group needs to be chosen'
 			return false
 		} else {
 			return true
@@ -322,54 +327,54 @@
 <div>
 	<div class="flex flex-col sm:flex-row sm:items-center gap-2 sm:gap-4 pb-0 mb-1">
 		{#if meta != undefined}
-			<div class="flex gap-x-4 shrink">
-				<!-- svelte-ignore a11y-label-has-associated-control -->
-				{#if !hideUser}
-					<div class="block">
-						<span class="text-secondary text-sm whitespace-nowrap">&nbsp;</span>
-
-						<ToggleButtonGroup
-							class="mt-0.5"
-							bind:selected={meta.ownerKind}
-							on:selected={(e) => {
-								setDirty()
-								const kind = e.detail
-								if (meta) {
-									if (kind === 'folder') {
-										meta.owner = folders?.[0]?.name ?? ''
-									} else if (kind === 'group') {
-										meta.owner = 'all'
-									} else {
-										meta.owner = $userStore?.username?.split('@')[0] ?? ''
-									}
+			<!-- svelte-ignore a11y-label-has-associated-control -->
+			{#if !hideUser}
+				<div class="block">
+					<ToggleButtonGroup
+						class="mt-0.5"
+						bind:selected={meta.ownerKind}
+						on:selected={(e) => {
+							setDirty()
+							const kind = e.detail
+							if (meta) {
+								if (kind === 'folder') {
+									meta.owner = folders?.[0]?.name ?? ''
+								} else if (kind === 'group') {
+									meta.owner = 'all'
+								} else {
+									meta.owner = $userStore?.username?.split('@')[0] ?? ''
 								}
-							}}
-						>
-							<ToggleButton
-								icon={User}
-								{disabled}
-								light
-								size="xs"
-								value="user"
-								position="left"
-								label="User"
-							/>
-							<!-- <ToggleButton light size="xs" value="group" position="center">Group</ToggleButton> -->
-							<ToggleButton
-								icon={Folder}
-								{disabled}
-								light
-								size="xs"
-								value="folder"
-								position="right"
-								label="Folder"
-							/>
-						</ToggleButtonGroup>
-					</div>
-				{/if}
+							}
+						}}
+					>
+						<ToggleButton
+							icon={User}
+							{disabled}
+							light
+							size="xs"
+							value="user"
+							position="left"
+							label="User"
+						/>
+						<!-- <ToggleButton light size="xs" value="group" position="center">Group</ToggleButton> -->
+						<ToggleButton
+							icon={Folder}
+							{disabled}
+							light
+							size="xs"
+							value="folder"
+							position="right"
+							label="Folder"
+						/>
+					</ToggleButtonGroup>
+				</div>
+			{/if}
+			{#if !hideUser}
+				<div class="text-xl">/</div>
+			{/if}
+			<div>
 				{#if meta.ownerKind === 'user'}
 					<label class="block shrink min-w-0">
-						<span class="text-secondary text-sm">User</span>
 						<input
 							class="!w-36"
 							type="text"
@@ -381,16 +386,6 @@
 					</label>
 				{:else if meta.ownerKind === 'folder'}
 					<label class="block grow w-48">
-						<span class="text-secondary text-sm">
-							Folder
-							<Tooltip
-								documentationLink="https://www.windmill.dev/docs/core_concepts/groups_and_folders"
-							>
-								Read and write permissions are given to groups and users at the folder level and
-								shared by all items inside the folder.
-							</Tooltip>
-						</span>
-
 						<div class="flex flex-row items-center gap-1 w-full">
 							<select class="grow w-full" {disabled} bind:value={meta.owner}>
 								{#if folders?.length == 0}
@@ -426,14 +421,8 @@
 					</label>
 				{/if}
 			</div>
+			<span class="text-xl">/</span>
 			<label class="block grow w-full max-w-md">
-				<div class="text-secondary text-sm flex items-center gap-1 w-full justify-between">
-					<div>
-						Name
-						<Required required={true} />
-					</div>
-					<div class="text-2xs text-tertiary"> '/' for subfolders </div>
-				</div>
 				<!-- svelte-ignore a11y-autofocus -->
 				<input
 					{disabled}
@@ -473,10 +462,10 @@
 			/>
 			<!-- <span class="font-mono text-sm break-all">{path}</span> -->
 		</div>
-		<div class="text-red-600 dark:text-red-400 text-2xs">{error}</div>
+		<div class="text-red-600 dark:text-red-400 text-2xs mt-1.5">{error}</div>
 	</div>
 
-	{#if kind != 'app' && kind != 'schedule' && kind != 'http_trigger' && initialPath != '' && initialPath != undefined && initialPath != path}
+	{#if kind != 'app' && kind != 'schedule' && kind != 'http_trigger' && kind != 'websocket_trigger' && initialPath != '' && initialPath != undefined && initialPath != path}
 		<Alert type="warning" class="mt-4" title="Moving may break other items relying on it">
 			You are renaming an item that may be depended upon by other items. This may break apps, flows
 			or resources. Find if it used elsewhere using the content search. Note that linked variables
diff --git a/frontend/src/lib/components/Popover.svelte b/frontend/src/lib/components/Popover.svelte
index 7ba0460e31..c7fed6ce71 100644
--- a/frontend/src/lib/components/Popover.svelte
+++ b/frontend/src/lib/components/Popover.svelte
@@ -67,7 +67,7 @@
 	</button>
 {/if}
 {#if showTooltip && !disablePopup}
-	<Portal>
+	<Portal name="popover">
 		<!-- svelte-ignore a11y-no-static-element-interactions -->
 		<div
 			use:popperContent={popperOptions}
diff --git a/frontend/src/lib/components/Portal.svelte b/frontend/src/lib/components/Portal.svelte
index f4dcbc0aea..020a17b236 100644
--- a/frontend/src/lib/components/Portal.svelte
+++ b/frontend/src/lib/components/Portal.svelte
@@ -1,13 +1,8 @@
 <script context="module">
 	import { tick } from 'svelte'
 
-	/**
-	 * Usage: <div use:portal={'css selector'}> or <div use:portal={document.body}>
-	 *
-	 * @param {HTMLElement} el
-	 * @param {HTMLElement|string} target DOM Element or CSS Selector
-	 */
-	export function portal(el, target = 'body') {
+	export function portal(el, options) {
+		let { target, name } = options
 		let targetEl
 		async function update(newTarget) {
 			target = newTarget
@@ -32,6 +27,9 @@
 			if (!el.classList.contains('windmill-app')) {
 				el.classList.add('windmill-app')
 			}
+			if (name && !el.classList.contains(name)) {
+				el.classList.add(name)
+			}
 			targetEl.appendChild(el)
 			el.hidden = false
 		}
@@ -56,8 +54,9 @@
 	 * @type { HTMLElement|string}
 	 */
 	export let target = 'body'
+	export let name = undefined
 </script>
 
-<div use:portal={target} hidden>
+<div use:portal={{ target, name }} hidden>
 	<slot />
 </div>
diff --git a/frontend/src/lib/components/PrimarySchedule.svelte b/frontend/src/lib/components/PrimarySchedule.svelte
new file mode 100644
index 0000000000..18544f760a
--- /dev/null
+++ b/frontend/src/lib/components/PrimarySchedule.svelte
@@ -0,0 +1,86 @@
+<script lang="ts">
+	import { Badge, Button } from './common'
+	import { sendUserToast } from '$lib/toast'
+	import { base } from '$lib/base'
+	import Toggle from './Toggle.svelte'
+	import { ListOrdered, PenBox } from 'lucide-svelte'
+	import JobArgs from './JobArgs.svelte'
+	import Tooltip from './Tooltip.svelte'
+	import ScheduleEditor from './ScheduleEditor.svelte'
+	import { type Schedule } from '$lib/gen'
+
+	export let schedule: any
+	export let can_write: boolean
+	export let path: string
+	export let isFlow: boolean
+	export let scheduleEditor: ScheduleEditor
+	export let setScheduleEnabled: (path: string, enabled: boolean) => void
+
+	$: schedule = typeof schedule === 'boolean' ? undefined : (schedule as Schedule | undefined)
+</script>
+
+<div class="flex flex-col gap-2 grow w-full">
+	<div class="grid grid-cols-3 w-full">
+		<div class="flex justify-start">
+			<Badge color="indigo" small>
+				Primary&nbsp;
+				<Tooltip light>
+					Share the same path as the script or flow it is attached to and its path get renamed
+					whenever the source path is renamed
+				</Tooltip>
+			</Badge>
+		</div>
+		<div class="flex justify-center">
+			<div class="flex flex-row gap-2 items-center">
+				<input
+					size="9"
+					class="!text-xs !h-6 !text-primary"
+					type="text"
+					id="cron-schedule"
+					name="cron-schedule"
+					placeholder="*/30 * * * *"
+					value={schedule?.schedule ?? ''}
+					disabled={true}
+				/>
+				<Toggle
+					checked={schedule?.enabled ?? false}
+					on:change={(e) => {
+						if (can_write) {
+							setScheduleEnabled(path, e.detail)
+						} else {
+							sendUserToast('not enough permission', true)
+						}
+					}}
+					options={{
+						right: 'On'
+					}}
+					size="xs"
+					textClass="text-primary font-normal text-xs"
+				/>
+			</div>
+		</div>
+		<div class="flex justify-end">
+			<div class="flex flex-row gap-2 items-center">
+				<Button size={'xs'} variant="border" color="light" href={`${base}/runs/${path}`}>
+					<span>Runs</span>
+					<ListOrdered size={14} />
+				</Button>
+				<Button
+					size="xs"
+					color="dark"
+					on:click={() => scheduleEditor?.openEdit(path ?? '', isFlow)}
+				>
+					<PenBox size={14} />
+				</Button>
+			</div>
+		</div>
+	</div>
+
+	{#if Object.keys(schedule?.args ?? {}).length > 0}
+		<div class="">
+			<JobArgs args={schedule?.args ?? {}} />
+		</div>
+	{:else}
+		<div class="text-xs text-tertiary"> No arguments </div>
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/QueueMetricsDrawer.svelte b/frontend/src/lib/components/QueueMetricsDrawer.svelte
index 613a75e716..a75caf5ff9 100644
--- a/frontend/src/lib/components/QueueMetricsDrawer.svelte
+++ b/frontend/src/lib/components/QueueMetricsDrawer.svelte
@@ -1,15 +1,429 @@
 <script lang="ts">
-	import { Drawer, DrawerContent } from './common'
-
+	import { onMount } from 'svelte'
+	import { Drawer, DrawerContent, Button } from './common'
 	import QueueMetricsDrawerInner from './QueueMetricsDrawerInner.svelte'
+	import { ConfigService } from '$lib/gen'
+	import Section from './Section.svelte'
+	import { sendUserToast } from '$lib/toast'
+	import { Pencil, Trash, Check, PlusCircle, SaveIcon } from 'lucide-svelte'
+	import Tooltip from './Tooltip.svelte'
+	import { enterpriseLicense } from '$lib/stores'
+
+	function updateChangesMade() {
+		changesMade = JSON.stringify(alerts) !== JSON.stringify(originalAlerts)
+	}
+
+	function handleInput(event) {
+		const target = event.target
+		console.log(target)
+		if (target.tagName.toLowerCase() === 'input') {
+			updateChangesMade()
+		}
+	}
+
+	type Alert = {
+		name: string
+		tags_to_monitor: string[]
+		jobs_num_threshold: number
+		alert_cooldown_seconds: number
+		alert_time_threshold_seconds: number
+	}
+
 	let drawer: Drawer
 	export function openDrawer() {
 		drawer?.openDrawer()
 	}
+
+	let alerts: Alert[] = []
+
+	let configName = 'alert__job_queue_waiting'
+	let originalAlerts: Alert[] = []
+	let newTag = ''
+	let editingIndex = -1
+	let changesMade = false
+	let removedAlerts: Alert[] = []
+	let stagedNewAlert = false
+	let workerTags: string[] = []
+	let filteredTags: string[] = []
+
+	$: removedAlerts
+
+	onMount(async () => {
+		await fetchConfig()
+		workerTags = await fetchWorkerTags()
+	})
+
+	async function fetchConfig() {
+		try {
+			const response = (await ConfigService.getConfig({ name: configName })) as { alerts: Alert[] }
+			alerts = response.alerts || []
+			originalAlerts = JSON.parse(JSON.stringify(alerts))
+		} catch (error) {
+			console.error('Failed to fetch config:', error)
+		}
+	}
+
+	async function fetchWorkerTags(): Promise<string[]> {
+		try {
+			const response = await ConfigService.listConfigs()
+			const workerTagsSet = new Set<string>()
+
+			response.forEach((config) => {
+				if (config.name.startsWith('worker__') && Array.isArray(config.config?.worker_tags)) {
+					config?.config?.worker_tags.forEach((tag) => workerTagsSet.add(tag))
+				}
+			})
+
+			return Array.from(workerTagsSet)
+		} catch (error) {
+			console.error('Failed to fetch worker tags:', error)
+			return []
+		}
+	}
+
+	function startEditing(index) {
+		if (editingIndex !== -1) {
+			const success = saveAlert(editingIndex)
+			if (!success) return
+		}
+		editingIndex = index
+		updateWorkerTags()
+	}
+
+	function saveAlert(index): boolean {
+		const newAlert = alerts[index]
+
+		if (newAlert.tags_to_monitor.length === 0) {
+			sendUserToast('Please add at least one tag before saving.', true)
+			return false
+		}
+
+		if (
+			newAlert.jobs_num_threshold <= 0 ||
+			newAlert.alert_cooldown_seconds <= 0 ||
+			newAlert.alert_time_threshold_seconds <= 0
+		) {
+			sendUserToast('All numeric values must be strictly positive.', true)
+			return false
+		}
+
+		const alertExists = originalAlerts.some(
+			(alert) =>
+				originalAlerts.indexOf(alert) !== index &&
+				JSON.stringify(alert.tags_to_monitor.sort()) ===
+					JSON.stringify(newAlert.tags_to_monitor.sort())
+		)
+
+		if (alertExists) {
+			sendUserToast('You can only define one alert per identical set of tags', true)
+			return false
+		}
+
+		editingIndex = -1
+		updateChangesMade()
+
+		stagedNewAlert = false
+		return true
+	}
+
+	function stageDeleteAlert(index) {
+		const alert = alerts[index]
+		removedAlerts = [...removedAlerts, alert]
+		changesMade =
+			removedAlerts.length > 0 || JSON.stringify(alerts) !== JSON.stringify(originalAlerts)
+	}
+
+	function filterTags(event: Event) {
+		const input = (event.target as HTMLInputElement).value
+		filteredTags = workerTags.filter((tag) => tag.toLowerCase().includes(input.toLowerCase()))
+	}
+
+	function addTag(alertIndex, tag) {
+		if (workerTags.includes(tag) && !alerts[alertIndex].tags_to_monitor.includes(tag)) {
+			alerts[alertIndex].tags_to_monitor = [...alerts[alertIndex].tags_to_monitor, tag]
+		}
+		newTag = ''
+		filteredTags = []
+		updateChangesMade()
+	}
+
+	function removeTag(alertIndex, tag) {
+		alerts[alertIndex].tags_to_monitor = alerts[alertIndex].tags_to_monitor.filter((t) => t !== tag)
+		updateChangesMade()
+	}
+
+	async function applyConfig() {
+		if (editingIndex !== -1) {
+			const success = saveAlert(editingIndex)
+			if (!success) return
+		}
+
+		try {
+			await ConfigService.updateConfig({ name: configName, requestBody: { alerts } })
+			sendUserToast('Configuration updated successfully')
+			alerts = alerts.filter((alert) => !removedAlerts.includes(alert))
+			originalAlerts = JSON.parse(JSON.stringify(alerts))
+			removedAlerts = []
+			changesMade = false
+			stagedNewAlert = false
+			editingIndex = -1
+		} catch (error) {
+			console.error('Failed to update config:', error)
+		}
+	}
+
+	async function cancelChanges() {
+		alerts = [...alerts, ...removedAlerts]
+		alerts = JSON.parse(JSON.stringify(originalAlerts))
+		removedAlerts = []
+		editingIndex = -1
+		changesMade = false
+		stagedNewAlert = false
+	}
+
+	function addNewAlert() {
+		// alert already being added
+		if (stagedNewAlert) {
+			return
+		}
+
+		const newAlert = {
+			name: 'Job Queue Alert',
+			tags_to_monitor: [],
+			jobs_num_threshold: 3,
+			alert_cooldown_seconds: 600,
+			alert_time_threshold_seconds: 30
+		}
+
+		alerts = [...alerts, newAlert]
+		editingIndex = alerts.length - 1
+		stagedNewAlert = true
+		updateChangesMade()
+		updateWorkerTags()
+	}
+
+	async function updateWorkerTags() {
+		workerTags = await fetchWorkerTags()
+	}
+
+	function addAllTags(alertIndex) {
+		alerts[alertIndex].tags_to_monitor = [
+			...new Set([...alerts[alertIndex].tags_to_monitor, ...workerTags])
+		]
+		alerts = [...alerts]
+		updateChangesMade()
+	}
 </script>
 
-<Drawer bind:this={drawer}>
-	<DrawerContent title="Queue Metrics" on:close={drawer.closeDrawer}>
-		<QueueMetricsDrawerInner />
+<Drawer bind:this={drawer} size="800px">
+	<DrawerContent
+		title="Queues"
+		on:close={drawer.closeDrawer}
+		documentationLink="https://www.windmill.dev/docs/core_concepts/worker_groups#queue-metrics"
+	>
+		<Section
+			label="Queue Alert Settings"
+			collapsable={true}
+			tooltip="A critical alert is triggered when the number of jobs in the queue exceeds the set threshold and they have been waiting for at least the specified time. After an alert, no new alerts will be triggered during the cooldown period."
+			eeOnly={true}
+		>
+			{#if $enterpriseLicense}
+				{#if changesMade}
+					<div class="text-red-600 text-xs whitespace-nowrap pb-2">Non applied changes</div>
+				{/if}
+				<div class="flex gap-2 pb-2">
+					<Button color="blue" size="xs" on:click={applyConfig} disabled={!changesMade}>
+						<SaveIcon size={16} /> Apply Config
+					</Button>
+					<Button color="light" size="xs" on:click={cancelChanges} disabled={!changesMade}>
+						Cancel
+					</Button>
+				</div>
+
+				{#if alerts.length > 0}
+					<div>
+						<form on:submit|preventDefault>
+							<table class="w-full border-collapse mb-2 text-xs table-auto">
+								<thead class="bg-gray-200 dark:bg-slate-600 text-left text-xs">
+									<tr>
+										<th class="p-2 w-full">
+											Queue Tags to Monitor
+											<Tooltip markdownTooltip="Queue tags to monitor for this alert." />
+										</th>
+										<th class="p-2 min-w-[65px]">
+											Jobs
+											<Tooltip
+												markdownTooltip="Number of jobs threshold: An alert will be triggered if the number of jobs in the queue exceeds this threshold and they have been waiting for at least the specified time threshold."
+											/>
+										</th>
+										<th class="p-2 min-w-[115px]">
+											Cooldown (s)
+											<Tooltip
+												markdownTooltip="Cooldown period in seconds: This defines the time interval after an alert is triggered during which no additional alerts will be sent."
+											/>
+										</th>
+										<th class="p-2 min-w-[105px]">
+											Time (s)
+											<Tooltip
+												markdownTooltip="Time threshold in seconds: An alert will be triggered if the number of jobs in the queue exceeds the job threshold and they have remained in the queue for at least this duration."
+											/>
+										</th>
+										<th class="p-2 min-w-[100px]"> Actions </th>
+									</tr>
+								</thead>
+								<tbody on:input={handleInput}>
+									{#each alerts as alert, index}
+										<tr
+											class={removedAlerts.includes(alert)
+												? 'bg-red-100 dark:bg-red-900 pointer-events-none opacity-50'
+												: ''}
+										>
+											<td class="border p-2">
+												{#if editingIndex === index}
+													<div class="flex flex-wrap gap-1 mb-2">
+														{#each alert.tags_to_monitor as tag}
+															<span
+																class="inline-block bg-blue-100 dark:bg-blue-700 rounded px-2 py-1 text-xs"
+															>
+																{tag}
+																<button
+																	on:click={() => removeTag(index, tag)}
+																	aria-label="Remove Tag"
+																	class="ml-1 text-xs">x</button
+																>
+															</span>
+														{/each}
+													</div>
+													<div class="flex items-center">
+														<input
+															type="text"
+															bind:value={newTag}
+															placeholder="{workerTags.length === alert.tags_to_monitor.length ? 'All tags already added' : 'Add tag from dropdown' }"
+															on:input={(e) => filterTags(e)}
+															disabled={workerTags.length === alert.tags_to_monitor.length}
+															class="p-1 flex-grow mr-1"
+														/>
+														<button on:click={() => addTag(index, newTag)} aria-label="Add Tag">
+															<PlusCircle size={16} />
+														</button>
+													</div>
+													<!-- Add the new "Add All Tags" button here -->
+													<button
+														on:click={() => addAllTags(index)}
+														class="text-xs hover:bg-gray-200 dark:hover:bg-gray-700 rounded px-2 py-1 mt-1"
+														disabled={workerTags.length === alert.tags_to_monitor.length}
+													>
+														Add All Tags
+													</button>
+													{#if filteredTags.length > 0}
+														<ul
+															class="autocomplete-list border max-h-36 overflow-y-auto absolute z-50"
+														>
+															{#each filteredTags as tag}
+																{#if !alert.tags_to_monitor.includes(tag)}
+																<li>
+																	<button
+																		type="button"
+																		class="w-full text-left p-2 cursor-pointer hover:bg-slate-200 dark:hover:bg-slate-700"
+																		on:click={() => addTag(index, tag)}
+																	>
+																		{tag}
+																	</button>
+																</li>
+																{/if}
+															{/each}
+														</ul>
+													{/if}
+												{:else}
+													<div class="flex flex-wrap gap-1">
+														{#each alert.tags_to_monitor as tag}
+															<span
+																class="inline-block bg-blue-100 dark:bg-blue-700 rounded px-2 py-1 text-xs"
+																>{tag}</span
+															>
+														{/each}
+													</div>
+												{/if}
+											</td>
+											<td class="border p-2">
+												{#if editingIndex === index}
+													<input
+														type="number"
+														bind:value={alert.jobs_num_threshold}
+														class="w-full p-1"
+													/>
+												{:else}
+													{alert.jobs_num_threshold}
+												{/if}
+											</td>
+											<td class="border p-2">
+												{#if editingIndex === index}
+													<input
+														type="number"
+														bind:value={alert.alert_cooldown_seconds}
+														class="w-full p-1"
+													/>
+												{:else}
+													{alert.alert_cooldown_seconds}
+												{/if}
+											</td>
+											<td class="border p-2">
+												{#if editingIndex === index}
+													<input
+														type="number"
+														bind:value={alert.alert_time_threshold_seconds}
+														class="w-full p-1"
+													/>
+												{:else}
+													{alert.alert_time_threshold_seconds}
+												{/if}
+											</td>
+											<td class="border p-2">
+												<div class="flex gap-3 justify-center items-center">
+													{#if editingIndex === index}
+														<button on:click={() => saveAlert(index)} aria-label="Save">
+															<Check size={16} />
+														</button>
+													{:else}
+														<button on:click={() => startEditing(index)} aria-label="Edit">
+															<Pencil size={16} />
+														</button>
+														<button on:click={() => stageDeleteAlert(index)} aria-label="Delete">
+															<Trash size={16} />
+														</button>
+													{/if}
+												</div>
+											</td>
+										</tr>
+									{/each}
+								</tbody>
+							</table>
+						</form>
+					</div>
+				{/if}
+
+				<!-- Button to Add New Alert at the Bottom of the Table -->
+				<div class="flex">
+					<Button color="blue" size="xs" on:click={addNewAlert}>
+						<PlusCircle size={16} />
+						Add New Alert
+					</Button>
+				</div>
+			{:else}
+				<p class="text-sm">
+					Queue Metric Alerts are an enterprise feature allowing you to monitor queues for waiting
+					jobs. Please upgrade to access this functionality.
+					<a
+						href="https://www.windmill.dev/docs/misc/plans_details"
+						target="_blank"
+						class="text-blue-500 underline">Learn more about our plans.</a
+					>
+				</p>
+			{/if}
+		</Section>
+		<h1 class="pt-4">Queue Metrics</h1>
+		<div class="p-8">
+			<QueueMetricsDrawerInner />
+		</div>
 	</DrawerContent>
 </Drawer>
diff --git a/frontend/src/lib/components/ResourceEditor.svelte b/frontend/src/lib/components/ResourceEditor.svelte
index 42c299267d..e6bd21e40b 100644
--- a/frontend/src/lib/components/ResourceEditor.svelte
+++ b/frontend/src/lib/components/ResourceEditor.svelte
@@ -86,7 +86,7 @@
 			sendUserToast(`Updated resource at ${path}`)
 			dispatch('refresh', path)
 		} else {
-			throw Error('Cannot edit undefined resourceToEdit')
+			throw Error('Cannot edit undefined resource')
 		}
 	}
 
@@ -231,11 +231,10 @@
 				<Skeleton layout={[[4]]} />
 			{:else if !viewJsonSchema && resourceSchema && resourceSchema?.properties}
 				{#if resourceTypeInfo?.format_extension}
-						<h5 class="mt-4 inline-flex items-center gap-4 pb-2">
-							File content ({resourceTypeInfo.format_extension})
-						</h5>
+					<h5 class="mt-4 inline-flex items-center gap-4 pb-2">
+						File content ({resourceTypeInfo.format_extension})
+					</h5>
 					<div class="h-full w-full border p-1 rounded">
-
 						<SimpleEditor
 							autoHeight
 							class="editor"
diff --git a/frontend/src/lib/components/ResourcePicker.svelte b/frontend/src/lib/components/ResourcePicker.svelte
index a3234f37b8..4942ec3014 100644
--- a/frontend/src/lib/components/ResourcePicker.svelte
+++ b/frontend/src/lib/components/ResourcePicker.svelte
@@ -40,7 +40,7 @@
 	let collection = valueSelect ? [valueSelect] : []
 
 	export async function askNewResource() {
-		appConnect?.open?.(resourceType, expressOAuthSetup)
+		appConnect?.open?.(resourceType)
 	}
 
 	let loading = true
@@ -101,6 +101,7 @@
 		}
 	}}
 	bind:this={appConnect}
+	{expressOAuthSetup}
 />
 
 <ResourceEditorDrawer
@@ -116,7 +117,7 @@
 />
 
 <div class="flex flex-col w-full items-start">
-	<div class="flex flex-row gap-x-1 w-full items-center">
+	<div class="flex flex-row w-full items-center">
 		{#if collection?.length > 0}
 			<Select
 				{disabled}
@@ -128,9 +129,11 @@
 					valueSelect = e.detail
 				}}
 				on:clear={() => {
+					initialValue = undefined
 					value = undefined
 					valueType = undefined
 					valueSelect = undefined
+					dispatch('clear')
 				}}
 				items={collection}
 				class="text-clip grow min-w-0"
@@ -143,14 +146,15 @@
 		{:else if !loading}
 			<div class="text-2xs text-tertiary mr-2">0 found</div>
 		{/if}
-
 		{#if !loading}
+			<div class="mx-0.5" />
 			{#if value && value != ''}
 				<Button
 					{disabled}
 					color="light"
-					variant="border"
-					size="xs"
+					variant="contained"
+					size="sm"
+					btnClasses="w-8 px-0.5 py-1.5"
 					on:click={() => resourceEditor?.initEdit?.(value ?? '')}
 					startIcon={{ icon: Pen }}
 					iconOnly
@@ -162,8 +166,9 @@
 					<Button
 						{disabled}
 						color="light"
-						variant="border"
-						size="xs"
+						variant="contained"
+						size="sm"
+						btnClasses="w-8 px-0.5 py-1.5"
 						on:click={() => appConnect?.open?.(rt)}
 						startIcon={{ icon: Plus }}>{rt}</Button
 					>
@@ -173,8 +178,8 @@
 					{disabled}
 					color="light"
 					variant="border"
-					size="xs"
-					on:click={() => appConnect?.open?.(resourceType, expressOAuthSetup)}
+					size="sm"
+					on:click={() => appConnect?.open?.(resourceType)}
 					startIcon={{ icon: Plus }}
 					iconOnly={collection?.length > 0}
 					>{#if collection?.length == 0}
@@ -185,9 +190,10 @@
 		{/if}
 
 		<Button
-			variant="border"
+			variant="contained"
 			color="light"
-			size="xs"
+			btnClasses="w-8 px-0.5 py-1.5"
+			size="sm"
 			on:click={() => {
 				loadResources(resourceType)
 			}}
diff --git a/frontend/src/lib/components/ResultJobLoader.svelte b/frontend/src/lib/components/ResultJobLoader.svelte
index 4510aedff9..8b117fe255 100644
--- a/frontend/src/lib/components/ResultJobLoader.svelte
+++ b/frontend/src/lib/components/ResultJobLoader.svelte
@@ -15,7 +15,7 @@
 
 	const dispatch = createEventDispatcher()
 
-	$: workspace = workspaceOverride ?? $workspaceStore
+	$: workspace = workspaceOverride ?? $workspaceStore!
 
 	let syncIteration: number = 0
 	let errorIteration = 0
@@ -76,7 +76,7 @@
 		return abstractRun(
 			() =>
 				JobService.runScriptByPath({
-					workspace: $workspaceStore!,
+					workspace: workspace,
 					path: path,
 					requestBody: args,
 					skipPreprocessor: true
@@ -93,7 +93,7 @@
 		return abstractRun(
 			() =>
 				JobService.runScriptByHash({
-					workspace: $workspaceStore!,
+					workspace: workspace,
 					hash: hash,
 					requestBody: args,
 					skipPreprocessor: true
@@ -110,7 +110,7 @@
 		return abstractRun(
 			() =>
 				JobService.runFlowByPath({
-					workspace: $workspaceStore!,
+					workspace: workspace,
 					path: path ?? '',
 					requestBody: args,
 					skipPreprocessor: true
@@ -130,7 +130,7 @@
 		return abstractRun(
 			() =>
 				JobService.runScriptPreview({
-					workspace: $workspaceStore!,
+					workspace: workspace,
 					requestBody: {
 						path,
 						content: code,
@@ -154,7 +154,7 @@
 			currentId = undefined
 			try {
 				await JobService.cancelQueuedJob({
-					workspace: $workspaceStore ?? '',
+					workspace: workspace ?? '',
 					id,
 					requestBody: {}
 				})
diff --git a/frontend/src/lib/components/RunChart.svelte b/frontend/src/lib/components/RunChart.svelte
index 3898bded6d..e976fd3351 100644
--- a/frontend/src/lib/components/RunChart.svelte
+++ b/frontend/src/lib/components/RunChart.svelte
@@ -249,6 +249,7 @@
 			if (canSelect) {
 				const ids = u.map((j) => data.datasets[j.datasetIndex].data[j.index].id)
 				selectedIds = ids
+				dispatch('pointClicked', ids)
 			}
 		},
 
diff --git a/frontend/src/lib/components/RunForm.svelte b/frontend/src/lib/components/RunForm.svelte
index 6a759b762d..7c605b43e2 100644
--- a/frontend/src/lib/components/RunForm.svelte
+++ b/frontend/src/lib/components/RunForm.svelte
@@ -107,7 +107,7 @@
 						<div class="flex items-center gap-2">
 							<span class="text-sm text-tertiary">
 								{#if runnable}
-									Edited <TimeAgo withDate agoOnlyIfRecent date={runnable.created_at || ''} /> by {runnable.created_by ||
+									Edited <TimeAgo agoOnlyIfRecent date={runnable.created_at || ''} /> by {runnable.created_by ||
 										'unknown'}
 								{/if}
 							</span>
diff --git a/frontend/src/lib/components/RunPageSchedules.svelte b/frontend/src/lib/components/RunPageSchedules.svelte
index 5ca250f3cc..45e081bcbc 100644
--- a/frontend/src/lib/components/RunPageSchedules.svelte
+++ b/frontend/src/lib/components/RunPageSchedules.svelte
@@ -1,178 +1,304 @@
 <script lang="ts">
 	import ScheduleEditor from './ScheduleEditor.svelte'
-	import { Badge, Button } from './common'
+	import { Button } from './common'
 	import { workspaceStore } from '$lib/stores'
 	import { ScheduleService, type Schedule } from '$lib/gen'
-	import { sendUserToast } from '$lib/toast'
-	import { base } from '$lib/base'
-	import Toggle from './Toggle.svelte'
-	import { ListOrdered, Calendar, PenBox } from 'lucide-svelte'
-	import JobArgs from './JobArgs.svelte'
+	import { Calendar, Trash, Save } from 'lucide-svelte'
 	import Skeleton from './common/skeleton/Skeleton.svelte'
-	import Tooltip from './Tooltip.svelte'
+	import Label from '$lib/components/Label.svelte'
+	import { getContext } from 'svelte'
+	import type { ScheduleTrigger, TriggerContext } from './triggers'
+	import CronInput from './CronInput.svelte'
+	import SchemaForm from './SchemaForm.svelte'
+	import { emptyString, sendUserToast } from '$lib/utils'
+	import Toggle from './Toggle.svelte'
 
+	export let schema: any
 	export let isFlow: boolean
 	export let path: string
 	export let can_write: boolean
+	export let newItem: boolean = false
+
+	const { primarySchedule, triggersCount } = getContext<TriggerContext>('TriggerContext')
 
 	let scheduleEditor: ScheduleEditor
 
-	let schedule: Schedule | false | undefined = undefined
+	$: loadSchedules(false) || path
+
 	let schedules: Schedule[] | undefined = undefined
-
-	$: path && loadSchedule()
-	$: path && loadSchedules()
-
-	async function loadSchedule() {
-		try {
-			let exists = await ScheduleService.existsSchedule({
-				workspace: $workspaceStore ?? '',
-				path
-			})
-			if (exists) {
-				schedule = await ScheduleService.getSchedule({
-					workspace: $workspaceStore ?? '',
-					path
-				})
-			} else {
-				schedule = false
+	let initialPrimarySchedule: ScheduleTrigger | false | undefined = undefined
+	async function loadSchedules(forceRefresh: boolean) {
+		if (!path || path == '') {
+			schedules = []
+			if ($primarySchedule == undefined) {
+				$primarySchedule = false
 			}
-		} catch (e) {
-			console.log('no primary schedule')
+			initialPrimarySchedule = structuredClone($primarySchedule)
+			return
 		}
-	}
-
-	async function loadSchedules() {
 		try {
-			schedules = (
-				await ScheduleService.listSchedules({
-					workspace: $workspaceStore ?? '',
-					path,
-					isFlow
-				})
-			).filter((s) => s.path != path)
-		} catch (e) {
-			console.error('impossible to load schedules')
-		}
-	}
-
-	async function setScheduleEnabled(path: string, enabled: boolean): Promise<void> {
-		try {
-			await ScheduleService.setScheduleEnabled({
-				path,
-				workspace: $workspaceStore!,
-				requestBody: { enabled }
+			const allSchedules = await ScheduleService.listSchedules({
+				workspace: $workspaceStore ?? '',
+				path: path,
+				isFlow
 			})
-			loadSchedule()
+			const primary = allSchedules.find((s) => s.path == path)
+			let remotePrimarySchedule = primary
+				? {
+						summary: primary.summary,
+						args: primary.args ?? {},
+						cron: primary.schedule,
+						timezone: primary.timezone,
+						enabled: primary.enabled
+				  }
+				: false
+			if ($primarySchedule == undefined || forceRefresh) {
+				$primarySchedule = remotePrimarySchedule
+			}
+			initialPrimarySchedule = structuredClone(remotePrimarySchedule)
 
-			sendUserToast(`Schedule ${enabled ? 'enabled' : 'disabled'}`)
-		} catch (err) {
-			sendUserToast(`Cannot ` + (enabled ? 'disable' : 'enable') + ` schedule: ${err}`, true)
-			loadSchedule()
+			$triggersCount = {
+				...($triggersCount ?? {}),
+				schedule_count: allSchedules.length,
+				primary_schedule: $primarySchedule ? { schedule: $primarySchedule.cron } : undefined
+			}
+			schedules = allSchedules.filter((s) => s.path != path)
+		} catch (e) {
+			console.error('impossible to load schedules', e)
 		}
 	}
+
+	async function save() {
+		const scheduleExists =
+			path != '' &&
+			!newItem &&
+			(await ScheduleService.existsSchedule({
+				workspace: $workspaceStore!,
+				path
+			}))
+		if (scheduleExists) {
+			console.log('primary schedule exists')
+			if ($primarySchedule) {
+				await ScheduleService.updateSchedule({
+					workspace: $workspaceStore!,
+					path,
+					requestBody: {
+						summary: $primarySchedule.summary,
+						args: $primarySchedule.args,
+						schedule: $primarySchedule.cron,
+						timezone: $primarySchedule.timezone
+					}
+				})
+				sendUserToast(`Primary schedule updated`)
+			} else {
+				await ScheduleService.deleteSchedule({ workspace: $workspaceStore!, path })
+				sendUserToast(`Primary schedule deleted`)
+			}
+		} else {
+			if ($primarySchedule) {
+				await ScheduleService.createSchedule({
+					workspace: $workspaceStore!,
+					requestBody: {
+						path,
+						script_path: path,
+						is_flow: isFlow,
+						summary: $primarySchedule.summary,
+						args: $primarySchedule.args,
+						schedule: $primarySchedule.cron,
+						timezone: $primarySchedule.timezone,
+						enabled: $primarySchedule.enabled
+					}
+				})
+				sendUserToast(`Primary schedule created`)
+			}
+		}
+		loadSchedules(true)
+	}
 </script>
 
 <ScheduleEditor
 	on:update={() => {
-		loadSchedule()
-		loadSchedules()
+		loadSchedules(true)
 	}}
 	bind:this={scheduleEditor}
 />
 
-<div class="p-2 flex flex-col">
-	<Button
-		on:click={() => scheduleEditor?.openNew(isFlow, path)}
-		variant="border"
-		color="light"
-		size="xs"
-		startIcon={{ icon: Calendar }}
-	>
-		New Schedule
-	</Button>
-</div>
+<div class="flex flex-col gap-4 w-full">
+	{#if $primarySchedule == undefined}
+		<Skeleton layout={[[12]]} />
+	{:else if $primarySchedule}
+		<div class="w-full flex flex-col mb-4">
+			{#if can_write}
+				<div class="w-full flex-row-reverse flex mb-2">
+					<div class="flex flex-row gap-4">
+						<Button
+							on:click={() => {
+								$primarySchedule = false
+								$triggersCount = {
+									...($triggersCount ?? {}),
+									schedule_count: ($triggersCount?.schedule_count ?? 1) - 1,
+									primary_schedule: undefined
+								}
+							}}
+							variant="border"
+							color="light"
+							size="xs"
+							startIcon={{ icon: Trash }}
+						/>
+						{#if initialPrimarySchedule && !newItem}
+							<Toggle
+								disabled={emptyString($primarySchedule.cron)}
+								bind:checked={$primarySchedule.enabled}
+								options={{
+									right: 'Enabled'
+								}}
+								on:change={async (e) => {
+									if (!newItem) {
+										await ScheduleService.setScheduleEnabled({
+											path: path,
+											workspace: $workspaceStore ?? '',
+											requestBody: { enabled: e.detail }
+										})
 
-{#if schedule}
-	<div class="p-2 flex flex-col gap-2">
-		<div class="flex flex-row justify-between h-8">
-			<div class="flex flex-row gap-2 items-center">
-				<input
-					class="inline-block !w-32"
-					type="text"
-					id="cron-schedule"
-					name="cron-schedule"
-					placeholder="*/30 * * * *"
-					value={schedule.schedule}
-					disabled={true}
-				/>
-				<div>
-					<Badge color="indigo" small
-						>Primary&nbsp;<Tooltip light
-							>Share the same path as the script or flow it is attached to and its path get renamed
-							whenever the source path is renamed</Tooltip
-						></Badge
-					>
-				</div>
-			</div>
-			<div class="flex flex-row gap-2 items-center">
-				<Toggle
-					checked={schedule.enabled}
-					on:change={(e) => {
-						if (can_write) {
-							setScheduleEnabled(path, e.detail)
-						} else {
-							sendUserToast('not enough permission', true)
-						}
-					}}
-					options={{
-						right: 'On'
-					}}
-					size="xs"
-				/>
-				<Button size="xs" variant="border" color="light" href={`${base}/runs/${path}`}>
-					<div class="flex flex-row gap-2">
-						<ListOrdered size={14} />
-						Runs
+										sendUserToast(`${e.detail ? 'enabled' : 'disabled'} schedule ${path}`)
+									}
+								}}
+							/>
+						{/if}
+
+						{#if !newItem}
+							<Button
+								on:click={save}
+								color="dark"
+								size="sm"
+								startIcon={{ icon: Save }}
+								disabled={JSON.stringify({ ...$primarySchedule, enabled: true }) ==
+									JSON.stringify({ ...initialPrimarySchedule, enabled: true })}
+								>Apply changes now</Button
+							>
+						{:else}
+							<div class="text-sm text-secondary mt-1 text-center"
+								>Deployed automatically with {isFlow ? 'flow' : 'script'}</div
+							>
+						{/if}
 					</div>
-				</Button>
-				<Button
-					size="xs"
-					color="dark"
-					on:click={() => scheduleEditor?.openEdit(path ?? '', isFlow)}
-				>
-					<PenBox size={14} />
-				</Button>
-			</div>
-		</div>
-		{#if Object.keys(schedule?.args ?? {}).length > 0}
-			<div class="">
-				<JobArgs args={schedule.args ?? {}} />
-			</div>
-		{:else}
-			<div class="text-xs texg-gray-700"> No arguments </div>
-		{/if}
-	</div>
-{:else if schedule == undefined}
-	<Skeleton layout={[[6]]} />
-{/if}
-
-<h3 class="px-2 pt-4">Other schedules</h3>
-
-{#if schedules}
-	{#if schedules.length == 0}
-		<div class="text-xs text-secondary px-2"> No other schedules </div>
-	{:else}
-		<div class="flex flex-col divide-y px-2 pt-2">
-			{#each schedules as schedule (schedule.path)}
-				<div class="grid grid-cols-6 text-2xs items-center py-2"
-					><div class="col-span-3 truncate">{schedule.path}</div><div>{schedule.schedule}</div>
-					<div>{schedule.enabled ? 'on' : 'off'}</div>
-					<button on:click={() => scheduleEditor?.openEdit(schedule.path, isFlow)}>Edit</button>
 				</div>
-			{/each}
+			{/if}
+
+			<!-- svelte-ignore a11y-autofocus -->
+			<div class="mt-5">
+				<Label label="Summary" class="font-semibold" primary>
+					<input
+						autofocus
+						type="text"
+						placeholder="Short summary to be displayed when listed"
+						class="text-sm w-full"
+						bind:value={$primarySchedule.summary}
+					/>
+				</Label>
+			</div>
 		</div>
+		<CronInput bind:schedule={$primarySchedule.cron} bind:timezone={$primarySchedule.timezone} />
+		<SchemaForm {schema} bind:args={$primarySchedule.args} />
+		{#if emptyString($primarySchedule.cron)}
+			<p class="text-xs text-tertiary mt-10">Define a schedule frequency first</p>
+		{/if}
+
+		{#if initialPrimarySchedule != false}
+			<div class="flex">
+				<Button size="xs" color="light" on:click={() => scheduleEditor?.openEdit(path, isFlow)}
+					>Advanced</Button
+				>
+			</div>
+		{/if}
+	{:else}
+		<div class="flex flex-row gap-4 mt-2">
+			<Button
+				on:click={() => {
+					$primarySchedule = {
+						summary: '',
+						args: {},
+						cron: '0 0 */1 * * *',
+						timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+						enabled: true
+					}
+					$triggersCount = {
+						...($triggersCount ?? {}),
+						schedule_count: ($triggersCount?.schedule_count ?? 0) + 1,
+						primary_schedule: { schedule: $primarySchedule.cron }
+					}
+				}}
+				variant="contained"
+				color="dark"
+				size="md"
+				startIcon={{ icon: Calendar }}
+			>
+				Set Primary Schedule
+			</Button>
+			{#if initialPrimarySchedule != undefined && initialPrimarySchedule != false && !newItem}
+				<Button on:click={save} color="dark" size="md" startIcon={{ icon: Save }}>
+					Apply changes now
+				</Button>
+			{:else}
+				<div class="text-sm text-center text-secondary mt-2"
+					>Deployed automatically with {isFlow ? 'flow' : 'script'}</div
+				>
+			{/if}
+		</div>
+
+		<Label label="Summary" class="font-semibold" primary>
+			<input
+				type="text"
+				disabled
+				placeholder="Short summary to be displayed when listed"
+				class="text-sm w-full"
+			/>
+		</Label>
+		<CronInput schedule={''} disabled timezone={Intl.DateTimeFormat().resolvedOptions().timeZone} />
+
+		<SchemaForm disabled {schema} />
 	{/if}
-{:else}
-	<Skeleton layout={[[8]]} />
-{/if}
+
+	{#if !newItem}
+		<div class="mt-10" />
+		{#if $primarySchedule}
+			<Button
+				on:click={() => scheduleEditor?.openNew(isFlow, path)}
+				variant="border"
+				color="light"
+				size="xs"
+				startIcon={{ icon: Calendar }}
+			>
+				New Schedule
+			</Button>
+		{/if}
+
+		<Label label="Other schedules">
+			{#if schedules}
+				{#if schedules?.length == 0 || schedules == undefined}
+					<div class="text-xs text-tertiary"> No other schedules </div>
+				{:else}
+					<div class="flex flex-col divide-y">
+						{#each schedules as schedule (schedule.path)}
+							<div class="grid grid-cols-6 text-xs items-center py-2">
+								<div class="col-span-3 truncate">{schedule.path}</div>
+								<div class="col-span-2 flex flex-row gap-4 flex-nowrap">
+									<div>{schedule.schedule}</div>
+									<div>{schedule.enabled ? 'on' : 'off'}</div>
+								</div>
+								<div class="flex justify-end">
+									<button
+										on:click={() => scheduleEditor?.openEdit(schedule.path, isFlow)}
+										class="px-2">Edit</button
+									>
+								</div>
+							</div>
+						{/each}
+					</div>
+				{/if}
+			{:else}
+				<Skeleton layout={[[8]]} />
+			{/if}
+		</Label>
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/SavedInputs.svelte b/frontend/src/lib/components/SavedInputs.svelte
index 33409d7d9c..09ccc321ec 100644
--- a/frontend/src/lib/components/SavedInputs.svelte
+++ b/frontend/src/lib/components/SavedInputs.svelte
@@ -364,7 +364,7 @@
 									<div
 										class="whitespace-nowrap col-span-3 !text-tertiary !text-2xs overflow-hidden text-ellipsis flex-shrink text-center"
 									>
-										<TimeAgo date={i.started_at ?? ''} />
+										<TimeAgo noDate date={i.started_at ?? ''} />
 									</div>
 									<div class="col-span-2">
 										<a
@@ -425,7 +425,7 @@
 									<div
 										class="whitespace-nowrap col-span-2 !text-tertiary !text-2xs overflow-hidden text-ellipsis flex-shrink text-center"
 									>
-										<TimeAgo date={i.created_at ?? ''} />
+										<TimeAgo noDate date={i.created_at ?? ''} />
 									</div>
 									<div class="col-span-1">
 										<a
diff --git a/frontend/src/lib/components/ScheduleEditorInner.svelte b/frontend/src/lib/components/ScheduleEditorInner.svelte
index 3980301d27..8622fffea3 100644
--- a/frontend/src/lib/components/ScheduleEditorInner.svelte
+++ b/frontend/src/lib/components/ScheduleEditorInner.svelte
@@ -520,13 +520,14 @@
 						<Toggle
 							disabled={!can_write}
 							checked={enabled}
-							options={{ right: 'enable', left: 'disable' }}
+							options={{ right: 'Enabled' }}
 							on:change={async (e) => {
 								await ScheduleService.setScheduleEnabled({
 									path: initialPath,
 									workspace: $workspaceStore ?? '',
 									requestBody: { enabled: e.detail }
 								})
+								dispatch('update')
 								sendUserToast(`${e.detail ? 'enabled' : 'disabled'} schedule ${initialPath}`)
 							}}
 						/>
diff --git a/frontend/src/lib/components/SchemaForm.svelte b/frontend/src/lib/components/SchemaForm.svelte
index 6068cda7fc..bbd226d0ae 100644
--- a/frontend/src/lib/components/SchemaForm.svelte
+++ b/frontend/src/lib/components/SchemaForm.svelte
@@ -120,6 +120,7 @@
 				schema.properties = n
 			}
 			let nkeys = Object.keys(schema.properties ?? {})
+
 			if (!deepEqual(keys, nkeys)) {
 				keys = nkeys
 				dispatch('change')
diff --git a/frontend/src/lib/components/SchemaViewer.svelte b/frontend/src/lib/components/SchemaViewer.svelte
index 4239525fd9..cd9f43d398 100644
--- a/frontend/src/lib/components/SchemaViewer.svelte
+++ b/frontend/src/lib/components/SchemaViewer.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { Schema } from '$lib/common'
-	import { emptySchema } from '$lib/utils'
+	import { copyToClipboard, emptySchema } from '$lib/utils'
 
 	import Highlight from 'svelte-highlight'
 	import json from 'svelte-highlight/languages/json'
@@ -10,6 +10,8 @@
 	import Tabs from './common/tabs/Tabs.svelte'
 	import { Badge } from './common'
 	import HighlightTheme from './HighlightTheme.svelte'
+	import Button from './common/button/Button.svelte'
+	import { ClipboardCopy } from 'lucide-svelte'
 
 	export let schema: Schema | undefined | any = emptySchema()
 
@@ -79,7 +81,19 @@
 					{/if}
 				</TabContent>
 				<TabContent value="advanced">
-					<Highlight language={json} code={JSON.stringify(schema, null, 4)} />
+					<div class="h-full relative">
+						<Button
+							wrapperClasses="absolute top-2 right-2 z-20"
+							on:click={() => copyToClipboard(JSON.stringify(schema, null, 4))}
+							color="light"
+							size="xs2"
+							startIcon={{
+								icon: ClipboardCopy
+							}}
+							iconOnly
+						/>
+						<Highlight language={json} code={JSON.stringify(schema, null, 4)} />
+					</div>
 				</TabContent>
 			</div>
 		</svelte:fragment>
diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte
index 766a733fab..8c2af724ff 100644
--- a/frontend/src/lib/components/ScriptBuilder.svelte
+++ b/frontend/src/lib/components/ScriptBuilder.svelte
@@ -5,7 +5,8 @@
 		ScriptService,
 		type NewScriptWithDraft,
 		ScheduleService,
-		type Script
+		type Script,
+		type TriggersCount
 	} from '$lib/gen'
 	import { inferArgs } from '$lib/infer'
 	import { initialCode } from '$lib/script_helpers'
@@ -16,7 +17,8 @@
 		emptyString,
 		encodeState,
 		formatCron,
-		orderedJsonStringify
+		orderedJsonStringify,
+		type Value
 	} from '$lib/utils'
 	import Path from './Path.svelte'
 	import ScriptEditor from './ScriptEditor.svelte'
@@ -55,19 +57,16 @@
 	import type Editor from './Editor.svelte'
 	import WorkerTagPicker from './WorkerTagPicker.svelte'
 	import MetadataGen from './copilot/MetadataGen.svelte'
-	import ScriptSchedules from './ScriptSchedules.svelte'
 	import { writable } from 'svelte/store'
-	import {
-		type ScriptSchedule,
-		loadScriptSchedule,
-		defaultScriptLanguages,
-		processLangs
-	} from '$lib/scripts'
+	import { defaultScriptLanguages, processLangs } from '$lib/scripts'
 	import DefaultScripts from './DefaultScripts.svelte'
-	import { createEventDispatcher } from 'svelte'
+	import { createEventDispatcher, setContext } from 'svelte'
 	import CustomPopover from './CustomPopover.svelte'
 	import Summary from './Summary.svelte'
 	import type { ScriptBuilderWhitelabelCustomUi } from './custom_ui'
+	import DeployOverrideConfirmationModal from '$lib/components/common/confirmationModal/DeployOverrideConfirmationModal.svelte'
+	import TriggersEditor from './triggers/TriggersEditor.svelte'
+	import type { ScheduleTrigger, TriggerContext } from './triggers'
 
 	export let script: NewScript
 	export let fullyLoaded: boolean = true
@@ -84,6 +83,12 @@
 	export let replaceStateFn: (url: string) => void = (url) =>
 		window.history.replaceState(null, '', url)
 	export let customUi: ScriptBuilderWhitelabelCustomUi = {}
+	export let savedPrimarySchedule: ScheduleTrigger | undefined = undefined
+
+	let deployedValue: Value | undefined = undefined // Value to diff against
+	let deployedBy: string | undefined = undefined // Author
+	let confirmCallback: () => void = () => {} // What happens when user clicks `override` in warning
+	let open: boolean = false // Is confirmation modal open
 
 	let metadataOpen =
 		!neverShowMeta &&
@@ -95,29 +100,47 @@
 	let editor: Editor | undefined = undefined
 	let scriptEditor: ScriptEditor | undefined = undefined
 
-	let scheduleStore = writable<ScriptSchedule>({
-		summary: '',
-		cron: '0 */5 * * *',
-		timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-		args: {},
-		enabled: false
-	})
+	const primaryScheduleStore = writable<ScheduleTrigger | undefined | false>(savedPrimarySchedule)
+	const triggersCount = writable<TriggersCount | undefined>(
+		savedPrimarySchedule
+			? { schedule_count: 1, primary_schedule: { schedule: savedPrimarySchedule.cron } }
+			: undefined
+	)
+	const selectedTriggerStore = writable<
+		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets'
+	>('webhooks')
 
-	async function loadSchedule() {
-		const scheduleRes = await loadScriptSchedule(initialPath, $workspaceStore!)
-		if (scheduleRes) {
-			scheduleStore.set(scheduleRes)
-		}
+	export function setPrimarySchedule(schedule: ScheduleTrigger | undefined | false) {
+		primaryScheduleStore.set(schedule)
+		loadTriggers()
 	}
 
 	const dispatch = createEventDispatcher()
 
-	$: {
-		if (initialPath != '') {
-			loadSchedule()
+	$: initialPath != '' && loadTriggers()
+
+	async function loadTriggers() {
+		$triggersCount = await ScriptService.getTriggersCountOfScript({
+			workspace: $workspaceStore!,
+			path: initialPath
+		})
+		if ($primaryScheduleStore && $triggersCount.primary_schedule == undefined) {
+			$triggersCount = {
+				...($triggersCount ?? {}),
+				schedule_count: ($triggersCount.schedule_count ?? 0) + 1,
+				primary_schedule: {
+					schedule: $primaryScheduleStore.cron
+				}
+			}
 		}
 	}
 
+	setContext<TriggerContext>('TriggerContext', {
+		selectedTrigger: selectedTriggerStore,
+		primarySchedule: primaryScheduleStore,
+		triggersCount
+	})
+
 	const enterpriseLangs = ['bigquery', 'snowflake', 'mssql']
 
 	export function setCode(code: string): void {
@@ -180,7 +203,8 @@
 		})
 	}
 
-	$: !disableHistoryChange && replaceStateFn('#' + encodeState(script))
+	$: !disableHistoryChange &&
+		replaceStateFn('#' + encodeState({ ...script, primarySchedule: $primaryScheduleStore }))
 
 	if (script.content == '') {
 		initContent(script.language, script.kind, template)
@@ -200,7 +224,10 @@
 	}
 
 	async function createSchedule(path: string) {
-		const { cron, timezone, args, enabled, summary } = $scheduleStore
+		if (!$primaryScheduleStore) {
+			return
+		}
+		const { cron, timezone, args, enabled, summary } = $primaryScheduleStore
 
 		try {
 			await ScheduleService.createSchedule({
@@ -221,7 +248,78 @@
 		}
 	}
 
-	async function editScript(stay: boolean, deploymentMsg?: string): Promise<void> {
+	async function handleEditScript(stay: boolean, deployMsg?: string): Promise<void> {
+		// Fetch latest version and fetch entire script after if needed
+		let actual_parent_hash: string | undefined = undefined
+
+		try {
+			if (initialPath && initialPath != '') {
+				actual_parent_hash = (
+					await ScriptService.getScriptLatestVersion({
+						workspace: $workspaceStore!,
+						path: initialPath
+					})
+				)?.script_hash
+			}
+		} catch (error) {
+			//
+		}
+
+		// Usually when we create new script, we put current hash as a parent_hash
+		// But if we specify parent_hash that is already used, than we get error
+		// In order to fix it we make sure that client's understanding of parent_hash
+		// is aligns with understanding of backend.
+		if (actual_parent_hash == undefined || script.parent_hash == actual_parent_hash) {
+			// Handle directly
+			await editScript(stay, script.parent_hash!, deployMsg)
+		} else {
+			// Fetch entire script, since we need it to show Diff
+			await syncWithDeployed()
+
+			// Handle through confirmation modal
+			confirmCallback = async () => {
+				open = false
+				if (actual_parent_hash) {
+					await editScript(stay, actual_parent_hash, deployMsg)
+				} else {
+					sendUserToast('Could not fetch latest version of the script', true)
+				}
+			}
+			// Open confirmation modal
+			open = true
+		}
+	}
+
+	async function syncWithDeployed() {
+		const latestScript = await ScriptService.getScriptByPath({
+			workspace: $workspaceStore!,
+			path: initialPath,
+			withStarredInfo: true
+		})
+
+		deployedValue = {
+			...latestScript,
+			starred: undefined,
+			workspace_id: undefined,
+			archived: undefined,
+			created_at: undefined,
+			created_by: undefined,
+			deleted: undefined,
+			extra_perms: undefined,
+			is_template: undefined,
+			lock: undefined,
+			lock_error_logs: undefined,
+			parent_hashes: undefined
+		}
+
+		deployedBy = latestScript.created_by
+	}
+
+	async function editScript(
+		stay: boolean,
+		parentHash: string,
+		deploymentMsg?: string
+	): Promise<void> {
 		loadingSave = true
 		try {
 			try {
@@ -245,7 +343,7 @@
 					summary: script.summary,
 					description: script.description ?? '',
 					content: script.content,
-					parent_hash: script.parent_hash,
+					parent_hash: parentHash,
 					schema: script.schema,
 					is_template: script.is_template,
 					language: script.language,
@@ -269,43 +367,52 @@
 				}
 			})
 
-			const { enabled, timezone, args, cron, summary } = $scheduleStore
-			const scheduleExists = await ScheduleService.existsSchedule({
-				workspace: $workspaceStore ?? '',
-				path: script.path
-			})
+			const scheduleExists =
+				initialPath != '' &&
+				(await ScheduleService.existsSchedule({
+					workspace: $workspaceStore ?? '',
+					path: script.path
+				}))
+			if ($primaryScheduleStore) {
+				const { enabled, timezone, args, cron, summary } = $primaryScheduleStore
 
-			if (scheduleExists) {
-				const schedule = await ScheduleService.getSchedule({
+				if (scheduleExists) {
+					const schedule = await ScheduleService.getSchedule({
+						workspace: $workspaceStore ?? '',
+						path: script.path
+					})
+					if (
+						JSON.stringify(schedule.args) != JSON.stringify(args) ||
+						schedule.schedule != cron ||
+						schedule.timezone != timezone ||
+						schedule.summary != summary
+					) {
+						await ScheduleService.updateSchedule({
+							workspace: $workspaceStore ?? '',
+							path: script.path,
+							requestBody: {
+								schedule: formatCron(cron),
+								timezone,
+								args,
+								summary
+							}
+						})
+					}
+					if (enabled != schedule.enabled) {
+						await ScheduleService.setScheduleEnabled({
+							workspace: $workspaceStore ?? '',
+							path: script.path,
+							requestBody: { enabled }
+						})
+					}
+				} else if (enabled) {
+					await createSchedule(script.path)
+				}
+			} else if (scheduleExists && !$triggersCount?.primary_schedule) {
+				await ScheduleService.deleteSchedule({
 					workspace: $workspaceStore ?? '',
 					path: script.path
 				})
-				if (
-					JSON.stringify(schedule.args) != JSON.stringify(args) ||
-					schedule.schedule != cron ||
-					schedule.timezone != timezone ||
-					schedule.summary != summary
-				) {
-					await ScheduleService.updateSchedule({
-						workspace: $workspaceStore ?? '',
-						path: script.path,
-						requestBody: {
-							schedule: formatCron(cron),
-							timezone,
-							args,
-							summary
-						}
-					})
-				}
-				if (enabled != schedule.enabled) {
-					await ScheduleService.setScheduleEnabled({
-						workspace: $workspaceStore ?? '',
-						path: script.path,
-						requestBody: { enabled }
-					})
-				}
-			} else if (enabled) {
-				await createSchedule(script.path)
 			}
 
 			savedScript = structuredClone(script) as NewScriptWithDraft
@@ -405,7 +512,7 @@
 				requestBody: {
 					path: initialPath == '' || savedScript?.draft_only ? script.path : initialPath,
 					typ: 'script',
-					value: script
+					value: { ...script, primary_schedule: $primaryScheduleStore }
 				}
 			})
 
@@ -442,7 +549,7 @@
 						{
 							label: 'Deploy & Stay here',
 							onClick: () => {
-								editScript(true)
+								handleEditScript(true)
 							}
 						},
 						{
@@ -481,7 +588,7 @@
 	let path: Path | undefined = undefined
 	let dirtyPath = false
 
-	let selectedTab: 'metadata' | 'runtime' | 'ui' | 'schedule' = 'metadata'
+	let selectedTab: 'metadata' | 'runtime' | 'ui' | 'triggers' = 'metadata'
 
 	let deploymentMsg = ''
 	let msgInput: HTMLInputElement | undefined = undefined
@@ -500,6 +607,14 @@
 <svelte:window on:keydown={onKeyDown} />
 <slot />
 
+<DeployOverrideConfirmationModal
+	bind:deployedBy
+	bind:confirmCallback
+	bind:open
+	{diffDrawer}
+	bind:deployedValue
+	currentValue={script}
+/>
 {#if !$userStore?.operator}
 	<Drawer
 		placement="right"
@@ -520,7 +635,7 @@
 						cannot be inferred from the type directly.
 					</Tooltip>
 				</Tab>
-				<Tab value="schedule" active={$scheduleStore.enabled}>Schedule</Tab>
+				<Tab value="triggers">Triggers</Tab>
 				<svelte:fragment slot="content">
 					<div
 						class={selectedTab === 'ui' ? 'p-0' : 'p-4'}
@@ -1026,8 +1141,16 @@
 						<TabContent value="ui" class="h-full">
 							<ScriptSchema bind:schema={script.schema} />
 						</TabContent>
-						<TabContent value="schedule">
-							<ScriptSchedules {initialPath} schema={script.schema} schedule={scheduleStore} />
+						<TabContent value="triggers">
+							<TriggersEditor
+								{initialPath}
+								schema={script.schema}
+								noEditor={true}
+								isFlow={false}
+								currentPath={script.path}
+								newItem={initialPath == ''}
+							/>
+							<!-- <ScriptSchedules {initialPath} schema={script.schema} schedule={scheduleStore} /> -->
 						</TabContent>
 					</div>
 				</svelte:fragment>
@@ -1056,7 +1179,7 @@
 				</div>
 
 				<div class="gap-4 flex">
-					{#if $scheduleStore.enabled}
+					{#if $primaryScheduleStore != undefined ? $primaryScheduleStore && $primaryScheduleStore?.enabled : $triggersCount?.primary_schedule}
 						<Button
 							btnClasses="hidden lg:inline-flex"
 							startIcon={{ icon: Calendar }}
@@ -1065,10 +1188,15 @@
 							size="xs"
 							on:click={async () => {
 								metadataOpen = true
-								selectedTab = 'schedule'
+								selectedTab = 'triggers'
+								$selectedTriggerStore = 'schedules'
 							}}
 						>
-							{$scheduleStore.cron ?? ''}
+							{$primaryScheduleStore != undefined
+								? $primaryScheduleStore
+									? $primaryScheduleStore?.cron
+									: ''
+								: $triggersCount?.primary_schedule?.schedule}
 						</Button>
 					{/if}
 					{#if customUi?.topBar?.path != false}
@@ -1111,14 +1239,16 @@
 							color="light"
 							variant="border"
 							size="xs"
-							on:click={() => {
+							on:click={async () => {
 								if (!savedScript) {
 									return
 								}
+								await syncWithDeployed()
+
 								diffDrawer?.openDrawer()
 								diffDrawer?.setDiff({
 									mode: 'normal',
-									deployed: savedScript,
+									deployed: deployedValue ?? savedScript,
 									draft: savedScript['draft'],
 									current: script
 								})
@@ -1163,7 +1293,7 @@
 							size="xs"
 							disabled={!fullyLoaded}
 							startIcon={{ icon: Save }}
-							on:click={() => editScript(false)}
+							on:click={() => handleEditScript(false)}
 							dropdownItems={computeDropdownItems(initialPath)}
 						>
 							Deploy
@@ -1177,13 +1307,13 @@
 									bind:this={msgInput}
 									on:keydown={(e) => {
 										if (e.key === 'Enter') {
-											editScript(false, deploymentMsg)
+											handleEditScript(false, deploymentMsg)
 										}
 									}}
 								/>
 								<Button
 									size="xs"
-									on:click={() => editScript(false, deploymentMsg)}
+									on:click={() => handleEditScript(false, deploymentMsg)}
 									endIcon={{ icon: CornerDownLeft }}
 									loading={loadingSave}
 								>
diff --git a/frontend/src/lib/components/ScriptEditor.svelte b/frontend/src/lib/components/ScriptEditor.svelte
index 659585bd1a..3e1009d0d9 100644
--- a/frontend/src/lib/components/ScriptEditor.svelte
+++ b/frontend/src/lib/components/ScriptEditor.svelte
@@ -74,7 +74,7 @@
 	let args: Record<string, any> = initialArgs
 
 	let isValid: boolean = true
-	let scriptProgress = undefined;
+	let scriptProgress = undefined
 
 	// Test
 	let testIsLoading = false
@@ -106,7 +106,7 @@
 
 	function runTest() {
 		// Not defined if JobProgressBar not loaded
-		if (jobProgressReset) jobProgressReset();
+		if (jobProgressReset) jobProgressReset()
 		//@ts-ignore
 		testJobLoader.runPreview(
 			path,
@@ -155,6 +155,7 @@
 
 	setLicense()
 	export async function setCollaborationMode() {
+		await setLicense()
 		if (!$enterpriseLicense) {
 			sendUserToast(`Multiplayer is an enterprise feature`, true, [
 				{
@@ -177,7 +178,7 @@
 
 		wsProvider = new WebsocketProvider(
 			`${wsProtocol}://${window.location.host}/ws_mp/`,
-			$workspaceStore + '/' + path ?? 'no-room-name',
+			$workspaceStore + '/' + (path ?? 'no-room-name'),
 			ydoc,
 			{ connect: false }
 		)
@@ -292,7 +293,9 @@
 			{args}
 			{noHistory}
 			{saveToWorkspace}
-		/>
+		>
+			<slot name="editor-bar-right" slot="right" />
+		</EditorBar>
 		{#if !noSyncFromGithub && customUi?.editorBar?.useVsCode != false}
 			<div class="py-1">
 				<Button
@@ -432,10 +435,15 @@
 							{diffEditor}
 							{args}
 						>
-						{#if scriptProgress}
-							<!-- Put to the slot in logpanel -->
-							<JobProgressBar job={testJob} bind:scriptProgress bind:reset={jobProgressReset} compact={true} />
-						{/if}
+							{#if scriptProgress}
+								<!-- Put to the slot in logpanel -->
+								<JobProgressBar
+									job={testJob}
+									bind:scriptProgress
+									bind:reset={jobProgressReset}
+									compact={true}
+								/>
+							{/if}
 						</LogPanel>
 					</Pane>
 				</Splitpanes>
diff --git a/frontend/src/lib/components/ScriptSchedules.svelte b/frontend/src/lib/components/ScriptSchedules.svelte
deleted file mode 100644
index 70454a45ed..0000000000
--- a/frontend/src/lib/components/ScriptSchedules.svelte
+++ /dev/null
@@ -1,110 +0,0 @@
-<script lang="ts">
-	import CronInput from '$lib/components/CronInput.svelte'
-	import SchemaForm from '$lib/components/SchemaForm.svelte'
-	import Toggle from '$lib/components/Toggle.svelte'
-	import { emptyString } from '$lib/utils'
-	import { Alert, Button, Skeleton } from '$lib/components/common'
-	import ScheduleEditor from '$lib/components/ScheduleEditor.svelte'
-	import { ScheduleService, type Schedule } from '$lib/gen'
-	import { workspaceStore } from '$lib/stores'
-	import { Calendar } from 'lucide-svelte'
-	import type { Writable } from 'svelte/store'
-	import type { ScriptSchedule } from '$lib/scripts'
-	import Label from './Label.svelte'
-
-	export let initialPath: string
-	export let schema: Record<string, any> | undefined
-	export let schedule: Writable<ScriptSchedule>
-	// const { schedule, flowStore, pathStore, initialPath } =
-	// 	getContext<FlowEditorContext>('FlowEditorContext')
-	let schedules: Schedule[] | undefined = undefined
-
-	async function loadSchedules() {
-		try {
-			schedules = (
-				await ScheduleService.listSchedules({
-					workspace: $workspaceStore ?? '',
-					path: initialPath,
-					isFlow: false
-				})
-			).filter((s) => s.path != initialPath)
-		} catch (e) {
-			console.error('impossible to load schedules')
-		}
-	}
-
-	let scheduleEditor: ScheduleEditor
-
-	$: initialPath && loadSchedules()
-</script>
-
-<div class="w-full flex flex-col gap-4 mb-4">
-	<!-- svelte-ignore a11y-autofocus -->
-	<Label label="Summary">
-		<input
-			autofocus
-			type="text"
-			placeholder="Short summary to be displayed when listed"
-			class="text-sm w-full"
-			bind:value={$schedule.summary}
-		/>
-	</Label>
-</div>
-
-<CronInput bind:schedule={$schedule.cron} bind:timezone={$schedule.timezone} />
-<div class="mt-10" />
-<SchemaForm {schema} bind:args={$schedule.args} />
-{#if emptyString($schedule.cron)}
-	<p class="text-xs text-tertiary mt-10">Define a schedule frequency first</p>
-{/if}
-<div class="mt-10" />
-<Toggle
-	disabled={emptyString($schedule.cron)}
-	bind:checked={$schedule.enabled}
-	options={{
-		right: 'Schedule enabled'
-	}}
-/>
-<Alert bgClass="my-4" type="warning" title="Changes only applied upon deploy">
-	Changes to the primary schedule are only applied upon deploy. Other schedules' changes are applied
-	immediately.
-</Alert>
-
-{#if initialPath != ''}
-	<ScheduleEditor
-		on:update={() => {
-			loadSchedules()
-		}}
-		bind:this={scheduleEditor}
-	/>
-	<h2 class="pt-7">Other schedules</h2>
-	<div class="py-4 flex">
-		<Button
-			on:click={() => scheduleEditor?.openNew(false, initialPath)}
-			variant="border"
-			color="light"
-			size="xs"
-			startIcon={{ icon: Calendar }}
-		>
-			New Schedule
-		</Button>
-	</div>
-
-	{#if schedules}
-		{#if schedules.length == 0}
-			<div class="text-xs text-secondary px-2"> No other schedules </div>
-		{:else}
-			<div class="flex flex-col divide-y px-2 pt-2 max-w-lg">
-				{#each schedules as schedule (schedule.path)}
-					<div class="grid grid-cols-6 text-2xs items-center py-2"
-						><div class="col-span-3 truncate">{schedule.path}</div><div>{schedule.schedule}</div>
-						<div>{schedule.enabled ? 'on' : 'off'}</div>
-						<button on:click={() => scheduleEditor?.openEdit(schedule.path, false)}>Edit</button>
-					</div>
-				{/each}
-			</div>
-		{/if}
-	{:else}
-		<Skeleton layout={[[8]]} />
-	{/if}
-{/if}
diff --git a/frontend/src/lib/components/ScriptVersionHistory.svelte b/frontend/src/lib/components/ScriptVersionHistory.svelte
index 584ea95596..7d66e7213d 100644
--- a/frontend/src/lib/components/ScriptVersionHistory.svelte
+++ b/frontend/src/lib/components/ScriptVersionHistory.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { Pane, Splitpanes } from 'svelte-splitpanes'
-	import PanelSection from './apps/editor/settingsPanel/common/PanelSection.svelte'
 	import { classNames, emptyString } from '$lib/utils'
 	import { ScriptService, type ScriptHistory } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
@@ -63,70 +62,66 @@
 
 <Splitpanes class="!overflow-visible">
 	<Pane size={20}>
-		<PanelSection title="Past Versions">
-			<div class="flex flex-col gap-2 w-full">
-				{#if !loading}
-					{#if versions && versions.length > 0}
-						<div class="flex gap-2 flex-col">
-							{#each versions ?? [] as version, versionIndex}
-								<!-- svelte-ignore a11y-click-events-have-key-events -->
-								<!-- svelte-ignore a11y-no-static-element-interactions -->
-								<div
-									class={classNames(
-										'border flex gap-1 truncate justify-between flex-row w-full items-center p-2 rounded-md cursor-pointer ',
-										selectedVersion?.script_hash == version.script_hash
-											? 'bg-surface-selected'
-											: '',
-										'hover:bg-surface-hover'
-									)}
-									on:click={() => {
-										selectedVersion = version
-										selectedVersionIndex = versionIndex
+		<div class="flex flex-col gap-2 px-2 pt-2 w-full">
+			{#if !loading}
+				{#if versions && versions.length > 0}
+					<div class="flex gap-2 flex-col">
+						{#each versions ?? [] as version, versionIndex}
+							<!-- svelte-ignore a11y-click-events-have-key-events -->
+							<!-- svelte-ignore a11y-no-static-element-interactions -->
+							<div
+								class={classNames(
+									'border flex gap-1 truncate justify-between flex-row w-full items-center p-2 rounded-md cursor-pointer ',
+									selectedVersion?.script_hash == version.script_hash ? 'bg-surface-selected' : '',
+									'hover:bg-surface-hover'
+								)}
+								on:click={() => {
+									selectedVersion = version
+									selectedVersionIndex = versionIndex
 
-										if (showDiff && versions && selectedVersionIndex === versions.length - 1) {
-											showDiff = false
-										}
+									if (showDiff && versions && selectedVersionIndex === versions.length - 1) {
+										showDiff = false
+									}
 
-										const availableVersions = versions?.slice(selectedVersionIndex + 1)
+									const availableVersions = versions?.slice(selectedVersionIndex + 1)
 
-										if (
-											previousHash &&
-											!availableVersions?.find((v) => v.script_hash === previousHash)
-										) {
-											previousHash = availableVersions?.[0]?.script_hash
-										}
+									if (
+										previousHash &&
+										!availableVersions?.find((v) => v.script_hash === previousHash)
+									) {
+										previousHash = availableVersions?.[0]?.script_hash
+									}
 
-										deploymentMsgUpdate = undefined
-										deploymentMsgUpdateMode = false
-									}}
-								>
-									<span class="text-xs truncate">
-										{#if emptyString(version.deployment_msg)}Version {version.script_hash}{:else}{version.deployment_msg}{/if}
-									</span>
-									{#if openDetails}
-										<Button
-											on:click={() => {
-												dispatch('openDetails', { version: version.script_hash })
-											}}
-											class="ml-2 inline-flex gap-1 text-xs items-center"
-											size="xs"
-											color="light"
-											variant="border"
-										>
-											Run page<ExternalLink size={14} />
-										</Button>
-									{/if}
-								</div>
-							{/each}
-						</div>
-					{:else}
-						<div class="text-sm text-tertiary">No items</div>
-					{/if}
+									deploymentMsgUpdate = undefined
+									deploymentMsgUpdateMode = false
+								}}
+							>
+								<span class="text-xs truncate">
+									{#if emptyString(version.deployment_msg)}Version {version.script_hash}{:else}{version.deployment_msg}{/if}
+								</span>
+								{#if openDetails}
+									<Button
+										on:click={() => {
+											dispatch('openDetails', { version: version.script_hash })
+										}}
+										class="ml-2 inline-flex gap-1 text-xs items-center"
+										size="xs"
+										color="light"
+										variant="border"
+									>
+										Run page<ExternalLink size={14} />
+									</Button>
+								{/if}
+							</div>
+						{/each}
+					</div>
 				{:else}
-					<Skeleton layout={[[40], [40], [40], [40], [40]]} />
+					<div class="text-sm text-tertiary">No items</div>
 				{/if}
-			</div>
-		</PanelSection>
+			{:else}
+				<Skeleton layout={[[40], [40], [40], [40], [40]]} />
+			{/if}
+		</div>
 	</Pane>
 	<Pane size={80}>
 		<div class="h-full w-full overflow-auto">
diff --git a/frontend/src/lib/components/Scrollable.svelte b/frontend/src/lib/components/Scrollable.svelte
new file mode 100644
index 0000000000..194bb05b6a
--- /dev/null
+++ b/frontend/src/lib/components/Scrollable.svelte
@@ -0,0 +1,58 @@
+<script lang="ts">
+	import { onMount, onDestroy } from 'svelte'
+	import { twMerge } from 'tailwind-merge'
+
+	let isAtBottom: boolean = false
+	let isScrollable = false
+
+	export let id: string | null | undefined = undefined
+	export let scrollableClass: string = ''
+	export let shiftedShadow: boolean = false
+	let mutationObserver: MutationObserver
+	let el: HTMLDivElement
+
+	function handleScroll(event) {
+		const scrollableElement = event.target
+
+		isAtBottom =
+			scrollableElement.scrollTop + scrollableElement.offsetHeight >=
+			scrollableElement.scrollHeight - 2
+	}
+
+	function checkIfScrollable(el) {
+		return el.scrollHeight > el.clientHeight
+	}
+
+	function observeScrollability(el) {
+		isScrollable = checkIfScrollable(el)
+
+		mutationObserver = new MutationObserver(() => {
+			isScrollable = checkIfScrollable(el)
+		})
+		mutationObserver?.observe(el, { childList: true, subtree: true, characterData: true })
+	}
+
+	export function scrollIntoView(top: number) {
+		el.scrollTo({ top, behavior: 'smooth' })
+	}
+	onMount(() => {
+		observeScrollability(el)
+	})
+
+	onDestroy(() => {
+		mutationObserver?.disconnect()
+	})
+</script>
+
+<div {id} class={twMerge('relative pb-1', scrollableClass)}>
+	<div bind:this={el} on:scroll={handleScroll} class="w-full h-full overflow-y-auto">
+		<slot />
+	</div>
+	{#if !isAtBottom && isScrollable}
+		<div
+			class="pointer-events-none absolute bottom-0 {shiftedShadow
+				? 'left-2'
+				: 'right-0'} h-14 w-full bg-gradient-to-t from-surface to-transparent"
+		/>
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/Section.svelte b/frontend/src/lib/components/Section.svelte
index 8c2379e982..43868d170e 100644
--- a/frontend/src/lib/components/Section.svelte
+++ b/frontend/src/lib/components/Section.svelte
@@ -48,6 +48,9 @@
 			{/if}
 		</h2>
 		<slot name="action" />
+		{#if collapsable && collapsed}
+			<slot name="badge" />
+		{/if}
 	</div>
 	<div class={collapsable && collapsed ? `hidden ${$$props.class}` : `${$$props.class}`}>
 		<slot />
diff --git a/frontend/src/lib/components/ShareModal.svelte b/frontend/src/lib/components/ShareModal.svelte
index 23605ce132..8f0192d5e4 100644
--- a/frontend/src/lib/components/ShareModal.svelte
+++ b/frontend/src/lib/components/ShareModal.svelte
@@ -25,6 +25,7 @@
 		| 'app'
 		| 'raw_app'
 		| 'http_trigger'
+		| 'websocket_trigger'
 	let kind: Kind
 
 	let path: string = ''
diff --git a/frontend/src/lib/components/StringTypeNarrowing.svelte b/frontend/src/lib/components/StringTypeNarrowing.svelte
index c89bb9dcc8..4405bc2fb6 100644
--- a/frontend/src/lib/components/StringTypeNarrowing.svelte
+++ b/frontend/src/lib/components/StringTypeNarrowing.svelte
@@ -18,9 +18,9 @@
 	export let contentEncoding: 'base64' | 'binary' | undefined
 	export let customErrorMessage: string | undefined
 	export let minRows: number | undefined = undefined
-	export let disableCreate: boolean | undefined = false
-	export let disableVariablePicker: boolean | undefined = false
-	export let password: boolean = false
+	export let disableCreate: boolean | undefined = undefined
+	export let disableVariablePicker: boolean | undefined = undefined
+	export let password: boolean | undefined = undefined
 	export let noExtra = false
 	export let dateFormat: string | undefined
 	export let enumLabels: Record<string, string> | undefined = undefined
@@ -236,7 +236,7 @@
 			<Toggle
 				size="xs"
 				options={{ right: 'Disallow creating custom values' }}
-				checked={disableCreate != undefined && disableCreate}
+				checked={disableCreate}
 				on:change={(e) => {
 					if (e.detail) {
 						disableCreate = true
@@ -309,7 +309,7 @@
 		<Toggle
 			size="xs"
 			options={{ right: 'Disable variable picker' }}
-			checked={disableVariablePicker != undefined && disableVariablePicker}
+			checked={disableVariablePicker}
 			on:change={(e) => {
 				if (e.detail) {
 					disableVariablePicker = true
@@ -327,7 +327,11 @@
 			options={{ right: 'Is Password' }}
 			checked={password}
 			on:change={(e) => {
-				password = e.detail
+				if (e.detail) {
+					password = true
+				} else {
+					password = undefined
+				}
 			}}
 		/>
 	{/if}
diff --git a/frontend/src/lib/components/SuperadminSettings.svelte b/frontend/src/lib/components/SuperadminSettings.svelte
index 498c708cec..1e81ace411 100644
--- a/frontend/src/lib/components/SuperadminSettings.svelte
+++ b/frontend/src/lib/components/SuperadminSettings.svelte
@@ -22,11 +22,12 @@
 	import ChangeInstanceUsername from './ChangeInstanceUsername.svelte'
 	import { isCloudHosted } from '$lib/cloud'
 	import InstanceNameEditor from './InstanceNameEditor.svelte'
+	import Toggle from './Toggle.svelte'
 	let drawer: Drawer
 	let filter = ''
 
 	export function openDrawer() {
-		listUsers()
+		listUsers(activeOnly)
 		drawer?.openDrawer?.()
 	}
 
@@ -45,11 +46,14 @@
 	let users: GlobalUserInfo[] = []
 	let filteredUsers: GlobalUserInfo[] = []
 	let deleteConfirmedCallback: (() => void) | undefined = undefined
+	let activeOnly = false
 
-	async function listUsers(): Promise<void> {
-		users = await UserService.listUsersAsSuperAdmin({ perPage: 100000 })
+	async function listUsers(activeOnly: boolean): Promise<void> {
+		users = await UserService.listUsersAsSuperAdmin({ perPage: 100000, activeOnly: activeOnly })
 	}
 
+	$: listUsers(activeOnly)
+
 	let tab: 'users' | string = 'users'
 
 	let nbDisplayed = 50
@@ -70,7 +74,7 @@
 		})
 		getAutomateUsernameCreationSetting()
 		sendUserToast('Automatic username creation enabled')
-		listUsers()
+		listUsers(activeOnly)
 	}
 
 	async function updateName(name: string | undefined, email: string) {
@@ -82,7 +86,7 @@
 				}
 			})
 			sendUserToast('User updated')
-			listUsers()
+			listUsers(activeOnly)
 		} catch (e) {
 			sendUserToast('Error updating user', true)
 		}
@@ -96,7 +100,12 @@
 	f={(x) => x.email + ' ' + x.name + ' ' + x.company}
 />
 
-<Drawer bind:this={drawer} on:open={listUsers} size="1200px" on:close={removeHash}>
+<Drawer
+	bind:this={drawer}
+	on:open={() => listUsers(activeOnly)}
+	size="1200px"
+	on:close={removeHash}
+>
 	<DrawerContent overflow_y={true} title="Instance settings" on:close={closeDrawer}>
 		<div class="flex flex-col h-full w-full">
 			<div>
@@ -130,11 +139,16 @@
 							<div class="h-full">
 								{#if !automateUsernameCreation && !isCloudHosted()}
 									<div class="mb-4">
-										<h3 class="mb-2">
-											Automatic username creation
-										</h3>
+										<h3 class="mb-2"> Automatic username creation </h3>
 										<div class="mb-2">
-											<span class="text-primary text-sm">Automatically create a username for new users based on their email, shared across workspaces. <a target="_blank" href="https://www.windmill.dev/docs/advanced/instance_settings#automatic-username-creation">Learn more</a></span>
+											<span class="text-primary text-sm"
+												>Automatically create a username for new users based on their email, shared
+												across workspaces. <a
+													target="_blank"
+													href="https://www.windmill.dev/docs/advanced/instance_settings#automatic-username-creation"
+													>Learn more</a
+												></span
+											>
 										</div>
 										<Button
 											btnClasses="w-auto"
@@ -164,10 +178,20 @@
 								{/if}
 
 								<div class="py-2 mb-4">
-									<InviteGlobalUser on:new={listUsers} />
+									<InviteGlobalUser on:new={() => listUsers(activeOnly)} />
 								</div>
 
-								<h3>All instance users</h3>
+								<div class="flex flex-row justify-between">
+									<h3>All instance users</h3>
+									<Toggle
+										bind:checked={activeOnly}
+										options={{
+											left: 'Show active users only',
+											leftTooltip:
+												'An active user is a user who has performed at least one action in the last 30 days'
+										}}
+									/>
+								</div>
 								<div class="pb-1" />
 								<div>
 									<input placeholder="Search users" bind:value={filter} class="input mt-1" />
@@ -181,12 +205,15 @@
 											{#if automateUsernameCreation}
 												<th>username</th>
 											{/if}
+											{#if activeOnly}
+												<th>kind</th>
+											{/if}
 											<th />
 											<th />
 										</tr>
 										<tbody slot="body" class="overflow-y-auto w-full h-full max-h-full">
 											{#if filteredUsers && users}
-												{#each filteredUsers.slice(0, nbDisplayed) as { email, super_admin, login_type, name, username } (email)}
+												{#each filteredUsers.slice(0, nbDisplayed) as { email, super_admin, login_type, name, username, operator_only } (email)}
 													<tr class="border">
 														<td>{email}</td>
 														<td>{login_type}</td>
@@ -203,21 +230,29 @@
 																			{email}
 																			isConflict
 																			on:renamed={() => {
-																				listUsers()
+																				listUsers(activeOnly)
 																			}}
 																		/>
 																	{/key}
 																{/if}
 															</td>
 														{/if}
+														{#if activeOnly}
+															<td>
+																{#if operator_only}
+																	Operator only
+																{:else}
+																	Developer
+																{/if}
+															</td>
+														{/if}
 														<td>
 															<ToggleButtonGroup
 																selected={super_admin}
 																on:selected={async (e) => {
-																	console.log('BAR')
 																	if (email == $userStore?.email) {
 																		sendUserToast('You cannot demote yourself', true)
-																		listUsers()
+																		listUsers(activeOnly)
 																		return
 																	}
 																	await UserService.globalUserUpdate({
@@ -227,7 +262,7 @@
 																		}
 																	})
 																	sendUserToast('User updated')
-																	listUsers()
+																	listUsers(activeOnly)
 																}}
 															>
 																<ToggleButton value={false} size="xs" label="User" />
@@ -244,7 +279,7 @@
 																		updateName(e.detail, email)
 																	}}
 																	on:renamed={() => {
-																		listUsers()
+																		listUsers(activeOnly)
 																	}}
 																	{automateUsernameCreation}
 																/>
@@ -258,7 +293,7 @@
 																		deleteConfirmedCallback = async () => {
 																			await UserService.globalUserDelete({ email })
 																			sendUserToast(`User ${email} removed`)
-																			listUsers()
+																			listUsers(activeOnly)
 																		}
 																	}}
 																>
diff --git a/frontend/src/lib/components/TestConnection.svelte b/frontend/src/lib/components/TestConnection.svelte
index ceb7e99987..99e9717ad1 100644
--- a/frontend/src/lib/components/TestConnection.svelte
+++ b/frontend/src/lib/components/TestConnection.svelte
@@ -60,6 +60,7 @@ export async function main(s3: S3) {
 		},
 		body: JSON.stringify({
 			type: "S3",
+			region: s3.region,
 			bucket: s3.bucket,
 			endpoint: s3.endPoint,
 			port: s3.port,
diff --git a/frontend/src/lib/components/TimeAgo.svelte b/frontend/src/lib/components/TimeAgo.svelte
index c89f410121..059bc3fddf 100644
--- a/frontend/src/lib/components/TimeAgo.svelte
+++ b/frontend/src/lib/components/TimeAgo.svelte
@@ -4,8 +4,8 @@
 	import { onDestroy, onMount } from 'svelte'
 
 	export let date: string
-	export let withDate: boolean = false
 	export let agoOnlyIfRecent: boolean = false
+	export let noDate = false
 
 	let computedTimeAgo: string | undefined = undefined
 
@@ -63,21 +63,20 @@
 			let dAgo = daysAgo(date)
 			if (dAgo == 0) {
 				return `yesterday at ${date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}`
-			} else if (dAgo > 7 && withDate) {
+			} else if (dAgo > 7 && !noDate) {
 				return `${dAgo + 1} days ago at ${date.toLocaleTimeString([], {
 					hour: '2-digit',
 					minute: '2-digit'
 				})}`
 			} else {
-				return !withDate ? displayDate(dateString, false, withDate) : ''
+				return displayDate(dateString, false, !noDate)
 			}
 		}
 	}
 </script>
 
-{#if withDate}
-	{displayDate(date)}
-{/if}
 {#if computedTimeAgo && (!agoOnlyIfRecent || isRecent)}
 	{computedTimeAgo}
+{:else}
+	{displayDate(date)}
 {/if}
diff --git a/frontend/src/lib/components/Toast.svelte b/frontend/src/lib/components/Toast.svelte
index 3b1382ccf6..c57a04ac48 100644
--- a/frontend/src/lib/components/Toast.svelte
+++ b/frontend/src/lib/components/Toast.svelte
@@ -4,6 +4,7 @@
 	import { onMount } from 'svelte'
 	import Button from './common/button/Button.svelte'
 	import type { ToastAction } from '$lib/toast'
+	import { processMessage } from './toast'
 
 	export let message: string
 	export let toastId: string
@@ -37,7 +38,7 @@
 				{/if}
 			</div>
 			<div class="ml-3 flex-1 w-0">
-				<p class="text-sm text-secondary break-words">{message}</p>
+				<p class="text-sm text-secondary break-words">{@html processMessage(message)}</p>
 				{#if errorMessage}
 					<p
 						class="text-sm text-secondary border bg-surface-secondary p-2 w-full overflow-auto mt-2"
diff --git a/frontend/src/lib/components/Toggle.svelte b/frontend/src/lib/components/Toggle.svelte
index d181468db2..0e29889c94 100644
--- a/frontend/src/lib/components/Toggle.svelte
+++ b/frontend/src/lib/components/Toggle.svelte
@@ -3,6 +3,7 @@
 	import { createEventDispatcher } from 'svelte'
 	import { twMerge } from 'tailwind-merge'
 	import Tooltip from './Tooltip.svelte'
+	import { AlertTriangle } from 'lucide-svelte'
 
 	export let options: {
 		left?: string
@@ -14,14 +15,17 @@
 	export let disabled = false
 	export let textClass = ''
 	export let textStyle = ''
-	export let color: 'blue' | 'red' = 'blue'
+	export let color: 'blue' | 'red' | 'nord' = 'blue'
 	export let id = (Math.random() + 1).toString(36).substring(10)
 	export let lightMode: boolean = false
+	export let eeOnly: boolean = false
 
 	export let size: 'sm' | 'xs' = 'sm'
 
 	const dispatch = createEventDispatcher()
 	const bothOptions = Boolean(options.left) && Boolean(options.right)
+
+	export let textDisabled = false
 </script>
 
 <label
@@ -34,7 +38,7 @@
 		<span
 			class={twMerge(
 				'mr-2 font-medium duration-50 select-none',
-				bothOptions ? (checked ? 'text-disabled' : 'text-primary') : 'text-primary',
+				bothOptions || textDisabled ? (checked ? 'text-disabled' : 'text-primary') : 'text-primary',
 				size === 'xs' ? 'text-xs' : 'text-sm',
 				textClass
 			)}
@@ -64,10 +68,12 @@
 		/>
 		<div
 			class={classNames(
-				"transition-all bg-surface-selected rounded-full peer peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute  after:bg-surface after:border-white after:border after:rounded-full after:transition-all ",
+				"transition-all bg-surface-selected rounded-full peer peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute  after:bg-surface after:border-white after:border after:rounded-full after:transition-all items-center",
 				color == 'red'
 					? 'peer-checked:bg-red-600'
-					: 'peer-checked:bg-blue-600 dark:peer-checked:bg-blue-500',
+					: color == 'blue'
+					? 'peer-checked:bg-blue-600 dark:peer-checked:bg-blue-500'
+					: 'peer-checked:bg-nord-950 dark:peer-checked:bg-nord-400',
 				size === 'sm'
 					? 'w-11 h-6 after:top-0.5 after:left-[2px] after:h-5 after:w-5'
 					: 'w-7 h-4 after:top-0.5 after:left-[2px] after:h-3 after:w-3'
@@ -78,7 +84,7 @@
 		<span
 			class={twMerge(
 				'ml-2 font-medium duration-50 select-none',
-				bothOptions ? (checked ? 'text-primary' : 'text-disabled') : 'text-primary',
+				bothOptions || textDisabled ? (checked ? 'text-primary' : 'text-disabled') : 'text-primary',
 				size === 'xs' ? 'text-xs' : 'text-sm',
 				textClass
 			)}
@@ -92,3 +98,11 @@
 	{/if}
 	<slot name="right" />
 </label>
+{#if eeOnly && disabled}
+	<span
+		class="inline-flex text-xs text-primary items-center gap-1 !text-yellow-500 whitespace-nowrap ml-8"
+	>
+		<AlertTriangle size={16} />
+		EE only <Tooltip>Enterprise Edition only feature</Tooltip>
+	</span>
+{/if}
diff --git a/frontend/src/lib/components/ToggleHubWorkspaceQuick.svelte b/frontend/src/lib/components/ToggleHubWorkspaceQuick.svelte
new file mode 100644
index 0000000000..9d6ec306a6
--- /dev/null
+++ b/frontend/src/lib/components/ToggleHubWorkspaceQuick.svelte
@@ -0,0 +1,15 @@
+<script lang="ts">
+	import { WindmillIcon2 } from './icons'
+	import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte'
+	import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte'
+	import { Building } from 'lucide-svelte'
+	export let selected: 'all' | 'hub' | 'workspace' = 'all'
+</script>
+
+<div class="max-w-min">
+	<ToggleButtonGroup id="flow-editor-flow-providers" bind:selected>
+		<ToggleButton value="all" label="All" light small />
+		<ToggleButton value="hub" icon={WindmillIcon2} label="Hub" light small />
+		<ToggleButton value="workspace" icon={Building} label="Workspace" light small />
+	</ToggleButtonGroup>
+</div>
diff --git a/frontend/src/lib/components/UserSettings.svelte b/frontend/src/lib/components/UserSettings.svelte
index e7fc2f9cdf..163e558668 100644
--- a/frontend/src/lib/components/UserSettings.svelte
+++ b/frontend/src/lib/components/UserSettings.svelte
@@ -25,6 +25,7 @@
 
 	export let scopes: string[] | undefined = undefined
 	export let newTokenLabel: string | undefined = undefined
+	export let newTokenWorkspace: string | undefined = undefined
 	export let newToken: string | undefined = undefined
 
 	let newPassword: string | undefined
@@ -79,7 +80,12 @@
 			date.setDate(date.getDate() + newTokenExpiration)
 		}
 		newToken = await UserService.createToken({
-			requestBody: { label: newTokenLabel, expiration: date?.toISOString(), scopes } as NewToken
+			requestBody: {
+				label: newTokenLabel,
+				expiration: date?.toISOString(),
+				scopes,
+				workspace_id: newTokenWorkspace
+			} as NewToken
 		})
 		dispatch('tokenCreated', newToken)
 		listTokens()
diff --git a/frontend/src/lib/components/WorkspaceGroup.svelte b/frontend/src/lib/components/WorkerGroup.svelte
similarity index 96%
rename from frontend/src/lib/components/WorkspaceGroup.svelte
rename to frontend/src/lib/components/WorkerGroup.svelte
index f1e31405c0..14ce6787bc 100644
--- a/frontend/src/lib/components/WorkspaceGroup.svelte
+++ b/frontend/src/lib/components/WorkerGroup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Copy, Plus, RefreshCcwIcon, Settings, Trash, X } from 'lucide-svelte'
-	import { Alert, Button, Drawer } from './common'
+	import { Alert, Badge, Button, Drawer } from './common'
 	import Multiselect from 'svelte-multiselect'
 	import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte'
 	import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte'
@@ -18,6 +18,8 @@
 	import AutoComplete from 'simple-svelte-autocomplete'
 	import YAML from 'yaml'
 	import Toggle from './Toggle.svelte'
+	import type { AutoscalingConfig } from './worker_group'
+	import AutoscalingConfigEditor from './AutoscalingConfigEditor.svelte'
 
 	export let name: string
 	export let config:
@@ -31,6 +33,7 @@
 				additional_python_paths?: string[]
 				pip_local_dependencies?: string[]
 				min_alive_workers_alert_threshold?: number
+				autoscaling?: AutoscalingConfig
 		  }
 	export let activeWorkers: number
 	export let customTags: string[] | undefined
@@ -65,6 +68,7 @@
 		additional_python_paths?: string[]
 		pip_local_dependencies?: string[]
 		min_alive_workers_alert_threshold?: number
+		autoscaling?: AutoscalingConfig
 	} = {}
 
 	function loadNConfig() {
@@ -438,7 +442,7 @@
 										</Tooltip>
 									</svelte:fragment>
 									<Multiselect
-										outerDivClass="text-secondary !bg-surface-disabled"
+										outerDivClass="text-secondary !bg-surface-disabled !border-0"
 										disabled={!$enterpriseLicense}
 										bind:selected={selectedPriorityTags}
 										on:change={(e) => {
@@ -452,6 +456,9 @@
 													delete nconfig.priority_tags[e.detail.option]
 												}
 												dirty = true
+											} else if (e.detail.type === 'removeAll') {
+												nconfig.priority_tags = undefined
+												dirty = true
 											} else {
 												console.error(
 													`Priority tags multiselect - unknown event type: '${e.detail.type}'`
@@ -782,6 +789,21 @@
 		</Section>
 		<div class="mt-8" />
 
+		<Section label="Autoscaling" collapsable>
+			<div slot="header" class="ml-4 flex flex-row gap-2 items-center">
+				<Badge>Beta</Badge>
+				{#if nconfig.autoscaling?.enabled}
+					<Badge color="green">Enabled</Badge>
+				{/if}
+			</div>
+			<AutoscalingConfigEditor
+				on:dirty={() => (dirty = true)}
+				worker_tags={nconfig.worker_tags}
+				bind:config={nconfig.autoscaling}
+			/>
+		</Section>
+		<div class="mt-8" />
+
 		<Section
 			label="Init Script"
 			tooltip="Bash scripts run at start of the workers. More lightweight than having to require the worker images at the cost of being run on every start."
diff --git a/frontend/src/lib/components/WorkerTagPicker.svelte b/frontend/src/lib/components/WorkerTagPicker.svelte
index a00278b780..b9200c7385 100644
--- a/frontend/src/lib/components/WorkerTagPicker.svelte
+++ b/frontend/src/lib/components/WorkerTagPicker.svelte
@@ -4,6 +4,7 @@
 	import { workerTags } from '$lib/stores'
 	import AssignableTags from './AssignableTags.svelte'
 	import { WorkerService } from '$lib/gen'
+	import WorkerTagSelect from './WorkerTagSelect.svelte'
 
 	export let tag: string | undefined
 	export let popupPlacement: 'bottom-end' | 'top-end' = 'bottom-end'
@@ -20,28 +21,7 @@
 	<div class="max-w-sm grow">
 		{#if $workerTags}
 			{#if $workerTags?.length ?? 0 > 0}
-				<select
-					value={tag}
-					on:change={(e) => {
-						if (e.target?.['value'] == '') {
-							tag = undefined
-						} else if (e?.target?.['value']) {
-							tag = e.target?.['value']
-						}
-					}}
-				>
-					{#if tag}
-						<option value="">reset to default</option>
-					{:else}
-						<option value="" disabled selected>Worker Group Tag</option>
-					{/if}
-					{#if tag && tag != '' && !($workerTags ?? []).includes(tag)}
-						<option value={tag} selected>{tag}</option>
-					{/if}
-					{#each $workerTags ?? [] as tag (tag)}
-						<option value={tag}>{tag}</option>
-					{/each}
-				</select>
+				<WorkerTagSelect noLabel bind:tag />
 			{:else}
 				<div class="text-sm text-secondary flex flex-row gap-2">
 					No custom worker group tag defined on this instance in "Workers {'->'} Custom Tags"
@@ -71,5 +51,5 @@
 		}}
 		startIcon={{ icon: RotateCw }}
 	/>
-	<AssignableTags placement={popupPlacement} />
+	<AssignableTags placement={popupPlacement} color="nord" />
 </div>
diff --git a/frontend/src/lib/components/WorkerTagSelect.svelte b/frontend/src/lib/components/WorkerTagSelect.svelte
new file mode 100644
index 0000000000..bbe96d03cb
--- /dev/null
+++ b/frontend/src/lib/components/WorkerTagSelect.svelte
@@ -0,0 +1,44 @@
+<script lang="ts">
+	import { workerTags } from '$lib/stores'
+	import { WorkerService } from '$lib/gen'
+
+	export let tag: string | undefined
+	export let noLabel: boolean = false
+	export let nullTag: string | undefined = undefined
+
+	loadWorkerGroups()
+
+	async function loadWorkerGroups() {
+		if (!$workerTags) {
+			$workerTags = await WorkerService.getCustomTags()
+		}
+	}
+</script>
+
+<div class="flex gap-1 items-center">
+	{#if !noLabel}
+		<div class="text-tertiary text-2xs">tag</div>
+	{/if}
+	<select
+		class="min-w-32"
+		placeholder="Tag"
+		bind:value={tag}
+		on:change={(e) => {
+			if (tag == '') {
+				tag = undefined
+			}
+		}}
+	>
+		{#if tag}
+			<option value="">reset to default</option>
+		{:else}
+			<option value={undefined} disabled selected>{nullTag ? `default: ${nullTag}` : ''}</option>
+		{/if}
+		{#if tag && tag != '' && !($workerTags ?? []).includes(tag)}
+			<option value={tag} selected>{tag}</option>
+		{/if}
+		{#each $workerTags ?? [] as tag (tag)}
+			<option value={tag}>{tag}</option>
+		{/each}
+	</select>
+</div>
diff --git a/frontend/src/lib/components/ZitadelSetting.svelte b/frontend/src/lib/components/ZitadelSetting.svelte
index 4481f55004..16e15a6070 100644
--- a/frontend/src/lib/components/ZitadelSetting.svelte
+++ b/frontend/src/lib/components/ZitadelSetting.svelte
@@ -52,6 +52,10 @@
 				>
 				<input type="text" placeholder="yourorg" bind:value={org} />
 			</label>
+			<label class="block pb-2">
+				<span class="text-primary font-semibold text-sm">Custom Name</span>
+				<input type="text" placeholder="Custom Name" bind:value={value['display_name']} />
+			</label>
 			<label class="block pb-2">
 				<span class="text-primary font-semibold text-sm">Client Id</span>
 				<input type="text" placeholder="Client Id" bind:value={value['id']} />
diff --git a/frontend/src/lib/components/apps/components/buttons/AppButton.svelte b/frontend/src/lib/components/apps/components/buttons/AppButton.svelte
index b05d8e3d6e..ce9cd67c36 100644
--- a/frontend/src/lib/components/apps/components/buttons/AppButton.svelte
+++ b/frontend/src/lib/components/apps/components/buttons/AppButton.svelte
@@ -244,7 +244,7 @@
 </RunnableWrapper>
 
 {#if resolvedConfig?.confirmationModal?.selected === 'confirmationModal'}
-	<Portal target="#app-editor-top-level-drawer">
+	<Portal name="app-button" target="#app-editor-top-level-drawer">
 		<ConfirmationModal
 			open={Boolean(confirmedCallback)}
 			title={resolvedConfig?.confirmationModal?.configuration?.confirmationModal?.title ?? ''}
diff --git a/frontend/src/lib/components/apps/components/display/AppDownload.svelte b/frontend/src/lib/components/apps/components/display/AppDownload.svelte
index ef2822f32f..9af424ebed 100644
--- a/frontend/src/lib/components/apps/components/display/AppDownload.svelte
+++ b/frontend/src/lib/components/apps/components/display/AppDownload.svelte
@@ -109,7 +109,8 @@
 				color={resolvedConfig.color}
 				download={resolvedConfig.filename}
 				href={transformBareBase64IfNecessary(resolvedConfig.source)}
-				target="_self"
+				target="_blank"
+				ref="external"
 				nonCaptureEvent
 			>
 				<span class="truncate inline-flex gap-2 items-center">
diff --git a/frontend/src/lib/components/apps/components/display/dbtable/AppDbExplorer.svelte b/frontend/src/lib/components/apps/components/display/dbtable/AppDbExplorer.svelte
index 1bd13f6d7f..3456d5a0e0 100644
--- a/frontend/src/lib/components/apps/components/display/dbtable/AppDbExplorer.svelte
+++ b/frontend/src/lib/components/apps/components/display/dbtable/AppDbExplorer.svelte
@@ -695,7 +695,7 @@
 		{/if}
 	</div>
 </RunnableWrapper>
-<Portal>
+<Portal name="db-explorer">
 	<Drawer bind:this={insertDrawer} size="800px">
 		<DrawerContent title="Insert row" on:close={insertDrawer.closeDrawer}>
 			<svelte:fragment slot="actions">
diff --git a/frontend/src/lib/components/apps/components/display/dbtable/utils.ts b/frontend/src/lib/components/apps/components/display/dbtable/utils.ts
index 5e9b31890a..53a3ce9001 100644
--- a/frontend/src/lib/components/apps/components/display/dbtable/utils.ts
+++ b/frontend/src/lib/components/apps/components/display/dbtable/utils.ts
@@ -27,28 +27,29 @@ export type ColumnMetadata = {
 export type TableMetadata = ColumnMetadata[]
 
 export type ColumnDef = {
-	minWidth: number
-	hide: boolean
-	flex: number
-	sort: 'asc' | 'desc'
-	sortIndex: number
-	aggFunc: string
-	pivot: boolean
-	pivotIndex: number
-	pinned: 'left' | 'right' | boolean
-	rowGroup: boolean
-	rowGroupIndex: number
-	valueFormatter: string
-	valueParser: string
-	field: string
-	headerName: string
+	minWidth?: number
+	hide?: boolean
+	flex?: number
+	sort?: 'asc' | 'desc'
+	sortIndex?: number
+	aggFunc?: string
+	pivot?: boolean
+	pivotIndex?: number
+	pinned?: 'left' | 'right' | boolean
+	rowGroup?: boolean
+	rowGroupIndex?: number
+	valueFormatter?: string
+	valueParser?: string
+	field?: string
+	headerName?: string
+	children?: ColumnDef[]
 	// DBExplorer
-	ignored: boolean
-	hideInsert: boolean
-	editable: boolean
-	overrideDefaultValue: boolean
-	defaultUserValue: any
-	defaultValueNull: boolean
+	ignored?: boolean
+	hideInsert?: boolean
+	editable?: boolean
+	overrideDefaultValue?: boolean
+	defaultUserValue?: any
+	defaultValueNull?: boolean
 } & ColumnMetadata
 
 export async function loadTableMetaData(
diff --git a/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte b/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte
index 85b056bfcf..30e8242797 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte
@@ -150,7 +150,7 @@
 					outputs?.inputs.set(inputs, true)
 				},
 				onRemove: (id, rowIndex) => {
-				if (inputs?.[id] == undefined) {
+					if (inputs?.[id] == undefined) {
 						return
 					}
 					delete inputs[id][rowIndex]
@@ -267,10 +267,24 @@
 
 		// Validate each column definition
 		columnDefs.forEach((colDef, index) => {
+			let noField = !colDef.field || typeof colDef.field !== 'string' || colDef.field.trim() === ''
+
 			// Check if 'field' property exists and is a non-empty string
-			if (!colDef.field || typeof colDef.field !== 'string' || colDef.field.trim() === '') {
+			if (noField && !(colDef.children && Array.isArray(colDef.children))) {
 				isValid = false
-				errors.push(`Column at index ${index} is missing a valid 'field' property.`)
+				errors.push(
+					`Column at index ${index} is missing a valid 'field' property nor having any children.`
+				)
+			}
+
+			if (colDef.children && Array.isArray(colDef.children)) {
+				const { isValid: isChildrenValid, errors: childrenErrors } = validateColumnDefs(
+					colDef.children
+				)
+				if (!isChildrenValid) {
+					isValid = false
+					errors.push(...childrenErrors.map((err) => `Error in children at index ${index}: ${err}`))
+				}
 			}
 		})
 
@@ -310,6 +324,7 @@
 						: false,
 					initialState: state,
 					suppressRowDeselection: true,
+					enableCellTextSelection: true,
 					...(resolvedConfig?.extraConfig ?? {}),
 					onViewportChanged: (e) => {
 						firstRow = e.firstRow
diff --git a/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte b/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
index b6a0909a4d..5e4e84a9f5 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
@@ -334,6 +334,7 @@
 						initialState: state,
 						suppressRowDeselection: true,
 						suppressDragLeaveHidesColumns: true,
+						enableCellTextSelection: true,
 						...(resolvedConfig?.extraConfig ?? {}),
 						onStateUpdated: (e) => {
 							state = e?.api?.getState()
diff --git a/frontend/src/lib/components/apps/components/helpers/eval.ts b/frontend/src/lib/components/apps/components/helpers/eval.ts
index 9646250631..ede329350b 100644
--- a/frontend/src/lib/components/apps/components/helpers/eval.ts
+++ b/frontend/src/lib/components/apps/components/helpers/eval.ts
@@ -1,6 +1,7 @@
 import type { World } from '../../rx'
 import { sendUserToast } from '$lib/toast'
 import { waitJob } from '$lib/components/waitJob'
+import { base } from '$lib/base'
 
 export function computeGlobalContext(world: World | undefined, extraContext: any = {}) {
 	return {
@@ -25,7 +26,7 @@ function create_context_function_template(
 ) {
 	let hasReturnAsLastLine = noReturn || eval_string.split('\n').some((x) => x.startsWith('return '))
 	return `
-return async function (context, state, createProxy, goto, setTab, recompute, getAgGrid, setValue, setSelectedIndex, openModal, closeModal, open, close, validate, invalidate, validateAll, clearFiles, showToast, waitJob, askNewResource) {
+return async function (context, state, createProxy, goto, setTab, recompute, getAgGrid, setValue, setSelectedIndex, openModal, closeModal, open, close, validate, invalidate, validateAll, clearFiles, showToast, waitJob, askNewResource, downloadFile) {
 "use strict";
 ${
 	contextKeys && contextKeys.length > 0
@@ -63,7 +64,8 @@ type WmFunctor = (
 	clearFiles,
 	showToast,
 	waitJob,
-	askNewResource
+	askNewResource,
+	downloadFile
 ) => Promise<any>
 
 let functorCache: Record<number, WmFunctor> = {}
@@ -237,6 +239,64 @@ export async function eval_like(
 		async (id) => waitJob(id),
 		(id) => {
 			controlComponents[id]?.askNewResource?.()
+		},
+		(input, filename) => {
+			const handleError = (error) => {
+				console.error('Error downloading file:', error)
+				sendUserToast(
+					`Error downloading file: ${error.message}. Ensure it is a valid URL, a base64 encoded data URL (data:...), or a valid S3 object.`,
+					true
+				)
+			}
+
+			const isBase64 = (str) => {
+				try {
+					return btoa(atob(str)) === str
+				} catch (err) {
+					return false
+				}
+			}
+
+			const downloadFile = (url, downloadFilename) => {
+				console.log(url, downloadFilename)
+				const link = document.createElement('a')
+				link.href = url
+				link.download = downloadFilename || true
+				link.target = '_blank'
+				link.rel = 'external'
+				document.body.appendChild(link)
+				link.click()
+				document.body.removeChild(link)
+			}
+
+			if (typeof input === 'object' && input.s3) {
+				const workspaceId = computeGlobalContext(worldStore).ctx.workspace
+				const s3href = `${base}/api/w/${workspaceId}/job_helpers/download_s3_file?file_key=${
+					input?.s3
+				}${input?.storage ? `&storage=${input.storage}` : ''}`
+				downloadFile(s3href, filename || input.s3)
+			} else if (typeof input === 'string') {
+				if (input.startsWith('data:')) {
+					downloadFile(input, filename)
+				} else if (isBase64(input)) {
+					const base64Url = `data:application/octet-stream;base64,${input}`
+					downloadFile(base64Url, filename)
+				} else if (/^(http|https):\/\//.test(input) || input.startsWith('/')) {
+					const url = input.startsWith('/') ? `${window.location.origin}${input}` : input
+					console.log('Downloading file from:', url)
+					downloadFile(url, filename ?? url.split('/').pop()?.split('?')[0])
+				} else {
+					handleError(
+						new Error(
+							'The input must be a valid URL, a base64 encoded string, or a valid S3 object.'
+						)
+					)
+				}
+			} else {
+				handleError(
+					new Error('The input must be a string or an object with a getAuthenticatedUrl method.')
+				)
+			}
 		}
 	)
 }
diff --git a/frontend/src/lib/components/apps/components/inputs/AppDateInput.svelte b/frontend/src/lib/components/apps/components/inputs/AppDateInput.svelte
index 2ffab7236d..dd78968a70 100644
--- a/frontend/src/lib/components/apps/components/inputs/AppDateInput.svelte
+++ b/frontend/src/lib/components/apps/components/inputs/AppDateInput.svelte
@@ -38,7 +38,7 @@
 		result: undefined as string | undefined
 	})
 
-	$: !value && handleDefault(resolvedConfig.defaultValue)
+	$: handleDefault(resolvedConfig.defaultValue)
 
 	function formatDate(dateString: string, formatString: string = 'dd.MM.yyyy') {
 		if (formatString === '') {
diff --git a/frontend/src/lib/components/apps/components/inputs/AppMultiSelect.svelte b/frontend/src/lib/components/apps/components/inputs/AppMultiSelect.svelte
index 7e20df7975..7b75d6391e 100644
--- a/frontend/src/lib/components/apps/components/inputs/AppMultiSelect.svelte
+++ b/frontend/src/lib/components/apps/components/inputs/AppMultiSelect.svelte
@@ -186,7 +186,7 @@
 					{option}
 				</div>
 			</MultiSelect>
-			<Portal>
+			<Portal name="app-multiselect">
 				<div use:floatingContent class="z5000" hidden={!open}>
 					<!-- svelte-ignore a11y-no-static-element-interactions -->
 					<!-- svelte-ignore a11y-click-events-have-key-events -->
diff --git a/frontend/src/lib/components/apps/components/inputs/AppMultiSelectV2.svelte b/frontend/src/lib/components/apps/components/inputs/AppMultiSelectV2.svelte
index 717fa0aa6f..261fea0317 100644
--- a/frontend/src/lib/components/apps/components/inputs/AppMultiSelectV2.svelte
+++ b/frontend/src/lib/components/apps/components/inputs/AppMultiSelectV2.svelte
@@ -184,7 +184,7 @@
 					{option}
 				</div>
 			</MultiSelect>
-			<Portal>
+			<Portal name="app-multiselect-v2">
 				<div use:floatingContent class="z5000" hidden={!open}>
 					<!-- svelte-ignore a11y-click-events-have-key-events -->
 					<!-- svelte-ignore a11y-no-static-element-interactions -->
diff --git a/frontend/src/lib/components/apps/components/inputs/AppS3FileInput.svelte b/frontend/src/lib/components/apps/components/inputs/AppS3FileInput.svelte
index 7064449e6a..32f99024c6 100644
--- a/frontend/src/lib/components/apps/components/inputs/AppS3FileInput.svelte
+++ b/frontend/src/lib/components/apps/components/inputs/AppS3FileInput.svelte
@@ -34,7 +34,7 @@
 	}
 
 	let fileUploads: Writable<FileUploadData[]> = writable([])
-	const { app, worldStore, componentControl, runnableComponents } =
+	const { app, worldStore, componentControl, runnableComponents, workspace } =
 		getContext<AppViewerContext>('AppViewerContext')
 
 	$componentControl[id] = {
@@ -44,8 +44,9 @@
 		}
 	}
 
+	let value: { path: string; filename: string }[] | undefined = undefined
 	const outputs = initOutput($worldStore, id, {
-		result: [] as { path: string; filename: string }[] | undefined,
+		result: value ?? ([] as { path: string; filename: string }[] | undefined),
 		loading: false,
 		jobId: undefined
 	})
@@ -124,14 +125,18 @@
 		customResourceType="s3"
 		customClass={css?.container?.class}
 		customStyle={css?.container?.style}
+		{fileUploads}
+		{workspace}
 		on:addition={(evt) => {
 			const curr = outputs.result.peak()
-			outputs.result.set(curr.concat(evt.detail))
+			value = curr.concat(evt.detail)
+			outputs.result.set(value)
 			onFileChange?.forEach((id) => $runnableComponents?.[id]?.cb?.forEach((cb) => cb?.()))
 		}}
 		on:deletion={(evt) => {
 			const curr = outputs.result.peak()
-			outputs.result.set(curr.filter((file) => file.path !== evt.detail?.path))
+			value = curr.filter((file) => file.path !== evt.detail?.path)
+			outputs.result.set(value)
 		}}
 		{forceDisplayUploads}
 	/>
diff --git a/frontend/src/lib/components/apps/components/inputs/AppTextInput.svelte b/frontend/src/lib/components/apps/components/inputs/AppTextInput.svelte
index b7cf25c245..546125c410 100644
--- a/frontend/src/lib/components/apps/components/inputs/AppTextInput.svelte
+++ b/frontend/src/lib/components/apps/components/inputs/AppTextInput.svelte
@@ -43,7 +43,7 @@
 	let value: string | undefined = resolvedConfig.defaultValue
 
 	let outputs = initOutput($worldStore, id, {
-		result: ''
+		result: value ?? ''
 	})
 
 	onDestroy(() => {
diff --git a/frontend/src/lib/components/apps/components/layout/AppDrawer.svelte b/frontend/src/lib/components/apps/components/layout/AppDrawer.svelte
index af9688cdf1..e5e73536d0 100644
--- a/frontend/src/lib/components/apps/components/layout/AppDrawer.svelte
+++ b/frontend/src/lib/components/apps/components/layout/AppDrawer.svelte
@@ -113,7 +113,7 @@
 	</AlignWrapper>
 </div>
 
-<Portal target="#app-editor-top-level-drawer">
+<Portal target="#app-editor-top-level-drawer" name="app-drawer">
 	<Drawer
 		let:open
 		bind:this={appDrawer}
diff --git a/frontend/src/lib/components/apps/components/layout/AppModal.svelte b/frontend/src/lib/components/apps/components/layout/AppModal.svelte
index 6c27b56709..1a4bd62cce 100644
--- a/frontend/src/lib/components/apps/components/layout/AppModal.svelte
+++ b/frontend/src/lib/components/apps/components/layout/AppModal.svelte
@@ -145,7 +145,7 @@
 		</AlignWrapper>
 	</div>
 {/if}
-<Portal target="#app-editor-top-level-drawer">
+<Portal target="#app-editor-top-level-drawer" name="app-modal">
 	<Disposable
 		{id}
 		let:handleClickAway
diff --git a/frontend/src/lib/components/apps/editor/AppEditor.svelte b/frontend/src/lib/components/apps/editor/AppEditor.svelte
index fe3faab844..9eb1afc069 100644
--- a/frontend/src/lib/components/apps/editor/AppEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditor.svelte
@@ -19,11 +19,11 @@
 	import AppEditorHeader from './AppEditorHeader.svelte'
 	import GridEditor from './GridEditor.svelte'
 
-	import { Button, Tab } from '$lib/components/common'
+	import { Alert, Button, Tab } from '$lib/components/common'
 	import TabContent from '$lib/components/common/tabs/TabContent.svelte'
 	import Tabs from '$lib/components/common/tabs/Tabs.svelte'
 	import { userStore, workspaceStore } from '$lib/stores'
-	import { classNames, encodeState, sendUserToast } from '$lib/utils'
+	import { classNames, encodeState, getModifierKey, sendUserToast } from '$lib/utils'
 	import AppPreview from './AppPreview.svelte'
 	import ComponentList from './componentsPanel/ComponentList.svelte'
 	import ContextPanel from './contextPanel/ContextPanel.svelte'
@@ -693,7 +693,15 @@
 			{#if $componentActive}
 				<div
 					class="absolute z-50 inset-0 h-full w-full bg-surface-secondary [background-size:16px_16px]"
-				/>
+				>
+					<div class="w-min whitespace-nowrap mx-auto pt-0.5 z-50">
+						<Alert
+							title={`Press ${getModifierKey()} to drop component inside a container.`}
+							size="xs"
+							class="h-10 py-1"
+						/>
+					</div>
+				</div>
 			{/if}
 
 			<SplitPanesWrapper>
diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
index bd08c89810..af2f4563df 100644
--- a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
@@ -40,7 +40,8 @@
 		cleanValueProperties,
 		copyToClipboard,
 		truncateRev,
-		orderedJsonStringify
+		orderedJsonStringify,
+		type Value
 	} from '../../../utils'
 	import type {
 		AppInput,
@@ -85,6 +86,7 @@
 	import Summary from '$lib/components/Summary.svelte'
 	import ToggleEnable from '$lib/components/common/toggleButton-v2/ToggleEnable.svelte'
 	import HideButton from './settingsPanel/HideButton.svelte'
+	import DeployOverrideConfirmationModal from '$lib/components/common/confirmationModal/DeployOverrideConfirmationModal.svelte'
 
 	async function hash(message) {
 		try {
@@ -121,6 +123,11 @@
 	export let rightPanelHidden: boolean = false
 	export let bottomPanelHidden: boolean = false
 
+	let deployedValue: Value | undefined = undefined // Value to diff against
+	let deployedBy: string | undefined = undefined // Author
+	let confirmCallback: () => void = () => {} // What happens when user clicks `override` in warning
+	let open: boolean = false // Is confirmation modal open
+
 	const {
 		app,
 		summary,
@@ -360,6 +367,49 @@
 		}
 	}
 
+	async function handleUpdateApp(npath: string) {
+		// We have to make sure there is no updates when we clicked the button
+		await compareVersions()
+
+		if (onLatest) {
+			// Handle directly
+			await updateApp(npath)
+		} else {
+			// There is onLatest, but we need more information while deploying
+			// We need it to show diff
+			// Handle through confirmation modal
+			await syncWithDeployed()
+
+			confirmCallback = async () => {
+				open = false
+				await updateApp(npath)
+			}
+			// Open confirmation modal
+			open = true
+		}
+	}
+
+	async function syncWithDeployed() {
+		const deployedApp = await AppService.getAppByPath({
+			workspace: $workspaceStore!,
+			path: appPath,
+			withStarredInfo: true
+		})
+
+		deployedBy = deployedApp.created_by
+
+		// Strip off extra information
+		deployedValue = {
+			...deployedApp,
+			starred: undefined,
+			id: undefined,
+			created_at: undefined,
+			created_by: undefined,
+			versions: undefined,
+			extra_perms: undefined //
+		}
+	}
+
 	async function updateApp(npath: string) {
 		await computeTriggerables()
 		await AppService.updateApp({
@@ -577,12 +627,18 @@
 		if (version === undefined) {
 			return
 		}
-		const appHistory = await AppService.getAppHistoryByPath({
-			workspace: $workspaceStore!,
-			path: appPath
-		})
-		onLatest = version === appHistory[0]?.version
+		try {
+			const appVersion = await AppService.getAppLatestVersion({
+				workspace: $workspaceStore!,
+				path: appPath
+			})
+			onLatest = version === appVersion?.version
+		} catch (e) {
+			console.error('Error comparing versions', e)
+			onLatest = true
+		}
 	}
+
 	$: saveDrawerOpen && compareVersions()
 
 	let selectedJobId: string | undefined = undefined
@@ -706,14 +762,18 @@
 		{
 			displayName: 'Diff',
 			icon: DiffIcon,
-			action: () => {
+			action: async () => {
 				if (!savedApp) {
 					return
 				}
+
+				// deployedValue should be syncronized when we open Diff
+				await syncWithDeployed()
+
 				diffDrawer?.openDrawer()
 				diffDrawer?.setDiff({
 					mode: 'normal',
-					deployed: savedApp,
+					deployed: deployedValue ?? savedApp,
 					draft: savedApp.draft,
 					current: {
 						summary: $summary,
@@ -766,6 +826,20 @@
 	}}
 />
 
+<DeployOverrideConfirmationModal
+	bind:deployedBy
+	bind:confirmCallback
+	bind:open
+	{diffDrawer}
+	bind:deployedValue
+	currentValue={{
+		summary: $summary,
+		value: $app,
+		path: newPath || savedApp?.draft?.path || savedApp?.path,
+		policy
+	}}
+/>
+
 {#if appPath == ''}
 	<Drawer bind:open={draftDrawerOpen} size="800px">
 		<DrawerContent title="Initial draft save" on:close={() => closeDraftDrawer()}>
@@ -823,8 +897,8 @@
 <Drawer bind:open={saveDrawerOpen} size="800px">
 	<DrawerContent title="Deploy" on:close={() => closeSaveDrawer()}>
 		{#if !onLatest}
-			<Alert title="You're not on the latest app version" type="warning">
-				By deploying, you may overwrite changes made by other users.
+			<Alert title="You're not on the latest app version. " type="warning">
+				By deploying, you may overwrite changes made by other users. Press 'Deploy' to see diff.
 			</Alert>
 			<div class="py-2" />
 		{/if}
@@ -880,15 +954,18 @@
 				variant="border"
 				color="light"
 				disabled={!savedApp || savedApp.draft_only}
-				on:click={() => {
+				on:click={async () => {
 					if (!savedApp) {
 						return
 					}
+					// deployedValue should be syncronized when we open Diff
+					await syncWithDeployed()
+
 					saveDrawerOpen = false
 					diffDrawer?.openDrawer()
 					diffDrawer?.setDiff({
 						mode: 'normal',
-						deployed: savedApp,
+						deployed: deployedValue ?? savedApp,
 						draft: savedApp.draft,
 						current: {
 							summary: $summary,
@@ -902,7 +979,7 @@
 								if (appPath == '') {
 									createApp(newPath)
 								} else {
-									updateApp(newPath)
+									handleUpdateApp(newPath)
 								}
 							}
 						}
@@ -921,7 +998,7 @@
 					if (appPath == '') {
 						createApp(newPath)
 					} else {
-						updateApp(newPath)
+						handleUpdateApp(newPath)
 					}
 				}}
 			>
diff --git a/frontend/src/lib/components/apps/editor/AppExportButton.svelte b/frontend/src/lib/components/apps/editor/AppExportButton.svelte
index f41507fa16..abc0136b07 100644
--- a/frontend/src/lib/components/apps/editor/AppExportButton.svelte
+++ b/frontend/src/lib/components/apps/editor/AppExportButton.svelte
@@ -49,9 +49,8 @@
 							size="sm"
 							startIcon={{ icon: Clipboard }}
 							btnClasses="absolute top-2 right-2 w-min z-20"
-						>
-							Copy content
-						</Button>
+							iconOnly
+						/>
 						{#key rawType}
 							<Highlight
 								class="overflow-auto px-1 flex-1"
diff --git a/frontend/src/lib/components/apps/editor/AppPreview.svelte b/frontend/src/lib/components/apps/editor/AppPreview.svelte
index 5b84cb5616..09bcb4e50c 100644
--- a/frontend/src/lib/components/apps/editor/AppPreview.svelte
+++ b/frontend/src/lib/components/apps/editor/AppPreview.svelte
@@ -218,7 +218,7 @@
 
 <svelte:window on:hashchange={hashchange} on:resize={resizeWindow} />
 
-<div class="relative h-full grow" bind:clientHeight={appHeight}>
+<div class="relative min-h-full grow" bind:clientHeight={appHeight}>
 	<div id="app-editor-top-level-drawer" />
 	<div id="app-editor-select" />
 
diff --git a/frontend/src/lib/components/apps/editor/GridEditor.svelte b/frontend/src/lib/components/apps/editor/GridEditor.svelte
index 926c5fe26f..c7e93d55dc 100644
--- a/frontend/src/lib/components/apps/editor/GridEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/GridEditor.svelte
@@ -1,13 +1,21 @@
 <script lang="ts">
 	import { getContext } from 'svelte'
 	import type { AppEditorContext, AppViewerContext } from '../types'
-	import { columnConfiguration, isFixed, toggleFixed } from '../gridUtils'
+	import { columnConfiguration, gridColumns, isFixed, toggleFixed } from '../gridUtils'
 	import { twMerge } from 'tailwind-merge'
 
 	import HiddenComponent from '../components/helpers/HiddenComponent.svelte'
 	import Component from './component/Component.svelte'
 	import { push } from '$lib/history'
-	import { dfs, expandGriditem, findGridItem } from './appUtils'
+	import {
+		dfs,
+		expandGriditem,
+		findGridItem,
+		findGridItemParentGrid,
+		insertNewGridItem,
+		isContainer,
+		subGridIndexKey
+	} from './appUtils'
 	import Grid from '../svelte-grid/Grid.svelte'
 	import { deepEqual } from 'fast-equals'
 	import ComponentWrapper from './component/ComponentWrapper.svelte'
@@ -32,7 +40,8 @@
 		parentWidth,
 		breakpoint,
 		allIdsInPath,
-		bgRuns
+		bgRuns,
+		worldStore
 	} = getContext<AppViewerContext>('AppViewerContext')
 
 	const { history, scale, componentActive } = getContext<AppEditorContext>('AppEditorContext')
@@ -61,6 +70,53 @@
 		}
 		$app = $app
 	}
+
+	export function moveComponentBetweenSubgrids(
+		componentId: string,
+		parentComponentId: string,
+		subGridIndex: number,
+		position?: { x: number; y: number }
+	) {
+		// Find the component in the source subgrid
+		const component = findGridItem($app, componentId)
+
+		if (!component) {
+			return
+		}
+
+		let parentGrid = findGridItemParentGrid($app, component.id)
+		if (parentGrid) {
+			$app.subgrids &&
+				($app.subgrids[parentGrid] = $app.subgrids[parentGrid].filter(
+					(item) => item.id !== component?.id
+				))
+		} else {
+			$app.grid = $app.grid.filter((item) => item.id !== component?.id)
+		}
+
+		const gridItem = component
+		insertNewGridItem(
+			$app,
+			(id) => ({ ...gridItem.data, id }),
+			{ parentComponentId: parentComponentId, subGridIndex: subGridIndex },
+			Object.fromEntries(gridColumns.map((column) => [column, gridItem[column]])),
+			component.id,
+			position,
+			undefined,
+			undefined,
+			undefined,
+			true
+		)
+
+		// Update the app state
+		$app = { ...$app }
+
+		$selectedComponent = [parentComponentId]
+		$focusedGrid = {
+			parentComponentId,
+			subGridIndex
+		}
+	}
 </script>
 
 <div class="w-full z-[1000] overflow-visible h-full">
@@ -134,10 +190,37 @@
 					push(history, $app)
 					$app.grid = e.detail
 				}}
+				root
 				let:dataItem
 				let:hidden
 				let:overlapped
+				let:moveMode
+				let:componentDraggedId
 				cols={columnConfiguration}
+				on:dropped={(e) => {
+					const { id, overlapped, x, y } = e.detail
+
+					const overlappedComponent = findGridItem($app, overlapped)
+
+					if (overlappedComponent && !isContainer(overlappedComponent.data.type)) {
+						return
+					}
+
+					if (!overlapped) {
+						return
+					}
+
+					if (id === overlapped) {
+						return
+					}
+
+					moveComponentBetweenSubgrids(
+						id,
+						overlapped,
+						subGridIndexKey(overlappedComponent?.data?.type, overlapped, $worldStore),
+						{ x, y }
+					)
+				}}
 			>
 				<ComponentWrapper
 					id={dataItem.id}
@@ -177,7 +260,9 @@
 							on:fillHeight={() => {
 								handleFillHeight(dataItem.id)
 							}}
-							overlapped={overlapped !== undefined}
+							{overlapped}
+							{moveMode}
+							{componentDraggedId}
 						/>
 					</GridEditorMenu>
 				</ComponentWrapper>
diff --git a/frontend/src/lib/components/apps/editor/GridEditorMenu.svelte b/frontend/src/lib/components/apps/editor/GridEditorMenu.svelte
index be91a3a6a9..9b9a5f66f2 100644
--- a/frontend/src/lib/components/apps/editor/GridEditorMenu.svelte
+++ b/frontend/src/lib/components/apps/editor/GridEditorMenu.svelte
@@ -167,7 +167,7 @@
 	<slot />
 
 	{#if contextMenuVisible}
-		<Portal>
+		<Portal name="grid-editor">
 			<div style="position: fixed; top: {menuY}px; left: {menuX}px; z-index:6000;">
 				<div class="rounded-md bg-surface border shadow-md divide-y w-64">
 					<div class="p-1" use:clickOutside={false}>
diff --git a/frontend/src/lib/components/apps/editor/SubGridEditor.svelte b/frontend/src/lib/components/apps/editor/SubGridEditor.svelte
index 30b5d76b86..5e16b51a3f 100644
--- a/frontend/src/lib/components/apps/editor/SubGridEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/SubGridEditor.svelte
@@ -3,10 +3,19 @@
 	import { classNames } from '$lib/utils'
 	import { createEventDispatcher, getContext, onDestroy } from 'svelte'
 	import { twMerge } from 'tailwind-merge'
-	import { columnConfiguration, isFixed, toggleFixed } from '../gridUtils'
+	import { columnConfiguration, gridColumns, isFixed, toggleFixed } from '../gridUtils'
 	import Grid from '../svelte-grid/Grid.svelte'
 	import type { AppEditorContext, AppViewerContext, GridItem } from '../types'
-	import { expandGriditem, findGridItem, maxHeight, selectId } from './appUtils'
+	import {
+		expandGriditem,
+		findGridItem,
+		findGridItemParentGrid,
+		insertNewGridItem,
+		isContainer,
+		maxHeight,
+		selectId,
+		subGridIndexKey
+	} from './appUtils'
 	import Component from './component/Component.svelte'
 	import ComponentWrapper from './component/ComponentWrapper.svelte'
 	import GridViewer from './GridViewer.svelte'
@@ -15,6 +24,7 @@
 	export let containerHeight: number | undefined = undefined
 	export let containerWidth: number | undefined = undefined
 	let classes = ''
+
 	export { classes as class }
 	export let style = ''
 	export let noPadding = false
@@ -34,7 +44,8 @@
 		mode,
 		parentWidth,
 		breakpoint,
-		allIdsInPath
+		allIdsInPath,
+		worldStore
 	} = getContext<AppViewerContext>('AppViewerContext')
 
 	const editorContext = getContext<AppEditorContext>('AppEditorContext')
@@ -68,6 +79,98 @@
 	let container: HTMLElement | undefined = undefined
 
 	$: maxRow = maxHeight($app.subgrids?.[subGridId] ?? [], containerHeight ?? 0, $breakpoint)
+
+	export function moveComponentBetweenSubgrids(
+		componentId: string,
+		parentComponentId: string,
+		subGridIndex: number,
+		position?: { x: number; y: number }
+	) {
+		// Find the component in the source subgrid
+		const component = findGridItem($app, componentId)
+
+		if (!component) {
+			return
+		}
+
+		let parentGrid = findGridItemParentGrid($app, component.id)
+
+		if (parentGrid) {
+			$app.subgrids &&
+				($app.subgrids[parentGrid] = $app.subgrids[parentGrid].filter(
+					(item) => item.id !== component?.id
+				))
+		} else {
+			$app.grid = $app.grid.filter((item) => item.id !== component?.id)
+		}
+
+		const gridItem = component
+
+		insertNewGridItem(
+			$app,
+			(id) => ({ ...gridItem.data, id }),
+			{ parentComponentId: parentComponentId, subGridIndex: subGridIndex },
+			Object.fromEntries(gridColumns.map((column) => [column, gridItem[column]])),
+			component.id,
+			position,
+			undefined,
+			undefined,
+			undefined,
+			true
+		)
+
+		// Update the app state
+		$app = { ...$app }
+
+		if (parentGrid) {
+			$focusedGrid = {
+				parentComponentId,
+				subGridIndex
+			}
+
+			$selectedComponent = [parentComponentId]
+		} else {
+			$focusedGrid = undefined
+		}
+	}
+
+	export function moveToRoot(componentId: string, position?: { x: number; y: number }) {
+		// Find the component in the source subgrid
+		const component = findGridItem($app, componentId)
+
+		if (!component) {
+			return
+		}
+
+		let parentGrid = findGridItemParentGrid($app, component.id)
+
+		if (parentGrid) {
+			$app.subgrids &&
+				($app.subgrids[parentGrid] = $app.subgrids[parentGrid].filter(
+					(item) => item.id !== component?.id
+				))
+		} else {
+			$app.grid = $app.grid.filter((item) => item.id !== component?.id)
+		}
+
+		const gridItem = component
+
+		insertNewGridItem(
+			$app,
+			(id) => ({ ...gridItem.data, id }),
+			undefined,
+			Object.fromEntries(gridColumns.map((column) => [column, gridItem[column]])),
+			component.id,
+			position,
+			undefined,
+			undefined,
+			undefined,
+			true
+		)
+
+		// Update the app state
+		$app = { ...$app }
+	}
 </script>
 
 <div
@@ -109,10 +212,39 @@
 					let:dataItem
 					let:hidden
 					let:overlapped
+					let:moveMode
+					let:componentDraggedId
 					cols={columnConfiguration}
 					scroller={container}
 					parentWidth={$parentWidth - 17}
 					{containerWidth}
+					on:dropped={(e) => {
+						const { id, overlapped, x, y } = e.detail
+
+						if (!overlapped) {
+							moveToRoot(id, { x, y })
+						} else {
+							const overlappedComponent = findGridItem($app, overlapped)
+
+							if (overlappedComponent && !isContainer(overlappedComponent.data.type)) {
+								return
+							}
+							if (!overlapped) {
+								return
+							}
+
+							if (id === overlapped) {
+								return
+							}
+
+							moveComponentBetweenSubgrids(
+								id,
+								overlapped,
+								subGridIndexKey(overlappedComponent?.data?.type, overlapped, $worldStore),
+								{ x, y }
+							)
+						}
+					}}
 				>
 					<ComponentWrapper
 						id={dataItem.id}
@@ -160,6 +292,8 @@
 									}
 									$app = $app
 								}}
+								{moveMode}
+								{componentDraggedId}
 							/>
 						</GridEditorMenu>
 					</ComponentWrapper>
diff --git a/frontend/src/lib/components/apps/editor/appUtils.ts b/frontend/src/lib/components/apps/editor/appUtils.ts
index 602a5bad0a..998d3d8a1c 100644
--- a/frontend/src/lib/components/apps/editor/appUtils.ts
+++ b/frontend/src/lib/components/apps/editor/appUtils.ts
@@ -20,7 +20,6 @@ import {
 import { gridColumns } from '../gridUtils'
 import { allItems } from '../utils'
 import type { Output, World } from '../rx'
-import gridHelp from '../svelte-grid/utils/helper'
 import type { FilledItem, Size } from '../svelte-grid/types'
 import type {
 	StaticAppInput,
@@ -35,6 +34,7 @@ import { deepMergeWithPriority } from '$lib/utils'
 import { sendUserToast } from '$lib/toast'
 import { getNextId } from '$lib/components/flows/idUtils'
 import { enterpriseLicense } from '$lib/stores'
+import gridHelp from '../svelte-grid/utils/helper'
 
 export function findComponentSettings(app: App, id: string | undefined) {
 	if (!id) return undefined
@@ -245,7 +245,8 @@ export function createNewGridItem(
 	columns?: Record<number, any>,
 	initialPosition: { x: number; y: number } = { x: 0, y: 0 },
 	recOverride?: Record<number, Size>,
-	fixed?: boolean
+	fixed?: boolean,
+	shouldNotFindSpace?: boolean
 ): GridItem {
 	const newComponent = {
 		fixed: fixed ?? false,
@@ -272,11 +273,28 @@ export function createNewGridItem(
 				h: rec.h
 			}
 		} else {
-			newItem[column] = columns[column]
+			newItem[column] = {
+				...columns[column],
+				x: initialPosition.x,
+				y: initialPosition.y
+			}
 		}
-		const position = gridHelp.findSpace(newItem, grid, column) as { x: number; y: number }
 
-		newItem[column] = { ...newItem[column], ...position }
+		let shouldComputePosition: boolean = false
+
+		// Fallback to avoid component disapearing
+		if (initialPosition.x === undefined || initialPosition.y === undefined) {
+			newItem[column].x = 0
+			newItem[column].y = 0
+			shouldComputePosition = true
+		}
+
+		// Either the final position is controlled using initialPosition or the position is computed because the component positions are wrong
+		if (!shouldNotFindSpace || shouldComputePosition) {
+			const position = gridHelp.findSpace(newItem, grid, column) as { x: number; y: number }
+
+			newItem[column] = { ...newItem[column], ...position }
+		}
 	})
 
 	return newItem
@@ -392,7 +410,8 @@ export function insertNewGridItem(
 	initialPosition: { x: number; y: number } = { x: 0, y: 0 },
 	recOverride?: Record<number, Size>,
 	keepSubgrids?: boolean,
-	fixed?: boolean
+	fixed?: boolean,
+	shouldNotFindSpace?: boolean
 ): string {
 	const id = keepId ?? getNextGridItemId(app)
 
@@ -439,7 +458,16 @@ export function insertNewGridItem(
 
 	let grid = focusedGrid ? app.subgrids[key!] : app.grid
 
-	const newItem = createNewGridItem(grid, id, data, columns, initialPosition, recOverride, fixed)
+	const newItem = createNewGridItem(
+		grid,
+		id,
+		data,
+		columns,
+		initialPosition,
+		recOverride,
+		fixed,
+		shouldNotFindSpace
+	)
 	grid.push(newItem)
 	return id
 }
@@ -1135,3 +1163,120 @@ export function setUpTopBarComponentContent(id: string, app: App) {
 		}
 	)
 }
+
+export function isContainer(type: string): boolean {
+	return (
+		type === 'containercomponent' ||
+		type === 'tabscomponent' ||
+		type === 'verticalsplitpanescomponent' ||
+		type === 'horizontalsplitpanescomponent' ||
+		type === 'steppercomponent' ||
+		type === 'listcomponent' ||
+		type === 'decisiontreecomponent'
+	)
+}
+
+export function subGridIndexKey(type: string | undefined, id: string, world: World): number {
+	switch (type) {
+		case 'containercomponent':
+		case 'verticalsplitpanescomponent':
+		case 'horizontalsplitpanescomponent':
+		case 'listcomponent':
+			return 0
+		case 'tabscomponent': {
+			return (world?.outputsById?.[id]?.selectedTabIndex?.peak() as number) ?? 0
+		}
+		case 'steppercomponent': {
+			return (world?.outputsById?.[id]?.currentStepIndex?.peak() as number) ?? 0
+		}
+		case 'decisiontreecomponent': {
+			return (world?.outputsById?.[id]?.currentNodeIndex?.peak() as number) ?? 0
+		}
+	}
+
+	return 0
+}
+
+export function computePosition(
+	clientX: number,
+	clientY: number,
+	xPerPx: number,
+	yPerPx: number,
+	overlapped?: string,
+	element?: HTMLElement
+) {
+	const overlappedElement = overlapped
+		? document.getElementById(`component-${overlapped}`)
+		: document.getElementById('root-grid')
+
+	const xRelativeToElement = element ? clientX - element.getBoundingClientRect().left : 0
+	const yRelativeToElement = element ? clientY - element.getBoundingClientRect().top : 0
+
+	const xRelativeToOverlappedElement = overlappedElement
+		? clientX - overlappedElement.getBoundingClientRect().left - xRelativeToElement
+		: 0
+	const yRelativeToOverlappedElement = overlappedElement
+		? clientY - overlappedElement.getBoundingClientRect().top - yRelativeToElement
+		: 0
+
+	const gridX = Math.max(Math.round(xRelativeToOverlappedElement / xPerPx) ?? 0, 0)
+	const gridY = Math.max(Math.round(yRelativeToOverlappedElement / yPerPx) ?? 0, 0)
+
+	return {
+		x: gridX,
+		y: gridY
+	}
+}
+
+export function getDeltaYByComponent(type: string) {
+	switch (type) {
+		case 'steppercomponent': {
+			return '36px + 0.5rem'
+		}
+		case 'tabscomponent': {
+			return '32px'
+		}
+		default:
+			return '0px'
+	}
+}
+
+export function getDeltaXByComponent(type: string) {
+	switch (type) {
+		case 'steppercomponent': {
+			return '0.5rem'
+		}
+		case 'tabscomponent': {
+			return '0px'
+		}
+		default:
+			return '0px'
+	}
+}
+
+export type GridShadow = {
+	x: number
+	y: number
+	xPerPx: number
+	yPerPx: number
+	w: number
+	h: number
+}
+
+export function areShadowsTheSame(
+	shadow1: GridShadow | undefined,
+	shadow2: GridShadow | undefined
+) {
+	if (!shadow1 || !shadow2) {
+		return false
+	}
+
+	return (
+		shadow1.x === shadow2.x &&
+		shadow1.y === shadow2.y &&
+		shadow1.xPerPx === shadow2.xPerPx &&
+		shadow1.yPerPx === shadow2.yPerPx &&
+		shadow1.w === shadow2.w &&
+		shadow1.h === shadow2.h
+	)
+}
diff --git a/frontend/src/lib/components/apps/editor/appUtilsInfer.ts b/frontend/src/lib/components/apps/editor/appUtilsInfer.ts
index 28f15e6c37..0a89e2e06b 100644
--- a/frontend/src/lib/components/apps/editor/appUtilsInfer.ts
+++ b/frontend/src/lib/components/apps/editor/appUtilsInfer.ts
@@ -19,6 +19,7 @@ export async function inferDeps(
 					componentId == 'iter' ||
 					componentId == 'group' ||
 					componentId == 'file' ||
+					componentId == 'state' ||
 					id in (worldOutputs[componentId] ?? {})
 			)
 			.map(([componentId, id]) => ({
diff --git a/frontend/src/lib/components/apps/editor/component/Component.svelte b/frontend/src/lib/components/apps/editor/component/Component.svelte
index 6561c1b1a5..56c39ed072 100644
--- a/frontend/src/lib/components/apps/editor/component/Component.svelte
+++ b/frontend/src/lib/components/apps/editor/component/Component.svelte
@@ -81,6 +81,7 @@
 	import AppRecomputeAll from '../../components/display/AppRecomputeAll.svelte'
 	import AppUserResource from '../../components/inputs/AppUserResource.svelte'
 	import { Anchor } from 'lucide-svelte'
+	import { findGridItemParentGrid, isContainer } from '../appUtils'
 
 	export let component: AppComponent
 	export let selected: boolean
@@ -88,9 +89,10 @@
 	export let render: boolean
 	export let hidden: boolean
 	export let fullHeight: boolean
-	export let overlapped: boolean = false
-
-	const { mode, app, hoverStore, connectingInput, selectedComponent } =
+	export let overlapped: string | undefined = undefined
+	export let moveMode: string | undefined = undefined
+	export let componentDraggedId: string | undefined = undefined
+	const { mode, app, hoverStore, connectingInput } =
 		getContext<AppViewerContext>('AppViewerContext')
 
 	const editorContext = getContext<AppEditorContext>('AppEditorContext')
@@ -121,6 +123,36 @@
 			}
 		}, 50)
 	}
+
+	function componentDraggedIsNotChild(componentDraggedId: string, componentId: string) {
+		let parentGrid = findGridItemParentGrid($app, componentDraggedId)
+
+		return !parentGrid?.startsWith(`${componentId}-`)
+	}
+
+	function areOnTheSameSubgrid(componentDraggedId: string, componentId: string) {
+		return (
+			findGridItemParentGrid($app, componentDraggedId) === findGridItemParentGrid($app, componentId)
+		)
+	}
+
+	let cachedComponentDraggedIsNotChild: boolean | undefined
+	let cachedAreOnTheSameSubgrid: boolean | undefined
+
+	function updateCache(componentDraggedId: string | undefined) {
+		if (componentDraggedId) {
+			cachedComponentDraggedIsNotChild = componentDraggedIsNotChild(
+				componentDraggedId,
+				component.id
+			)
+			cachedAreOnTheSameSubgrid = areOnTheSameSubgrid(componentDraggedId, component.id)
+		} else {
+			cachedComponentDraggedIsNotChild = undefined
+			cachedAreOnTheSameSubgrid = undefined
+		}
+	}
+
+	$: updateCache(componentDraggedId)
 </script>
 
 <!-- svelte-ignore a11y-mouse-events-have-key-events -->
@@ -139,18 +171,23 @@
 		hidden && $mode === 'preview' ? 'hidden' : ''
 	)}
 >
-	{#if locked && componentActive && $componentActive && $selectedComponent?.[0] !== component.id && overlapped}
+	{#if locked && componentActive && $componentActive && moveMode === 'move' && componentDraggedId && componentDraggedId !== component.id && cachedAreOnTheSameSubgrid}
 		<div
-			class={twMerge(
-				'absolute inset-0 bg-locked center-center flex-col z-50',
-				overlapped ? 'bg-locked-hover' : ''
-			)}
+			class={twMerge('absolute inset-0 bg-locked center-center flex-col z-50', 'bg-locked-hover')}
 		>
 			<div class="bg-surface p-2 shadow-sm rounded-md flex center-center flex-col gap-2">
 				<Anchor size={24} class="text-primary " />
-				<div class="text-xs">Anchored: The component cannot be moved</div>
+				<div class="text-xs"> Anchored: The component cannot be moved. </div>
 			</div>
 		</div>
+	{:else if moveMode === 'insert' && isContainer(component.type) && componentDraggedId && componentDraggedId !== component.id && cachedComponentDraggedIsNotChild}
+		<div
+			class={twMerge(
+				'absolute inset-0  flex-col rounded-md bg-blue-100 dark:bg-gray-800 bg-opacity-50',
+				'outline-dashed outline-offset-2 outline-2 outline-blue-300 dark:outline-blue-700',
+				overlapped === component?.id ? 'bg-draggedover dark:bg-draggedover-dark' : ''
+			)}
+		/>
 	{/if}
 	{#if $mode !== 'preview'}
 		<ComponentHeader
diff --git a/frontend/src/lib/components/apps/editor/contextPanel/components/OutputHeader.svelte b/frontend/src/lib/components/apps/editor/contextPanel/components/OutputHeader.svelte
index 7fa66daf82..e95c207628 100644
--- a/frontend/src/lib/components/apps/editor/contextPanel/components/OutputHeader.svelte
+++ b/frontend/src/lib/components/apps/editor/contextPanel/components/OutputHeader.svelte
@@ -258,7 +258,7 @@
 					<IdEditor
 						{id}
 						on:selected={() => ($selectedComponent = [id])}
-						on:change={({ detail }) => renameId(detail)}
+						on:save={({ detail }) => renameId(detail)}
 					/></div
 				>
 			{/if}
diff --git a/frontend/src/lib/components/apps/svelte-grid/Grid.svelte b/frontend/src/lib/components/apps/svelte-grid/Grid.svelte
index 84652710de..3b18732c67 100644
--- a/frontend/src/lib/components/apps/svelte-grid/Grid.svelte
+++ b/frontend/src/lib/components/apps/svelte-grid/Grid.svelte
@@ -1,16 +1,44 @@
+<script lang="ts" context="module">
+	import { writable } from 'svelte/store'
+
+	const componentDraggedIdStore = writable<string | undefined>(undefined)
+	const componentDraggedParentIdStore = writable<string | undefined>(undefined)
+	const overlappedStore = writable<string | undefined>(undefined)
+	const fakeShadowStore = writable<GridShadow | undefined>(undefined)
+	const isCtrlOrMetaPressedStore = writable<boolean>(false)
+</script>
+
 <script lang="ts">
+	import gridHelp from './utils/helper'
+	import type { AppViewerContext, GridItem } from '../types'
+	import { twMerge } from 'tailwind-merge'
+
 	import { getContainerHeight } from './utils/container'
 	import { moveItem, getItemById, specifyUndefinedColumns } from './utils/item'
-	import { onMount, createEventDispatcher } from 'svelte'
+	import { onMount, createEventDispatcher, getContext } from 'svelte'
 	import { getColumn, throttle } from './utils/other'
 	import MoveResize from './MoveResize.svelte'
 	import type { FilledItem } from './types'
-	import { ROW_GAP_X, ROW_GAP_Y, ROW_HEIGHT, sortGridItemsPosition } from '../editor/appUtils'
+	import {
+		areShadowsTheSame,
+		findGridItemParentGrid,
+		getDeltaXByComponent,
+		getDeltaYByComponent,
+		isContainer,
+		ROW_GAP_X,
+		ROW_GAP_Y,
+		ROW_HEIGHT,
+		sortGridItemsPosition,
+		subGridIndexKey,
+		type GridShadow
+	} from '../editor/appUtils'
 
 	const dispatch = createEventDispatcher()
 
 	type T = $$Generic
 
+	const { app, worldStore } = getContext<AppViewerContext>('AppViewerContext')
+
 	export let items: FilledItem<T>[]
 	export let rowHeight: number = ROW_HEIGHT
 	export let cols: [number, number][]
@@ -22,11 +50,10 @@
 	export let containerWidth: number | undefined = undefined
 	export let scroller: HTMLElement | undefined = undefined
 	export let sensor = 20
-
+	export let root: boolean = false
 	export let parentWidth: number | undefined = undefined
 
 	let getComputedCols
-
 	let container
 
 	$: [gapX, gapY] = gap
@@ -81,7 +108,21 @@
 	let sortedItems: FilledItem<T>[] = []
 	$: sortedItems = JSON.parse(JSON.stringify(items)).sort((a, b) => a.id.localeCompare(b.id))
 
+	let resizing: boolean = false
+
+	function handleKeyUp(event) {
+		if ((event.key === 'Control' || event.key === 'Meta') && $isCtrlOrMetaPressedStore) {
+			setTimeout(() => {
+				$isCtrlOrMetaPressedStore = false
+
+				$fakeShadowStore = undefined
+			}, 50)
+		}
+	}
+	const initialFixedStates = new Map()
+
 	let initItems: FilledItem<T>[] | undefined = undefined
+
 	const updateMatrix = ({ detail }) => {
 		let isPointerUp = detail.isPointerUp
 		let citems: FilledItem<T>[]
@@ -114,10 +155,44 @@
 						...shadows[id]
 					}
 				}
-				let { items, overlap } = moveItem(activeItem, sortedItems, getComputedCols)
 
-				sortedItems = items
-				overlapped = overlap ? id : undefined
+				if ($isCtrlOrMetaPressedStore) {
+					if ($componentDraggedParentIdStore === $overlappedStore) {
+						const fixedContainer = sortedItems.map((item) => {
+							if (isContainer(item.data['type'])) {
+								initialFixedStates.set(item.id, {
+									item3Fixed: item[3].fixed,
+									item12Fixed: item[12].fixed
+								})
+
+								item[3].fixed = true
+								item[12].fixed = true
+							}
+
+							return item
+						})
+
+						let { items } = moveItem(activeItem, fixedContainer, getComputedCols)
+
+						items = items.map((item) => {
+							if (initialFixedStates.has(item.id)) {
+								const initialState = initialFixedStates.get(item.id)
+
+								if (initialState) {
+									item[3].fixed = initialState.item3Fixed
+									item[12].fixed = initialState.item12Fixed
+								}
+							}
+							return item
+						})
+
+						sortedItems = items
+					}
+				} else {
+					let { items } = moveItem(activeItem, sortedItems, getComputedCols)
+
+					sortedItems = items
+				}
 			}
 		}
 
@@ -139,6 +214,8 @@
 
 	//let hiddenComponents = writable({})
 
+	let lastDetail: { isPointerUp: false; activate: false; id: string | undefined } | undefined =
+		undefined
 	const handleRepaint = ({ detail }) => {
 		if (!detail.isPointerUp) {
 			throttleMatrix({ detail })
@@ -156,6 +233,21 @@
 		*/
 	}
 
+	function handleKeyDown(event) {
+		if ((event.key === 'Control' || event.key === 'Meta') && !$isCtrlOrMetaPressedStore) {
+			if (resizing) {
+				return
+			}
+
+			$isCtrlOrMetaPressedStore = true
+
+			if (lastDetail) {
+				throttleMatrix({ detail: lastDetail })
+				lastDetail = undefined
+			}
+		}
+	}
+
 	let moveResizes: Record<string, MoveResize> = {}
 	let shadows: Record<string, { x: number; y: number; w: number; h: number } | undefined> = {}
 
@@ -165,32 +257,199 @@
 				moveResize?.updateMove(JSON.parse(JSON.stringify(detail.cordDiff)), detail.eventY)
 			}
 		})
+
+		lastDetail = detail
 		throttleMatrix({ detail: { isPointerUp: false, activate: false } })
+
+		if (!$isCtrlOrMetaPressedStore) {
+			$overlappedStore = undefined
+			return
+		}
+
+		if (
+			// We don't display the fake shadow if the dragged component is a child of the overlapped component
+			$componentDraggedParentIdStore !== $overlappedStore &&
+			detail.shadow &&
+			// only update the fake shadow if the are different
+			!areShadowsTheSame($fakeShadowStore, detail.shadow)
+		) {
+			const draggedItem = sortedItems.find((item) => item.id === $componentDraggedIdStore)
+
+			if (draggedItem) {
+				draggedItem[getComputedCols].x = detail.shadow.x
+				draggedItem[getComputedCols].y = detail.shadow.y
+			}
+
+			let items: GridItem[] = []
+
+			if ($overlappedStore) {
+				const div = document.getElementById(`component-${$overlappedStore}`)
+				const type = div?.getAttribute('data-componenttype')
+
+				if (!$app.subgrids) {
+					return
+				}
+
+				const index = type ? subGridIndexKey(type, $overlappedStore, $worldStore) : 0
+
+				items = $app.subgrids[`${$overlappedStore}-${index}`] ?? []
+			} else {
+				items = $app.grid ?? []
+			}
+
+			if (!draggedItem) {
+				return
+			}
+
+			const freeSpace = gridHelp.findSpace(draggedItem, items, getComputedCols)
+
+			$fakeShadowStore = {
+				x: freeSpace.x,
+				y: freeSpace.y,
+				xPerPx: detail.shadow.xPerPx,
+				yPerPx: detail.shadow.yPerPx,
+				w: detail.shadow.w,
+				h: detail.shadow.h
+			}
+		}
+
+		// When leaving the overlapped component, we clear the fake shadow
+		// to avoid rendering it with the wrong position at the next intersection
+		if (detail.intersectingElement !== $overlappedStore) {
+			$fakeShadowStore = undefined
+		}
+
+		// Update the overlapped component
+		$overlappedStore = detail.intersectingElement
 	}
 
-	export function handleInitMove({ detail }) {
+	export function handleInitMove(id: string) {
+		$componentDraggedIdStore = id
+		$componentDraggedParentIdStore = findGridItemParentGrid($app, id)?.split('-')[0] ?? undefined
+
 		Object.entries(moveResizes).forEach(([id, moveResize]) => {
 			if (selectedIds?.includes(id)) {
 				moveResize?.initmove()
 			}
 		})
 	}
-	let overlapped: string | undefined = undefined
 </script>
 
-<div class="svlt-grid-container" style="height: {containerHeight}px" bind:this={container}>
+<svelte:window on:keydown={handleKeyDown} on:keyup={handleKeyUp} />
+
+<div
+	class="svlt-grid-container"
+	style="height: {containerHeight}px"
+	bind:this={container}
+	id={root ? 'root-grid' : undefined}
+	data-xperpx={xPerPx}
+>
+	<!-- ROOT SHADOW-->
+	{#if $isCtrlOrMetaPressedStore && root && $overlappedStore !== $componentDraggedParentIdStore}
+		<div
+			class={twMerge(
+				'absolute inset-0  flex-col rounded-md bg-blue-100 dark:bg-gray-800 bg-opacity-50',
+				'outline-dashed outline-offset-2 outline-2 outline-blue-300 dark:outline-blue-700',
+				$componentDraggedIdStore && $overlappedStore === undefined
+					? 'bg-draggedover dark:bg-draggedover-dark'
+					: ''
+			)}
+		/>
+		{#if $overlappedStore === undefined && $componentDraggedIdStore && $fakeShadowStore}
+			{@const columnGap = gapX}
+			<!-- gap between the columns in px -->
+			{@const containerBorder = 0.5 * 16}
+			<!-- 0.5rem converted to px (1rem = 16px) -->
+			{@const gridTotalWidth = containerWidth ? containerWidth - 2 * containerBorder : 0}
+			<!-- subtract borders -->
+			{@const availableWidth = gridTotalWidth - 11 * columnGap}
+			<!-- subtract gaps between the 12 columns (11 gaps) -->
+			{@const columnWidthPx = availableWidth / 12}
+			<!-- divide by the number of columns -->
+			{@const maxX = Math.floor(availableWidth / columnWidthPx) - $fakeShadowStore.w}
+
+			<div class="absolute inset-0">
+				<div class="relative h-full w-full">
+					<div
+						class="absolute bg-blue-300 transition-all"
+						style={`
+								left:${Math.min(maxX, $fakeShadowStore.x) * xPerPx + gapX}px ;
+								top: ${$fakeShadowStore.y * yPerPx + gapY}px;
+								width: ${$fakeShadowStore.w * xPerPx - gapX}px;
+								height: ${$fakeShadowStore.h * yPerPx - gapY}px;
+							`}
+					/>
+				</div>
+			</div>
+		{/if}
+	{/if}
+
 	{#each sortedItems as item (item.id)}
 		{#if item[getComputedCols] != undefined}
+			{#if $isCtrlOrMetaPressedStore && item.id === $overlappedStore && $componentDraggedIdStore && $componentDraggedParentIdStore !== item.id && $fakeShadowStore}
+				{@const columnGap = gapX}
+				<!-- gap between the columns in px -->
+				{@const containerBorder = 0.5 * 16}
+				<!-- 0.5rem converted to px (1rem = 16px) -->
+				{@const gridTotalWidth = containerWidth ? containerWidth - 2 * containerBorder : 0}
+				<!-- subtract borders -->
+				{@const availableWidth = gridTotalWidth - 11 * columnGap}
+				<!-- subtract gaps between the 12 columns (11 gaps) -->
+				{@const columnWidthPx = availableWidth / 12}
+				<!-- divide by the number of columns -->
+				{@const maxX = Math.floor(availableWidth / columnWidthPx) - $fakeShadowStore.w}
+
+				<div
+					class="absolute"
+					style={`
+						left: ${item[getComputedCols].x * xPerPx + gapX}px;
+						top: ${item[getComputedCols].y * yPerPx + gapY}px;
+					`}
+				>
+					<div class="relative h-full w-full">
+						<div
+							class={twMerge('absolute transition-all duration-[50ms] bg-blue-300')}
+							style={`
+								left: calc(${
+									Math.min($fakeShadowStore.x, maxX) * $fakeShadowStore.xPerPx + gapX
+								}px + 0.5rem + ${getDeltaXByComponent(item.data['type'])});
+								top: calc(${
+									$fakeShadowStore.y * $fakeShadowStore.yPerPx + gapY
+								}px + 0.5rem + ${getDeltaYByComponent(item.data['type'])});
+								width: ${$fakeShadowStore.w * $fakeShadowStore.xPerPx - gapX * 2}px;
+								height: ${$fakeShadowStore.h * $fakeShadowStore.yPerPx - gapY * 2}px;
+							`}
+						/>
+					</div>
+				</div>
+			{/if}
+
 			<MoveResize
-				on:initmove={handleInitMove}
+				on:initmove={() => handleInitMove(item.id)}
 				on:move={handleMove}
 				bind:shadow={shadows[item.id]}
 				bind:this={moveResizes[item.id]}
 				on:repaint={handleRepaint}
+				on:resizeStart={() => (resizing = true)}
+				on:resizeEnd={() => (resizing = false)}
 				onTop={Boolean(allIdsInPath?.includes(item.id))}
 				id={item.id}
 				{xPerPx}
 				{yPerPx}
+				fakeShadow={$fakeShadowStore}
+				on:dropped={(e) => {
+					$componentDraggedIdStore = undefined
+					$componentDraggedParentIdStore = undefined
+					$overlappedStore = undefined
+					$fakeShadowStore = undefined
+					lastDetail = undefined
+
+					if (!$isCtrlOrMetaPressedStore) {
+						return
+					}
+
+					dispatch('dropped', e.detail)
+				}}
 				width={xPerPx == 0
 					? 0
 					: Math.min(getComputedCols, item[getComputedCols] && item[getComputedCols].w) * xPerPx -
@@ -205,10 +464,18 @@
 				{sensor}
 				container={scroller}
 				nativeContainer={container}
-				{overlapped}
+				overlapped={$overlappedStore}
+				moveMode={$isCtrlOrMetaPressedStore ? 'insert' : 'move'}
+				type={item.data['type']}
 			>
 				{#if item[getComputedCols]}
-					<slot dataItem={item} hidden={false} {overlapped} />
+					<slot
+						dataItem={item}
+						hidden={false}
+						overlapped={$overlappedStore}
+						moveMode={$isCtrlOrMetaPressedStore ? 'insert' : 'move'}
+						componentDraggedId={$componentDraggedIdStore}
+					/>
 				{/if}
 			</MoveResize>
 		{/if}
diff --git a/frontend/src/lib/components/apps/svelte-grid/MoveResize.svelte b/frontend/src/lib/components/apps/svelte-grid/MoveResize.svelte
index 7c8654e60c..c7fcc94d04 100644
--- a/frontend/src/lib/components/apps/svelte-grid/MoveResize.svelte
+++ b/frontend/src/lib/components/apps/svelte-grid/MoveResize.svelte
@@ -3,6 +3,13 @@
 	import type { AppEditorContext, AppViewerContext } from '../types'
 	import { writable } from 'svelte/store'
 	import { twMerge } from 'tailwind-merge'
+	import {
+		computePosition,
+		findGridItemParentGrid,
+		isContainer,
+		type GridShadow
+	} from '../editor/appUtils'
+	import { throttle } from './utils/other'
 
 	const dispatch = createEventDispatcher()
 
@@ -28,9 +35,12 @@
 	export let onTop
 	export let shadow: { x: number; y: number; w: number; h: number } | undefined = undefined
 	export let overlapped: string | undefined = undefined
+	export let moveMode: 'move' | 'insert' = 'move'
+	export let type: string | undefined = undefined
+	export let fakeShadow: GridShadow | undefined = undefined
 
 	const ctx = getContext<AppEditorContext>('AppEditorContext')
-	const { mode } = getContext<AppViewerContext>('AppViewerContext')
+	const { mode, app } = getContext<AppViewerContext>('AppViewerContext')
 
 	const scale = ctx ? ctx.scale : writable(100)
 
@@ -75,6 +85,7 @@
 						x: (moveX / $scale) * 100 - initX,
 						y: (moveY / $scale) * 100 - initY
 					}
+
 					dispatch('move', { cordDiff, clientY: clientY })
 				}
 				return x
@@ -168,7 +179,7 @@
 	}
 
 	let dragClosure: (() => void) | undefined = undefined
-	const pointerdown = ({ clientX, clientY, pageX, pageY }) => {
+	const pointerdown = ({ clientX, clientY }) => {
 		dragClosure = () => {
 			dragClosure = undefined
 			ctx.componentActive.set(true)
@@ -223,16 +234,45 @@
 		}
 	}
 
+	// Shared state for the shadow position
+	let currentShadowPosition:
+		| { x: number; y: number; xPerPx: number; yPerPx: number; h: number; w: number }
+		| undefined = undefined
+	let currentIntersectingElementId: string | undefined = undefined
+
+	let moving: boolean = false
+
 	const pointermove = (event) => {
 		dragClosure && dragClosure()
 		event.preventDefault()
 		event.stopPropagation()
 		event.stopImmediatePropagation()
 
+		moving = true
+
 		const { clientX, clientY } = event
 		const cordDiff = { x: (clientX / $scale) * 100 - initX, y: (clientY / $scale) * 100 - initY }
 
-		dispatch('move', { cordDiff, clientY })
+		if (moveMode === 'move') {
+			dispatch('move', {
+				cordDiff,
+				clientY,
+				intersectingElement: undefined,
+				shadow: undefined
+			})
+
+			return
+		}
+
+		throttledComputeShadow(clientX, clientY)
+
+		dispatch('move', {
+			cordDiff,
+			clientY,
+			intersectingElement: currentIntersectingElementId,
+			shadow: currentShadowPosition,
+			overlapped
+		})
 	}
 
 	export function updateMove(newCoordDiff, clientY) {
@@ -274,6 +314,56 @@
 			update()
 		}
 	}
+
+	let element: HTMLElement | undefined = undefined
+
+	function computeShadow(clientX: number, clientY: number) {
+		const elementsAtPoint = document.elementsFromPoint(clientX, clientY)
+		const intersectingElement = elementsAtPoint.find(
+			(el) =>
+				el.id !== divId &&
+				el.classList.contains('svlt-grid-item') &&
+				el.getAttribute('data-iscontainer') === 'true'
+		)
+
+		const newOverlapped = intersectingElement ? intersectingElement?.id.split('-')[1] : undefined
+
+		const container = newOverlapped
+			? intersectingElement?.querySelector('.svlt-grid-container')
+			: document.getElementById('root-grid')
+
+		const xPerPxComputed = Number(container?.getAttribute('data-xperpx')) ?? xPerPx
+
+		const position = computePosition(
+			clientX,
+			clientY,
+			xPerPxComputed,
+			yPerPx,
+			newOverlapped,
+			element
+		)
+
+		if (overlapped !== newOverlapped) {
+			currentShadowPosition = undefined
+		} else {
+			// Update shared state
+			currentShadowPosition = {
+				x: position.x,
+				y: position.y,
+				xPerPx: xPerPxComputed,
+				yPerPx,
+				h: item.h,
+				w: item.w
+			}
+		}
+
+		currentIntersectingElementId = newOverlapped
+	}
+
+	const throttledComputeShadow = throttle((clientX, clientY) => {
+		computeShadow(clientX, clientY)
+	}, 50)
+
 	const pointerup = (e) => {
 		ctx.componentActive.set(false)
 		stopAutoscroll()
@@ -281,11 +371,29 @@
 		window.removeEventListener('pointerdown', pointerdown)
 		window.removeEventListener('pointermove', pointermove)
 		window.removeEventListener('pointerup', pointerup)
+
 		if (!dragClosure) {
 			repaint(true, true)
 		} else {
 			dragClosure = undefined
 		}
+
+		if (!moving) {
+			return
+		}
+
+		const parent = findGridItemParentGrid($app, id)
+
+		if (overlapped && (overlapped === parent || parent?.startsWith(overlapped))) {
+			return
+		}
+
+		dispatch('dropped', {
+			id,
+			overlapped,
+			x: fakeShadow?.x,
+			y: fakeShadow?.y
+		})
 	}
 
 	let resizeInitPos = { x: 0, y: 0 }
@@ -315,6 +423,7 @@
 
 		window.addEventListener('pointermove', resizePointerMove)
 		window.addEventListener('pointerup', resizePointerUp)
+		dispatch('resizeStart')
 	}
 
 	const resizePointerMove = ({ pageX, pageY }) => {
@@ -350,15 +459,36 @@
 
 		window.removeEventListener('pointermove', resizePointerMove)
 		window.removeEventListener('pointerup', resizePointerUp)
+		dispatch('resizeEnd')
+	}
+
+	function shouldDisplayShadow(moveMode: 'insert' | 'move', overlapped: string | undefined) {
+		if (moveMode === 'move') {
+			return true
+		}
+
+		const parent = findGridItemParentGrid($app, id)
+
+		if (parent === undefined) {
+			return overlapped === undefined
+		} else if (overlapped) {
+			return parent.startsWith(overlapped)
+		}
+
+		return false
 	}
 </script>
 
 <!-- svelte-ignore a11y-click-events-have-key-events -->
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div
+	bind:this={element}
 	draggable="false"
 	on:pointerdown|stopPropagation|preventDefault={pointerdown}
 	id={divId}
 	class="svlt-grid-item"
+	data-iscontainer={type ? isContainer(type) : false}
+	data-componenttype={type}
 	class:svlt-grid-active={active || (trans && rect)}
 	style="width: {xPerPx == 0 ? 0 : active ? newSize.width : width}px; height:{xPerPx == 0
 		? 0
@@ -377,16 +507,24 @@
 		  } transform: translate(${left}px, ${top}px); `} "
 >
 	<slot />
-	<div class="svlt-grid-resizer-bottom" on:pointerdown={(e) => resizePointerDown(e, 'vertical')} />
-	<div class="svlt-grid-resizer-side" on:pointerdown={(e) => resizePointerDown(e, 'horizontal')} />
-	<div class="svlt-grid-resizer" on:pointerdown={(e) => resizePointerDown(e, 'both')} />
+	{#if moveMode === 'move'}
+		<div
+			class="svlt-grid-resizer-bottom"
+			on:pointerdown={(e) => resizePointerDown(e, 'vertical')}
+		/>
+		<div
+			class="svlt-grid-resizer-side"
+			on:pointerdown={(e) => resizePointerDown(e, 'horizontal')}
+		/>
+		<div class="svlt-grid-resizer" on:pointerdown={(e) => resizePointerDown(e, 'both')} />
+	{/if}
 </div>
 
 {#if xPerPx > 0 && (active || trans) && shadow}
 	<div
 		class={twMerge(
 			'svlt-grid-shadow shadow-active',
-			overlapped ? 'svlte-grid-shadow-forbidden' : ''
+			shouldDisplayShadow(moveMode, overlapped) ? '' : 'hidden'
 		)}
 		style="width: {shadow.w * xPerPx - gapX * 2}px; height: {shadow.h * yPerPx -
 			gapY * 2}px; transform: translate({shadow.x * xPerPx + gapX}px, {shadow.y * yPerPx +
@@ -470,8 +608,4 @@
 		-webkit-backface-visibility: hidden;
 		background: #93c4fdd0;
 	}
-
-	.svlte-grid-shadow-forbidden {
-		background: rgba(255, 99, 71, 0.2) !important;
-	}
 </style>
diff --git a/frontend/src/lib/components/apps/svelte-grid/utils/item.ts b/frontend/src/lib/components/apps/svelte-grid/utils/item.ts
index 9d6d591151..aacc8c9b36 100644
--- a/frontend/src/lib/components/apps/svelte-grid/utils/item.ts
+++ b/frontend/src/lib/components/apps/svelte-grid/utils/item.ts
@@ -31,6 +31,7 @@ function distance(a, b): number {
 
 export function findFreeSpaceForItem<T>(matrix: FilledItem<T>[][], item: ItemLayout) {
 	const cols = matrix[0].length
+
 	const w = Math.min(cols, item.w)
 	const h = item.h
 	let xNtime = cols - w + 1
@@ -135,8 +136,7 @@ export function moveItem(active, items, cols) {
 	// If found fixed, reset the active to its original position
 	if (fixed) {
 		return {
-			items: items,
-			overlap: closeBlocks.length > 0
+			items: items
 		}
 	}
 
@@ -178,7 +178,7 @@ export function moveItem(active, items, cols) {
 	// Return result
 	return {
 		items: tempItems,
-		overlap: false
+		overlap: undefined
 	}
 }
 
diff --git a/frontend/src/lib/components/apps/svelte-select/lib/ConditionalPortal.svelte b/frontend/src/lib/components/apps/svelte-select/lib/ConditionalPortal.svelte
index 85b998719d..f5086874c4 100644
--- a/frontend/src/lib/components/apps/svelte-select/lib/ConditionalPortal.svelte
+++ b/frontend/src/lib/components/apps/svelte-select/lib/ConditionalPortal.svelte
@@ -12,7 +12,7 @@
 </script>
 
 {#if condition}
-	<Portal {target}><slot /></Portal>
+	<Portal name="conditional-portal-select" {target}><slot /></Portal>
 {:else}
 	<slot />
 {/if}
diff --git a/frontend/src/lib/components/apps/svelte-select/lib/ConditionalPortalGlobal.svelte b/frontend/src/lib/components/apps/svelte-select/lib/ConditionalPortalGlobal.svelte
index c0f18c32bf..44d2beebe3 100644
--- a/frontend/src/lib/components/apps/svelte-select/lib/ConditionalPortalGlobal.svelte
+++ b/frontend/src/lib/components/apps/svelte-select/lib/ConditionalPortalGlobal.svelte
@@ -5,7 +5,7 @@
 </script>
 
 {#if condition}
-	<Portal><slot /></Portal>
+	<Portal name="conditional-portal-global"><slot /></Portal>
 {:else}
 	<slot />
 {/if}
diff --git a/frontend/src/lib/components/apps/utils.ts b/frontend/src/lib/components/apps/utils.ts
index 3f63922f25..cb30aac94f 100644
--- a/frontend/src/lib/components/apps/utils.ts
+++ b/frontend/src/lib/components/apps/utils.ts
@@ -299,6 +299,13 @@ declare async function waitJob(id: string): Promise<any>;
  */
 declare async function askNewResource(id: string): void;
 
+/**
+ * Download a file from a url or base64 encoded string
+ * @param input url, base64 encoded string, [dataUrl](https://developer.mozilla.org/en-US/docs/Web/URI/Schemes/data) or S3 object
+ * @param [fileName] name of the file to download (optional)
+ */
+declare function downloadFile(input: string | {s3: string, storage?: string}, fileName?: string): void;
+
 `
 		: ''
 }
@@ -451,6 +458,9 @@ export function transformBareBase64IfNecessary(source: string | undefined) {
 	if (!source) {
 		return source
 	}
+	if (/^(http|https):\/\//.test(source) || source.startsWith('/')) {
+		return source
+	}
 	if (source.startsWith('data:') || source.includes(',')) {
 		return source
 	} else {
diff --git a/frontend/src/lib/components/auditLogs/AuditLogsFilters.svelte b/frontend/src/lib/components/auditLogs/AuditLogsFilters.svelte
index 107d80b0c0..0610d7f571 100644
--- a/frontend/src/lib/components/auditLogs/AuditLogsFilters.svelte
+++ b/frontend/src/lib/components/auditLogs/AuditLogsFilters.svelte
@@ -241,6 +241,7 @@
 		USERS_SETPASSWORD: 'users.setpassword',
 		USERS_UPDATE: 'users.update',
 		USERS_LOGIN: 'users.login',
+		USERS_LOGIN_FAILURE: 'users.login_failure',
 		USERS_LOGOUT: 'users.logout',
 		USERS_ACCEPT_INVITE: 'users.accept_invite',
 		USERS_DECLINE_INVITE: 'users.decline_invite',
@@ -251,6 +252,7 @@
 		USERS_IMPERSONATE: 'users.impersonate',
 		USERS_LEAVE_WORKSPACE: 'users.leave_workspace',
 		OAUTH_LOGIN: 'oauth.login',
+		OAUTH_LOGIN_FAILURE: 'oauth.login_failure',
 		OAUTH_SIGNUP: 'oauth.signup',
 		VARIABLES_CREATE: 'variables.create',
 		VARIABLES_DELETE: 'variables.delete',
diff --git a/frontend/src/lib/components/common/button/Button.svelte b/frontend/src/lib/components/common/button/Button.svelte
index 4e2d2fe08a..1fef9435a0 100644
--- a/frontend/src/lib/components/common/button/Button.svelte
+++ b/frontend/src/lib/components/common/button/Button.svelte
@@ -114,6 +114,13 @@
 			contained:
 				'bg-surface border-transparent hover:bg-surface-hover focus-visible:bg-surface-hover text-primary focus-visible:ring-surface-selected',
 			divider: 'divide-x divide-gray-200 dark:divide-gray-700'
+		},
+		nord: {
+			border:
+				'border-nord-200 bg-surface hover:bg-surface-hover focus-visible:bg-surface-hover text-primary hover:text-secondary focus-visible:text-secondary focus-visible:ring-surface-selected-inverse dark:border-nord-200',
+			contained:
+				'bg-nord-300 hover:bg-nord-0 focus-visible:bg-surface-hover-inverse text-primary-inverse focus-visible:ring-surface-selected-inverse dark:bg-nord-400 dark:hover:bg-nord-600 dark:text-primary-inverse',
+			divider: 'divide-x divide-gray-800 dark:divide-gray-200'
 		}
 	}
 
diff --git a/frontend/src/lib/components/common/button/ButtonDropdown.svelte b/frontend/src/lib/components/common/button/ButtonDropdown.svelte
index d2c5408ad5..b617c04323 100644
--- a/frontend/src/lib/components/common/button/ButtonDropdown.svelte
+++ b/frontend/src/lib/components/common/button/ButtonDropdown.svelte
@@ -41,7 +41,7 @@
 		</MenuButton>
 	</span>
 
-	<Portal {target}>
+	<Portal name="button-dropdown" {target}>
 		<div use:popperContent={popperOptions} class="z-[6000]">
 			<Transition
 				show={open}
diff --git a/frontend/src/lib/components/common/confirmationModal/DeployOverrideConfirmationModal.svelte b/frontend/src/lib/components/common/confirmationModal/DeployOverrideConfirmationModal.svelte
new file mode 100644
index 0000000000..4b71413e2d
--- /dev/null
+++ b/frontend/src/lib/components/common/confirmationModal/DeployOverrideConfirmationModal.svelte
@@ -0,0 +1,53 @@
+<script lang="ts">
+	import ConfirmationModal from './ConfirmationModal.svelte'
+	import Button from '../button/Button.svelte'
+	import type DiffDrawer from '$lib/components/DiffDrawer.svelte'
+	import {  type Value } from '$lib/utils'
+
+	export let deployedValue: Value | undefined = undefined
+	export let currentValue: Value | undefined = undefined
+	export let diffDrawer: DiffDrawer | undefined = undefined
+	export let confirmCallback: () => void
+	export let deployedBy : string | undefined = undefined
+	export let open = false
+</script>
+
+<ConfirmationModal
+	{open}
+	title={"New version deployed by " + deployedBy}
+	confirmationText="Override"
+	on:canceled={() => {
+		open = false
+	}}
+	on:confirmed={() => confirmCallback()}
+>
+	<div class="flex flex-col w-full space-y-4">
+		<span>There was deployed new version while you were editing this one.</span>
+		{#if diffDrawer}
+			<Button
+				wrapperClasses="self-start"
+				color="light"
+				variant="border"
+				size="xs"
+				on:click={() => {
+					if (!deployedValue || !currentValue) {
+						return
+					}
+					open = false
+					diffDrawer?.openDrawer()
+					diffDrawer?.setDiff({
+						mode: 'simple',
+						original: deployedValue,
+						current: currentValue,
+						title: 'Deployed <> Current',
+						button: {
+							text: 'Override anyway',
+							onClick: () => confirmCallback()
+						}
+					})
+				}}
+				>Show diff
+			</Button>
+		{/if}
+	</div>
+</ConfirmationModal>
diff --git a/frontend/src/lib/components/common/drawer/ConditionalPortal.svelte b/frontend/src/lib/components/common/drawer/ConditionalPortal.svelte
index 2fecd242be..50cb2f2d8b 100644
--- a/frontend/src/lib/components/common/drawer/ConditionalPortal.svelte
+++ b/frontend/src/lib/components/common/drawer/ConditionalPortal.svelte
@@ -6,7 +6,7 @@
 </script>
 
 {#if condition}
-	<Portal {target}><slot /></Portal>
+	<Portal name="conditional-portal" {target}><slot /></Portal>
 {:else}
 	<slot />
 {/if}
diff --git a/frontend/src/lib/components/common/fileDownload/FileDownload.svelte b/frontend/src/lib/components/common/fileDownload/FileDownload.svelte
index dc4fa621da..d4ade7b249 100644
--- a/frontend/src/lib/components/common/fileDownload/FileDownload.svelte
+++ b/frontend/src/lib/components/common/fileDownload/FileDownload.svelte
@@ -4,6 +4,7 @@
 	import { base } from '$lib/base'
 
 	export let s3object: any
+	export let workspaceId: string | undefined = undefined
 </script>
 
 <a
@@ -11,9 +12,9 @@
 border border-dashed border-gray-400 hover:border-blue-500
 focus-within:border-blue-500 hover:bg-blue-50 dark:hover:bg-frost-900 focus-within:bg-blue-50
 duration-200 rounded-lg p-1 gap-2"
-	href={`${base}/api/w/${$workspaceStore}/job_helpers/download_s3_file?file_key=${s3object?.s3}${
-		s3object?.storage ? `&storage=${s3object.storage}` : ''
-	}`}
+	href={`${base}/api/w/${workspaceId ?? $workspaceStore}/job_helpers/download_s3_file?file_key=${
+		s3object?.s3
+	}${s3object?.storage ? `&storage=${s3object.storage}` : ''}`}
 	download={s3object?.s3.split('/').pop() ?? 'unnamed_download.file'}
 >
 	<Download />
diff --git a/frontend/src/lib/components/common/fileUpload/FileUpload.svelte b/frontend/src/lib/components/common/fileUpload/FileUpload.svelte
index 14228b6b78..4ba06e3d99 100644
--- a/frontend/src/lib/components/common/fileUpload/FileUpload.svelte
+++ b/frontend/src/lib/components/common/fileUpload/FileUpload.svelte
@@ -23,6 +23,8 @@
 	export let pathTransformer: any = undefined // function taking as input {file: File} and returning a string
 	export let forceDisplayUploads: boolean = false
 	export let defaultValue: string | undefined = undefined
+	export let workspace: string | undefined = undefined
+	export let fileUploads: Writable<FileUploadData[]> = writable([])
 
 	const dispatch = createEventDispatcher()
 
@@ -36,8 +38,6 @@
 		file?: File
 	}
 
-	let fileUploads: Writable<FileUploadData[]> = writable([])
-
 	async function handleChange(files: File[] | undefined) {
 		for (const file of files ?? []) {
 			uploadFileToS3(file, file.name)
@@ -154,7 +154,7 @@
 				})
 				xhr?.open(
 					'POST',
-					`/api/w/${$workspaceStore}/job_helpers/upload_s3_file?${params.toString()}`,
+					`/api/w/${workspace ?? $workspaceStore}/job_helpers/upload_s3_file?${params.toString()}`,
 					true
 				)
 				xhr?.setRequestHeader('Content-Type', 'application/octet-stream')
@@ -189,7 +189,7 @@
 
 	async function deleteFile(fileKey: string) {
 		await HelpersService.deleteS3File({
-			workspace: $workspaceStore!,
+			workspace: workspace ?? $workspaceStore!,
 			fileKey: fileKey
 		})
 		dispatch('deletion', { path: fileKey })
diff --git a/frontend/src/lib/components/common/menu/Menu.svelte b/frontend/src/lib/components/common/menu/Menu.svelte
index 173eae2208..92ced7e4be 100644
--- a/frontend/src/lib/components/common/menu/Menu.svelte
+++ b/frontend/src/lib/components/common/menu/Menu.svelte
@@ -54,7 +54,8 @@
 		'bottom-start': 'origin-top-left left-0',
 		'bottom-end': 'origin-top-right right-0',
 		'top-start': 'origin-bottom-left left-0 bottom-0',
-		'top-end': 'origin-bottom-right right-0 bottom-0'
+		'top-end': 'origin-bottom-right right-0 bottom-0',
+		'top-center': 'origin-top-left -top-full left-1/2  transform -translate-x-1/2 -translate-y-full'
 	}
 	const dispatch = createEventDispatcher()
 </script>
diff --git a/frontend/src/lib/components/common/menu/MenuV2.svelte b/frontend/src/lib/components/common/menu/MenuV2.svelte
index 416a88d29e..6354ed4cb1 100644
--- a/frontend/src/lib/components/common/menu/MenuV2.svelte
+++ b/frontend/src/lib/components/common/menu/MenuV2.svelte
@@ -25,7 +25,7 @@
 			<slot name="trigger" />
 		</MenuButton>
 	</div>
-	<Portal>
+	<Portal name="menu-v2">
 		<div use:floatingContent class="z-[6000]">
 			<Transition
 				{open}
diff --git a/frontend/src/lib/components/common/modal/AlwaysMountedModal.svelte b/frontend/src/lib/components/common/modal/AlwaysMountedModal.svelte
index ddcfa453a6..8c14d3b997 100644
--- a/frontend/src/lib/components/common/modal/AlwaysMountedModal.svelte
+++ b/frontend/src/lib/components/common/modal/AlwaysMountedModal.svelte
@@ -24,7 +24,7 @@
 	}
 </script>
 
-<Portal target="#app-editor-top-level-drawer">
+<Portal name="always-mounted" target="#app-editor-top-level-drawer">
 	<div
 		class={twMerge(
 			`${
diff --git a/frontend/src/lib/components/common/popup/Popup.svelte b/frontend/src/lib/components/common/popup/Popup.svelte
index e2ccc22b74..eb5c15189f 100644
--- a/frontend/src/lib/components/common/popup/Popup.svelte
+++ b/frontend/src/lib/components/common/popup/Popup.svelte
@@ -9,12 +9,13 @@
 	}
 
 	export let containerClasses: string = 'rounded-lg shadow-md border p-4 bg-surface'
-
+	export let floatingClasses: string = ''
 	const [floatingRef, floatingContent] = createFloatingActions(floatingConfig)
 
 	export let blockOpen = false
 	export let shouldUsePortal: boolean = true
 	export let target: string | HTMLElement | undefined = undefined
+	export let noTransition = false
 </script>
 
 <Popover on:close class="leading-none">
@@ -24,22 +25,30 @@
 		</div>
 	</PopoverButton>
 	<ConditionalPortal condition={shouldUsePortal} {target}>
-		<div use:floatingContent class="z5000">
-			<Transition
-				show={blockOpen || undefined}
-				enter="transition ease-out duration-200"
-				enterFrom="opacity-0 translate-y-1"
-				enterTo="opacity-100 translate-y-0"
-				leave="transition ease-in duration-150"
-				leaveFrom="opacity-100 translate-y-0"
-				leaveTo="opacity-0 translate-y-1"
-			>
-				<PopoverPanel let:close static={blockOpen}>
+		<div use:floatingContent class={`z5000 ${floatingClasses}`}>
+			{#if !noTransition}
+				<Transition
+					show={blockOpen || undefined}
+					enter="transition ease-out duration-200"
+					enterFrom="opacity-0 translate-y-1"
+					enterTo="opacity-100 translate-y-0"
+					leave="transition ease-in duration-150"
+					leaveFrom="opacity-100 translate-y-0"
+					leaveTo="opacity-0 translate-y-1"
+				>
+					<PopoverPanel let:close static={blockOpen}>
+						<div class={containerClasses}>
+							<slot {close} />
+						</div>
+					</PopoverPanel>
+				</Transition>
+			{:else}
+				<PopoverPanel focus={false} let:close static={blockOpen}>
 					<div class={containerClasses}>
 						<slot {close} />
 					</div>
 				</PopoverPanel>
-			</Transition>
+			{/if}
 		</div>
 	</ConditionalPortal>
 </Popover>
diff --git a/frontend/src/lib/components/common/popup/PopupV2.svelte b/frontend/src/lib/components/common/popup/PopupV2.svelte
new file mode 100644
index 0000000000..b5ae79f3d8
--- /dev/null
+++ b/frontend/src/lib/components/common/popup/PopupV2.svelte
@@ -0,0 +1,63 @@
+<script lang="ts">
+	import Portal from '$lib/components/Portal.svelte'
+	import { clickOutside } from '$lib/utils'
+	import { createFloatingActions, type ComputeConfig } from 'svelte-floating-ui'
+
+	export let floatingConfig: ComputeConfig = {
+		strategy: 'absolute',
+		//@ts-ignore
+		placement: 'bottom-center'
+	}
+	export let open = false
+	export let target: string | undefined = undefined
+
+	// export let containerClasses: string = 'rounded-lg shadow-md border p-4 bg-surface'
+	// export let floatingClasses: string = ''
+	const [floatingRef, floatingContent] = createFloatingActions(floatingConfig)
+
+	function close(div: Element | null) {
+		open = false
+	}
+
+	let acceptClickoutside = false
+	function pointerup() {
+		setTimeout(() => {
+			acceptClickoutside = true
+		}, 100)
+	}
+
+	function pointerdown() {
+		if (acceptClickoutside && open) {
+			open = false
+		} else {
+			acceptClickoutside = false
+			open = true
+		}
+	}
+</script>
+
+<div use:floatingRef>
+	<slot {pointerup} {pointerdown} name="button" />
+</div>
+
+<Portal name="popup-v2" {target}>
+	{#if open}
+		<div
+			class="border rounded-lg shadow-lg bg-surface z5000"
+			style="position:absolute"
+			use:floatingContent
+		>
+			<div
+				use:clickOutside
+				on:click_outside={() => {
+					if (acceptClickoutside) {
+						acceptClickoutside = false
+						open = false
+					}
+				}}
+			>
+				<slot {close} />
+			</div>
+		</div>
+	{/if}
+</Portal>
diff --git a/frontend/src/lib/components/common/tabs/Tab.svelte b/frontend/src/lib/components/common/tabs/Tab.svelte
index 90b3bcf04c..63c2974364 100644
--- a/frontend/src/lib/components/common/tabs/Tab.svelte
+++ b/frontend/src/lib/components/common/tabs/Tab.svelte
@@ -30,7 +30,7 @@
 
 <button
 	class={twMerge(
-		'border-b-2 py-1 px-2 cursor-pointer transition-all z-10 ease-linear font-normal text-primary',
+		'border-b-2 py-1 px-2 cursor-pointer transition-all z-10 ease-linear font-normal text-tertiary',
 		isSelected
 			? 'wm-tab-active font-main'
 			: 'border-gray-300 dark:border-gray-600 border-opacity-0 hover:border-opacity-100 ',
diff --git a/frontend/src/lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte b/frontend/src/lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte
index 6751db0c99..b688c94bfa 100644
--- a/frontend/src/lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte
+++ b/frontend/src/lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte
@@ -11,6 +11,7 @@
 	import { TabGroup, TabList } from '@rgossiaux/svelte-headlessui'
 	import { twMerge } from 'tailwind-merge'
 
+	export let id: string | null | undefined = undefined
 	export let selected: any
 	export let noWFull: boolean = false
 	export let disabled: boolean = false
@@ -38,6 +39,7 @@
 </script>
 
 <TabGroup
+	{id}
 	class={twMerge(
 		`h-8 flex ${noWFull ? '' : 'w-full'} ${disabled ? 'disabled' : ''}`,
 		$$props.class
diff --git a/frontend/src/lib/components/copilot/RegexGen.svelte b/frontend/src/lib/components/copilot/RegexGen.svelte
index 0817167bf5..b2c2199385 100644
--- a/frontend/src/lib/components/copilot/RegexGen.svelte
+++ b/frontend/src/lib/components/copilot/RegexGen.svelte
@@ -19,7 +19,7 @@
 
 	const dispatch = createEventDispatcher()
 	async function onGenerate() {
-		if (funcDesc.length <= 0) {
+		if (funcDesc?.length <= 0) {
 			return
 		}
 		savePrompt()
@@ -122,7 +122,7 @@
 						bind:this={input}
 						bind:value={funcDesc}
 						on:keypress={({ key }) => {
-							if (key === 'Enter' && funcDesc.length > 0) {
+							if (key === 'Enter' && funcDesc?.length > 0) {
 								close(input || null)
 								onGenerate()
 							}
@@ -139,7 +139,7 @@
 							close(input || null)
 							onGenerate()
 						}}
-						disabled={funcDesc.length <= 0}
+						disabled={funcDesc?.length <= 0}
 						iconOnly
 						startIcon={{ icon: Wand2 }}
 					/>
diff --git a/frontend/src/lib/components/copilot/StepGen.svelte b/frontend/src/lib/components/copilot/StepGen.svelte
index 8b2aa3605b..f2a7617b70 100644
--- a/frontend/src/lib/components/copilot/StepGen.svelte
+++ b/frontend/src/lib/components/copilot/StepGen.svelte
@@ -110,7 +110,7 @@
 	f={(x) => (emptyString(x.summary) ? x.path : x.summary + ' (' + x.path + ')')}
 />
 
-<div class="text-primary transition-all {funcDesc.length > 0 ? 'w-96' : 'w-60'}">
+<div class="text-primary transition-all {funcDesc?.length > 0 ? 'w-96' : 'w-60'}">
 	<div>
 		<div class="flex p-2 relative">
 			<input
@@ -118,7 +118,7 @@
 				bind:this={input}
 				bind:value={funcDesc}
 				on:input={() => {
-					if (funcDesc.length > 2) {
+					if (funcDesc?.length > 2) {
 						getHubCompletions(funcDesc)
 					} else {
 						hubCompletions = []
@@ -126,14 +126,14 @@
 				}}
 				placeholder="Search {trigger ? 'triggers' : 'scripts'} or AI gen"
 			/>
-			{#if funcDesc.length === 0}
+			{#if funcDesc?.length === 0}
 				<Wand2
 					size={14}
 					class="absolute right-4 top-1/2 -translate-y-1/2 fill-current opacity-70 text-violet-800 dark:text-violet-400"
 				/>
 			{/if}
 		</div>
-		{#if !disableAi && funcDesc.length > 0}
+		{#if !disableAi && funcDesc?.length > 0}
 			<ul class="transition-all divide-y">
 				<li>
 					<button
@@ -181,11 +181,11 @@
 				</li>
 			</ul>
 		{/if}
-		{#if funcDesc.length > 0 && filteredItems.length > 0}
+		{#if funcDesc?.length > 0 && filteredItems?.length > 0}
 			<div class="text-left mt-2">
 				<p class="text-xs text-secondary ml-2">Workspace {trigger ? 'Triggers' : 'Scripts'}</p>
 				<ul class="transition-all divide-y">
-					{#each filteredItems.slice(0, 3) as item (item.path)}
+					{#each filteredItems?.slice(0, 3) ?? [] as item (item.path)}
 						<li>
 							<button
 								class="py-2 gap-4 flex flex-row hover:bg-surface-hover transition-all items-center justify-between w-full"
diff --git a/frontend/src/lib/components/copilot/StepGenQuick.svelte b/frontend/src/lib/components/copilot/StepGenQuick.svelte
new file mode 100644
index 0000000000..5cb15839ba
--- /dev/null
+++ b/frontend/src/lib/components/copilot/StepGenQuick.svelte
@@ -0,0 +1,75 @@
+<script lang="ts">
+	import { workspaceStore } from '$lib/stores'
+	import { ScriptService, type Script } from '$lib/gen'
+
+	import { Wand2, Loader2 } from 'lucide-svelte'
+	import SearchItems from '../SearchItems.svelte'
+	import { emptyString } from '$lib/utils'
+	import { createEventDispatcher, onMount } from 'svelte'
+
+	export let funcDesc: string
+	export let trigger = false
+	export let loading = false
+	export let preFilter: string
+	export let disableAi = false
+
+	let scripts: Script[] | undefined = undefined
+	export let filteredItems: (Script & { marked?: string })[] | (Item & { marked?: string })[] = []
+	$: prefilteredItems = scripts ?? []
+
+	const dispatch = createEventDispatcher()
+
+	async function loadScripts(): Promise<void> {
+		const loadedScripts = await ScriptService.listScripts({
+			workspace: $workspaceStore!,
+			perPage: 300,
+			kinds: trigger ? 'trigger' : 'script'
+		})
+
+		scripts = loadedScripts
+	}
+
+	$: scripts == undefined && funcDesc?.length > 1 && loadScripts()
+
+	let input: HTMLInputElement
+
+	$: preFilter &&
+		setTimeout(() => {
+			input?.focus()
+		}, 50)
+
+	onMount(() => {
+		input?.focus()
+	})
+</script>
+
+<SearchItems
+	filter={funcDesc}
+	items={prefilteredItems}
+	bind:filteredItems
+	f={(x) => (emptyString(x.summary) ? x.path : x.summary + ' (' + x.path + ')')}
+/>
+
+<div class="relative text-primary items-center transition-all flex-grow">
+	<div class="grow items-cente">
+		<input
+			bind:this={input}
+			type="text"
+			on:keydown={(e) => {
+				if (e.key === 'Escape') {
+					dispatch('escape')
+				}
+			}}
+			bind:value={funcDesc}
+			placeholder="Search {trigger ? 'triggers' : 'scripts'} {disableAi ? '' : 'or AI gen'}"
+		/>
+	</div>
+	<div class="absolute inset-y-0 right-3 flex items-center pointer-events-none">
+		{#if loading}
+			<Loader2 size={16} class="animate-spin text-gray-400" />
+		{/if}
+		{#if funcDesc?.length === 0 && !loading && !disableAi}
+			<Wand2 size={14} class="fill-current opacity-70 text-violet-800 dark:text-violet-400" />
+		{/if}
+	</div>
+</div>
diff --git a/frontend/src/lib/components/copilot/flow.ts b/frontend/src/lib/components/copilot/flow.ts
index ff99fc11e2..502f1b0dc6 100644
--- a/frontend/src/lib/components/copilot/flow.ts
+++ b/frontend/src/lib/components/copilot/flow.ts
@@ -14,7 +14,7 @@ import { scriptLangToEditorLang } from '$lib/scripts'
 
 export type FlowCopilotModule = {
 	id: string
-	type: 'trigger' | 'script'
+	type: 'trigger' | 'script' 
 	description: string
 	code: string
 	source: 'hub' | 'custom' | undefined
@@ -25,6 +25,8 @@ export type FlowCopilotModule = {
 		kind: string
 		app: string
 		ask_id: number
+		id: number
+		version_id: number
 	}[]
 	selectedCompletion:
 		| {
@@ -104,6 +106,69 @@ To maintain state across runs, you can use get_state() and set_state(value) whic
 {additionalInformation}`
 }
 
+
+// const preprocessorPrompts: {
+// 	bun: string
+// 	python3: string
+// } = {
+// 	bun: `I'm building a workflow which is a sequence of script steps. Write the preprocessor step in {codeLang} which should check for {description} and return an array.
+// The preprocessor step is executed before flow begins to map trigger specific inputs to the flow inputs.
+
+// Here is an example of what the preprocessor step should look like:
+// \`\`\`{codeLang}
+// export async function preprocessor(
+// 	wm_trigger: {
+// 		kind: 'http' | 'email' | 'webhook',
+// 		http?: {
+// 			route: string // The route path, e.g. "/users/:id"
+// 			path: string // The actual path called, e.g. "/users/123"
+// 			method: string
+// 			params: Record<string, string>
+// 			query: Record<string, string>
+// 			headers: Record<string, string>
+// 		}
+// 	},
+// 	/* your other args */ 
+// ) {
+// 	return {
+// 		// return the args to be passed to the flow
+// 	}
+// }
+// \`\`\`
+
+// {additionalInformation}`,
+// 	python3: `I'm building a workflow which is a sequence of script steps. Write the preprocessor step in {codeLang} which should check for {description} and return an array.
+// The preprocessor step is executed before flow begins to map trigger specific inputs to the flow inputs.
+
+// Here is an example of what the preprocessor step should look like:
+// \`\`\`{codeLang}
+// from typing import TypedDict, Literal
+
+// class Http(TypedDict):
+// 	route: str # The route path, e.g. "/users/:id"
+// 	path: str # The actual path called, e.g. "/users/123"
+// 	method: str
+// 	params: dict[str, str]
+// 	query: dict[str, str]
+// 	headers: dict[str, str]
+
+// class WmTrigger(TypedDict):
+//     kind: Literal["http", "email", "webhook"]
+//     http: Http | None
+
+// def preprocessor(
+// 	wm_trigger: WmTrigger,
+// 	# your other args
+// ):
+// 	return {
+// 		# return the args to be passed to the flow
+// 	}
+// \`\`\`
+
+// {additionalInformation}`
+// }
+
+
 const firstActionPrompt = `I'm building a workflow which is a sequence of script steps. Write a script in {codeLang} which should {description}.
 Return the script's output.
 
@@ -200,6 +265,8 @@ export async function stepCopilot(
 	let prompt =
 		module.type === 'trigger'
 			? triggerPrompts[lang]
+			// : module.type === 'preprocessor'
+			// 	? preprocessorPrompts[lang]
 			: pastModule === undefined
 			? firstActionPrompt
 			: isFirstInLoop
diff --git a/frontend/src/lib/components/custom_ui.ts b/frontend/src/lib/components/custom_ui.ts
index 40d45c1d61..3ec24fc9f6 100644
--- a/frontend/src/lib/components/custom_ui.ts
+++ b/frontend/src/lib/components/custom_ui.ts
@@ -30,6 +30,7 @@ export type FlowBuilderWhitelabelCustomUi = {
 	languages?: (SupportedLanguage | 'docker' | 'bunnative')[]
 	scriptFork?: boolean
 	editorBar?: EditorBarUi
+	downloadLogs?: boolean
 }
 
 export type EditorBarUi = {
diff --git a/frontend/src/lib/components/details/ClipboardPanel.svelte b/frontend/src/lib/components/details/ClipboardPanel.svelte
index b4cc68b435..3107834df3 100644
--- a/frontend/src/lib/components/details/ClipboardPanel.svelte
+++ b/frontend/src/lib/components/details/ClipboardPanel.svelte
@@ -13,12 +13,12 @@
 <!-- svelte-ignore a11y-click-events-have-key-events -->
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <div
-	class="px-2 py-1 border flex items-center cursor-pointer bg-surface-secondary text-primary justify-between rounded-md"
+	class="grow min-w-0 w-full px-2 py-1 border flex items-center cursor-pointer bg-surface-secondary text-primary justify-between rounded-md"
 	on:click={(e) => {
 		e.preventDefault()
 		copyToClipboard(content)
 	}}
 >
-	<div class="text-xs truncate whitespace-pre-wrap w-11/12">{content}</div>
-	<Clipboard size={14} class="w-1/12" />
+	<div class="text-xs truncate whitespace-no-wrap grow">{content}</div>
+	<Clipboard size={12} class="flex-shrink-0" />
 </div>
diff --git a/frontend/src/lib/components/details/DetailPageDetailPanel.svelte b/frontend/src/lib/components/details/DetailPageDetailPanel.svelte
index c2df3d8bd9..84180d2d5e 100644
--- a/frontend/src/lib/components/details/DetailPageDetailPanel.svelte
+++ b/frontend/src/lib/components/details/DetailPageDetailPanel.svelte
@@ -1,112 +1,68 @@
 <script lang="ts">
 	import { Tabs, Tab, TabContent } from '$lib/components/common'
-	import { CalendarCheck2, MailIcon, Route, Terminal, Webhook } from 'lucide-svelte'
 
-	import { Pane, Splitpanes } from 'svelte-splitpanes'
 	import HighlightTheme from '../HighlightTheme.svelte'
 	import FlowViewerInner from '../FlowViewerInner.svelte'
+	import DetailPageTriggerPanel from './DetailPageTriggerPanel.svelte'
 
-	export let triggerSelected: 'webhooks' | 'email' | 'schedule' | 'cli' | 'routes' = 'webhooks'
+	export let triggerSelected:
+		| 'webhooks'
+		| 'emails'
+		| 'schedules'
+		| 'cli'
+		| 'routes'
+		| 'websockets' = 'webhooks'
 	export let flow_json: any | undefined = undefined
-	export let hasStepDetails: boolean = false
 
 	export let isOperator: boolean = false
 
 	export let selected: string
-
-	$: if (hasStepDetails) {
-		selected = 'flow_step'
-	}
-
-	// When we no longer have a selected flow step, switch to saved inputs
-	$: !hasStepDetails && selected === 'flow_step' && (selected = 'saved_inputs')
 </script>
 
 <HighlightTheme />
 
-<Splitpanes horizontal class="h-full">
-	<Pane size={100}>
-		<Tabs bind:selected>
-			<Tab value="saved_inputs">Saved inputs</Tab>
-			{#if !isOperator}
-				<Tab value="details">Details & Triggers</Tab>
-			{/if}
-			{#if flow_json}
-				<Tab value="raw">Raw</Tab>
-			{/if}
-			{#if hasStepDetails}
-				<Tab value="flow_step">Step</Tab>
-			{/if}
-			<svelte:fragment slot="content">
-				<div class="overflow-hidden" style="height:calc(100% - 32px);">
-					<TabContent value="saved_inputs" class="flex flex-col flex-1 h-full">
-						<slot name="save_inputs" />
-					</TabContent>
-					<TabContent value="details" class="flex flex-col flex-1 h-full">
-						<Splitpanes horizontal class="h-full">
-							<Pane size={50} minSize={20}>
-								<slot name="details" />
-							</Pane>
-							<Pane size={50} minSize={20}>
-								<Tabs bind:selected={triggerSelected}>
-									<Tab value="webhooks">
-										<span class="flex flex-row gap-2 items-center">
-											<Webhook size={14} />
-											Webhooks
-										</span>
-									</Tab>
-									<Tab value="schedule">
-										<span class="flex flex-row gap-2 items-center">
-											<CalendarCheck2 size={14} />
-											Schedules
-										</span>
-									</Tab>
-									<Tab value="routes">
-										<span class="flex flex-row gap-2 items-center">
-											<Route size={14} />
-											HTTP
-										</span>
-									</Tab>
-									<Tab value="email">
-										<span class="flex flex-row gap-2 items-center">
-											<MailIcon size={14} />
-											Email
-										</span>
-									</Tab>
-									<Tab value="cli">
-										<span class="flex flex-row gap-2 items-center">
-											<Terminal size={14} />
-											CLI
-										</span>
-									</Tab>
-								</Tabs>
+<Tabs bind:selected>
+	<Tab value="saved_inputs">Saved Inputs</Tab>
+	{#if !isOperator}
+		<Tab value="triggers">Triggers</Tab>
+	{/if}
+	{#if flow_json}
+		<Tab value="raw">Export</Tab>
+	{:else}
+		<Tab value="script">Script</Tab>
+	{/if}
+	{#if selected == 'flow_step'}
+		<Tab value="flow_step">Step</Tab>
+	{/if}
 
-								<div class="h-[calc(100%-32px)]">
-									<div class="h-full overflow-auto">
-										{#if triggerSelected === 'webhooks'}
-											<slot name="webhooks" />
-										{:else if triggerSelected === 'routes'}
-											<slot name="routes" />
-										{:else if triggerSelected === 'email'}
-											<slot name="email" />
-										{:else if triggerSelected === 'schedule'}
-											<slot name="schedule" />
-										{:else if triggerSelected === 'cli'}
-											<slot name="cli" />
-										{/if}
-									</div>
-								</div>
-							</Pane>
-						</Splitpanes>
-					</TabContent>
-					<TabContent value="raw" class="flex flex-col flex-1 h-full overflow-auto">
+	<svelte:fragment slot="content">
+		<div class="h-[calc(100%-32px)]">
+			<div class="h-full overflow-auto">
+				<TabContent value="saved_inputs" class="h-full">
+					<slot name="save_inputs" />
+				</TabContent>
+				<TabContent value="script" class="h-full">
+					<slot name="script" />
+				</TabContent>
+				<TabContent value="triggers" class="h-full pt-2">
+					<DetailPageTriggerPanel bind:triggerSelected>
+						<slot slot="webhooks" name="webhooks" />
+						<slot slot="routes" name="routes" />
+						<slot slot="websockets" name="websockets" />
+						<slot slot="emails" name="emails" />
+						<slot slot="schedules" name="schedules" />
+						<slot slot="cli" name="cli" />
+					</DetailPageTriggerPanel>
+				</TabContent>
+				{#if flow_json}
+					<TabContent value="raw" class="flex flex-col flex-1 h-full overflow-auto p-2">
 						<FlowViewerInner flow={flow_json} />
 					</TabContent>
 					<TabContent value="flow_step" class="flex flex-col flex-1 h-full">
 						<slot name="flow_step" />
 					</TabContent>
-				</div>
-			</svelte:fragment>
-		</Tabs>
-	</Pane>
-</Splitpanes>
+				{/if}
+			</div>
+		</div>
+	</svelte:fragment>
+</Tabs>
diff --git a/frontend/src/lib/components/details/DetailPageHeader.svelte b/frontend/src/lib/components/details/DetailPageHeader.svelte
index 3b8885740a..6a3012946b 100644
--- a/frontend/src/lib/components/details/DetailPageHeader.svelte
+++ b/frontend/src/lib/components/details/DetailPageHeader.svelte
@@ -7,6 +7,9 @@
 	import ErrorHandlerToggleButton from './ErrorHandlerToggleButton.svelte'
 	import { twMerge } from 'tailwind-merge'
 	import { userStore } from '$lib/stores'
+	import { createEventDispatcher, getContext } from 'svelte'
+	import type { TriggerContext } from '../triggers'
+	import { Calendar } from 'lucide-svelte'
 
 	type MainButton = {
 		label: string
@@ -22,6 +25,8 @@
 		color?: 'red'
 	}
 
+	const { triggersCount, selectedTrigger } = getContext<TriggerContext>('TriggerContext')
+
 	export let mainButtons: MainButton[] = []
 	export let menuItems: MenuItemButton[] = []
 	export let title: string
@@ -30,6 +35,8 @@
 	export let errorHandlerKind: 'flow' | 'script'
 	export let scriptOrFlowPath: string
 	export let errorHandlerMuted: boolean | undefined
+
+	const dispatch = createEventDispatcher()
 </script>
 
 <div class="border-b p-2 shadow-md">
@@ -47,6 +54,22 @@
 					<Badge>tag: {tag}</Badge>
 				{/if}
 				<slot />
+				{#if $triggersCount?.primary_schedule}
+					<Button
+						btnClasses="inline-flex"
+						startIcon={{ icon: Calendar }}
+						variant="contained"
+						color="light"
+						size="xs"
+						on:click={() => {
+							$selectedTrigger = 'schedules'
+							dispatch('triggerDetail')
+						}}
+					>
+						{$triggersCount?.primary_schedule?.schedule ?? ''}
+					</Button>
+				{/if}
+				<slot name="trigger-badges" />
 			</div>
 			<div class="flex gap-1 md:gap-2 items-center">
 				{#if menuItems.length > 0}
diff --git a/frontend/src/lib/components/details/DetailPageLayout.svelte b/frontend/src/lib/components/details/DetailPageLayout.svelte
index 2ed73d06c5..f3c58daf54 100644
--- a/frontend/src/lib/components/details/DetailPageLayout.svelte
+++ b/frontend/src/lib/components/details/DetailPageLayout.svelte
@@ -3,16 +3,31 @@
 	import SplitPanesWrapper from '$lib/components/splitPanes/SplitPanesWrapper.svelte'
 	import { Pane, Splitpanes } from 'svelte-splitpanes'
 	import DetailPageDetailPanel from './DetailPageDetailPanel.svelte'
+	import type { ScheduleTrigger, TriggerContext } from '../triggers'
+	import { setContext } from 'svelte'
+	import { writable, type Writable } from 'svelte/store'
+	import type { TriggersCount } from '$lib/gen'
+	import DetailPageTriggerPanel from './DetailPageTriggerPanel.svelte'
 
 	export let isOperator: boolean = false
 	export let flow_json: any | undefined = undefined
-	export let hasStepDetails: boolean = false
 	export let selected: string
-	export let triggerSelected: 'webhooks' | 'schedule' | 'cli' = 'webhooks'
+	export let triggersCount: Writable<TriggersCount | undefined>
 
 	let mobileTab: 'form' | 'detail' = 'form'
 
 	let clientWidth = window.innerWidth
+
+	const primaryScheduleStore = writable<ScheduleTrigger | undefined | false>(undefined)
+	const selectedTriggerStore = writable<
+		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets'
+	>('webhooks')
+
+	setContext<TriggerContext>('TriggerContext', {
+		selectedTrigger: selectedTriggerStore,
+		primarySchedule: primaryScheduleStore,
+		triggersCount
+	})
 </script>
 
 <main class="h-screen w-full" bind:clientWidth>
@@ -26,18 +41,18 @@
 					</Pane>
 					<Pane size={35} minSize={15}>
 						<DetailPageDetailPanel
-							bind:triggerSelected
+							bind:triggerSelected={$selectedTriggerStore}
 							bind:selected
 							{isOperator}
 							{flow_json}
-							{hasStepDetails}
 						>
 							<slot slot="webhooks" name="webhooks" />
 							<slot slot="routes" name="routes" />
-							<slot slot="email" name="email" />
-							<slot slot="schedule" name="schedule" />
+							<slot slot="websockets" name="websockets" />
+							<slot slot="emails" name="emails" />
+							<slot slot="schedules" name="schedules" />
 							<slot slot="cli" name="cli" />
-							<slot slot="details" name="details" />
+							<slot slot="script" name="script" />
 							<slot slot="save_inputs" name="save_inputs" />
 							<slot slot="flow_step" name="flow_step" />
 						</DetailPageDetailPanel>
@@ -46,28 +61,42 @@
 			</SplitPanesWrapper>
 		</div>
 	{:else}
-		<div class="h-full">
+		<div class="h-full w-full">
 			<slot name="header" />
 			<Tabs bind:selected={mobileTab}>
 				<Tab value="form">Run form</Tab>
-				<Tab value="detail">Details</Tab>
-				<svelte:fragment slot="content">
-					<TabContent value="form" class="flex flex-col flex-1 h-full">
-						<slot name="form" />
-					</TabContent>
+				<Tab value="saved_inputs">Saved Inputs</Tab>
+				{#if !isOperator}
+					<Tab value="triggers">Triggers</Tab>
+				{/if}
+				{#if !flow_json}
+					<Tab value="script">Script</Tab>
+				{/if}
 
-					<TabContent value="detail" class="flex flex-col flex-1 h-full">
-						<DetailPageDetailPanel bind:triggerSelected bind:selected {isOperator} {hasStepDetails}>
-							<slot slot="webhooks" name="webhooks" />
-							<slot slot="routes" name="routes" />
-							<slot slot="email" name="email" />
-							<slot slot="schedule" name="schedule" />
-							<slot slot="cli" name="cli" />
-							<slot slot="details" name="details" />
-							<slot slot="save_inputs" name="save_inputs" />
-							<slot slot="flow_step" name="flow_step" />
-						</DetailPageDetailPanel>
-					</TabContent>
+				<svelte:fragment slot="content">
+					<div class="h-full">
+						<TabContent value="form" class="flex flex-col flex-1 h-full">
+							<slot name="form" />
+						</TabContent>
+
+						<TabContent value="saved_inputs" class="flex flex-col flex-1 h-full">
+							<slot name="save_inputs" />
+						</TabContent>
+						<TabContent value="triggers" class="flex flex-col flex-1 h-full">
+							<DetailPageTriggerPanel bind:triggerSelected={$selectedTriggerStore}>
+								<slot slot="webhooks" name="webhooks" />
+								<slot slot="routes" name="routes" />
+								<slot slot="script" name="script" />
+								<slot slot="websockets" name="websockets" />
+								<slot slot="emails" name="emails" />
+								<slot slot="schedules" name="schedules" />
+								<slot slot="cli" name="cli" />
+							</DetailPageTriggerPanel>
+						</TabContent>
+						<TabContent value="script" class="flex flex-col flex-1 h-full">
+							<slot name="script" />
+						</TabContent>
+					</div>
 				</svelte:fragment>
 			</Tabs>
 		</div>
diff --git a/frontend/src/lib/components/details/DetailPageTriggerPanel.svelte b/frontend/src/lib/components/details/DetailPageTriggerPanel.svelte
new file mode 100644
index 0000000000..d09a92ae81
--- /dev/null
+++ b/frontend/src/lib/components/details/DetailPageTriggerPanel.svelte
@@ -0,0 +1,73 @@
+<script lang="ts">
+	import { Tabs, Tab } from '$lib/components/common'
+	import { CalendarCheck2, MailIcon, Route, Terminal, Webhook, Unplug } from 'lucide-svelte'
+
+	import HighlightTheme from '../HighlightTheme.svelte'
+
+	export let triggerSelected:
+		| 'webhooks'
+		| 'emails'
+		| 'schedules'
+		| 'cli'
+		| 'routes'
+		| 'websockets' = 'webhooks'
+</script>
+
+<HighlightTheme />
+
+<Tabs bind:selected={triggerSelected}>
+	<Tab value="webhooks">
+		<span class="flex flex-row gap-2 items-center text-xs">
+			<Webhook size={12} />
+			Webhooks
+		</span>
+	</Tab>
+	<Tab value="schedules">
+		<span class="flex flex-row gap-2 items-center text-xs">
+			<CalendarCheck2 size={12} />
+			Schedules
+		</span>
+	</Tab>
+	<Tab value="routes">
+		<span class="flex flex-row gap-2 items-center text-xs">
+			<Route size={12} />
+			HTTP
+		</span>
+	</Tab>
+	<Tab value="websockets">
+		<span class="flex flex-row gap-2 items-center text-xs">
+			<Unplug size={12} />
+			Websockets
+		</span>
+	</Tab>
+	<Tab value="emails">
+		<span class="flex flex-row gap-2 items-center text-xs">
+			<MailIcon size={12} />
+			Email
+		</span>
+	</Tab>
+	<Tab value="cli">
+		<span class="flex flex-row gap-2 items-center text-xs">
+			<Terminal size={12} />
+			CLI
+		</span>
+	</Tab>
+</Tabs>
+
+<div class="h-[calc(100%-32px)]">
+	<div class="h-full overflow-auto">
+		{#if triggerSelected === 'webhooks'}
+			<slot name="webhooks" />
+		{:else if triggerSelected === 'routes'}
+			<slot name="routes" />
+		{:else if triggerSelected === 'emails'}
+			<slot name="emails" />
+		{:else if triggerSelected === 'schedules'}
+			<slot name="schedules" />
+		{:else if triggerSelected === 'websockets'}
+			<slot name="websockets" />
+		{:else if triggerSelected === 'cli'}
+			<slot name="cli" />
+		{/if}
+	</div>
+</div>
diff --git a/frontend/src/lib/components/details/EmailTriggerPanel.svelte b/frontend/src/lib/components/details/EmailTriggerPanel.svelte
index fb93e0fc1c..578ef02e4c 100644
--- a/frontend/src/lib/components/details/EmailTriggerPanel.svelte
+++ b/frontend/src/lib/components/details/EmailTriggerPanel.svelte
@@ -14,7 +14,8 @@
 	import ToggleButtonGroup from '../common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import { AlertTriangle } from 'lucide-svelte'
 	import Skeleton from '../common/skeleton/Skeleton.svelte'
-
+	import Label from '$lib/components/Label.svelte'
+	import TriggerTokens from '../triggers/TriggerTokens.svelte'
 	let userSettings: UserSettings
 
 	export let token: string
@@ -33,6 +34,7 @@
 			})) as any) ?? null
 		loading = false
 	}
+
 	getEmailDomain()
 
 	let requestType: 'hash' | 'path' = 'path'
@@ -49,6 +51,12 @@
 			.toLowerCase()
 		return `${pathOrHash}+${encodedPrefix}@${emailDomain}`
 	}
+
+	export let email: string = ''
+
+	$: email = emailAddress()
+
+	let triggerTokens: TriggerTokens | undefined = undefined
 </script>
 
 <HighlightTheme />
@@ -57,18 +65,20 @@
 	bind:this={userSettings}
 	on:tokenCreated={(e) => {
 		token = e.detail
+		triggerTokens?.listTokens()
 	}}
-	newTokenLabel={`${$userStore?.username ?? 'superadmin'}-${generateRandomString(4)}`}
+	newTokenWorkspace={$workspaceStore}
+	newTokenLabel={`email-${$userStore?.username ?? 'superadmin'}-${generateRandomString(4)}`}
 	{scopes}
 />
 
-<div class="p-2 flex flex-col w-full gap-4">
+<div class="flex flex-col w-full gap-4">
 	{#if loading}
 		<Skeleton layout={[[18]]} />
 	{:else}
 		{#if emailDomain}
 			{#if SCRIPT_VIEW_SHOW_CREATE_TOKEN_BUTTON}
-				<div class="my-2">
+				<Label label="Token">
 					<div class="flex flex-row justify-between gap-2">
 						<input
 							bind:value={token}
@@ -89,7 +99,7 @@
 							Create/input a valid token before copying the email address below
 						</div>
 					{/if}
-				</div>
+				</Label>
 			{/if}
 
 			{#if !isFlow}
@@ -103,20 +113,19 @@
 					</div>
 				</div>
 			{/if}
-			<div class="flex flex-col gap-4">
-				{#key requestType}
-					{#key token}
-						<div class="flex flex-col gap-2">
-							<ClipboardPanel title="Email address" content={emailAddress()} />
-						</div>
-					{/key}
+
+			{#key requestType}
+				{#key token}
+					<Label label="Email address">
+						<ClipboardPanel content={email} />
+					</Label>
 				{/key}
-				<Alert title="Email trigger" size="xs">
-					To trigger the job by email, send an email to the address above. The job will receive two
-					arguments: `raw_email` containing the raw email as string, and `parsed_email` containing
-					the parsed email as an object.
-				</Alert>
-			</div>
+			{/key}
+			<Alert title="Email trigger" size="xs">
+				To trigger the job by email, send an email to the address above. The job will receive two
+				arguments: `raw_email` containing the raw email as string, and `parsed_email` containing the
+				parsed email as an object.
+			</Alert>
 		{:else}
 			<div>
 				<Alert title="Email triggers are disabled" size="xs" type="warning">
@@ -133,5 +142,7 @@
 				Email triggers on Windmill Community Edition are limited to 100 emails per day.
 			</Alert>
 		{/if}
+
+		<TriggerTokens bind:this={triggerTokens} {isFlow} {path} labelPrefix="email" />
 	{/if}
 </div>
diff --git a/frontend/src/lib/components/details/ErrorHandlerToggleButtonV2.svelte b/frontend/src/lib/components/details/ErrorHandlerToggleButtonV2.svelte
new file mode 100644
index 0000000000..18d1bd5591
--- /dev/null
+++ b/frontend/src/lib/components/details/ErrorHandlerToggleButtonV2.svelte
@@ -0,0 +1,67 @@
+<script lang="ts">
+	import Toggle from '$lib/components/Toggle.svelte'
+
+	import { FlowService, ScriptService } from '$lib/gen'
+	import { sendUserToast } from '$lib/toast'
+	import { workspaceStore } from '$lib/stores'
+
+	export let kind: 'script' | 'flow'
+	export let scriptOrFlowPath: string
+	export let errorHandlerMuted: boolean | undefined
+	export let textDisabled = false
+	let toggleState = errorHandlerMuted
+
+	export let color: 'nord' | 'red' | 'blue' = 'nord'
+
+	async function toggleErrorHandler(): Promise<void> {
+		toggleState = !toggleState
+		if ($workspaceStore !== undefined) {
+			try {
+				if (kind === 'flow') {
+					await FlowService.toggleWorkspaceErrorHandlerForFlow({
+						workspace: $workspaceStore,
+						path: scriptOrFlowPath,
+						requestBody: {
+							muted: !errorHandlerMuted
+						}
+					})
+				} else {
+					await ScriptService.toggleWorkspaceErrorHandlerForScript({
+						workspace: $workspaceStore,
+						path: scriptOrFlowPath,
+						requestBody: {
+							muted: !errorHandlerMuted
+						}
+					})
+				}
+			} catch (error) {
+				sendUserToast(
+					`Error while toggling Workspace Error Handler: ${error.body || error.message}`,
+					true
+				)
+				toggleState = false
+				return
+			}
+			errorHandlerMuted = !errorHandlerMuted
+			toggleState = errorHandlerMuted
+			sendUserToast(
+				errorHandlerMuted ? 'Workspace error handler muted' : 'Workspace error handler active',
+				false
+			)
+		}
+		toggleState = false
+	}
+</script>
+
+<Toggle
+	{color}
+	textClass="font-normal text-sm"
+	size="xs"
+	checked={toggleState}
+	on:change={toggleErrorHandler}
+	options={{
+		right: 'Mute',
+		rightTooltip: 'Disable workspace error handler, EE only'
+	}}
+	{textDisabled}
+/>
diff --git a/frontend/src/lib/components/details/Menu.svelte b/frontend/src/lib/components/details/Menu.svelte
index e875d6bf7e..baa8999974 100644
--- a/frontend/src/lib/components/details/Menu.svelte
+++ b/frontend/src/lib/components/details/Menu.svelte
@@ -38,7 +38,7 @@
 		</MenuButton>
 	</span>
 
-	<Portal>
+	<Portal name="menu">
 		<div use:popperContent={popperOptions} class="z-[2000]">
 			<Transition
 				show={open}
diff --git a/frontend/src/lib/components/flows/CreateActionsApp.svelte b/frontend/src/lib/components/flows/CreateActionsApp.svelte
index f0c08acf3b..c8260b0fc0 100644
--- a/frontend/src/lib/components/flows/CreateActionsApp.svelte
+++ b/frontend/src/lib/components/flows/CreateActionsApp.svelte
@@ -72,7 +72,7 @@
 			}
 		]}
 	>
-		<div class="flex flex-row">
+		<div class="flex flex-row items-center">
 			App <LayoutDashboard class="ml-1.5" size={18} />
 		</div>
 	</Button>
diff --git a/frontend/src/lib/components/flows/FlowEditor.svelte b/frontend/src/lib/components/flows/FlowEditor.svelte
index 2c7a763ba6..01fb16db41 100644
--- a/frontend/src/lib/components/flows/FlowEditor.svelte
+++ b/frontend/src/lib/components/flows/FlowEditor.svelte
@@ -16,15 +16,18 @@
 	export let disableTutorials = false
 	export let disableAi = false
 	export let disableSettings = false
+	export let disabledFlowInputs = false
 	export let smallErrorHandler = false
+	export let newFlow: boolean = false
 
-	let size = 40
+	let size = 50
 
 	const { currentStepStore: copilotCurrentStepStore } =
 		getContext<FlowCopilotContext>('FlowCopilotContext')
 </script>
 
 <div
+	id="flow-editor"
 	class={classNames(
 		'h-full overflow-hidden transition-colors duration-[400ms] ease-linear border-t',
 		$copilotCurrentStepStore !== undefined ? 'border-gray-500/75' : ''
@@ -46,6 +49,7 @@
 						{disableAi}
 						{disableSettings}
 						{smallErrorHandler}
+						{newFlow}
 						bind:modules={$flowStore.value.modules}
 						on:reload
 					/>
@@ -60,7 +64,7 @@
 					</div>
 				</div>
 			{:else}
-				<FlowEditorPanel enableAi={!disableAi} />
+				<FlowEditorPanel {disabledFlowInputs} {newFlow} enableAi={!disableAi} />
 			{/if}
 		</Pane>
 	</Splitpanes>
diff --git a/frontend/src/lib/components/flows/FlowHistory.svelte b/frontend/src/lib/components/flows/FlowHistory.svelte
index e98d3a2778..5349de4333 100644
--- a/frontend/src/lib/components/flows/FlowHistory.svelte
+++ b/frontend/src/lib/components/flows/FlowHistory.svelte
@@ -1,88 +1,18 @@
 <script lang="ts">
-	import { Pane, Splitpanes } from 'svelte-splitpanes'
-	import PanelSection from '../apps/editor/settingsPanel/common/PanelSection.svelte'
-	import { classNames, displayDate, emptyString, sendUserToast } from '$lib/utils'
-	import { type Flow, FlowService, type FlowVersion } from '$lib/gen'
-	import { workspaceStore } from '$lib/stores'
-	import { Skeleton } from '$lib/components/common'
+	import { createEventDispatcher } from 'svelte'
 	import Drawer from '../common/drawer/Drawer.svelte'
 	import DrawerContent from '../common/drawer/DrawerContent.svelte'
-	import Button from '../common/button/Button.svelte'
-	import { ArrowRight, Loader2, Pencil, X } from 'lucide-svelte'
-	import { createEventDispatcher } from 'svelte'
+
+	import FlowHistoryInner from './FlowHistoryInner.svelte'
 
 	export let path: string
 	let drawer: Drawer
-	let loading: boolean = false
-
-	let versions: FlowVersion[] = []
-
-	let selectedVersion: FlowVersion | undefined = undefined
-	let selected: Flow | undefined = undefined
-	let deploymentMsgUpdateMode = false
-	let deploymentMsgUpdate: string | undefined = undefined
 
 	export function open() {
-		loadVersions()
 		drawer.openDrawer()
 	}
 
-	async function loadFlow(version: number) {
-		selected = await FlowService.getFlowVersion({
-			workspace: $workspaceStore!,
-			version,
-			path
-		})
-	}
-
-	async function loadVersions() {
-		loading = true
-		versions = await FlowService.getFlowHistory({
-			workspace: $workspaceStore!,
-			path: path
-		})
-		loading = false
-	}
-
-	async function updateDeploymentMsg(version: number | undefined) {
-		if (
-			selectedVersion === undefined ||
-			version === undefined ||
-			emptyString(deploymentMsgUpdate)
-		) {
-			return
-		}
-		await FlowService.updateFlowHistory({
-			workspace: $workspaceStore!,
-			version,
-			path,
-			requestBody: {
-				deployment_msg: deploymentMsgUpdate!
-			}
-		})
-		selectedVersion.deployment_msg = deploymentMsgUpdate
-		deploymentMsgUpdateMode = false
-		loadVersions()
-	}
-
 	const dispatch = createEventDispatcher()
-
-	async function restoreVersion(flow: Flow | undefined) {
-		if (!flow) return
-		await FlowService.updateFlow({
-			workspace: $workspaceStore!,
-			requestBody: {
-				...flow,
-				path
-			},
-			path
-		})
-		dispatch('historyRestore')
-		drawer?.closeDrawer()
-		sendUserToast('Flow restored from previous deployment')
-	}
-
-	$: selectedVersion !== undefined && loadFlow(selectedVersion.id)
 </script>
 
 <Drawer bind:this={drawer} size="1200px">
@@ -91,136 +21,15 @@
 			drawer?.closeDrawer()
 		}}
 		noPadding
+		title="Deployment History"
 	>
-		<Splitpanes class="!overflow-visible">
-			<Pane size={20}>
-				<PanelSection title="Past Deployments">
-					<div class="flex flex-col gap-2 w-full">
-						{#if !loading}
-							{#if versions.length > 0}
-								<div class="flex gap-2 flex-col">
-									{#each versions ?? [] as version}
-										<!-- svelte-ignore a11y-click-events-have-key-events -->
-										<div
-											class={classNames(
-												'border flex gap-1 truncate justify-between flex-row w-full items-center p-2 rounded-md cursor-pointer hover:bg-blue-50 hover:text-blue-400',
-												selectedVersion?.id == version.id ? 'bg-blue-100 text-blue-600' : ''
-											)}
-											role="button"
-											tabindex="0"
-											on:click={() => {
-												selectedVersion = version
-											}}
-										>
-											<span class="text-xs truncate">
-												{#if emptyString(version.deployment_msg)}Version {version.id}{:else}{version.deployment_msg}{/if}
-											</span>
-										</div>
-									{/each}
-								</div>
-							{:else}
-								<div class="text-sm text-tertiary">No items</div>
-							{/if}
-						{:else}
-							<Skeleton layout={[[40], [40], [40], [40], [40]]} />
-						{/if}
-					</div>
-				</PanelSection>
-			</Pane>
-			<Pane size={80}>
-				<div class="h-full w-full overflow-auto">
-					{#if selectedVersion}
-						{#if selected}
-							<div class="px-2 flex flex-col gap-2">
-								<span class="flex flex-row text-sm p-1 text-tertiary">
-									{#if deploymentMsgUpdateMode}
-										<div class="flex w-full">
-											<input
-												type="text"
-												bind:value={deploymentMsgUpdate}
-												class="!w-auto grow"
-												on:click|stopPropagation={() => {}}
-												on:keydown|stopPropagation
-												on:keypress|stopPropagation={({ key }) => {
-													if (key === 'Enter') updateDeploymentMsg(selectedVersion?.id)
-												}}
-											/>
-											<Button
-												size="xs"
-												color="blue"
-												buttonType="button"
-												btnClasses="!p-1 !w-[34px] !ml-1"
-												aria-label="Save Deployment Message"
-												on:click={() => {
-													updateDeploymentMsg(selectedVersion?.id)
-												}}
-											>
-												<ArrowRight size={14} />
-											</Button>
-											<Button
-												size="xs"
-												color="light"
-												buttonType="button"
-												btnClasses="!p-1 !w-[34px] !ml-1"
-												aria-label="Abort"
-												on:click={() => {
-													deploymentMsgUpdateMode = false
-													deploymentMsgUpdate = undefined
-												}}
-											>
-												<X size={14} />
-											</Button>
-										</div>
-									{:else}
-										{#if selectedVersion.deployment_msg}
-											{selectedVersion.deployment_msg}
-										{:else}
-											Deployed {displayDate(selected.edited_at)} by {selected.edited_by}
-										{/if}
-										<button
-											on:click={() => {
-												deploymentMsgUpdate = selectedVersion?.deployment_msg
-												deploymentMsgUpdateMode = true
-											}}
-											title="Update commit message"
-											class="flex items-center px-1 rounded-sm hover:text-primary text-secondary h-5"
-											aria-label="Update commit message"
-										>
-											<Pencil size={14} />
-										</button>
-									{/if}
-								</span>
-								<div class="flex p-1 gap-2">
-									<Button
-										size="xs"
-										on:click={() =>
-											window.open(
-												`/flows/add?template_id=${selectedVersion?.id}&template=${path}`,
-												'_blank'
-											)}
-									>
-										Restore as fork
-									</Button>
-									<Button size="xs" on:click={() => restoreVersion(selected)}
-										>Redeploy with that version
-									</Button>
-								</div>
-								{#await import('$lib/components/FlowViewer.svelte')}
-									<Loader2 class="animate-spin" />
-								{:then Module}
-									<Module.default flow={selected} />
-								{/await}
-							</div>
-						{:else}
-							<Skeleton layout={[[40]]} />
-						{/if}
-					{:else}
-						<div class="text-sm p-2 text-tertiary"
-							>Select a deployment version to see its details</div
-						>
-					{/if}
-				</div>
-			</Pane>
-		</Splitpanes>
+		<FlowHistoryInner
+			allowFork
+			on:historyRestore={() => {
+				drawer.closeDrawer()
+				dispatch('historyRestore')
+			}}
+			{path}
+		/>
 	</DrawerContent>
 </Drawer>
diff --git a/frontend/src/lib/components/flows/FlowHistoryInner.svelte b/frontend/src/lib/components/flows/FlowHistoryInner.svelte
new file mode 100644
index 0000000000..666d76456c
--- /dev/null
+++ b/frontend/src/lib/components/flows/FlowHistoryInner.svelte
@@ -0,0 +1,216 @@
+<script lang="ts">
+	import { Pane, Splitpanes } from 'svelte-splitpanes'
+	import { classNames, displayDate, emptyString, sendUserToast } from '$lib/utils'
+	import { type Flow, FlowService, type FlowVersion } from '$lib/gen'
+	import { workspaceStore } from '$lib/stores'
+	import { Skeleton } from '$lib/components/common'
+	import Button from '../common/button/Button.svelte'
+	import { ArrowRight, Loader2, Pencil, X } from 'lucide-svelte'
+	import { createEventDispatcher } from 'svelte'
+
+	export let path: string
+	export let allowFork: boolean = false
+	let loading: boolean = false
+
+	let versions: FlowVersion[] = []
+
+	let selectedVersion: FlowVersion | undefined = undefined
+	let selected: Flow | undefined = undefined
+	let deploymentMsgUpdateMode = false
+	let deploymentMsgUpdate: string | undefined = undefined
+
+	async function loadFlow(version: number) {
+		selected = await FlowService.getFlowVersion({
+			workspace: $workspaceStore!,
+			version,
+			path
+		})
+	}
+
+	async function loadVersions() {
+		loading = true
+		versions = await FlowService.getFlowHistory({
+			workspace: $workspaceStore!,
+			path: path
+		})
+		loading = false
+	}
+
+	async function updateDeploymentMsg(version: number | undefined) {
+		if (
+			selectedVersion === undefined ||
+			version === undefined ||
+			emptyString(deploymentMsgUpdate)
+		) {
+			return
+		}
+		await FlowService.updateFlowHistory({
+			workspace: $workspaceStore!,
+			version,
+			path,
+			requestBody: {
+				deployment_msg: deploymentMsgUpdate!
+			}
+		})
+		selectedVersion.deployment_msg = deploymentMsgUpdate
+		deploymentMsgUpdateMode = false
+		loadVersions()
+	}
+
+	const dispatch = createEventDispatcher()
+
+	async function restoreVersion(flow: Flow | undefined) {
+		if (!flow) return
+		await FlowService.updateFlow({
+			workspace: $workspaceStore!,
+			requestBody: {
+				...flow,
+				path
+			},
+			path
+		})
+		dispatch('historyRestore')
+		sendUserToast('Flow restored from previous deployment')
+	}
+
+	loadVersions()
+
+	$: selectedVersion !== undefined && loadFlow(selectedVersion.id)
+</script>
+
+<Splitpanes class="!overflow-visible">
+	<Pane size={20}>
+		<div class="flex flex-col gap-2 w-full px-2 py-2">
+			{#if !loading}
+				{#if versions.length > 0}
+					<div class="flex gap-2 flex-col">
+						{#each versions ?? [] as version}
+							<!-- svelte-ignore a11y-click-events-have-key-events -->
+							<div
+								class={classNames(
+									'border flex gap-1 truncate justify-between flex-row w-full items-center p-2 rounded-md cursor-pointer hover:bg-surface-hover hover:text-primary',
+									selectedVersion?.id == version.id ? 'bg-surface-selected text-primary' : ''
+								)}
+								role="button"
+								tabindex="0"
+								on:click={() => {
+									selectedVersion = version
+								}}
+							>
+								<span class="text-xs truncate">
+									{#if emptyString(version.deployment_msg)}Version {version.id}{:else}{version.deployment_msg}{/if}
+								</span>
+							</div>
+						{/each}
+					</div>
+				{:else}
+					<div class="text-sm text-tertiary">No items</div>
+				{/if}
+			{:else}
+				<Skeleton layout={[[40], [40], [40], [40], [40]]} />
+			{/if}
+		</div>
+	</Pane>
+	<Pane size={80}>
+		<div class="h-full w-full overflow-auto pt-2">
+			{#if selectedVersion}
+				{#if selected}
+					<div class="px-2 flex flex-col gap-2">
+						<div class="flex justify-between">
+							<span class="flex flex-row text-sm p-1 text-tertiary">
+								{#if deploymentMsgUpdateMode}
+									<div class="flex w-full">
+										<input
+											type="text"
+											bind:value={deploymentMsgUpdate}
+											class="!w-auto grow"
+											on:click|stopPropagation={() => {}}
+											on:keydown|stopPropagation
+											on:keypress|stopPropagation={({ key }) => {
+												if (key === 'Enter') updateDeploymentMsg(selectedVersion?.id)
+											}}
+										/>
+										<Button
+											size="xs"
+											color="blue"
+											buttonType="button"
+											btnClasses="!p-1 !w-[34px] !ml-1"
+											aria-label="Save Deployment Message"
+											on:click={() => {
+												updateDeploymentMsg(selectedVersion?.id)
+											}}
+										>
+											<ArrowRight size={14} />
+										</Button>
+										<Button
+											size="xs"
+											color="light"
+											buttonType="button"
+											btnClasses="!p-1 !w-[34px] !ml-1"
+											aria-label="Abort"
+											on:click={() => {
+												deploymentMsgUpdateMode = false
+												deploymentMsgUpdate = undefined
+											}}
+										>
+											<X size={14} />
+										</Button>
+									</div>
+								{:else}
+									{#if selectedVersion.deployment_msg}
+										{selectedVersion.deployment_msg}
+									{:else}
+										Deployed {displayDate(selected.edited_at)} by {selected.edited_by}
+									{/if}
+									<button
+										on:click={() => {
+											deploymentMsgUpdate = selectedVersion?.deployment_msg
+											deploymentMsgUpdateMode = true
+										}}
+										title="Update commit message"
+										class="flex items-center px-1 rounded-sm hover:text-primary text-secondary h-5"
+										aria-label="Update commit message"
+									>
+										<Pencil size={14} />
+									</button>
+								{/if}
+							</span>
+							<div class="flex p-1 gap-2">
+								{#if allowFork}
+									<div class="flex">
+										<Button
+											size="sm"
+											color="dark"
+											on:click={() =>
+												window.open(
+													`/flows/add?template_id=${selectedVersion?.id}&template=${path}`,
+													'_blank'
+												)}
+										>
+											Restore as fork
+										</Button>
+									</div>
+								{/if}
+
+								<div class="flex">
+									<Button size="sm" color="dark" on:click={() => restoreVersion(selected)}
+										>Redeploy with that version
+									</Button>
+								</div>
+							</div>
+						</div>
+						{#await import('$lib/components/FlowViewer.svelte')}
+							<Loader2 class="animate-spin" />
+						{:then Module}
+							<Module.default flow={selected} />
+						{/await}
+					</div>
+				{:else}
+					<Skeleton layout={[[40]]} />
+				{/if}
+			{:else}
+				<div class="text-sm p-2 text-tertiary">Select a deployment version to see its details</div>
+			{/if}
+		</div>
+	</Pane>
+</Splitpanes>
diff --git a/frontend/src/lib/components/flows/content/FlowBranchesAllWrapper.svelte b/frontend/src/lib/components/flows/content/FlowBranchesAllWrapper.svelte
index 1399739a0c..01a14049c7 100644
--- a/frontend/src/lib/components/flows/content/FlowBranchesAllWrapper.svelte
+++ b/frontend/src/lib/components/flows/content/FlowBranchesAllWrapper.svelte
@@ -14,10 +14,12 @@
 	import FlowModuleMock from './FlowModuleMock.svelte'
 	import FlowModuleDeleteAfterUse from './FlowModuleDeleteAfterUse.svelte'
 	import { enterpriseLicense } from '$lib/stores'
+	import FlowModuleSkip from './FlowModuleSkip.svelte'
 
 	export let noEditor: boolean
 	export let flowModule: FlowModule
 	export let previousModule: FlowModule | undefined
+	export let parentModule: FlowModule | undefined
 
 	let value = flowModule.value as BranchAll
 	$: value = flowModule.value as BranchAll
@@ -77,6 +79,7 @@
 					<Pane size={40}>
 						<Tabs bind:selected>
 							<Tab value="early-stop">Early Stop/Break</Tab>
+							<Tab value="skip">Skip</Tab>
 							<Tab value="suspend">Suspend/Approval/Prompt</Tab>
 							<Tab value="sleep">Sleep</Tab>
 							<Tab value="mock">Mock</Tab>
@@ -88,6 +91,11 @@
 											<FlowModuleEarlyStop bind:flowModule />
 										</div>
 									</TabContent>
+									<TabContent value="skip" class="flex flex-col flex-1 h-full">
+										<div class="p-4 overflow-y-auto">
+											<FlowModuleSkip bind:flowModule {parentModule} {previousModule} />
+										</div>
+									</TabContent>
 									<TabContent value="suspend" class="flex flex-col flex-1 h-full">
 										<div class="p-4 overflow-y-auto">
 											<FlowModuleSuspend previousModuleId={previousModule?.id} bind:flowModule />
diff --git a/frontend/src/lib/components/flows/content/FlowBranchesOneWrapper.svelte b/frontend/src/lib/components/flows/content/FlowBranchesOneWrapper.svelte
index c4fc266b0a..3adfaebe05 100644
--- a/frontend/src/lib/components/flows/content/FlowBranchesOneWrapper.svelte
+++ b/frontend/src/lib/components/flows/content/FlowBranchesOneWrapper.svelte
@@ -14,10 +14,12 @@
 	import SplitPanesWrapper from '../../splitPanes/SplitPanesWrapper.svelte'
 	import FlowModuleMock from './FlowModuleMock.svelte'
 	import { enterpriseLicense } from '$lib/stores'
+	import FlowModuleSkip from './FlowModuleSkip.svelte'
 	// import FlowRetries from './FlowRetries.svelte'
 
 	export let flowModule: FlowModule
 	export let previousModule: FlowModule | undefined
+	export let parentModule: FlowModule | undefined
 	export let noEditor: boolean
 	export let enableAi = false
 
@@ -89,6 +91,7 @@
 					<Pane size={40}>
 						<Tabs bind:selected>
 							<Tab value="early-stop">Early Stop/Break</Tab>
+							<Tab value="skip">Skip</Tab>
 							<Tab value="suspend">Suspend/Approval/Prompt</Tab>
 							<Tab value="sleep">Sleep</Tab>
 							<Tab value="mock">Mock</Tab>
@@ -100,6 +103,11 @@
 											<FlowModuleEarlyStop bind:flowModule />
 										</div>
 									</TabContent>
+									<TabContent value="skip" class="flex flex-col flex-1 h-full">
+										<div class="p-4 overflow-y-auto">
+											<FlowModuleSkip bind:flowModule {parentModule} {previousModule} />
+										</div>
+									</TabContent>
 									<TabContent value="suspend" class="flex flex-col flex-1 h-full">
 										<div class="p-4 overflow-y-auto">
 											<FlowModuleSuspend previousModuleId={previousModule?.id} bind:flowModule />
diff --git a/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte b/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
index 79a283a982..4993afa0f9 100644
--- a/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
+++ b/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
@@ -7,6 +7,7 @@
 	import FlowInput from './FlowInput.svelte'
 	import FlowFailureModule from './FlowFailureModule.svelte'
 	import FlowConstants from './FlowConstants.svelte'
+	import TriggersEditor from '../../triggers/TriggersEditor.svelte'
 	import type { FlowModule } from '$lib/gen'
 	import { initFlowStepWarnings } from '../utils'
 	import { dfs } from '../dfs'
@@ -14,8 +15,10 @@
 
 	export let noEditor = false
 	export let enableAi = false
+	export let newFlow = false
+	export let disabledFlowInputs = false
 
-	const { selectedId, flowStore, flowStateStore, flowInputsStore } =
+	const { selectedId, flowStore, flowStateStore, flowInputsStore, pathStore, initialPath } =
 		getContext<FlowEditorContext>('FlowEditorContext')
 
 	function checkDup(modules: FlowModule[]): string | undefined {
@@ -57,7 +60,7 @@
 {#if $selectedId?.startsWith('settings')}
 	<FlowSettings {noEditor} />
 {:else if $selectedId === 'Input'}
-	<FlowInput {noEditor} />
+	<FlowInput {noEditor} disabled={disabledFlowInputs} />
 {:else if $selectedId === 'Result'}
 	<p class="p-4 text-secondary">Nothing to show about the result node. Happy flow building!</p>
 {:else if $selectedId === 'constants'}
@@ -66,6 +69,15 @@
 	<FlowFailureModule {noEditor} />
 {:else if $selectedId === 'preprocessor'}
 	<FlowPreprocessorModule {noEditor} />
+{:else if $selectedId === 'triggers'}
+	<TriggersEditor
+		currentPath={$pathStore}
+		{initialPath}
+		schema={$flowStore.schema}
+		{noEditor}
+		newItem={newFlow}
+		isFlow={true}
+	/>
 {:else}
 	{@const dup = checkDup($flowStore.value.modules)}
 	{#if dup}
diff --git a/frontend/src/lib/components/flows/content/FlowInput.svelte b/frontend/src/lib/components/flows/content/FlowInput.svelte
index 3e485d5a9b..cb7ed9ad80 100644
--- a/frontend/src/lib/components/flows/content/FlowInput.svelte
+++ b/frontend/src/lib/components/flows/content/FlowInput.svelte
@@ -12,8 +12,10 @@
 	import SavedInputs from '$lib/components/SavedInputs.svelte'
 	import EditableSchemaForm from '$lib/components/EditableSchemaForm.svelte'
 	import AddProperty from '$lib/components/schema/AddProperty.svelte'
+	import FlowInputViewer from '$lib/components/FlowInputViewer.svelte'
 
 	export let noEditor: boolean
+	export let disabled: boolean
 
 	const { flowStore, flowStateStore, previewArgs, initialPath } =
 		getContext<FlowEditorContext>('FlowEditorContext')
@@ -42,67 +44,73 @@
 <CapturePayload bind:this={capturePayload} />
 
 <FlowCard {noEditor} title="Flow Input">
-	<div class="flex flex-row items-center gap-2 px-4 py-2 border-b">
-		<div>Copy input's schema from</div>
-		<Button
-			color="dark"
-			size="xs"
-			on:click={() => {
-				capturePayload.openDrawer()
-			}}
-		>
-			A request
-		</Button>
-		<Button
-			color="dark"
-			size="xs"
-			on:click={() => {
-				jsonPayload.openDrawer()
-			}}
-		>
-			A JSON
-		</Button>
-		<Button
-			color="dark"
-			size="xs"
-			on:click={() => {
-				inputLibraryDrawer.openDrawer()
-			}}
-		>
-			Past Runs/Input library
-		</Button>
-		<Button
-			color="dark"
-			size="xs"
-			disabled={$flowStore.value.modules.length === 0 ||
-				$flowStore.value.modules[0].value.type == 'identity'}
-			on:click={() => copyFirstStepSchema($flowStateStore, flowStore)}
-		>
-			First step's inputs
-		</Button>
-	</div>
-	<div class="p-4 border-b">
-		<AddProperty
-			bind:schema={$flowStore.schema}
-			bind:this={addProperty}
-			on:change={() => {
-				$flowStore = $flowStore
-			}}
-		/>
-	</div>
+	{#if !disabled}
+		<div class="flex flex-row items-center gap-2 px-4 py-2 border-b">
+			<div>Copy input's schema from</div>
+			<Button
+				color="dark"
+				size="xs"
+				on:click={() => {
+					capturePayload.openDrawer()
+				}}
+			>
+				A request
+			</Button>
+			<Button
+				color="dark"
+				size="xs"
+				on:click={() => {
+					jsonPayload.openDrawer()
+				}}
+			>
+				A JSON
+			</Button>
+			<Button
+				color="dark"
+				size="xs"
+				on:click={() => {
+					inputLibraryDrawer.openDrawer()
+				}}
+			>
+				Past Runs/Input library
+			</Button>
+			<Button
+				color="dark"
+				size="xs"
+				disabled={$flowStore.value.modules.length === 0 ||
+					$flowStore.value.modules[0].value.type == 'identity'}
+				on:click={() => copyFirstStepSchema($flowStateStore, flowStore)}
+			>
+				First step's inputs
+			</Button>
+		</div>
+		<div class="p-4 border-b">
+			<AddProperty
+				bind:schema={$flowStore.schema}
+				bind:this={addProperty}
+				on:change={() => {
+					$flowStore = $flowStore
+				}}
+			/>
+		</div>
 
-	<EditableSchemaForm
-		bind:schema={$flowStore.schema}
-		isFlowInput
-		on:edit={(e) => {
-			addProperty?.openDrawer(e.detail)
-		}}
-		on:delete={(e) => {
-			addProperty?.handleDeleteArgument([e.detail])
-		}}
-		offset={yOffset}
-		displayWebhookWarning
-	/>
+		<EditableSchemaForm
+			bind:schema={$flowStore.schema}
+			isFlowInput
+			on:edit={(e) => {
+				addProperty?.openDrawer(e.detail)
+			}}
+			on:delete={(e) => {
+				addProperty?.handleDeleteArgument([e.detail])
+			}}
+			offset={yOffset}
+			displayWebhookWarning
+		/>
+	{:else}
+		<div class="p-4 border-b">
+			<FlowInputViewer schema={$flowStore.schema} />
+		</div>
+	{/if}
 </FlowCard>
 
 <Drawer bind:this={jsonPayload} size="800px">
diff --git a/frontend/src/lib/components/flows/content/FlowInputsFlowQuick.svelte b/frontend/src/lib/components/flows/content/FlowInputsFlowQuick.svelte
new file mode 100644
index 0000000000..0c7dc25bd7
--- /dev/null
+++ b/frontend/src/lib/components/flows/content/FlowInputsFlowQuick.svelte
@@ -0,0 +1,73 @@
+<script lang="ts">
+	import { Skeleton } from '$lib/components/common'
+	import SearchItems from '$lib/components/SearchItems.svelte'
+	import { FlowService, type Flow } from '$lib/gen'
+	import { workspaceStore } from '$lib/stores'
+	import { emptyString } from '$lib/utils'
+	import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
+	import { createEventDispatcher } from 'svelte'
+
+	// export let failureModule: boolean
+	const dispatch = createEventDispatcher()
+
+	let items: Flow[] | undefined = undefined
+	let filteredItems: (Flow & { marked?: string })[] | undefined = undefined
+	export let filter = ''
+	$: $workspaceStore && loadFlows()
+
+	let ownerFilter: string | undefined = undefined
+	$: prefilteredItems = ownerFilter ? items?.filter((x) => x.path.startsWith(ownerFilter!)) : items
+
+	export let owners: string[] = []
+	$: owners = Array.from(
+		new Set(filteredItems?.map((x) => x.path.split('/').slice(0, 2).join('/')) ?? [])
+	).sort()
+
+	async function loadFlows() {
+		items = await FlowService.listFlows({ workspace: $workspaceStore! })
+	}
+</script>
+
+<SearchItems
+	{filter}
+	items={prefilteredItems}
+	bind:filteredItems
+	f={(x) => (emptyString(x.summary) ? x.path : x.summary + ' (' + x.path + ')')}
+/>
+<div class="flex flex-col min-h-0">
+	{#if filteredItems}
+		{#if filter.length > 0 && filteredItems.length == 0}
+			<div class="text-2xs text-tercary font-extralight text-center py-2 px-3 items-center">
+				No items found.
+			</div>
+		{/if}
+		<ul class="overflow-auto">
+			{#each filteredItems as { path, summary, marked }}
+				<li class="flex flex-row w-full">
+					<button
+						class="px-3 py-2 gap-2 flex flex-row w-full hover:bg-surface-hover bg-surface transition-all items-center rounded-md text-left text-2xs text-primary font-normal"
+						on:click={async () => {
+							dispatch('pickFlow', {
+								path,
+								summary
+							})
+						}}
+					>
+						<BarsStaggered size={14} />
+						<span class="grow truncate">
+							{#if marked}
+								{@html marked}
+							{:else}
+								{!summary || summary.length == 0 ? path : summary}
+							{/if}
+						</span>
+					</button>
+				</li>
+			{/each}
+		</ul>
+	{:else}
+		{#each Array(10).fill(0) as _}
+			<Skeleton layout={[0.5, [1.5]]} />
+		{/each}
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte b/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte
new file mode 100644
index 0000000000..9cbee5ca21
--- /dev/null
+++ b/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte
@@ -0,0 +1,466 @@
+<script lang="ts">
+	import { isCloudHosted } from '$lib/cloud'
+	import { sendUserToast } from '$lib/toast'
+	import FlowScriptPickerQuick from '../pickers/FlowScriptPickerQuick.svelte'
+	import WorkspaceScriptPickerQuick from '../pickers/WorkspaceScriptPickerQuick.svelte'
+	import { defaultScriptLanguages, processLangs } from '$lib/scripts'
+	import { defaultScripts, enterpriseLicense, userStore } from '$lib/stores'
+	import type { SupportedLanguage } from '$lib/common'
+	import { createEventDispatcher, getContext, onDestroy, onMount } from 'svelte'
+	import type { FlowBuilderWhitelabelCustomUi } from '$lib/components/custom_ui'
+	import PickHubScriptQuick from '../pickers/PickHubScriptQuick.svelte'
+	import { type Script, type FlowModule } from '$lib/gen'
+	import ListFiltersQuick from '$lib/components/home/ListFiltersQuick.svelte'
+	import { Folder, User } from 'lucide-svelte'
+	import type { FlowCopilotContext, FlowCopilotModule } from '../../copilot/flow'
+	import type { FlowEditorContext } from '../../flows/types'
+	import { copilotInfo } from '$lib/stores'
+	import { nextId } from '../../flows/flowModuleNextId'
+	import { twMerge } from 'tailwind-merge'
+	import { fade } from 'svelte/transition'
+	import { flip } from 'svelte/animate'
+	import Scrollable from '$lib/components/Scrollable.svelte'
+	import { Button } from '$lib/components/common'
+	import { SettingsIcon } from 'lucide-svelte'
+	import DefaultScriptsInner from '$lib/components/DefaultScriptsInner.svelte'
+	import GenAiQuick from './GenAiQuick.svelte'
+	import FlowToplevelNode from '../pickers/FlowToplevelNode.svelte'
+
+	const dispatch = createEventDispatcher()
+
+	export let summary: string | undefined = undefined
+	export let filter = ''
+	export let disableAi = false
+	export let preFilter: 'all' | 'workspace' | 'hub' = 'hub'
+	export let funcDesc: string
+	export let index: number
+	export let modules: FlowModule[]
+	export let owners: string[] = []
+	export let loading = false
+	export let small = false
+	export let kind: 'trigger' | 'script' | 'preprocessor' | 'failure' | 'approval'
+	export let selectedKind: 'script' | 'flow' | 'approval' | 'trigger' | 'preprocessor' | 'failure' =
+		kind
+
+	let lang: FlowCopilotModule['lang'] = undefined
+	let selectedCompletion: FlowCopilotModule['selectedCompletion'] = undefined
+
+	let filteredWorkspaceItems: (Script & { marked?: string })[] = []
+
+	let hubCompletions: FlowCopilotModule['hubCompletions'] = []
+
+	const { flowStore, flowStateStore, insertButtonOpen } =
+		getContext<FlowEditorContext>('FlowEditorContext')
+	const { modulesStore: copilotModulesStore, genFlow } =
+		getContext<FlowCopilotContext>('FlowCopilotContext')
+
+	let selected: { kind: 'owner' | 'integrations'; name: string | undefined } | undefined = undefined
+
+	let integrations: string[] = []
+
+	let customUi: undefined | FlowBuilderWhitelabelCustomUi = getContext('customUi')
+
+	$: langs = processLangs(undefined, $defaultScripts?.order ?? Object.keys(defaultScriptLanguages))
+		.map((l) => [defaultScriptLanguages[l], l])
+		.filter(
+			(x) => $defaultScripts?.hidden == undefined || !$defaultScripts.hidden.includes(x[1])
+		) as [string, SupportedLanguage | 'docker'][]
+
+	function displayLang(
+		lang: SupportedLanguage | 'docker',
+		kind: 'script' | 'flow' | 'approval' | 'trigger' | 'preprocessor' | 'failure'
+	) {
+		if (kind == 'trigger') {
+			return ['python3', 'bun', 'deno', 'go'].includes(lang)
+		} else if (kind == 'script') {
+			return true
+		} else if (kind == 'approval') {
+			return ['python3', 'bun', 'deno'].includes(lang)
+		} else if (kind == 'flow') {
+			return false
+		} else if (kind == 'preprocessor') {
+			return ['python3', 'bun', 'deno'].includes(lang)
+		} else if (kind == 'failure') {
+			return ['python3', 'bun', 'deno', 'go'].includes(lang)
+		}
+	}
+
+	async function onGenerate() {
+		if (!selectedCompletion && !$copilotInfo.exists_openai_resource_path) {
+			sendUserToast(
+				'Windmill AI is not enabled, you can activate it in the workspace settings',
+				true
+			)
+			return
+		}
+		$copilotModulesStore = [
+			{
+				id: nextId($flowStateStore, $flowStore),
+				type: selectedKind == 'trigger' ? 'trigger' : 'script',
+				description: funcDesc,
+				code: '',
+				source: selectedCompletion ? 'hub' : 'custom',
+				hubCompletions,
+				selectedCompletion,
+				editor: undefined,
+				lang
+			}
+		]
+		genFlow?.(index, modules, true)
+		dispatch('close')
+	}
+
+	let openScriptSettings = false
+
+	let selectedByKeyboard = 0
+
+	$: onSelectedKindChange(selectedKind)
+
+	function onSelectedKindChange(
+		_selectedKind: 'script' | 'flow' | 'approval' | 'trigger' | 'preprocessor' | 'failure'
+	) {
+		selectedByKeyboard = 0
+	}
+
+	let inlineScripts: [string, SupportedLanguage | 'docker'][] = []
+
+	const enterpriseLangs = ['bigquery', 'snowflake', 'mssql']
+
+	function computeInlineScriptChoices(
+		funcDesc: string,
+		selected: { kind: 'owner' | 'integrations'; name: string | undefined } | undefined,
+		preFilter: 'all' | 'workspace' | 'hub',
+		selectedKind: 'script' | 'flow' | 'approval' | 'trigger' | 'preprocessor' | 'failure'
+	) {
+		if (['script', 'trigger', 'failure', 'approval', 'preprocessor'].includes(selectedKind)) {
+			if (!selected && preFilter == 'all') {
+				inlineScripts = langs.filter((lang) => {
+					return (
+						(customUi?.languages == undefined || customUi?.languages?.includes(lang?.[1])) &&
+						(funcDesc?.length == 0 ||
+							lang?.[0]?.toLowerCase()?.includes(funcDesc?.toLowerCase())) &&
+						displayLang(lang?.[1], selectedKind)
+					)
+				})
+				return
+			}
+		}
+		inlineScripts = []
+	}
+
+	const allToplevelNodes: [string, string][] = [
+		['For Loop', 'forloop'],
+		['While Loop', 'whileloop'],
+		['Branch to one', 'branchone'],
+		['Branch to all', 'branchall']
+	]
+	let topLevelNodes: [string, string][] = []
+	function computeToplevelNodeChoices(funcDesc: string, preFilter: 'all' | 'workspace' | 'hub') {
+		if (funcDesc.length > 0 && preFilter == 'all' && kind == 'script') {
+			topLevelNodes = allToplevelNodes.filter((node) =>
+				node[0].toLowerCase().startsWith(funcDesc.toLowerCase())
+			)
+		} else {
+			topLevelNodes = []
+		}
+	}
+
+	$: computeToplevelNodeChoices(funcDesc, preFilter)
+	$: computeInlineScriptChoices(funcDesc, selected, preFilter, selectedKind)
+	$: onPrefilterChange(preFilter)
+
+	function onPrefilterChange(preFilter: 'all' | 'workspace' | 'hub') {
+		if (preFilter == 'workspace') {
+			hubCompletions = []
+		} else if (preFilter == 'hub') {
+			filteredWorkspaceItems = []
+		}
+		selectedByKeyboard = 0
+	}
+
+	$: aiLength =
+		funcDesc?.length > 0 && !disableAi && selectedKind != 'flow' && preFilter == 'all' ? 2 : 0
+
+	let scrollable: Scrollable | undefined
+	function onKeyDown(e: KeyboardEvent) {
+		let length =
+			topLevelNodes?.length +
+			inlineScripts.length +
+			aiLength +
+			filteredWorkspaceItems.length +
+			hubCompletions.length
+		if (e.key === 'ArrowDown') {
+			selectedByKeyboard = (selectedByKeyboard + 1) % length
+			scrollable?.scrollIntoView(selectedByKeyboard * 32)
+			e.preventDefault()
+		} else if (e.key === 'ArrowUp') {
+			selectedByKeyboard = (selectedByKeyboard - 1 + length) % length
+			scrollable?.scrollIntoView(selectedByKeyboard * 32)
+			e.preventDefault()
+		}
+	}
+
+	onMount(() => {
+		$insertButtonOpen = true
+	})
+
+	onDestroy(() => {
+		$insertButtonOpen = false
+	})
+</script>
+
+<svelte:window on:keydown={onKeyDown} />
+<div class="flex flex-row grow min-w-0 divide-x relative {!small ? 'shadow-inset' : ''}">
+	{#if selectedKind != 'preprocessor'}
+		<Scrollable shiftedShadow scrollableClass="w-32 grow-0 shrink-0 ">
+			{#if ['script', 'trigger', 'approval', 'preprocessor', 'failure'].includes(selectedKind)}
+				{#if (preFilter === 'all' && owners.length > 0) || preFilter === 'workspace'}
+					{#if preFilter !== 'workspace'}
+						<div class="pb-0 text-2xs font-light text-secondary ml-2">Workspace Folders</div>
+					{/if}
+
+					{#if owners.length > 0}
+						{#each owners as owner (owner)}
+							<div
+								in:fade={{ duration: 50 }}
+								animate:flip={{ duration: 100 }}
+								class="w-full px-0.5"
+							>
+								<button
+									class={twMerge(
+										'w-full text-left text-2xs text-primary font-normal py-2 px-3 hover:bg-surface-hover transition-all whitespace-nowrap flex flex-row gap-2 items-center rounded-md',
+										owner === selected?.name ? 'bg-surface-hover' : ''
+									)}
+									on:click={() => {
+										selected = selected?.name == owner ? undefined : { kind: 'owner', name: owner }
+									}}
+								>
+									{#if owner.startsWith('f/')}
+										<Folder class="mr-0.5" size={14} />
+									{:else}
+										<User class="mr-0.5" size={14} />
+									{/if}
+									{owner.slice(2)}
+								</button>
+							</div>
+						{/each}
+						<div class="pb-1.5" />
+					{:else}
+						<div class="text-2xs text-tertiary font-light text-center py-3 px-3 items-center">
+							No items found.
+						</div>
+					{/if}
+				{/if}
+
+				{#if preFilter === 'hub' || preFilter === 'all'}
+					{#if preFilter == 'all'}
+						<div class="pb-0 text-2xs font-light text-secondary ml-2 pt-0.5">Integrations</div>
+					{/if}
+					<ListFiltersQuick
+						on:selected={() => {
+							filteredWorkspaceItems = []
+							selectedByKeyboard = 0
+						}}
+						filters={integrations}
+						bind:selectedFilter={selected}
+						resourceType
+					/>
+				{/if}
+			{:else if selectedKind === 'flow'}
+				{#if owners.length > 0}
+					{#each owners as owner (owner)}
+						<div in:fade={{ duration: 50 }} animate:flip={{ duration: 100 }}>
+							<button
+								class={twMerge(
+									'w-full text-left text-2xs text-primary font-normal py-2 px-3 hover:bg-surface-hover transition-all whitespace-nowrap flex flex-row gap-2 items-center rounded-md',
+									owner === selected?.name ? 'bg-surface-hover' : ''
+								)}
+								on:click={() => {
+									selected = selected?.name == owner ? undefined : { kind: 'owner', name: owner }
+								}}
+							>
+								{#if owner.startsWith('f/')}
+									<Folder class="mr-0.5" size={14} />
+								{:else}
+									<User class="mr-0.5" size={14} />
+								{/if}
+								{owner.slice(2)}
+							</button>
+						</div>
+					{/each}
+				{/if}
+			{/if}
+		</Scrollable>
+	{/if}
+	<Scrollable id="flow-editor-flow-atoms" bind:this={scrollable} scrollableClass="grow min-w-0">
+		{#if kind == 'script'}
+			{#each topLevelNodes as [label, kind], i (label)}
+				<FlowToplevelNode
+					on:click={() => {
+						dispatch('new', { kind })
+					}}
+					{label}
+					selected={selectedByKeyboard === i}
+				/>
+			{/each}
+		{/if}
+
+		{#if inlineScripts?.length > 0}
+			<div class="pb-0 flex flex-row items-center gap-2">
+				<div class=" text-2xs font-light text-secondary ml-2"
+					>New {selectedKind != 'script' ? selectedKind + ' ' : ''}script</div
+				>
+				{#if $userStore?.is_admin || $userStore?.is_super_admin}
+					{#if !openScriptSettings}
+						<Button
+							on:click={() => (openScriptSettings = true)}
+							startIcon={{ icon: SettingsIcon }}
+							color="light"
+							size="xs2"
+							btnClasses="!text-tertiary"
+							variant="contained"
+							title="Edit global default scripts"
+						/>
+					{:else}
+						<Button
+							on:click={() => (openScriptSettings = false)}
+							startIcon={{ icon: SettingsIcon }}
+							color="dark"
+							size="xs2"
+							variant="contained"
+						>
+							Close
+						</Button>
+					{/if}
+				{/if}
+			</div>
+			{#if openScriptSettings}
+				<div class="p-2">
+					<DefaultScriptsInner small />
+				</div>
+			{/if}
+			{#each inlineScripts as [label, lang], i (lang)}
+				<FlowScriptPickerQuick
+					eeRestricted={!$enterpriseLicense && enterpriseLangs.includes(lang)}
+					selected={selectedByKeyboard === i + topLevelNodes.length}
+					{enterpriseLangs}
+					{label}
+					lang={lang == 'docker' ? 'bash' : lang}
+					on:click={() => {
+						if (lang == 'docker') {
+							if (isCloudHosted()) {
+								sendUserToast(
+									'You cannot use Docker scripts on the multi-tenant platform. Use a dedicated instance or self-host windmill instead.',
+									true,
+									[
+										{
+											label: 'Learn more',
+											callback: () => {
+												window.open('https://www.windmill.dev/docs/advanced/docker', '_blank')
+											}
+										}
+									]
+								)
+								return
+							}
+						}
+
+						dispatch('new', {
+							kind: selectedKind,
+							inlineScript: {
+								language: lang == 'docker' ? 'bash' : lang,
+								kind: selectedKind,
+								subkind:
+									lang == 'docker'
+										? 'docker'
+										: selectedKind == 'preprocessor'
+										? 'preprocessor'
+										: 'flow',
+								summary
+							}
+						})
+					}}
+				/>
+			{/each}
+		{/if}
+
+		{#if !disableAi && funcDesc?.length > 0 && kind != 'failure' && kind != 'preprocessor' && (selectedKind == 'script' || selectedKind == 'trigger') && preFilter == 'all'}
+			<ul class="transition-all">
+				<li
+					><GenAiQuick
+						{funcDesc}
+						lang="TypeScript"
+						selected={selectedByKeyboard === inlineScripts?.length + topLevelNodes.length}
+						on:click={() => {
+							lang = 'bun'
+							onGenerate()
+						}}
+					/>
+				</li>
+				<li>
+					<GenAiQuick
+						{funcDesc}
+						lang="Python"
+						selected={selectedByKeyboard === inlineScripts?.length + topLevelNodes.length + 1}
+						on:click={() => {
+							lang = 'python3'
+							onGenerate()
+						}}
+					/>
+				</li>
+			</ul>
+		{/if}
+
+		{#if (!selected || selected?.kind === 'owner') && (preFilter === 'workspace' || preFilter === 'all')}
+			{#if !selected && (preFilter !== 'workspace' || funcDesc?.length > 0)}
+				<div class="pt-2 pb-0 text-2xs font-light text-secondary ml-2">Workspace</div>
+			{/if}
+			<WorkspaceScriptPickerQuick
+				bind:owners
+				bind:ownerFilter={selected}
+				bind:filteredWithOwner={filteredWorkspaceItems}
+				{filter}
+				kind={selectedKind}
+				selected={selectedByKeyboard - inlineScripts?.length - aiLength - topLevelNodes.length}
+				on:pickScript
+				on:pickFlow
+			/>
+		{/if}
+
+		{#if selectedKind != 'preprocessor' && selectedKind != 'flow'}
+			{#if (!selected || selected?.kind === 'integrations') && (preFilter === 'hub' || preFilter === 'all')}
+				{#if !selected && preFilter !== 'hub'}
+					<div class=" pb-0 text-2xs font-light text-secondary ml-2">Hub</div>
+				{/if}
+
+				<PickHubScriptQuick
+					bind:items={hubCompletions}
+					bind:filter
+					bind:apps={integrations}
+					appFilter={selected?.name}
+					kind={selectedKind}
+					selected={selectedByKeyboard -
+						inlineScripts?.length -
+						aiLength -
+						filteredWorkspaceItems?.length -
+						topLevelNodes.length}
+					on:pickScript
+					bind:loading
+				/>
+			{/if}
+		{/if}
+	</Scrollable>
+</div>
+
+<style>
+	.shadow-inset::before {
+		box-shadow: inset 25px 0px 12px -30px rgba(94, 129, 172, 0.5);
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		content: '';
+		pointer-events: none;
+	}
+</style>
diff --git a/frontend/src/lib/components/flows/content/FlowLoop.svelte b/frontend/src/lib/components/flows/content/FlowLoop.svelte
index cca4b6d411..6180d2f0fd 100644
--- a/frontend/src/lib/components/flows/content/FlowLoop.svelte
+++ b/frontend/src/lib/components/flows/content/FlowLoop.svelte
@@ -21,6 +21,7 @@
 	import FlowLoopIterationPreview from '$lib/components/FlowLoopIterationPreview.svelte'
 	import FlowModuleDeleteAfterUse from './FlowModuleDeleteAfterUse.svelte'
 	import IteratorGen from '$lib/components/copilot/IteratorGen.svelte'
+	import FlowModuleSkip from './FlowModuleSkip.svelte'
 
 	const { previewArgs, flowStateStore, flowStore } =
 		getContext<FlowEditorContext>('FlowEditorContext')
@@ -210,6 +211,7 @@
 				<Tabs bind:selected>
 					<!-- <Tab value="retries">Retries</Tab> -->
 					<Tab value="early-stop">Early Stop/Break</Tab>
+					<Tab value="skip">Skip</Tab>
 					<Tab value="suspend">Suspend/Approval/Prompt</Tab>
 					<Tab value="sleep">Sleep</Tab>
 					<Tab value="mock">Mock</Tab>
@@ -228,7 +230,11 @@
 									<FlowModuleEarlyStop bind:flowModule={mod} />
 								</div>
 							</TabContent>
-
+							<TabContent value="skip" class="flex flex-col flex-1 h-full">
+								<div class="p-4 overflow-y-auto">
+									<FlowModuleSkip bind:flowModule={mod} {parentModule} {previousModule} />
+								</div>
+							</TabContent>
 							<TabContent value="suspend" class="flex flex-col flex-1 h-full">
 								<div class="p-4 overflow-y-auto">
 									<FlowModuleSuspend previousModuleId={previousModule?.id} bind:flowModule={mod} />
diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
index 8d901be167..c73336df14 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
@@ -47,6 +47,7 @@
 	import { computeFlowStepWarning, initFlowStepWarnings } from '../utils'
 	import { debounce } from '$lib/utils'
 	import { dfs } from '../dfs'
+	import FlowModuleSkip from './FlowModuleSkip.svelte'
 
 	const {
 		selectedId,
@@ -69,6 +70,8 @@
 	export let noEditor: boolean
 	export let enableAi: boolean
 
+	let tag: string | undefined = undefined
+
 	let editor: Editor
 	let diffEditor: DiffEditor
 	let modulePreview: ModulePreview
@@ -228,6 +231,7 @@
 		>
 			<svelte:fragment slot="header">
 				<FlowModuleHeader
+					{tag}
 					bind:module={flowModule}
 					on:toggleSuspend={() => selectAdvanced('suspend')}
 					on:toggleSleep={() => selectAdvanced('sleep')}
@@ -348,6 +352,7 @@
 								<div class="border-t">
 									{#key forceReload}
 										<FlowModuleScript
+											bind:tag
 											showAllCode={false}
 											path={flowModule.value.path}
 											hash={flowModule.value.hash}
@@ -373,7 +378,7 @@
 							class={advancedSelected === 'runtime' ? 'h-[calc(100%-68px)]' : 'h-[calc(100%-34px)]'}
 						>
 							{#if selected === 'inputs' && (flowModule.value.type == 'rawscript' || flowModule.value.type == 'script' || flowModule.value.type == 'flow')}
-								<div class="h-full overflow-auto" id="flow-editor-step-input">
+								<div class="h-full overflow-auto px-2" id="flow-editor-step-input">
 									<PropPickerWrapper
 										pickableProperties={stepPropPicker.pickableProperties}
 										error={failureModule}
@@ -418,6 +423,7 @@
 										>
 											Early Stop
 										</Tab>
+										<Tab value="skip" active={Boolean(flowModule.skip_if)}>Skip</Tab>
 										<Tab value="suspend" active={Boolean(flowModule.suspend)}>Suspend</Tab>
 										<Tab value="sleep" active={Boolean(flowModule.sleep)}>Sleep</Tab>
 										<Tab value="mock" active={Boolean(flowModule.mock?.enabled)}>Mock</Tab>
@@ -581,6 +587,8 @@
 										</div>
 									{:else if advancedSelected === 'early-stop'}
 										<FlowModuleEarlyStop bind:flowModule />
+									{:else if advancedSelected === 'skip'}
+										<FlowModuleSkip bind:flowModule {parentModule} {previousModule} />
 									{:else if advancedSelected === 'suspend'}
 										<div>
 											<FlowModuleSuspend previousModuleId={previousModule?.id} bind:flowModule />
diff --git a/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte b/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte
index 8ab01acdd7..434cf2451f 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte
@@ -22,6 +22,7 @@
 	import FlowModuleWorkerTagSelect from './FlowModuleWorkerTagSelect.svelte'
 
 	export let module: FlowModule
+	export let tag: string | undefined
 	const { scriptEditorDrawer } = getContext<FlowEditorContext>('FlowEditorContext')
 
 	const dispatch = createEventDispatcher()
@@ -125,7 +126,7 @@
 				Edit {#if module.value.hash != undefined} (locked hash){/if}
 			</Button>
 		{/if}
-		<FlowModuleWorkerTagSelect bind:tag={module.value.tag_override} />
+		<FlowModuleWorkerTagSelect nullTag={tag} bind:tag={module.value.tag_override} />
 		{#if customUi?.scriptFork != false}
 			<Button
 				size="xs"
diff --git a/frontend/src/lib/components/flows/content/FlowModuleScript.svelte b/frontend/src/lib/components/flows/content/FlowModuleScript.svelte
index 452b8f3ae2..fcfdd4d72b 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleScript.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleScript.svelte
@@ -12,6 +12,7 @@
 	export let previousHash: string | undefined = undefined
 	export let showDate = false
 	export let showAllCode: boolean = true
+	export let tag: string | undefined = undefined
 
 	let code: string
 	let previousCode: string
@@ -31,6 +32,7 @@
 			language = script.language
 			lock = script.lock
 			date = script.created_at
+			tag = script.tag
 		} catch (e) {
 			notFound = true
 			console.error(e)
@@ -61,7 +63,10 @@
 
 <div class="flex flex-col flex-1 h-full overflow-auto p-2">
 	{#if showDate && date}
-		<span class="text-xs text-tertiary mb-4"><TimeAgo agoOnlyIfRecent withDate {date} /></span>
+		<span class="text-xs text-tertiary mb-4"><TimeAgo agoOnlyIfRecent {date} /></span>
+	{/if}
+	{#if tag}
+		<div class="text-xs text-tertiary mb-4">tag: {tag}</div>
 	{/if}
 	{#if notFound}
 		<div class="text-red-400">script not found at {path} in workspace {$workspaceStore}</div>
diff --git a/frontend/src/lib/components/flows/content/FlowModuleSkip.svelte b/frontend/src/lib/components/flows/content/FlowModuleSkip.svelte
new file mode 100644
index 0000000000..c53d9d1dc3
--- /dev/null
+++ b/frontend/src/lib/components/flows/content/FlowModuleSkip.svelte
@@ -0,0 +1,85 @@
+<script lang="ts">
+	import SimpleEditor from '$lib/components/SimpleEditor.svelte'
+	import Toggle from '$lib/components/Toggle.svelte'
+	import PropPickerWrapper from '$lib/components/flows/propPicker/PropPickerWrapper.svelte'
+	import type { FlowModule } from '$lib/gen'
+	import Tooltip from '$lib/components/Tooltip.svelte'
+	import type { FlowEditorContext } from '../types'
+	import { getContext } from 'svelte'
+	import Section from '$lib/components/Section.svelte'
+	import { getStepPropPicker } from '../previousResults'
+
+	const { flowStateStore, flowStore, previewArgs } =
+		getContext<FlowEditorContext>('FlowEditorContext')
+
+	export let flowModule: FlowModule
+	export let parentModule: FlowModule | undefined
+	export let previousModule: FlowModule | undefined
+
+	let editor: SimpleEditor | undefined = undefined
+	$: stepPropPicker = getStepPropPicker(
+		$flowStateStore,
+		parentModule,
+		previousModule,
+		flowModule.id,
+		$flowStore,
+		$previewArgs,
+		false
+	)
+
+	$: isSkipEnabled = Boolean(flowModule.skip_if)
+</script>
+
+<div class="flex flex-col items-start space-y-2 {$$props.class}">
+	<Section label="Skip" class="w-full">
+		<svelte:fragment slot="header">
+			<Tooltip>
+				If the condition is met, the step will behave as an identity step, passing the previous
+				step's result through unchanged.
+			</Tooltip>
+		</svelte:fragment>
+
+		<Toggle
+			checked={isSkipEnabled}
+			on:change={() => {
+				if (isSkipEnabled && flowModule.skip_if) {
+					flowModule.skip_if = undefined
+				} else {
+					flowModule.skip_if = {
+						expr: 'false'
+					}
+				}
+			}}
+			options={{
+				right: 'Skip step if condition is met'
+			}}
+		/>
+
+		<div class="w-full border p-2 flex flex-col {flowModule.skip_if ? '' : 'bg-surface-secondary'}">
+			{#if flowModule.skip_if}
+				<span class="mt-2 text-xs font-bold">Skip condition expression</span>
+				<div class="border w-full">
+					<PropPickerWrapper
+						notSelectable
+						pickableProperties={stepPropPicker.pickableProperties}
+						on:select={({ detail }) => {
+							editor?.insertAtCursor(detail)
+							editor?.focus()
+						}}
+					>
+						<SimpleEditor
+							bind:this={editor}
+							lang="javascript"
+							bind:code={flowModule.skip_if.expr}
+							class="few-lines-editor"
+							extraLib={stepPropPicker.extraLib}
+						/>
+					</PropPickerWrapper>
+				</div>
+			{:else}
+				<span class="mt-2 text-xs font-bold">Skip condition expression</span>
+				<textarea disabled rows="3" class="min-h-[80px]" />
+			{/if}
+		</div>
+	</Section>
+</div>
diff --git a/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte b/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte
index 1e26f35e82..c65d7a78ef 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte
@@ -3,8 +3,10 @@
 	import type { FlowEditorContext } from '../types'
 	import { workerTags } from '$lib/stores'
 	import { WorkerService } from '$lib/gen'
+	import WorkerTagSelect from '$lib/components/WorkerTagSelect.svelte'
 
 	export let tag: string | undefined
+	export let nullTag: string | undefined = undefined
 
 	const { flowStore, selectedId } = getContext<FlowEditorContext>('FlowEditorContext')
 
@@ -21,28 +23,11 @@
 	{#if $workerTags?.length > 0}
 		<div class="w-40">
 			{#if $flowStore.tag == undefined}
-				<select
-					placeholder="Tag"
-					bind:value={tag}
-					on:change={(e) => {
-						if (tag == '') {
-							tag = undefined
-						}
-					}}
-				>
-					{#if tag}
-						<option value="">reset to default</option>
-					{:else}
-						<option value="" disabled selected>Tag</option>
-					{/if}
-					{#each $workerTags ?? [] as tag (tag)}
-						<option value={tag}>{tag}</option>
-					{/each}
-				</select>
+				<WorkerTagSelect {nullTag} bind:tag />
 			{:else}
 				<button
 					title="Worker Group is defined at the flow level"
-					class="w-full text-left items-center font-normal p-1 border text-xs rounded"
+					class="w-full text-left items-center font-normal p-1 py-2 border text-xs rounded"
 					on:click={() => ($selectedId = 'settings-worker-group')}
 				>
 					Flow's WG: {$flowStore.tag}
diff --git a/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte b/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
index 92250304e8..a52370ea87 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
@@ -20,14 +20,17 @@
 	import FlowWhileLoop from './FlowWhileLoop.svelte'
 	import { initFlowStepWarnings } from '../utils'
 	import { dfs } from '../dfs'
+	import type { TriggerContext } from '$lib/components/triggers'
 
 	export let flowModule: FlowModule
 	export let noEditor: boolean = false
 	export let enableAi = false
 
-	const { selectedId, schedule, flowStateStore, flowInputsStore, flowStore } =
+	const { selectedId, flowStateStore, flowInputsStore, flowStore } =
 		getContext<FlowEditorContext>('FlowEditorContext')
 
+	const { primarySchedule } = getContext<TriggerContext>('TriggerContext')
+
 	let scriptKind: 'script' | 'trigger' | 'approval' = 'script'
 	let scriptTemplate: 'pgsql' | 'mysql' | 'script' | 'docker' | 'powershell' = 'script'
 
@@ -37,6 +40,26 @@
 	// Pointer to previous module, for easy access to testing results
 	export let previousModule: FlowModule | undefined = undefined
 
+	function initializePrimaryScheduleForTriggerScript(module: FlowModule) {
+		if (!$primarySchedule) {
+			$primarySchedule = {
+				summary: 'Scheduled poll of flow',
+				args: {},
+				cron: '0 */15 * * *',
+				timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+				enabled: true
+			}
+		}
+		if (!$primarySchedule.cron) {
+			$primarySchedule.cron = '0 */15 * * *'
+		}
+		$primarySchedule.enabled = true
+
+		module.stop_after_if = {
+			expr: 'result == undefined || Array.isArray(result) && result.length == 0',
+			skip_if_stopped: true
+		}
+	}
 	async function createModuleFromScript(
 		path: string,
 		summary: string,
@@ -50,15 +73,7 @@
 		}
 
 		if (kind == 'trigger') {
-			if (!$schedule.cron) {
-				$schedule.cron = '0 */15 * * *'
-			}
-			$schedule.enabled = true
-
-			module.stop_after_if = {
-				expr: 'result == undefined || Array.isArray(result) && result.length == 0',
-				skip_if_stopped: true
-			}
+			initializePrimaryScheduleForTriggerScript(module)
 		}
 
 		flowModule = module
@@ -80,11 +95,11 @@
 	{#if flowModule.value.type === 'forloopflow'}
 		<FlowLoop {noEditor} bind:mod={flowModule} {parentModule} {previousModule} {enableAi} />
 	{:else if flowModule.value.type === 'whileloopflow'}
-		<FlowWhileLoop {noEditor} bind:mod={flowModule} {previousModule} />
+		<FlowWhileLoop {noEditor} bind:mod={flowModule} {previousModule} {parentModule} />
 	{:else if flowModule.value.type === 'branchone'}
-		<FlowBranchesOneWrapper {noEditor} {previousModule} bind:flowModule {enableAi} />
+		<FlowBranchesOneWrapper {noEditor} {previousModule} {parentModule} bind:flowModule {enableAi} />
 	{:else if flowModule.value.type === 'branchall'}
-		<FlowBranchesAllWrapper {noEditor} {previousModule} bind:flowModule />
+		<FlowBranchesAllWrapper {noEditor} {previousModule} {parentModule} bind:flowModule />
 	{:else if flowModule.value.type === 'identity'}
 		{#if $selectedId == 'failure'}
 			<div class="p-4">
@@ -140,15 +155,7 @@
 					scriptTemplate = subkind
 
 					if (kind == 'trigger') {
-						if (!$schedule.cron) {
-							$schedule.cron = '0 */15 * * *'
-						}
-						$schedule.enabled = true
-
-						module.stop_after_if = {
-							expr: 'result == undefined || Array.isArray(result) && result.length == 0',
-							skip_if_stopped: true
-						}
+						initializePrimaryScheduleForTriggerScript(module)
 					}
 
 					if (kind == 'approval') {
diff --git a/frontend/src/lib/components/flows/content/FlowPathViewer.svelte b/frontend/src/lib/components/flows/content/FlowPathViewer.svelte
index 109e833c0f..a55ad17c47 100644
--- a/frontend/src/lib/components/flows/content/FlowPathViewer.svelte
+++ b/frontend/src/lib/components/flows/content/FlowPathViewer.svelte
@@ -1,15 +1,33 @@
 <script lang="ts">
 	import Skeleton from '$lib/components/common/skeleton/Skeleton.svelte'
 	import FlowGraphViewer from '$lib/components/FlowGraphViewer.svelte'
-	import { FlowService, type Flow } from '$lib/gen'
+	import type { ScheduleTrigger, TriggerContext } from '$lib/components/triggers'
+	import { FlowService, type Flow, type TriggersCount } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
+	import { setContext } from 'svelte'
+	import { writable } from 'svelte/store'
 
 	export let path: string
 	export let noSide = false
 
 	let flow: Flow | undefined = undefined
+
+	const selectedTriggerStore = writable<'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes'>(
+		'webhooks'
+	)
+	const primaryScheduleStore = writable<ScheduleTrigger | undefined | false>(undefined)
+	const triggersCount = writable<TriggersCount | undefined>(undefined)
+	setContext<TriggerContext>('TriggerContext', {
+		primarySchedule: primaryScheduleStore,
+		selectedTrigger: selectedTriggerStore,
+		triggersCount: triggersCount
+	})
+
 	async function loadFlow(path: string) {
 		flow = await FlowService.getFlowByPath({ workspace: $workspaceStore!, path })
+		triggersCount.set(
+			await FlowService.getTriggersCountOfFlow({ workspace: $workspaceStore!, path })
+		)
 	}
 
 	$: path && loadFlow(path)
@@ -17,7 +35,7 @@
 
 <div class="flex flex-col flex-1 h-full overflow-auto">
 	{#if flow}
-		<FlowGraphViewer {noSide} {flow} />
+		<FlowGraphViewer triggerNode={true} {noSide} {flow} />
 	{:else}
 		<Skeleton layout={[[40]]} />
 	{/if}
diff --git a/frontend/src/lib/components/flows/content/FlowSchedules.svelte b/frontend/src/lib/components/flows/content/FlowSchedules.svelte
deleted file mode 100644
index 14f98a4e47..0000000000
--- a/frontend/src/lib/components/flows/content/FlowSchedules.svelte
+++ /dev/null
@@ -1,106 +0,0 @@
-<script lang="ts">
-	import CronInput from '$lib/components/CronInput.svelte'
-	import SchemaForm from '$lib/components/SchemaForm.svelte'
-	import Toggle from '$lib/components/Toggle.svelte'
-	import { emptyString } from '$lib/utils'
-	import { getContext } from 'svelte'
-	import type { FlowEditorContext } from '../types'
-	import { Alert, Button, Skeleton } from '$lib/components/common'
-	import ScheduleEditor from '$lib/components/ScheduleEditor.svelte'
-	import { ScheduleService, type Schedule } from '$lib/gen'
-	import { workspaceStore } from '$lib/stores'
-	import { Calendar } from 'lucide-svelte'
-	import Label from '$lib/components/Label.svelte'
-
-	const { schedule, flowStore, initialPath } = getContext<FlowEditorContext>('FlowEditorContext')
-	let schedules: Schedule[] | undefined = undefined
-
-	async function loadSchedules() {
-		try {
-			schedules = (
-				await ScheduleService.listSchedules({
-					workspace: $workspaceStore ?? '',
-					path: initialPath,
-					isFlow: true
-				})
-			).filter((s) => s.path != initialPath)
-		} catch (e) {
-			console.error('impossible to load schedules')
-		}
-	}
-
-	let scheduleEditor: ScheduleEditor
-
-	$: initialPath && loadSchedules()
-</script>
-
-<div class="w-full flex flex-col gap-4 mb-4">
-	<!-- svelte-ignore a11y-autofocus -->
-	<Label label="Summary">
-		<input
-			autofocus
-			type="text"
-			placeholder="Short summary to be displayed when listed"
-			class="text-sm w-full"
-			bind:value={$schedule.summary}
-		/>
-	</Label>
-</div>
-
-<CronInput bind:schedule={$schedule.cron} bind:timezone={$schedule.timezone} />
-<div class="mt-10" />
-<SchemaForm schema={$flowStore.schema} bind:args={$schedule.args} />
-{#if emptyString($schedule.cron)}
-	<p class="text-xs text-tertiary mt-10">Define a schedule frequency first</p>
-{/if}
-<div class="mt-10" />
-<Toggle
-	disabled={emptyString($schedule.cron)}
-	bind:checked={$schedule.enabled}
-	options={{
-		right: 'Schedule enabled'
-	}}
-/>
-<Alert bgClass="my-4" type="warning" title="Changes only applied upon deploy">
-	Changes to the primary schedule are only applied upon deploy. Other schedules' changes are applied
-	immediately.
-</Alert>
-
-{#if initialPath != ''}
-	<ScheduleEditor
-		on:update={() => {
-			loadSchedules()
-		}}
-		bind:this={scheduleEditor}
-	/>
-	<h2 class="pt-7">Other schedules</h2>
-	<div class="py-4 flex">
-		<Button
-			on:click={() => scheduleEditor?.openNew(true, initialPath)}
-			variant="border"
-			color="light"
-			size="xs"
-			startIcon={{ icon: Calendar }}
-		>
-			New Schedule
-		</Button>
-	</div>
-
-	{#if schedules}
-		{#if schedules.length == 0}
-			<div class="text-xs text-secondary px-2"> No other schedules </div>
-		{:else}
-			<div class="flex flex-col divide-y px-2 pt-2 max-w-lg">
-				{#each schedules as schedule (schedule.path)}
-					<div class="grid grid-cols-6 text-2xs items-center py-2"
-						><div class="col-span-3 truncate">{schedule.path}</div><div>{schedule.schedule}</div>
-						<div>{schedule.enabled ? 'on' : 'off'}</div>
-						<button on:click={() => scheduleEditor?.openEdit(schedule.path, true)}>Edit</button>
-					</div>
-				{/each}
-			</div>
-		{/if}
-	{:else}
-		<Skeleton layout={[[8]]} />
-	{/if}
-{/if}
diff --git a/frontend/src/lib/components/flows/content/FlowSettings.svelte b/frontend/src/lib/components/flows/content/FlowSettings.svelte
index 0cf95cf676..8883b9cc65 100644
--- a/frontend/src/lib/components/flows/content/FlowSettings.svelte
+++ b/frontend/src/lib/components/flows/content/FlowSettings.svelte
@@ -1,348 +1,195 @@
 <script lang="ts">
-	import Tabs from '$lib/components/common/tabs/Tabs.svelte'
-	import Tab from '$lib/components/common/tabs/Tab.svelte'
-	import TabContent from '$lib/components/common/tabs/TabContent.svelte'
-
-	import { BROWSER } from 'esm-env'
-	import { base } from '$lib/base'
 	import Path from '$lib/components/Path.svelte'
 	import FlowCard from '../common/FlowCard.svelte'
-	import FlowSchedules from './FlowSchedules.svelte'
 	import Toggle from '$lib/components/Toggle.svelte'
 	import { Alert, Button, SecondsInput } from '$lib/components/common'
 	import { getContext } from 'svelte'
 	import type { FlowEditorContext } from '../types'
-	import Slider from '$lib/components/Slider.svelte'
 	import { enterpriseLicense, workspaceStore } from '$lib/stores'
 	import { isCloudHosted } from '$lib/cloud'
-	import { copyToClipboard } from '$lib/utils'
 	import Tooltip from '$lib/components/Tooltip.svelte'
-	import { AlertTriangle, Clipboard } from 'lucide-svelte'
 	import SimpleEditor from '$lib/components/SimpleEditor.svelte'
 	import { schemaToObject } from '$lib/schema'
 	import type { Schema } from '$lib/common'
 	import Section from '$lib/components/Section.svelte'
 	import Label from '$lib/components/Label.svelte'
-	import ErrorHandlerToggleButton from '$lib/components/details/ErrorHandlerToggleButton.svelte'
+	import ErrorHandlerToggleButtonV2 from '$lib/components/details/ErrorHandlerToggleButtonV2.svelte'
 	import WorkerTagPicker from '$lib/components/WorkerTagPicker.svelte'
 	import MetadataGen from '$lib/components/copilot/MetadataGen.svelte'
+	import Badge from '$lib/components/Badge.svelte'
+	import { AlertTriangle } from 'lucide-svelte'
 
 	export let noEditor: boolean
 
-	const { selectedId, flowStore, initialPath, previewArgs, pathStore, schedule, customUi } =
+	const { flowStore, initialPath, previewArgs, pathStore, customUi } =
 		getContext<FlowEditorContext>('FlowEditorContext')
 
-	let hostname = BROWSER ? window.location.protocol + '//' + window.location.host : 'SSR'
-	$: url = `${hostname}/api/w/${$workspaceStore}/jobs/run/f/${$pathStore}`
-	$: syncedUrl = `${hostname}/api/w/${$workspaceStore}/jobs/run_wait_result/f/${$pathStore}`
-
 	function asSchema(x: any) {
 		return x as Schema
 	}
 	let path: Path | undefined = undefined
 	let dirtyPath = false
+
+	let displayWorkerTagPicker = false
+	$: $flowStore.tag ? (displayWorkerTagPicker = true) : null
+
+	$: activeAdvancedOptions = [
+		{
+			name: 'High Priority',
+			active: $flowStore.value.priority !== undefined && $flowStore.value.priority > 0
+		},
+		{ name: 'Error Handler Muted', active: Boolean($flowStore.ws_error_handler_muted) },
+		{ name: 'Invisible to Others', active: Boolean($flowStore.visible_to_runner_only) },
+		{ name: 'Shared Directory', active: Boolean($flowStore.value.same_worker) },
+		{ name: 'Cache Results', active: Boolean($flowStore.value.cache_ttl) },
+		{ name: 'Early Stop', active: Boolean($flowStore.value.skip_expr) },
+		{ name: 'Early Return', active: Boolean($flowStore.value.early_return) },
+		{ name: 'Dedicated Worker', active: Boolean($flowStore.dedicated_worker) },
+		{ name: 'Concurrent Limit', active: Boolean($flowStore.value.concurrent_limit) },
+		{ name: 'Worker Tag', active: displayWorkerTagPicker }
+	]
+
+	$: numberOfAdvancedOptionsOn = activeAdvancedOptions.filter((option) => option.active).length
+	$: activeAdvancedOptionNames = activeAdvancedOptions
+		.filter((option) => option.active)
+		.map((option) => option.name)
 </script>
 
-<div class="h-full overflow-hidden">
+<div class="h-full overflow-y-auto flex flex-col">
 	<FlowCard {noEditor} title="Settings">
-		<div class="h-full flex-1">
-			<!-- svelte-ignore a11y-autofocus -->
-			<Tabs bind:selected={$selectedId}>
-				<Tab value="settings-metadata">Metadata</Tab>
-				{#if !noEditor && customUi?.settingsTabs?.schedule != false}
-					<Tab value="settings-schedule" active={$schedule.enabled}>Schedule</Tab>
-				{/if}
-				{#if customUi?.settingsTabs?.sharedDiretory != false}
-					<Tab value="settings-same-worker" active={$flowStore.value.same_worker}>
-						Shared Directory
-					</Tab>
-				{/if}
-				{#if customUi?.settingsTabs?.earlyStop != false}
-					<Tab value="settings-early-stop" active={Boolean($flowStore.value.skip_expr)}>
-						Early Stop
-					</Tab>
-				{/if}
-				{#if customUi?.settingsTabs?.earlyReturn != false}
-					<Tab value="settings-early-return" active={Boolean($flowStore.value.early_return)}>
-						Early Return
-					</Tab>
+		<div class="grow min-h-0 p-4 h-full flex flex-col gap-8">
+			<!-- Metadata Section -->
+			<div class="gap-8 flex flex-col">
+				<Label label="Summary">
+					<MetadataGen
+						bind:content={$flowStore.summary}
+						promptConfigName="flowSummary"
+						flow={$flowStore.value}
+						on:change={() => {
+							if (initialPath == '' && $flowStore.summary?.length > 0 && !dirtyPath) {
+								path?.setName(
+									$flowStore.summary
+										.toLowerCase()
+										.replace(/[^a-z0-9_]/g, '_')
+										.replace(/-+/g, '_')
+										.replace(/^-|-$/g, '')
+								)
+							}
+						}}
+						elementProps={{
+							type: 'text',
+							id: 'flow-summary',
+							placeholder: 'Short summary to be displayed when listed'
+						}}
+					/>
+				</Label>
+
+				{#if !noEditor}
+					<Label label="Path">
+						<Path
+							autofocus={false}
+							bind:this={path}
+							bind:dirty={dirtyPath}
+							bind:path={$pathStore}
+							{initialPath}
+							namePlaceholder="flow"
+							kind="flow"
+						/>
+					</Label>
 				{/if}
+
+				<Label label="Description">
+					<MetadataGen
+						bind:content={$flowStore.description}
+						promptConfigName="flowDescription"
+						flow={$flowStore.value}
+						class="w-full"
+						elementType="textarea"
+						elementProps={{
+							id: 'inp',
+							placeholder: 'What this flow does and how to use it.'
+						}}
+					/>
+				</Label>
+			</div>
+
+			<!-- Deployable Section -->
+			<Section
+				label="Advanced"
+				collapsable={true}
+				small={true}
+				class="h-full grow  min-h-0 flex flex-col gap-4"
+			>
+				<!-- Worker Group Section -->
 				{#if customUi?.settingsTabs?.workerGroup != false}
-					<Tab value="settings-worker-group">Worker Group</Tab>
-				{/if}
-				{#if customUi?.settingsTabs?.concurrency != false}
-					<Tab value="settings-concurrency">Concurrency</Tab>
-				{/if}
-				{#if customUi?.settingsTabs?.cache != false}
-					<Tab value="settings-cache" active={Boolean($flowStore.value.cache_ttl)}>Cache</Tab>
-				{/if}
-				<svelte:fragment slot="content">
-					<TabContent value="settings-metadata" class="p-4 h-full overflow-auto">
-						<Section label="Metadata">
-							<div class="h-full gap-8 flex flex-col">
-								<Label label="Summary">
-									<MetadataGen
-										bind:content={$flowStore.summary}
-										promptConfigName="flowSummary"
-										flow={$flowStore.value}
-										on:change={() => {
-											if (initialPath == '' && $flowStore.summary?.length > 0 && !dirtyPath) {
-												path?.setName(
-													$flowStore.summary
-														.toLowerCase()
-														.replace(/[^a-z0-9_]/g, '_')
-														.replace(/-+/g, '_')
-														.replace(/^-|-$/g, '')
-												)
-											}
-										}}
-										elementProps={{
-											type: 'text',
-											id: 'flow-summary',
-											placeholder: 'Short summary to be displayed when listed'
-										}}
-									/>
-								</Label>
+					<div>
+						<Toggle
+							textClass="font-normal text-sm"
+							color="nord"
+							size="xs"
+							checked={displayWorkerTagPicker}
+							on:change={() => {
+								displayWorkerTagPicker = !displayWorkerTagPicker
+								if (!displayWorkerTagPicker) {
+									$flowStore.tag = undefined
+								}
+							}}
+							options={{
+								right: 'Worker Group Tag (Queue)',
+								rightTooltip:
+									"When a worker group tag is defined at the flow level, any steps inside the flow will run on any worker group that listen to that tag, regardless of the steps tag. If no worker group tags is defined, the flow controls will be executed with the default tag 'flow' and the steps will be executed with their respective tag"
+							}}
+							class="py-1"
+						/>
 
-								{#if !noEditor}
-									<Label label="Path">
-										<Path
-											autofocus={false}
-											bind:this={path}
-											bind:dirty={dirtyPath}
-											bind:path={$pathStore}
-											{initialPath}
-											namePlaceholder="flow"
-											kind="flow"
-										/>
-									</Label>
-								{/if}
+						{#if displayWorkerTagPicker}
+							<WorkerTagPicker bind:tag={$flowStore.tag} popupPlacement="top-end" />
+						{/if}
+					</div>
 
-								<Label label="Description">
-									<MetadataGen
-										bind:content={$flowStore.description}
-										promptConfigName="flowDescription"
-										flow={$flowStore.value}
-										class="w-full"
-										elementType="textarea"
-										elementProps={{
-											id: 'inp',
-											placeholder: 'What this flow does and how to use it.'
-										}}
-									/>
-								</Label>
+					<!-- <Tooltip
+								>In this mode, every scripts of this flow is run on the workers dedicated to this flow
+								that keep the scripts "hot" so that there is not cold start cost incurred. Steps can run
+								at >1500 rps in this mode.</Tooltip
+							> -->
+				{/if}
 
-								<!-- TODO: Add EE-only badge when we have it -->
-								<Toggle
-									disabled={!$enterpriseLicense || isCloudHosted()}
-									checked={$flowStore.value.priority !== undefined && $flowStore.value.priority > 0}
-									on:change={() => {
-										if ($flowStore.value.priority) {
-											$flowStore.value.priority = undefined
-										} else {
-											$flowStore.value.priority = 100
-										}
-									}}
-									options={{
-										right: `Label as high priority`,
-										rightTooltip: `All jobs scheduled by flows labeled as high priority take precedence over the other jobs in the jobs queue. ${
-											!$enterpriseLicense
-												? 'This is a feature only available on enterprise edition.'
-												: ''
-										}`
-									}}
+				<!-- Metadata Advanced Section -->
+				<svelte:fragment slot="badge">
+					{#if numberOfAdvancedOptionsOn > 0}
+						<div class="flex grow min-w-0 w-full flex-wrap gap-1 ps-2">
+							{#each activeAdvancedOptionNames as optionName}
+								<Badge twBgColor="bg-nord-950 dark:bg-nord-400" twTextColor="text-primary-inverse"
+									>{optionName}</Badge
 								>
-									<svelte:fragment slot="right">
-										<input
-											type="number"
-											class="!w-16 ml-4"
-											disabled={$flowStore.value.priority === undefined}
-											bind:value={$flowStore.value.priority}
-											on:focus
-											on:change={() => {
-												if ($flowStore.value.priority && $flowStore.value.priority > 100) {
-													$flowStore.value.priority = 100
-												} else if ($flowStore.value.priority && $flowStore.value.priority < 0) {
-													$flowStore.value.priority = 0
-												}
-											}}
-										/>
-									</svelte:fragment>
-								</Toggle>
+							{/each}
+						</div>
+					{/if}
+				</svelte:fragment>
 
-								<Toggle
-									size="sm"
-									checked={Boolean($flowStore.visible_to_runner_only)}
-									on:change={() => {
-										if ($flowStore.visible_to_runner_only) {
-											$flowStore.visible_to_runner_only = undefined
-										} else {
-											$flowStore.visible_to_runner_only = true
-										}
-									}}
-									options={{
-										right: 'Make runs invisible to others',
-										rightTooltip:
-											'When this option is enabled, manual executions of this script are invisible to users other than the user running it, including the owner(s). This setting can be overridden when this script is run manually from the advanced menu.'
-									}}
-								/>
-
-								<div class="flex flex-row items-center gap-1">
-									<ErrorHandlerToggleButton
-										kind="flow"
-										scriptOrFlowPath={$pathStore}
-										bind:errorHandlerMuted={$flowStore.ws_error_handler_muted}
-										iconOnly={false}
-									/>
-								</div>
-
-								<Slider text="How to trigger flows?">
-									<div class="text-sm text-tertiary border p-4 mb-20">
-										On-demand:
-										<ul class="pt-4">
-											<li>
-												1. <a
-													href="https://www.windmill.dev/docs/core_concepts/auto_generated_uis"
-													target="_blank">Auto-generated UIs</a
-												>
-											</li>
-											<li>
-												2. <a href="{base}/apps/add?nodraft=true" target="_blank"> App Editor</a> for
-												customized-UIs
-											</li>
-											<li>
-												3. <a href="{base}/schedules" target="_blank">Scheduling</a>
-											</li>
-											<li>
-												4. <a href="https://www.windmill.dev/docs/advanced/cli" target="_blank"
-													>Windmill CLI</a
-												>
-											</li>
-											<br />
-											<li class="mt-2">
-												<div class="flex flex-col gap-2">
-													<p> From external events: </p>
-												</div>
-											</li>
-											<li class="mt-2">
-												5. Send a <a
-													href="https://www.windmill.dev/docs/core_concepts/webhooks"
-													target="_blank">webhook</a
-												>
-												after each event:
-												<ul class="list-disc pl-4"
-													><li
-														>Async <Tooltip
-															>Return an uuid instantly that you can use to fetch status and result</Tooltip
-														>:
-														<a
-															on:click={(e) => {
-																e.preventDefault()
-																copyToClipboard(url)
-															}}
-															href={url}
-															class="whitespace-nowrap text-ellipsis overflow-hidden mr-1"
-														>
-															{url}
-															<span class="text-secondary ml-2">
-																<Clipboard />
-															</span>
-														</a>
-													</li>
-													<li
-														>Sync <Tooltip>Wait for result within a timeout of 20s</Tooltip>:
-														<a
-															on:click={(e) => {
-																e.preventDefault()
-																copyToClipboard(syncedUrl)
-															}}
-															href={syncedUrl}
-															class="whitespace-nowrap text-ellipsis overflow-hidden mr-1"
-														>
-															{syncedUrl}
-															<span class="text-secondary ml-2">
-																<Clipboard />
-															</span>
-														</a>
-													</li>
-												</ul></li
-											>
-											<br />
-											<li>
-												6. Use a <a
-													href="https://www.windmill.dev/docs/flows/flow_trigger"
-													target="_blank">trigger script</a
-												>
-												and schedule this flow to run as frequently as needed and compare a state persisted
-												in Windmill to the state of the external system. If a difference is detected,
-												then the rest of the flow is triggered. Oftentimes, the second step of a flow
-												is a for-loop that will iterate over every elements. When using a trigger, a
-												default schedule will be created.
-												<img
-													class="shadow-lg border rounded"
-													alt="static button"
-													src="{base}/trigger_button.png"
-												/>
-											</li></ul
-										>
-									</div>
-								</Slider>
-							</div>
-						</Section>
-					</TabContent>
-					<TabContent value="settings-schedule" class="p-4 h-full overflow-scroll">
-						<Alert
-							type="info"
-							title="Primary Schedule"
-							documentationLink="https://www.windmill.dev/docs/core_concepts/scheduling"
-						>
-							Flows can be triggered by any schedules, their webhooks or their UI but they have only
-							one primary schedule with which they share the same path. The primary schedule can be
-							set here.
-						</Alert>
-						<div class="mt-4" />
-						<FlowSchedules />
-					</TabContent>
-
-					<TabContent value="settings-same-worker" class="p-4 flex flex-col">
-						<Section label="Shared Directory" class="flex flex-col">
-							<Alert type="info" title="Shared Directory">
-								Steps will share a folder at `./shared` in which they can store heavier data and
-								pass them to the next step. <br /><br />Beware that the `./shared` folder is not
-								preserved across suspends and sleeps. <br /><br />
-								Furthermore, steps' worker groups is not respected and only the flow's worker group will
-								be respected.
-							</Alert>
-							<Toggle
-								bind:checked={$flowStore.value.same_worker}
-								options={{
-									right: 'Shared Directory on `./shared`'
-								}}
-								class="mt-2"
-							/>
-						</Section>
-					</TabContent>
-					<TabContent value="settings-cache" class="p-4 flex flex-col">
-						<Section label="Cache">
-							<svelte:fragment slot="action">
-								<Toggle
-									size="xs"
-									checked={Boolean($flowStore.value.cache_ttl)}
-									on:change={() => {
-										if ($flowStore.value.cache_ttl && $flowStore.value.cache_ttl != undefined) {
-											$flowStore.value.cache_ttl = undefined
-										} else {
-											$flowStore.value.cache_ttl = 300
-										}
-									}}
-									options={{
-										right: 'Cache the results for each possible inputs'
-									}}
-								/>
-							</svelte:fragment>
-
-							<div class="flex gap-x-4 flex-col gap-2">
-								<div class="text-xs">How long to keep the cache valid</div>
+				<!-- Cache Section -->
+				{#if customUi?.settingsTabs?.cache != false}
+					<div>
+						<Toggle
+							textClass="font-normal text-sm"
+							color="nord"
+							size="xs"
+							checked={Boolean($flowStore.value.cache_ttl)}
+							on:change={() => {
+								if ($flowStore.value.cache_ttl && $flowStore.value.cache_ttl != undefined) {
+									$flowStore.value.cache_ttl = undefined
+								} else {
+									$flowStore.value.cache_ttl = 300
+								}
+							}}
+							options={{
+								right: 'Cache the results for each possible inputs'
+							}}
+							class="py-1"
+						/>
+						{#if $flowStore.value.cache_ttl}
+							<div class="flex gap-x-4 flex-col gap-1">
+								<div class="text-sm text-secondary">How long to keep the cache valid</div>
 								<div>
 									{#if $flowStore.value.cache_ttl}
 										<SecondsInput bind:seconds={$flowStore.value.cache_ttl} />
@@ -351,136 +198,87 @@
 									{/if}
 								</div>
 							</div>
-						</Section>
-					</TabContent>
-
-					<TabContent value="settings-worker-group" class="p-4 flex flex-col">
-						<Alert type="info" title="Worker Group Tag (Queue)">
-							When a worker group tag is defined at the flow level, any steps inside the flow will
-							run on any worker group that listen to that tag, regardless of the steps' tag. If no
-							worker group tags is defined, the flow controls will be executed with the default tag
-							'flow' and the steps will be executed with their respective tag
-						</Alert>
-						<span class="my-4 text-lg font-bold">Worker Group Tag (Queue)</span>
-						<WorkerTagPicker bind:tag={$flowStore.tag} />
-
-						<div class="py-6" />
-						<span class="my-4 text-lg font-bold flex items-baseline gap-8"
-							>Dedicated Worker {#if !$enterpriseLicense}<div
-									class="flex text-xs items-center gap-1 text-yellow-500 whitespace-nowrap"
-								>
-									<AlertTriangle size={16} />
-									EE only
-								</div>{/if}</span
-						>
+						{/if}
+					</div>
+				{/if}
 
+				<!-- Early Stop Section -->
+				{#if customUi?.settingsTabs?.earlyStop != false}
+					<div>
+						<!-- documentationLink="https://www.windmill.dev/docs/flows/early_stop -->
 						<Toggle
-							disabled={!$enterpriseLicense || isCloudHosted()}
-							size="sm"
-							checked={Boolean($flowStore.dedicated_worker)}
+							textClass="font-normal text-sm"
+							color="nord"
+							size="xs"
+							checked={Boolean($flowStore.value.skip_expr)}
 							on:change={() => {
-								if ($flowStore.dedicated_worker) {
-									$flowStore.dedicated_worker = undefined
+								if (Boolean($flowStore.value.skip_expr) && $flowStore.value.skip_expr) {
+									$flowStore.value.skip_expr = undefined
 								} else {
-									$flowStore.dedicated_worker = true
+									$flowStore.value.skip_expr = 'flow_input.foo == undefined'
 								}
 							}}
 							options={{
-								right: 'Flow is run on dedicated workers'
+								right: 'Early stop if condition met',
+								rightTooltip:
+									'If defined, at the beginning of the step the predicate expression will be evaluated' +
+									'to decide if the flow should stop early.'
 							}}
+							class="py-1"
 						/>
-						{#if $flowStore.dedicated_worker}
-							<div class="py-2">
-								<Alert type="info" title="Require dedicated workers">
-									One worker in a worker group needs to be configured with dedicated worker set to: <pre
-										>{$workspaceStore}:flow/{$pathStore}</pre
-									>
-								</Alert>
-							</div>
-						{/if}
-						<svelte:fragment slot="header">
-							<Tooltip
-								>In this mode, every scripts of this flow is run on the workers dedicated to this
-								flow that keep the scripts "hot" so that there is not cold start cost incurred.
-								Steps can run at >1500 rps in this mode.</Tooltip
-							>
-						</svelte:fragment>
-					</TabContent>
-					<TabContent value="settings-early-stop" class="p-4">
-						<Section label="Early stop">
-							<svelte:fragment slot="header">
-								<Tooltip documentationLink="https://www.windmill.dev/docs/flows/early_stop">
-									If defined, at the beginning of the step the predicate expression will be
-									evaluated to decide if the flow should stop early.
-								</Tooltip>
-							</svelte:fragment>
-							<Toggle
-								checked={Boolean($flowStore.value.skip_expr)}
-								on:change={() => {
-									if (Boolean($flowStore.value.skip_expr) && $flowStore.value.skip_expr) {
-										$flowStore.value.skip_expr = undefined
-									} else {
-										$flowStore.value.skip_expr = 'flow_input.foo == undefined'
-									}
-								}}
-								options={{
-									right: 'Early stop if condition met'
-								}}
-							/>
-
+						{#if $flowStore.value.skip_expr}
 							<div
-								class="w-full border mt-2 p-2 flex flex-col {$flowStore.value.skip_expr
+								class="w-full border flex flex-col {$flowStore.value.skip_expr
 									? ''
 									: 'bg-surface-secondary'}"
 							>
-								{#if $flowStore.value.skip_expr}
-									<div class="border w-full">
-										<SimpleEditor
-											lang="javascript"
-											bind:code={$flowStore.value.skip_expr}
-											class="small-editor"
-											extraLib={`declare const flow_input = ${JSON.stringify(
-												schemaToObject(asSchema($flowStore.schema), $previewArgs)
-											)};
-											declare const WM_SCHEDULED_FOR: string;`}
-										/>
-										<div class="text-xs text-tertiary mt-2">
-											You can use the variable `flow_input` to access the inputs of the flow. <br
-											/>The variable `WM_SCHEDULED_FOR` contains the time the flow was scheduled for
-											which you can use to stop early non fresh jobs:
-											<pre>new Date().getTime() - new Date(WM_SCHEDULED_FOR).getTime() {'>'} X</pre>
-										</div>
+								<div class="border w-full">
+									<SimpleEditor
+										lang="javascript"
+										bind:code={$flowStore.value.skip_expr}
+										class="small-editor"
+										extraLib={`declare const flow_input = ${JSON.stringify(
+											schemaToObject(asSchema($flowStore.schema), $previewArgs)
+										)};
+									declare const WM_SCHEDULED_FOR: string;`}
+									/>
+									<div class="text-xs text-tertiary mt-2">
+										You can use the variable `flow_input` to access the inputs of the flow. <br
+										/>The variable `WM_SCHEDULED_FOR` contains the time the flow was scheduled for
+										which you can use to stop early non fresh jobs:
+										<pre>new Date().getTime() - new Date(WM_SCHEDULED_FOR).getTime() {'>'} X</pre>
 									</div>
-								{:else}
-									<textarea disabled rows="3" class="min-h-[80px]" />
-								{/if}
+								</div>
 							</div>
-						</Section>
-					</TabContent>
-					<TabContent value="settings-early-return" class="p-4">
-						<Section label="Early Return">
-							<div class="py-2">
-								<Alert type="info" title="Return sync endpoints early">
-									If defined, sync endpoints will return early at the node defined here while the
-									rest of the flow continue asynchronously.
-								</Alert>
-							</div>
-							<Toggle
-								checked={Boolean($flowStore.value.early_return)}
-								on:change={() => {
-									if (Boolean($flowStore.value.early_return) && $flowStore.value.early_return) {
-										$flowStore.value.early_return = undefined
-									} else {
-										$flowStore.value.early_return = $flowStore.value.modules?.[0]?.id ?? 'a'
-									}
-								}}
-								options={{
-									right: 'Early return sync endpoint at a top-level step'
-								}}
-							/>
+						{/if}
+					</div>
+				{/if}
 
+				<!-- Early Return Section -->
+				{#if customUi?.settingsTabs?.earlyReturn != false}
+					<div>
+						<Toggle
+							textClass="font-normal text-sm"
+							color="nord"
+							size="xs"
+							checked={Boolean($flowStore.value.early_return)}
+							on:change={() => {
+								if (Boolean($flowStore.value.early_return) && $flowStore.value.early_return) {
+									$flowStore.value.early_return = undefined
+								} else {
+									$flowStore.value.early_return = $flowStore.value.modules?.[0]?.id ?? 'a'
+								}
+							}}
+							options={{
+								right: 'Early return for sync webhooks',
+								rightTooltip:
+									'If defined, sync endpoints will return early at the node defined here while the rest of the flow continue asynchronously.'
+							}}
+							class="py-1"
+						/>
+						{#if $flowStore.value.early_return}
 							<div
-								class="border max-w-[120px] mt-2 p-2 flex flex-col {$flowStore.value.early_return
+								class="max-w-[120px] flex flex-col {$flowStore.value.early_return
 									? ''
 									: 'bg-surface-secondary'}"
 							>
@@ -488,6 +286,7 @@
 									name="oauth_name"
 									id="oauth_name"
 									bind:value={$flowStore.value.early_return}
+									class="text-xs"
 								>
 									<option value={undefined}>Node's id</option>
 									{#each $flowStore.value?.modules?.map((x) => x.id) as name}
@@ -495,14 +294,92 @@
 									{/each}
 								</select>
 							</div>
-						</Section>
-					</TabContent>
+						{/if}
+					</div>
+				{/if}
 
-					<TabContent value="settings-concurrency" class="p-4 flex flex-col">
-						<Section label="Concurrency Limits" eeOnly>
-							<svelte:fragment slot="header">
-								<Tooltip>Allowed concurrency within a given timeframe</Tooltip>
-							</svelte:fragment>
+				<!-- Shared Directory Section -->
+				{#if customUi?.settingsTabs?.sharedDiretory != false}
+					<Toggle
+						textClass="font-normal text-sm"
+						color="nord"
+						size="xs"
+						bind:checked={$flowStore.value.same_worker}
+						options={{
+							right: 'Same Worker + Shared Directory on `./shared`',
+							rightTooltip:
+								'Steps will share a folder at `./shared` in which they can store heavier data and ' +
+								'pass them to the next step. Beware that the `./shared` folder is not ' +
+								'preserved across suspends and sleeps.'
+						}}
+						class="py-1"
+					/>
+				{/if}
+
+				<!-- Visibility Section -->
+				<Toggle
+					textClass="font-normal text-sm"
+					color="nord"
+					size="xs"
+					checked={Boolean($flowStore.visible_to_runner_only)}
+					on:change={() => {
+						if ($flowStore.visible_to_runner_only) {
+							$flowStore.visible_to_runner_only = undefined
+						} else {
+							$flowStore.visible_to_runner_only = true
+						}
+					}}
+					options={{
+						right: 'Make runs invisible to others',
+						rightTooltip:
+							'When this option is enabled, manual executions of this script are invisible to users other than the user running it, including the owner(s). This setting can be overridden when this script is run manually from the advanced menu.'
+					}}
+					class="py-1"
+				/>
+
+				<!-- Error Handler Section -->
+				<div class="flex flex-row items-center py-1">
+					<ErrorHandlerToggleButtonV2
+						color="nord"
+						kind="flow"
+						scriptOrFlowPath={$pathStore}
+						bind:errorHandlerMuted={$flowStore.ws_error_handler_muted}
+					/>
+					{#if !$enterpriseLicense}
+						<span
+							class="inline-flex text-xs text-primary items-center gap-1 !text-yellow-500 whitespace-nowrap ml-8"
+						>
+							<AlertTriangle size={16} />
+							EE only <Tooltip>Enterprise Edition only feature</Tooltip>
+						</span>
+					{/if}
+				</div>
+
+				<!-- Concurrency Section -->
+				{#if customUi?.settingsTabs?.concurrency != false}
+					<div>
+						<Toggle
+							textClass="font-normal text-sm"
+							color="nord"
+							size="xs"
+							disabled={!$enterpriseLicense}
+							checked={Boolean($flowStore.value.concurrent_limit)}
+							on:change={() => {
+								if ($flowStore.value.concurrent_limit) {
+									$flowStore.value.concurrent_limit = undefined
+								} else {
+									$flowStore.value.concurrent_limit = 1
+								}
+							}}
+							options={{
+								right: 'Concurrency Limits',
+								rightTooltip: 'Allowed concurrency within a given timeframe'
+							}}
+							class="py-1"
+							eeOnly={true}
+						/>
+
+						{#if $flowStore.value.concurrent_limit}
 							<div class="flex flex-col gap-4">
 								<Label label="Max number of executions within the time window">
 									<div class="flex flex-row gap-2 max-w-sm">
@@ -544,10 +421,90 @@
 									/>
 								</Label>
 							</div>
-						</Section>
-					</TabContent>
-				</svelte:fragment>
-			</Tabs>
+						{/if}
+					</div>
+				{/if}
+
+				<!-- Priority Section -->
+				<Toggle
+					textClass="font-normal text-sm"
+					color="nord"
+					size="xs"
+					disabled={!$enterpriseLicense || isCloudHosted()}
+					checked={$flowStore.value.priority !== undefined && $flowStore.value.priority > 0}
+					on:change={() => {
+						if ($flowStore.value.priority) {
+							$flowStore.value.priority = undefined
+						} else {
+							$flowStore.value.priority = 100
+						}
+					}}
+					options={{
+						right: `Label as high priority`,
+						rightTooltip: `All jobs scheduled by flows labeled as high priority take precedence over the other jobs in the jobs queue. Higher priority numbers are executed first. ${
+							!$enterpriseLicense ? 'This is a feature only available on enterprise edition.' : ''
+						}`
+					}}
+					class="py-1 relative"
+				>
+					<svelte:fragment slot="right">
+						<input
+							type="number"
+							class="!w-16 text-xs ml-4 absolute left-52"
+							disabled={$flowStore.value.priority === undefined}
+							bind:value={$flowStore.value.priority}
+							on:focus
+							on:change={() => {
+								if ($flowStore.value.priority && $flowStore.value.priority > 100) {
+									$flowStore.value.priority = 100
+								} else if ($flowStore.value.priority && $flowStore.value.priority < 0) {
+									$flowStore.value.priority = 0
+								}
+							}}
+						/>
+						{#if !$enterpriseLicense || isCloudHosted()}
+							<span
+								class="inline-flex absolute top-0 left-72 text-xs text-primary items-center gap-1 !text-yellow-500 whitespace-nowrap ml-8"
+							>
+								<AlertTriangle size={16} />
+								EE only <Tooltip>Enterprise Edition only feature</Tooltip>
+							</span>
+						{/if}
+					</svelte:fragment>
+				</Toggle>
+
+				<div>
+					<Toggle
+						textClass="font-normal text-sm"
+						color="nord"
+						size="xs"
+						disabled={!$enterpriseLicense || isCloudHosted()}
+						checked={Boolean($flowStore.dedicated_worker)}
+						on:change={() => {
+							if ($flowStore.dedicated_worker) {
+								$flowStore.dedicated_worker = undefined
+							} else {
+								$flowStore.dedicated_worker = true
+							}
+						}}
+						options={{
+							right: 'Flow is run on dedicated workers'
+						}}
+						class="py-1"
+						eeOnly={true}
+					/>
+
+					{#if $flowStore.dedicated_worker}
+						<div>
+							<Alert type="info" title="Require dedicated workers">
+								One worker in a worker group needs to be configured with dedicated worker set to: <pre
+									>{$workspaceStore}:flow/{$pathStore}</pre
+								>
+							</Alert>
+						</div>
+					{/if}
+				</div>
+			</Section>
 		</div>
 	</FlowCard>
 </div>
diff --git a/frontend/src/lib/components/flows/content/FlowWhileLoop.svelte b/frontend/src/lib/components/flows/content/FlowWhileLoop.svelte
index c68e73973b..c9363f1359 100644
--- a/frontend/src/lib/components/flows/content/FlowWhileLoop.svelte
+++ b/frontend/src/lib/components/flows/content/FlowWhileLoop.svelte
@@ -17,11 +17,13 @@
 	import type { FlowModule, Job } from '$lib/gen'
 	import FlowLoopIterationPreview from '$lib/components/FlowLoopIterationPreview.svelte'
 	import FlowModuleDeleteAfterUse from './FlowModuleDeleteAfterUse.svelte'
+	import FlowModuleSkip from './FlowModuleSkip.svelte'
 
 	const { flowStateStore } = getContext<FlowEditorContext>('FlowEditorContext')
 
 	export let mod: FlowModule
 	export let previousModule: FlowModule | undefined
+	export let parentModule: FlowModule | undefined
 	export let noEditor: boolean
 
 	let selected: string = 'early-stop'
@@ -105,6 +107,7 @@
 				<Tabs bind:selected>
 					<!-- <Tab value="retries">Retries</Tab> -->
 					<Tab value="early-stop">Early Stop/Break</Tab>
+					<Tab value="skip">Skip</Tab>
 					<Tab value="suspend">Suspend/Approval/Prompt</Tab>
 					<Tab value="sleep">Sleep</Tab>
 					<Tab value="mock">Mock</Tab>
@@ -124,6 +127,12 @@
 								</div>
 							</TabContent>
 
+							<TabContent value="skip" class="flex flex-col flex-1 h-full">
+								<div class="p-4 overflow-y-auto">
+									<FlowModuleSkip bind:flowModule={mod} {parentModule} {previousModule} />
+								</div>
+							</TabContent>
+
 							<TabContent value="suspend" class="flex flex-col flex-1 h-full">
 								<div class="p-4 overflow-y-auto">
 									<FlowModuleSuspend previousModuleId={previousModule?.id} bind:flowModule={mod} />
diff --git a/frontend/src/lib/components/flows/content/GenAiQuick.svelte b/frontend/src/lib/components/flows/content/GenAiQuick.svelte
new file mode 100644
index 0000000000..ef59d9d6d7
--- /dev/null
+++ b/frontend/src/lib/components/flows/content/GenAiQuick.svelte
@@ -0,0 +1,33 @@
+<script lang="ts">
+	import { Wand2 } from 'lucide-svelte'
+	import { createEventDispatcher } from 'svelte'
+
+	export let funcDesc: string
+	export let selected: boolean
+	export let lang: string
+	const dispatch = createEventDispatcher()
+
+	const onKeyDown = (e: KeyboardEvent) => {
+		if (selected && e.key === 'Enter') {
+			e.preventDefault()
+			dispatch('click')
+		}
+	}
+</script>
+
+<svelte:window on:keydown={onKeyDown} />
+<button
+	class="px-3 py-2 gap-2 w-full text-left hover:bg-surface-hover flex flex-row items-center transition-all rounded-md {selected
+		? 'bg-surface-hover'
+		: ''}"
+	on:click
+>
+	<Wand2 size={14} class="text-violet-800 dark:text-violet-400" />
+
+	<span class="grow truncate text-left text-2xs text-primary font-normal">
+		Generate "{funcDesc}" in {lang}
+	</span>
+	{#if selected}
+		<kbd class="!text-xs">&crarr;</kbd>
+	{/if}
+</button>
diff --git a/frontend/src/lib/components/flows/content/ScriptEditorDrawer.svelte b/frontend/src/lib/components/flows/content/ScriptEditorDrawer.svelte
index b20f34eb80..01f766d038 100644
--- a/frontend/src/lib/components/flows/content/ScriptEditorDrawer.svelte
+++ b/frontend/src/lib/components/flows/content/ScriptEditorDrawer.svelte
@@ -15,6 +15,7 @@
 	} from '$lib/utils'
 	import { createEventDispatcher } from 'svelte'
 	import { fade } from 'svelte/transition'
+	import WorkerTagSelect from '$lib/components/WorkerTagSelect.svelte'
 
 	let scriptEditorDrawer: Drawer
 
@@ -41,6 +42,7 @@
 				language: Preview['language']
 				content: string
 				schema?: any
+				tag?: string
 				kind: 'script' | 'failure' | 'trigger' | 'command' | 'approval' | undefined
 				envs?: string[]
 				ws_error_handler_muted?: boolean
@@ -60,6 +62,7 @@
 				language: Preview['language']
 				content: string
 				schema?: any
+				tag?: string
 				kind: 'script' | 'failure' | 'trigger' | 'command' | 'approval' | undefined
 				envs?: string[]
 				ws_error_handler_muted?: boolean
@@ -90,6 +93,7 @@
 						description: script.description ?? '',
 						parent_hash: script.hash != '' ? script.hash : undefined,
 						is_template: false,
+						tag: script.tag,
 						kind: script.kind as Script['kind'] | undefined,
 						lock: undefined
 					}
@@ -199,11 +203,15 @@
 					noSyncFromGithub
 					lang={script.language}
 					path={script.path}
+					tag={script.tag}
 					fixedOverflowWidgets={false}
 					bind:code={script.content}
 					bind:schema={script.schema}
-					tag={undefined}
-				/>
+				>
+					<div slot="editor-bar-right">
+						<WorkerTagSelect bind:tag={script.tag} />
+					</div>
+				</ScriptEditor>
 			{/key}
 		{:else}
 			<div
diff --git a/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte b/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte
index 03b3fc2ed4..8790c7b222 100644
--- a/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte
+++ b/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte
@@ -45,7 +45,8 @@
 			'preprocessor',
 			'constants',
 			'Result',
-			'Input'
+			'Input',
+			'triggers'
 		].includes($selectedId) ||
 		$selectedId?.includes('branch')
 </script>
diff --git a/frontend/src/lib/components/flows/header/FlowYamlEditor.svelte b/frontend/src/lib/components/flows/header/FlowYamlEditor.svelte
index e1f268c738..0409aaee63 100644
--- a/frontend/src/lib/components/flows/header/FlowYamlEditor.svelte
+++ b/frontend/src/lib/components/flows/header/FlowYamlEditor.svelte
@@ -6,9 +6,9 @@
 	import { filteredContentForExport } from '../utils'
 	import YAML from 'yaml'
 
-	import SimpleEditor from '$lib/components/SimpleEditor.svelte'
 	import { Button } from '$lib/components/common'
 	import { sendUserToast } from '$lib/toast'
+	import { Loader2 } from 'lucide-svelte'
 
 	const { flowStore } = getContext<FlowEditorContext>('FlowEditorContext')
 
@@ -56,7 +56,11 @@
 		</svelte:fragment>
 
 		{#if $flowStore}
-			<SimpleEditor autoHeight bind:code lang="yaml" />
+			{#await import('../../SimpleEditor.svelte')}
+				<Loader2 class="animate-spin" />
+			{:then Module}
+				<Module.default autoHeight bind:code lang="yaml" />
+			{/await}
 		{/if}
 	</DrawerContent>
 </Drawer>
diff --git a/frontend/src/lib/components/flows/map/FlowCopilotButton.svelte b/frontend/src/lib/components/flows/map/FlowCopilotButton.svelte
index 34d3791624..53f78cce59 100644
--- a/frontend/src/lib/components/flows/map/FlowCopilotButton.svelte
+++ b/frontend/src/lib/components/flows/map/FlowCopilotButton.svelte
@@ -6,7 +6,6 @@
 	import { copilotInfo } from '$lib/stores'
 	import { ExternalLink, Wand2 } from 'lucide-svelte'
 	import { base } from '$lib/base'
-	import { twMerge } from 'tailwind-merge'
 
 	let openNoCopilot = false
 	export let className = ''
@@ -15,7 +14,7 @@
 		getContext<FlowCopilotContext | undefined>('FlowCopilotContext') || {}
 </script>
 
-<div class={twMerge('absolute left-1/2 transform -translate-x-1/2 z-10', className)}>
+<div class={className}>
 	<Popover>
 		<div class={openNoCopilot ? 'z-10' : ''}>
 			<Menu pointerDown noMinW placement="bottom-center" let:close bind:show={openNoCopilot}>
diff --git a/frontend/src/lib/components/flows/map/FlowErrorHandlerItem.svelte b/frontend/src/lib/components/flows/map/FlowErrorHandlerItem.svelte
index 9faf6d862a..7cc97750c1 100644
--- a/frontend/src/lib/components/flows/map/FlowErrorHandlerItem.svelte
+++ b/frontend/src/lib/components/flows/map/FlowErrorHandlerItem.svelte
@@ -3,37 +3,52 @@
 	import { getContext } from 'svelte'
 	import { classNames, emptySchema } from '$lib/utils'
 	import type { FlowModuleState } from '../flowState'
-	import Toggle from '$lib/components/Toggle.svelte'
 	import { NEVER_TESTED_THIS_FAR } from '../models'
 	import type { FlowCopilotContext } from '$lib/components/copilot/flow'
 	import { fade } from 'svelte/transition'
-	import { Bug } from 'lucide-svelte'
+	import { Bug, X } from 'lucide-svelte'
+	import InsertModuleButton from '$lib/components/flows/map/InsertModuleButton.svelte'
+	import { createInlineScriptModule, pickScript } from '$lib/components/flows/flowStateUtils'
+	import type { FlowModule, RawScript } from '$lib/gen'
+	import { twMerge } from 'tailwind-merge'
 
 	export let small: boolean
 
 	const { selectedId, flowStateStore, flowStore } =
 		getContext<FlowEditorContext>('FlowEditorContext')
 
-	function onToggle() {
-		if ($flowStore?.value?.failure_module) {
-			$flowStore.value.failure_module = undefined
-			// By default, we return to settings when disabling the failure module
-			$selectedId = 'settings-metadata'
-		} else {
-			const failureModule: FlowModuleState = {
-				schema: emptySchema(),
-				previewResult: NEVER_TESTED_THIS_FAR
-			}
-
-			$flowStore.value.failure_module = {
-				id: 'failure',
-				value: { type: 'identity' }
-			}
-			$flowStateStore['failure'] = failureModule
-
-			$selectedId = 'failure'
-			$flowStore = $flowStore
+	async function insertNewFailureModule(
+		inlineScript?: {
+			language: RawScript['language']
+			subkind: 'pgsql' | 'flow'
+		},
+		wsScript?: { path: string; summary: string; hash: string | undefined }
+	) {
+		var module: FlowModule = {
+			id: 'failure',
+			value: { type: 'identity' }
 		}
+		var state: FlowModuleState = {
+			schema: emptySchema(),
+			previewResult: NEVER_TESTED_THIS_FAR
+		}
+
+		if (inlineScript) {
+			;[module, state] = await createInlineScriptModule(
+				inlineScript.language,
+				'failure',
+				inlineScript.subkind,
+				'failure'
+			)
+		} else if (wsScript) {
+			;[module, state] = await pickScript(wsScript.path, wsScript.summary, module.id, wsScript.hash)
+		}
+
+		$flowStore.value.failure_module = module
+		$flowStateStore[module.id] = state
+
+		$selectedId = 'failure'
+		$flowStore = $flowStore
 	}
 
 	const { currentStepStore: copilotCurrentStepStore } =
@@ -42,45 +57,72 @@
 
 <!-- svelte-ignore a11y-click-events-have-key-events -->
 <!-- svelte-ignore a11y-no-static-element-interactions -->
+
 <div
+	id="flow-editor-error-handler"
+	class={classNames(
+		'z-10',
+		$copilotCurrentStepStore !== undefined ? 'border-gray-500/75' : 'cursor-pointer',
+		'border transition-colors duration-[400ms] ease-linear rounded-sm px-2 py-1 gap-2 bg-surface text-sm flex items-center flex-row',
+		$selectedId?.includes('failure')
+			? 'outline outline-offset-1 outline-2 outline-slate-900 dark:outline-slate-900/0 dark:bg-surface-secondary dark:border-gray-400'
+			: ''
+	)}
+	style="min-width: {small ? '200px' : '230px'}; max-width: 275px;"
 	on:click={() => {
 		if ($copilotCurrentStepStore !== undefined) return
 		if ($flowStore?.value?.failure_module) {
 			$selectedId = 'failure'
-		} else {
-			onToggle()
 		}
 	}}
-	class={classNames(
-		'z-10',
-		$copilotCurrentStepStore !== undefined ? 'border-gray-500/75' : 'cursor-pointer',
-		'border transition-colors duration-[400ms] ease-linear rounded-sm px-2 py-1 bg-surface text-sm flex justify-between items-center flex-row overflow-x-hidden relative',
-		$selectedId?.includes('failure') ? 'outline outline-offset-1 outline-2 outline-slate-900 dark:outline-slate-900/0 dark:bg-surface-secondary dark:border-gray-400' : ''
-	)}
-	style={small ? 'min-width: 200px' : 'min-width: 275px'}
 >
 	{#if $copilotCurrentStepStore !== undefined}
 		<div transition:fade class="absolute inset-0 bg-gray-500 bg-opacity-75 z-[900]" />
 	{/if}
-	<div class=" flex justify-between items-center flex-wrap gap-2">
-		<Bug size={16} />
-		<span class="font-bold text-xs">Error Handler</span>
+	<div class="flex items-center grow-0 min-w-0 gap-2">
+		<Bug size={16} color={$flowStore?.value?.failure_module ? '#3b82f6' : '#9CA3AF'} />
 	</div>
 
-	<div class=" items-center truncate flex text-xs">
-		{#if Boolean($flowStore?.value?.failure_module)}
-			<span>
-				{$flowStore.value.failure_module?.summary ||
-					($flowStore.value.failure_module?.value.type === 'rawscript'
-						? `${$flowStore.value.failure_module?.value.language}`
-						: 'TBD')}
-			</span>
-		{/if}
-	</div>
-	<Toggle
-		size={small ? 'xs' : 'sm'}
-		checked={Boolean($flowStore?.value?.failure_module)}
-		on:change={onToggle}
-		id="error-handler-toggle"
-	/>
+	{#if !$flowStore?.value?.failure_module}
+		<div class="grow text-center font-bold text-xs">Error Handler</div>
+	{:else}
+		<div class="truncate grow min-w-0 text-center text-xs">
+			{$flowStore.value.failure_module?.summary ||
+				($flowStore.value.failure_module?.value.type === 'rawscript'
+					? `${$flowStore.value.failure_module?.value.language}`
+					: 'TBD')}
+		</div>
+	{/if}
+
+	{#if !$flowStore?.value?.failure_module}
+		<InsertModuleButton
+			disableAi={false}
+			index={0}
+			placement={'top-center'}
+			on:new={(e) => {
+				insertNewFailureModule(e.detail.inlineScript)
+			}}
+			on:pickScript={(e) => {
+				insertNewFailureModule(undefined, e.detail)
+			}}
+			kind="failure"
+		/>
+	{:else}
+		<button
+			title="Delete failure script"
+			type="button"
+			class={twMerge(
+				'w-5 h-5 flex items-center justify-center grow-0 shrink-0',
+				'outline-[1px] outline dark:outline-gray-500 outline-gray-300',
+				'text-secondary',
+				'bg-surface focus:outline-none hover:bg-surface-hover rounded '
+			)}
+			on:click={() => {
+				$flowStore.value.failure_module = undefined
+				$selectedId = 'settings-metadata'
+			}}
+		>
+			<X size={12} />
+		</button>
+	{/if}
 </div>
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
index bbab6a6f7e..d93d85366d 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
@@ -13,6 +13,7 @@
 		PhoneIncoming,
 		Repeat,
 		Square,
+		SkipForward,
 		Voicemail,
 		X
 	} from 'lucide-svelte'
@@ -33,6 +34,7 @@
 	export let retry: boolean = false
 	export let cache: boolean = false
 	export let earlyStop: boolean = false
+	export let skip: boolean = false
 	export let suspend: boolean = false
 	export let sleep: boolean = false
 	export let mock: boolean = false
@@ -60,6 +62,11 @@
 	let newId: string = id ?? ''
 
 	let hover = false
+
+	let idBadgeWidth: number | undefined = undefined
+	let iconWidth: number | undefined = undefined
+
+	$: marginLeft = Math.max(iconWidth ?? 0, idBadgeWidth ?? 0) * 2 + 32
 </script>
 
 {#if deletable && id && editId}
@@ -181,6 +188,17 @@
 				<svelte:fragment slot="text">Early stop/break</svelte:fragment>
 			</Popover>
 		{/if}
+		{#if skip}
+			<Popover notClickable>
+				<div
+					transition:fade|local={{ duration: 200 }}
+					class="center-center bg-surface rounded border border-gray-400 text-secondary px-1 py-0.5"
+				>
+					<SkipForward size={12} />
+				</div>
+				<svelte:fragment slot="text">Skip</svelte:fragment>
+			</Popover>
+		{/if}
 		{#if suspend}
 			<Popover notClickable>
 				<div
@@ -217,16 +235,24 @@
 	</div>
 
 	<div
-		class="flex gap-1 justify-between items-center w-full overflow-hidden rounded-sm
+		class="relative flex gap-1 justify-between items-center w-full overflow-hidden rounded-sm
 	 p-2 text-2xs module text-primary"
 	>
 		{#if $$slots.icon}
-			<slot name="icon" />
+			<div class="flex-none" bind:clientWidth={iconWidth}>
+				<slot name="icon" />
+			</div>
 		{/if}
-		<div class="truncate" class:font-bold={bold}>{label}</div>
-		<div class="flex items-center space-x-2 relative">
+		<div
+			class="absolute left-1/2 transform -translate-x-1/2 text-center truncate"
+			class:font-bold={bold}
+			style="max-width: calc(100% - {marginLeft}px)">{label}</div
+		>
+		<div class="flex items-center space-x-2 relative max-w-[25%]" bind:clientWidth={idBadgeWidth}>
 			{#if id && id !== 'preprocessor' && !id.startsWith('failure')}
-				<Badge color="indigo">{id}</Badge>
+				<Badge color="indigo" wrapperClass="max-w-full" baseClass="max-w-full truncate" title={id}>
+					<span class="max-w-full text-2xs truncate">{id}</span></Badge
+				>
 				{#if deletable}
 					<button
 						class="absolute -left-[28px] z-10 h-[20px] rounded-l rounded-t rounded-s w-[20px] trash center-center text-secondary bg-surface duration-150 hover:bg-blue-400 {editId
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
index bc2af7f82e..203ac70988 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
@@ -2,15 +2,17 @@
 	import type { FlowEditorContext } from '../types'
 	import { createEventDispatcher, getContext, tick } from 'svelte'
 	import {
+		createInlineScriptModule,
 		createBranchAll,
 		createBranches,
 		createLoop,
 		createWhileLoop,
 		deleteFlowStateById,
 		emptyModule,
-		pickScript
+		pickScript,
+		pickFlow
 	} from '$lib/components/flows/flowStateUtils'
-	import type { FlowModule } from '$lib/gen'
+	import type { FlowModule, RawScript, Script } from '$lib/gen'
 	import { emptyFlowModuleState, initFlowStepWarnings } from '../utils'
 	import FlowSettingsItem from './FlowSettingsItem.svelte'
 	import FlowConstantsItem from './FlowConstantsItem.svelte'
@@ -31,8 +33,6 @@
 	import { tutorialInProgress } from '$lib/tutorialUtils'
 	import FlowGraphV2 from '$lib/components/graph/FlowGraphV2.svelte'
 	import { replaceId } from '../flowStore'
-	import { emptySchema } from '$lib/utils'
-	import { NEVER_TESTED_THIS_FAR } from '../models'
 
 	export let modules: FlowModule[] | undefined
 	export let sidebarSize: number | undefined = undefined
@@ -40,12 +40,12 @@
 	export let disableTutorials = false
 	export let disableAi = false
 	export let disableSettings = false
-
+	export let newFlow: boolean = false
 	export let smallErrorHandler = false
 
 	let flowTutorials: FlowTutorials | undefined = undefined
 
-	const { selectedId, moving, history, flowStateStore, flowStore, flowInputsStore } =
+	const { selectedId, moving, history, flowStateStore, flowStore, flowInputsStore, pathStore } =
 		getContext<FlowEditorContext>('FlowEditorContext')
 
 	async function insertNewModuleAtIndex(
@@ -61,12 +61,22 @@
 			| 'trigger'
 			| 'approval'
 			| 'end',
-		wsScript?: { path: string; summary: string; hash: string | undefined }
+		wsScript?: { path: string; summary: string; hash: string | undefined },
+		wsFlow?: { path: string; summary: string },
+		inlineScript?: {
+			language: RawScript['language']
+			kind: Script['kind']
+			subkind: 'pgsql' | 'flow'
+			id: string
+			summary?: string
+		}
 	): Promise<FlowModule[]> {
 		push(history, $flowStore)
 		var module = emptyModule($flowStateStore, $flowStore, kind == 'flow')
 		var state = emptyFlowModuleState()
-		if (wsScript) {
+		if (wsFlow) {
+			;[module, state] = await pickFlow(wsFlow.path, wsFlow.summary, module.id)
+		} else if (wsScript) {
 			;[module, state] = await pickScript(wsScript.path, wsScript.summary, module.id, wsScript.hash)
 		} else if (kind == 'forloop') {
 			;[module, state] = await createLoop(
@@ -81,19 +91,66 @@
 			;[module, state] = await createBranchAll(module.id)
 		}
 		$flowStateStore[module.id] = state
-		if (kind == 'trigger') {
-			module.summary = 'Trigger'
-		} else if (kind == 'approval') {
-			module.summary = 'Approval'
-		} else if (kind == 'end') {
-			module.summary = 'Terminate flow'
-			module.stop_after_if = { skip_if_stopped: false, expr: 'true' }
+
+		if (inlineScript) {
+			const { language, kind, subkind } = inlineScript
+			;[module, state] = await createInlineScriptModule(
+				language,
+				kind,
+				subkind,
+				module.id,
+				module.summary
+			)
+			$flowStateStore[module.id] = state
+			if (kind == 'trigger') {
+				module.summary = 'Trigger'
+			} else if (kind == 'approval') {
+				module.summary = 'Approval'
+			}
 		}
+
+		if (kind == 'approval') {
+			module.suspend = { required_events: 1, timeout: 1800 }
+		} else if (kind == 'trigger') {
+			module.stop_after_if = {
+				expr: '!result || (Array.isArray(result) && result.length == 0)',
+				skip_if_stopped: true
+			}
+		}
+
 		if (!modules) return [module]
 		modules.splice(index, 0, module)
 		return modules
 	}
 
+	async function insertNewPreprocessorModule(
+		inlineScript?: {
+			language: RawScript['language']
+			subkind: 'pgsql' | 'flow'
+		},
+		wsScript?: { path: string; summary: string; hash: string | undefined }
+	) {
+		var module: FlowModule = {
+			id: 'preprocessor',
+			value: { type: 'identity' }
+		}
+		var state = emptyFlowModuleState()
+
+		if (inlineScript) {
+			;[module, state] = await createInlineScriptModule(
+				inlineScript.language,
+				'script',
+				inlineScript.subkind,
+				'preprocessor'
+			)
+		} else if (wsScript) {
+			;[module, state] = await pickScript(wsScript.path, wsScript.summary, module.id, wsScript.hash)
+		}
+
+		$flowStore.value.preprocessor_module = module
+		$flowStateStore[module.id] = state
+	}
+
 	function removeAtId(modules: FlowModule[], id: string): FlowModule[] {
 		const index = modules.findIndex((mod) => mod.id == id)
 		if (index != -1) {
@@ -205,9 +262,16 @@
 			}
 		}
 	}
+
+	function setExpr(module: FlowModule, expr: string) {
+		if (module.value.type == 'forloopflow') {
+			module.value.iterator = { type: 'javascript', expr }
+			module.value.parallel = true
+		}
+	}
 </script>
 
-<Portal>
+<Portal name="flow-module">
 	<ConfirmationModal
 		title="Confirm deleting step with dependents"
 		confirmationText="Delete step"
@@ -256,6 +320,9 @@
 
 	<div class="z-10 flex-auto grow bg-surface-secondary" bind:clientHeight={minHeight}>
 		<FlowGraphV2
+			triggerNode={true}
+			path={$pathStore}
+			{newFlow}
 			{disableAi}
 			insertable
 			scroll
@@ -300,7 +367,7 @@
 				} else if (shouldRunTutorial('branchall', detail.detail, 3)) {
 					flowTutorials?.runTutorialById('branchall')
 				} else {
-					if (detail.modules) {
+					if (detail.modules && Array.isArray(detail.modules)) {
 						await tick()
 						if ($moving) {
 							push(history, $flowStore)
@@ -311,31 +378,39 @@
 							$moving = undefined
 						} else {
 							if (detail.detail === 'preprocessor') {
-								const preprocessorModule = {
-									schema: emptySchema(),
-									previewResult: NEVER_TESTED_THIS_FAR
-								}
-								$flowStore.value.preprocessor_module = {
-									id: 'preprocessor',
-									value: { type: 'identity' }
-								}
-								$flowStateStore['preprocessor'] = preprocessorModule
+								insertNewPreprocessorModule(detail.inlineScript, detail.script)
 								$selectedId = 'preprocessor'
 							} else {
+								const index = detail.index ?? 0
 								await insertNewModuleAtIndex(
 									detail.modules,
-									detail.index ?? 0,
-									detail.detail,
-									detail.script
+									index,
+									detail.kind,
+									detail.script,
+									detail.flow,
+									detail.inlineScript
 								)
-								$selectedId = detail.modules[detail.index ?? 0].id
+								const id = detail.modules[detail.index ?? 0].id
+								$selectedId = id
+
+								if (detail.kind == 'trigger') {
+									await insertNewModuleAtIndex(
+										detail.modules,
+										index + 1,
+										'forloop',
+										undefined,
+										undefined,
+										undefined
+									)
+									setExpr(detail.modules[index + 1], `results.${id}`)
+								}
 							}
 						}
 
-						if (['branchone', 'branchall'].includes(detail.detail)) {
+						if (['branchone', 'branchall'].includes(detail.kind)) {
 							await addBranch(detail.modules[detail.index ?? 0])
 						}
-
+						$flowStateStore = $flowStateStore
 						$flowStore = $flowStore
 						dispatch('change')
 					}
diff --git a/frontend/src/lib/components/flows/map/InsertModuleButton.svelte b/frontend/src/lib/components/flows/map/InsertModuleButton.svelte
index 40cce9648f..1544972c4b 100644
--- a/frontend/src/lib/components/flows/map/InsertModuleButton.svelte
+++ b/frontend/src/lib/components/flows/map/InsertModuleButton.svelte
@@ -1,169 +1,207 @@
 <script lang="ts">
-	import { Menu } from '$lib/components/common'
 	import { createEventDispatcher, getContext } from 'svelte'
-	import { CheckCircle2, Code, Cross, GitBranch, Repeat, Square, Zap } from 'lucide-svelte'
-	import StepGen from '$lib/components/copilot/StepGen.svelte'
+	import { Cross, Zap } from 'lucide-svelte'
+	import StepGenQuick from '$lib/components/copilot/StepGenQuick.svelte'
+	import FlowInputsQuick from '../content/FlowInputsQuick.svelte'
 	import type { FlowModule } from '$lib/gen'
-	import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
 	import type { FlowBuilderWhitelabelCustomUi } from '$lib/components/custom_ui'
+	import ToggleHubWorkspaceQuick from '$lib/components/ToggleHubWorkspaceQuick.svelte'
 	import { twMerge } from 'tailwind-merge'
+	import type { ComputeConfig } from 'svelte-floating-ui'
+	import TopLevelNode from '../pickers/TopLevelNode.svelte'
+	import PopupV2 from '$lib/components/common/popup/PopupV2.svelte'
+	import { flip, offset } from 'svelte-floating-ui/dom'
+
+	// import type { Writable } from 'svelte/store'
 
 	const dispatch = createEventDispatcher()
-	export let trigger = false
 	export let stop = false
-	export let open: boolean | undefined = undefined
-	export let index: number
+	export let index: number = 0
 	export let funcDesc = ''
-	export let modules: FlowModule[]
+	export let modules: FlowModule[] = []
 	export let disableAi = false
+	export let kind: 'script' | 'trigger' | 'preprocessor' | 'failure' = 'script'
+	export let allowTrigger = true
 
+	type Alignment = 'start' | 'end' | 'center'
+	type Side = 'top' | 'bottom'
+	type Placement = `${Side}-${Alignment}`
+
+	export let placement: Placement = 'bottom-center'
+
+	let floatingConfig: ComputeConfig = {
+		strategy: 'fixed',
+		// @ts-ignore
+		placement,
+		middleware: [offset(8), flip()],
+		autoUpdate: true
+	}
 	$: !open && (funcDesc = '')
 	let customUi: undefined | FlowBuilderWhitelabelCustomUi = getContext('customUi')
+	let selectedKind: 'script' | 'trigger' | 'preprocessor' | 'approval' | 'flow' | 'failure' = kind
+	let preFilter: 'all' | 'workspace' | 'hub' = 'all'
+	let loading = false
+	let small = false
+	let open = false
+
+	$: small = kind === 'preprocessor' || kind === 'failure'
 </script>
 
-<Menu
-	transitionDuration={0}
-	pointerDown
-	bind:show={open}
-	noMinW
-	placement="bottom-center"
-	let:close
->
-	<svelte:fragment slot="trigger">
+<!-- <Menu transitionDuration={0} pointerDown bind:show={open} noMinW {placement} let:close> -->
+
+<!-- {floatingConfig}
+floatingClasses="mt-2"
+containerClasses="border rounded-lg shadow-lg  bg-surface"
+noTransition
+shouldUsePortal={true} -->
+
+<PopupV2 {floatingConfig} bind:open let:close target="#flow-editor">
+	<svelte:fragment let:pointerdown let:pointerup slot="button">
 		<button
-			title="Add step"
+			title={`Add ${
+				kind === 'failure'
+					? ' failure module '
+					: kind === 'preprocessor'
+					? 'preprocessor step'
+					: kind === 'trigger'
+					? 'trigger'
+					: 'step'
+			}`}
 			id={`flow-editor-add-step-${index}`}
 			type="button"
 			class={twMerge(
 				'w-5 h-5 flex items-center justify-center',
 				'outline-[1px] outline dark:outline-gray-500 outline-gray-300',
 				'text-secondary',
-				'bg-surface focus:outline-none hover:bg-surface-hover   rounded '
+				'bg-surface focus:outline-none hover:bg-surface-hover rounded'
 			)}
+			on:pointerdown|preventDefault|stopPropagation={pointerdown}
+			on:pointerup={pointerup}
 		>
-			<Cross size={12} />
+			{#if kind === 'trigger'}
+				<Zap size={12} />
+			{:else}
+				<Cross size={12} />
+			{/if}
 		</button>
 	</svelte:fragment>
-	<div id="flow-editor-insert-module">
-		<StepGen on:insert {index} bind:funcDesc bind:open {close} {modules} {disableAi} />
+	<!-- FOO -->
+	<div
+		id="flow-editor-insert-module"
+		class="flex flex-col h-[400px] {small ? 'w-[450px]' : 'w-[650px]'}  pt-1 pr-1 pl-1 gap-1.5"
+		on:wheel={(e) => {
+			e.stopPropagation()
+		}}
+		role="none"
+	>
+		<div class="flex flex-row items-center gap-2">
+			<StepGenQuick
+				on:escape={() => close(null)}
+				{disableAi}
+				on:insert
+				bind:funcDesc
+				{preFilter}
+				{loading}
+			/>
+			{#if selectedKind != 'preprocessor' && selectedKind != 'flow'}
+				<ToggleHubWorkspaceQuick bind:selected={preFilter} />
+			{/if}
+		</div>
 
-		{#if funcDesc.length === 0}
-			<div class="font-mono divide-y text-xs w-full text-secondary">
-				<button
-					class="w-full text-left py-2 px-3 hover:bg-surface-hover whitespace-nowrap flex flex-row gap-2 items-center"
-					on:pointerdown={() => {
-						close()
-						dispatch('new', 'script')
-					}}
-					role="menuitem"
-					tabindex="-1"
-				>
-					<Code size={14} />
-					Action
-				</button>
-				{#if customUi?.triggers != false && trigger}
-					<button
-						class="w-full text-left py-2 px-3 hover:bg-surface-hover whitespace-nowrap flex flex-row gap-2 items-center"
-						on:pointerdown={() => {
-							close()
-							dispatch('new', 'trigger')
+		<div class="flex flex-row grow min-h-0">
+			{#if kind === 'script' || kind == 'trigger'}
+				<div class="flex-none flex flex-col text-xs text-primary">
+					<TopLevelNode
+						label="Action"
+						selected={selectedKind === 'script'}
+						on:select={() => {
+							selectedKind = 'script'
 						}}
-						role="menuitem"
-						tabindex="-1"
-					>
-						<Zap size={14} />
-						Trigger
-					</button>
-				{/if}
-				<button
-					class="w-full text-left py-2 px-3 hover:bg-surface-hover whitespace-nowrap flex flex-row gap-2 items-center"
-					on:pointerdown={() => {
-						close()
-						dispatch('new', 'approval')
-					}}
-					role="menuitem"
-					tabindex="-1"
-				>
-					<CheckCircle2 size={14} />
-					Approval/Prompt
-				</button>
-				<button
-					class="w-full text-left py-2 px-3 hover:bg-surface-hover whitespace-nowrap flex flex-row gap-2 items-center"
-					on:pointerdown={() => {
-						close()
-						dispatch('new', 'forloop')
-					}}
-					role="menuitem"
-				>
-					<Repeat size={14} />
-
-					For Loop
-				</button>
-				<button
-					class="w-full text-left py-2 px-3 hover:bg-surface-hover whitespace-nowrap flex flex-row gap-2 items-center"
-					on:pointerdown={() => {
-						close()
-						dispatch('new', 'whileloop')
-					}}
-					role="menuitem"
-				>
-					<Repeat size={14} />
-
-					While Loop
-				</button>
-
-				<button
-					class="w-full text-left py-2 px-3 hover:bg-surface-hover whitespace-nowrap flex flex-row gap-2 items-center"
-					on:pointerdown={() => {
-						close()
-						dispatch('new', 'branchone')
-					}}
-					role="menuitem"
-				>
-					<GitBranch size={14} />
-					Branch to one
-				</button>
-
-				<button
-					class="w-full text-left py-2 px-3 hover:bg-surface-hover whitespace-nowrap flex flex-row gap-2 items-center"
-					on:pointerdown={() => {
-						close()
-						dispatch('new', 'branchall')
-					}}
-					role="menuitem"
-				>
-					<GitBranch size={14} />
-
-					Branch to all
-				</button>
-
-				{#if customUi?.flowNode != false}
-					<button
-						class="w-full text-left py-2 px-3 hover:bg-surface-hover rounded-none whitespace-nowrap flex flex-row gap-2 items-center"
-						on:pointerdown={() => {
-							close()
-							dispatch('new', 'flow')
+					/>
+					{#if customUi?.triggers != false && allowTrigger}
+						<TopLevelNode
+							label="Trigger"
+							selected={selectedKind === 'trigger'}
+							on:select={() => {
+								selectedKind = 'trigger'
+							}}
+						/>
+					{/if}
+					<TopLevelNode
+						label="Approval/Prompt"
+						selected={selectedKind === 'approval'}
+						on:select={() => {
+							selectedKind = 'approval'
 						}}
-						role="menuitem"
-					>
-						<BarsStaggered size={14} />
-						Flow
-					</button>
-				{/if}
-				{#if stop}
-					<button
-						class="w-full text-left py-2 px-3 hover:bg-surface-hover inline-flex gap-2.5"
-						on:pointerdown={() => {
-							close()
-							dispatch('new', 'end')
+					/>
+					{#if customUi?.flowNode != false}
+						<TopLevelNode
+							label="Flow"
+							selected={selectedKind === 'flow'}
+							on:select={() => {
+								selectedKind = 'flow'
+							}}
+						/>
+					{/if}
+					{#if stop}
+						<TopLevelNode
+							label="End Flow"
+							selected={selectedKind === 'script'}
+							on:select={() => {
+								selectedKind = 'script'
+							}}
+						/>
+					{/if}
+
+					<TopLevelNode
+						label="For Loop"
+						on:select={() => {
+							close(null)
+							dispatch('new', { kind: 'forloop' })
 						}}
-						role="menuitem"
-					>
-						<Square size={14} />
-						End Flow
-					</button>
-				{/if}
-			</div>
-		{/if}
+					/>
+					<TopLevelNode
+						label="While Loop"
+						on:select={() => {
+							close(null)
+							dispatch('new', { kind: 'whileloop' })
+						}}
+					/>
+					<TopLevelNode
+						label="Branch to one"
+						on:select={() => {
+							close(null)
+							dispatch('new', { kind: 'branchone' })
+						}}
+					/>
+					<TopLevelNode
+						label="Branch to all"
+						on:select={() => {
+							close(null)
+							dispatch('new', { kind: 'branchall' })
+						}}
+					/>
+				</div>
+			{/if}
+
+			<FlowInputsQuick
+				{selectedKind}
+				bind:loading
+				filter={funcDesc}
+				{modules}
+				{index}
+				{disableAi}
+				{funcDesc}
+				{kind}
+				on:close={() => {
+					close(null)
+				}}
+				on:new
+				on:pickScript
+				on:pickFlow
+				{preFilter}
+				{small}
+			/>
+		</div>
 	</div>
-</Menu>
+</PopupV2>
diff --git a/frontend/src/lib/components/flows/map/InsertTriggerButton.svelte b/frontend/src/lib/components/flows/map/InsertTriggerButton.svelte
deleted file mode 100644
index 35dc331161..0000000000
--- a/frontend/src/lib/components/flows/map/InsertTriggerButton.svelte
+++ /dev/null
@@ -1,52 +0,0 @@
-<script lang="ts">
-	import { Menu } from '$lib/components/common'
-	import { createEventDispatcher } from 'svelte'
-	import StepGen from '$lib/components/copilot/StepGen.svelte'
-	import type { FlowModule } from '$lib/gen'
-	import { Zap } from 'lucide-svelte'
-
-	const dispatch = createEventDispatcher()
-	export let open: boolean | undefined = undefined
-	export let index: number
-	export let funcDesc = ''
-	export let modules: FlowModule[]
-	export let disableAi = false
-
-	$: !open && (funcDesc = '')
-</script>
-
-<Menu
-	transitionDuration={0}
-	pointerDown
-	bind:show={open}
-	noMinW
-	placement="bottom-center"
-	let:close
->
-	<button
-		title="Add a Trigger"
-		slot="trigger"
-		type="button"
-		class="text-secondary bg-surface outline-[1px] outline dark:outline-gray-500 outline-gray-300 rotate-180 focus:outline-none hover:bg-surface-hover focus:ring-4 focus:ring-gray-200 font-medium rounded text-sm w-[20px] h-[20px] flex items-center justify-center"
-	>
-		<Zap size={12} />
-	</button>
-	{#if !disableAi}
-		<StepGen {index} bind:funcDesc bind:open {close} {modules} trigger on:insert />
-	{/if}
-	{#if funcDesc.length === 0}
-		<div class="font-mono divide-y text-xs w-full text-secondary whitespace-nowrap">
-			<button
-				class="w-full text-left py-2 px-3 hover:bg-surface-hover flex flex-row items-center gap-2"
-				on:pointerdown={() => {
-					close()
-					dispatch('new', 'trigger')
-				}}
-				role="menuitem"
-				tabindex="-1"
-			>
-				<Zap size={14} />Trigger
-			</button>
-		</div>
-	{/if}
-</Menu>
diff --git a/frontend/src/lib/components/flows/map/MapItem.svelte b/frontend/src/lib/components/flows/map/MapItem.svelte
index a171cd3344..5114758357 100644
--- a/frontend/src/lib/components/flows/map/MapItem.svelte
+++ b/frontend/src/lib/components/flows/map/MapItem.svelte
@@ -11,11 +11,9 @@
 	import { msToSec } from '$lib/utils'
 	import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
 	import FlowJobsMenu from './FlowJobsMenu.svelte'
-	import FlowCopilotButton from './FlowCopilotButton.svelte'
 
 	export let mod: FlowModule
 	export let insertable: boolean
-	export let disableAi: boolean
 	export let annotation: string | undefined = undefined
 	export let bgColor: string = ''
 	export let modules: FlowModule[]
@@ -48,6 +46,7 @@
 		selected: $selectedId === mod.id,
 		retry: mod.retry?.constant != undefined || mod.retry?.exponential != undefined,
 		earlyStop: mod.stop_after_if != undefined || mod.stop_after_all_iters_if != undefined,
+		skip: Boolean(mod.skip_if),
 		suspend: Boolean(mod.suspend),
 		sleep: Boolean(mod.sleep),
 		cache: Boolean(mod.cache_ttl),
@@ -62,9 +61,6 @@
 
 {#if mod}
 	<div class="relative">
-		{#if insertable && !disableAi && mod.id === 'preprocessor'}
-			<FlowCopilotButton className="-top-10" />
-		{/if}
 		{#if moving == mod.id}
 			<div class="absolute z-10 right-20 top-0.5 center-center">
 				<Button color="dark" on:click={() => dispatch('move')} size="xs" variant="border">
diff --git a/frontend/src/lib/components/flows/pickers/FlowScriptPickerQuick.svelte b/frontend/src/lib/components/flows/pickers/FlowScriptPickerQuick.svelte
new file mode 100644
index 0000000000..3f854bec46
--- /dev/null
+++ b/frontend/src/lib/components/flows/pickers/FlowScriptPickerQuick.svelte
@@ -0,0 +1,57 @@
+<script lang="ts">
+	import type { SupportedLanguage } from '$lib/common'
+	import LanguageIcon from '$lib/components/common/languageIcons/LanguageIcon.svelte'
+	import { sendUserToast } from '$lib/toast'
+	import { createEventDispatcher } from 'svelte'
+	import { twMerge } from 'tailwind-merge'
+
+	export let label: string
+	export let lang: SupportedLanguage | 'docker' | 'javascript' | undefined = undefined
+	export let selected = false
+	export let eeRestricted: boolean
+	export let enterpriseLangs: string[] = []
+
+	const dispatch = createEventDispatcher()
+	function handleKeydown(event: KeyboardEvent & { currentTarget: EventTarget & Window }) {
+		if (selected && event.key === 'Enter') {
+			click()
+		}
+	}
+
+	function click() {
+		if (eeRestricted) {
+			sendUserToast(
+				`The languages ${enterpriseLangs.join(', ')} are only available on the enterprise edition`,
+				true
+			)
+			return
+		}
+		dispatch('click')
+	}
+</script>
+
+<svelte:window on:keydown={handleKeydown} />
+
+<button
+	id={`flow-editor-new-${lang}`}
+	class={twMerge(
+		'px-3 py-2 gap-2 w-full text-left hover:bg-surface-hover flex flex-row items-center transition-all rounded-md',
+		selected ? 'bg-surface-hover' : ''
+	)}
+	on:click={click}
+	role="menuitem"
+>
+	{#if lang}
+		<LanguageIcon {lang} width={14} height={14} />
+	{/if}
+	<span
+		class="grow truncate text-left text-2xs font-normal {eeRestricted
+			? 'text-secondary'
+			: 'text-primary'}"
+	>
+		{label}{#if eeRestricted}&nbsp;(EE){/if}
+	</span>
+	{#if selected}
+		<kbd class="!text-xs">&crarr;</kbd>
+	{/if}
+</button>
diff --git a/frontend/src/lib/components/flows/pickers/FlowToplevelNode.svelte b/frontend/src/lib/components/flows/pickers/FlowToplevelNode.svelte
new file mode 100644
index 0000000000..0248437963
--- /dev/null
+++ b/frontend/src/lib/components/flows/pickers/FlowToplevelNode.svelte
@@ -0,0 +1,22 @@
+<script lang="ts">
+	import { createEventDispatcher } from 'svelte'
+	import TopLevelNode from './TopLevelNode.svelte'
+
+	export let label: string
+	export let selected = false
+	const dispatch = createEventDispatcher()
+	function handleKeydown(event: KeyboardEvent & { currentTarget: EventTarget & Window }) {
+		if (selected && event.key === 'Enter') {
+			event.preventDefault()
+			click()
+		}
+	}
+
+	function click() {
+		dispatch('click')
+	}
+</script>
+
+<svelte:window on:keydown={handleKeydown} />
+
+<TopLevelNode class="px-3" {label} {selected} returnIcon on:select={click} />
diff --git a/frontend/src/lib/components/flows/pickers/PickHubScriptQuick.svelte b/frontend/src/lib/components/flows/pickers/PickHubScriptQuick.svelte
new file mode 100644
index 0000000000..122e4a3125
--- /dev/null
+++ b/frontend/src/lib/components/flows/pickers/PickHubScriptQuick.svelte
@@ -0,0 +1,175 @@
+<script lang="ts">
+	import { createEventDispatcher } from 'svelte'
+	import { Skeleton } from '$lib/components/common'
+	import { classNames } from '$lib/utils'
+	import { APP_TO_ICON_COMPONENT } from '$lib/components/icons'
+	import { IntegrationService, ScriptService, type HubScriptKind } from '$lib/gen'
+	import { Circle } from 'lucide-svelte'
+
+	export let kind: HubScriptKind & string = 'script'
+	export let filter = ''
+
+	export let loading = false
+	export let selected: number | undefined = undefined
+	let hubNotAvailable = false
+
+	const dispatch = createEventDispatcher()
+
+	export let appFilter: string | undefined = undefined
+	export let items: {
+		path: string
+		summary: string
+		id: number
+		version_id: number
+		ask_id: number
+		app: string
+		kind: HubScriptKind
+	}[] = []
+
+	export let apps: string[] = []
+	let allApps: string[] = []
+	$: applyFilter(filter, kind, appFilter)
+	$: getAllApps(kind)
+
+	async function getAllApps(filterKind: typeof kind) {
+		try {
+			hubNotAvailable = false
+			allApps = (
+				await IntegrationService.listHubIntegrations({
+					kind: filterKind
+				})
+			).map((x) => x.name)
+			apps = allApps
+		} catch (err) {
+			console.error('Hub is not available')
+			allApps = []
+			apps = []
+			hubNotAvailable = true
+		}
+	}
+
+	let startTs = 0
+	async function applyFilter(
+		filter: string,
+		filterKind: typeof kind,
+		appFilter: string | undefined
+	) {
+		try {
+			loading = true
+			hubNotAvailable = false
+			const ts = Date.now()
+			startTs = ts
+			await new Promise((resolved, rejected) => setTimeout(resolved, 200))
+			if (ts < startTs) return
+			const scripts =
+				filter.length > 0
+					? await ScriptService.queryHubScripts({
+							text: `${filter}`,
+							limit: 40,
+							kind: filterKind
+					  })
+					: (
+							await ScriptService.getTopHubScripts({
+								limit: 40,
+								kind: filterKind,
+								app: appFilter
+							})
+					  ).asks ?? []
+
+			const mappedItems = scripts.map(
+				(x: {
+					summary: string
+					version_id: number
+					id: number
+					ask_id: number
+					app: string
+					kind: HubScriptKind
+				}) => ({
+					...x,
+					path: `hub/${x.version_id}/${x.app}/${x.summary.toLowerCase().replaceAll(/\s+/g, '_')}`,
+					summary: `${x.summary} (${x.app})`
+				})
+			)
+			if (filter.length > 0) {
+				apps = Array.from(new Set(mappedItems?.map((x) => x.app) ?? [])).sort()
+			} else {
+				apps = allApps
+			}
+
+			items = appFilter ? mappedItems.filter((x) => x.app === appFilter) : mappedItems
+
+			if (ts === startTs) {
+				loading = false
+			}
+
+			hubNotAvailable = false
+		} catch (err) {
+			hubNotAvailable = true
+			console.error('Hub not available')
+			loading = false
+		}
+	}
+
+	function onKeyDown(e: KeyboardEvent) {
+		if (
+			selected != undefined &&
+			items &&
+			selected >= 0 &&
+			selected < items?.length! &&
+			e.key === 'Enter'
+		) {
+			e.preventDefault()
+			let item = items![selected]
+			dispatch('pickScript', item)
+		}
+	}
+</script>
+
+<svelte:window on:keydown={onKeyDown} />
+{#if hubNotAvailable}
+	<div class="text-2xs text-red-400 ftext-2xs font-light text-center py-2 px-3 items-center">
+		Hub not available
+	</div>
+{:else if loading}
+	{#each Array(15).fill(0) as _}
+		<Skeleton layout={[0.1, [1.5]]} />
+	{/each}
+{:else if items.length > 0 && apps.length > 0}
+	<ul>
+		{#each items as item, index (item.path)}
+			<li class="w-full">
+				<button
+					class="px-3 py-2 gap-2 flex flex-row w-full hover:bg-surface-hover transition-all items-center rounded-md {index ===
+					selected
+						? 'bg-surface-hover'
+						: ''}"
+					on:click={() => dispatch('pickScript', item)}
+				>
+					<div class={classNames('flex justify-center items-center')}>
+						{#if item['app'] in APP_TO_ICON_COMPONENT}
+							<svelte:component this={APP_TO_ICON_COMPONENT[item['app']]} height={14} width={14} />
+						{:else}
+							<div
+								class="w-[14px] h-[14px] text-gray-400 flex flex-row items-center justify-center"
+							>
+								<Circle size="12" />
+							</div>
+						{/if}
+					</div>
+
+					<span class="grow truncate text-left text-2xs text-primary font-normal">
+						{item.summary ?? ''}
+					</span>
+					{#if index === selected}
+						<kbd class="!text-xs">&crarr;</kbd>
+					{/if}
+				</button>
+			</li>
+		{/each}
+	</ul>
+	{#if items.length == 40}
+		<div class="text-2xs text-tercary font-extralight text-center py-2 px-3 items-center">
+			There are more items than being displayed. Refine your search.
+		</div>
+	{/if}
+{/if}
diff --git a/frontend/src/lib/components/flows/pickers/TopLevelNode.svelte b/frontend/src/lib/components/flows/pickers/TopLevelNode.svelte
new file mode 100644
index 0000000000..837281851d
--- /dev/null
+++ b/frontend/src/lib/components/flows/pickers/TopLevelNode.svelte
@@ -0,0 +1,61 @@
+<script lang="ts">
+	import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
+	import { CheckCircle2, ChevronRight, Code, GitBranch, Repeat, Square, Zap } from 'lucide-svelte'
+	import { createEventDispatcher } from 'svelte'
+	import { twMerge } from 'tailwind-merge'
+
+	export let label: string
+	export let selected = false
+	export let returnIcon = false
+	const dispatch = createEventDispatcher()
+</script>
+
+<button
+	id={`flow-editor-flow-kind-${label.replaceAll(' ', '-').toLowerCase()}`}
+	class={twMerge(
+		'w-full text-left py-2 px-1.5 hover:bg-surface-hover text-xs font-medium transition-all whitespace-nowrap flex flex-row gap-2 items-center rounded-md',
+		selected ? 'bg-surface-hover' : '',
+		$$props.class
+	)}
+	on:pointerdown={() => dispatch('select', label)}
+	role="menuitem"
+	tabindex="-1"
+>
+	<span class="grow flex items-center gap-2">
+		{#if label === 'Action'}
+			<Code size={14} />
+			Action
+			<ChevronRight size={12} class="ml-auto" color="#4c566a" />
+		{:else if label === 'Trigger'}
+			<Zap size={14} />
+			Trigger
+			<ChevronRight size={12} class="ml-auto" color="#4c566a" />
+		{:else if label === 'Approval/Prompt'}
+			<CheckCircle2 size={14} />
+			Approval/Prompt
+			<ChevronRight size={12} class="ml-auto" color="#4c566a" />
+		{:else if label === 'Flow'}
+			<BarsStaggered size={14} />
+			Flow
+			<ChevronRight size={12} class="ml-auto" color="#4c566a" />
+		{:else if label === 'End Flow'}
+			<Square size={14} />
+			End Flow
+		{:else if label === 'For Loop'}
+			<Repeat size={14} />
+			For Loop
+		{:else if label === 'While Loop'}
+			<Repeat size={14} />
+			While Loop
+		{:else if label === 'Branch to one'}
+			<GitBranch size={14} />
+			Branch to one
+		{:else if label === 'Branch to all'}
+			<GitBranch size={14} />
+			Branch to all
+		{/if}
+	</span>
+	{#if returnIcon && selected}
+		<kbd class="!text-xs text-right">&crarr;</kbd>
+	{/if}
+</button>
diff --git a/frontend/src/lib/components/flows/pickers/WorkspaceScriptPickerQuick.svelte b/frontend/src/lib/components/flows/pickers/WorkspaceScriptPickerQuick.svelte
new file mode 100644
index 0000000000..21da7ecb04
--- /dev/null
+++ b/frontend/src/lib/components/flows/pickers/WorkspaceScriptPickerQuick.svelte
@@ -0,0 +1,144 @@
+<script lang="ts">
+	import { workspaceStore } from '$lib/stores'
+	import { createEventDispatcher } from 'svelte'
+	import { FlowService, ScriptService } from '$lib/gen'
+	import SearchItems from '$lib/components/SearchItems.svelte'
+	import { Skeleton } from '$lib/components/common'
+	import { emptyString } from '$lib/utils'
+	import { Code2 } from 'lucide-svelte'
+	import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
+
+	export let kind: 'script' | 'trigger' | 'approval' | 'failure' | 'flow' | 'preprocessor' =
+		'script'
+	export let isTemplate: boolean | undefined = undefined
+	export let selected: number | undefined = undefined
+
+	type Item = {
+		path: string
+		summary?: string
+		description?: string
+		hash?: string
+	}
+
+	let items: Item[] | undefined = undefined
+
+	let filteredItems: (Item & { marked?: string })[] | undefined = undefined
+	export let filteredWithOwner: (Item & { marked?: string })[] | undefined = undefined
+
+	export let filter = ''
+	export let owners: string[] = []
+
+	$: $workspaceStore && kind && loadItems()
+
+	async function loadItems(): Promise<void> {
+		items =
+			kind == 'flow'
+				? await FlowService.listFlows({ workspace: $workspaceStore! })
+				: await ScriptService.listScripts({
+						workspace: $workspaceStore!,
+						kinds: kind,
+						isTemplate
+				  })
+	}
+
+	export let ownerFilter:
+		| { kind: 'inline' | 'owner' | 'integrations'; name: string | undefined }
+		| undefined = undefined
+
+	$: if ($workspaceStore) {
+		ownerFilter = undefined
+	}
+
+	$: owners = Array.from(
+		new Set(filteredItems?.map((x) => x.path.split('/').slice(0, 2).join('/')) ?? [])
+	).sort((a, b) => {
+		if (a.startsWith('u/') && !b.startsWith('u/')) return -1
+		if (b.startsWith('u/') && !a.startsWith('u/')) return 1
+
+		if (a.startsWith('f/') && !b.startsWith('f/')) return -1
+		if (b.startsWith('f/') && !a.startsWith('f/')) return 1
+
+		return a.localeCompare(b)
+	})
+
+	const dispatch = createEventDispatcher()
+	let lockHash = false
+
+	$: filteredWithOwner =
+		ownerFilter != undefined
+			? filteredItems?.filter((x) => x.path.startsWith(ownerFilter?.name!))
+			: filteredItems
+
+	function onKeyDown(e: KeyboardEvent) {
+		if (
+			selected != undefined &&
+			filteredWithOwner &&
+			selected >= 0 &&
+			selected < filteredWithOwner.length &&
+			e.key === 'Enter'
+		) {
+			e.preventDefault()
+			let item = filteredWithOwner[selected]
+			if (kind == 'flow') {
+				dispatch('pickFlow', { path: item.path })
+			} else {
+				dispatch('pickScript', { path: item.path, hash: lockHash ? item.hash : undefined, kind })
+			}
+		}
+	}
+</script>
+
+<SearchItems
+	{filter}
+	{items}
+	bind:filteredItems
+	f={(x) => (emptyString(x.summary) ? x.path : x.summary + ' (' + x.path + ')')}
+/>
+
+<svelte:window on:keydown={onKeyDown} />
+{#if filteredItems}
+	{#if filteredItems.length == 0}
+		<div class="text-2xs text-tertiary font-light text-center py-2 px-3 items-center">
+			{kind == 'flow' ? 'No flows found.' : 'No scripts found.'}
+		</div>
+	{/if}
+	<ul>
+		{#each filteredWithOwner ?? [] as { path, hash, summary, marked }, index}
+			<li class="w-full">
+				<button
+					class="px-3 py-2 gap-2 flex flex-row w-full hover:bg-surface-hover transition-all items-center rounded-md {index ===
+					selected
+						? 'bg-surface-hover'
+						: ''}"
+					on:click={() => {
+						if (kind == 'flow') {
+							dispatch('pickFlow', { path: path })
+						} else {
+							dispatch('pickScript', { path: path, hash: lockHash ? hash : undefined, kind })
+						}
+					}}
+				>
+					{#if kind == 'flow'}
+						<BarsStaggered size={14} class="shrink-0" />
+					{:else}
+						<Code2 size={14} />
+					{/if}
+					<span class="grow min-w-0 truncate text-left text-2xs text-primary font-normal">
+						{#if marked}
+							{@html marked}
+						{:else}
+							{!summary || summary.length == 0 ? path : summary}
+						{/if}</span
+					>
+					{#if index === selected}
+						<kbd class="!text-xs">&crarr;</kbd>
+					{/if}
+				</button>
+			</li>
+		{/each}
+	</ul>
+{:else}
+	{#each Array(10).fill(0) as _}
+		<Skeleton layout={[0.5, [1.5]]} />
+	{/each}
+{/if}
diff --git a/frontend/src/lib/components/flows/scheduleUtils.ts b/frontend/src/lib/components/flows/scheduleUtils.ts
index 2390043ac1..ef1f2b1fde 100644
--- a/frontend/src/lib/components/flows/scheduleUtils.ts
+++ b/frontend/src/lib/components/flows/scheduleUtils.ts
@@ -1,15 +1,8 @@
 import { ScheduleService } from '$lib/gen'
-
-export type Schedule = {
-	summary: string | undefined
-	args: Record<string, any>
-	cron: string
-	timezone: string
-	enabled: boolean
-}
+import type { ScheduleTrigger } from '../triggers'
 
 // Load the schedule of a flow given its path and the workspace
-export async function loadFlowSchedule(path: string, workspace: string): Promise<Schedule> {
+export async function loadFlowSchedule(path: string, workspace: string): Promise<ScheduleTrigger> {
 	const existsSchedule = await ScheduleService.existsSchedule({
 		workspace,
 		path
diff --git a/frontend/src/lib/components/flows/types.ts b/frontend/src/lib/components/flows/types.ts
index ba8ce95c5b..2cf7127018 100644
--- a/frontend/src/lib/components/flows/types.ts
+++ b/frontend/src/lib/components/flows/types.ts
@@ -3,7 +3,6 @@ import type { History } from '$lib/history'
 import type { Writable } from 'svelte/store'
 import type ScriptEditorDrawer from './content/ScriptEditorDrawer.svelte'
 import type { FlowState } from './flowState'
-import type { Schedule } from './scheduleUtils'
 import type { FlowBuilderWhitelabelCustomUi } from '../custom_ui'
 
 export type FlowInput = Record<
@@ -29,7 +28,6 @@ export type ExtendedOpenFlow = OpenFlow & {
 export type FlowEditorContext = {
 	selectedId: Writable<string>
 	moving: Writable<{ module: FlowModule; modules: FlowModule[] } | undefined>
-	schedule: Writable<Schedule>
 	previewArgs: Writable<Record<string, any>>
 	scriptEditorDrawer: Writable<ScriptEditorDrawer | undefined>
 	history: History<OpenFlow>
@@ -41,4 +39,5 @@ export type FlowEditorContext = {
 	initialPath: string
 	flowInputsStore: Writable<FlowInput>
 	customUi: FlowBuilderWhitelabelCustomUi
+	insertButtonOpen: Writable<boolean>
 }
diff --git a/frontend/src/lib/components/graph/FlowGraphV2.svelte b/frontend/src/lib/components/graph/FlowGraphV2.svelte
index 318ccaaa74..e7a48ac84f 100644
--- a/frontend/src/lib/components/graph/FlowGraphV2.svelte
+++ b/frontend/src/lib/components/graph/FlowGraphV2.svelte
@@ -32,10 +32,12 @@
 	import { encodeState } from '$lib/utils'
 	import BranchOneStart from './renderers/nodes/BranchOneStart.svelte'
 	import NoBranchNode from './renderers/nodes/NoBranchNode.svelte'
+	import HiddenBaseEdge from './renderers/edges/HiddenBaseEdge.svelte'
+	import TriggersNode from './renderers/nodes/TriggersNode.svelte'
 	import { Alert, Drawer } from '../common'
 	import Button from '../common/button/Button.svelte'
 	import FlowYamlEditor from '../flows/header/FlowYamlEditor.svelte'
-
+	import BranchOneEndNode from './renderers/nodes/branchOneEndNode.svelte'
 	export let success: boolean | undefined = undefined
 	export let modules: FlowModule[] | undefined = []
 	export let failureModule: FlowModule | undefined = undefined
@@ -46,10 +48,12 @@
 	export let flowModuleStates: Record<string, GraphModuleState> | undefined = undefined
 
 	export let selectedId: Writable<string | undefined> = writable<string | undefined>(undefined)
+	export let path: string | undefined = undefined
+	export let newFlow: boolean = false
 
 	export let insertable = false
-	export let moving: string | undefined = undefined
 	export let scroll = false
+	export let moving: string | undefined = undefined
 
 	// Download: display a top level button to open the graph in a new tab
 	export let download = false
@@ -58,6 +62,7 @@
 	export let flowInputsStore: Writable<FlowInput | undefined> = writable<FlowInput | undefined>(
 		undefined
 	)
+	export let triggerNode = false
 
 	let useDataflow: Writable<boolean | undefined> = writable<boolean | undefined>(false)
 
@@ -130,7 +135,9 @@
 			disableAi,
 			insertable,
 			flowModuleStates,
-			selectedId: $selectedId
+			selectedId: $selectedId,
+			path,
+			newFlow
 		},
 		failureModule,
 		preprocessorModule,
@@ -172,7 +179,12 @@
 		success,
 		$useDataflow,
 		$selectedId,
-		moving
+		moving,
+		triggerNode
+			? {
+					path
+			  }
+			: undefined
 	)
 
 	const nodes = writable<Node[]>([])
@@ -204,14 +216,16 @@
 		whileLoopStart: ForLoopStartNode,
 		whileLoopEnd: ForLoopEndNode,
 		branchOneStart: BranchOneStart,
-		branchOneEnd: BranchAllEndNode,
-		noBranch: NoBranchNode
+		branchOneEnd: BranchOneEndNode,
+		noBranch: NoBranchNode,
+		trigger: TriggersNode
 	} as any
 
 	const edgeTypes = {
 		edge: BaseEdge,
 		empty: EmptyEdge,
-		dataflowedge: DataflowEdge
+		dataflowedge: DataflowEdge,
+		hiddenedge: HiddenBaseEdge
 	} as any
 
 	const proOptions = { hideAttribution: true }
@@ -222,7 +236,8 @@
 		!$selectedId.startsWith('settings') &&
 		$selectedId !== 'failure' &&
 		$selectedId !== 'preprocessor' &&
-		$selectedId !== 'Result'
+		$selectedId !== 'Result' &&
+		$selectedId !== 'triggers'
 
 	const viewport = writable<Viewport>({
 		x: 0,
@@ -252,7 +267,7 @@
 
 <div style={`height: ${height}px; max-height: ${maxHeight}px;`} bind:clientWidth={width}>
 	{#if graph?.error}
-		<div class="center-center">
+		<div class="center-center p-2">
 			<Alert title="Error parsing the flow" type="error" class="max-w-1/2">
 				{graph.error}
 
@@ -266,6 +281,9 @@
 		</div>
 	{:else}
 		<SvelteFlow
+			on:paneclick={(e) => {
+				document.dispatchEvent(new Event('focus'))
+			}}
 			{nodes}
 			{edges}
 			{edgeTypes}
diff --git a/frontend/src/lib/components/graph/graphBuilder.ts b/frontend/src/lib/components/graph/graphBuilder.ts
index eecaffc7e3..e63d6c2c51 100644
--- a/frontend/src/lib/components/graph/graphBuilder.ts
+++ b/frontend/src/lib/components/graph/graphBuilder.ts
@@ -25,7 +25,10 @@ export default function graphBuilder(
 	success: boolean | undefined,
 	useDataflow: boolean | undefined,
 	selectedId: string | undefined,
-	moving: string | undefined
+	moving: string | undefined,
+	triggerProps?: {
+		path?: string
+	}
 ): {
 	nodes: Node[]
 	edges: Edge[]
@@ -33,14 +36,15 @@ export default function graphBuilder(
 } {
 	const nodes: Node[] = []
 	const edges: Edge[] = []
-
 	try {
 		if (!modules) {
 			return { nodes, edges }
 		}
 
 		function addNode(module: FlowModule, offset: number, type: string, subModules?: FlowModule[]) {
-			if (nodes.some((n) => n.id === module.id)) {
+			const duplicated = nodes.find((n) => n.id === module.id)
+			if (duplicated) {
+				console.log('Duplicated node detected: ', module, duplicated)
 				throw new Error(`Duplicated node detected: ${module.id}`)
 			}
 
@@ -152,6 +156,29 @@ export default function graphBuilder(
 			}
 		}
 
+		if (extra.path && triggerProps != undefined) {
+			const triggerNode: Node = {
+				id: 'Trigger',
+				position: { x: -1, y: -1 },
+				type: 'trigger',
+				data: {
+					path: triggerProps?.path,
+					newFlow: extra.newFlow,
+					eventHandlers: eventHandlers
+				}
+			}
+			nodes.push(triggerNode)
+			if (preprocessorModule != null && preprocessorModule != undefined) {
+				addEdge('Trigger', preprocessorModule.id, {
+					type: 'empty'
+				})
+			} else {
+				addEdge('Trigger', 'Input', {
+					type: 'empty'
+				})
+			}
+		}
+
 		const resultNode: Node = {
 			id: 'result',
 			data: {
@@ -173,7 +200,8 @@ export default function graphBuilder(
 			nextNode: Node,
 			currentOffset = 0,
 			disableMoveIds: string[] = [],
-			parentIndex?: string
+			parentIndex?: string,
+			branchChosen?: boolean
 		) {
 			let previousId: string | undefined = undefined
 
@@ -402,13 +430,15 @@ export default function graphBuilder(
 
 						addEdge(module.id, defaultBranch.id, { type: 'empty' })
 
+						const branchChosen = extra.flowModuleStates?.[module.id]?.branchChosen
 						processModules(
 							module.value.default,
 							defaultBranch,
 							endNode,
 							currentOffset,
 							localDisableMoveIds,
-							parentIndex ? `${parentIndex}-${index}` : index.toString()
+							parentIndex ? `${parentIndex}-${index}` : index.toString(),
+							branchChosen == 0
 						)
 
 						module.value.branches.forEach((branch, branchIndex) => {
@@ -440,7 +470,8 @@ export default function graphBuilder(
 								endNode,
 								currentOffset,
 								localDisableMoveIds,
-								parentIndex ? `${parentIndex}-${index}` : index.toString()
+								parentIndex ? `${parentIndex}-${index}` : index.toString(),
+								branchChosen == branchIndex + 1
 							)
 						})
 
@@ -449,6 +480,8 @@ export default function graphBuilder(
 						addNode(module, currentOffset, 'module', modules)
 
 						previousId = module.id
+
+
 					}
 
 					if (index === 0) {
@@ -466,27 +499,29 @@ export default function graphBuilder(
 					}
 				})
 
-				if (failureModule) {
-					const id = parentIndex ? `failure-${parentIndex}` : 'failure'
-					const failureState = extra.flowModuleStates?.[id] as GraphModuleState | undefined
 
-					if (failureState && failureState.parent_module) {
-						addNode(
-							{
-								...failureModule,
-								id: id
-							},
-							0,
-							'module'
-						)
-						addEdge(failureState.parent_module, id, { type: 'empty' })
-					}
-				}
 			}
 		}
 
 		processModules(modules, inputNode, resultNode)
 
+		if (failureModule) {
+			let toAdd: Record<string, string> = {}
+			Object.keys(extra.flowModuleStates ?? {}).forEach((id) => {
+				if (id.startsWith('failure-')) {
+					const failureState = extra.flowModuleStates?.[id] as GraphModuleState | undefined
+					if (failureState?.parent_module) {
+						toAdd[failureState.parent_module] = id
+					}
+				}
+			})
+
+			Object.entries(toAdd).forEach((x) => {
+				addNode({ ...failureModule, id: x[1] }, 0, 'module')
+				addEdge(x[0], x[1], { type: 'empty' })
+			})
+		}
+
 		if (preprocessorModule) {
 			addNode(preprocessorModule, 0, 'module')
 			const id = JSON.parse(JSON.stringify(preprocessorModule.id))
diff --git a/frontend/src/lib/components/graph/model.ts b/frontend/src/lib/components/graph/model.ts
index 34f7a4c4a3..8ce0bc1eb7 100644
--- a/frontend/src/lib/components/graph/model.ts
+++ b/frontend/src/lib/components/graph/model.ts
@@ -37,6 +37,7 @@ export type FlowStatusViewerContext = {
 	hideTimeline?: boolean
 	hideNodeDefinition?: boolean
 	hideJobId?: boolean
+	hideDownloadLogs
 }
 
 export type GraphModuleState = {
@@ -60,6 +61,7 @@ export type GraphModuleState = {
 	started_at?: number
 	suspend_count?: number
 	isListJob?: boolean
+	skipped?: boolean
 }
 
 export type NestedNodes = GraphItem[]
diff --git a/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte b/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte
index f27e89b8e0..8dbe9d3ad5 100644
--- a/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte
+++ b/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte
@@ -7,7 +7,6 @@
 	import type { Writable } from 'svelte/store'
 	import type { GraphEventHandlers } from '../../graphBuilder'
 	import { getStraightLinePath } from '../utils'
-	import InsertTriggerButton from '$lib/components/flows/map/InsertTriggerButton.svelte'
 	import { twMerge } from 'tailwind-merge'
 
 	export let sourceX: number
@@ -47,33 +46,44 @@
 	const { useDataflow } = getContext<{
 		useDataflow: Writable<boolean | undefined>
 	}>('FlowGraphContext')
-
-	let menuOpen = false
 </script>
 
 <EdgeLabelRenderer>
 	{#if data?.insertable && !$useDataflow && !data?.moving}
 		<div
-			class={twMerge('edgeButtonContainer nodrag nopan top-0', menuOpen ? 'z-50' : '')}
+			class={twMerge('edgeButtonContainer nodrag nopan top-0')}
 			style:transform="translate(-50%, 50%) translate({sourceX}px,{sourceY + 2}px)"
 		>
 			<InsertModuleButton
 				disableAi={data.disableAi}
 				index={data.index ?? 0}
-				trigger={data.enableTrigger}
+				allowTrigger={data.enableTrigger}
 				modules={data?.modules ?? []}
 				on:new={(e) => {
-					data?.eventHandlers.insert({ modules: data.modules, index: data.index, detail: e.detail })
+					data?.eventHandlers.insert({
+						modules: data.modules,
+						index: data.index,
+						kind: e.detail.kind,
+						inlineScript: e.detail.inlineScript
+					})
 				}}
-				on:insert={(e) => {
+				on:pickScript={(e) => {
+					// console.log('pickScript', e)
 					data?.eventHandlers.insert({
 						modules: data.modules,
 						index: data.index,
 						script: e.detail,
-						detail: 'script'
+						kind: e.detail.kind
+					})
+				}}
+				on:pickFlow={(e) => {
+					// console.log('pickFlow', e)
+					data?.eventHandlers.insert({
+						modules: data.modules,
+						index: data.index,
+						flow: e.detail
 					})
 				}}
-				bind:open={menuOpen}
 			/>
 		</div>
 		{#if data.enableTrigger}
@@ -81,23 +91,35 @@
 				class="edgeButtonContainer nodrag nopan"
 				style:transform="translate(100%, 50%) translate({sourceX}px,{sourceY + 2}px)"
 			>
-				<InsertTriggerButton
+				<InsertModuleButton
 					disableAi={data.disableAi}
 					on:new={(e) => {
+						// console.log('new', e)
 						data?.eventHandlers.insert({
 							modules: data.modules,
 							index: data.index,
-							detail: e.detail
+							kind: e.detail.kind,
+							inlineScript: e.detail.inlineScript
 						})
 					}}
-					on:insert={(e) => {
+					on:pickScript={(e) => {
+						// console.log('pickScript', e)
 						data?.eventHandlers.insert({
 							modules: data.modules,
 							index: data.index,
 							script: e.detail,
-							detail: 'script'
+							kind: e.detail.kind
 						})
 					}}
+					on:pickFlow={(e) => {
+						// console.log('pickFlow', e)
+						data?.eventHandlers.insert({
+							modules: data.modules,
+							index: data.index,
+							flow: e.detail
+						})
+					}}
+					kind="trigger"
 					index={data?.index ?? 0}
 					modules={data?.modules ?? []}
 				/>
diff --git a/frontend/src/lib/components/graph/renderers/edges/HiddenBaseEdge.svelte b/frontend/src/lib/components/graph/renderers/edges/HiddenBaseEdge.svelte
new file mode 100644
index 0000000000..a6032a2af1
--- /dev/null
+++ b/frontend/src/lib/components/graph/renderers/edges/HiddenBaseEdge.svelte
@@ -0,0 +1,6 @@
+<script lang="ts">
+	import { BaseEdge } from '@xyflow/svelte'
+	export let markerEnd: string | undefined = undefined
+</script>
+
+<BaseEdge path={''} {markerEnd} class="hidden" />
diff --git a/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte
index 0cacdbfc47..869fb8c00b 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte
@@ -1,21 +1,23 @@
 <script lang="ts">
 	import VirtualItem from '$lib/components/flows/map/VirtualItem.svelte'
-	import { Cross } from 'lucide-svelte'
 	import NodeWrapper from './NodeWrapper.svelte'
 	import type { GraphEventHandlers } from '../../graphBuilder'
 	import type { FlowModule } from '$lib/gen'
 	import { getStateColor } from '../../util'
 	import { getContext } from 'svelte'
 	import type { Writable } from 'svelte/store'
-	import { twMerge } from 'tailwind-merge'
-	import FlowCopilotButton from '$lib/components/flows/map/FlowCopilotButton.svelte'
+	import InsertModuleButton from '$lib/components/flows/map/InsertModuleButton.svelte'
 
 	export let data: {
-		insertable: boolean
-		eventHandlers: GraphEventHandlers
-		modules: FlowModule[]
-		disableAi: boolean
 		hasPreprocessor: boolean
+		insertable: boolean
+		modules: FlowModule[]
+		moving: string | undefined
+		eventHandlers: GraphEventHandlers
+		index: number
+		enableTrigger: boolean
+		disableAi: boolean
+		disableMoveIds: string[]
 	}
 
 	const { selectedId } = getContext<{
@@ -24,30 +26,31 @@
 </script>
 
 <NodeWrapper let:darkMode>
-	{#if data.insertable && !data.disableAi && !data.hasPreprocessor}
-		<FlowCopilotButton className="-top-[4.25rem]" />
-	{/if}
 	{#if data.insertable && !data.hasPreprocessor}
-		<div class="absolute -top-8 left-1/2 transform -translate-x-1/2 z-10">
-			<button
-				on:click={(e) => {
-					data.eventHandlers?.insert({
+		<div class="absolute bottom-full left-0 right-0 flex center-center mb-3.5">
+			<InsertModuleButton
+				disableAi={data.disableAi}
+				index={data.index ?? 0}
+				modules={data?.modules ?? []}
+				kind="preprocessor"
+				on:new={(e) => {
+					data?.eventHandlers.insert({
 						modules: data.modules,
+						index: data.index,
+						kind: e.detail.kind,
+						inlineScript: e.detail.inlineScript,
 						detail: 'preprocessor'
 					})
 				}}
-				title="Add preprocessor step"
-				id={`flow-editor-add-preprocessor`}
-				type="button"
-				class={twMerge(
-					'w-5 h-5 flex items-center justify-center',
-					'outline-[1px] outline dark:outline-gray-500 outline-gray-300',
-					'text-secondary',
-					'bg-surface focus:outline-none hover:bg-surface-hover   rounded '
-				)}
-			>
-				<Cross size={12} />
-			</button>
+				on:pickScript={(e) => {
+					data?.eventHandlers.insert({
+						modules: data.modules,
+						index: data.index,
+						script: e.detail,
+						detail: 'preprocessor'
+					})
+				}}
+			/>
 		</div>
 	{/if}
 	<VirtualItem
diff --git a/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte
index c733890161..91d6de5076 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte
@@ -56,12 +56,11 @@
 			  '/' +
 			  (state?.iteration_total ?? '?')
 			: ''}
-		bgColor={getStateColor(type, darkMode, true)}
+		bgColor={getStateColor(type, darkMode, true, state?.skipped)}
 		modules={data.modules ?? []}
 		moving={data.moving}
 		duration_ms={state?.duration_ms}
 		retries={data.retries}
-		disableAi={data.disableAi}
 		{flowJobs}
 		on:delete={(e) => {
 			data.eventHandlers.delete(e.detail, '')
diff --git a/frontend/src/lib/components/graph/renderers/nodes/NodeWrapper.svelte b/frontend/src/lib/components/graph/renderers/nodes/NodeWrapper.svelte
index 6bc6427a62..bbf920adc7 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/NodeWrapper.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/NodeWrapper.svelte
@@ -1,17 +1,19 @@
 <script lang="ts">
 	import DarkModeObserver from '$lib/components/DarkModeObserver.svelte'
 	import { Handle, Position } from '@xyflow/svelte'
+	import { twMerge } from 'tailwind-merge'
 
 	export let enableSourceHandle: boolean = true
 	export let enableTargetHandle: boolean = true
 	export let offset: number = 0
+	export let wrapperClass: string = ''
 
 	let darkMode: boolean = false
 </script>
 
 <DarkModeObserver bind:darkMode />
 
-<div class="relative shadow-md" style={`margin-left: ${offset}px;`}>
+<div class={twMerge('relative shadow-md', wrapperClass)} style={`margin-left: ${offset}px;`}>
 	<slot {darkMode} />
 </div>
 
diff --git a/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte
new file mode 100644
index 0000000000..868c2cc26d
--- /dev/null
+++ b/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte
@@ -0,0 +1,31 @@
+<script lang="ts">
+	import NodeWrapper from './NodeWrapper.svelte'
+	import TriggersWrapper from '../triggers/TriggersWrapper.svelte'
+	import { type GraphEventHandlers } from '../../graphBuilder'
+	import { getContext } from 'svelte'
+	import type { Writable } from 'svelte/store'
+
+	export let data: {
+		path: string
+		isEditor: boolean
+		newFlow: boolean
+		extra_perms: Record<string, any>
+		eventHandlers: GraphEventHandlers
+	}
+
+	const { selectedId } = getContext<{
+		selectedId: Writable<string | undefined>
+	}>('FlowGraphContext')
+</script>
+
+<NodeWrapper wrapperClass="shadow-none">
+	<TriggersWrapper
+		path={data.path}
+		on:select={() => {
+			data?.eventHandlers?.select('triggers')
+		}}
+		isFlow={true}
+		selected={$selectedId == 'triggers'}
+		newItem={data.newFlow}
+	/>
+</NodeWrapper>
diff --git a/frontend/src/lib/components/graph/renderers/nodes/branchOneEndNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/branchOneEndNode.svelte
index ab446c74d3..3f9622dbf0 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/branchOneEndNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/branchOneEndNode.svelte
@@ -16,7 +16,7 @@
 
 <NodeWrapper let:darkMode offset={data.offset}>
 	<VirtualItem
-		label={'Collect result from all branches'}
+		label={'Collect result from chosen branch'}
 		id={data.id}
 		selectable={true}
 		selected={false}
diff --git a/frontend/src/lib/components/graph/renderers/triggers/TriggerButton.svelte b/frontend/src/lib/components/graph/renderers/triggers/TriggerButton.svelte
new file mode 100644
index 0000000000..7f052670b2
--- /dev/null
+++ b/frontend/src/lib/components/graph/renderers/triggers/TriggerButton.svelte
@@ -0,0 +1,15 @@
+<script lang="ts">
+	import { twMerge } from 'tailwind-merge'
+
+	export let selected: boolean
+</script>
+
+<button
+	on:click
+	class={twMerge(
+		'hover:bg-surface-hover rounded-md border text-xs w-6 h-6 relative center-center cursor-pointer bg-surface',
+		selected ? 'outline-1 outline-tertiary outline' : 'outline-0'
+	)}
+>
+	<slot />
+</button>
diff --git a/frontend/src/lib/components/graph/renderers/triggers/TriggerCount.svelte b/frontend/src/lib/components/graph/renderers/triggers/TriggerCount.svelte
new file mode 100644
index 0000000000..c08cfcc056
--- /dev/null
+++ b/frontend/src/lib/components/graph/renderers/triggers/TriggerCount.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+	import { Loader2 } from 'lucide-svelte'
+
+	export let count: number | undefined = undefined
+</script>
+
+{#if count && count > 0}
+	<div class="absolute -right-2 -top-2">
+		<div
+			class="bg-surface-secondary font-bold border border-surface-border rounded-md h-4 w-4 p-1 flex center-center text-primary text-xs"
+		>
+			{#if count === undefined}
+				<Loader2 class="animate-spin text-2xs" />
+			{:else}
+				{count}
+			{/if}
+		</div>
+	</div>
+{/if}
diff --git a/frontend/src/lib/components/graph/renderers/triggers/TriggersBadge.svelte b/frontend/src/lib/components/graph/renderers/triggers/TriggersBadge.svelte
new file mode 100644
index 0000000000..ae4be3a994
--- /dev/null
+++ b/frontend/src/lib/components/graph/renderers/triggers/TriggersBadge.svelte
@@ -0,0 +1,122 @@
+<script lang="ts">
+	import { Calendar, Mail, Webhook, Unplug } from 'lucide-svelte'
+	import TriggerButton from './TriggerButton.svelte'
+
+	import Popover from '$lib/components/Popover.svelte'
+	import TriggerCount from './TriggerCount.svelte'
+	import { createEventDispatcher, onMount } from 'svelte'
+	import { Route } from 'lucide-svelte'
+	import { getContext } from 'svelte'
+	import { type TriggerContext } from '$lib/components/triggers'
+	import { FlowService, ScriptService } from '$lib/gen'
+	import { workspaceStore } from '$lib/stores'
+
+	const { selectedTrigger, triggersCount } = getContext<TriggerContext>('TriggerContext')
+
+	export let path: string
+	export let newItem: boolean
+	export let isFlow: boolean
+	export let selected: boolean
+	export let showOnlyWithCount: boolean
+	const dispatch = createEventDispatcher()
+
+	onMount(() => {
+		if (!newItem) {
+			loadCount()
+		}
+	})
+
+	async function loadCount() {
+		if (isFlow) {
+			$triggersCount = await FlowService.getTriggersCountOfFlow({
+				workspace: $workspaceStore!,
+				path
+			})
+		} else {
+			$triggersCount = await ScriptService.getTriggersCountOfScript({
+				workspace: $workspaceStore!,
+				path
+			})
+		}
+	}
+</script>
+
+{#if !showOnlyWithCount || ($triggersCount?.webhook_count ?? 0) > 0}
+	<Popover>
+		<svelte:fragment slot="text">Webhooks</svelte:fragment>
+		<TriggerButton
+			on:click={() => {
+				$selectedTrigger = 'webhooks'
+				dispatch('select')
+			}}
+			selected={selected && $selectedTrigger === 'webhooks'}
+		>
+			<TriggerCount count={$triggersCount?.webhook_count} />
+			<Webhook size={12} />
+		</TriggerButton>
+	</Popover>
+{/if}
+
+{#if !showOnlyWithCount || ($triggersCount?.schedule_count ?? 0) > 0}
+	<Popover>
+		<svelte:fragment slot="text">Schedules</svelte:fragment>
+		<TriggerButton
+			on:click={() => {
+				$selectedTrigger = 'schedules'
+				dispatch('select')
+			}}
+			selected={selected && $selectedTrigger === 'schedules'}
+		>
+			<TriggerCount count={$triggersCount?.schedule_count} />
+			<Calendar size={12} />
+		</TriggerButton>
+	</Popover>
+{/if}
+
+{#if !showOnlyWithCount || ($triggersCount?.http_routes_count ?? 0) > 0}
+	<Popover>
+		<svelte:fragment slot="text">HTTP Routes</svelte:fragment>
+		<TriggerButton
+			on:click={() => {
+				$selectedTrigger = 'routes'
+				dispatch('select')
+			}}
+			selected={selected && $selectedTrigger === 'routes'}
+		>
+			<TriggerCount count={$triggersCount?.http_routes_count} />
+			<Route size={12} />
+		</TriggerButton>
+	</Popover>
+{/if}
+
+{#if !showOnlyWithCount || ($triggersCount?.websocket_count ?? 0) > 0}
+	<Popover>
+		<svelte:fragment slot="text">Websockets</svelte:fragment>
+		<TriggerButton
+			on:click={() => {
+				$selectedTrigger = 'websockets'
+				dispatch('select')
+			}}
+			selected={selected && $selectedTrigger === 'websockets'}
+		>
+			<TriggerCount count={$triggersCount?.websocket_count} />
+			<Unplug size={12} />
+		</TriggerButton>
+	</Popover>
+{/if}
+
+{#if !showOnlyWithCount || ($triggersCount?.email_count ?? 0) > 0}
+	<Popover>
+		<svelte:fragment slot="text">Emails</svelte:fragment>
+		<TriggerButton
+			on:click={() => {
+				$selectedTrigger = 'emails'
+				dispatch('select')
+			}}
+			selected={selected && $selectedTrigger === 'emails'}
+		>
+			<TriggerCount count={$triggersCount?.email_count} />
+			<Mail size={12} />
+		</TriggerButton>
+	</Popover>
+{/if}
diff --git a/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte b/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte
new file mode 100644
index 0000000000..4f8bbc5f14
--- /dev/null
+++ b/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+	import { NODE } from '../../util'
+
+	import { createEventDispatcher } from 'svelte'
+
+	import TriggersBadge from './TriggersBadge.svelte'
+
+	export let path: string
+	export let newItem: boolean
+	export let isFlow: boolean
+	export let selected: boolean
+
+	const dispatch = createEventDispatcher()
+</script>
+
+<div style={`width: ${NODE.width}px;`}>
+	<div class="flex flex-row mx-auto w-min">
+		<button
+			class="flex flex-row gap-2 px-2 border p-1 rounded-md bg-surface shadow-md items-center {selected
+				? 'outline outline-offset-1 outline-1  outline-slate-900 dark:bg-white/5 dark:outline-slate-800/60 dark:border-gray-400'
+				: ''}"
+			on:click={() => {
+				dispatch('select')
+			}}
+		>
+			<div class="flex flex-col">
+				<div class="flex flex-row items-center text-2xs font-normal"> Triggers </div>
+			</div>
+			<TriggersBadge showOnlyWithCount={false} {path} {newItem} {isFlow} {selected} on:select />
+		</button>
+	</div>
+</div>
diff --git a/frontend/src/lib/components/graph/util.ts b/frontend/src/lib/components/graph/util.ts
index dc3b255bb3..fb2ac009a1 100644
--- a/frontend/src/lib/components/graph/util.ts
+++ b/frontend/src/lib/components/graph/util.ts
@@ -12,11 +12,16 @@ export const NODE = {
 export function getStateColor(
 	state: FlowStatusModule['type'] | undefined,
 	isDark: boolean,
-	nonVirtualItem?: boolean
+	nonVirtualItem?: boolean,
+	isSkipped?: boolean
 ): string {
 	switch (state) {
 		case 'Success':
-			return isDark ? '#059669' : 'rgb(193, 255, 216)'
+			if (isSkipped) {
+				return isDark ? '#1E3A8A' : 'rgb(191, 219, 254)'
+			} else {
+				return isDark ? '#059669' : 'rgb(193, 255, 216)'
+			}
 		case 'Failure':
 			return isDark ? '#dc2626' : 'rgb(248 113 113)'
 		case 'InProgress':
diff --git a/frontend/src/lib/components/home/ListFiltersQuick.svelte b/frontend/src/lib/components/home/ListFiltersQuick.svelte
new file mode 100644
index 0000000000..e300a832ac
--- /dev/null
+++ b/frontend/src/lib/components/home/ListFiltersQuick.svelte
@@ -0,0 +1,58 @@
+<script lang="ts">
+	import { Folder, User, Circle } from 'lucide-svelte'
+	import { APP_TO_ICON_COMPONENT } from '../icons'
+	import { twMerge } from 'tailwind-merge'
+	import { createEventDispatcher } from 'svelte'
+
+	export let filters: string[]
+	export let selectedFilter:
+		| { kind: 'owner' | 'integrations'; name: string | undefined }
+		| undefined = undefined
+	$: selectedAppFilter = selectedFilter?.kind === 'integrations' ? selectedFilter?.name : undefined
+
+	export let resourceType = false
+
+	function getIconComponent(name: string) {
+		return APP_TO_ICON_COMPONENT[name] || APP_TO_ICON_COMPONENT[name.split('_')[0]]
+	}
+
+	const dispatch = createEventDispatcher()
+</script>
+
+{#if Array.isArray(filters) && filters.length > 0}
+	{#each filters as filter (filter)}
+		<div>
+			<button
+				class={twMerge(
+					'w-full text-left py-2 px-3 hover:bg-surface-hover whitespace-nowrap flex flex-row gap-2 items-center rounded-md',
+					filter === selectedAppFilter ? 'bg-surface-hover' : ''
+				)}
+				on:click={() => {
+					selectedFilter =
+						selectedAppFilter == filter ? undefined : { kind: 'integrations', name: filter }
+					dispatch('selected')
+				}}
+			>
+				<div class="flex justify-center flex-row items-center gap-2">
+					{#if resourceType}
+						{@const icon = getIconComponent(filter)}
+						{#if icon}
+							<svelte:component this={icon} height="14px" width="14px" />
+						{:else}
+							<div
+								class="w-[14px] h-[14px] text-gray-400 flex flex-row items-center justify-center"
+							>
+								<Circle size="12" />
+							</div>
+						{/if}
+					{:else if filter.startsWith('u/')}
+						<User class="mr-0.5" size={14} />
+					{:else if filter.startsWith('f/')}
+						<Folder class="mr-0.5" size={14} />
+					{/if}
+					<span class="text-left text-2xs text-primary font-normal">{filter}</span>
+				</div>
+			</button>
+		</div>
+	{/each}
+{/if}
diff --git a/frontend/src/lib/components/icons/SpotifyIcon.svelte b/frontend/src/lib/components/icons/SpotifyIcon.svelte
new file mode 100644
index 0000000000..ce0da3d0d0
--- /dev/null
+++ b/frontend/src/lib/components/icons/SpotifyIcon.svelte
@@ -0,0 +1,9 @@
+<script lang="ts">
+	export let height = '24px'
+	export let width = '24px'
+</script>
+
+<svg {width} {height} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512">
+    <path fill="#1ed760" d="M248 8C111.1 8 0 119.1 0 256s111.1 248 248 248 248-111.1 248-248S384.9 8 248 8Z"/>
+    <path d="M406.6 231.1c-5.2 0-8.4-1.3-12.9-3.9-71.2-42.5-198.5-52.7-280.9-29.7-3.6 1-8.1 2.6-12.9 2.6-13.2 0-23.3-10.3-23.3-23.6 0-13.6 8.4-21.3 17.4-23.9 35.2-10.3 74.6-15.2 117.5-15.2 73 0 149.5 15.2 205.4 47.8 7.8 4.5 12.9 10.7 12.9 22.6 0 13.6-11 23.3-23.2 23.3zm-31 76.2c-5.2 0-8.7-2.3-12.3-4.2-62.5-37-155.7-51.9-238.6-29.4-4.8 1.3-7.4 2.6-11.9 2.6-10.7 0-19.4-8.7-19.4-19.4s5.2-17.8 15.5-20.7c27.8-7.8 56.2-13.6 97.8-13.6 64.9 0 127.6 16.1 177 45.5 8.1 4.8 11.3 11 11.3 19.7-.1 10.8-8.5 19.5-19.4 19.5zm-26.9 65.6c-4.2 0-6.8-1.3-10.7-3.6-62.4-37.6-135-39.2-206.7-24.5-3.9 1-9 2.6-11.9 2.6-9.7 0-15.8-7.7-15.8-15.8 0-10.3 6.1-15.2 13.6-16.8 81.9-18.1 165.6-16.5 237 26.2 6.1 3.9 9.7 7.4 9.7 16.5s-7.1 15.4-15.2 15.4z"/>
+</svg>
diff --git a/frontend/src/lib/components/icons/WindmillIcon.svelte b/frontend/src/lib/components/icons/WindmillIcon.svelte
index ea49d7cd6e..2aef2fd20b 100644
--- a/frontend/src/lib/components/icons/WindmillIcon.svelte
+++ b/frontend/src/lib/components/icons/WindmillIcon.svelte
@@ -1,114 +1,129 @@
 <script lang="ts">
+	import { customIcon } from './store'
+
 	export let height = '24px'
 	export let width = '24px'
 	export let white = false
 	export let spin: 'slow' | 'medium' | 'fast' | 'veryfast' | undefined = undefined
 </script>
 
-<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg
-	class={$$props.class}
-	class:animate-[spin_2s_linear_infinite]={spin === 'veryfast'}
-	class:animate-[spin_5s_linear_infinite]={spin === 'fast'}
-	class:animate-[spin_15s_linear_infinite]={spin === 'medium'}
-	class:animate-[spin_50s_linear_infinite]={spin === 'slow'}
-	version="1.1"
-	id="Calque_1"
-	xmlns="http://www.w3.org/2000/svg"
-	xmlns:xlink="http://www.w3.org/1999/xlink"
-	x="0px"
-	y="0px"
-	{width}
-	{height}
-	viewBox="0 0 256 256"
-	style="enable-background:new 0 0 256 256;"
-	xml:space="preserve"
->
-	<style type="text/css">
-		.st0 {
-			fill: #ffffff;
-		}
-		.st1 {
-			opacity: 0.4;
-			fill: #ffffff;
-		}
-		.st2 {
-			fill: #bcd4fc;
-		}
-		.st2-gray {
-			fill: #cccccc;
-		}
-		.st3 {
-			fill: #3b82f6;
-		}
-		.st4 {
-			fill: #b3b3b3;
-		}
-		.st5 {
-			fill: url(#SVGID_1_);
-		}
-		.st6 {
-			fill: url(#SVGID_00000021089067129159788970000008246765442136188072_);
-		}
-		.st7 {
-			fill: url(#SVGID_00000117639240116366130650000015074833605515028638_);
-		}
-		.st8 {
-			opacity: 0.4;
-			fill: url(#SVGID_00000101781798616409025840000016567063639337360777_);
-		}
-		.st9 {
-			opacity: 0.4;
-			fill: url(#SVGID_00000052086836598721292040000002033117744178971046_);
-		}
-		.st10 {
-			opacity: 0.4;
-			fill: url(#SVGID_00000159460939004760751800000002448009281983951536_);
-		}
-		.st11 {
-			opacity: 0.4;
-			fill: url(#SVGID_00000013177830667419993080000017721442101626521532_);
-		}
-		.st12 {
-			opacity: 0.4;
-			fill: url(#SVGID_00000152235521444854938490000006526001119318383285_);
-		}
-		.st13 {
-			opacity: 0.4;
-			fill: url(#SVGID_00000119823135212293698520000012774889010992664993_);
-		}
-	</style>
-	<g>
-		<polygon
-			class:st2={!white}
-			class:st2-gray={white}
-			points="134.78,14.22 114.31,48.21 101.33,69.75 158.22,69.75 177.97,36.95 191.67,14.22 	"
+{#if customIcon.white || customIcon.normal}
+	{#if white}
+		<img src={customIcon.white} alt="Windmill Custom icon" {width} {height} class={$$props.class} />
+	{:else}
+		<img
+			src={customIcon.normal}
+			alt="Windmill Custom icon"
+			{width}
+			{height}
+			class={$$props.class}
 		/>
-		<polygon
-			class:st3={!white}
-			class:st0={white}
-			points="227.55,69.75 186.61,69.75 101.33,69.75 129.78,119.02 158.16,119.02 228.61,119.02 256,119.02 	"
-		/>
-		<polygon
-			class:st3={!white}
-			class:st0={white}
-			points="136.93,132.47 116.46,167.93 73.82,241.78 130.71,241.78 144.9,217.2 180.13,156.18 193.82,132.46 	
+	{/if}
+{:else}
+	<svg
+		class={$$props.class}
+		class:animate-[spin_2s_linear_infinite]={spin === 'veryfast'}
+		class:animate-[spin_5s_linear_infinite]={spin === 'fast'}
+		class:animate-[spin_15s_linear_infinite]={spin === 'medium'}
+		class:animate-[spin_50s_linear_infinite]={spin === 'slow'}
+		version="1.1"
+		id="Calque_1"
+		xmlns="http://www.w3.org/2000/svg"
+		xmlns:xlink="http://www.w3.org/1999/xlink"
+		x="0px"
+		y="0px"
+		{width}
+		{height}
+		viewBox="0 0 256 256"
+		style="enable-background:new 0 0 256 256;"
+		xml:space="preserve"
+	>
+		<style type="text/css">
+			.st0 {
+				fill: #ffffff;
+			}
+			.st1 {
+				opacity: 0.4;
+				fill: #ffffff;
+			}
+			.st2 {
+				fill: #bcd4fc;
+			}
+			.st2-gray {
+				fill: #cccccc;
+			}
+			.st3 {
+				fill: #3b82f6;
+			}
+			.st4 {
+				fill: #b3b3b3;
+			}
+			.st5 {
+				fill: url(#SVGID_1_);
+			}
+			.st6 {
+				fill: url(#SVGID_00000021089067129159788970000008246765442136188072_);
+			}
+			.st7 {
+				fill: url(#SVGID_00000117639240116366130650000015074833605515028638_);
+			}
+			.st8 {
+				opacity: 0.4;
+				fill: url(#SVGID_00000101781798616409025840000016567063639337360777_);
+			}
+			.st9 {
+				opacity: 0.4;
+				fill: url(#SVGID_00000052086836598721292040000002033117744178971046_);
+			}
+			.st10 {
+				opacity: 0.4;
+				fill: url(#SVGID_00000159460939004760751800000002448009281983951536_);
+			}
+			.st11 {
+				opacity: 0.4;
+				fill: url(#SVGID_00000013177830667419993080000017721442101626521532_);
+			}
+			.st12 {
+				opacity: 0.4;
+				fill: url(#SVGID_00000152235521444854938490000006526001119318383285_);
+			}
+			.st13 {
+				opacity: 0.4;
+				fill: url(#SVGID_00000119823135212293698520000012774889010992664993_);
+			}
+		</style>
+		<g>
+			<polygon
+				class:st2={!white}
+				class:st2-gray={white}
+				points="134.78,14.22 114.31,48.21 101.33,69.75 158.22,69.75 177.97,36.95 191.67,14.22 	"
+			/>
+			<polygon
+				class:st3={!white}
+				class:st0={white}
+				points="227.55,69.75 186.61,69.75 101.33,69.75 129.78,119.02 158.16,119.02 228.61,119.02 256,119.02 	"
+			/>
+			<polygon
+				class:st3={!white}
+				class:st0={white}
+				points="136.93,132.47 116.46,167.93 73.82,241.78 130.71,241.78 144.9,217.2 180.13,156.18 193.82,132.46 	
 		"
-		/>
-		<polygon
-			class:st3={!white}
-			class:st0={white}
-			points="121.7,131.95 101.23,96.49 58.59,22.63 30.15,71.91 44.34,96.49 79.57,157.5 93.26,181.22 	"
-		/>
-		<polygon
-			class:st2={!white}
-			class:st2-gray={white}
-			points="64.81,131.95 25.15,131.21 0,130.74 28.44,180.01 66.73,180.72 93.26,181.21 	"
-		/>
-		<polygon
-			class:st2={!white}
-			class:st2-gray={white}
-			points="165.38,181.74 184.58,216.46 196.75,238.47 225.19,189.2 206.66,155.69 193.83,132.46 	"
-		/>
-	</g>
-</svg>
+			/>
+			<polygon
+				class:st3={!white}
+				class:st0={white}
+				points="121.7,131.95 101.23,96.49 58.59,22.63 30.15,71.91 44.34,96.49 79.57,157.5 93.26,181.22 	"
+			/>
+			<polygon
+				class:st2={!white}
+				class:st2-gray={white}
+				points="64.81,131.95 25.15,131.21 0,130.74 28.44,180.01 66.73,180.72 93.26,181.21 	"
+			/>
+			<polygon
+				class:st2={!white}
+				class:st2-gray={white}
+				points="165.38,181.74 184.58,216.46 196.75,238.47 225.19,189.2 206.66,155.69 193.83,132.46 	"
+			/>
+		</g>
+	</svg>
+{/if}
diff --git a/frontend/src/lib/components/icons/WindmillIcon2.svelte b/frontend/src/lib/components/icons/WindmillIcon2.svelte
new file mode 100644
index 0000000000..e274fbded0
--- /dev/null
+++ b/frontend/src/lib/components/icons/WindmillIcon2.svelte
@@ -0,0 +1,175 @@
+<script lang="ts">
+	import { customIcon } from './store'
+
+	export let white = false
+	export let size = '24px'
+	export let color: string | undefined = undefined
+	export let spin: 'slow' | 'medium' | 'fast' | 'veryfast' | undefined = undefined
+
+	function hslToHex(h, s, l) {
+		s /= 100
+		l /= 100
+
+		let c = (1 - Math.abs(2 * l - 1)) * s
+		let x = c * (1 - Math.abs(((h / 60) % 2) - 1))
+		let m = l - c / 2
+		let r = 0
+		let g = 0
+		let b = 0
+
+		if (0 <= h && h < 60) {
+			r = c
+			g = x
+			b = 0
+		} else if (60 <= h && h < 120) {
+			r = x
+			g = c
+			b = 0
+		} else if (120 <= h && h < 180) {
+			r = 0
+			g = c
+			b = x
+		} else if (180 <= h && h < 240) {
+			r = 0
+			g = x
+			b = c
+		} else if (240 <= h && h < 300) {
+			r = x
+			g = 0
+			b = c
+		} else if (300 <= h && h < 360) {
+			r = c
+			g = 0
+			b = x
+		}
+
+		let rs = Math.round((r + m) * 255)
+			.toString(16)
+			.padStart(2, '0')
+		let gs = Math.round((g + m) * 255)
+			.toString(16)
+			.padStart(2, '0')
+		let bs = Math.round((b + m) * 255)
+			.toString(16)
+			.padStart(2, '0')
+
+		return `#${rs}${gs}${bs}`
+	}
+
+	function hexToHsl(hex) {
+		let r: number = parseInt(hex.slice(1, 3), 16) / 255
+		let g: number = parseInt(hex.slice(3, 5), 16) / 255
+		let b: number = parseInt(hex.slice(5, 7), 16) / 255
+
+		const max = Math.max(r, g, b),
+			min = Math.min(r, g, b)
+		let h,
+			s,
+			l = (max + min) / 2
+
+		if (max === min) {
+			h = s = 0 // Achromatic
+		} else {
+			const d = max - min
+			s = l > 0.5 ? d / (2 - max - min) : d / (max + min)
+			switch (max) {
+				case r:
+					h = (g - b) / d + (g < b ? 6 : 0)
+					break
+				case g:
+					h = (b - r) / d + 2
+					break
+				case b:
+					h = (r - g) / d + 4
+					break
+			}
+			h /= 6
+		}
+
+		return [h * 360, s * 100, l * 100]
+	}
+
+	function reduceSaturation(hex: string, reductionPercent: number) {
+		// Convert HEX to HSL
+
+		// Convert the hex to HSL
+		let [h, s, l] = hexToHsl(hex)
+
+		// Reduce the saturation by the specified percentage
+		l = Math.max(0, l - reductionPercent)
+
+		// Convert back to hex
+		return hslToHex(h, s, l)
+	}
+
+	let lessSaturatedColor: string | undefined
+
+	$: color ? (lessSaturatedColor = reduceSaturation(color, -16)) : (lessSaturatedColor = undefined)
+</script>
+
+{#if customIcon.white || customIcon.normal}
+	{#if white}
+		<img
+			src={customIcon.white}
+			alt="Windmill Custom icon"
+			width={size}
+			height={size}
+			class={$$props.class}
+		/>
+	{:else}
+		<img
+			src={customIcon.normal}
+			alt="Windmill Custom icon"
+			width={size}
+			height={size}
+			class={$$props.class}
+		/>
+	{/if}
+{:else}
+	<svg
+		class={$$props.class}
+		class:animate-[spin_2s_linear_infinite]={spin === 'veryfast'}
+		class:animate-[spin_5s_linear_infinite]={spin === 'fast'}
+		class:animate-[spin_15s_linear_infinite]={spin === 'medium'}
+		class:animate-[spin_50s_linear_infinite]={spin === 'slow'}
+		version="1.1"
+		id="Calque_1"
+		xmlns="http://www.w3.org/2000/svg"
+		xmlns:xlink="http://www.w3.org/1999/xlink"
+		x="0px"
+		y="0px"
+		width={size}
+		height={size}
+		viewBox="0 0 256 256"
+		style="enable-background:new 0 0 256 256;"
+		xml:space="preserve"
+	>
+		<g>
+			<!-- Use color or fallback to defaults (white or blue) -->
+			<polygon
+				fill={lessSaturatedColor || (white ? '#cccccc' : '#bcd4fc')}
+				points="134.78,14.22 114.31,48.21 101.33,69.75 158.22,69.75 177.97,36.95 191.67,14.22"
+			/>
+			<polygon
+				fill={color || (white ? '#ffffff' : '#3b82f6')}
+				points="227.55,69.75 186.61,69.75 101.33,69.75 129.78,119.02 158.16,119.02 228.61,119.02 256,119.02"
+			/>
+			<polygon
+				fill={color || (white ? '#ffffff' : '#3b82f6')}
+				points="136.93,132.47 116.46,167.93 73.82,241.78 130.71,241.78 144.9,217.2 180.13,156.18 193.82,132.46"
+			/>
+			<polygon
+				fill={color || (white ? '#ffffff' : '#3b82f6')}
+				points="121.7,131.95 101.23,96.49 58.59,22.63 30.15,71.91 44.34,96.49 79.57,157.5 93.26,181.22"
+			/>
+			<polygon
+				fill={lessSaturatedColor || (white ? '#cccccc' : '#bcd4fc')}
+				points="64.81,131.95 25.15,131.21 0,130.74 28.44,180.01 66.73,180.72 93.26,181.21"
+			/>
+			<polygon
+				fill={lessSaturatedColor || (white ? '#cccccc' : '#bcd4fc')}
+				points="165.38,181.74 184.58,216.46 196.75,238.47 225.19,189.2 206.66,155.69 193.83,132.46"
+			/>
+		</g>
+	</svg>
+{/if}
diff --git a/frontend/src/lib/components/icons/index.ts b/frontend/src/lib/components/icons/index.ts
index 78ec4769d2..da7e21ea91 100644
--- a/frontend/src/lib/components/icons/index.ts
+++ b/frontend/src/lib/components/icons/index.ts
@@ -18,6 +18,7 @@ import S3Icon from './S3Icon.svelte'
 import Slack from './Slack.svelte'
 import TogglIcon from './TogglIcon.svelte'
 import WindmillIcon from './WindmillIcon.svelte'
+import WindmillIcon2 from './WindmillIcon2.svelte'
 import MailchimpIcon from './MailchimpIcon.svelte'
 import SendgridIcon from './SendgridIcon.svelte'
 import SendflakeIcon from './SendflakeIcon.svelte'
@@ -90,6 +91,7 @@ import VismaIcon from './VismaIcon.svelte'
 import JumpCloudIcon from './JumpCloudIcon.svelte'
 import KeycloakIcon from './KeycloakIcon.svelte'
 import ZitadelIcon from './ZitadelIcon.svelte'
+import SpotifyIcon from './SpotifyIcon.svelte'
 
 export const APP_TO_ICON_COMPONENT = {
 	postgresql: PostgresIcon,
@@ -187,7 +189,8 @@ export const APP_TO_ICON_COMPONENT = {
 	visma: VismaIcon,
 	jumpcloud: JumpCloudIcon,
 	keycloak: KeycloakIcon,
-	zitadel: ZitadelIcon
+	zitadel: ZitadelIcon,
+	spotify: SpotifyIcon
 } as const
 
 export {
@@ -211,6 +214,7 @@ export {
 	Slack,
 	TogglIcon,
 	WindmillIcon,
+	WindmillIcon2,
 	MailchimpIcon,
 	SendgridIcon,
 	LinkedinIcon,
diff --git a/frontend/src/lib/components/icons/store.ts b/frontend/src/lib/components/icons/store.ts
new file mode 100644
index 0000000000..960a49e7c8
--- /dev/null
+++ b/frontend/src/lib/components/icons/store.ts
@@ -0,0 +1 @@
+export let customIcon: { normal?: string; white?: string } = {}
diff --git a/frontend/src/lib/components/instanceSettings.ts b/frontend/src/lib/components/instanceSettings.ts
index 4bb35371dc..8e38dc3816 100644
--- a/frontend/src/lib/components/instanceSettings.ts
+++ b/frontend/src/lib/components/instanceSettings.ts
@@ -21,18 +21,26 @@ export interface Setting {
 		| 'slack_connect'
 		| 'smtp_connect'
 	storage: SettingStorage
+	advancedToggle?: {
+		label: string
+		onChange: (values: Record<string, any>) => Record<string, any>
+		checked: (values: Record<string, any>) => boolean
+	}
+	hiddenIfNull?: boolean
+	requiresReloadOnChange?: boolean
 	isValid?: (value: any) => boolean
 	error?: string
 	defaultValue?: () => any
 }
 
-export type SettingStorage = 'setting' 
+export type SettingStorage = 'setting'
 
 export const settings: Record<string, Setting[]> = {
 	Core: [
 		{
 			label: 'Base url',
-			description: 'Public base url of the instance. <a href="https://www.windmill.dev/docs/advanced/instance_settings#global-users">Learn more</a>',
+			description:
+				'Public base url of the instance. <a href="https://www.windmill.dev/docs/advanced/instance_settings#global-users">Learn more</a>',
 			key: 'base_url',
 			fieldType: 'text',
 			placeholder: 'https://windmill.com',
@@ -67,14 +75,16 @@ export const settings: Record<string, Setting[]> = {
 		{
 			label: 'Default timeout',
 			key: 'job_default_timeout',
-			description: 'Default timeout for individual jobs. <a href="https://www.windmill.dev/docs/core_concepts/jobs#retention-policy">Learn more</a>',
+			description:
+				'Default timeout for individual jobs. <a href="https://www.windmill.dev/docs/core_concepts/jobs#retention-policy">Learn more</a>',
 			fieldType: 'seconds',
 			storage: 'setting',
 			cloudonly: false
 		},
 		{
 			label: 'Max timeout for sync endpoints',
-			description: 'Maximum amount of time (measured in seconds) that a <a href="https://www.windmill.dev/docs/core_concepts/webhooks">sync endpoint</a> is allowed to run before it is forcibly stopped or timed out.',
+			description:
+				'Maximum amount of time (measured in seconds) that a <a href="https://www.windmill.dev/docs/core_concepts/webhooks">sync endpoint</a> is allowed to run before it is forcibly stopped or timed out.',
 			key: 'timeout_wait_result',
 			cloudonly: true,
 			fieldType: 'seconds',
@@ -83,7 +93,8 @@ export const settings: Record<string, Setting[]> = {
 		},
 		{
 			label: 'License key',
-			description: 'License key required to use the EE (switch image for windmill-ee). <a href="https://www.windmill.dev/docs/advanced/instance_settings#license-key">Learn more</a>',
+			description:
+				'License key required to use the EE (switch image for windmill-ee). <a href="https://www.windmill.dev/docs/advanced/instance_settings#license-key">Learn more</a>',
 			key: 'license_key',
 			fieldType: 'license_key',
 			placeholder: 'only needed to prepare upgrade to EE',
@@ -91,7 +102,8 @@ export const settings: Record<string, Setting[]> = {
 		},
 		{
 			label: 'Non-prod instance',
-			description: 'Whether we should consider the reported usage of this instance as non-prod. <a href="https://www.windmill.dev/docs/advanced/instance_settings#non-prod-instance">Learn more</a>',
+			description:
+				'Whether we should consider the reported usage of this instance as non-prod. <a href="https://www.windmill.dev/docs/advanced/instance_settings#non-prod-instance">Learn more</a>',
 			key: 'dev_instance',
 			fieldType: 'boolean',
 			storage: 'setting'
@@ -99,7 +111,8 @@ export const settings: Record<string, Setting[]> = {
 		{
 			label: 'Retention period in secs',
 			key: 'retention_period_secs',
-			description: 'How long to keep the jobs data in the database (max 30 days on CE). <a href="https://www.windmill.dev/docs/advanced/instance_settings#retention-period-in-secs">Learn more</a>',
+			description:
+				'How long to keep the jobs data in the database (max 30 days on CE). <a href="https://www.windmill.dev/docs/advanced/instance_settings#retention-period-in-secs">Learn more</a>',
 			fieldType: 'seconds',
 			placeholder: '30',
 			storage: 'setting',
@@ -108,7 +121,8 @@ export const settings: Record<string, Setting[]> = {
 		},
 		{
 			label: 'Expose metrics',
-			description: 'Expose Prometheus metrics for workers and servers on port 8001 at /metrics. <a href="https://www.windmill.dev/docs/advanced/instance_settings#expose-metrics">Learn more</a>',
+			description:
+				'Expose Prometheus metrics for workers and servers on port 8001 at /metrics. <a href="https://www.windmill.dev/docs/advanced/instance_settings#expose-metrics">Learn more</a>',
 			key: 'expose_metrics',
 			fieldType: 'boolean',
 			storage: 'setting',
@@ -116,7 +130,8 @@ export const settings: Record<string, Setting[]> = {
 		},
 		{
 			label: 'Instance object storage',
-			description: ' S3/Azure bucket to store large logs and global cache for Python and Go. <a href="https://www.windmill.dev/docs/core_concepts/object_storage_in_windmill#instance-object-storage">Learn more</a>',
+			description:
+				' S3/Azure bucket to store large logs and global cache for Python and Go. <a href="https://www.windmill.dev/docs/core_concepts/object_storage_in_windmill#instance-object-storage">Learn more</a>',
 			key: 'object_store_cache_config',
 			fieldType: 'object_store_config',
 			storage: 'setting',
@@ -124,7 +139,8 @@ export const settings: Record<string, Setting[]> = {
 		},
 		{
 			label: 'Critical alert channels',
-			description: 'Channels to send critical alerts to. SMTP must be configured for the email channel. A Slack workspace must be connected to the instance for the Slack channel. <a href="https://www.windmill.dev/docs/core_concepts/critical_alert_channels">Learn more</a>',
+			description:
+				'Channels to send critical alerts to. SMTP must be configured for the email channel. A Slack workspace must be connected to the instance for the Slack channel. <a href="https://www.windmill.dev/docs/core_concepts/critical_alert_channels">Learn more</a>',
 			key: 'critical_error_channels',
 			fieldType: 'critical_error_channels',
 			storage: 'setting',
@@ -132,7 +148,8 @@ export const settings: Record<string, Setting[]> = {
 		},
 		{
 			label: 'Azure OpenAI base path',
-			description: 'All Windmill AI features will run on the specified deployed model. Format: https://{your-resource-name}.openai.azure.com/openai/deployments/{deployment-id}. <a href="https://www.windmill.dev/docs/core_concepts/ai_generation#azure-openai-advanced-models">Learn more</a>',
+			description:
+				'All Windmill AI features will run on the specified deployed model. Format: https://{your-resource-name}.openai.azure.com/openai/deployments/{deployment-id}. <a href="https://www.windmill.dev/docs/core_concepts/ai_generation#azure-openai-advanced-models">Learn more</a>',
 			key: 'openai_azure_base_path',
 			fieldType: 'text',
 			storage: 'setting',
@@ -140,12 +157,38 @@ export const settings: Record<string, Setting[]> = {
 		},
 		{
 			label: 'Private Hub base url',
-			description: 'Base url of your private Hub instance, without trailing slash. <a href="https://www.windmill.dev/docs/core_concepts/private_hub">Learn more</a>',
+			description:
+				'Base URL of your private Hub instance, without trailing slash. <a href="https://www.windmill.dev/docs/core_concepts/private_hub">Learn more</a>',
 			placeholder: 'https://hub.company.com',
 			key: 'hub_base_url',
 			fieldType: 'text',
 			storage: 'setting',
-			ee_only: ''
+			ee_only: '',
+			advancedToggle: {
+				label: 'I have a different URL for Hub access from end-user browsers',
+				onChange(values) {
+					if (values['hub_accessible_url']) {
+						values['hub_accessible_url'] = null
+					} else {
+						values['hub_accessible_url'] = values['hub_base_url'] || 'https://hub.company.com'
+					}
+					return values
+				},
+				checked: (values) => values['hub_accessible_url'] != null
+			},
+			requiresReloadOnChange: true
+		},
+		{
+			label: 'Private Hub accessible url',
+			description:
+				'Base URL accessible from end-user browsers, without trailing slash. <a href="https://www.windmill.dev/docs/core_concepts/private_hub">Learn more</a>',
+			key: 'hub_accessible_url',
+			fieldType: 'text',
+			hiddenIfNull: true,
+
+			storage: 'setting',
+			ee_only: '',
+			requiresReloadOnChange: true
 		}
 	],
 	'SSO/OAuth': [],
@@ -189,12 +232,12 @@ export const settings: Record<string, Setting[]> = {
 		}
 	],
 	SMTP: [
-			{
-				label: 'SMTP',
-				key: 'smtp_settings',
-				fieldType: 'smtp_connect',
-				storage: 'setting',
-				ee_only: '',
+		{
+			label: 'SMTP',
+			key: 'smtp_settings',
+			fieldType: 'smtp_connect',
+			storage: 'setting',
+			ee_only: ''
 		}
 	],
 	Slack: [
diff --git a/frontend/src/lib/components/job_args.ts b/frontend/src/lib/components/job_args.ts
new file mode 100644
index 0000000000..ef3377081f
--- /dev/null
+++ b/frontend/src/lib/components/job_args.ts
@@ -0,0 +1,9 @@
+import { deepEqual } from 'fast-equals'
+
+export function isWindmillTooBigObject(obj: any): boolean {
+	return (
+		typeof obj === 'object' &&
+		deepEqual(Object.keys(obj), ['reason']) &&
+		obj['reason'] == 'WINDMILL_TOO_BIG'
+	)
+}
diff --git a/frontend/src/lib/components/multiselect/MultiSelectWrapper.svelte b/frontend/src/lib/components/multiselect/MultiSelectWrapper.svelte
index cd9c844464..d4c6e6e87c 100644
--- a/frontend/src/lib/components/multiselect/MultiSelectWrapper.svelte
+++ b/frontend/src/lib/components/multiselect/MultiSelectWrapper.svelte
@@ -80,7 +80,7 @@
 				</div>
 			</MultiSelect>
 		</div>
-		<Portal>
+		<Portal name="multi-select">
 			<div use:floatingContent class="z5000" hidden={!open}>
 				<!-- svelte-ignore a11y-click-events-have-key-events -->
 				<!-- svelte-ignore a11y-no-static-element-interactions -->
diff --git a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
index e99f106d3c..b0ed460636 100644
--- a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
+++ b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
@@ -63,7 +63,7 @@
 	$: fullyCollapsed = keys.length > 1 && collapsed
 </script>
 
-<Portal>
+<Portal name="object-viewer">
 	<S3FilePicker bind:this={s3FileViewer} readOnlyMode={true} />
 </Portal>
 
diff --git a/frontend/src/lib/components/runs/RunRow.svelte b/frontend/src/lib/components/runs/RunRow.svelte
index a45d41f59a..f79b1b7307 100644
--- a/frontend/src/lib/components/runs/RunRow.svelte
+++ b/frontend/src/lib/components/runs/RunRow.svelte
@@ -2,7 +2,7 @@
 	import { base } from '$lib/base'
 	import { goto } from '$lib/navigation'
 	import type { Job } from '$lib/gen'
-	import { displayDate, msToReadableTime, truncateHash, truncateRev } from '$lib/utils'
+	import { displayDate, msToReadableTime, truncateHash, truncateRev, isJobCancelable } from '$lib/utils'
 	import { Badge, Button } from '../common'
 	import ScheduleEditor from '../ScheduleEditor.svelte'
 	import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
@@ -39,12 +39,9 @@
 
 	$: isExternal = job && job.id === '-'
 
-	function isJobCancelable(j: Job): boolean {
-		return j.type === 'QueuedJob' && !j.schedule_path
-	}
 </script>
 
-<Portal>
+<Portal name="run-row">
 	<ScheduleEditor on:update={() => goto('/schedules')} bind:this={scheduleEditor} />
 </Portal>
 <!-- svelte-ignore a11y-click-events-have-key-events -->
@@ -94,6 +91,10 @@
 			<Badge color="blue" baseClass="!px-1.5">
 				<Calendar size={14} />
 			</Badge>
+		{:else if job.canceled}
+			<Badge color="red" baseClass="!px-1.5">
+				<Hourglass size={14} />
+			</Badge>
 		{:else}
 			<Badge baseClass="!px-1.5">
 				<Hourglass size={14} />
@@ -105,7 +106,7 @@
 		<div class="flex flex-row items-center gap-1 text-gray-500 dark:text-gray-300 text-2xs">
 			{#if job}
 				{#if 'started_at' in job && job.started_at}
-					Started <TimeAgo withDate agoOnlyIfRecent date={job.started_at ?? ''} />
+					Started <TimeAgo agoOnlyIfRecent date={job.started_at ?? ''} />
 					{#if job && 'duration_ms' in job && job.duration_ms != undefined}
 						(Ran in {msToReadableTime(
 							job.duration_ms
@@ -120,12 +121,11 @@
 					{/if}
 				{:else if `scheduled_for` in job && job.scheduled_for && forLater(job.scheduled_for)}
 					Scheduled for {displayDate(job.scheduled_for)}
+				{:else if job.canceled}
+					Cancelling job... (created <TimeAgo agoOnlyIfRecent date={job.created_at || ''} />)
+
 				{:else}
-					Waiting for executor (created <TimeAgo
-						withDate
-						agoOnlyIfRecent
-						date={job.created_at || ''}
-					/>)
+					Waiting for executor (created <TimeAgo agoOnlyIfRecent date={job.created_at || ''} />)
 				{/if}
 			{/if}
 		</div>
diff --git a/frontend/src/lib/components/runs/RunsTable.svelte b/frontend/src/lib/components/runs/RunsTable.svelte
index e98e00d967..340eaeba9b 100644
--- a/frontend/src/lib/components/runs/RunsTable.svelte
+++ b/frontend/src/lib/components/runs/RunsTable.svelte
@@ -8,6 +8,7 @@
 	import Popover from '../Popover.svelte'
 	import { workspaceStore } from '$lib/stores'
 	import { twMerge } from 'tailwind-merge'
+	import { isJobCancelable } from '$lib/utils'
 	//import InfiniteLoading from 'svelte-infinite-loading'
 
 	export let jobs: Job[] | undefined = undefined
@@ -138,9 +139,6 @@
 		}
 	}
 	*/
-	function isJobCancelable(j: Job): boolean {
-		return j.type === 'QueuedJob' && !j.schedule_path
-	}
 
 	let allSelected: boolean = false
 
@@ -174,6 +172,19 @@
 		computeHeight()
 	})
 	const dispatch = createEventDispatcher()
+
+	let scrollToIndex = 0
+
+	export function scrollToRun(ids: string[]) {
+		if (flatJobs && ids.length > 0) {
+			const i = flatJobs.findIndex(
+				(jobOrDate) => jobOrDate.type === 'job' && jobOrDate.job.id === ids[0]
+			)
+			if (i !== -1) {
+				scrollToIndex = i
+			}
+		}
+	}
 </script>
 
 <svelte:window on:resize={() => computeHeight()} />
@@ -248,6 +259,9 @@
 			itemSize={42}
 			overscanCount={20}
 			{stickyIndices}
+			{scrollToIndex}
+			scrollToAlignment="center"
+			scrollToBehaviour="smooth"
 		>
 			<div slot="item" let:index let:style {style} class="w-full">
 				{#if flatJobs}
diff --git a/frontend/src/lib/components/schema/FlowPropertyEditor.svelte b/frontend/src/lib/components/schema/FlowPropertyEditor.svelte
index b20e6e335f..c983a2de7c 100644
--- a/frontend/src/lib/components/schema/FlowPropertyEditor.svelte
+++ b/frontend/src/lib/components/schema/FlowPropertyEditor.svelte
@@ -26,11 +26,11 @@
 	export let oneOf: SchemaProperty[] | undefined = undefined
 	export let required = false
 	export let pattern: undefined | string = undefined
-	export let password = false
+	export let password: undefined | boolean = undefined
 	export let variableEditor: VariableEditor | undefined = undefined
 	export let itemPicker: ItemPicker | undefined = undefined
-	export let nullable: boolean = false
-	export let disabled: boolean = false
+	export let nullable: boolean | undefined = undefined
+	export let disabled: boolean | undefined = undefined
 	export let defaultValue: any = undefined
 	export let propsNames: any = []
 	export let showExpr: string | undefined = undefined
@@ -44,9 +44,9 @@
 				multiselect?: string[]
 		  }
 		| undefined = undefined
-	export let properties: Record<string, any> = {}
-	export let order: string[] = []
-	export let requiredProperty: string[] = []
+	export let properties: Record<string, any> | undefined = undefined
+	export let order: string[] | undefined = undefined
+	export let requiredProperty: string[] | undefined = undefined
 	export let displayWebhookWarning: boolean = true
 	export let lightweightMode: boolean = false
 
@@ -126,7 +126,7 @@
 				return {
 					...v,
 					properties: {
-						...v.properties,
+						...(v.properties ?? {}),
 						label: {
 							type: 'string',
 							enum: [v.title ?? '']
@@ -341,6 +341,7 @@
 				/>
 			{:else}
 				<ArgInput
+					noDefaultOnSelectFirst
 					{itemPicker}
 					resourceTypes={getResourceTypesFromFormat(format)}
 					bind:value={defaultValue}
@@ -385,7 +386,14 @@
 				}}
 				lightMode
 				size="xs"
-				bind:checked={nullable}
+				checked={nullable}
+				on:change={(event) => {
+					if (event?.detail) {
+						nullable = true
+					} else {
+						nullable = undefined
+					}
+				}}
 				disabled={required}
 			/>
 		{/if}
@@ -396,7 +404,14 @@
 			}}
 			lightMode
 			size="xs"
-			bind:checked={disabled}
+			checked={disabled}
+			on:change={(event) => {
+				if (event?.detail) {
+					disabled = true
+				} else {
+					disabled = undefined
+				}
+			}}
 		/>
 	</div>
 
diff --git a/frontend/src/lib/components/search/GlobalSearchModal.svelte b/frontend/src/lib/components/search/GlobalSearchModal.svelte
index ffd030edcb..c1e74e9074 100644
--- a/frontend/src/lib/components/search/GlobalSearchModal.svelte
+++ b/frontend/src/lib/components/search/GlobalSearchModal.svelte
@@ -180,7 +180,9 @@
 	let debounceTimeout: any = undefined
 	const debouncePeriod: number = 1000
 	let loadingCompletedRuns: boolean = false
+
 	let queryParseErrors: string[] = []
+	let indexMetadata: any = {}
 
 	async function handleSearch() {
 		queryParseErrors = []
@@ -240,6 +242,7 @@
 					})
 					itemMap['runs'] = searchResults.hits
 					queryParseErrors = searchResults.query_parse_errors
+					indexMetadata = searchResults.index_metadata
 				} catch (e) {
 					sendUserToast(e, true)
 				}
@@ -499,7 +502,7 @@
 </script>
 
 {#if open}
-	<Portal>
+	<Portal name="global-search">
 		<div
 			class={twMerge(
 				`fixed top-0 bottom-0 left-0 right-0 transition-all duration-50 flex items-start justify-center`,
@@ -680,8 +683,33 @@
 								{#if selectedItem === undefined}
 									Select a result to preview
 								{:else}
-									<div class="w-8/12 overflow-y-scroll max-h-[70vh]">
-										<JobPreview id={selectedItem?.document?.id[0]} workspace={selectedWorkspace} />
+									<div class="w-8/12 max-h-[70vh]">
+										<div class="h-[95%] overflow-y-scroll">
+											<JobPreview
+												id={selectedItem?.document?.id[0]}
+												workspace={selectedWorkspace}
+											/>
+										</div>
+										<div class="flex flex-row pt-3 pl-4 items-center text-xs text-secondary">
+											{#if indexMetadata.indexed_until}
+												<span class="px-2">
+												Most recent indexed job was created <TimeAgo
+													agoOnlyIfRecent
+													date={indexMetadata.indexed_until || ''}
+												/>
+												</span>
+											{/if}
+											{#if indexMetadata.lost_lock_ownership}
+												<Popover notClickable placement="top">
+													<AlertTriangle size={16} class="text-gray-500" />
+													<svelte:fragment slot="text">
+														The current indexer is no longer indexing new jobs. This is most likely
+														because of an ongoing deployment and indexing will resume once it's
+														complete.
+													</svelte:fragment>
+												</Popover>
+											{/if}
+										</div>
 									</div>
 								{/if}
 							{:else}
diff --git a/frontend/src/lib/components/settings/WorkspaceUserSettings.svelte b/frontend/src/lib/components/settings/WorkspaceUserSettings.svelte
index 0ee008b11b..43aa4af06c 100644
--- a/frontend/src/lib/components/settings/WorkspaceUserSettings.svelte
+++ b/frontend/src/lib/components/settings/WorkspaceUserSettings.svelte
@@ -98,7 +98,9 @@
 	async function removeAllInvitesFromDomain() {
 		await Promise.all(
 			invites
-				.filter((x) => (isCloudHosted() ? x.email.endsWith('@' + auto_invite_domain ?? '') : true))
+				.filter((x) =>
+					isCloudHosted() ? x.email.endsWith('@' + (auto_invite_domain ?? '')) : true
+				)
 				.map(({ email, is_admin, operator }) =>
 					WorkspaceService.deleteInvite({
 						workspace: $workspaceStore ?? '',
@@ -137,9 +139,11 @@
 		</div>
 	</div>
 </div>
-<div class="flex flex-row justify-between items-center">
+<div class="flex flex-row justify-between items-center pt-2">
 	<PageHeader
-		title="Members ({filteredUsers?.length ?? users?.length ?? ''})"
+		title="Members {(filteredUsers?.length ?? users?.length) != undefined
+			? `(${filteredUsers?.length ?? users?.length})`
+			: ''}"
 		primary={true}
 		tooltip="Manage users manually or enable SSO authentication."
 		documentationLink="https://www.windmill.dev/docs/core_concepts/authentification"
diff --git a/frontend/src/lib/components/sidebar/MenuLink.svelte b/frontend/src/lib/components/sidebar/MenuLink.svelte
index eba95b1313..0c6d1cd2dc 100644
--- a/frontend/src/lib/components/sidebar/MenuLink.svelte
+++ b/frontend/src/lib/components/sidebar/MenuLink.svelte
@@ -17,7 +17,7 @@
 		if (href === `${base}/`) {
 			isSelected = $page.url.pathname === href
 		} else {
-			isSelected = $page.url.pathname.includes(href)
+			isSelected = $page.url.pathname.startsWith(href)
 		}
 	})
 </script>
diff --git a/frontend/src/lib/components/sidebar/SidebarContent.svelte b/frontend/src/lib/components/sidebar/SidebarContent.svelte
index 3b59a5d636..833272f6be 100644
--- a/frontend/src/lib/components/sidebar/SidebarContent.svelte
+++ b/frontend/src/lib/components/sidebar/SidebarContent.svelte
@@ -21,7 +21,8 @@
 		ServerCog,
 		Settings,
 		UserCog,
-		Plus
+		Plus,
+		Unplug
 	} from 'lucide-svelte'
 	import Menu from '../common/menu/MenuV2.svelte'
 	import MenuButton from './MenuButton.svelte'
@@ -77,6 +78,13 @@
 			icon: Route,
 			disabled: $userStore?.operator,
 			kind: 'http'
+		},
+		{
+			label: 'Websockets',
+			href: '/websocket_triggers',
+			icon: Unplug,
+			disabled: $userStore?.operator,
+			kind: 'ws'
 		}
 	]
 
diff --git a/frontend/src/lib/components/toast.ts b/frontend/src/lib/components/toast.ts
new file mode 100644
index 0000000000..8c1afb1a31
--- /dev/null
+++ b/frontend/src/lib/components/toast.ts
@@ -0,0 +1,8 @@
+//regex that match path starting with u/ or f/ and with at least 2 /
+const pathRegex = /\b(u|f)\/[^\/\s]+\/[^\/\s]+\b/g
+
+export function processMessage(message: string): string {
+	return message.replaceAll(pathRegex, (path) => {
+		return `<span class="bg-surface-secondary p-1 text-xs font-mono whitespace-nowrap rounded-md">${path}</span>`
+	})
+}
diff --git a/frontend/src/lib/components/triggers.ts b/frontend/src/lib/components/triggers.ts
new file mode 100644
index 0000000000..a7a7735160
--- /dev/null
+++ b/frontend/src/lib/components/triggers.ts
@@ -0,0 +1,16 @@
+import type { TriggersCount } from '$lib/gen'
+import type { Writable } from 'svelte/store'
+
+export type ScheduleTrigger = {
+	summary: string | undefined
+	args: Record<string, any>
+	cron: string
+	timezone: string
+	enabled: boolean
+}
+
+export type TriggerContext = {
+	selectedTrigger: Writable<'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets'>
+	primarySchedule: Writable<ScheduleTrigger | undefined | false>
+	triggersCount: Writable<TriggersCount | undefined>
+}
diff --git a/frontend/src/lib/components/triggers/RouteEditor.svelte b/frontend/src/lib/components/triggers/RouteEditor.svelte
index fc56f5303b..0b670423ef 100644
--- a/frontend/src/lib/components/triggers/RouteEditor.svelte
+++ b/frontend/src/lib/components/triggers/RouteEditor.svelte
@@ -15,6 +15,10 @@
 		drawer?.openNew(is_flow, initial_script_path)
 	}
 
+	export async function getTriggers() {
+		return drawer?.getTriggers()
+	}
+
 	let drawer: RouteEditorInner
 </script>
 
diff --git a/frontend/src/lib/components/triggers/RouteEditorInner.svelte b/frontend/src/lib/components/triggers/RouteEditorInner.svelte
index 2fa7998295..5cf683515b 100644
--- a/frontend/src/lib/components/triggers/RouteEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/RouteEditorInner.svelte
@@ -28,6 +28,7 @@
 
 	let script_path = ''
 	let initialScriptPath = ''
+	let fixedScriptPath = ''
 
 	let drawerLoading = true
 	export async function openEdit(ePath: string, isFlow: boolean) {
@@ -38,6 +39,7 @@
 			itemKind = isFlow ? 'flow' : 'script'
 			edit = true
 			dirtyPath = false
+			dirtyRoutePath = false
 			await loadTrigger()
 		} catch (err) {
 			sendUserToast(`Could not load route: ${err}`, true)
@@ -46,7 +48,7 @@
 		}
 	}
 
-	export async function openNew(nis_flow: boolean, initial_script_path?: string) {
+	export async function openNew(nis_flow: boolean, fixedScriptPath_?: string) {
 		drawerLoading = true
 		try {
 			drawer?.openDrawer()
@@ -57,9 +59,11 @@
 			requires_auth = false
 			initialRoutePath = ''
 			route_path = ''
+			dirtyRoutePath = false
 			http_method = 'post'
-			initialScriptPath = initial_script_path ?? ''
-			script_path = initialScriptPath
+			initialScriptPath = ''
+			fixedScriptPath = fixedScriptPath_ ?? ''
+			script_path = fixedScriptPath
 			path = ''
 			initialPath = ''
 			dirtyPath = false
@@ -71,6 +75,7 @@
 	let path: string = ''
 	let pathError = ''
 	let routeError = ''
+	let dirtyRoutePath = false
 	let is_async = false
 	let requires_auth = false
 	let initialRoutePath = ''
@@ -237,6 +242,9 @@
 								class={routeError === ''
 									? ''
 									: 'border border-red-700 bg-red-100 border-opacity-30 focus:border-red-700 focus:border-opacity-30 focus-visible:ring-red-700 focus-visible:ring-opacity-25 focus-visible:border-red-700'}
+								on:input={() => {
+									dirtyRoutePath = true
+								}}
 							/>
 						</label>
 
@@ -270,7 +278,10 @@
 									}}
 								/>
 							</div>
-							<div class="text-red-600 dark:text-red-400 text-2xs">{routeError}</div>
+
+							<div class="text-red-600 dark:text-red-400 text-2xs mt-1.5"
+								>{dirtyRoutePath ? routeError : ''}</div
+							>
 						</div>
 					</div>
 				</Section>
@@ -282,8 +293,8 @@
 					</p>
 					<div class="flex flex-row mb-2">
 						<ScriptPicker
-							disabled={!can_write}
-							initialPath={initialScriptPath}
+							disabled={fixedScriptPath != '' || !can_write}
+							initialPath={fixedScriptPath || initialScriptPath}
 							kinds={['script']}
 							allowFlow={true}
 							bind:itemKind
diff --git a/frontend/src/lib/components/triggers/RoutesPanel.svelte b/frontend/src/lib/components/triggers/RoutesPanel.svelte
index 8b14800673..12feac5bd8 100644
--- a/frontend/src/lib/components/triggers/RoutesPanel.svelte
+++ b/frontend/src/lib/components/triggers/RoutesPanel.svelte
@@ -7,18 +7,24 @@
 	import Skeleton from '../common/skeleton/Skeleton.svelte'
 	import RouteEditor from './RouteEditor.svelte'
 	import { canWrite } from '$lib/utils'
+	import Alert from '../common/alert/Alert.svelte'
+	import type { TriggerContext } from '../triggers'
+	import { getContext } from 'svelte'
 
 	export let isFlow: boolean
 	export let path: string
+	export let newItem: boolean = false
 
 	let routeEditor: RouteEditor
 
-	let triggers: (HttpTrigger & { canWrite: boolean })[] | undefined = undefined
-
 	$: path && loadTriggers()
-	async function loadTriggers() {
+
+	const { triggersCount } = getContext<TriggerContext>('TriggerContext')
+
+	let httpTriggers: (HttpTrigger & { canWrite: boolean })[] | undefined = undefined
+	export async function loadTriggers() {
 		try {
-			triggers = (
+			httpTriggers = (
 				await HttpTriggerService.listHttpTriggers({
 					workspace: $workspaceStore ?? '',
 					path,
@@ -27,8 +33,9 @@
 			).map((x) => {
 				return { canWrite: canWrite(x.path, x.extra_perms!, $userStore), ...x }
 			})
+			$triggersCount = { ...($triggersCount ?? {}), http_routes_count: httpTriggers?.length }
 		} catch (e) {
-			console.error('impossible to load http routes')
+			console.error('impossible to load http routes', e)
 		}
 	}
 </script>
@@ -40,42 +47,57 @@
 	bind:this={routeEditor}
 />
 
-<div class="p-2 flex flex-col">
-	{#if $userStore?.is_admin || $userStore?.is_super_admin}
-		<Button
-			on:click={() => routeEditor?.openNew(isFlow, path)}
-			variant="border"
-			color="light"
-			size="xs"
-			startIcon={{ icon: RouteIcon }}
-		>
-			New Route
-		</Button>
+<div class="flex flex-col gap-4">
+	{#if !newItem}
+		{#if $userStore?.is_admin || $userStore?.is_super_admin}
+			<Button
+				on:click={() => routeEditor?.openNew(isFlow, path)}
+				variant="border"
+				color="light"
+				size="xs"
+				startIcon={{ icon: RouteIcon }}
+			>
+				New Route
+			</Button>
+		{:else}
+			<Alert title="Only workspace admins can create routes" type="warning" size="xs" />
+		{/if}
+	{/if}
+
+	{#if httpTriggers}
+		{#if httpTriggers.length == 0}
+			<div class="text-xs text-secondary"> No http routes </div>
+		{:else}
+			<div class="flex flex-col divide-y pt-2">
+				{#each httpTriggers as httpTriggers (httpTriggers.path)}
+					<div class="grid grid-cols-5 text-2xs items-center py-2">
+						<div class="col-span-2 truncate">{httpTriggers.path}</div>
+						<div class="col-span-2 truncate">
+							{httpTriggers.http_method.toUpperCase()} /{httpTriggers.route_path}
+						</div>
+						<div class="flex justify-end">
+							<button
+								on:click={() => routeEditor?.openEdit(httpTriggers.path, isFlow)}
+								class="px-2"
+							>
+								{#if httpTriggers.canWrite}
+									Edit
+								{:else}
+									View
+								{/if}
+							</button>
+						</div>
+					</div>
+				{/each}
+			</div>
+		{/if}
+	{:else}
+		<Skeleton layout={[[8]]} />
+	{/if}
+
+	{#if newItem}
+		<Alert title="Triggers disabled" type="warning" size="xs">
+			Deploy the {isFlow ? 'flow' : 'script'} to add http routes.
+		</Alert>
 	{/if}
 </div>
-
-{#if triggers}
-	{#if triggers.length == 0}
-		<div class="text-xs text-secondary px-2"> No http routes </div>
-	{:else}
-		<div class="flex flex-col divide-y px-2 pt-2">
-			{#each triggers as trigger (trigger.path)}
-				<div class="grid grid-cols-5 text-2xs items-center py-2">
-					<div class="col-span-2 truncate">{trigger.path}</div>
-					<div class="col-span-2 truncate">
-						{trigger.http_method.toUpperCase()} /{trigger.route_path}
-					</div>
-					<button on:click={() => routeEditor?.openEdit(trigger.path, isFlow)}>
-						{#if trigger.canWrite}
-							Edit
-						{:else}
-							View
-						{/if}
-					</button>
-				</div>
-			{/each}
-		</div>
-	{/if}
-{:else}
-	<Skeleton layout={[[8]]} />
-{/if}
diff --git a/frontend/src/lib/components/triggers/TriggerTokens.svelte b/frontend/src/lib/components/triggers/TriggerTokens.svelte
new file mode 100644
index 0000000000..e07d33532d
--- /dev/null
+++ b/frontend/src/lib/components/triggers/TriggerTokens.svelte
@@ -0,0 +1,79 @@
+<script lang="ts">
+	import { FlowService, ScriptService, UserService, type TruncatedToken } from '$lib/gen'
+	import { userStore, workspaceStore } from '$lib/stores'
+	import { getContext } from 'svelte'
+	import { Skeleton } from '../common'
+	import Label from '../Label.svelte'
+	import type { TriggerContext } from '../triggers'
+	import { capitalize } from '$lib/utils'
+
+	export let isFlow: boolean
+	export let path: string
+	export let labelPrefix: 'email' | 'webhook'
+
+	const { triggersCount } = getContext<TriggerContext>('TriggerContext')
+
+	let tokens: TruncatedToken[] | undefined = undefined
+
+	export async function listTokens() {
+		tokens = (
+			isFlow
+				? await FlowService.listTokensOfFlow({ workspace: $workspaceStore!, path })
+				: await ScriptService.listTokensOfScript({ workspace: $workspaceStore!, path })
+		).filter((x) => x.label && x.label.startsWith(labelPrefix + '-'))
+		if (labelPrefix == 'email') {
+			$triggersCount = { ...($triggersCount ?? {}), email_count: tokens?.length }
+		} else {
+			$triggersCount = { ...($triggersCount ?? {}), webhook_count: tokens?.length }
+		}
+	}
+
+	async function deleteToken(tokenPrefix: string) {
+		await UserService.deleteToken({
+			tokenPrefix: tokenPrefix
+		})
+		await listTokens()
+	}
+
+	$: $workspaceStore && listTokens()
+</script>
+
+<div class="flex flex-col gap-2">
+	<Label label="Existing {capitalize(labelPrefix)} Tokens">
+		{#if tokens}
+			{#if tokens.length == 0}
+				<div class="text-xs text-secondary">No {labelPrefix} specific tokens found</div>
+			{:else}
+				<div class="flex flex-col divide-y pt-2">
+					<div class="grid grid-cols-6 text-2xs items-center py-2">
+						<div class="col-span-2 truncate font-semibold">Prefix</div>
+						<div class="col-span-2 truncate font-semibold">Label</div>
+						<div class="col-span-1 truncate font-semibold">Owner</div>
+						<div class="col-span-1" />
+					</div>
+					{#each tokens as token (token.token_prefix)}
+						<div class="grid grid-cols-6 text-2xs items-center py-2">
+							<div class="col-span-2 truncate">{token.token_prefix}***</div>
+							<div class="col-span-2 truncate">
+								{token.label}
+							</div>
+							<div class="col-span-1 truncate">
+								{token.email}
+							</div>
+							{#if token.email == $userStore?.email}
+								<button
+									on:click={() => deleteToken(token.token_prefix)}
+									class="text-xs text-secondary">delete</button
+								>
+							{:else}
+								<div class="col-span-1" />
+							{/if}
+						</div>
+					{/each}
+				</div>
+			{/if}
+		{:else}
+			<Skeleton layout={[[8]]} />
+		{/if}
+	</Label>
+</div>
diff --git a/frontend/src/lib/components/triggers/TriggersEditor.svelte b/frontend/src/lib/components/triggers/TriggersEditor.svelte
new file mode 100644
index 0000000000..e442624ed8
--- /dev/null
+++ b/frontend/src/lib/components/triggers/TriggersEditor.svelte
@@ -0,0 +1,85 @@
+<script lang="ts">
+	import Tab from '$lib/components/common/tabs/Tab.svelte'
+	import { Tabs } from '$lib/components/common'
+	import WebhooksPanel from '$lib/components/triggers/WebhooksPanel.svelte'
+	import EmailTriggerPanel from '$lib/components/details/EmailTriggerPanel.svelte'
+	import RoutesPanel from '$lib/components/triggers/RoutesPanel.svelte'
+	import RunPageSchedules from '$lib/components/RunPageSchedules.svelte'
+	import { canWrite } from '$lib/utils'
+	import { userStore } from '$lib/stores'
+	import FlowCard from '../flows/common/FlowCard.svelte'
+	import { getContext } from 'svelte'
+	import type { TriggerContext } from '$lib/components/triggers'
+	import WebsocketTriggersPanel from './WebsocketTriggersPanel.svelte'
+
+	export let noEditor: boolean
+	export let newItem = false
+	export let currentPath: string
+	export let initialPath: string
+	export let schema: any
+	export let isFlow: boolean
+
+	const { selectedTrigger } = getContext<TriggerContext>('TriggerContext')
+</script>
+
+<FlowCard {noEditor} title="Triggers">
+	<div class="pt-4">
+		<Tabs bind:selected={$selectedTrigger}>
+			<Tab value="webhooks" selectedClass="text-primary font-semibold">Webhooks</Tab>
+			<Tab value="schedules" selectedClass="text-primary text-sm font-semibold">Schedules</Tab>
+			<Tab value="routes" selectedClass="text-primary text-sm font-semibold">Routes</Tab>
+			<Tab value="websockets" selectedClass="text-primary text-sm font-semibold">Websockets</Tab>
+			<Tab value="emails" selectedClass="text-primary text-sm font-semibold">Email</Tab>
+
+			<svelte:fragment slot="content">
+				{#if $selectedTrigger === 'webhooks'}
+					<div class="p-4">
+						<WebhooksPanel
+							scopes={isFlow ? [`run:flow/${currentPath}`] : [`run:script/${currentPath}`]}
+							path={currentPath}
+							{isFlow}
+							args={{}}
+							token=""
+							{newItem}
+						/>
+					</div>
+				{/if}
+
+				{#if $selectedTrigger === 'emails'}
+					<div class="p-4">
+						<EmailTriggerPanel
+							token=""
+							scopes={isFlow ? [`run:flow/${currentPath}`] : [`run:script/${currentPath}`]}
+							path={currentPath}
+							{isFlow}
+						/>
+					</div>
+				{/if}
+
+				{#if $selectedTrigger === 'routes'}
+					<div class="p-4">
+						<RoutesPanel {newItem} path={currentPath} {isFlow} />
+					</div>
+				{/if}
+
+				{#if $selectedTrigger === 'websockets'}
+					<div class="p-4">
+						<WebsocketTriggersPanel {newItem} path={currentPath} {isFlow} />
+					</div>
+				{/if}
+
+				{#if $selectedTrigger === 'schedules'}
+					<div class="p-2">
+						<RunPageSchedules
+							{schema}
+							{isFlow}
+							path={initialPath}
+							{newItem}
+							can_write={canWrite(currentPath, {}, $userStore)}
+						/>
+					</div>
+				{/if}
+			</svelte:fragment>
+		</Tabs>
+	</div>
+</FlowCard>
diff --git a/frontend/src/lib/components/details/WebhooksPanel.svelte b/frontend/src/lib/components/triggers/WebhooksPanel.svelte
similarity index 82%
rename from frontend/src/lib/components/details/WebhooksPanel.svelte
rename to frontend/src/lib/components/triggers/WebhooksPanel.svelte
index 2b937f1624..eefd785b47 100644
--- a/frontend/src/lib/components/details/WebhooksPanel.svelte
+++ b/frontend/src/lib/components/triggers/WebhooksPanel.svelte
@@ -3,7 +3,7 @@
 	import Tooltip from '$lib/components/Tooltip.svelte'
 	import { userStore, workspaceStore } from '$lib/stores'
 	import bash from 'svelte-highlight/languages/bash'
-	import { Tabs, Tab, TabContent, Button } from '$lib/components/common'
+	import { Tabs, Tab, TabContent, Button, Alert } from '$lib/components/common'
 	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
 	import {
@@ -15,10 +15,12 @@
 	import UserSettings from '../UserSettings.svelte'
 	import { Highlight } from 'svelte-highlight'
 	import { typescript } from 'svelte-highlight/languages'
-	import ClipboardPanel from './ClipboardPanel.svelte'
+	import ClipboardPanel from '../details/ClipboardPanel.svelte'
 	import { copyToClipboard, generateRandomString } from '$lib/utils'
 	import HighlightTheme from '../HighlightTheme.svelte'
 	import { base } from '$lib/base'
+	import Label from '$lib/components/Label.svelte'
+	import TriggerTokens from './TriggerTokens.svelte'
 	let userSettings: UserSettings
 
 	export let token: string
@@ -27,7 +29,8 @@
 	export let isFlow: boolean = false
 	export let hash: string | undefined = undefined
 	export let path: string
-
+	export let url: string = ''
+	export let newItem: boolean = false
 	let selectedTab: string = 'rest'
 
 	let webhooks: {
@@ -219,6 +222,8 @@ while true; do
 done`
 }`
 	}
+
+	let triggerTokens: TriggerTokens | undefined = undefined
 </script>
 
 <HighlightTheme />
@@ -227,32 +232,36 @@ done`
 	bind:this={userSettings}
 	on:tokenCreated={(e) => {
 		token = e.detail
+		triggerTokens?.listTokens()
 	}}
+	newTokenWorkspace={$workspaceStore}
 	newTokenLabel={`webhook-${$userStore?.username ?? 'superadmin'}-${generateRandomString(4)}`}
 	{scopes}
 />
 
-<div class="p-2 flex flex-col w-full gap-4">
+<div class="flex flex-col w-full gap-4">
 	{#if SCRIPT_VIEW_SHOW_CREATE_TOKEN_BUTTON}
-		<div class="flex flex-row justify-between my-2 gap-2">
-			<input
-				bind:value={token}
-				placeholder="paste your token here once created to alter examples below"
-				class="!text-xs"
-			/>
-			<Button size="xs" color="light" variant="border" on:click={userSettings.openDrawer}>
-				Create a Webhook-specific Token
-				<Tooltip light>
-					The token will have a scope such that it can only be used to trigger this script. It is
-					safe to share as it cannot be used to impersonate you.
-				</Tooltip>
-			</Button>
-		</div>
+		<Label label="Token">
+			<div class="flex flex-row justify-between gap-2">
+				<input
+					bind:value={token}
+					placeholder="paste your token here once created to alter examples below"
+					class="!text-xs !font-normal"
+				/>
+				<Button size="xs" color="light" variant="border" on:click={userSettings.openDrawer}>
+					Create a Webhook-specific Token
+					<Tooltip light>
+						The token will have a scope such that it can only be used to trigger this script. It is
+						safe to share as it cannot be used to impersonate you.
+					</Tooltip>
+				</Button>
+			</div>
+		</Label>
 	{/if}
 
 	<div class="flex flex-col gap-2">
 		<div class="flex flex-row justify-between">
-			<div class="text-xs font-semibold flex flex-row items-center">Request type</div>
+			<div class="text-sm font-normal text-secondary flex flex-row items-center">Request type</div>
 			<ToggleButtonGroup class="h-[30px] w-auto" bind:selected={webhookType}>
 				<ToggleButton
 					label="Async"
@@ -267,7 +276,7 @@ done`
 			</ToggleButtonGroup>
 		</div>
 		<div class="flex flex-row justify-between">
-			<div class="text-xs font-semibold flex flex-row items-center">Call method</div>
+			<div class="text-sm font-normal text-secondary flex flex-row items-center">Call method</div>
 			<ToggleButtonGroup class="h-[30px] w-auto" bind:selected={requestType}>
 				<ToggleButton
 					label="POST by path"
@@ -294,7 +303,9 @@ done`
 			</ToggleButtonGroup>
 		</div>
 		<div class="flex flex-row justify-between">
-			<div class="text-xs font-semibold flex flex-row items-center">Token configuration</div>
+			<div class="text-sm font-normal text-secondary flex flex-row items-center"
+				>Token configuration</div
+			>
 			<ToggleButtonGroup class="h-[30px] w-auto" bind:selected={tokenType}>
 				<ToggleButton label="Token in Headers" value="headers" />
 				<ToggleButton label="Token in Query" value="query" />
@@ -314,14 +325,20 @@ done`
 			{#key token}
 				<TabContent value="rest" class="flex flex-col flex-1 h-full ">
 					<div class="flex flex-col gap-2">
-						<ClipboardPanel title="Url" content={url} />
+						<Label label="Url">
+							<ClipboardPanel content={url} />
+						</Label>
 
 						{#if requestType !== 'get_path'}
-							<ClipboardPanel title="Body" content={JSON.stringify(args, null, 2)} />
+							<Label label="Body">
+								<ClipboardPanel content={JSON.stringify(args, null, 2)} />
+							</Label>
 						{/if}
 						{#key requestType}
 							{#key tokenType}
-								<ClipboardPanel title="Headers" content={JSON.stringify(headers(), null, 2)} />
+								<Label label="Headers">
+									<ClipboardPanel content={JSON.stringify(headers(), null, 2)} />
+								</Label>
 							{/key}
 						{/key}
 					</div>
@@ -370,4 +387,15 @@ done`
 			{/key}
 		</svelte:fragment>
 	</Tabs>
+
+	<div class="mt-10" />
+	<TriggerTokens bind:this={triggerTokens} {isFlow} {path} labelPrefix="webhook" />
+
+	{#if newItem}
+		<div class="mt-10" />
+		<Alert type="warning" title="Attached to a deployed path">
+			The webhooks are only valid for a given path and will only trigger the deployed version of the
+			{isFlow ? 'flow' : 'script'}.
+		</Alert>
+	{/if}
 </div>
diff --git a/frontend/src/lib/components/triggers/WebsocketTriggerEditor.svelte b/frontend/src/lib/components/triggers/WebsocketTriggerEditor.svelte
new file mode 100644
index 0000000000..d92c468b82
--- /dev/null
+++ b/frontend/src/lib/components/triggers/WebsocketTriggerEditor.svelte
@@ -0,0 +1,23 @@
+<script lang="ts">
+	import { tick } from 'svelte'
+	import WebsocketTriggerEditorInner from './WebsocketTriggerEditorInner.svelte'
+
+	let open = false
+	export async function openEdit(ePath: string, isFlow: boolean) {
+		open = true
+		await tick()
+		drawer?.openEdit(ePath, isFlow)
+	}
+
+	export async function openNew(is_flow: boolean, initial_script_path?: string) {
+		open = true
+		await tick()
+		drawer?.openNew(is_flow, initial_script_path)
+	}
+
+	let drawer: WebsocketTriggerEditorInner
+</script>
+
+{#if open}
+	<WebsocketTriggerEditorInner on:update bind:this={drawer} />
+{/if}
diff --git a/frontend/src/lib/components/triggers/WebsocketTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/WebsocketTriggerEditorInner.svelte
new file mode 100644
index 0000000000..39f9ce3cae
--- /dev/null
+++ b/frontend/src/lib/components/triggers/WebsocketTriggerEditorInner.svelte
@@ -0,0 +1,338 @@
+<script lang="ts">
+	import { Alert, Button } from '$lib/components/common'
+	import Drawer from '$lib/components/common/drawer/Drawer.svelte'
+	import DrawerContent from '$lib/components/common/drawer/DrawerContent.svelte'
+	import Path from '$lib/components/Path.svelte'
+	import Required from '$lib/components/Required.svelte'
+	import ScriptPicker from '$lib/components/ScriptPicker.svelte'
+	import { WebsocketTriggerService } from '$lib/gen'
+	import { usedTriggerKinds, userStore, workspaceStore } from '$lib/stores'
+	import { canWrite, emptyString, sendUserToast } from '$lib/utils'
+	import { createEventDispatcher } from 'svelte'
+	import Section from '$lib/components/Section.svelte'
+	import { Loader2, Save, X, Plus } from 'lucide-svelte'
+	import Label from '$lib/components/Label.svelte'
+	import Toggle from '../Toggle.svelte'
+	import { fade } from 'svelte/transition'
+	import JsonEditor from '../apps/editor/settingsPanel/inputEditor/JsonEditor.svelte'
+
+	let drawer: Drawer
+	let is_flow: boolean = false
+	let initialPath = ''
+	let edit = true
+	let itemKind: 'flow' | 'script' = 'script'
+	let script_path = ''
+	let initialScriptPath = ''
+	let fixedScriptPath = ''
+	let path: string = ''
+	let pathError = ''
+	let url = ''
+	let urlError = ''
+	let dirtyUrl = false
+	let enabled = false
+	let filters: {
+		key: string
+		value: any
+	}[] = []
+	let dirtyPath = false
+	let can_write = true
+	let drawerLoading = true
+
+	const dispatch = createEventDispatcher()
+
+	$: is_flow = itemKind === 'flow'
+
+	export async function openEdit(ePath: string, isFlow: boolean) {
+		drawerLoading = true
+		try {
+			drawer?.openDrawer()
+			initialPath = ePath
+			itemKind = isFlow ? 'flow' : 'script'
+			edit = true
+			dirtyPath = false
+			dirtyUrl = false
+			await loadTrigger()
+		} catch (err) {
+			sendUserToast(`Could not load websocket trigger: ${err}`, true)
+		} finally {
+			drawerLoading = false
+		}
+	}
+
+	export async function openNew(nis_flow: boolean, fixedScriptPath_?: string) {
+		drawerLoading = true
+		try {
+			drawer?.openDrawer()
+			is_flow = nis_flow
+			edit = false
+			itemKind = nis_flow ? 'flow' : 'script'
+			url = ''
+			dirtyUrl = false
+			initialScriptPath = ''
+			fixedScriptPath = fixedScriptPath_ ?? ''
+			script_path = fixedScriptPath
+			path = ''
+			initialPath = ''
+			filters = []
+			dirtyPath = false
+		} finally {
+			drawerLoading = false
+		}
+	}
+
+	async function loadTrigger(): Promise<void> {
+		const s = await WebsocketTriggerService.getWebsocketTrigger({
+			workspace: $workspaceStore!,
+			path: initialPath
+		})
+		script_path = s.script_path
+		initialScriptPath = s.script_path
+
+		is_flow = s.is_flow
+		path = s.path
+		url = s.url
+		enabled = s.enabled
+		filters = s.filters
+
+		can_write = canWrite(s.path, s.extra_perms, $userStore)
+	}
+
+	async function updateTrigger(): Promise<void> {
+		if (edit) {
+			await WebsocketTriggerService.updateWebsocketTrigger({
+				workspace: $workspaceStore!,
+				path: initialPath,
+				requestBody: {
+					path,
+					script_path,
+					is_flow,
+					url,
+					filters
+				}
+			})
+			sendUserToast(`Route ${path} updated`)
+		} else {
+			await WebsocketTriggerService.createWebsocketTrigger({
+				workspace: $workspaceStore!,
+				requestBody: {
+					path,
+					script_path,
+					is_flow,
+					url,
+					enabled: true,
+					filters
+				}
+			})
+			sendUserToast(`Route ${path} created`)
+		}
+		if (!$usedTriggerKinds.includes('ws')) {
+			$usedTriggerKinds = [...$usedTriggerKinds, 'ws']
+		}
+		dispatch('update')
+		drawer.closeDrawer()
+	}
+
+	let validateTimeout: NodeJS.Timeout | undefined = undefined
+	function validateUrl(url: string) {
+		urlError = ''
+		if (validateTimeout) {
+			clearTimeout(validateTimeout)
+		}
+		validateTimeout = setTimeout(() => {
+			if (/^(ws:|wss:)\/\/[^\s]+$/.test(url) === false) {
+				urlError = 'Invalid websocket URL'
+			}
+			validateTimeout = undefined
+		}, 500)
+	}
+	$: validateUrl(url)
+</script>
+
+<Drawer size="700px" bind:this={drawer}>
+	<DrawerContent
+		title={edit
+			? can_write
+				? `Edit WS trigger ${initialPath}`
+				: `WS trigger ${initialPath}`
+			: 'New WS trigger'}
+		on:close={drawer.closeDrawer}
+	>
+		<svelte:fragment slot="actions">
+			{#if !drawerLoading && can_write}
+				{#if edit}
+					<div class="mr-8 center-center -mt-1">
+						<Toggle
+							disabled={!can_write}
+							checked={enabled}
+							options={{ right: 'enable', left: 'disable' }}
+							on:change={async (e) => {
+								await WebsocketTriggerService.setWebsocketTriggerEnabled({
+									path: initialPath,
+									workspace: $workspaceStore ?? '',
+									requestBody: { enabled: e.detail }
+								})
+								sendUserToast(
+									`${e.detail ? 'enabled' : 'disabled'} websocket trigger ${initialPath}`
+								)
+							}}
+						/>
+					</div>
+				{/if}
+				<Button
+					startIcon={{ icon: Save }}
+					disabled={pathError != '' || urlError != '' || emptyString(script_path) || !can_write}
+					on:click={updateTrigger}
+				>
+					Save
+				</Button>
+			{/if}
+		</svelte:fragment>
+		{#if drawerLoading}
+			<Loader2 class="animate-spin" />
+		{:else}
+			<Alert title="Info" type="info">
+				{#if edit}
+					Changes can take up to 30 seconds to take effect.
+				{:else}
+					New websocket triggers can take up to 30 seconds to start listening.
+				{/if}
+			</Alert>
+			<div class="flex flex-col gap-12 mt-6">
+				<div class="flex flex-col gap-4">
+					<Label label="Path">
+						<Path
+							bind:dirty={dirtyPath}
+							bind:error={pathError}
+							bind:path
+							{initialPath}
+							checkInitialPathExistence={!edit}
+							namePlaceholder="ws_trigger"
+							kind="websocket_trigger"
+							disabled={!can_write}
+						/>
+					</Label>
+				</div>
+
+				<Section label="Websocket">
+					<div class="flex flex-col w-full gap-4">
+						<label class="block grow w-full">
+							<div class="text-secondary text-sm flex items-center gap-1 w-full justify-between">
+								<div>
+									URL
+									<Required required={true} />
+								</div>
+							</div>
+							<input
+								type="text"
+								autocomplete="off"
+								bind:value={url}
+								disabled={!can_write}
+								on:input={() => {
+									dirtyUrl = true
+								}}
+								class={urlError === ''
+									? ''
+									: 'border border-red-700 bg-red-100 border-opacity-30 focus:border-red-700 focus:border-opacity-30 focus-visible:ring-red-700 focus-visible:ring-opacity-25 focus-visible:border-red-700'}
+							/>
+							<div class="text-red-600 dark:text-red-400 text-2xs mt-1.5">
+								{dirtyUrl ? urlError : ''}
+							</div>
+						</label>
+					</div>
+				</Section>
+
+				<Section label="Runnable">
+					<p class="text-xs mb-1 text-tertiary">
+						Pick a script or flow to be triggered<Required required={true} />
+					</p>
+					<div class="flex flex-row mb-2">
+						<ScriptPicker
+							disabled={fixedScriptPath != '' || !can_write}
+							initialPath={fixedScriptPath || initialScriptPath}
+							kinds={['script']}
+							allowFlow={true}
+							bind:itemKind
+							bind:scriptPath={script_path}
+							allowRefresh
+						/>
+					</div>
+				</Section>
+
+				<Section label="Filters">
+					<p class="text-xs mb-1 text-tertiary">
+						Filters will limit the execution of the trigger to only messages that match all
+						criteria.<br />
+						The JSON filter checks if the value at the key is equal or a superset of the filter value.
+					</p>
+					<div class="flex flex-col gap-4 mt-1">
+						{#each filters as v, i}
+							<div class="flex w-full gap-4 items-center">
+								<div class="w-full flex flex-col gap-2">
+									<div class="flex flex-row gap-2 w-full">
+										<label class="flex flex-col w-full">
+											<div class="text-secondary text-sm">Type</div>
+											<select
+												class="w-20"
+												on:change={(e) => {
+													if (e.target?.['value']) {
+														filters[i] = {
+															key: '',
+															value: ''
+														}
+													}
+												}}
+												value={'json'}
+											>
+												<option value="json">JSON</option>
+											</select>
+										</label>
+									</div>
+									<label class="flex flex-col w-full">
+										<div class="text-secondary text-sm">Key</div>
+										<input type="text" bind:value={v.key} />
+									</label>
+									<!-- svelte-ignore a11y-label-has-associated-control -->
+									<label class="flex flex-col w-full">
+										<div class="text-secondary text-sm">Value</div>
+										<JsonEditor bind:value={v.value} code={JSON.stringify(v.value)} />
+									</label>
+								</div>
+								<button
+									transition:fade|local={{ duration: 100 }}
+									class="rounded-full p-1 bg-surface-secondary duration-200 hover:bg-surface-hover"
+									aria-label="Clear"
+									on:click={() => {
+										filters = filters.filter((_, index) => index !== i)
+									}}
+								>
+									<X size={14} />
+								</button>
+							</div>
+						{/each}
+
+						<div class="flex items-baseline">
+							<Button
+								variant="border"
+								color="light"
+								size="xs"
+								btnClasses="mt-1"
+								on:click={() => {
+									if (filters == undefined || !Array.isArray(filters)) {
+										filters = []
+									}
+									filters = filters.concat({
+										key: '',
+										value: ''
+									})
+								}}
+								startIcon={{ icon: Plus }}
+							>
+								Add item
+							</Button>
+						</div>
+					</div>
+				</Section>
+			</div>
+		{/if}
+	</DrawerContent>
+</Drawer>
diff --git a/frontend/src/lib/components/triggers/WebsocketTriggersPanel.svelte b/frontend/src/lib/components/triggers/WebsocketTriggersPanel.svelte
new file mode 100644
index 0000000000..f209b4fbb8
--- /dev/null
+++ b/frontend/src/lib/components/triggers/WebsocketTriggersPanel.svelte
@@ -0,0 +1,108 @@
+<script lang="ts">
+	import { Button } from '../common'
+	import { userStore, workspaceStore } from '$lib/stores'
+	import { WebsocketTriggerService, type WebsocketTrigger } from '$lib/gen'
+	import { UnplugIcon } from 'lucide-svelte'
+
+	import Skeleton from '../common/skeleton/Skeleton.svelte'
+	import { canWrite } from '$lib/utils'
+	import Alert from '../common/alert/Alert.svelte'
+	import type { TriggerContext } from '../triggers'
+	import { getContext } from 'svelte'
+	import WebsocketTriggerEditor from './WebsocketTriggerEditor.svelte'
+	import { isCloudHosted } from '$lib/cloud'
+
+	export let isFlow: boolean
+	export let path: string
+	export let newItem: boolean = false
+
+	let wsTriggerEditor: WebsocketTriggerEditor
+
+	$: path && loadTriggers()
+
+	const { triggersCount } = getContext<TriggerContext>('TriggerContext')
+
+	let wsTriggers: (WebsocketTrigger & { canWrite: boolean })[] | undefined = undefined
+	export async function loadTriggers() {
+		try {
+			wsTriggers = (
+				await WebsocketTriggerService.listWebsocketTriggers({
+					workspace: $workspaceStore ?? '',
+					path,
+					isFlow
+				})
+			).map((x) => {
+				return { canWrite: canWrite(x.path, x.extra_perms!, $userStore), ...x }
+			})
+			$triggersCount = { ...($triggersCount ?? {}), websocket_count: wsTriggers?.length }
+		} catch (e) {
+			console.error('impossible to load WS triggers', e)
+		}
+	}
+</script>
+
+<WebsocketTriggerEditor
+	on:update={() => {
+		loadTriggers()
+	}}
+	bind:this={wsTriggerEditor}
+/>
+
+<div class="flex flex-col gap-4">
+	{#if !newItem}
+		{#if isCloudHosted()}
+			<Alert title="Not compatible with multi-tenant cloud" type="warning">
+				Websocket triggers are disabled in the multi-tenant cloud.
+			</Alert>
+		{:else if $userStore?.is_admin || $userStore?.is_super_admin}
+			<Button
+				on:click={() => wsTriggerEditor?.openNew(isFlow, path)}
+				variant="border"
+				color="light"
+				size="xs"
+				startIcon={{ icon: UnplugIcon }}
+			>
+				New WS Trigger
+			</Button>
+		{:else}
+			<Alert title="Only workspace admins can create routes" type="warning" size="xs" />
+		{/if}
+	{/if}
+
+	{#if wsTriggers}
+		{#if wsTriggers.length == 0}
+			<div class="text-xs text-secondary"> No WS triggers </div>
+		{:else}
+			<div class="flex flex-col divide-y pt-2">
+				{#each wsTriggers as wsTriggers (wsTriggers.path)}
+					<div class="grid grid-cols-5 text-2xs items-center py-2">
+						<div class="col-span-2 truncate">{wsTriggers.path}</div>
+						<div class="col-span-2 truncate">
+							{wsTriggers.url}
+						</div>
+						<div class="flex justify-end">
+							<button
+								on:click={() => wsTriggerEditor?.openEdit(wsTriggers.path, isFlow)}
+								class="px-2"
+							>
+								{#if wsTriggers.canWrite}
+									Edit
+								{:else}
+									View
+								{/if}
+							</button>
+						</div>
+					</div>
+				{/each}
+			</div>
+		{/if}
+	{:else}
+		<Skeleton layout={[[8]]} />
+	{/if}
+
+	{#if newItem}
+		<Alert title="Triggers disabled" type="warning" size="xs">
+			Deploy the {isFlow ? 'flow' : 'script'} to add WS triggers.
+		</Alert>
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/tutorials/FlowBranchAll.svelte b/frontend/src/lib/components/tutorials/FlowBuilderTutorialBranchAll.svelte
similarity index 81%
rename from frontend/src/lib/components/tutorials/FlowBranchAll.svelte
rename to frontend/src/lib/components/tutorials/FlowBuilderTutorialBranchAll.svelte
index 88eaff5496..68937f187d 100644
--- a/frontend/src/lib/components/tutorials/FlowBranchAll.svelte
+++ b/frontend/src/lib/components/tutorials/FlowBuilderTutorialBranchAll.svelte
@@ -1,12 +1,11 @@
 <script lang="ts">
 	import { getContext } from 'svelte'
 	import type { FlowEditorContext } from '../flows/types'
-	import { triggerAddFlowStep, selectFlowStepKind } from './utils'
+	import { triggerPointerDown } from './utils'
 	import Tutorial from './Tutorial.svelte'
 	import { updateProgress } from '$lib/tutorialUtils'
-	import { nextId } from '../flows/flowModuleNextId'
 
-	const { flowStore, flowStateStore } = getContext<FlowEditorContext>('FlowEditorContext')
+	const { flowStore } = getContext<FlowEditorContext>('FlowEditorContext')
 
 	let tutorial: Tutorial | undefined = undefined
 
@@ -22,9 +21,7 @@
 	on:error
 	on:skipAll
 	getSteps={(driver, options) => {
-		const id = nextId($flowStateStore, $flowStore)
 		const index = options?.indexToInsertAt ?? $flowStore.value.modules.length
-		const isFirst = id === 'a'
 
 		const steps = [
 			{
@@ -40,7 +37,7 @@
 					title: 'Add a step',
 					description: 'Click here to add a step to your flow',
 					onNextClick: () => {
-						triggerAddFlowStep(index)
+						triggerPointerDown(`#flow-editor-add-step-${index}`)
 
 						setTimeout(() => {
 							driver.moveNext()
@@ -62,14 +59,14 @@
 					title: 'Insert Branch all',
 					description: "Let's pick branch all",
 					onNextClick: () => {
-						selectFlowStepKind(isFirst ? 6 : 5)
+						triggerPointerDown('#flow-editor-flow-kind-branch-to-all')
 
 						setTimeout(() => {
 							driver.moveNext()
 						})
 					}
 				},
-				element: `#flow-editor-insert-module > div > button:nth-child(${isFirst ? 6 : 5})`
+				element: '#flow-editor-flow-kind-branch-to-all'
 			},
 			{
 				element: '#flow-editor-branch-all-wrapper',
diff --git a/frontend/src/lib/components/tutorials/FlowBranchOne.svelte b/frontend/src/lib/components/tutorials/FlowBuilderTutorialBranchOne.svelte
similarity index 87%
rename from frontend/src/lib/components/tutorials/FlowBranchOne.svelte
rename to frontend/src/lib/components/tutorials/FlowBuilderTutorialBranchOne.svelte
index d7fbea5880..adc08ddd5a 100644
--- a/frontend/src/lib/components/tutorials/FlowBranchOne.svelte
+++ b/frontend/src/lib/components/tutorials/FlowBuilderTutorialBranchOne.svelte
@@ -1,12 +1,7 @@
 <script lang="ts">
 	import { createEventDispatcher, getContext } from 'svelte'
 	import type { FlowEditorContext } from '../flows/types'
-	import {
-		clickButtonBySelector,
-		triggerAddFlowStep,
-		selectFlowStepKind,
-		updateFlowModuleById
-	} from './utils'
+	import { clickButtonBySelector, updateFlowModuleById, triggerPointerDown } from './utils'
 	import Tutorial from './Tutorial.svelte'
 	import { updateProgress } from '$lib/tutorialUtils'
 	import { nextId } from '../flows/flowModuleNextId'
@@ -30,7 +25,6 @@
 	getSteps={(driver, options) => {
 		const id = nextId($flowStateStore, $flowStore)
 		const index = options?.indexToInsertAt ?? $flowStore.value.modules.length
-		const isFirst = id === 'a'
 
 		const steps = [
 			{
@@ -46,7 +40,7 @@
 					title: 'Branch one',
 					description: 'Windmill supports branches, let us add one',
 					onNextClick: () => {
-						triggerAddFlowStep(index)
+						triggerPointerDown(`#flow-editor-add-step-${index}`)
 
 						setTimeout(() => {
 							driver.moveNext()
@@ -66,16 +60,15 @@
 					title: 'Insert Branch one',
 					description: "Let's pick branch one",
 					onNextClick: () => {
-						selectFlowStepKind(isFirst ? 5 : 4)
+						triggerPointerDown('#flow-editor-flow-kind-branch-to-one')
 
 						setTimeout(() => {
 							driver.moveNext()
 						})
 					}
 				},
-				element: `#flow-editor-insert-module > div > button:nth-child(${isFirst ? 5 : 4})`
+				element: '#flow-editor-flow-kind-branch-to-one'
 			},
-
 			{
 				element: '#flow-editor-edit-predicate',
 				popover: {
@@ -96,7 +89,6 @@
 					}
 				}
 			},
-
 			{
 				element: '#flow-editor-branch-one-wrapper',
 				popover: {
@@ -111,16 +103,14 @@
 					}
 				}
 			},
-
 			{
 				popover: {
 					title: 'Add steps',
-					description: 'You can now add step to one of the branches',
+					description: 'You can now add a step to one of the branches',
 					onNextClick: () => {
 						setTimeout(() => {
-							driver.moveNext()
-
 							updateProgress(2)
+							driver.moveNext()
 						})
 					}
 				}
diff --git a/frontend/src/lib/components/tutorials/FlowErrorHandler.svelte b/frontend/src/lib/components/tutorials/FlowBuilderTutorialErrorHandler.svelte
similarity index 86%
rename from frontend/src/lib/components/tutorials/FlowErrorHandler.svelte
rename to frontend/src/lib/components/tutorials/FlowBuilderTutorialErrorHandler.svelte
index 787e936ffb..973ced76ac 100644
--- a/frontend/src/lib/components/tutorials/FlowErrorHandler.svelte
+++ b/frontend/src/lib/components/tutorials/FlowBuilderTutorialErrorHandler.svelte
@@ -2,7 +2,7 @@
 	import { getContext } from 'svelte'
 	import type { FlowEditorContext } from '../flows/types'
 	import Tutorial from './Tutorial.svelte'
-	import { clickButtonBySelector } from './utils'
+	import { clickButtonBySelector, triggerPointerDown } from './utils'
 	import { updateProgress } from '$lib/tutorialUtils'
 
 	const { flowStore } = getContext<FlowEditorContext>('FlowEditorContext')
@@ -51,14 +51,14 @@
 			}
 		},
 		{
-			element: '#error-handler-toggle',
+			element: '#flow-editor-error-handler',
 			popover: {
 				title: 'Error handler',
 				description:
 					'You can add an error handler to your flow. It will be executed if any of the steps in the flow fails.',
 
 				onNextClick: () => {
-					clickButtonBySelector('#error-handler-toggle')
+					triggerPointerDown('#flow-editor-error-handler button')
 					setTimeout(() => {
 						driver.moveNext()
 					})
@@ -73,26 +73,26 @@
 			element: '#flow-editor-insert-module'
 		},
 		{
-			element: '#flow-editor-flow-inputs',
+			element: '#flow-editor-flow-providers',
 			popover: {
 				title: 'Action configuration',
 				description: 'An action can be inlined, imported from your workspace or the Hub.'
 			}
 		},
 		{
-			element: '#flow-editor-action-script',
+			element: '#flow-editor-flow-atoms',
 			popover: {
 				title: 'Supported languages',
 				description: 'Windmill support the following languages/runtimes.'
 			}
 		},
 		{
-			element: '#flow-editor-action-script > button:nth-child(1)',
+			element: '#flow-editor-new-bun',
 			popover: {
 				title: 'Typescript',
-				description: "Let's pick an action to add to your flow",
+				description: "Let's create a Typescript error handler for your flow",
 				onNextClick: () => {
-					clickButtonBySelector('#flow-editor-action-script > button > div > button:nth-child(1)')
+					clickButtonBySelector('#flow-editor-new-bun')
 
 					setTimeout(() => {
 						driver.moveNext()
diff --git a/frontend/src/lib/components/tutorials/FlowBuilderTutorialsForLoop.svelte b/frontend/src/lib/components/tutorials/FlowBuilderTutorialForLoop.svelte
similarity index 94%
rename from frontend/src/lib/components/tutorials/FlowBuilderTutorialsForLoop.svelte
rename to frontend/src/lib/components/tutorials/FlowBuilderTutorialForLoop.svelte
index e431608662..8e99b5d3d1 100644
--- a/frontend/src/lib/components/tutorials/FlowBuilderTutorialsForLoop.svelte
+++ b/frontend/src/lib/components/tutorials/FlowBuilderTutorialForLoop.svelte
@@ -2,12 +2,7 @@
 	import { createEventDispatcher, getContext } from 'svelte'
 	import type { FlowEditorContext } from '../flows/types'
 	import { emptyFlowModuleState } from '../flows/utils'
-	import {
-		clickButtonBySelector,
-		triggerAddFlowStep,
-		selectFlowStepKind,
-		updateFlowModuleById
-	} from './utils'
+	import { clickButtonBySelector, updateFlowModuleById, triggerPointerDown } from './utils'
 	import Tutorial from './Tutorial.svelte'
 	import { updateProgress } from '$lib/tutorialUtils'
 	import { nextId } from '../flows/flowModuleNextId'
@@ -33,7 +28,6 @@
 	getSteps={(driver, options) => {
 		const id = nextId($flowStateStore, $flowStore)
 		const index = options?.indexToInsertAt ?? $flowStore.value.modules.length
-		const isFirst = id === 'a'
 
 		let tempId = ''
 
@@ -52,7 +46,7 @@
 					title: 'Add a step',
 					description: 'Click here to add a step to your flow',
 					onNextClick: () => {
-						triggerAddFlowStep(index)
+						triggerPointerDown(`#flow-editor-add-step-${index}`)
 
 						setTimeout(() => {
 							driver.moveNext()
@@ -71,16 +65,16 @@
 
 			{
 				popover: {
-					title: 'Insert loop',
-					description: "Let's pick forloop",
+					title: 'Insert a loop',
+					description: "Let's pick a for loop",
 					onNextClick: () => {
-						selectFlowStepKind(isFirst ? 4 : 3)
+						triggerPointerDown('#flow-editor-flow-kind-for-loop')
 						setTimeout(() => {
 							driver.moveNext()
 						})
 					}
 				},
-				element: `#flow-editor-insert-module > div > button:nth-child(${isFirst ? 4 : 3})`
+				element: '#flow-editor-flow-kind-for-loop'
 			},
 
 			{
diff --git a/frontend/src/lib/components/tutorials/FlowBuilderTutorialSimpleFlow.svelte b/frontend/src/lib/components/tutorials/FlowBuilderTutorialSimpleFlow.svelte
index 5c3856d4bc..5dbae7f199 100644
--- a/frontend/src/lib/components/tutorials/FlowBuilderTutorialSimpleFlow.svelte
+++ b/frontend/src/lib/components/tutorials/FlowBuilderTutorialSimpleFlow.svelte
@@ -5,15 +5,14 @@
 	import {
 		clickButtonBySelector,
 		isFlowTainted,
-		selectFlowStepKind,
 		setInputBySelector,
-		triggerAddFlowStep
+		triggerPointerDown,
+		waitForElementLoading
 	} from './utils'
 	import Tutorial from './Tutorial.svelte'
 
 	const { flowStore } = getContext<FlowEditorContext>('FlowEditorContext')
 	const dispatch = createEventDispatcher()
-	const queue: string[] = []
 
 	let tutorial: Tutorial | undefined = undefined
 
@@ -51,13 +50,12 @@
 			element: '#svelvet-Input'
 		},
 		{
-			element: '#flow-editor-add-property',
+			element: 'input[placeholder="Field name"]',
 			popover: {
-				title: 'Add a property',
-				description: 'Click here to add a property to your schema',
+				title: 'Name your property',
+				description: 'Give a name to your property. Here we will call it firstname',
 				onNextClick: () => {
-					clickButtonBySelector('#flow-editor-add-property')
-
+					setInputBySelector('input[placeholder="Field name"]', 'firstname')
 					setTimeout(() => {
 						driver.moveNext()
 					})
@@ -65,27 +63,12 @@
 			}
 		},
 		{
-			element: '#schema-modal-name',
+			element: '#flow-editor-add-property',
 			popover: {
-				title: 'Name your property',
-				description: 'Give a name to your property. Here we will call it firstname',
-				onNextClick: () => {
-					setInputBySelector('#schema-modal-name', 'firstname')
-
-					driver.moveNext()
-				}
-			}
-		},
-		{
-			element: '#schema-modal-save',
-			popover: {
-				title: 'Save your property',
+				title: 'Add your property',
 				description: 'Click here to save your property',
 				onNextClick: () => {
-					queue.push(JSON.stringify($flowStore))
-
-					clickButtonBySelector('#schema-modal-save')
-
+					clickButtonBySelector('#flow-editor-add-property')
 					setTimeout(() => {
 						driver.moveNext()
 					})
@@ -98,21 +81,13 @@
 				title: 'Add a step',
 				description: 'Click here to add a step to your flow',
 				onNextClick: () => {
-					triggerAddFlowStep(0)
-
+					triggerPointerDown(`#flow-editor-add-step-0`)
 					setTimeout(() => {
 						driver.moveNext()
 					})
-				},
-
-				onPrevClick: () => {
-					driver.moveTo(1)
-					$flowStore = JSON.parse(queue.pop() || '{}')
-					dispatch('reload')
 				}
 			}
 		},
-
 		{
 			popover: {
 				title: 'Steps kind',
@@ -125,52 +100,55 @@
 				title: 'Pick an action',
 				description: 'Let’s pick an action to add to your flow',
 				onNextClick: () => {
-					selectFlowStepKind(1)
+					triggerPointerDown('#flow-editor-insert-module > div > div > button:nth-child(1)')
 
 					setTimeout(() => {
 						driver.moveNext()
 					})
 				}
 			},
-			element: '#flow-editor-insert-module > div > button:nth-child(1)'
+			element: '#flow-editor-insert-module > div > div > button:nth-child(1)'
 		},
 		{
-			element: '#flow-editor-flow-inputs',
+			element: '#flow-editor-flow-providers',
 			popover: {
 				title: 'Action configuration',
 				description: 'An action can be inlined, imported from your workspace or the Hub.'
 			}
 		},
 		{
-			element: '#flow-editor-action-script',
+			element: '#flow-editor-flow-atoms',
 			popover: {
 				title: 'Supported languages',
 				description: 'Windmill support the following languages/runtimes.'
 			}
 		},
 		{
-			element: '#flow-editor-action-script-bun',
+			element: '#flow-editor-new-bun',
 			popover: {
 				title: 'Typescript',
-				description: "Let's pick an action to add to your flow",
+				description: "Let's write a script for your flow",
 				onNextClick: () => {
-					clickButtonBySelector('#flow-editor-action-script-bun')
-
-					setTimeout(() => {
+					clickButtonBySelector('#flow-editor-new-bun')
+					waitForElementLoading('#flow-editor-editor', () => {
 						driver.moveNext()
 					})
 				}
 			}
 		},
-
 		{
 			element: '#flow-editor-editor',
 			popover: {
 				title: 'Action editor',
-				description: 'Windmill provides a full code editor to write your actions'
+				description: 'Windmill provides a full code editor to write your actions',
+				onPrevClick: () => {
+					triggerPointerDown(`#flow-editor-add-step-0`)
+					setTimeout(() => {
+						driver.movePrevious()
+					})
+				}
 			}
 		},
-
 		{
 			element: '#flow-editor-step-input',
 			popover: {
@@ -178,7 +156,6 @@
 				description: 'The schema and the UI is autogenerated from your code'
 			}
 		},
-
 		{
 			element: '#flow-editor-plug',
 			popover: {
@@ -187,7 +164,6 @@
 					'You can provide static values or connect to other nodes result. Here we will connect to the firstname input',
 				onNextClick: () => {
 					clickButtonBySelector('#flow-editor-plug')
-
 					setTimeout(() => {
 						driver.moveNext()
 					})
diff --git a/frontend/src/lib/components/tutorials/Tutorial.svelte b/frontend/src/lib/components/tutorials/Tutorial.svelte
index cd2fe1a317..0eb415e9f2 100644
--- a/frontend/src/lib/components/tutorials/Tutorial.svelte
+++ b/frontend/src/lib/components/tutorials/Tutorial.svelte
@@ -79,7 +79,19 @@
 		})
 
 		tutorialControls.$on('previous', () => {
-			tutorial?.movePrevious()
+			const step = tutorial?.getActiveStep()
+
+			if (step) {
+				if (tutorial?.getActiveStep()?.popover?.onPrevClick) {
+					const activeElement = tutorial?.getActiveElement()
+					tutorial?.getActiveStep()?.popover?.onPrevClick?.(activeElement, step, {
+						config,
+						state
+					})
+				} else {
+					tutorial?.movePrevious()
+				}
+			}
 		})
 
 		if (popoverDescription) {
diff --git a/frontend/src/lib/components/tutorials/TutorialControls.svelte b/frontend/src/lib/components/tutorials/TutorialControls.svelte
index 0ff7198e29..712f7ac39f 100644
--- a/frontend/src/lib/components/tutorials/TutorialControls.svelte
+++ b/frontend/src/lib/components/tutorials/TutorialControls.svelte
@@ -18,10 +18,11 @@
 		</Alert>
 	{/if}
 	<div class="flex flex-row gap-2 justify-between w-full items-center">
-		<div class="text-xs">
-			Step {activeIndex} of {totalSteps}
-		</div>
-
+		{#if activeIndex !== undefined && totalSteps !== undefined}
+			<div class="text-xs">
+				Step {activeIndex + 1} of {totalSteps}
+			</div>
+		{/if}
 		<div class="flex flex-row gap-2">
 			<Button
 				size="xs2"
diff --git a/frontend/src/lib/components/tutorials/utils.ts b/frontend/src/lib/components/tutorials/utils.ts
index 73d9ccb6a0..f1cd29691b 100644
--- a/frontend/src/lib/components/tutorials/utils.ts
+++ b/frontend/src/lib/components/tutorials/utils.ts
@@ -29,21 +29,11 @@ export function clickFirstButtonBySelector(selector: string) {
 	}
 }
 
-export function triggerAddFlowStep(index: number) {
-	const button = document.querySelector(`#flow-editor-add-step-${index}`) as HTMLButtonElement
+export function triggerPointerDown(selector: string) {
+	const elem = document.querySelector(selector) as HTMLElement
 
-	if (button) {
-		button.parentElement?.dispatchEvent(new PointerEvent('pointerdown', { bubbles: true }))
-	}
-}
-
-export function selectFlowStepKind(index: number) {
-	const button = document.querySelector(
-		`#flow-editor-insert-module > div > button:nth-child(${index})`
-	) as HTMLButtonElement
-
-	if (button) {
-		button?.dispatchEvent(new PointerEvent('pointerdown', { bubbles: true }))
+	if (elem) {
+		elem.dispatchEvent(new PointerEvent('pointerdown', { bubbles: true }))
 	}
 }
 
@@ -334,3 +324,27 @@ export function connectInlineRunnableInputToComponentOutput(
 		}
 	}
 }
+
+function elementExists(selector: string): boolean {
+	return !!document.querySelector(selector)
+}
+
+export function waitForElementLoading(
+	selector: string,
+	callback: () => void,
+	interval: number = 50,
+	maxAttempts: number = 30
+): void {
+	let attempts = 0
+
+	const checkExistence = setInterval(() => {
+		if (elementExists(selector)) {
+			clearInterval(checkExistence)
+			callback()
+		} else if (attempts >= maxAttempts) {
+			clearInterval(checkExistence)
+			console.error('Element not found after multiple attempts.')
+		}
+		attempts++
+	}, interval)
+}
diff --git a/frontend/src/lib/components/worker_group.ts b/frontend/src/lib/components/worker_group.ts
new file mode 100644
index 0000000000..3f61f7346d
--- /dev/null
+++ b/frontend/src/lib/components/worker_group.ts
@@ -0,0 +1,39 @@
+// enabled: bool,
+// min_workers: usize,
+// max_workers: usize,
+// cooldown_seconds: usize,
+// inc_scale_jobs_waiting: usize,
+// full_scale_cooldown_seconds: usize,
+// full_scale_jobs_waiting: usize,
+// dec_scale_occupancy_rate: u8, // occupancy rate of 30s, 5m, 30m to scale down
+// inc_scale_occupancy_rate: u8, // occupancy rate of 30s, 5m to scale up
+// inc_percent: usize,
+// integration: Option<AutoscalingIntegration>,
+
+export type AutoscalingConfig = {
+    enabled: boolean
+    min_workers: number
+    max_workers: number
+    cooldown_seconds?: number
+    inc_scale_num_jobs_waiting?: number
+    full_scale_cooldown_seconds?: number
+    full_scale_jobs_waiting?: number
+    dec_scale_occupancy_rate?: number
+    inc_scale_occupancy_rate?: number
+    inc_num_workers?: number
+    integration?: AutoscalingIntegration
+    custom_tags?: string[]
+}
+
+
+export type AutoscalingIntegration = AutoscaleScript | AutoscaleDryRun
+
+export type AutoscaleScript = {
+    type: 'script'
+    tag?: string
+    path: string
+}
+
+export type AutoscaleDryRun = {
+    type: 'dryrun'
+}
diff --git a/frontend/src/lib/consts.ts b/frontend/src/lib/consts.ts
index 2fa5fc30eb..45ccb51978 100644
--- a/frontend/src/lib/consts.ts
+++ b/frontend/src/lib/consts.ts
@@ -65,8 +65,8 @@ export const POSTGRES_TYPES = [
 	'BIGSERIAL[]',
 	'REAL',
 	'REAL[]',
-	'DOUBLE PRECISION',
-	'DOUBLE PRECISION[]',
+	'FLOAT8',
+	'FLOAT8[]',
 	'NUMERIC',
 	'NUMERIC[]',
 	'DECIMAL',
@@ -77,8 +77,12 @@ export const POSTGRES_TYPES = [
 	'DATE[]',
 	'TIME',
 	'TIME[]',
+	'TIMETZ',
+	'TIMETZ[]',
 	'TIMESTAMP',
 	'TIMESTAMP[]',
+	'TIMESTAMPTZ',
+	'TIMESTAMPTZ[]',
 	'JSON',
 	'JSON[]',
 	'JSONB',
diff --git a/frontend/src/lib/hubPaths.json b/frontend/src/lib/hubPaths.json
index 6fa5966973..06d3255db6 100644
--- a/frontend/src/lib/hubPaths.json
+++ b/frontend/src/lib/hubPaths.json
@@ -1,10 +1,11 @@
 {
 	"gitSync": "hub/9087/sync-script-to-git-repo-windmill",
 	"gitSyncTest": "hub/9073/git-repo-test-read-write-windmill",
-	"slackErrorHandler": "hub/9079/workspace-or-schedule-error-handler-slack",
+	"slackErrorHandler": "hub/9206/workspace-or-schedule-error-handler-slack",
+	"slackErrorHandler_0": "hub/9079/workspace-or-schedule-error-handler-slack",
 	"slackRecoveryHandler": "hub/9080/slack/schedule-recovery-handler-slack",
 	"slackSuccessHandler": "hub/9072/slack/schedule-success-handler-slack",
 	"slackReport": "hub/9084/slack",
 	"discordReport": "hub/9085/discord",
 	"smtpReport": "hub/9086/smtp"
-}
+}
\ No newline at end of file
diff --git a/frontend/src/lib/init_scripts/python_failure_module.ts b/frontend/src/lib/init_scripts/python_failure_module.ts
deleted file mode 100644
index db8e1a7705..0000000000
--- a/frontend/src/lib/init_scripts/python_failure_module.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export default `import os
-
-def main(message: str, name: str, step_id: str):
-    flow_id = os.environ.get("WM_ROOT_FLOW_JOB_ID")
-    print("message", message)
-    print("name", name)
-    print("step_id", step_id)
-    return { "message": message, "flow_id": flow_id, "step_id": step_id, "recover": False }`
diff --git a/frontend/src/lib/init_scripts/python_init_code.ts b/frontend/src/lib/init_scripts/python_init_code.ts
deleted file mode 100644
index 282ffd7bf2..0000000000
--- a/frontend/src/lib/init_scripts/python_init_code.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-export default `import os
-import wmill
-
-# You can import any PyPi package. 
-# See here for more info: https://www.windmill.dev/docs/advanced/dependencies_in_python
-
-# you can use typed resources by doing a type alias to dict
-#postgresql = dict
-
-def main(
-    no_default: str,
-    #db: postgresql,
-    name="Nicolas Bourbaki",
-    age=42,
-    obj: dict = {"even": "dicts"},
-    l: list = ["or", "lists!"],
-    file_: bytes = bytes(0),
-):
-
-    print(f"Hello World and a warm welcome especially to {name}")
-    print("and its acolytes..", age, obj, l, len(file_))
-
-    # retrieve variables, resources, states using the wmill client
-    try:
-        secret = wmill.get_variable("f/examples/secret")
-    except:
-        secret = "No secret yet at f/examples/secret !"
-    print(f"The variable at \`f/examples/secret\`: {secret}")
-
-    # Get last state of this script execution by the same trigger/user
-    last_state = wmill.get_state()
-    new_state = {"foo": 42} if last_state is None else last_state
-    new_state["foo"] += 1
-    wmill.set_state(new_state)
-
-    # fetch context variables
-    user = os.environ.get("WM_USERNAME")
-
-    # return value is converted to JSON
-    return {"splitted": name.split(), "user": user, "state": new_state}`
diff --git a/frontend/src/lib/init_scripts/python_init_code_clear.ts b/frontend/src/lib/init_scripts/python_init_code_clear.ts
deleted file mode 100644
index e37835cd24..0000000000
--- a/frontend/src/lib/init_scripts/python_init_code_clear.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default `# import wmill
-
-
-def main(x: str):
-    return x`
diff --git a/frontend/src/lib/init_scripts/python_init_code_trigger.ts b/frontend/src/lib/init_scripts/python_init_code_trigger.ts
deleted file mode 100644
index 3895317060..0000000000
--- a/frontend/src/lib/init_scripts/python_init_code_trigger.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export default `import wmill
-
-
-def main():
-    # A common trigger script would follow this pattern:
-    # 1. Get the last saved state
-    # state = wmill.get_state()
-    # 2. Get the actual state from the external service
-    # newState = ...
-    # 3. Compare the two states and update the internal state
-    # wmill.setState(newState)
-    # 4. Return the new rows
-    # return range from (state to newState)
-    return [1, 2, 3]`
diff --git a/frontend/src/lib/relative_imports.ts b/frontend/src/lib/relative_imports.ts
index 3923a1e648..fd4b44c9ba 100644
--- a/frontend/src/lib/relative_imports.ts
+++ b/frontend/src/lib/relative_imports.ts
@@ -26,5 +26,5 @@ export function approximateFindPythonRelativePath(code: string) {
 
 	// Use match to find all matches in the code
 	const matches = code.match(regex)
-	return [...(matches?.entries() ?? [])] || []
+	return [...(matches?.entries() ?? [])]
 }
diff --git a/frontend/src/lib/script_helpers.ts b/frontend/src/lib/script_helpers.ts
index 3dcade90c0..a4bd376c34 100644
--- a/frontend/src/lib/script_helpers.ts
+++ b/frontend/src/lib/script_helpers.ts
@@ -1,19 +1,79 @@
 import { type Script } from './gen'
 
-import PYTHON_INIT_CODE from '$lib/init_scripts/python_init_code'
-import PYTHON_INIT_CODE_CLEAR from '$lib/init_scripts/python_init_code_clear'
-import PYTHON_INIT_CODE_TRIGGER from '$lib/init_scripts/python_init_code_trigger'
-import PYTHON_FAILURE_MODULE_CODE from '$lib/init_scripts/python_failure_module'
 import type { SupportedLanguage } from './common'
 
-export {
-	PYTHON_INIT_CODE,
-	PYTHON_INIT_CODE_CLEAR,
-	PYTHON_INIT_CODE_TRIGGER,
-	PYTHON_FAILURE_MODULE_CODE
-}
+const PYTHON_FAILURE_MODULE_CODE = `import os
 
-export const NATIVETS_INIT_CODE = `// Fetch-only script, no imports allowed (except windmill) but benefits from a dedicated highly efficient runtime
+def main(message: str, name: str, step_id: str):
+    flow_id = os.environ.get("WM_ROOT_FLOW_JOB_ID")
+    print("message", message)
+    print("name", name)
+    print("step_id", step_id)
+    return { "message": message, "flow_id": flow_id, "step_id": step_id, "recover": False }`
+
+const PYTHON_INIT_CODE_CLEAR = `# import wmill
+
+
+def main(x: str):
+    return x`
+
+const PYTHON_INIT_CODE_TRIGGER = `import wmill
+
+
+def main():
+    # A common trigger script would follow this pattern:
+    # 1. Get the last saved state
+    # state = wmill.get_state()
+    # 2. Get the actual state from the external service
+    # newState = ...
+    # 3. Compare the two states and update the internal state
+    # wmill.setState(newState)
+    # 4. Return the new rows
+    # return range from (state to newState)
+    return [1, 2, 3]`
+
+const PYTHON_INIT_CODE = `import os
+import wmill
+
+# You can import any PyPi package. 
+# See here for more info: https://www.windmill.dev/docs/advanced/dependencies_in_python
+
+# you can use typed resources by doing a type alias to dict
+#postgresql = dict
+
+def main(
+    no_default: str,
+    #db: postgresql,
+    name="Nicolas Bourbaki",
+    age=42,
+    obj: dict = {"even": "dicts"},
+    l: list = ["or", "lists!"],
+    file_: bytes = bytes(0),
+):
+
+    print(f"Hello World and a warm welcome especially to {name}")
+    print("and its acolytes..", age, obj, l, len(file_))
+
+    # retrieve variables, resources, states using the wmill client
+    try:
+        secret = wmill.get_variable("f/examples/secret")
+    except:
+        secret = "No secret yet at f/examples/secret !"
+    print(f"The variable at \`f/examples/secret\`: {secret}")
+
+    # Get last state of this script execution by the same trigger/user
+    last_state = wmill.get_state()
+    new_state = {"foo": 42} if last_state is None else last_state
+    new_state["foo"] += 1
+    wmill.set_state(new_state)
+
+    # fetch context variables
+    user = os.environ.get("WM_USERNAME")
+
+    # return value is converted to JSON
+    return {"splitted": name.split(), "user": user, "state": new_state}`
+
+const NATIVETS_INIT_CODE = `// Fetch-only script, no imports allowed (except windmill) but benefits from a dedicated highly efficient runtime
 //import * as wmill from './windmill.ts'
 
 export async function main(example_input: number = 3) {
@@ -25,7 +85,7 @@ export async function main(example_input: number = 3) {
 }
 `
 
-export const BUNNATIVE_INIT_CODE = `//native
+const BUNNATIVE_INIT_CODE = `//native
 //you can add proxy support using //proxy http(s)://host:port
 
 // native scripts are bun scripts that are executed on native workers and can be parallelized
@@ -42,7 +102,7 @@ export async function main(example_input: number = 3) {
 }
 `
 
-export const NATIVETS_INIT_CODE_CLEAR = `// Fetch-only script, no imports allowed (except windmill) but benefits from a dedicated highly efficient runtime
+const NATIVETS_INIT_CODE_CLEAR = `// Fetch-only script, no imports allowed (except windmill) but benefits from a dedicated highly efficient runtime
 //import * as wmill from './windmill.ts'
 
 export async function main() {
@@ -53,7 +113,7 @@ export async function main() {
 }
 `
 
-export const DENO_INIT_CODE = `// Ctrl/CMD+. to cache dependencies on imports hover.
+const DENO_INIT_CODE = `// Ctrl/CMD+. to cache dependencies on imports hover.
 
 // Deno uses "npm:" prefix to import from npm (https://deno.land/manual@v1.36.3/node/npm_specifiers)
 // import * as wmill from "npm:windmill-client@${__pkg__.version}"
@@ -74,7 +134,7 @@ export async function main(
 }
 `
 
-export const BUN_INIT_CODE = `// there are multiple modes to add as header: //nobundling //native //npm //nodejs
+const BUN_INIT_CODE = `// there are multiple modes to add as header: //nobundling //native //npm //nodejs
 // https://www.windmill.dev/docs/getting_started/scripts_quickstart/typescript#modes
 
 // import { toWords } from "number-to-words@1"
@@ -105,7 +165,7 @@ export async function main(
 }
 `
 
-export const GO_INIT_CODE = `package inner
+const GO_INIT_CODE = `package inner
 
 import (
 	"fmt"
@@ -129,7 +189,7 @@ func main(x string, nested struct {
 }
 `
 
-export const GO_FAILURE_MODULE_CODE = `package inner
+const GO_FAILURE_MODULE_CODE = `package inner
 
 import (
 	"fmt"
@@ -146,21 +206,21 @@ func main(message string, name string) (interface{}, error) {
 }
 `
 
-export const DENO_INIT_CODE_CLEAR = `// import * as wmill from "npm:windmill-client@${__pkg__.version}"
+const DENO_INIT_CODE_CLEAR = `// import * as wmill from "npm:windmill-client@${__pkg__.version}"
 
 export async function main(x: string) {
   return x
 }
 `
 
-export const BUN_INIT_CODE_CLEAR = `// import * as wmill from "windmill-client"
+const BUN_INIT_CODE_CLEAR = `// import * as wmill from "windmill-client"
 
 export async function main(x: string) {
   return x
 }
 `
 
-export const DENO_FAILURE_MODULE_CODE = `
+const DENO_FAILURE_MODULE_CODE = `
 export async function main(message: string, name: string, step_id: string) {
   const flow_id = Deno.env.get("WM_ROOT_FLOW_JOB_ID")
   console.log("message", message)
@@ -170,7 +230,7 @@ export async function main(message: string, name: string, step_id: string) {
 }
 `
 
-export const BUN_FAILURE_MODULE_CODE = `
+const BUN_FAILURE_MODULE_CODE = `
 export async function main(message: string, name: string, step_id: string) {
   const flow_id = process.env.WM_ROOT_FLOW_JOB_ID
   console.log("message", message)
@@ -180,7 +240,7 @@ export async function main(message: string, name: string, step_id: string) {
 }
 `
 
-export const POSTGRES_INIT_CODE = `-- to pin the database use '-- database f/your/path'
+const POSTGRES_INIT_CODE = `-- to pin the database use '-- database f/your/path'
 -- $1 name1 = default arg
 -- $2 name2
 -- $3 name3
@@ -189,7 +249,7 @@ INSERT INTO demo VALUES (\$1::TEXT, \$2::INT, \$3::TEXT[]) RETURNING *;
 UPDATE demo SET col2 = \$4::INT WHERE col2 = \$2::INT;
 `
 
-export const MYSQL_INIT_CODE = `-- to pin the database use '-- database f/your/path'
+const MYSQL_INIT_CODE = `-- to pin the database use '-- database f/your/path'
 -- :name1 (text) = default arg
 -- :name2 (int)
 -- :name3 (int)
@@ -197,7 +257,7 @@ INSERT INTO demo VALUES (:name1, :name2);
 UPDATE demo SET col2 = :name3 WHERE col2 = :name2;
 `
 
-export const BIGQUERY_INIT_CODE = `-- to pin the database use '-- database f/your/path'
+const BIGQUERY_INIT_CODE = `-- to pin the database use '-- database f/your/path'
 -- @name1 (string) = default arg
 -- @name2 (integer)
 -- @name3 (string[])
@@ -206,7 +266,7 @@ INSERT INTO \`demodb.demo\` VALUES (@name1, @name2, @name3);
 UPDATE \`demodb.demo\` SET col2 = @name4 WHERE col2 = @name2;
 `
 
-export const SNOWFLAKE_INIT_CODE = `-- to pin the database use '-- database f/your/path'
+const SNOWFLAKE_INIT_CODE = `-- to pin the database use '-- database f/your/path'
 -- ? name1 (varchar) = default arg
 -- ? name2 (int)
 INSERT INTO demo VALUES (?, ?);
@@ -215,7 +275,7 @@ INSERT INTO demo VALUES (?, ?);
 UPDATE demo SET col2 = ? WHERE col2 = ?;
 `
 
-export const MSSQL_INIT_CODE = `-- return_last_result
+const MSSQL_INIT_CODE = `-- return_last_result
 -- to pin the database use '-- database f/your/path'
 -- @p1 name1 (varchar) = default arg
 -- @p2 name2 (int)
@@ -224,7 +284,7 @@ INSERT INTO demo VALUES (@p1, @p2);
 UPDATE demo SET col2 = @p3 WHERE col2 = @p2;
 `
 
-export const GRAPHQL_INIT_CODE = `query($name4: String, $name2: Int, $name3: [String]) {
+const GRAPHQL_INIT_CODE = `query($name4: String, $name2: Int, $name3: [String]) {
 	demo(name1: $name1, name2: $name2, name3: $name3) {
 		name1,
 		name2,
@@ -233,7 +293,7 @@ export const GRAPHQL_INIT_CODE = `query($name4: String, $name2: Int, $name3: [St
 }
 `
 
-export const PHP_INIT_CODE = `<?php
+const PHP_INIT_CODE = `<?php
 
 // remove the first // of the following lines to specify packages to install using composer
 // // require:
@@ -253,7 +313,7 @@ function main(
 }
 `
 
-export const RUST_INIT_CODE = `//! Add dependencies in the following partial Cargo.toml manifest
+const RUST_INIT_CODE = `//! Add dependencies in the following partial Cargo.toml manifest
 //!
 //! \`\`\`cargo
 //! [dependencies]
@@ -288,7 +348,7 @@ fn main(who_to_greet: String, numbers: Vec<i8>) -> anyhow::Result<Ret> {
 }
 `
 
-export const FETCH_INIT_CODE = `export async function main(
+const FETCH_INIT_CODE = `export async function main(
 	url: string | undefined,
 	method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS' = 'GET',
 	body: Object = {},
@@ -319,7 +379,7 @@ export const FETCH_INIT_CODE = `export async function main(
 		})
 }`
 
-export const BASH_INIT_CODE = `# shellcheck shell=bash
+const BASH_INIT_CODE = `# shellcheck shell=bash
 # arguments of the form X="$I" are parsed as parameters X of type string
 msg="$1"
 dflt="\${2:-default value}"
@@ -329,7 +389,7 @@ dflt="\${2:-default value}"
 echo "Hello $msg"
 `
 
-export const DENO_INIT_CODE_TRIGGER = `import * as wmill from "npm:windmill-client@${__pkg__.version}"
+const DENO_INIT_CODE_TRIGGER = `import * as wmill from "npm:windmill-client@${__pkg__.version}"
 
 export async function main() {
 
@@ -350,7 +410,28 @@ export async function main() {
 }
 `
 
-export const GO_INIT_CODE_TRIGGER = `package inner
+const BUN_INIT_CODE_TRIGGER = `import * as wmill from "windmill-client"
+
+export async function main() {
+
+  // A common trigger script would follow this pattern:
+  // 1. Get the last saved state
+  // const state = await wmill.getState()
+  // 2. Get the actual state from the external service
+  // const newState = await (await fetch('https://hacker-news.firebaseio.com/v0/topstories.json')).json()
+  // 3. Compare the two states and update the internal state
+  // await wmill.setState(newState)
+  // 4. Return the new rows
+  // return range from (state to newState)
+
+  return [1,2,3]
+
+  // In subsequent scripts, you may refer to each row/value returned by the trigger script using
+  // 'flow_input.iter.value'
+}
+`
+
+const GO_INIT_CODE_TRIGGER = `package inner
 
 import (
 	wmill "github.com/windmill-labs/windmill-go-client"
@@ -374,7 +455,7 @@ func main() (interface{}, error) {
 }
 `
 
-export const DENO_INIT_CODE_APPROVAL = `import * as wmill from "npm:windmill-client@^1.158.2"
+const DENO_INIT_CODE_APPROVAL = `import * as wmill from "npm:windmill-client@^1.158.2"
 
 export async function main(approver?: string) {
   const urls = await wmill.getResumeUrls(approver)
@@ -402,7 +483,7 @@ export async function main(approver?: string) {
 // add a form in Advanced - Suspend
 // all on approval steps: https://www.windmill.dev/docs/flows/flow_approval`
 
-export const BUN_INIT_CODE_APPROVAL = `import * as wmill from "windmill-client@^1.158.2"
+const BUN_INIT_CODE_APPROVAL = `import * as wmill from "windmill-client@^1.158.2"
 
 export async function main(approver?: string) {
   const urls = await wmill.getResumeUrls(approver)
@@ -430,10 +511,10 @@ export async function main(approver?: string) {
 // add a form in Advanced - Suspend
 // all on approval steps: https://www.windmill.dev/docs/flows/flow_approval`
 
-export const BUN_PREPROCESSOR_MODULE_CODE = `
+const BUN_PREPROCESSOR_MODULE_CODE = `
 export async function preprocessor(
 	wm_trigger: {
-		kind: 'http' | 'email' | 'webhook',
+		kind: 'http' | 'email' | 'webhook' | 'websocket',
 		http?: {
 			route: string // The route path, e.g. "/users/:id"
 			path: string // The actual path called, e.g. "/users/123"
@@ -451,10 +532,10 @@ export async function preprocessor(
 }
 `
 
-export const DENO_PREPROCESSOR_MODULE_CODE = `
+const DENO_PREPROCESSOR_MODULE_CODE = `
 export async function preprocessor(
 	wm_trigger: {
-		kind: 'http' | 'email' | 'wehbook',
+		kind: 'http' | 'email' | 'wehbook' | 'websocket',
 		http?: {
 			route: string // The route path, e.g. "/users/:id"
 			path: string // The actual path called, e.g. "/users/123"
@@ -472,7 +553,7 @@ export async function preprocessor(
 }
 `
 
-export const PYTHON_INIT_CODE_APPROVAL = `import wmill
+const PYTHON_INIT_CODE_APPROVAL = `import wmill
 
 def main():
   urls = wmill.get_resume_urls()
@@ -499,7 +580,7 @@ def main():
 # add a form in Advanced - Suspend
 # all on approval steps: https://www.windmill.dev/docs/flows/flow_approval`
 
-export const PYTHON_PREPROCESSOR_MODULE_CODE = `from typing import TypedDict, Literal
+const PYTHON_PREPROCESSOR_MODULE_CODE = `from typing import TypedDict, Literal
 
 class Http(TypedDict):
 	route: str # The route path, e.g. "/users/:id"
@@ -510,7 +591,7 @@ class Http(TypedDict):
 	headers: dict[str, str]
 
 class WmTrigger(TypedDict):
-    kind: Literal["http", "email", "webhook"]
+    kind: Literal["http", "email", "webhook", "websocket"]
     http: Http | None
 
 def preprocessor(
@@ -522,7 +603,7 @@ def preprocessor(
 	}
 `
 
-export const DOCKER_INIT_CODE = `# shellcheck shell=bash
+const DOCKER_INIT_CODE = `# shellcheck shell=bash
 # Bash script that calls docker as a client to the host daemon
 # See documentation: https://www.windmill.dev/docs/advanced/docker
 msg="\${1:-world}"
@@ -535,7 +616,7 @@ docker pull $IMAGE
 docker run --rm $IMAGE $COMMAND
 `
 
-export const POWERSHELL_INIT_CODE = `param($Msg, $Dflt = "default value", [int]$Nb = 3)
+const POWERSHELL_INIT_CODE = `param($Msg, $Dflt = "default value", [int]$Nb = 3)
 
 # Import-Module MyModule
 
@@ -546,7 +627,7 @@ export const POWERSHELL_INIT_CODE = `param($Msg, $Dflt = "default value", [int]$
 # the last line of the stdout is the return value
 Write-Output "Hello $Msg"`
 
-export const ANSIBLE_PLAYBOOK_INIT_CODE = `---
+const ANSIBLE_PLAYBOOK_INIT_CODE = `---
 inventory:
   - resource_type: ansible_inventory
     # You can pin an inventory to this script by hardcoding the resource path:
@@ -554,9 +635,11 @@ inventory:
 
 # File resources will be written in the relative \`target\` location before
 # running the playbook
-# file_resources:
+# files:
   # - resource: u/user/fabulous_jinja_template
   #   target:  ./config_template.j2
+  # - variable: u/user/ssh_key
+  #   target:  ./ssh_key
 
 # Define the arguments of the windmill script
 extra_vars:
@@ -590,43 +673,90 @@ dependencies:
       content: "{{ my_result | to_json }}"
       dest: result.json
 `
-
-const ALL_INITIAL_CODE = [
-	PYTHON_INIT_CODE,
-	PYTHON_INIT_CODE_TRIGGER,
-	DENO_INIT_CODE,
-	POSTGRES_INIT_CODE,
-	MYSQL_INIT_CODE,
-	BIGQUERY_INIT_CODE,
-	SNOWFLAKE_INIT_CODE,
-	MSSQL_INIT_CODE,
-	GRAPHQL_INIT_CODE,
-	DENO_INIT_CODE_TRIGGER,
-	DENO_INIT_CODE_CLEAR,
-	PYTHON_INIT_CODE_CLEAR,
-	PYTHON_FAILURE_MODULE_CODE,
-	PYTHON_PREPROCESSOR_MODULE_CODE,
-	DENO_INIT_CODE_APPROVAL,
-	DENO_FAILURE_MODULE_CODE,
-	DENO_PREPROCESSOR_MODULE_CODE,
-	BUN_INIT_CODE,
-	BUN_INIT_CODE_CLEAR,
-	BUN_INIT_CODE_APPROVAL,
-	BUN_FAILURE_MODULE_CODE,
-	BUN_PREPROCESSOR_MODULE_CODE,
-	BASH_INIT_CODE,
-	POWERSHELL_INIT_CODE,
-	PHP_INIT_CODE,
-	RUST_INIT_CODE,
-	ANSIBLE_PLAYBOOK_INIT_CODE
-]
+export const INITIAL_CODE = {
+	bun: {
+		script: BUN_INIT_CODE,
+		trigger: BUN_INIT_CODE_TRIGGER,
+		approval: BUN_INIT_CODE_APPROVAL,
+		failure: BUN_FAILURE_MODULE_CODE,
+		preprocessor: BUN_PREPROCESSOR_MODULE_CODE,
+		clear: BUN_INIT_CODE_CLEAR
+	},
+	python3: {
+		script: PYTHON_INIT_CODE,
+		trigger: PYTHON_INIT_CODE_TRIGGER,
+		approval: PYTHON_INIT_CODE_APPROVAL,
+		failure: PYTHON_FAILURE_MODULE_CODE,
+		preprocessor: PYTHON_PREPROCESSOR_MODULE_CODE,
+		clear: PYTHON_INIT_CODE_CLEAR
+	},
+	deno: {
+		script: DENO_INIT_CODE,
+		trigger: DENO_INIT_CODE_TRIGGER,
+		approval: DENO_INIT_CODE_APPROVAL,
+		failure: DENO_FAILURE_MODULE_CODE,
+		preprocessor: DENO_PREPROCESSOR_MODULE_CODE,
+		fetch: FETCH_INIT_CODE,
+		clear: DENO_INIT_CODE_CLEAR
+	},
+	go: {
+		script: GO_INIT_CODE,
+		trigger: GO_INIT_CODE_TRIGGER,
+		failure: GO_FAILURE_MODULE_CODE
+	},
+	bash: {
+		script: BASH_INIT_CODE
+	},
+	powershell: {
+		script: POWERSHELL_INIT_CODE
+	},
+	nativets: {
+		script: NATIVETS_INIT_CODE
+	},
+	postgresql: {
+		script: POSTGRES_INIT_CODE
+	},
+	mysql: {
+		script: MYSQL_INIT_CODE
+	},
+	bigquery: {
+		script: BIGQUERY_INIT_CODE
+	},
+	snowflake: {
+		script: SNOWFLAKE_INIT_CODE
+	},
+	mssql: {
+		script: MSSQL_INIT_CODE
+	},
+	graphql: {
+		script: GRAPHQL_INIT_CODE
+	},
+	php: {
+		script: PHP_INIT_CODE
+	},
+	rust: {
+		script: RUST_INIT_CODE
+	},
+	ansible: {
+		script: ANSIBLE_PLAYBOOK_INIT_CODE
+	},
+	docker: {
+		script: DOCKER_INIT_CODE
+	},
+	bunnative: {
+		script: BUNNATIVE_INIT_CODE
+	}
+}
 
 export function isInitialCode(content: string): boolean {
-	for (const code of ALL_INITIAL_CODE) {
-		if (content === code) {
-			return true
-		}
-	}
+	Object.values(INITIAL_CODE).forEach((lang) => {
+		Object.values(lang).forEach((code) => {
+			if (content === code) {
+				return true
+			}
+		})
+	})
+
 	return false
 }
 
@@ -650,92 +780,93 @@ export function initialCode(
 	}
 	if (language === 'deno') {
 		if (kind === 'trigger') {
-			return DENO_INIT_CODE_TRIGGER
+			return INITIAL_CODE.deno.trigger
 		} else if (kind === 'script') {
 			if (subkind === 'flow') {
-				return DENO_INIT_CODE_CLEAR
+				return INITIAL_CODE.deno.clear
 			} else if (subkind === 'pgsql') {
-				return POSTGRES_INIT_CODE
+				return INITIAL_CODE.postgresql.script
 			} else if (subkind === 'mysql') {
-				return MYSQL_INIT_CODE
+				return INITIAL_CODE.mysql.script
 			} else if (subkind === 'fetch') {
-				return FETCH_INIT_CODE
+				return INITIAL_CODE.deno.fetch
 			} else if (subkind === 'preprocessor') {
-				return DENO_PREPROCESSOR_MODULE_CODE
+				return INITIAL_CODE.deno.preprocessor
 			} else {
-				return DENO_INIT_CODE
+				return INITIAL_CODE.deno.script
 			}
 		} else if (kind === 'failure') {
-			return DENO_FAILURE_MODULE_CODE
+			return INITIAL_CODE.deno.failure
 		} else if (kind === 'approval') {
-			return DENO_INIT_CODE_APPROVAL
+			return INITIAL_CODE.deno.approval
 		} else {
-			return DENO_INIT_CODE
+			return INITIAL_CODE.deno.script
 		}
 	} else if (language === 'python3') {
 		if (kind === 'trigger') {
-			return PYTHON_INIT_CODE_TRIGGER
+			return INITIAL_CODE.python3.trigger
 		} else if (kind === 'approval') {
-			return PYTHON_INIT_CODE_APPROVAL
+			return INITIAL_CODE.python3.approval
 		} else if (kind === 'failure') {
-			return PYTHON_FAILURE_MODULE_CODE
+			return INITIAL_CODE.python3.failure
 		} else if (subkind === 'flow') {
-			return PYTHON_INIT_CODE_CLEAR
+			return INITIAL_CODE.python3.clear
 		} else if (subkind === 'preprocessor') {
-			return PYTHON_PREPROCESSOR_MODULE_CODE
+			return INITIAL_CODE.python3.preprocessor
 		} else {
-			return PYTHON_INIT_CODE
+			return INITIAL_CODE.python3.script
 		}
 	} else if (language == 'bash') {
 		if (subkind === 'docker') {
-			return DOCKER_INIT_CODE
+			return INITIAL_CODE.docker.script
 		} else {
-			return BASH_INIT_CODE
+			return INITIAL_CODE.bash.script
 		}
 	} else if (language == 'powershell') {
-		return POWERSHELL_INIT_CODE
+		return INITIAL_CODE.powershell.script
 	} else if (language == 'nativets') {
-		return NATIVETS_INIT_CODE
+		return INITIAL_CODE.nativets.script
 	} else if (language == 'postgresql') {
-		return POSTGRES_INIT_CODE
+		return INITIAL_CODE.postgresql.script
 	} else if (language == 'mysql') {
-		return MYSQL_INIT_CODE
+		return INITIAL_CODE.mysql.script
 	} else if (language == 'bigquery') {
-		return BIGQUERY_INIT_CODE
+		return INITIAL_CODE.bigquery.script
 	} else if (language == 'snowflake') {
-		return SNOWFLAKE_INIT_CODE
+		return INITIAL_CODE.snowflake.script
 	} else if (language == 'mssql') {
-		return MSSQL_INIT_CODE
+		return INITIAL_CODE.mssql.script
 	} else if (language == 'graphql') {
-		return GRAPHQL_INIT_CODE
+		return INITIAL_CODE.graphql.script
 	} else if (language == 'php') {
-		return PHP_INIT_CODE
+		return INITIAL_CODE.php.script
 	} else if (language == 'rust') {
-		return RUST_INIT_CODE
+		return INITIAL_CODE.rust.script
 	} else if (language == 'ansible') {
-		return ANSIBLE_PLAYBOOK_INIT_CODE
+		return INITIAL_CODE.ansible.script
 	} else if (language == 'bun' || language == 'bunnative') {
-		if (language == 'bunnative' || subkind === 'bunnative') {
-			return BUNNATIVE_INIT_CODE
+		if (kind == 'trigger') {
+			return INITIAL_CODE.bun.trigger
+		} else if (language == 'bunnative' || subkind === 'bunnative') {
+			return INITIAL_CODE.bunnative.script
 		} else if (kind === 'approval') {
-			return BUN_INIT_CODE_APPROVAL
+			return INITIAL_CODE.bun.approval
 		} else if (kind === 'failure') {
-			return BUN_FAILURE_MODULE_CODE
+			return INITIAL_CODE.bun.failure
 		} else if (subkind === 'preprocessor') {
-			return BUN_PREPROCESSOR_MODULE_CODE
-		}
-		if (subkind === 'flow') {
-			return BUN_INIT_CODE_CLEAR
+			return INITIAL_CODE.bun.preprocessor
+		} else if (subkind === 'flow') {
+			return INITIAL_CODE.bun.clear
 		}
 
-		return BUN_INIT_CODE
+		return INITIAL_CODE.bun.script
 	} else {
 		if (kind === 'failure') {
-			return GO_FAILURE_MODULE_CODE
+			return INITIAL_CODE.go.failure
 		} else if (kind === 'trigger') {
-			return GO_INIT_CODE_TRIGGER
+			return INITIAL_CODE.go.trigger
 		} else {
-			return GO_INIT_CODE
+			return INITIAL_CODE.go.script
 		}
 	}
 }
diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts
index 16692ee0ae..e2dabd8f3b 100644
--- a/frontend/src/lib/utils.ts
+++ b/frontend/src/lib/utils.ts
@@ -11,11 +11,15 @@ import { deepEqual } from 'fast-equals'
 import YAML from 'yaml'
 import type { UserExt } from './stores'
 import { sendUserToast } from './toast'
-import type { Script } from './gen'
+import type { Job, Script } from './gen'
 import type { EnumType, SchemaProperty } from './common'
 import type { Schema } from './common'
 export { sendUserToast }
 
+export function isJobCancelable(j: Job): boolean {
+	return j.type === 'QueuedJob' && !j.schedule_path && !j.canceled
+}
+
 export function validateUsername(username: string): string {
 	if (username != '' && !/^[a-zA-Z]\w+$/.test(username)) {
 		return 'username can only contain letters and numbers and must start with a letter'
@@ -468,7 +472,7 @@ export async function copyToClipboard(value?: string, sendToast = true): Promise
 }
 
 export function pluralize(quantity: number, word: string, customPlural?: string) {
-	if (quantity <= 1) {
+	if (quantity == 1) {
 		return `${quantity} ${word}`
 	} else if (customPlural) {
 		return `${quantity} ${customPlural}}`
@@ -494,7 +498,7 @@ export function isObject(obj: any) {
 
 export function debounce(func: (...args: any[]) => any, wait: number) {
 	let timeout: any
-	return function(...args: any[]) {
+	return function (...args: any[]) {
 		// @ts-ignore
 		const context = this
 		clearTimeout(timeout)
@@ -504,7 +508,7 @@ export function debounce(func: (...args: any[]) => any, wait: number) {
 
 export function throttle<T>(func: (...args: any[]) => T, wait: number) {
 	let timeout: any
-	return function(...args: any[]) {
+	return function (...args: any[]) {
 		if (!timeout) {
 			timeout = setTimeout(() => {
 				timeout = null
diff --git a/frontend/src/routes/(root)/(logged)/+layout.svelte b/frontend/src/routes/(root)/(logged)/+layout.svelte
index 3eae42916f..e5b0c3271d 100644
--- a/frontend/src/routes/(root)/(logged)/+layout.svelte
+++ b/frontend/src/routes/(root)/(logged)/+layout.svelte
@@ -8,7 +8,6 @@
 		RawAppService,
 		ScriptService,
 		SettingService,
-		HttpTriggerService,
 		UserService,
 		WorkspaceService
 	} from '$lib/gen'
@@ -140,7 +139,8 @@
 
 	async function loadHubBaseUrl() {
 		$hubBaseUrlStore =
-			((await SettingService.getGlobal({ key: 'hub_base_url' })) as string) ??
+			((await SettingService.getGlobal({ key: 'hub_accessible_url' })) as string) ||
+			((await SettingService.getGlobal({ key: 'hub_base_url' })) as string) ||
 			'https://hub.windmill.dev'
 	}
 
@@ -187,8 +187,17 @@
 	}
 
 	async function loadUsedTriggerKinds() {
-		const httpUsed = await HttpTriggerService.used({ workspace: $workspaceStore ?? '' })
-		$usedTriggerKinds = httpUsed ? ['http'] : []
+		let usedKinds: string[] = []
+		const { http_routes_used, websocket_used } = await WorkspaceService.getUsedTriggers({
+			workspace: $workspaceStore ?? ''
+		})
+		if (http_routes_used) {
+			usedKinds.push('http')
+		}
+		if (websocket_used) {
+			usedKinds.push('ws')
+		}
+		$usedTriggerKinds = usedKinds
 	}
 
 	function pathInAppMode(pathname: string | undefined): boolean {
diff --git a/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
index a92e91d62d..b8fb52948c 100644
--- a/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
@@ -13,6 +13,7 @@
 	import { decodeState, emptySchema } from '$lib/utils'
 	import { tick } from 'svelte'
 	import { writable } from 'svelte/store'
+	import type { ScheduleTrigger } from '$lib/components/triggers'
 
 	let nodraft = $page.url.searchParams.get('nodraft')
 
@@ -53,6 +54,7 @@
 	})
 	const flowStateStore = writable<FlowState>({})
 
+	let savedPrimarySchedule: ScheduleTrigger | undefined = undefined
 	async function loadFlow() {
 		loading = true
 		let flow: Flow = {
@@ -97,6 +99,7 @@
 
 			flow = state.flow
 			pathStoreInit = state.path
+			savedPrimarySchedule = state.primarySchedule
 			state?.selectedId && (selectedId = state?.selectedId)
 		} else {
 			if (templatePath) {
@@ -172,6 +175,7 @@
 	{flowStateStore}
 	{selectedId}
 	{loading}
+	{savedPrimarySchedule}
 >
 	<UnsavedConfirmationModal savedValue={savedFlow} modifiedValue={$flowStore} /></FlowBuilder
 >
diff --git a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
index f674433c11..9409ecca89 100644
--- a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
@@ -13,7 +13,9 @@
 	import { sendUserToast } from '$lib/toast'
 	import DiffDrawer from '$lib/components/DiffDrawer.svelte'
 	import UnsavedConfirmationModal from '$lib/components/common/confirmationModal/UnsavedConfirmationModal.svelte'
+	import type { ScheduleTrigger } from '$lib/components/triggers'
 
+	let version: undefined | number = undefined;
 	let nodraft = $page.url.searchParams.get('nodraft')
 	const initialState = nodraft ? undefined : localStorage.getItem(`flow-${$page.params.path}`)
 	let stateLoadedFromUrl = initialState != undefined ? decodeState(initialState) : undefined
@@ -54,11 +56,23 @@
 	let selectedId: string = 'settings-metadata'
 
 	let nobackenddraft = false
+
+	let savedPrimarySchedule: ScheduleTrigger | undefined = stateLoadedFromUrl?.primarySchedule
+
+	let flowBuilder: FlowBuilder | undefined = undefined
+
 	async function loadFlow(): Promise<void> {
 		loading = true
 		let flow: Flow
 		let statePath = stateLoadedFromUrl?.path
 		if (stateLoadedFromUrl != undefined && statePath == $page.params.path) {
+			// Currently there is no way to get version of flow with flow.
+			// So we have to request it here
+			version = (await FlowService.getFlowLatestVersion({
+				workspace: $workspaceStore!,
+				path: statePath
+			})).id;
+
 			savedFlow = await FlowService.getFlowByPathWithDraft({
 				workspace: $workspaceStore!,
 				path: statePath
@@ -67,6 +81,7 @@
 			const draftOrDeployed = cleanValueProperties(savedFlow?.draft || savedFlow)
 			const urlScript = cleanValueProperties(stateLoadedFromUrl.flow)
 			flow = stateLoadedFromUrl.flow
+			savedPrimarySchedule = stateLoadedFromUrl.primarySchedule
 			const reloadAction = () => {
 				stateLoadedFromUrl = undefined
 				goto(`/flows/edit/${statePath}`)
@@ -96,6 +111,13 @@
 				])
 			}
 		} else {
+			// Currently there is no way to get version of flow with flow.
+			// So we have to request it here
+			version = (await FlowService.getFlowLatestVersion({
+				workspace: $workspaceStore!,
+				path: $page.params.path
+			})).id;
+
 			const flowWithDraft = await FlowService.getFlowByPathWithDraft({
 				workspace: $workspaceStore!,
 				path: $page.params.path
@@ -113,6 +135,9 @@
 			}
 			if (flowWithDraft.draft != undefined && !nobackenddraft) {
 				flow = flowWithDraft.draft
+				savedPrimarySchedule = flowWithDraft?.draft?.['primary_schedule']
+				flowBuilder?.setPrimarySchedule(savedPrimarySchedule)
+
 				if (!flowWithDraft.draft_only) {
 					const deployed = cleanValueProperties(flowWithDraft)
 					const draft = cleanValueProperties(flow)
@@ -216,8 +241,11 @@
 	{selectedId}
 	{initialArgs}
 	{loading}
+	bind:this={flowBuilder}
 	bind:savedFlow
 	{diffDrawer}
+	{savedPrimarySchedule}
+	bind:version
 >
 	<UnsavedConfirmationModal {diffDrawer} savedValue={savedFlow} modifiedValue={$flowStore} />
 </FlowBuilder>
diff --git a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
index 3f71923a15..64b003a8a8 100644
--- a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
@@ -6,15 +6,16 @@
 		WorkspaceService,
 		type Flow,
 		type FlowModule,
+		type TriggersCount,
 		type WorkspaceDeployUISettings
 	} from '$lib/gen'
-	import { canWrite, defaultIfEmptyString, emptyString } from '$lib/utils'
+	import { canWrite, copyToClipboard, defaultIfEmptyString, emptyString } from '$lib/utils'
 	import { isDeployable, ALL_DEPLOYABLE } from '$lib/utils_deployable'
 
 	import DetailPageLayout from '$lib/components/details/DetailPageLayout.svelte'
 	import { goto } from '$lib/navigation'
 	import { base } from '$lib/base'
-	import { Alert, Button, Badge as HeaderBadge, Skeleton } from '$lib/components/common'
+	import { Alert, Badge as HeaderBadge, Skeleton } from '$lib/components/common'
 	import MoveDrawer from '$lib/components/MoveDrawer.svelte'
 	import RunForm from '$lib/components/RunForm.svelte'
 	import ShareModal from '$lib/components/ShareModal.svelte'
@@ -31,31 +32,35 @@
 		Badge,
 		Loader2,
 		GitFork,
+		Play,
 		History,
 		Columns,
 		Pen,
 		Eye,
-		Calendar,
-		HistoryIcon
+		HistoryIcon,
+		ClipboardCopy
 	} from 'lucide-svelte'
 
 	import DetailPageHeader from '$lib/components/details/DetailPageHeader.svelte'
-	import WebhooksPanel from '$lib/components/details/WebhooksPanel.svelte'
+	import WebhooksPanel from '$lib/components/triggers/WebhooksPanel.svelte'
 	import CliHelpBox from '$lib/components/CliHelpBox.svelte'
 	import FlowGraphViewer from '$lib/components/FlowGraphViewer.svelte'
-	import SchemaViewer from '$lib/components/SchemaViewer.svelte'
 	import RunPageSchedules from '$lib/components/RunPageSchedules.svelte'
 	import { createAppFromFlow } from '$lib/components/details/createAppFromScript'
 	import { importStore } from '$lib/components/apps/store'
 	import TimeAgo from '$lib/components/TimeAgo.svelte'
 	import ClipboardPanel from '$lib/components/details/ClipboardPanel.svelte'
 	import FlowGraphViewerStep from '$lib/components/FlowGraphViewerStep.svelte'
-	import { loadFlowSchedule, type Schedule } from '$lib/components/flows/scheduleUtils'
 	import GfmMarkdown from '$lib/components/GfmMarkdown.svelte'
 	import FlowHistory from '$lib/components/flows/FlowHistory.svelte'
 	import EmailTriggerPanel from '$lib/components/details/EmailTriggerPanel.svelte'
 	import Star from '$lib/components/Star.svelte'
 	import RoutesPanel from '$lib/components/triggers/RoutesPanel.svelte'
+	import { Highlight } from 'svelte-highlight'
+	import json from 'svelte-highlight/languages/json'
+	import { writable } from 'svelte/store'
+	import TriggersBadge from '$lib/components/graph/renderers/triggers/TriggersBadge.svelte'
+	import WebsocketTriggersPanel from '$lib/components/triggers/WebsocketTriggersPanel.svelte'
 
 	let flow: Flow | undefined
 	let can_write = false
@@ -67,6 +72,8 @@
 	let invisible_to_owner: boolean | undefined = undefined
 	let overrideTag: string | undefined = undefined
 
+	const triggersCount = writable<TriggersCount | undefined>(undefined)
+
 	$: cliCommand = `wmill flow run ${flow?.path} -d '${JSON.stringify(args)}'`
 
 	let previousPath: string | undefined = undefined
@@ -75,6 +82,7 @@
 			if (previousPath !== path) {
 				previousPath = path
 				loadFlow()
+				loadTriggersCount()
 			}
 		}
 	}
@@ -94,9 +102,15 @@
 		goto('/')
 	}
 
-	let schedule: Schedule | undefined = undefined
 	let starred: boolean | undefined = undefined
 
+	async function loadTriggersCount() {
+		$triggersCount = await FlowService.getTriggersCountOfFlow({
+			workspace: $workspaceStore!,
+			path
+		})
+	}
+
 	async function loadFlow(): Promise<void> {
 		flow = await FlowService.getFlowByPath({
 			workspace: $workspaceStore!,
@@ -108,9 +122,6 @@
 			invisible_to_owner = flow.visible_to_runner_only
 		}
 		can_write = canWrite(flow.path, flow.extra_perms!, $userStore)
-		try {
-			schedule = await loadFlowSchedule(path, $workspaceStore!)
-		} catch {}
 	}
 
 	let isValid = true
@@ -182,6 +193,19 @@
 			label: `View runs`,
 			buttonProps: {
 				href: `${base}/runs/${flow.path}`,
+				size: 'xs',
+				color: 'light',
+				startIcon: Play
+			}
+		})
+
+		buttons.push({
+			label: `History`,
+			buttonProps: {
+				onClick: () => {
+					flowHistory?.open()
+				},
+
 				size: 'xs',
 				color: 'light',
 				startIcon: History
@@ -312,9 +336,7 @@
 	}
 	let stepDetail: FlowModule | string | undefined = undefined
 	let token = 'TOKEN_TO_CREATE'
-	let detailSelected = 'saved_inputs'
-
-	let triggerSelected: 'webhooks' | 'schedule' | 'cli' = 'webhooks'
+	let rightPaneSelected = 'saved_inputs'
 
 	let flowHistory: FlowHistory | undefined = undefined
 </script>
@@ -340,8 +362,8 @@
 
 {#if flow}
 	<DetailPageLayout
-		bind:triggerSelected
-		bind:selected={detailSelected}
+		{triggersCount}
+		bind:selected={rightPaneSelected}
 		isOperator={$userStore?.operator}
 		flow_json={{
 			value: flow.value,
@@ -349,10 +371,12 @@
 			description: flow.description,
 			schema: flow.schema
 		}}
-		hasStepDetails={Boolean(stepDetail)}
 	>
 		<svelte:fragment slot="header">
 			<DetailPageHeader
+				on:seeTriggers={() => {
+					rightPaneSelected = 'triggers'
+				}}
 				{mainButtons}
 				menuItems={getMenuItems(flow, deployUiSettings)}
 				title={defaultIfEmptyString(flow.summary, flow.path)}
@@ -361,6 +385,18 @@
 				errorHandlerKind="flow"
 				tag={flow.tag}
 			>
+				<svelte:fragment slot="trigger-badges">
+					<TriggersBadge
+						showOnlyWithCount={true}
+						{path}
+						newItem={false}
+						isFlow
+						selected={rightPaneSelected == 'triggers'}
+						on:select={() => {
+							rightPaneSelected = 'triggers'
+						}}
+					/>
+				</svelte:fragment>
 				{#if $workspaceStore}
 					<Star
 						kind="flow"
@@ -386,21 +422,6 @@
 						</HeaderBadge>
 					</div>
 				{/if}
-				{#if schedule?.enabled}
-					<Button
-						btnClasses="inline-flex"
-						startIcon={{ icon: Calendar }}
-						variant="contained"
-						color="light"
-						size="xs"
-						on:click={() => {
-							detailSelected = 'details'
-							triggerSelected = 'schedule'
-						}}
-					>
-						{schedule.cron ?? ''}
-					</Button>
-				{/if}
 			</DetailPageHeader>
 		</svelte:fragment>
 		<svelte:fragment slot="form">
@@ -442,7 +463,7 @@
 					{/if}
 					<div class="flex flex-row gap-x-2 flex-wrap items-center">
 						<span class="text-sm text-tertiary">
-							Edited <TimeAgo withDate date={flow.edited_at ?? ''} /> by {flow.edited_by}
+							Edited <TimeAgo date={flow.edited_at ?? ''} /> by {flow.edited_by}
 						</span>
 
 						{#if flow.archived}
@@ -453,6 +474,7 @@
 				</div>
 				<div class="mt-8">
 					<FlowGraphViewer
+						triggerNode={true}
 						download
 						{flow}
 						overflowAuto
@@ -460,10 +482,15 @@
 						on:select={(e) => {
 							if (e.detail) {
 								stepDetail = e.detail
+								rightPaneSelected = 'flow_step'
 							} else {
 								stepDetail = undefined
+								rightPaneSelected = 'saved_inputs'
 							}
 						}}
+						on:triggerDetail={(e) => {
+							rightPaneSelected = 'triggers'
+						}}
 					/>
 				</div>
 			</div>
@@ -480,33 +507,52 @@
 				}}
 			/>
 		</svelte:fragment>
-		<svelte:fragment slot="details">
-			<div class="p-1">
-				<SchemaViewer schema={flow.schema} />
+		<svelte:fragment slot="schema">
+			<div class="p-1 relative">
+				<button
+					on:click={() => copyToClipboard(JSON.stringify(flow?.schema, null, 4))}
+					class="absolute top-2 right-2"
+				>
+					<ClipboardCopy size={14} />
+				</button>
+				<Highlight language={json} code={JSON.stringify(flow?.schema, null, 4)} />
 			</div>
 		</svelte:fragment>
 		<svelte:fragment slot="webhooks">
-			<WebhooksPanel
-				bind:token
-				scopes={[`run:flow/${flow?.path}`]}
-				path={flow?.path}
-				isFlow={true}
-				{args}
-			/>
+			<div class="p-2">
+				<WebhooksPanel
+					bind:token
+					scopes={[`run:flow/${flow?.path}`]}
+					path={flow?.path}
+					isFlow={true}
+					{args}
+				/>
+			</div>
 		</svelte:fragment>
 		<svelte:fragment slot="routes">
-			<RoutesPanel path={flow.path ?? ''} isFlow />
+			<div class="p-2">
+				<RoutesPanel path={flow.path ?? ''} isFlow />
+			</div>
 		</svelte:fragment>
-		<svelte:fragment slot="email">
-			<EmailTriggerPanel
-				bind:token
-				scopes={[`run:flow/${flow?.path}`]}
-				path={flow?.path}
-				isFlow={true}
-			/>
+		<svelte:fragment slot="websockets">
+			<div class="p-2">
+				<WebsocketTriggersPanel path={flow.path ?? ''} isFlow />
+			</div>
 		</svelte:fragment>
-		<svelte:fragment slot="schedule">
-			<RunPageSchedules isFlow={true} path={flow.path ?? ''} {can_write} />
+		<svelte:fragment slot="emails">
+			<div class="p-2">
+				<EmailTriggerPanel
+					bind:token
+					scopes={[`run:flow/${flow?.path}`]}
+					path={flow?.path}
+					isFlow={true}
+				/>
+			</div>
+		</svelte:fragment>
+		<svelte:fragment slot="schedules">
+			<div class="p-2">
+				<RunPageSchedules schema={flow.schema} isFlow={true} path={flow.path ?? ''} {can_write} />
+			</div>
 		</svelte:fragment>
 		<svelte:fragment slot="cli">
 			<div class="p-2">
diff --git a/frontend/src/routes/(root)/(logged)/routes/+page.svelte b/frontend/src/routes/(root)/(logged)/routes/+page.svelte
index a865544cb5..c2f12fbe8a 100644
--- a/frontend/src/routes/(root)/(logged)/routes/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/routes/+page.svelte
@@ -54,7 +54,7 @@
 	const TRIGGER_PATH_KIND_FILTER_SETTING = 'filter_path_of'
 	const FILTER_USER_FOLDER_SETTING_NAME = 'user_and_folders_only'
 	let selectedFilterKind =
-		(getLocalSetting(TRIGGER_PATH_KIND_FILTER_SETTING) as 'route' | 'script_flow') ?? 'route'
+		(getLocalSetting(TRIGGER_PATH_KIND_FILTER_SETTING) as 'trigger' | 'script_flow') ?? 'trigger'
 	let filterUserFolders = getLocalSetting(FILTER_USER_FOLDER_SETTING_NAME) == 'true'
 
 	$: storeLocalSetting(TRIGGER_PATH_KIND_FILTER_SETTING, selectedFilterKind)
@@ -62,12 +62,12 @@
 
 	function filterItemsPathsBaseOnUserFilters(
 		item: TriggerW,
-		selectedFilterKind: 'route' | 'script_flow',
+		selectedFilterKind: 'trigger' | 'script_flow',
 		filterUserFolders: boolean
 	) {
 		if ($workspaceStore == 'admins') return true
 		if (filterUserFolders) {
-			if (selectedFilterKind === 'route') {
+			if (selectedFilterKind === 'trigger') {
 				return (
 					!item.path.startsWith('u/') || item.path.startsWith('u/' + $userStore?.username + '/')
 				)
@@ -84,15 +84,15 @@
 
 	$: preFilteredItems =
 		ownerFilter != undefined
-			? selectedFilterKind === 'route'
+			? selectedFilterKind === 'trigger'
 				? triggers?.filter(
 						(x) =>
-							x.path.startsWith(ownerFilter + '/' ?? '') &&
+							x.path.startsWith(ownerFilter + '/') &&
 							filterItemsPathsBaseOnUserFilters(x, selectedFilterKind, filterUserFolders)
 				  )
 				: triggers?.filter(
 						(x) =>
-							x.script_path.startsWith(ownerFilter + '/' ?? '') &&
+							x.script_path.startsWith(ownerFilter + '/') &&
 							filterItemsPathsBaseOnUserFilters(x, selectedFilterKind, filterUserFolders)
 				  )
 			: triggers?.filter((x) =>
@@ -104,7 +104,7 @@
 	}
 
 	$: owners =
-		selectedFilterKind === 'route'
+		selectedFilterKind === 'trigger'
 			? Array.from(
 					new Set(filteredItems?.map((x) => x.path.split('/').slice(0, 2).join('/')) ?? [])
 			  ).sort()
@@ -133,7 +133,7 @@
 		let queryFilterKind = url.searchParams.get(TRIGGER_PATH_KIND_FILTER_SETTING)
 		let queryFilterUserFolders = url.searchParams.get(FILTER_USER_FOLDER_SETTING_NAME)
 		if (queryFilterKind) {
-			selectedFilterKind = queryFilterKind as 'route' | 'script_flow'
+			selectedFilterKind = queryFilterKind as 'trigger' | 'script_flow'
 		}
 		if (queryFilterUserFolders) {
 			filterUserFolders = queryFilterUserFolders == 'true'
@@ -174,7 +174,7 @@
 			<div class="flex flex-row items-center gap-2 mt-6">
 				<div class="text-sm shrink-0"> Filter by path of </div>
 				<ToggleButtonGroup bind:selected={selectedFilterKind}>
-					<ToggleButton small value="route" label="Route" icon={Route} />
+					<ToggleButton small value="trigger" label="Route" icon={Route} />
 					<ToggleButton small value="script_flow" label="Script/Flow" icon={Code} />
 				</ToggleButtonGroup>
 			</div>
diff --git a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
index 6131ed5ea0..1669b17720 100644
--- a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
@@ -9,9 +9,8 @@
 		type WorkflowStatus,
 		type NewScript,
 		ConcurrencyGroupsService,
-
-		MetricsService
-
+		MetricsService,
+		type ScriptArgs
 	} from '$lib/gen'
 	import {
 		canWrite,
@@ -93,11 +92,13 @@
 	import HighlightTheme from '$lib/components/HighlightTheme.svelte'
 	import PreprocessedArgsDisplay from '$lib/components/runs/PreprocessedArgsDisplay.svelte'
 	import ExecutionDuration from '$lib/components/ExecutionDuration.svelte'
+	import CustomPopover from '$lib/components/CustomPopover.svelte'
+	import { isWindmillTooBigObject } from '$lib/components/job_args'
 
 	let job: Job | undefined
 	let jobUpdateLastFetch: Date | undefined
 
-	let scriptProgress: number | undefined = undefined;
+	let scriptProgress: number | undefined = undefined
 	let currentJobIsLongRunning: boolean = false
 
 	let viewTab: 'result' | 'logs' | 'code' | 'stats' = 'result'
@@ -203,20 +204,20 @@
 	async function onJobLoaded() {
 		// We want to set up scriptProgress once job is loaded
 		// We need this to show progress bar if job has progress and is finished
-		if (job && job.type == "CompletedJob"){
+		if (job && job.type == 'CompletedJob') {
 			// If error occured and job is completed
 			// than we fetch progress from server to display on what progress did it fail
 			// Could be displayed after run or as a historical page
 			// If opening page without running job (e.g. reloading page after run) progress will be displayed instantly
 			MetricsService.getJobProgress({
-				workspace: job.workspace_id ?? "NO_WORKSPACE",
-				id: job.id,
-			}).then(progress => {
-			  // Returned progress is not always 100%, could be 65%, 33%, anything
-			  // Its ok if its a failure and we want to keep that value
-			  // But we want progress to be 100% if job has been succeeded
-				scriptProgress = progress;
-			});
+				workspace: job.workspace_id ?? 'NO_WORKSPACE',
+				id: job.id
+			}).then((progress) => {
+				// Returned progress is not always 100%, could be 65%, 33%, anything
+				// Its ok if its a failure and we want to keep that value
+				// But we want progress to be 100% if job has been succeeded
+				scriptProgress = progress
+			})
 		}
 
 		if (job === undefined || job.job_kind !== 'script' || job.script_hash === undefined) {
@@ -229,7 +230,6 @@
 		if (script.restart_unless_cancelled ?? false) {
 			persistentScriptDefinition = script
 		}
-
 	}
 
 	$: {
@@ -309,6 +309,46 @@
 	}
 
 	let scheduleEditor: ScheduleEditor
+
+	let runImmediatelyLoading = false
+	async function runImmediately() {
+		runImmediatelyLoading = true
+		try {
+			let args = job?.args as ScriptArgs
+			if (isWindmillTooBigObject(args)) {
+				args = (await JobService.getJobArgs({
+					workspace: $workspaceStore!,
+					id: job?.id!
+				})) as ScriptArgs
+			}
+
+			const commonArgs = {
+				workspace: $workspaceStore!,
+				requestBody: args
+			}
+			if (job?.job_kind == 'script' || job?.job_kind == 'flow') {
+				let id
+
+				if (job?.job_kind == 'script') {
+					id = await JobService.runScriptByHash({
+						...commonArgs,
+						hash: job.script_hash!
+					})
+				} else {
+					id = await JobService.runFlowByPath({
+						...commonArgs,
+						path: job.script_path!
+					})
+				}
+
+				await goto('/run/' + id + '?workspace=' + $workspaceStore)
+			} else {
+				sendUserToast('Cannot run this job immediately', true)
+			}
+		} finally {
+			runImmediatelyLoading = false
+		}
+	}
 </script>
 
 <HighlightTheme />
@@ -349,7 +389,7 @@
 
 <TestJobLoader
 	lazyLogs
-	bind:scriptProgress 
+	bind:scriptProgress
 	on:done={() => job?.['result'] != undefined && (viewTab = 'result')}
 	bind:this={testJobLoader}
 	bind:getLogs
@@ -360,7 +400,7 @@
 	bind:notfound
 />
 
-<Portal>
+<Portal name="persistent-run">
 	<PersistentScriptDrawer bind:this={persistentScriptDrawer} />
 </Portal>
 
@@ -598,14 +638,23 @@
 				{/if}
 			{/if}
 			{#if job?.job_kind === 'script' || job?.job_kind === 'flow'}
-				<Button
-					on:click|once={() => {
-						goto(viewHref + `#${computeSharableHash(job?.args)}`)
-					}}
-					color="blue"
-					size="sm"
-					startIcon={{ icon: RefreshCw }}>Run again</Button
-				>
+				<CustomPopover noPadding appearTimeout={0}>
+					<Button
+						on:click|once={() => {
+							goto(viewHref + `#${computeSharableHash(job?.args)}`)
+						}}
+						color="blue"
+						size="sm"
+						startIcon={{ icon: RefreshCw }}>Run again</Button
+					>
+					<svelte:fragment slot="overlay">
+						<div class="flex flex-row gap-2">
+							<Button size="xs" loading={runImmediatelyLoading} on:click={() => runImmediately()}>
+								Run immediately with same args
+							</Button>
+						</div>
+					</svelte:fragment>
+				</CustomPopover>
 			{/if}
 			{#if job?.job_kind === 'script' || job?.job_kind === 'flow'}
 				{#if !$userStore?.operator}
@@ -613,11 +662,7 @@
 						<Button
 							on:click|once={() => {
 								$initialArgsStore = job?.args
-								goto(
-									`${stem}/edit/${
-										job?.script_path
-									}${isScript ? `` : `?nodraft=true`}`
-								)
+								goto(`${stem}/edit/${job?.script_path}${isScript ? `` : `?nodraft=true`}`)
 							}}
 							color="blue"
 							size="sm"
@@ -753,7 +798,7 @@
 				<Skeleton loading={!job} layout={[[9.5]]} />
 				{#if job}
 					<FlowMetadata {job} {scheduleEditor} />
-					{#if currentJobIsLongRunning && showExplicitProgressTip  && !scriptProgress && 'running' in job}
+					{#if currentJobIsLongRunning && showExplicitProgressTip && !scriptProgress && 'running' in job}
 						<Alert
 							class="mt-4 p-1 flex flex-row relative text-center"
 							size="xs"
@@ -801,7 +846,7 @@
 					/>
 				{/if}
 				{#if scriptProgress}
-					<JobProgressBar {job} {scriptProgress} class="py-4" hideStepTitle={true}/>
+					<JobProgressBar {job} {scriptProgress} class="py-4" hideStepTitle={true} />
 				{/if}
 				<!-- Logs and outputs-->
 				<div class="mr-2 sm:mr-0 mt-12">
diff --git a/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte
index 419465c623..120699e183 100644
--- a/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte
@@ -38,6 +38,7 @@
 	import DropdownV2 from '$lib/components/DropdownV2.svelte'
 	import { goto } from '$app/navigation'
 	import { base } from '$app/paths'
+	import { isJobCancelable } from '$lib/utils'
 
 	let jobs: Job[] | undefined
 	let selectedIds: string[] = []
@@ -166,6 +167,8 @@
 
 	let manualDatePicker: ManuelDatePicker
 
+	let runsTable: RunsTable
+
 	$: (user ||
 		label ||
 		folder ||
@@ -494,10 +497,6 @@
 		isCancelingVisibleJobs = true
 	}
 
-	function isJobCancelable(j: Job): boolean {
-		return j.type === 'QueuedJob' && !j.schedule_path
-	}
-
 	function jobCountString(count: number) {
 		return `${count} ${count == 1 ? 'job' : 'jobs'}`
 	}
@@ -755,14 +754,17 @@
 					minTimeSet={minTs}
 					maxTimeSet={maxTs}
 					maxIsNow={maxTs == undefined}
-					jobs={completedJobs}
 					on:loadExtra={loadExtra}
+					jobs={completedJobs}
 					on:zoom={async (e) => {
 						minTs = e.detail.min.toISOString()
 						maxTs = e.detail.max.toISOString()
 						manualDatePicker?.resetChoice()
 						jobLoader?.loadJobs(minTs, maxTs, true)
 					}}
+					on:pointClicked={(e) => {
+						runsTable.scrollToRun(e.detail)
+					}}
 				/>
 			{:else if graph === 'ConcurrencyChart'}
 				<ConcurrentJobsChart
@@ -988,6 +990,7 @@
 							on:filterByConcurrencyKey={filterByConcurrencyKey}
 							on:filterByTag={filterByTag}
 							on:filterBySchedule={filterBySchedule}
+							bind:this={runsTable}
 						/>
 					{:else}
 						<div class="gap-1 flex flex-col">
@@ -1131,6 +1134,9 @@
 						manualDatePicker?.resetChoice()
 						jobLoader?.loadJobs(minTs, maxTs, true)
 					}}
+					on:pointClicked={(e) => {
+						runsTable.scrollToRun(e.detail)
+					}}
 				/>
 			{:else if graph === 'ConcurrencyChart'}
 				<ConcurrentJobsChart
@@ -1359,6 +1365,7 @@
 				on:filterByLabel={filterByLabel}
 				on:filterByConcurrencyKey={filterByConcurrencyKey}
 				on:filterByTag={filterByTag}
+				bind:this={runsTable}
 			/>
 		</div>
 	</div>
diff --git a/frontend/src/routes/(root)/(logged)/schedules/+page.svelte b/frontend/src/routes/(root)/(logged)/schedules/+page.svelte
index e9225d405d..1f8c9e84a5 100644
--- a/frontend/src/routes/(root)/(logged)/schedules/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/schedules/+page.svelte
@@ -172,13 +172,13 @@
 			? selectedFilterKind === 'schedule'
 				? schedules?.filter(
 						(x) =>
-							x.path.startsWith(ownerFilter + '/' ?? '') &&
+							x.path.startsWith(ownerFilter + '/') &&
 							filterItemsPathsBaseOnUserFilters(x, selectedFilterKind, filterUserFolders) &&
 							filterItemsBasedOnEnabledDisabled(x, filterEnabledDisabled)
 				  )
 				: schedules?.filter(
 						(x) =>
-							x.script_path.startsWith(ownerFilter + '/' ?? '') &&
+							x.script_path.startsWith(ownerFilter + '/') &&
 							filterItemsPathsBaseOnUserFilters(x, selectedFilterKind, filterUserFolders) &&
 							filterItemsBasedOnEnabledDisabled(x, filterEnabledDisabled)
 				  )
diff --git a/frontend/src/routes/(root)/(logged)/scripts/add/+page.svelte b/frontend/src/routes/(root)/(logged)/scripts/add/+page.svelte
index 6e01f068b1..c4c8de15bf 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/add/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/add/+page.svelte
@@ -9,6 +9,7 @@
 	import { goto } from '$lib/navigation'
 	import { replaceState } from '$app/navigation'
 	import UnsavedConfirmationModal from '$lib/components/common/confirmationModal/UnsavedConfirmationModal.svelte'
+	import type { ScheduleTrigger } from '$lib/components/triggers'
 
 	// Default
 	let schema: Schema = emptySchema()
@@ -29,13 +30,16 @@
 	const initialState = $page.url.hash != '' ? $page.url.hash.slice(1) : undefined
 
 	let scriptBuilder: ScriptBuilder | undefined = undefined
+	let savedPrimarySchedule: ScheduleTrigger | undefined = undefined
 
 	function decodeStateAndHandleError(state) {
 		try {
-			return decodeState(state)
+			const decoded = decodeState(state)
+			savedPrimarySchedule = decoded.primarySchedule
+			return decoded
 		} catch (e) {
 			console.error('Error decoding state', e)
-			return defaultScript
+			return defaultScript()
 		}
 	}
 
@@ -115,6 +119,7 @@
 	searchParams={$page.url.searchParams}
 	{script}
 	{showMeta}
+	{savedPrimarySchedule}
 	replaceStateFn={(path) => replaceState(path, $page.state)}
 >
 	<UnsavedConfirmationModal savedValue={savedScript} modifiedValue={script} />
diff --git a/frontend/src/routes/(root)/(logged)/scripts/edit/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/scripts/edit/[...path]/+page.svelte
index a65d999a11..2479985148 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/edit/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/edit/[...path]/+page.svelte
@@ -10,6 +10,7 @@
 	import { sendUserToast } from '$lib/toast'
 	import DiffDrawer from '$lib/components/DiffDrawer.svelte'
 	import UnsavedConfirmationModal from '$lib/components/common/confirmationModal/UnsavedConfirmationModal.svelte'
+	import type { ScheduleTrigger } from '$lib/components/triggers'
 
 	let initialState = window.location.hash != '' ? window.location.hash.slice(1) : undefined
 	let initialArgs = {}
@@ -35,6 +36,8 @@
 	let savedScript: NewScriptWithDraft | undefined = undefined
 	let fullyLoaded = false
 
+	let savedPrimarySchedule: ScheduleTrigger | undefined = scriptLoadedFromUrl?.primarySchedule
+
 	async function loadScript(): Promise<void> {
 		fullyLoaded = false
 		if (scriptLoadedFromUrl != undefined && scriptLoadedFromUrl.path == $page.params.path) {
@@ -94,6 +97,10 @@
 				savedScript = structuredClone(scriptWithDraft)
 				if (scriptWithDraft.draft != undefined) {
 					script = scriptWithDraft.draft
+					if (script['primary_schedule']) {
+						savedPrimarySchedule = script['primary_schedule']
+						scriptBuilder?.setPrimarySchedule(savedPrimarySchedule)
+					}
 					if (!scriptWithDraft.draft_only) {
 						reloadAction = async () => {
 							scriptLoadedFromUrl = undefined
@@ -199,6 +206,7 @@
 		bind:savedScript
 		{initialArgs}
 		{diffDrawer}
+		{savedPrimarySchedule}
 		searchParams={$page.url.searchParams}
 		on:deploy={(e) => {
 			let newHash = e.detail
diff --git a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
index d123bb8973..a0523d77d1 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
@@ -6,6 +6,7 @@
 		ScriptService,
 		WorkspaceService,
 		type Script,
+		type TriggersCount,
 		type WorkspaceDeployUISettings
 	} from '$lib/gen'
 	import {
@@ -20,7 +21,6 @@
 	import { enterpriseLicense, hubBaseUrlStore, userStore, workspaceStore } from '$lib/stores'
 	import { isDeployable, ALL_DEPLOYABLE } from '$lib/utils_deployable'
 
-	import SchemaViewer from '$lib/components/SchemaViewer.svelte'
 	import { onDestroy } from 'svelte'
 	import HighlightCode from '$lib/components/HighlightCode.svelte'
 	import {
@@ -42,7 +42,7 @@
 	import DeployWorkspaceDrawer from '$lib/components/DeployWorkspaceDrawer.svelte'
 
 	import SavedInputs from '$lib/components/SavedInputs.svelte'
-	import WebhooksPanel from '$lib/components/details/WebhooksPanel.svelte'
+	import WebhooksPanel from '$lib/components/triggers/WebhooksPanel.svelte'
 	import DetailPageLayout from '$lib/components/details/DetailPageLayout.svelte'
 	import DetailPageHeader from '$lib/components/details/DetailPageHeader.svelte'
 	import CliHelpBox from '$lib/components/CliHelpBox.svelte'
@@ -50,7 +50,6 @@
 		Activity,
 		Archive,
 		ArchiveRestore,
-		Calendar,
 		Eye,
 		FolderOpen,
 		GitFork,
@@ -75,12 +74,16 @@
 	import TimeAgo from '$lib/components/TimeAgo.svelte'
 	import ClipboardPanel from '$lib/components/details/ClipboardPanel.svelte'
 	import PersistentScriptDrawer from '$lib/components/PersistentScriptDrawer.svelte'
-	import { loadScriptSchedule, type ScriptSchedule } from '$lib/scripts'
 	import GfmMarkdown from '$lib/components/GfmMarkdown.svelte'
 	import EmailTriggerPanel from '$lib/components/details/EmailTriggerPanel.svelte'
 	import Star from '$lib/components/Star.svelte'
 	import LogViewer from '$lib/components/LogViewer.svelte'
 	import RoutesPanel from '$lib/components/triggers/RoutesPanel.svelte'
+	import { Highlight } from 'svelte-highlight'
+	import json from 'svelte-highlight/languages/json'
+	import { writable } from 'svelte/store'
+	import TriggersBadge from '$lib/components/graph/renderers/triggers/TriggersBadge.svelte'
+	import WebsocketTriggersPanel from '$lib/components/triggers/WebsocketTriggersPanel.svelte'
 
 	let script: Script | undefined
 	let topHash: string | undefined
@@ -106,6 +109,8 @@
 		}
 	}
 
+	const triggersCount = writable<TriggersCount | undefined>(undefined)
+
 	async function deleteScript(hash: string): Promise<void> {
 		try {
 			await ScriptService.deleteScriptByHash({ workspace: $workspaceStore!, hash })
@@ -150,9 +155,15 @@
 			}
 		}
 	}
-	let schedule: ScriptSchedule | undefined = undefined
 	let starred: boolean | undefined = undefined
 
+	async function loadTriggersCount(path: string) {
+		$triggersCount = await ScriptService.getTriggersCountOfScript({
+			workspace: $workspaceStore!,
+			path: path
+		})
+	}
+
 	async function loadScript(hash: string): Promise<void> {
 		try {
 			script = await ScriptService.getScriptByHash({
@@ -173,7 +184,7 @@
 		can_write =
 			script.workspace_id == $workspaceStore &&
 			canWrite(script.path, script.extra_perms!, $userStore)
-		schedule = await loadScriptSchedule(script.path, $workspaceStore!)
+		loadTriggersCount(script.path)
 
 		if (script.path && script.archived) {
 			const script_by_path = await ScriptService.getScriptByPath({
@@ -477,8 +488,7 @@
 	}
 
 	let token = 'TOKEN_TO_CREATE'
-	let detailSelected = 'saved_inputs'
-	let triggerSelected: 'webhooks' | 'schedule' | 'cli' = 'webhooks'
+	let rightPaneSelected = 'saved_inputs'
 </script>
 
 <MoveDrawer
@@ -512,8 +522,8 @@
 	</Drawer>
 	{#key script.hash}
 		<DetailPageLayout
-			bind:triggerSelected
-			bind:selected={detailSelected}
+			{triggersCount}
+			bind:selected={rightPaneSelected}
 			isOperator={$userStore?.operator}
 		>
 			<svelte:fragment slot="header">
@@ -526,6 +536,18 @@
 					scriptOrFlowPath={script.path}
 					tag={script.tag}
 				>
+					<svelte:fragment slot="trigger-badges">
+						<TriggersBadge
+							showOnlyWithCount={true}
+							path={script.path}
+							newItem={false}
+							isFlow={false}
+							selected={rightPaneSelected == 'triggers'}
+							on:select={() => {
+								rightPaneSelected = 'triggers'
+							}}
+						/>
+					</svelte:fragment>
 					{#if $workspaceStore}
 						<Star
 							kind="script"
@@ -565,21 +587,6 @@
 							</Badge>
 						</div>
 					{/if}
-					{#if schedule?.enabled}
-						<Button
-							btnClasses="inline-flex"
-							startIcon={{ icon: Calendar }}
-							variant="contained"
-							color="light"
-							size="xs"
-							on:click={() => {
-								detailSelected = 'details'
-								triggerSelected = 'schedule'
-							}}
-						>
-							{schedule.cron ?? ''}
-						</Button>
-					{/if}
 				</DetailPageHeader>
 			</svelte:fragment>
 			<svelte:fragment slot="form">
@@ -660,8 +667,7 @@
 					{/if}
 					<div class="flex flex-row gap-x-2 flex-wrap items-center">
 						<span class="text-sm text-tertiary">
-							Edited <TimeAgo withDate date={script.created_at || ''} /> by {script.created_by ||
-								'unknown'}
+							Edited <TimeAgo date={script.created_at || ''} /> by {script.created_by || 'unknown'}
 						</span>
 						<Badge small color="gray">
 							{truncateHash(script?.hash ?? '')}
@@ -695,51 +701,57 @@
 				{/if}
 			</svelte:fragment>
 			<svelte:fragment slot="webhooks">
-				<WebhooksPanel
-					bind:token
-					scopes={[`run:script/${script?.path}`]}
-					hash={script.hash}
-					path={script.path}
-					{args}
-				/>
+				<div class="p-2">
+					<WebhooksPanel
+						bind:token
+						scopes={[`run:script/${script?.path}`]}
+						hash={script.hash}
+						path={script.path}
+						{args}
+					/>
+				</div>
 			</svelte:fragment>
 			<svelte:fragment slot="routes">
-				<RoutesPanel path={script.path ?? ''} isFlow={false} />
+				<div class="p-2">
+					<RoutesPanel path={script.path ?? ''} isFlow={false} />
+				</div>
 			</svelte:fragment>
-			<svelte:fragment slot="email">
-				<EmailTriggerPanel
-					bind:token
-					scopes={[`run:script/${script?.path}`]}
-					hash={script.hash}
-					path={script.path}
-				/>
+			<svelte:fragment slot="websockets">
+				<div class="p-2">
+					<WebsocketTriggersPanel path={script.path ?? ''} isFlow={false} />
+				</div>
 			</svelte:fragment>
-			<svelte:fragment slot="schedule">
-				<RunPageSchedules isFlow={false} path={script.path ?? ''} {can_write} />
+			<svelte:fragment slot="emails">
+				<div class="p-2">
+					<EmailTriggerPanel
+						bind:token
+						scopes={[`run:script/${script?.path}`]}
+						hash={script.hash}
+						path={script.path}
+					/>
+				</div>
 			</svelte:fragment>
-			<svelte:fragment slot="details">
-				<div>
+			<svelte:fragment slot="schedules">
+				<div class="p-2 mt-2">
+					<RunPageSchedules
+						schema={script.schema}
+						isFlow={false}
+						path={script.path ?? ''}
+						{can_write}
+					/>
+				</div>
+			</svelte:fragment>
+			<svelte:fragment slot="script">
+				<div class="h-full">
 					<Skeleton {loading} layout={[[20]]} />
 
 					<Tabs selected="code">
 						<Tab value="code" size="xs">Code</Tab>
 						<Tab value="dependencies" size="xs">Lockfile</Tab>
-						<Tab value="arguments" size="xs">
-							<span class="inline-flex items-center gap-1">
-								Inputs
-								<Tooltip>
-									The jsonschema defines the constraints that the payload must respect to be
-									compatible with the input parameters of this script. The UI form is generated
-									automatically from the script jsonschema. See
-									<a href="https://json-schema.org/" class="text-blue-500">
-										jsonschema documentation
-									</a>
-								</Tooltip>
-							</span>
-						</Tab>
+						<Tab value="schema" size="xs">Schema</Tab>
 						<svelte:fragment slot="content">
 							<TabContent value="code">
-								<div class="p-2 w-full overflow-auto">
+								<div class="p-2 w-full">
 									<HighlightCode
 										language={script.language}
 										code={script.content}
@@ -772,9 +784,15 @@
 									{/if}
 								</div>
 							</TabContent>
-							<TabContent value="arguments">
-								<div class="p-2">
-									<SchemaViewer schema={script.schema} />
+							<TabContent value="schema">
+								<div class="p-1 relative h-full">
+									<button
+										on:click={() => copyToClipboard(JSON.stringify(script?.schema, null, 4))}
+										class="absolute top-2 right-2"
+									>
+										<ClipboardCopy size={14} />
+									</button>
+									<Highlight language={json} code={JSON.stringify(script?.schema, null, 4)} />
 								</div>
 							</TabContent>
 						</svelte:fragment>
diff --git a/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte
index 89b0341747..21ca506c8b 100644
--- a/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte
@@ -24,6 +24,7 @@
 	import { isCloudHosted } from '$lib/cloud'
 	import { emptyString } from '$lib/utils'
 	import { getUserExt } from '$lib/user'
+	import { refreshSuperadmin } from '$lib/refreshUser'
 
 	let invites: WorkspaceInvite[] = []
 	let list_all_as_super_admin: boolean = false
@@ -45,6 +46,7 @@
 	}
 
 	async function loadWorkspaces() {
+		console.log('loading workspaces', $usersWorkspaceStore)
 		if (!$usersWorkspaceStore) {
 			try {
 				usersWorkspaceStore.set(await WorkspaceService.listUserWorkspaces())
@@ -76,7 +78,7 @@
 	}
 	$: list_all_as_super_admin != undefined && $userWorkspaces && handleListWorkspaces()
 
-	$: adminsInstance = workspaces?.find((x) => x.id == 'admins')
+	$: adminsInstance = workspaces?.find((x) => x.id == 'admins') || $superadmin
 
 	$: nonAdminWorkspaces = (workspaces ?? []).filter((x) => x.id != 'admins')
 	$: noWorkspaces = $superadmin && nonAdminWorkspaces.length == 0
@@ -97,6 +99,7 @@
 		getCreateWorkspaceRequireSuperadmin()
 	}
 
+	refreshSuperadmin()
 	loadInvites()
 	loadWorkspaces()
 
diff --git a/frontend/src/routes/(root)/embed_connect/+page.js b/frontend/src/routes/(root)/(logged)/websocket_triggers/+page.js
similarity index 51%
rename from frontend/src/routes/(root)/embed_connect/+page.js
rename to frontend/src/routes/(root)/(logged)/websocket_triggers/+page.js
index 4b8139b4c9..8e3a86c5f4 100644
--- a/frontend/src/routes/(root)/embed_connect/+page.js
+++ b/frontend/src/routes/(root)/(logged)/websocket_triggers/+page.js
@@ -1,5 +1,5 @@
 export function load() {
 	return {
-		stuff: { title: 'App Connection' }
+		stuff: { title: 'WS triggers' }
 	}
 }
diff --git a/frontend/src/routes/(root)/(logged)/websocket_triggers/+page.svelte b/frontend/src/routes/(root)/(logged)/websocket_triggers/+page.svelte
new file mode 100644
index 0000000000..49a8ec6e52
--- /dev/null
+++ b/frontend/src/routes/(root)/(logged)/websocket_triggers/+page.svelte
@@ -0,0 +1,422 @@
+<script lang="ts">
+	import { WebsocketTriggerService, type WebsocketTrigger } from '$lib/gen'
+	import {
+		canWrite,
+		displayDate,
+		getLocalSetting,
+		sendUserToast,
+		storeLocalSetting
+	} from '$lib/utils'
+	import { base } from '$app/paths'
+	import CenteredPage from '$lib/components/CenteredPage.svelte'
+	import { Alert, Button, Skeleton } from '$lib/components/common'
+	import Dropdown from '$lib/components/DropdownV2.svelte'
+	import PageHeader from '$lib/components/PageHeader.svelte'
+	import SharedBadge from '$lib/components/SharedBadge.svelte'
+	import ShareModal from '$lib/components/ShareModal.svelte'
+	import Toggle from '$lib/components/Toggle.svelte'
+	import { userStore, workspaceStore } from '$lib/stores'
+	import { Unplug, Code, Eye, Pen, Plus, Share, Trash, Circle } from 'lucide-svelte'
+	import { goto } from '$lib/navigation'
+	import SearchItems from '$lib/components/SearchItems.svelte'
+	import NoItemFound from '$lib/components/home/NoItemFound.svelte'
+	import RowIcon from '$lib/components/common/table/RowIcon.svelte'
+	import ListFilters from '$lib/components/home/ListFilters.svelte'
+	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
+	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
+	import { setQuery } from '$lib/navigation'
+	import { onDestroy, onMount } from 'svelte'
+	import WebsocketTriggerEditor from '$lib/components/triggers/WebsocketTriggerEditor.svelte'
+	import Popover from '$lib/components/Popover.svelte'
+	import { isCloudHosted } from '$lib/cloud'
+
+	type TriggerW = WebsocketTrigger & { canWrite: boolean }
+
+	let triggers: TriggerW[] = []
+	let shareModal: ShareModal
+	let loading = true
+
+	async function loadTriggers(): Promise<void> {
+		triggers = (
+			await WebsocketTriggerService.listWebsocketTriggers({ workspace: $workspaceStore! })
+		).map((x) => {
+			return { canWrite: canWrite(x.path, x.extra_perms!, $userStore), ...x }
+		})
+		loading = false
+	}
+
+	let status: {
+		[path: string]: { error: string | undefined; last_server_ping: string | undefined }
+	} = {}
+
+	let interval = setInterval(async () => {
+		try {
+			status = (
+				await WebsocketTriggerService.listWebsocketTriggers({
+					workspace: $workspaceStore!
+				})
+			).reduce((acc, x) => {
+				acc[x.path] = x
+				return acc
+			}, {})
+		} catch (err) {
+			console.error(err)
+		}
+	}, 5000)
+
+	onDestroy(() => {
+		clearInterval(interval)
+	})
+
+	async function setTriggerEnabled(path: string, enabled: boolean): Promise<void> {
+		try {
+			await WebsocketTriggerService.setWebsocketTriggerEnabled({
+				path,
+				workspace: $workspaceStore!,
+				requestBody: { enabled }
+			})
+		} catch (err) {
+			sendUserToast(
+				`Cannot ` + (enabled ? 'enable' : 'disable') + ` websocket trigger: ${err.body}`,
+				true
+			)
+		} finally {
+			loadTriggers()
+		}
+	}
+
+	$: {
+		if ($workspaceStore && $userStore) {
+			loadTriggers()
+		}
+	}
+	let websocketTriggerEditor: WebsocketTriggerEditor
+
+	let filteredItems: (TriggerW & { marked?: any })[] | undefined = []
+	let items: typeof filteredItems | undefined = []
+	let preFilteredItems: typeof filteredItems | undefined = []
+	let filter = ''
+	let ownerFilter: string | undefined = undefined
+	let nbDisplayed = 15
+
+	const TRIGGER_PATH_KIND_FILTER_SETTING = 'filter_path_of'
+	const FILTER_USER_FOLDER_SETTING_NAME = 'user_and_folders_only'
+	let selectedFilterKind =
+		(getLocalSetting(TRIGGER_PATH_KIND_FILTER_SETTING) as 'trigger' | 'script_flow') ?? 'trigger'
+	let filterUserFolders = getLocalSetting(FILTER_USER_FOLDER_SETTING_NAME) == 'true'
+
+	$: storeLocalSetting(TRIGGER_PATH_KIND_FILTER_SETTING, selectedFilterKind)
+	$: storeLocalSetting(FILTER_USER_FOLDER_SETTING_NAME, filterUserFolders ? 'true' : undefined)
+
+	function filterItemsPathsBaseOnUserFilters(
+		item: TriggerW,
+		selectedFilterKind: 'trigger' | 'script_flow',
+		filterUserFolders: boolean
+	) {
+		if ($workspaceStore == 'admins') return true
+		if (filterUserFolders) {
+			if (selectedFilterKind === 'trigger') {
+				return (
+					!item.path.startsWith('u/') || item.path.startsWith('u/' + $userStore?.username + '/')
+				)
+			} else {
+				return (
+					!item.script_path.startsWith('u/') ||
+					item.script_path.startsWith('u/' + $userStore?.username + '/')
+				)
+			}
+		} else {
+			return true
+		}
+	}
+
+	$: preFilteredItems =
+		ownerFilter != undefined
+			? selectedFilterKind === 'trigger'
+				? triggers?.filter(
+						(x) =>
+							x.path.startsWith(ownerFilter + '/') &&
+							filterItemsPathsBaseOnUserFilters(x, selectedFilterKind, filterUserFolders)
+				  )
+				: triggers?.filter(
+						(x) =>
+							x.script_path.startsWith(ownerFilter + '/') &&
+							filterItemsPathsBaseOnUserFilters(x, selectedFilterKind, filterUserFolders)
+				  )
+			: triggers?.filter((x) =>
+					filterItemsPathsBaseOnUserFilters(x, selectedFilterKind, filterUserFolders)
+			  )
+
+	$: if ($workspaceStore) {
+		ownerFilter = undefined
+	}
+
+	$: owners =
+		selectedFilterKind === 'trigger'
+			? Array.from(
+					new Set(filteredItems?.map((x) => x.path.split('/').slice(0, 2).join('/')) ?? [])
+			  ).sort()
+			: Array.from(
+					new Set(filteredItems?.map((x) => x.script_path.split('/').slice(0, 2).join('/')) ?? [])
+			  ).sort()
+
+	$: items = filter !== '' ? filteredItems : preFilteredItems
+
+	function updateQueryFilters(selectedFilterKind, filterUserFolders) {
+		setQuery(
+			new URL(window.location.href),
+			TRIGGER_PATH_KIND_FILTER_SETTING,
+			selectedFilterKind
+		).then(() => {
+			setQuery(
+				new URL(window.location.href),
+				FILTER_USER_FOLDER_SETTING_NAME,
+				String(filterUserFolders)
+			)
+		})
+	}
+
+	function loadQueryFilters() {
+		let url = new URL(window.location.href)
+		let queryFilterKind = url.searchParams.get(TRIGGER_PATH_KIND_FILTER_SETTING)
+		let queryFilterUserFolders = url.searchParams.get(FILTER_USER_FOLDER_SETTING_NAME)
+		if (queryFilterKind) {
+			selectedFilterKind = queryFilterKind as 'trigger' | 'script_flow'
+		}
+		if (queryFilterUserFolders) {
+			filterUserFolders = queryFilterUserFolders == 'true'
+		}
+	}
+
+	onMount(() => {
+		loadQueryFilters()
+	})
+
+	$: updateQueryFilters(selectedFilterKind, filterUserFolders)
+</script>
+
+<WebsocketTriggerEditor on:update={loadTriggers} bind:this={websocketTriggerEditor} />
+
+<SearchItems
+	{filter}
+	items={preFilteredItems}
+	bind:filteredItems
+	f={(x) => (x.summary ?? '') + ' ' + x.path + ' (' + x.script_path + ')'}
+/>
+
+<CenteredPage>
+	<PageHeader
+		title="Websocket triggers"
+		tooltip="Windmill can listen to websocket events and trigger scripts or flows based on them."
+	>
+		<Button
+			size="md"
+			startIcon={{ icon: Plus }}
+			on:click={() => websocketTriggerEditor.openNew(false)}
+		>
+			New&nbsp;WS trigger
+		</Button>
+	</PageHeader>
+
+	{#if isCloudHosted()}
+		<Alert title="Not compatible with multi-tenant cloud" type="warning">
+			Websocket triggers are disabled in the multi-tenant cloud.
+		</Alert>
+		<div class="py-4" />
+	{/if}
+	<div class="w-full h-full flex flex-col">
+		<div class="w-full pb-4 pt-6">
+			<input type="text" placeholder="Search WS triggers" bind:value={filter} class="search-item" />
+			<div class="flex flex-row items-center gap-2 mt-6">
+				<div class="text-sm shrink-0"> Filter by path of </div>
+				<ToggleButtonGroup bind:selected={selectedFilterKind}>
+					<ToggleButton small value="trigger" label="WS Trigger" icon={Unplug} />
+					<ToggleButton small value="script_flow" label="Script/Flow" icon={Code} />
+				</ToggleButtonGroup>
+			</div>
+			<ListFilters syncQuery bind:selectedFilter={ownerFilter} filters={owners} />
+
+			<div class="flex flex-row items-center justify-end gap-4">
+				{#if $userStore?.is_super_admin && $userStore.username.includes('@')}
+					<Toggle size="xs" bind:checked={filterUserFolders} options={{ right: 'Only f/*' }} />
+				{:else if $userStore?.is_admin || $userStore?.is_super_admin}
+					<Toggle
+						size="xs"
+						bind:checked={filterUserFolders}
+						options={{ right: `Only u/${$userStore.username} and f/*` }}
+					/>
+				{/if}
+			</div>
+		</div>
+		{#if loading}
+			{#each new Array(6) as _}
+				<Skeleton layout={[[6], 0.4]} />
+			{/each}
+		{:else if !triggers?.length}
+			<div class="text-center text-sm text-tertiary mt-2"> No websocket triggers </div>
+		{:else if items?.length}
+			<div class="border rounded-md divide-y">
+				{#each items.slice(0, nbDisplayed) as { path, edited_by, edited_at, script_path, url, is_flow, extra_perms, canWrite, marked, error, last_server_ping, enabled } (path)}
+					{@const href = `${is_flow ? '/flows/get' : '/scripts/get'}/${script_path}`}
+					{@const wsStatus = status[path] ?? { error, last_server_ping }}
+
+					<div
+						class="hover:bg-surface-hover w-full items-center px-4 py-2 gap-4 first-of-type:!border-t-0
+				first-of-type:rounded-t-md last-of-type:rounded-b-md flex flex-col"
+					>
+						<div class="w-full flex gap-5 items-center">
+							<RowIcon kind={is_flow ? 'flow' : 'script'} />
+
+							<a
+								href="#{path}"
+								on:click={() => websocketTriggerEditor?.openEdit(path, is_flow)}
+								class="min-w-0 grow hover:underline decoration-gray-400"
+							>
+								<div class="text-primary flex-wrap text-left text-md font-semibold mb-1 truncate">
+									{#if marked}
+										<span class="text-xs">
+											{@html marked}
+										</span>
+									{:else}
+										{url}
+									{/if}
+								</div>
+								<div class="text-secondary text-xs truncate text-left font-light">
+									{path}
+								</div>
+								<div class="text-secondary text-xs truncate text-left font-light">
+									runnable: {script_path}
+								</div>
+							</a>
+
+							<div class="hidden lg:flex flex-row gap-1 items-center">
+								<SharedBadge {canWrite} extraPerms={extra_perms} />
+							</div>
+
+							<div class="w-10">
+								{#if enabled}
+									{@const ping = wsStatus.last_server_ping
+										? new Date(wsStatus.last_server_ping)
+										: undefined}
+									{#if !ping || ping.getTime() < new Date().getTime() - 15 * 1000 || wsStatus.error}
+										<Popover notClickable>
+											<span class="flex h-4 w-4">
+												<Circle
+													class="text-red-600 animate-ping absolute inline-flex fill-current"
+													size={12}
+												/>
+												<Circle class="text-red-600 relative inline-flex fill-current" size={12} />
+											</span>
+											<div slot="text">
+												Websocket is not connected{wsStatus.error ? ': ' + wsStatus.error : ''}
+											</div>
+										</Popover>
+									{:else}
+										<Popover notClickable>
+											<span class="flex h-4 w-4">
+												<Circle
+													class="text-green-600 relative inline-flex fill-current"
+													size={12}
+												/>
+											</span>
+											<div slot="text"> Websocket is connected </div>
+										</Popover>
+									{/if}
+								{/if}
+							</div>
+
+							<Toggle
+								checked={enabled}
+								disabled={!canWrite}
+								on:change={(e) => {
+									setTriggerEnabled(path, e.detail)
+								}}
+							/>
+
+							<div class="flex gap-2 items-center justify-end">
+								<Button
+									on:click={() => websocketTriggerEditor?.openEdit(path, is_flow)}
+									size="xs"
+									startIcon={canWrite
+										? { icon: Pen }
+										: {
+												icon: Eye
+										  }}
+									color="dark"
+								>
+									{canWrite ? 'Edit' : 'View'}
+								</Button>
+								<Dropdown
+									items={[
+										{
+											displayName: `View ${is_flow ? 'Flow' : 'Script'}`,
+											icon: Eye,
+											action: () => {
+												goto(href)
+											}
+										},
+										{
+											displayName: 'Delete',
+											type: 'delete',
+											icon: Trash,
+											disabled: !canWrite,
+											action: async () => {
+												await WebsocketTriggerService.deleteWebsocketTrigger({
+													workspace: $workspaceStore ?? '',
+													path
+												})
+												loadTriggers()
+											}
+										},
+										{
+											displayName: canWrite ? 'Edit' : 'View',
+											icon: canWrite ? Pen : Eye,
+											action: () => {
+												websocketTriggerEditor?.openEdit(path, is_flow)
+											}
+										},
+										{
+											displayName: 'Audit logs',
+											icon: Eye,
+											href: `${base}/audit_logs?resource=${path}`
+										},
+										{
+											displayName: canWrite ? 'Share' : 'See Permissions',
+											icon: Share,
+											action: () => {
+												shareModal.openDrawer(path, 'websocket_trigger')
+											}
+										}
+									]}
+								/>
+							</div>
+						</div>
+						<div class="w-full flex justify-between items-baseline">
+							<div
+								class="flex flex-wrap text-[0.7em] text-tertiary gap-1 items-center justify-end truncate pr-2"
+								><div class="truncate">edited by {edited_by}</div><div class="truncate"
+									>the {displayDate(edited_at)}</div
+								></div
+							></div
+						>
+					</div>
+				{/each}
+			</div>
+		{:else}
+			<NoItemFound />
+		{/if}
+	</div>
+	{#if items && items?.length > 15 && nbDisplayed < items.length}
+		<span class="text-xs"
+			>{nbDisplayed} items out of {items.length}
+			<button class="ml-4" on:click={() => (nbDisplayed += 30)}>load 30 more</button></span
+		>
+	{/if}
+</CenteredPage>
+
+<ShareModal
+	bind:this={shareModal}
+	on:change={() => {
+		loadTriggers()
+	}}
+/>
diff --git a/frontend/src/routes/(root)/(logged)/workers/+page.svelte b/frontend/src/routes/(root)/(logged)/workers/+page.svelte
index f3a595a561..beab747a51 100644
--- a/frontend/src/routes/(root)/(logged)/workers/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/workers/+page.svelte
@@ -13,17 +13,18 @@
 	import DataTable from '$lib/components/table/DataTable.svelte'
 	import Head from '$lib/components/table/Head.svelte'
 	import Tooltip from '$lib/components/Tooltip.svelte'
-	import WorkspaceGroup from '$lib/components/WorkspaceGroup.svelte'
+	import WorkspaceGroup from '$lib/components/WorkerGroup.svelte'
 	import { WorkerService, type WorkerPing, ConfigService, SettingService } from '$lib/gen'
 	import { enterpriseLicense, superadmin } from '$lib/stores'
 	import { sendUserToast } from '$lib/toast'
 	import { displayDate, groupBy, pluralize, truncate } from '$lib/utils'
-	import { AlertTriangle, CopyIcon, LineChart, List, Plus, Search } from 'lucide-svelte'
+	import { AlertTriangle, LineChart, List, Plus, Search } from 'lucide-svelte'
 	import { getContext, onDestroy, onMount } from 'svelte'
 	import AutoComplete from 'simple-svelte-autocomplete'
 
 	import YAML from 'yaml'
 	import { DEFAULT_TAGS_WORKSPACES_SETTING } from '$lib/consts'
+	import AutoscalingEvents from '$lib/components/AutoscalingEvents.svelte'
 
 	let workers: WorkerPing[] | undefined = undefined
 	let workerGroups: Record<string, any> | undefined = undefined
@@ -326,7 +327,7 @@
 			<p>No workers seem to be available</p>
 		{/if}
 
-		<div class="py-4 w-full flex justify-between"
+		<div class="pt-4 pb-8 w-full flex justify-between items-center"
 			><h4
 				>{groupWorkers?.length} Worker Groups <Tooltip
 					documentationLink="https://www.windmill.dev/docs/core_concepts/worker_groups"
@@ -336,6 +337,7 @@
 				</Tooltip></h4
 			>
 			<div />
+
 			{#if $superadmin}
 				<div class="flex flex-row items-center">
 					<Popup
@@ -344,31 +346,30 @@
 					>
 						<svelte:fragment slot="button">
 							<div class="flex items-center gap-2">
-								<Button
-									size="sm"
-									color="light"
-									startIcon={{ icon: CopyIcon }}
-									on:click={() => {
-										if (!workerGroups) {
-											return sendUserToast('No worker groups found', true)
-										}
-
-										const workersConfig = Object.entries(workerGroups).map(([name, config]) => ({
-											name,
-											...config
-										}))
-										navigator.clipboard.writeText(YAML.stringify(workersConfig))
-										sendUserToast('Worker groups config copied to clipboard as YAML')
-									}}
-								>
-									<span class="hidden md:block">Copy groups config</span>
-								</Button>
 								<Button
 									size="sm"
 									startIcon={{ icon: Plus }}
 									nonCaptureEvent
+									disabled={!$enterpriseLicense}
 									dropdownItems={$enterpriseLicense
 										? [
+												{
+													label: 'Copy groups config as YAML',
+													onClick: () => {
+														if (!workerGroups) {
+															return sendUserToast('No worker groups found', true)
+														}
+
+														const workersConfig = Object.entries(workerGroups).map(
+															([name, config]) => ({
+																name,
+																...config
+															})
+														)
+														navigator.clipboard.writeText(YAML.stringify(workersConfig))
+														sendUserToast('Worker groups config copied to clipboard as YAML')
+													}
+												},
 												{
 													label: 'Import groups config from YAML',
 													onClick: () => {
@@ -378,7 +379,9 @@
 										  ]
 										: undefined}
 								>
-									<span class="hidden md:block">New group config</span>
+									<span class="hidden md:block"
+										>New group config {!$enterpriseLicense ? '(EE)' : ''}</span
+									>
 
 									<Tooltip light>
 										Worker Group configs are propagated to every workers in the worker group
@@ -644,7 +647,8 @@
 				{/if}
 			{/if}
 		</div>
-		<div class="pb-4" />
+		<div class="pb-20" />
+		<AutoscalingEvents worker_group={selectedTab} />
 	{:else}
 		<div class="flex flex-col">
 			{#each new Array(4) as _}
diff --git a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
index 6f7b9dcae9..14be8dbcaa 100644
--- a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { goto } from '$lib/navigation'
-	import { replaceState } from '$app/navigation'
 	import { page } from '$app/stores'
 	import { isCloudHosted } from '$lib/cloud'
 	import CenteredPage from '$lib/components/CenteredPage.svelte'
@@ -37,7 +36,8 @@
 		X,
 		Plus,
 		Loader2,
-		Save
+		Save,
+		ExternalLink
 	} from 'lucide-svelte'
 	import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
 
@@ -140,30 +140,6 @@
 	let usingOpenaiClientCredentialsOauth = false
 
 	const latestGitSyncHubScript = hubPaths.gitSync
-	// function getDropDownItems(username: string): DropdownItem[] {
-	// 	return [
-	// 		{
-	// 			displayName: 'Manage user',
-	// 			href: `/admin/user/manage/${username}`
-	// 		},
-	// 		{
-	// 			displayName: 'Delete',
-	// 			action: () => deleteUser(username)
-	// 		}
-	// 	];
-	// }
-
-	// async function deleteUser(username: string): Promise<void> {
-	// 	try {
-	// 		await UserService.deleteUser({ workspace: $workspaceStore!, username });
-	// 		users = await UserService.listUsers({ workspace: $workspaceStore! });
-	// 		fuse?.setCollection(users);
-	// 		sendUserToast(`User ${username} has been removed`);
-	// 	} catch (err) {
-	// 		console.error(err);
-	// 		sendUserToast(`Cannot delete user: ${err}`, true);
-	// 	}
-	// }
 
 	async function editSlackCommand(): Promise<void> {
 		initialPath = scriptPath
@@ -520,11 +496,7 @@
 		}
 	}
 
-	$: {
-		if ($workspaceStore) {
-			loadSettings()
-		}
-	}
+	$: $workspaceStore && loadSettings()
 
 	async function editErrorHandler() {
 		if (errorHandlerScriptPath) {
@@ -602,34 +574,9 @@
 			timeout: 5000
 		})
 	}
-
-	let debounced: NodeJS.Timeout | undefined = undefined
-	export function setQueryWithoutLoad(
-		url: URL,
-		args: { key: string; value: string | null | undefined }[],
-		bounceTime?: number
-	): void {
-		debounced && clearTimeout(debounced)
-		debounced = setTimeout(() => {
-			const nurl = new URL(url.toString())
-			for (const { key, value } of args) {
-				if (value) {
-					nurl.searchParams.set(key, value)
-				} else {
-					nurl.searchParams.delete(key)
-				}
-			}
-
-			try {
-				replaceState(nurl.toString(), $page.state)
-			} catch (e) {
-				console.error(e)
-			}
-		}, bounceTime ?? 200)
-	}
 </script>
 
-<Portal>
+<Portal name="workspace-settings">
 	<S3FilePicker bind:this={s3FileViewer} readOnlyMode={false} fromWorkspaceSettings={true} />
 </Portal>
 
@@ -652,7 +599,9 @@
 			<Tabs
 				bind:selected={tab}
 				on:selected={() => {
-					setQueryWithoutLoad($page.url, [{ key: 'tab', value: tab }], 0)
+					// setQueryWithoutLoad($page.url, [{ key: 'tab', value: tab }], 0)
+					$page.url.searchParams.set('tab', tab)
+					goto(`?${$page.url.searchParams.toString()}`)
 				}}
 			>
 				<Tab size="xs" value="users">
@@ -933,6 +882,7 @@
 					Workspace error handler is a Windmill EE feature. It enables using your current Slack
 					connection or a custom script to send notifications anytime any job would fail.
 				</Alert>
+				<div class="pb-2" />
 			{/if}
 			<div class="flex flex-col gap-4 my-8">
 				<div class="flex flex-col gap-1">
@@ -1053,9 +1003,12 @@
 		{:else if tab == 'windmill_lfs'}
 			<div class="flex flex-col gap-4 my-8">
 				<div class="flex flex-col gap-1">
-					<div class=" text-primary text-lg font-semibold">Workspace object storage (S3/Azure Blob)</div>
+					<div class=" text-primary text-lg font-semibold"
+						>Workspace object storage (S3/Azure Blob)</div
+					>
 					<div class="text-tertiary text-xs">
-						Connect your Windmill workspace to your S3 bucket or your Azure Blob storage to enable users to read and write from S3 without having to have access to the credentials.
+						Connect your Windmill workspace to your S3 bucket or your Azure Blob storage to enable
+						users to read and write from S3 without having to have access to the credentials.
 						<a
 							href="https://www.windmill.dev/docs/core_concepts/object_storage_in_windmill#workspace-object-storage"
 							target="_blank"
@@ -1074,8 +1027,11 @@
 				<Alert type="info" title="Logs storage is set at the instance level">
 					This setting is only for storage of large files allowing to upload files directly to
 					object storage using S3Object and use the wmill sdk to read and write large files backed
-					by an object storage. Large-scale log management and distributed dependency caching is under <a href="https://www.windmill.dev/docs/core_concepts/object_storage_in_windmill#instance-object-storage" class="text-blue-500">Instance object storage</a>, set by the superadmins in the
-					instance settings UI.
+					by an object storage. Large-scale log management and distributed dependency caching is
+					under <a
+						href="https://www.windmill.dev/docs/core_concepts/object_storage_in_windmill#instance-object-storage"
+						class="text-blue-500">Instance object storage</a
+					>, set by the superadmins in the instance settings UI.
 				</Alert>
 			{/if}
 			{#if s3ResourceSettings}
@@ -1255,26 +1211,33 @@
 				<div class="mb-2" />
 			{/if}
 			{#if gitSyncSettings != undefined}
-				{#if $enterpriseLicense}
-					<div class="flex mt-5 mb-5 gap-1">
-						<Button
-							color="blue"
-							disabled={gitSyncSettings?.repositories?.some((elmt) =>
+				<div class="flex mt-5 mb-5 gap-8">
+					<Button
+						color="blue"
+						disabled={!$enterpriseLicense ||
+							gitSyncSettings?.repositories?.some((elmt) =>
 								emptyString(elmt.git_repo_resource_path)
 							)}
-							on:click={() => {
-								editWindmillGitSyncSettings()
-								console.log('Saving git sync settings', gitSyncSettings)
-							}}>Save Git sync settings</Button
-						>
-					</div>
-				{/if}
+						on:click={() => {
+							editWindmillGitSyncSettings()
+							console.log('Saving git sync settings', gitSyncSettings)
+						}}>Save git sync settings {!$enterpriseLicense ? '(ee only)' : ''}</Button
+					>
+
+					<Button
+						color="dark"
+						target="_blank"
+						endIcon={{ icon: ExternalLink }}
+						href={`/runs?job_kinds=deploymentcallbacks&workspace=${$workspaceStore}`}
+						>See sync jobs</Button
+					>
+				</div>
 
 				<div class="flex flex-wrap gap-20">
 					<div class="max-w-md w-full">
 						{#if Array.isArray(gitSyncSettings?.include_path)}
 							<h4 class="flex gap-2 mb-4"
-								>Filter on path<Tooltip>
+								>Path filters<Tooltip>
 									Only scripts, flows and apps with their path matching one of those filters will be
 									synced to the Git repositories below. The filters allow '*'' and '**' characters,
 									with '*'' matching any character allowed in paths until the next slash (/) and
@@ -1314,11 +1277,16 @@
 								Add filter
 							</Button>
 						</div>
+						<div class="pt-2" />
+						<Alert type="info" title="Only new updates trigger git sync">
+							Only new changes matching the filters will trigger a git sync. You still need to
+							initalize the repo to the desired state first.
+						</Alert>
 					</div>
 
 					<div class="max-w-md w-full">
 						<h4 class="flex gap-2 mb-4"
-							>Filter on type<Tooltip>
+							>Type filters<Tooltip>
 								On top of the filter path above, you can include only certain type of object to be
 								synced with the Git repository.
 								<br />By default everything is synced.
@@ -1639,13 +1607,15 @@
 
 						<br />
 
-						. For the git repo to be representative of the entire workspace, it is recommended to
-						set it up using the Windmill CLI before turning this option on.
+						For the git repo to be representative of the entire workspace, it is recommended to set
+						it up using the Windmill CLI before turning this option on.
 
 						<br /><br />
 
 						Not familiar with Windmill CLI?
-						<a href="https://www.windmill.dev/docs/advanced/cli">Check out the docs</a>
+						<a href="https://www.windmill.dev/docs/advanced/cli" class="text-primary"
+							>Check out the docs</a
+						>
 
 						<br /><br />
 
@@ -1656,9 +1626,11 @@
 
 						<pre class="overflow-auto max-h-screen"
 							><code
-								>wmill workspace add  {$workspaceStore} {$workspaceStore} {`${$page.url.protocol}//${$page.url.hostname}/`}
-echo 'includes: ["f/**"]' > wmill.yaml
-wmill sync pull --raw --skip-variables --skip-secrets --skip-resources
+								>npm install -g windmill-cli
+wmill workspace add  {$workspaceStore} {$workspaceStore} {`${$page.url.protocol}//${$page.url.hostname}/`}
+wmill init
+# adjust wmill.yaml file configuraton as needed
+wmill sync pull
 git add -A
 git commit -m 'Initial commit'
 git push</code
diff --git a/frontend/src/routes/(root)/embed_connect/+page.svelte b/frontend/src/routes/(root)/embed_connect/+page.svelte
deleted file mode 100644
index 87ae396e55..0000000000
--- a/frontend/src/routes/(root)/embed_connect/+page.svelte
+++ /dev/null
@@ -1,78 +0,0 @@
-<script lang="ts">
-	import { page } from '$app/stores'
-	import { base } from '$app/paths'
-
-	import AppConnectInner from '$lib/components/AppConnectInner.svelte'
-	import DarkModeObserver from '$lib/components/DarkModeObserver.svelte'
-	import { Button } from '$lib/components/common'
-	import { workspaceStore } from '$lib/stores'
-	import { onMount } from 'svelte'
-
-	let resourceType = $page.url.searchParams.get('resource_type') ?? undefined
-	let step = 1
-	let disabled = false
-	let isGoogleSignin = false
-	let manual = true
-
-	let appConnect: AppConnectInner | undefined = undefined
-
-	let darkMode: boolean = false
-	const workspace = $page.url.searchParams.get('workspace')
-	const express = $page.url.searchParams.get('express') == 'true'
-
-	if (workspace) {
-		$workspaceStore = workspace
-	}
-
-	onMount(async () => {
-		if (resourceType) {
-			appConnect?.open(resourceType, express)
-		}
-	})
-</script>
-
-<DarkModeObserver bind:darkMode />
-
-<div>
-	<div class="flex flex-row-reverse w-full">
-		<div class="flex gap-2">
-			{#if step > 2}
-				<Button variant="border" on:click={appConnect?.back}>Back</Button>
-			{/if}
-
-			{#if isGoogleSignin}
-				<button {disabled} on:click={appConnect?.next}>
-					<img
-						class="h-10 w-auto object-contain"
-						src={darkMode ? base + '/google_signin_dark.png' : base + '/google_signin_light.png'}
-						alt="Google sign-in"
-					/>
-				</button>
-			{:else}
-				<Button {disabled} on:click={appConnect?.next}>
-					{#if step == 2 && !manual}
-						Connect
-					{:else if step == 1}
-						Next
-					{:else}
-						Save
-					{/if}
-				</Button>
-			{/if}
-		</div>
-	</div>
-	<AppConnectInner
-		bind:this={appConnect}
-		bind:step
-		bind:resourceType
-		bind:isGoogleSignin
-		bind:disabled
-		bind:manual
-		on:error={(e) => {
-			window?.parent?.postMessage({ type: 'error', error: e.detail }, '*')
-		}}
-		on:refresh={(e) => {
-			window?.parent?.postMessage({ type: 'refresh', detail: e.detail }, '*')
-		}}
-	/>
-</div>
diff --git a/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte b/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
index 18b80ed3bf..377879daff 100644
--- a/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
+++ b/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
@@ -287,6 +287,7 @@
 			<h2 class="mt-10">Flow details</h2>
 			<div class="border border-gray-700">
 				<FlowGraphV2
+					triggerNode={false}
 					modules={job.raw_flow?.modules}
 					failureModule={job.raw_flow?.failure_module}
 					preprocessorModule={job.raw_flow?.preprocessor_module}
diff --git a/frontend/src/routes/flows/dev/+page.svelte b/frontend/src/routes/flows/dev/+page.svelte
index 6cd02642a4..2db4421e8a 100644
--- a/frontend/src/routes/flows/dev/+page.svelte
+++ b/frontend/src/routes/flows/dev/+page.svelte
@@ -6,7 +6,7 @@
 	import FlowPreviewButtons from '$lib/components/flows/header/FlowPreviewButtons.svelte'
 	import type { FlowEditorContext, FlowInput } from '$lib/components/flows/types'
 	import { writable } from 'svelte/store'
-	import { OpenAPI, type FlowModule, type OpenFlow } from '$lib/gen'
+	import { OpenAPI, type FlowModule, type OpenFlow, type TriggersCount } from '$lib/gen'
 	import { initHistory } from '$lib/history'
 	import type { FlowState } from '$lib/components/flows/flowState'
 	import FlowModuleSchemaMap from '$lib/components/flows/map/FlowModuleSchemaMap.svelte'
@@ -16,7 +16,7 @@
 	import { userStore, workspaceStore } from '$lib/stores'
 	import { getUserExt } from '$lib/user'
 	import DarkModeToggle from '$lib/components/sidebar/DarkModeToggle.svelte'
-	import type { Schedule } from '$lib/components/flows/scheduleUtils'
+	import type { ScheduleTrigger, TriggerContext } from '$lib/components/triggers'
 
 	let token = $page.url.searchParams.get('wm_token') ?? undefined
 	let workspace = $page.url.searchParams.get('workspace') ?? undefined
@@ -63,13 +63,6 @@
 
 	let initialCode = JSON.stringify($flowStore, null, 4)
 	const flowStateStore = writable({} as FlowState)
-	const scheduleStore = writable<Schedule>({
-		args: {},
-		cron: '',
-		timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-		enabled: false,
-		summary: undefined
-	})
 
 	const previewArgsStore = writable<Record<string, any>>({})
 	const scriptEditorDrawer = writable(undefined)
@@ -78,14 +71,19 @@
 
 	const testStepStore = writable<Record<string, any>>({})
 	const selectedIdStore = writable('settings-metadata')
-
-	// function select(selectedId: string) {
-	// 	selectedIdStore.set(selectedId)
-	// }
+	const primaryScheduleStore = writable<ScheduleTrigger | undefined | false>(undefined)
+	const triggersCount = writable<TriggersCount | undefined>(undefined)
+	const selectedTriggerStore = writable<
+		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets'
+	>('webhooks')
+	setContext<TriggerContext>('TriggerContext', {
+		primarySchedule: primaryScheduleStore,
+		selectedTrigger: selectedTriggerStore,
+		triggersCount: triggersCount
+	})
 
 	setContext<FlowEditorContext>('FlowEditorContext', {
 		selectedId: selectedIdStore,
-		schedule: scheduleStore,
 		previewArgs: previewArgsStore,
 		scriptEditorDrawer,
 		moving,
@@ -97,7 +95,8 @@
 		saveDraft: () => {},
 		initialPath: '',
 		flowInputsStore: writable<FlowInput>({}),
-		customUi: {}
+		customUi: {},
+		insertButtonOpen: writable(false)
 	})
 
 	type LastEdit = {
diff --git a/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte b/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte
index 9c4fc9006c..67e8daa181 100644
--- a/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte
+++ b/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte
@@ -137,7 +137,7 @@
 	{#key app}
 		<div
 			class={twMerge(
-				'min-h-screen h-full w-full',
+				'min-h-screen h-full w-full flex',
 				app?.value?.['css']?.['app']?.['viewer']?.class,
 				'wm-app-viewer'
 			)}
diff --git a/frontend/src/routes/view_graph/+page.svelte b/frontend/src/routes/view_graph/+page.svelte
index 6844733561..ef6bea27e0 100644
--- a/frontend/src/routes/view_graph/+page.svelte
+++ b/frontend/src/routes/view_graph/+page.svelte
@@ -8,7 +8,7 @@
 		: { modules: [], failureModule: undefined, preprocessorModule: undefined }
 </script>
 
-<FlowGraphV2 {modules} {failureModule} {preprocessorModule} />
+<FlowGraphV2 triggerNode={false} {modules} {failureModule} {preprocessorModule} />
 <a
 	download="flow.json"
 	href={'data:text/json;charset=utf-8,' +
diff --git a/frontend/tailwind.config.cjs b/frontend/tailwind.config.cjs
index fe2a87aea3..74ca853a17 100644
--- a/frontend/tailwind.config.cjs
+++ b/frontend/tailwind.config.cjs
@@ -12,8 +12,8 @@ const lightTheme = {
 	textTertiary: '#505c70',
 	textDisabled: '#a0aec0',
 
-	border: '#ddd',
-	borderHover: '#ccc'
+	border: '#dddddd',
+	borderHover: '#cccccc'
 }
 
 const lightThemeRgb = makeRgb(lightTheme)
@@ -384,6 +384,20 @@ const config = {
 				400: '#394A6D',
 				500: '#323F5B'
 			},
+			nord: {
+				0: '#2E3440',
+				100: '#3B4252',
+				200: '#434C5E',
+				300: '#4C566A',
+				400: '#D8DEE9',
+				500: '#E5E9F0',
+				600: '#ECEFF4',
+				700: '#8FBCBB',
+				800: '#88C0D0',
+				900: '#81A1C1',
+				950: '#5E81AC'
+			},
+
 			surface: 'rgb(var(--color-surface) / <alpha-value>)',
 			'surface-secondary': 'rgb(var(--color-surface-secondary) / <alpha-value>)',
 			'surface-hover': 'rgb(var(--color-surface-hover) / <alpha-value>)',
diff --git a/go-client/build.sh b/go-client/build.sh
index e7906afb09..6cce7fee31 100755
--- a/go-client/build.sh
+++ b/go-client/build.sh
@@ -4,17 +4,18 @@ set -e
 mkdir openapi
 cp  ../backend/windmill-api/openapi.yaml openapi/openapi.yaml
 
-sed -i '/                enum:/ { N; /                  \[/ { N; /"S3Storage",/ { N; /"AzureBlobStorage",/ { N; /"AzureWorkloadIdentity",/ { N; /"S3AwsOidc",/ { N; /                  \]/d; }}}}}}' openapi/openapi.yaml
-sed -z 's/                    extra_params:\n                      additionalProperties:\n                        type: string/                    extra_params: {}/' openapi/openapi.yaml > openapi/openapi1.yaml
-sed -z 's/                          enum: \[script, failure, trigger, command, approval\]//' openapi/openapi1.yaml > openapi/openapi2.yaml
-sed -z 's/                    enum: \[deno, python3, go, bash\]//' openapi/openapi2.yaml > openapi/openapi3.yaml
+# sed -i '/                enum:/ { N; /                  \[/ { N; /"S3Storage",/ { N; /"AzureBlobStorage",/ { N; /"AzureWorkloadIdentity",/ { N; /"S3AwsOidc",/ { N; /                  \]/d; }}}}}}' openapi/openapi.yaml
+# sed -z 's/                    extra_params:\n                      additionalProperties:\n                        type: string/                    extra_params: {}/' openapi/openapi.yaml > openapi/openapi3.yaml
+# sed -z 's/                          enum: \[script, failure, trigger, command, approval\]//' openapi/openapi1.yaml > openapi/openapi2.yaml
+# sed -z 's/                    enum: \[deno, python3, go, bash\]//' openapi/openapi2.yaml > openapi/openapi3.yaml
 
-npx @redocly/openapi-cli@latest bundle openapi/openapi3.yaml --ext json > openapi-bundled.json
+npx @redocly/openapi-cli@latest bundle openapi/openapi.yaml --ext json > openapi-bundled.json
 
-cat openapi-bundled.json | jq 'del(.paths."/oauth/list_connects")' > openapi-bundled-cleaned.json
+cat openapi-bundled.json | jq 'del(.paths."/oauth/list_connects")' | jq 'del(.components.schemas.Job.discriminator)' > openapi-bundled-cleaned.json
 
 rm -rf api/ || true
 mkdir -p api
+go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.4.1
 ~/go/bin/oapi-codegen -old-config-style --package=windmill_api --generate=types,client  openapi-bundled-cleaned.json > api/windmill_api.gen.go
 rm -rf openapi/
 rm openapi*
diff --git a/go-client/go.mod b/go-client/go.mod
index 03833ac9a8..6cc15bf017 100644
--- a/go-client/go.mod
+++ b/go-client/go.mod
@@ -3,79 +3,16 @@ module github.com/windmill-labs/windmill-go-client
 go 1.19
 
 require (
-	github.com/deepmap/oapi-codegen v1.15.0
+	github.com/google/uuid v1.5.0
+	github.com/oapi-codegen/runtime v1.1.1
 	github.com/stretchr/testify v1.8.4
 )
 
 require (
-	github.com/BurntSushi/toml v1.3.2 // indirect
-	github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect
-	github.com/CloudyKit/jet/v6 v6.2.0 // indirect
-	github.com/Joker/jade v1.1.3 // indirect
-	github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect
-	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
-	github.com/aymerick/douceur v0.2.0 // indirect
-	github.com/bytedance/sonic v1.10.0-rc3 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
-	github.com/chenzhuoyu/iasm v0.9.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fatih/structs v1.1.0 // indirect
-	github.com/flosch/pongo2/v4 v4.0.2 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
-	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/gin-gonic/gin v1.9.1 // indirect
-	github.com/go-playground/locales v0.14.1 // indirect
-	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.14.1 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12 // indirect
-	github.com/google/uuid v1.3.1 // indirect
-	github.com/gorilla/css v1.0.0 // indirect
-	github.com/iris-contrib/schema v0.0.6 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/kataras/blocks v0.0.7 // indirect
-	github.com/kataras/golog v0.1.9 // indirect
-	github.com/kataras/iris/v12 v12.2.6-0.20230908161203-24ba4e8933b9 // indirect
-	github.com/kataras/pio v0.0.12 // indirect
-	github.com/kataras/sitemap v0.0.6 // indirect
-	github.com/kataras/tunnel v0.0.4 // indirect
-	github.com/klauspost/compress v1.16.7 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
-	github.com/labstack/echo/v4 v4.11.1 // indirect
-	github.com/labstack/gommon v0.4.0 // indirect
-	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/mailgun/raymond/v2 v2.0.48 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/microcosm-cc/bluemonday v1.0.25 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.9 // indirect
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/schollz/closestmatch v2.1.0+incompatible // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
-	github.com/tdewolff/minify/v2 v2.12.9 // indirect
-	github.com/tdewolff/parse/v2 v2.6.8 // indirect
-	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.11 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.2 // indirect
-	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
-	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	github.com/yosssi/ace v0.0.5 // indirect
-	golang.org/x/arch v0.4.0 // indirect
-	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/net v0.15.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go-client/go.sum b/go-client/go.sum
index 524578dca3..e856c9ce82 100644
--- a/go-client/go.sum
+++ b/go-client/go.sum
@@ -1,246 +1,29 @@
-github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
-github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 h1:sR+/8Yb4slttB4vD+b9btVEnWgL3Q00OBTzVT8B9C0c=
-github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
-github.com/CloudyKit/jet/v6 v6.2.0 h1:EpcZ6SR9n28BUGtNJSvlBqf90IpjeFr36Tizxhn/oME=
-github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4=
-github.com/Joker/hpp v1.0.0 h1:65+iuJYdRXv/XyN62C1uEmmOx3432rNG/rKlX6V7Kkc=
-github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
-github.com/Joker/jade v1.1.3 h1:Qbeh12Vq6BxURXT1qZBRHsDxeURB8ztcL6f3EXSGeHk=
-github.com/Joker/jade v1.1.3/go.mod h1:T+2WLyt7VH6Lp0TRxQrUYEs64nRc83wkMQrfeIQKduM=
 github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
-github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 h1:KkH3I3sJuOLP3TjA/dfr4NAY8bghDwnXiU7cTKxQqo0=
-github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06/go.mod h1:7erjKLwalezA0k99cWs5L11HWOAPNjdUZ6RxH1BXbbM=
-github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
-github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
-github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
-github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
-github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
-github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
-github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
-github.com/bytedance/sonic v1.10.0-rc3 h1:uNSnscRapXTwUgTyOF0GVljYD08p9X/Lbr9MweSV3V0=
-github.com/bytedance/sonic v1.10.0-rc3/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
-github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
-github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
-github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
-github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
-github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo=
-github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/deepmap/oapi-codegen v1.15.0 h1:SQqViaeb4k2vMul8gx12oDOIadEtoRqTdLkxjzqtQ90=
-github.com/deepmap/oapi-codegen v1.15.0/go.mod h1:a6KoHV7lMRwsPoEg2C6NDHiXYV3EQfiFocOlJ8dgJQE=
-github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
-github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
-github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw=
-github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8=
-github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
-github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
-github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
-github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
-github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
-github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
-github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
-github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k=
-github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
-github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12 h1:uK3X/2mt4tbSGoHvbLBHUny7CKiuwUip3MArtukol4E=
-github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
-github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/imkira/go-interpol v1.1.0 h1:KIiKr0VSG2CUW1hl1jpiyuzuJeKUUpC8iM1AIE7N1Vk=
-github.com/iris-contrib/httpexpect/v2 v2.15.2 h1:T9THsdP1woyAqKHwjkEsbCnMefsAFvk8iJJKokcJ3Go=
-github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw=
-github.com/iris-contrib/schema v0.0.6/go.mod h1:iYszG0IOsuIsfzjymw1kMzTL8YQcCWlm65f3wX8J5iA=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
+github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE=
-github.com/kataras/blocks v0.0.7 h1:cF3RDY/vxnSRezc7vLFlQFTYXG/yAr1o7WImJuZbzC4=
-github.com/kataras/blocks v0.0.7/go.mod h1:UJIU97CluDo0f+zEjbnbkeMRlvYORtmc1304EeyXf4I=
-github.com/kataras/golog v0.1.9 h1:vLvSDpP7kihFGKFAvBSofYo7qZNULYSHOH2D7rPTKJk=
-github.com/kataras/golog v0.1.9/go.mod h1:jlpk/bOaYCyqDqH18pgDHdaJab72yBE6i0O3s30hpWY=
-github.com/kataras/iris/v12 v12.2.6-0.20230908161203-24ba4e8933b9 h1:Vx8kDVhO2qepK8w44lBtp+RzN3ld743i+LYPzODJSpQ=
-github.com/kataras/iris/v12 v12.2.6-0.20230908161203-24ba4e8933b9/go.mod h1:ldkoR3iXABBeqlTibQ3MYaviA1oSlPvim6f55biwBh4=
-github.com/kataras/pio v0.0.12 h1:o52SfVYauS3J5X08fNjlGS5arXHjW/ItLkyLcKjoH6w=
-github.com/kataras/pio v0.0.12/go.mod h1:ODK/8XBhhQ5WqrAhKy+9lTPS7sBf6O3KcLhc9klfRcY=
-github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY=
-github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4=
-github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA=
-github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw=
-github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
-github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
-github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
-github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/labstack/echo/v4 v4.11.1 h1:dEpLU2FLg4UVmvCGPuk/APjlH6GDpbEPti61srUUUs4=
-github.com/labstack/echo/v4 v4.11.1/go.mod h1:YuYRTSM3CHs2ybfrL8Px48bO6BAnYIN4l8wSTMP6BDQ=
-github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
-github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
-github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
-github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
-github.com/mailgun/raymond/v2 v2.0.48 h1:5dmlB680ZkFG2RN/0lvTAghrSxIESeu9/2aeDqACtjw=
-github.com/mailgun/raymond/v2 v2.0.48/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNfj4KA0W54Z18=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/microcosm-cc/bluemonday v1.0.25 h1:4NEwSfiJ+Wva0VxN5B8OwMicaJvD8r9tlJWm9rtloEg=
-github.com/microcosm-cc/bluemonday v1.0.25/go.mod h1:ZIOjCQp1OrzBBPIJmfX4qDYFuhU02nx4bn030ixfHLE=
-github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0=
-github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro=
+github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sanity-io/litter v1.5.5 h1:iE+sBxPBzoK6uaEP5Lt3fHNgpKcHXc/A2HGETy0uJQo=
-github.com/schollz/closestmatch v2.1.0+incompatible h1:Uel2GXEpJqOWBrlyI+oY9LTiyyjYS17cCYRqP13/SHk=
-github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
-github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tdewolff/minify/v2 v2.12.9 h1:dvn5MtmuQ/DFMwqf5j8QhEVpPX6fi3WGImhv8RUB4zA=
-github.com/tdewolff/minify/v2 v2.12.9/go.mod h1:qOqdlDfL+7v0/fyymB+OP497nIxJYSvX4MQWA8OoiXU=
-github.com/tdewolff/parse/v2 v2.6.8 h1:mhNZXYCx//xG7Yq2e/kVLNZw4YfYmeHbhx+Zc0OvFMA=
-github.com/tdewolff/parse/v2 v2.6.8/go.mod h1:XHDhaU6IBgsryfdnpzUXBlT6leW/l25yrFBTEb4eIyM=
-github.com/tdewolff/test v1.0.9 h1:SswqJCmeN4B+9gEAi/5uqT0qpi1y2/2O47V/1hhGZT0=
-github.com/tdewolff/test v1.0.9/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
-github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
-github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
-github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
-github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
-github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
-github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
-github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
-github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
-github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
-github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
-github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
-github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
-github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
-github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 h1:6fRhSjgLCkTD3JnJxvaJ4Sj+TYblw757bqYgZaOq5ZY=
-github.com/yosssi/ace v0.0.5 h1:tUkIP/BLdKqrlrPwcmH0shwEEhTRHoGnc1wFIWmaBUA=
-github.com/yosssi/ace v0.0.5/go.mod h1:ALfIzm2vT7t5ZE7uoIZqF3TQ7SAOyupFZnkrF5id+K0=
-github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA=
-github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc=
-golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U=
-golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
-gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-moul.io/http2curl/v2 v2.3.0 h1:9r3JfDzWPcbIklMOs2TnIFzDYvfAZvjeavG6EzP7jYs=
-nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
-rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
diff --git a/go-client/windmill.go b/go-client/windmill.go
index 7fde732aab..f8d46bf1d5 100644
--- a/go-client/windmill.go
+++ b/go-client/windmill.go
@@ -8,7 +8,6 @@ import (
 	"math/rand"
 	"net/http"
 	"os"
-
 	"github.com/google/uuid"
 	api "github.com/windmill-labs/windmill-go-client/api"
 )
diff --git a/lsp/Dockerfile b/lsp/Dockerfile
index e8241c31a3..2d56305116 100644
--- a/lsp/Dockerfile
+++ b/lsp/Dockerfile
@@ -26,7 +26,7 @@ ENV GOBIN=/usr/local/go/bin
 RUN /usr/local/go/bin/go install -v golang.org/x/tools/gopls@latest
 RUN pip3 install tornado python-lsp-jsonrpc ruff-lsp
 
-COPY --from=denoland/deno:1.46.1 --chmod=755 /usr/bin/deno /usr/bin/deno
+COPY --from=denoland/deno:2.0.2 --chmod=755 /usr/bin/deno /usr/bin/deno
 
 COPY Pipfile .
 
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 8487b85565..c76b2cb3a0 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.402.3"
-wmill_pg = ">=1.402.3"
+wmill = ">=1.416.2"
+wmill_pg = ">=1.416.2"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index e4600e9528..c2d1c0e9bd 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.402.3
+  version: 1.416.2
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
@@ -114,6 +114,13 @@ components:
               type: string
           required:
             - expr
+        skip_if:
+          type: object
+          properties:
+            expr:
+              type: string
+          required:
+            - expr
         sleep:
           $ref: "#/components/schemas/InputTransform"
         cache_ttl:
@@ -542,4 +549,6 @@ components:
           items:
             type: string
             format: uuid
+        skipped:
+          type: boolean
       required: [type]
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 89445c5e22..bbf1ca823e 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
 RootModule = 'WindmillClient.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.402.3'
+ModuleVersion = '1.416.2'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 5746949537..7c7b08b1c4 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.402.3"
+version = "1.416.2"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/python-client/wmill/wmill/client.py b/python-client/wmill/wmill/client.py
index 42ea61281f..bfa2760195 100644
--- a/python-client/wmill/wmill/client.py
+++ b/python-client/wmill/wmill/client.py
@@ -257,10 +257,7 @@ class Windmill:
         assert job_type, f"{job} is not a valid job"
         if job_type.lower() == "completedjob":
             return "COMPLETED"
-        additional_properties = job.get("additional_properties", {})
-        if "running" not in additional_properties:
-            raise Exception(f"{job_id} is not running")
-        if additional_properties.get("running"):
+        if job.get("running"):
             return "RUNNING"
         return "WAITING"
 
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index 5e4f589322..cc280a1fe6 100644
--- a/python-client/wmill_pg/pyproject.toml
+++ b/python-client/wmill_pg/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.402.3"
+version = "1.416.2"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/shell.nix b/shell.nix
index 58085ee675..c3009eb183 100644
--- a/shell.nix
+++ b/shell.nix
@@ -8,8 +8,8 @@ let
     "https://github.com/oxalica/rust-overlay/archive/master.tar.gz");
   pkgs = import <nixpkgs> { overlays = [ rust_overlay ]; };
   # TODO: Pin version?
-  rustVersion = "latest";
-  # rustVersion = "1.83.0";
+  # rustVersion = "latest";
+  rustVersion = "2024-09-30";
   rust = pkgs.rust-bin.nightly.${rustVersion}.default.override {
     extensions = [
       "rust-src" # for rust-analyzer
@@ -27,6 +27,7 @@ in pkgs.mkShell {
     postgresql
     watchexec # used in client's dev.nu
     poetry # for python client
+    uv
     python312Packages.pip-tools # pip-compile
   ];
 
@@ -54,6 +55,7 @@ in pkgs.mkShell {
     "-C link-arg=-fuse-ld=${pkgs.mold}/bin/mold -Zshare-generics=y -Z threads=4";
   RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache";
 
-  # Use mold as a linker (for faster compilation)
+  # Useful for development
+  RUST_LOG = "debug";
 
 }
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index a4dfd07ee9..4441b9c599 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.402.3",
+  "version": "1.416.2",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index c6fbf1c41c..ab8403f63d 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.402.3",
+  "version": "1.416.2",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index cce8c1101e..049bcd7227 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.402.3
+1.416.2