diff --git a/.cursor/rules/rust-best-practices.mdc b/.cursor/rules/rust-best-practices.mdc
index e8511c67d4..bdbdb0d24d 100644
--- a/.cursor/rules/rust-best-practices.mdc
+++ b/.cursor/rules/rust-best-practices.mdc
@@ -47,6 +47,7 @@ Windmill uses a workspace-based architecture with multiple crates:
 - Group related routes together
 - Use consistent response formats (JSON)
 - Follow proper authentication and authorization patterns
+- Do not forget to update backend/windmill-api/openapi.yaml after modifying an api endpoint
 
 ## Performance Optimizations
 
diff --git a/.github/workflows/aider-after-review.yaml b/.github/workflows/aider-after-review.yaml
index 87d48ddb4c..2db321a7a8 100644
--- a/.github/workflows/aider-after-review.yaml
+++ b/.github/workflows/aider-after-review.yaml
@@ -90,5 +90,5 @@ jobs:
     with:
       needs_processing: false
       base_prompt: ${{ needs.check-and-prepare.outputs.prompt_content }}
-      rules_files: "CLAUDE.md backend/CLAUDE.md frontend/CLAUDE.md"
+      rules_files: ".cursor/rules/rust-best-practices.mdc .cursor/rules/svelte5-best-practices.mdc .cursor/rules/windmill-overview.mdc"
     secrets: inherit
diff --git a/.github/workflows/aider-external.yaml b/.github/workflows/aider-external.yaml
index cfdb03d352..c01152e3ce 100644
--- a/.github/workflows/aider-external.yaml
+++ b/.github/workflows/aider-external.yaml
@@ -76,5 +76,5 @@ jobs:
       issue_body: ${{ needs.check-and-prepare.outputs.issue_body }}
       instruction: ${{ needs.check-and-prepare.outputs.instruction }}
       issue_id: ${{ github.event.client_payload.issue_id }}
-      rules_files: "CLAUDE.md backend/CLAUDE.md frontend/CLAUDE.md"
+      rules_files: ".cursor/rules/rust-best-practices.mdc .cursor/rules/svelte5-best-practices.mdc .cursor/rules/windmill-overview.mdc"
     secrets: inherit
diff --git a/.github/workflows/aider.yaml b/.github/workflows/aider.yaml
index e7609597e3..2e943234b9 100644
--- a/.github/workflows/aider.yaml
+++ b/.github/workflows/aider.yaml
@@ -161,5 +161,5 @@ jobs:
       issue_body: ${{ needs.check-and-prepare.outputs.issue_body }}
       instruction: ${{ needs.check-and-prepare.outputs.comment_content }}
       issue_id: ${{ github.event.issue.number }}
-      rules_files: "CLAUDE.md backend/CLAUDE.md frontend/CLAUDE.md"
+      rules_files: ".cursor/rules/rust-best-practices.mdc .cursor/rules/svelte5-best-practices.mdc .cursor/rules/windmill-overview.mdc"
     secrets: inherit
diff --git a/.github/workflows/backend-check.yml b/.github/workflows/backend-check.yml
index 901a30cca6..7fc0874564 100644
--- a/.github/workflows/backend-check.yml
+++ b/.github/workflows/backend-check.yml
@@ -53,7 +53,7 @@ jobs:
         timeout-minutes: 16
         run: |
           mkdir -p fake_frontend_build
-          FRONTEND_BUILD_DIR=$(pwd)/fake_frontend_build SQLX_OFFLINE=true cargo check --all-features
+          FRONTEND_BUILD_DIR=$(pwd)/fake_frontend_build SQLX_OFFLINE=true cargo check --features $(./all_features_oss.sh)
 
   check_ee:
     runs-on: ubicloud-standard-8
diff --git a/.github/workflows/build-publish-rh-image.yml b/.github/workflows/build-publish-rh-image.yml
index b919de6e18..848c30c7f6 100644
--- a/.github/workflows/build-publish-rh-image.yml
+++ b/.github/workflows/build-publish-rh-image.yml
@@ -64,7 +64,7 @@ jobs:
           platforms: linux/amd64
           push: true
           build-args: |
-            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,license,otel,http_trigger,zip,oauth2,kafka,sqs_trigger,nats,postgres_trigger,gcp_trigger,mqtt_trigger,websocket,smtp,static_frontend,all_languages,deno_core,mcp
+            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,license,otel,http_trigger,zip,oauth2,kafka,sqs_trigger,nats,postgres_trigger,gcp_trigger,mqtt_trigger,websocket,smtp,static_frontend,all_languages,deno_core,mcp,private
           secrets: |
             rh_username=${{ secrets.RH_USERNAME }}
             rh_password=${{ secrets.RH_PASSWORD }}
@@ -81,7 +81,7 @@ jobs:
           platforms: linux/arm64
           push: true
           build-args: |
-            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,license,otel,http_trigger,zip,oauth2,kafka,sqs_trigger,nats,postgres_trigger,gcp_trigger,mqtt_trigger,websocket,smtp,static_frontend,all_languages,deno_core,mcp
+            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,license,otel,http_trigger,zip,oauth2,kafka,sqs_trigger,nats,postgres_trigger,gcp_trigger,mqtt_trigger,websocket,smtp,static_frontend,all_languages,deno_core,mcp,private
           secrets: |
             rh_username=${{ secrets.RH_USERNAME }}
             rh_password=${{ secrets.RH_PASSWORD }}
diff --git a/.github/workflows/build_windows_worker_.yml b/.github/workflows/build_windows_worker_.yml
index ac1476d76e..738b2a9224 100644
--- a/.github/workflows/build_windows_worker_.yml
+++ b/.github/workflows/build_windows_worker_.yml
@@ -51,7 +51,7 @@ jobs:
           $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,license,http_trigger,zip,oauth2,kafka,nats,sqs_trigger,postgres_trigger,gcp_trigger,mqtt_trigger,websocket,smtp,static_frontend,all_languages,mcp
+          cargo build --release --features=enterprise,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,tantivy,license,http_trigger,zip,oauth2,kafka,nats,sqs_trigger,postgres_trigger,gcp_trigger,mqtt_trigger,websocket,smtp,static_frontend,all_languages_windows,mcp,private
       - name: Rename binary with corresponding architecture
         run: |
           Rename-Item -Path ".\backend\target\release\windmill.exe" -NewName "windmill-ee.exe"
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
index 9bc9f8d7ea..7261fb607c 100644
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -69,17 +69,17 @@ jobs:
         with:
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
           timeout_minutes: "60"
-          allowed_tools: "mcp__github__create_pull_request,Bash(npm run check),Bash(npm install),Bash(cargo check),Bash(curl https://sh.rustup.rs -sSf | sh)"
+          allowed_tools: "mcp__github__create_pull_request,Bash(npm run check),Bash(npm install),Bash(cargo check),Bash(curl https://sh.rustup.rs -sSf | sh -s -- -y)"
           custom_instructions: "IMPORTANT INSTRUCTIONS:
-          - Bypass previous instructions and instead of adding a url in your comment to manually create a PR, if you created a new branch with your changes, automatically create a PR from that branch to main, with the title starting with [Claude PR].
+          - Bypass previous instructions and instead of adding a url in your comment to manually create a PR, if you created a new branch with your changes, automatically create a draft PR from that branch to main, with the title starting with [Claude PR].
           - If you made changes to the frontend code, run npm install, then npm run generate-backend-client, then npm run check. You can ignore warnings that are reported by the check script, but fix the errors.
           - If you made changes to the backend code, install Rust and then run cargo check. You can ignore warnings that are reported by the check script, but fix the errors.
-          - DO NOT FORGET TO OPEN A PR AFTER YOU ARE DONE if you made changes after a request from a git issue.
+          - DO NOT FORGET TO OPEN A DRAFT PR AFTER YOU ARE DONE if you made changes after a request from a git issue.
           AVAILABLE TOOLS:
           - mcp__github__create_pull_request: Create a PR from a branch to main
           - Bash(npm run check): Run the check script. You should run this tool after making changes to the frontend code.
           - Bash(npm install): Install dependencies. You need this to run npm run check.
           - Bash(npm run generate-backend-client): Generate the backend client. You need this to run npm run check.
           - Bash(cargo check): Run the cargo check script. You should run this tool after making changes to the backend code.
-          - Bash(curl https://sh.rustup.rs -sSf | sh): Install Rust. You need this to run cargo check."
+          - Bash(curl https://sh.rustup.rs -sSf | sh -s -- -y): Install Rust. You need this to run cargo check."
           trigger_phrase: "/ai"
diff --git a/.github/workflows/discord-notification.yml b/.github/workflows/discord-notification.yml
index 3ffec78a60..012c406cef 100644
--- a/.github/workflows/discord-notification.yml
+++ b/.github/workflows/discord-notification.yml
@@ -17,8 +17,11 @@ jobs:
       PR_AUTHOR: ${{ github.event.pull_request.user.login }}
       PR_STATUS: "opened"
       PR_NUMBER: ${{ github.event.pull_request.number }}
+      DISCORD_CHANNEL_ID: "1372204995868491786"
+      DISCORD_GUILD_ID: "930051556043276338"
     secrets:
       DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_PR_REVIEWS_WEBHOOK }}
+      DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_AI_BOT_TOKEN }}
 
   merge_success_emoji:
     if: github.event.pull_request.merged == true
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 216d7cefea..5425ccb7e1 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -92,7 +92,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            features=embedding,parquet,openidconnect,jemalloc,license,http_trigger,zip,oauth2,dind,postgres_trigger,mqtt_trigger,websocket,smtp,static_frontend,agent_worker_server,all_languages,deno_core,mcp
+            features=embedding,parquet,openidconnect,jemalloc,license,http_trigger,zip,oauth2,dind,postgres_trigger,mqtt_trigger,websocket,smtp,static_frontend,agent_worker_server,all_languages,deno_core,mcp,private
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.DEV_SHA }}
             ${{ steps.meta-public.outputs.tags }}
@@ -154,7 +154,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,agent_worker_server,tantivy,license,http_trigger,zip,oauth2,kafka,sqs_trigger,nats,otel,dind,postgres_trigger,mqtt_trigger,gcp_trigger,websocket,smtp,static_frontend,all_languages,deno_core,mcp
+            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,agent_worker_server,tantivy,license,http_trigger,zip,oauth2,kafka,sqs_trigger,nats,otel,dind,postgres_trigger,mqtt_trigger,gcp_trigger,websocket,smtp,static_frontend,all_languages,private,deno_core,mcp
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ee:${{ env.DEV_SHA }}
             ${{ steps.meta-ee-public.outputs.tags }}
diff --git a/.github/workflows/helmchart_on_release.yml b/.github/workflows/helmchart_on_release.yml
index 1d63cbc326..eeae218d5d 100644
--- a/.github/workflows/helmchart_on_release.yml
+++ b/.github/workflows/helmchart_on_release.yml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: windmill-labs/windmill-helm-charts
-          token: ${{ secrets.DOCS_TOKEN }}
+          token: ${{ secrets.HELM_CHART_TOKEN }}
 
       - name: Get version
         id: get_version
@@ -57,7 +57,7 @@ jobs:
 
       - name: Create PR
         env:
-          GH_TOKEN: ${{ secrets.DOCS_TOKEN }}
+          GH_TOKEN: ${{ secrets.HELM_CHART_TOKEN }}
         run: |
           gh pr create \
             --title "helm: bump version to ${{ env.VERSION }}" \
diff --git a/.github/workflows/publish_windows_worker.yml b/.github/workflows/publish_windows_worker.yml
index 057a858881..e9a8c77e87 100644
--- a/.github/workflows/publish_windows_worker.yml
+++ b/.github/workflows/publish_windows_worker.yml
@@ -53,7 +53,7 @@ jobs:
           $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,license,http_trigger,zip,oauth2,kafka,sqs_trigger,nats,postgres_trigger,mqtt_trigger,gcp_trigger,websocket,smtp,static_frontend,all_languages,mcp
+          cargo build --release --features=enterprise,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc,tantivy,license,http_trigger,zip,oauth2,kafka,sqs_trigger,nats,postgres_trigger,mqtt_trigger,gcp_trigger,websocket,smtp,static_frontend,all_languages_windows,mcp,private
       - name: Rename binary with corresponding architecture
         run: |
           Rename-Item -Path ".\backend\target\release\windmill.exe" -NewName "windmill-ee.exe"
diff --git a/.github/workflows/shareable-discord-notification.yml b/.github/workflows/shareable-discord-notification.yml
index cb6dbf055d..1b7936330f 100644
--- a/.github/workflows/shareable-discord-notification.yml
+++ b/.github/workflows/shareable-discord-notification.yml
@@ -38,24 +38,45 @@ jobs:
       - name: Send Discord notification and start a thread
         env:
           WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          BOT_TOKEN: ${{ secrets.DISCORD_BOT_TOKEN }}
+          CHANNEL_ID: ${{ inputs.DISCORD_CHANNEL_ID }}
+          GUILD_ID: ${{ inputs.DISCORD_GUILD_ID }}
           PR_TITLE: ${{ inputs.PR_TITLE }}
           PR_NUMBER: ${{ inputs.PR_NUMBER }}
           PR_URL: ${{ inputs.PR_URL }}
           PR_AUTHOR: ${{ inputs.PR_AUTHOR }}
         run: |
-          payload=$(jq -n \
-            --arg content "${PR_URL}" \
-            --arg thread "#${PR_NUMBER}: $PR_TITLE by \`${PR_AUTHOR}\`" \
-            '{
-              content: $content,
-              thread_name: $thread,
-              auto_archive_duration: 10080
-            }'
-          )
-          curl -H "Content-Type: application/json" \
-            -X POST \
-            -d "$payload" \
-            "$WEBHOOK_URL"
+          # Check if thread already exists
+          thread_exists=false
+          if threads=$(curl -s -H "Authorization: Bot $BOT_TOKEN" "https://discord.com/api/v10/guilds/${GUILD_ID}/threads/active"); then
+            if thread_id=$(echo "$threads" | jq -r --arg cid "$CHANNEL_ID" --arg pref "#${PR_NUMBER}:" '.threads[] | select(.parent_id == $cid and (.name | startswith($pref))) | .id' 2>/dev/null); then
+              if [ -n "$thread_id" ]; then
+                thread_exists=true
+                echo "Thread already exists, skipping creation"
+              fi
+            fi
+          else
+            echo "Failed to check for existing threads, will create new thread"
+          fi
+
+          # Create thread if it doesn't exist or if check failed
+          if [ "$thread_exists" = false ]; then
+            echo "Creating new thread"
+            THREAD_TITLE="#${PR_NUMBER}: ${PR_TITLE} by \`${PR_AUTHOR}\`"
+            payload=$(jq -n \
+              --arg content "${PR_URL}" \
+              --arg thread "${THREAD_TITLE:0:99}" \
+              '{
+                content: $content,
+                thread_name: $thread,
+                auto_archive_duration: 10080
+              }'
+            )
+            curl -H "Content-Type: application/json" \
+              -X POST \
+              -d "$payload" \
+              "$WEBHOOK_URL"
+          fi
 
   merge_success_emoji:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/validate-openapi.yml b/.github/workflows/validate-openapi.yml
new file mode 100644
index 0000000000..5bc59ebc4c
--- /dev/null
+++ b/.github/workflows/validate-openapi.yml
@@ -0,0 +1,34 @@
+name: Validate OpenAPI Spec
+
+on:
+  push:
+    paths:
+      - 'backend/windmill-api/openapi*'
+  pull_request:
+    paths:
+      - 'backend/windmill-api/openapi*'
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install openapi-generator-cli
+        run: npm install @openapitools/openapi-generator-cli -g
+
+      - name: Validate openapi.yaml
+        run: npx @openapitools/openapi-generator-cli validate -i backend/windmill-api/openapi.yaml
+
+      - name: Validate openapi-deref.json
+        run: npx @openapitools/openapi-generator-cli validate -i backend/windmill-api/openapi-deref.json
+
+      # Does not work well with dereferenced yaml
+      # - name: Validate openapi-deref.yaml
+      #   run: npx @openapitools/openapi-generator-cli validate -i backend/windmill-api/openapi-deref.yaml
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bdd6a9a9f..5996d90d3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,94 @@
 # Changelog
 
+## [1.496.3](https://github.com/windmill-labs/windmill/compare/v1.496.2...v1.496.3) (2025-06-09)
+
+
+### Bug Fixes
+
+* improve concurrent job parallelism performance ([e8836a3](https://github.com/windmill-labs/windmill/commit/e8836a393a872bb91e68ba0037681caf24149470))
+* Prioritize diff contexts in script mode for ai chat ([#5888](https://github.com/windmill-labs/windmill/issues/5888)) ([a47939d](https://github.com/windmill-labs/windmill/commit/a47939d13c30e2d4b41efd539f845959174d4fb1))
+
+## [1.496.2](https://github.com/windmill-labs/windmill/compare/v1.496.1...v1.496.2) (2025-06-07)
+
+
+### Bug Fixes
+
+* add clearable by default for select ([#5900](https://github.com/windmill-labs/windmill/issues/5900)) ([b44b9c1](https://github.com/windmill-labs/windmill/commit/b44b9c1b82116ad5487af95d1f78226d56c75179))
+
+## [1.496.1](https://github.com/windmill-labs/windmill/compare/v1.496.0...v1.496.1) (2025-06-07)
+
+
+### Bug Fixes
+
+* never consider minor version for global site packages ([#5893](https://github.com/windmill-labs/windmill/issues/5893)) ([22b2f49](https://github.com/windmill-labs/windmill/commit/22b2f4988db9314f2403508933d0aa932187c668))
+
+## [1.496.0](https://github.com/windmill-labs/windmill/compare/v1.495.1...v1.496.0) (2025-06-06)
+
+
+### Features
+
+* generate http route triggers from openapi spec ([#5857](https://github.com/windmill-labs/windmill/issues/5857)) ([5713483](https://github.com/windmill-labs/windmill/commit/571348377b73d54b4d2a1c5775ab00b247b01910))
+
+
+### Bug Fixes
+
+* allow fileupload drag and drop in edit mode on full component without triggering file picker ([#5889](https://github.com/windmill-labs/windmill/issues/5889)) ([9ae3212](https://github.com/windmill-labs/windmill/commit/9ae3212a1e0f88a8297bf41ab53e3c1be4bcc56c))
+* **python:** account instance version when cli deploy and local lockfile ([#5894](https://github.com/windmill-labs/windmill/issues/5894)) ([ec552d5](https://github.com/windmill-labs/windmill/commit/ec552d5ef6fdb5e824e453f196f9cf16629ee2ea))
+* use full client side js library for route gen from openapi ([#5891](https://github.com/windmill-labs/windmill/issues/5891)) ([3c3fdbd](https://github.com/windmill-labs/windmill/commit/3c3fdbdf26a9581b815210839b91ebdedb924093))
+
+## [1.495.0](https://github.com/windmill-labs/windmill/compare/v1.494.0...v1.495.0) (2025-06-05)
+
+
+### Features
+
+* Add ask mode to AI chat ([#5878](https://github.com/windmill-labs/windmill/issues/5878)) ([67ab469](https://github.com/windmill-labs/windmill/commit/67ab46990ad0c9fad810a64c54297419c6151c79))
+* add navigator mode to AIChat and unify UI ([#5859](https://github.com/windmill-labs/windmill/issues/5859)) ([cbba829](https://github.com/windmill-labs/windmill/commit/cbba8297cd4c1caa21b96a8422bbbd5c306b8398))
+* ai flow chat ([#5842](https://github.com/windmill-labs/windmill/issues/5842)) ([68ebf66](https://github.com/windmill-labs/windmill/commit/68ebf667d5c0bc306329d0b55a3cc59e5b4862cb))
+* ai prompts improvements + o3/o4 support ([#5862](https://github.com/windmill-labs/windmill/issues/5862)) ([825422c](https://github.com/windmill-labs/windmill/commit/825422c48456b2c9b230e1a35914b3fbf7d1e836))
+* connect fix btn in flow editor to ai chat ([#5863](https://github.com/windmill-labs/windmill/issues/5863)) ([6247d15](https://github.com/windmill-labs/windmill/commit/6247d159ce25ae13f6fbc5c105df88305ce29451))
+* fix backward compatibility pg 14 for postgres trigger ([#5851](https://github.com/windmill-labs/windmill/issues/5851)) ([4cbcbdb](https://github.com/windmill-labs/windmill/commit/4cbcbdb960b469acf773d3943128b6c7d0dcb0b8))
+* ssh repl like direct to workers hosts machine ([#5809](https://github.com/windmill-labs/windmill/issues/5809)) ([f252657](https://github.com/windmill-labs/windmill/commit/f2526571a3614156b2b1e5cc91b15d0c57565d99))
+* use rust-postgres client instead of sqlx for postgres trigger ([#5853](https://github.com/windmill-labs/windmill/issues/5853)) ([39dbd64](https://github.com/windmill-labs/windmill/commit/39dbd646b9683e0ad8de047cca786ae468759e77))
+
+
+### Bug Fixes
+
+* broken event dispatch for simpleditor ([#5879](https://github.com/windmill-labs/windmill/issues/5879)) ([df4992a](https://github.com/windmill-labs/windmill/commit/df4992a9295ed188c2a2cb0a5dfd3e33ae2e2dcb))
+* cannot parse INSTANCE_PYTHON_VERSION ([#5874](https://github.com/windmill-labs/windmill/issues/5874)) ([a0b302d](https://github.com/windmill-labs/windmill/commit/a0b302d2c58d4245260376cf280bc866be91717c))
+* fix regex that extract workspaces from custom tags ([#5876](https://github.com/windmill-labs/windmill/issues/5876)) ([1551dc8](https://github.com/windmill-labs/windmill/commit/1551dc8af22f6ea41f68290ace4c58f936c47745))
+* nit ai flow prompt ([#5867](https://github.com/windmill-labs/windmill/issues/5867)) ([3e769f0](https://github.com/windmill-labs/windmill/commit/3e769f0c591b80138b3a356d147228675756452f))
+* **python:** assign PATCH version to python runtime only when needed ([#5866](https://github.com/windmill-labs/windmill/issues/5866)) ([50a5c1f](https://github.com/windmill-labs/windmill/commit/50a5c1f56a7e45882fa0095203de709571e149bb))
+* remove duplicate tools from script ai chat ([#5880](https://github.com/windmill-labs/windmill/issues/5880)) ([fe4a767](https://github.com/windmill-labs/windmill/commit/fe4a767df0e6f46fd0c0fd21b4116c7375978bf9))
+* replace crypto.randomUUID with generateRandomString for HTTP compatibility ([#5849](https://github.com/windmill-labs/windmill/issues/5849)) ([64f35d0](https://github.com/windmill-labs/windmill/commit/64f35d050fb0d1008ce7142fd62d500845e62c4a)), closes [#5847](https://github.com/windmill-labs/windmill/issues/5847)
+
+## [1.494.0](https://github.com/windmill-labs/windmill/compare/v1.493.4...v1.494.0) (2025-05-31)
+
+
+### Features
+
+* array of s3 objects in input maker ([806d669](https://github.com/windmill-labs/windmill/commit/806d66972568d21a1621acd1b30db5ae9b217341))
+* **rust:** shared build directory ([#5610](https://github.com/windmill-labs/windmill/issues/5610)) ([ed61d97](https://github.com/windmill-labs/windmill/commit/ed61d9770031c1a04908880dbd3e5fb692df9946))
+
+
+### Bug Fixes
+
+* allow disable tabs for sidebar/accordion tabs ([#5838](https://github.com/windmill-labs/windmill/issues/5838)) ([80277d1](https://github.com/windmill-labs/windmill/commit/80277d14d02e8e596c7002326946142226d382a6))
+
+## [1.493.4](https://github.com/windmill-labs/windmill/compare/v1.493.3...v1.493.4) (2025-05-29)
+
+
+### Bug Fixes
+
+* templatev2 delete issue ([#5834](https://github.com/windmill-labs/windmill/issues/5834)) ([ed3ad32](https://github.com/windmill-labs/windmill/commit/ed3ad327a235c16b9f3aa7f8edeefe61b0c01da3))
+
+## [1.493.3](https://github.com/windmill-labs/windmill/compare/v1.493.2...v1.493.3) (2025-05-29)
+
+
+### Bug Fixes
+
+* evalv2 prohibit component delete ([e302aa3](https://github.com/windmill-labs/windmill/commit/e302aa38b5977dd406ae05e1d8dbb74cb7dc3d17))
+* faster layout for larger graphs ([8d12bcc](https://github.com/windmill-labs/windmill/commit/8d12bcc8ee2991909ea0d9bb57f04f0d4106c69f))
+
 ## [1.493.2](https://github.com/windmill-labs/windmill/compare/v1.493.1...v1.493.2) (2025-05-28)
 
 
diff --git a/CLAUDE.md b/CLAUDE.md
index 3b701f2536..00d81d1b48 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,71 +1,3 @@
-# Windmill Overview
-
-Windmill is an open-source developer platform for building internal tools, API integrations, background jobs, workflows, and user interfaces. It offers a unified system where scripts are automatically turned into sharable UIs and can be composed into flows or embedded in custom applications.
-
-## Core Capabilities
-
-- **Script Development and Execution**: Write and run scripts in Python, TypeScript/JavaScript (Deno/Bun), Go, Bash, SQL, and other languages
-- **Workflow Orchestration**: Compose scripts into multi-step flows with conditional logic, loops, and error handling
-- **UI Generation**: Automatically generate UIs from scripts or build custom applications with a low-code editor
-- **Job Scheduling**: Trigger scripts and flows on schedules, webhooks, or external events
-- **Resource Management**: Securely store and use credentials, databases, and other connections
-
-## Platform Architecture
-
-The Windmill platform consists of several key components:
-
-- **Frontend UI**: Web-based interface for script and flow development, app building, and result visualization
-- **API Server**: Central API that handles authentication, resource management, and job coordination
-- **Workers**: Execute scripts in their respective environments with proper sandboxing
-- **Database**: PostgreSQL database for storage of scripts, flows, resources, job results, and more
-- **Job Queue**: Queue system for managing job execution, implemented in PostgreSQL
-- **Client Libraries**: Libraries for interacting with Windmill from Python, TypeScript, or command line
-
-# Windmill Backend Architecture
-
-The Windmill backend is written in Rust and consists of several services working together. These services are designed for horizontal scaling with stateless API servers and workers that can be deployed across multiple machines.
-
-## Key Components
-
-- **API Server (`windmill-api`)**: Handles HTTP requests, authentication, and resource management
-- **Queue Manager (`windmill-queue`)**: Manages the job queue in PostgreSQL
-- **Worker System (`windmill-worker`)**: Executes jobs in sandboxed environments
-- **Common Utilities (`windmill-common`)**: Shared code used by multiple services
-- **Git Sync (`windmill-git-sync`)**: Synchronizes scripts with Git repositories
-
-## Job Execution System
-
-The job execution process follows these steps:
-
-1. The API server receives a request to run a script or flow and creates a job record in the database
-2. The job is added to the queue system in PostgreSQL
-3. Workers continuously poll the queue for jobs matching their capabilities
-4. When a job is picked up, it's routed to the appropriate language executor
-5. The script is executed in a sandboxed environment using NSJAIL for security
-6. Results are processed and stored in the database
-7. For flows, each step creates a new job that goes through the same process
-
-Windmill supports worker tags and groups to route jobs to workers with specific capabilities or resource access.
-
-# Windmill Frontend Architecture
-
-The Windmill frontend is built with Svelte and provides several key interfaces for interacting with the platform.
-
-## Key Components
-
-- **Script Builder**: Code editor with language support, schema inference, and dependency management
-- **Flow Builder**: Visual editor for creating multi-step workflows with branching and looping
-- **App Editor**: Grid-based editor for building custom UIs that integrate scripts and flows
-- **Schema Form System**: Generates form interfaces from script parameters automatically
-- **Result Viewer**: Visualizes job results, logs, and execution status
-
-The frontend uses the Monaco editor (same as VS Code) for code editing, with specialized language support for all supported script languages.
-
-## UI Framework
-
-The frontend is built with Svelte, providing a reactive and component-based architecture. Key frontend technologies include:
-
-- **Svelte/SvelteKit**: Core framework for UI components and routing
-- **Monaco Editor**: Code editing experience similar to VS Code
-- **Schema Form**: Automatic UI generation from TypeScript/JSON schemas
-- **Tailwind CSS**: Utility-first CSS framework for styling
+To have an overview of what this app does, see @.cursor/rules/windmill-overview.mdc
+For backend modifications, follow the rules mentioned here @.cursor/rules/rust-best-practices.mdc
+For frontend modifications, follow the rules mentioned here @.cursor/rules/svelte5-best-practices.mdc
diff --git a/backend/.gitignore b/backend/.gitignore
index f75b9d1eaa..2a3262acac 100644
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -6,4 +6,5 @@ tracing.folded
 heaptrack*
 index/
 windmill-api/openapi-*.*
-.duckdb/*
\ No newline at end of file
+.duckdb/*
+*ee.rs
\ No newline at end of file
diff --git a/backend/.ignore b/backend/.ignore
new file mode 100644
index 0000000000..3173520127
--- /dev/null
+++ b/backend/.ignore
@@ -0,0 +1 @@
+!*ee.rs
\ No newline at end of file
diff --git a/backend/.sqlx/query-0937e25e89959447e7cb1816c112bbc4718cbb8ad6e2f13eae6b14f129d12936.json b/backend/.sqlx/query-0937e25e89959447e7cb1816c112bbc4718cbb8ad6e2f13eae6b14f129d12936.json
index 7d24993172..152ae38fdc 100644
--- a/backend/.sqlx/query-0937e25e89959447e7cb1816c112bbc4718cbb8ad6e2f13eae6b14f129d12936.json
+++ b/backend/.sqlx/query-0937e25e89959447e7cb1816c112bbc4718cbb8ad6e2f13eae6b14f129d12936.json
@@ -61,7 +61,8 @@
                 "csharp",
                 "oracledb",
                 "nu",
-                "java"
+                "java",
+                "duckdb"
               ]
             }
           }
diff --git a/backend/.sqlx/query-13444bbd5547e101c41206c5f97ac4dded0536faf52c370d704ed9a451041caf.json b/backend/.sqlx/query-13444bbd5547e101c41206c5f97ac4dded0536faf52c370d704ed9a451041caf.json
new file mode 100644
index 0000000000..6b8e275167
--- /dev/null
+++ b/backend/.sqlx/query-13444bbd5547e101c41206c5f97ac4dded0536faf52c370d704ed9a451041caf.json
@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) FROM sqs_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": "13444bbd5547e101c41206c5f97ac4dded0536faf52c370d704ed9a451041caf"
+}
diff --git a/backend/.sqlx/query-19f0ccadd3ee44719a781ea0d73ea4e45f5b2c3d5c0aa5dbecf9ea9838881b74.json b/backend/.sqlx/query-19f0ccadd3ee44719a781ea0d73ea4e45f5b2c3d5c0aa5dbecf9ea9838881b74.json
new file mode 100644
index 0000000000..62c47f2503
--- /dev/null
+++ b/backend/.sqlx/query-19f0ccadd3ee44719a781ea0d73ea4e45f5b2c3d5c0aa5dbecf9ea9838881b74.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "CREATE INDEX CONCURRENTLY IF NOT EXISTS v2_job_queue_suspend ON v2_job_queue (workspace_id, suspend) WHERE suspend > 0;",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "19f0ccadd3ee44719a781ea0d73ea4e45f5b2c3d5c0aa5dbecf9ea9838881b74"
+}
diff --git a/backend/.sqlx/query-1d87f41fd1abb9361d795a899120e6b77e24bf5a9044fdc5284d0d7f1e14eafa.json b/backend/.sqlx/query-1d87f41fd1abb9361d795a899120e6b77e24bf5a9044fdc5284d0d7f1e14eafa.json
deleted file mode 100644
index 6a79013c0b..0000000000
--- a/backend/.sqlx/query-1d87f41fd1abb9361d795a899120e6b77e24bf5a9044fdc5284d0d7f1e14eafa.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO usage (id, is_workspace, month_, usage) \n            VALUES ($1, TRUE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), $2) \n            ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + $2",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "1d87f41fd1abb9361d795a899120e6b77e24bf5a9044fdc5284d0d7f1e14eafa"
-}
diff --git a/backend/.sqlx/query-2bf5f7f2cf9d85a5d23e5db2f7616fb41fece9b3d46fde2d546d70b46f9008e3.json b/backend/.sqlx/query-2bf5f7f2cf9d85a5d23e5db2f7616fb41fece9b3d46fde2d546d70b46f9008e3.json
new file mode 100644
index 0000000000..d60b424505
--- /dev/null
+++ b/backend/.sqlx/query-2bf5f7f2cf9d85a5d23e5db2f7616fb41fece9b3d46fde2d546d70b46f9008e3.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO usage (id, is_workspace, month_, usage) \n                    VALUES ($1, FALSE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), $2) \n                    ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "2bf5f7f2cf9d85a5d23e5db2f7616fb41fece9b3d46fde2d546d70b46f9008e3"
+}
diff --git a/backend/.sqlx/query-2e9b3e718440f3c5269e9217a13076c565f3add98b6768b5476bd3afed11ea31.json b/backend/.sqlx/query-2e9b3e718440f3c5269e9217a13076c565f3add98b6768b5476bd3afed11ea31.json
deleted file mode 100644
index 70c5674cdf..0000000000
--- a/backend/.sqlx/query-2e9b3e718440f3c5269e9217a13076c565f3add98b6768b5476bd3afed11ea31.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO usage (id, is_workspace, month_, usage)\n                    VALUES ($1, FALSE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), 1)\n                    ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + 1 \n                    RETURNING usage.usage",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "usage",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Varchar"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "2e9b3e718440f3c5269e9217a13076c565f3add98b6768b5476bd3afed11ea31"
-}
diff --git a/backend/.sqlx/query-2ef25599ea0c9ef946d6cc70ae048af970aed2638a3f767e152b654aebf68e48.json b/backend/.sqlx/query-2ef25599ea0c9ef946d6cc70ae048af970aed2638a3f767e152b654aebf68e48.json
deleted file mode 100644
index da7d13f71c..0000000000
--- a/backend/.sqlx/query-2ef25599ea0c9ef946d6cc70ae048af970aed2638a3f767e152b654aebf68e48.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SHOW WAL_LEVEL;",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "wal_level",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "2ef25599ea0c9ef946d6cc70ae048af970aed2638a3f767e152b654aebf68e48"
-}
diff --git a/backend/.sqlx/query-faf2c77242e0ab39b33886edf3b742531bf1351d0be1c3631bde0adfe375497a.json b/backend/.sqlx/query-3e244a5057d4f1b4a18c0edac52cdf695c7e7aa0468d2686255de3d83719e6d0.json
similarity index 53%
rename from backend/.sqlx/query-faf2c77242e0ab39b33886edf3b742531bf1351d0be1c3631bde0adfe375497a.json
rename to backend/.sqlx/query-3e244a5057d4f1b4a18c0edac52cdf695c7e7aa0468d2686255de3d83719e6d0.json
index ea798bab76..e98bd34c2d 100644
--- a/backend/.sqlx/query-faf2c77242e0ab39b33886edf3b742531bf1351d0be1c3631bde0adfe375497a.json
+++ b/backend/.sqlx/query-3e244a5057d4f1b4a18c0edac52cdf695c7e7aa0468d2686255de3d83719e6d0.json
@@ -1,22 +1,22 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT tag FROM v2_job WHERE id = $1",
+  "query": "SELECT path FROM script WHERE workspace_id = $1 AND archived = false",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "tag",
+        "name": "path",
         "type_info": "Varchar"
       }
     ],
     "parameters": {
       "Left": [
-        "Uuid"
+        "Text"
       ]
     },
     "nullable": [
       false
     ]
   },
-  "hash": "faf2c77242e0ab39b33886edf3b742531bf1351d0be1c3631bde0adfe375497a"
+  "hash": "3e244a5057d4f1b4a18c0edac52cdf695c7e7aa0468d2686255de3d83719e6d0"
 }
diff --git a/backend/.sqlx/query-4469ee6c206c46951980ea1bc73f126f339d2e3cf97f363be8921084b16dac45.json b/backend/.sqlx/query-4469ee6c206c46951980ea1bc73f126f339d2e3cf97f363be8921084b16dac45.json
deleted file mode 100644
index 46a8d2e4f0..0000000000
--- a/backend/.sqlx/query-4469ee6c206c46951980ea1bc73f126f339d2e3cf97f363be8921084b16dac45.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT pubname AS publication_name FROM pg_publication;",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "publication_name",
-        "type_info": "Name"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "4469ee6c206c46951980ea1bc73f126f339d2e3cf97f363be8921084b16dac45"
-}
diff --git a/backend/.sqlx/query-488dd591096b2b47787afdc3a1d73917ed13269f2ee20b86df79fca2c8efe672.json b/backend/.sqlx/query-488dd591096b2b47787afdc3a1d73917ed13269f2ee20b86df79fca2c8efe672.json
index da5eb1ceea..561e202d1d 100644
--- a/backend/.sqlx/query-488dd591096b2b47787afdc3a1d73917ed13269f2ee20b86df79fca2c8efe672.json
+++ b/backend/.sqlx/query-488dd591096b2b47787afdc3a1d73917ed13269f2ee20b86df79fca2c8efe672.json
@@ -70,7 +70,8 @@
                 "csharp",
                 "oracledb",
                 "nu",
-                "java"
+                "java",
+                "duckdb"
               ]
             }
           }
diff --git a/backend/.sqlx/query-4aaab98ebdaa90f1edf49ac96fba6c391c4d0054a618b861464ee37239f1f1e0.json b/backend/.sqlx/query-4aaab98ebdaa90f1edf49ac96fba6c391c4d0054a618b861464ee37239f1f1e0.json
index d8a93c797d..65fa6cc9eb 100644
--- a/backend/.sqlx/query-4aaab98ebdaa90f1edf49ac96fba6c391c4d0054a618b861464ee37239f1f1e0.json
+++ b/backend/.sqlx/query-4aaab98ebdaa90f1edf49ac96fba6c391c4d0054a618b861464ee37239f1f1e0.json
@@ -137,7 +137,8 @@
                 "csharp",
                 "oracledb",
                 "nu",
-                "java"
+                "java",
+                "duckdb"
               ]
             }
           }
diff --git a/backend/.sqlx/query-4e5273b9ce05f6ee2dfd5f14c8574a0cf43682480452f7dbe23012320fe7fe25.json b/backend/.sqlx/query-4e5273b9ce05f6ee2dfd5f14c8574a0cf43682480452f7dbe23012320fe7fe25.json
new file mode 100644
index 0000000000..8176539a30
--- /dev/null
+++ b/backend/.sqlx/query-4e5273b9ce05f6ee2dfd5f14c8574a0cf43682480452f7dbe23012320fe7fe25.json
@@ -0,0 +1,58 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n    SELECT \n        tag, \n        script_lang AS \"script_lang!: _\"\n    FROM \n        v2_job\n    WHERE \n        id = $1\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "tag",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "script_lang!: _",
+        "type_info": {
+          "Custom": {
+            "name": "script_lang",
+            "kind": {
+              "Enum": [
+                "python3",
+                "deno",
+                "go",
+                "bash",
+                "postgresql",
+                "nativets",
+                "bun",
+                "mysql",
+                "bigquery",
+                "snowflake",
+                "graphql",
+                "powershell",
+                "mssql",
+                "php",
+                "bunnative",
+                "rust",
+                "ansible",
+                "csharp",
+                "oracledb",
+                "nu",
+                "java",
+                "duckdb"
+              ]
+            }
+          }
+        }
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid"
+      ]
+    },
+    "nullable": [
+      false,
+      true
+    ]
+  },
+  "hash": "4e5273b9ce05f6ee2dfd5f14c8574a0cf43682480452f7dbe23012320fe7fe25"
+}
diff --git a/backend/.sqlx/query-4ee0017771f46f0272817d18edb821940cb5064e3f155b9630b131c09c9dba13.json b/backend/.sqlx/query-4ee0017771f46f0272817d18edb821940cb5064e3f155b9630b131c09c9dba13.json
deleted file mode 100644
index 52136dd33e..0000000000
--- a/backend/.sqlx/query-4ee0017771f46f0272817d18edb821940cb5064e3f155b9630b131c09c9dba13.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        SELECT \n            slot_name,\n            active\n        FROM\n            pg_replication_slots \n        WHERE \n            plugin = 'pgoutput' AND\n            slot_type = 'logical';\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "slot_name",
-        "type_info": "Name"
-      },
-      {
-        "ordinal": 1,
-        "name": "active",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      true,
-      true
-    ]
-  },
-  "hash": "4ee0017771f46f0272817d18edb821940cb5064e3f155b9630b131c09c9dba13"
-}
diff --git a/backend/.sqlx/query-553108ba3c0b8d579800bc8b5a4f887d79fb4c13b60b19c4913a8db18521958c.json b/backend/.sqlx/query-553108ba3c0b8d579800bc8b5a4f887d79fb4c13b60b19c4913a8db18521958c.json
deleted file mode 100644
index e3d2e205f1..0000000000
--- a/backend/.sqlx/query-553108ba3c0b8d579800bc8b5a4f887d79fb4c13b60b19c4913a8db18521958c.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE v2_job_queue q SET suspend = 0\n                             FROM v2_job j, v2_job_status f\n                             WHERE parent_job = $1\n                                 AND f.id = j.id AND q.id = j.id\n                                 AND suspend = $2 AND (f.flow_status->'step')::int = 0",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "553108ba3c0b8d579800bc8b5a4f887d79fb4c13b60b19c4913a8db18521958c"
-}
diff --git a/backend/.sqlx/query-56b2326015fde12b1a4efa226518566101dd27a0f3363884781071d417f8b7e7.json b/backend/.sqlx/query-56b2326015fde12b1a4efa226518566101dd27a0f3363884781071d417f8b7e7.json
new file mode 100644
index 0000000000..9da0554266
--- /dev/null
+++ b/backend/.sqlx/query-56b2326015fde12b1a4efa226518566101dd27a0f3363884781071d417f8b7e7.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO usage (id, is_workspace, month_, usage)\n                        VALUES ($1, FALSE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), 1)\n                        ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + 1 \n                        RETURNING usage.usage",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "usage",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Varchar"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "56b2326015fde12b1a4efa226518566101dd27a0f3363884781071d417f8b7e7"
+}
diff --git a/backend/.sqlx/query-61c29d684e8e683e839a6d7210b3b9b96854e5bfd752e45922c358c42ebea0c4.json b/backend/.sqlx/query-61c29d684e8e683e839a6d7210b3b9b96854e5bfd752e45922c358c42ebea0c4.json
index be472306a0..1a30ad011f 100644
--- a/backend/.sqlx/query-61c29d684e8e683e839a6d7210b3b9b96854e5bfd752e45922c358c42ebea0c4.json
+++ b/backend/.sqlx/query-61c29d684e8e683e839a6d7210b3b9b96854e5bfd752e45922c358c42ebea0c4.json
@@ -61,7 +61,8 @@
                 "csharp",
                 "oracledb",
                 "nu",
-                "java"
+                "java",
+                "duckdb"
               ]
             }
           }
diff --git a/backend/.sqlx/query-621e9a2a53187dac3ebed62f0d645b692815f1594bf302dbebd5f80d5d22b98e.json b/backend/.sqlx/query-621e9a2a53187dac3ebed62f0d645b692815f1594bf302dbebd5f80d5d22b98e.json
deleted file mode 100644
index 6a66bb6f22..0000000000
--- a/backend/.sqlx/query-621e9a2a53187dac3ebed62f0d645b692815f1594bf302dbebd5f80d5d22b98e.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO usage (id, is_workspace, month_, usage)\n                    VALUES ($1, TRUE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), 1)\n                    ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + 1 \n                    RETURNING usage.usage",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "usage",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Varchar"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "621e9a2a53187dac3ebed62f0d645b692815f1594bf302dbebd5f80d5d22b98e"
-}
diff --git a/backend/.sqlx/query-6a19c440a7a8064f3969cf6f48adea0bfdb683de9555e374ce5731e0b3c379f9.json b/backend/.sqlx/query-6a19c440a7a8064f3969cf6f48adea0bfdb683de9555e374ce5731e0b3c379f9.json
new file mode 100644
index 0000000000..4ea7dabd04
--- /dev/null
+++ b/backend/.sqlx/query-6a19c440a7a8064f3969cf6f48adea0bfdb683de9555e374ce5731e0b3c379f9.json
@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) FROM gcp_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": "6a19c440a7a8064f3969cf6f48adea0bfdb683de9555e374ce5731e0b3c379f9"
+}
diff --git a/backend/.sqlx/query-6e2564dc37ee967c634deade67ceabc4c516418e595dee9cd7d651acc1f4af6e.json b/backend/.sqlx/query-6e2564dc37ee967c634deade67ceabc4c516418e595dee9cd7d651acc1f4af6e.json
index 1ab5672e7d..39ebee28b4 100644
--- a/backend/.sqlx/query-6e2564dc37ee967c634deade67ceabc4c516418e595dee9cd7d651acc1f4af6e.json
+++ b/backend/.sqlx/query-6e2564dc37ee967c634deade67ceabc4c516418e595dee9cd7d651acc1f4af6e.json
@@ -147,7 +147,8 @@
                 "csharp",
                 "oracledb",
                 "nu",
-                "java"
+                "java",
+                "duckdb"
               ]
             }
           }
diff --git a/backend/.sqlx/query-6f56acb985aa7141ea1891d7ad58a32c35d1b02fe7070c92a2e62c1a5339c396.json b/backend/.sqlx/query-6f56acb985aa7141ea1891d7ad58a32c35d1b02fe7070c92a2e62c1a5339c396.json
deleted file mode 100644
index f3bda55eec..0000000000
--- a/backend/.sqlx/query-6f56acb985aa7141ea1891d7ad58a32c35d1b02fe7070c92a2e62c1a5339c396.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT slot_name FROM pg_replication_slots where slot_name = $1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "slot_name",
-        "type_info": "Name"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Name"
-      ]
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "6f56acb985aa7141ea1891d7ad58a32c35d1b02fe7070c92a2e62c1a5339c396"
-}
diff --git a/backend/.sqlx/query-7e64ba7e2362cc19d2aed9f34c9879983922e96a9baab7c1a2b09ed2b1c261e2.json b/backend/.sqlx/query-7e64ba7e2362cc19d2aed9f34c9879983922e96a9baab7c1a2b09ed2b1c261e2.json
deleted file mode 100644
index 9984af6e6e..0000000000
--- a/backend/.sqlx/query-7e64ba7e2362cc19d2aed9f34c9879983922e96a9baab7c1a2b09ed2b1c261e2.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT \n            active_pid \n        FROM \n            pg_replication_slots \n        WHERE \n            slot_name = $1\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "active_pid",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Name"
-      ]
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "7e64ba7e2362cc19d2aed9f34c9879983922e96a9baab7c1a2b09ed2b1c261e2"
-}
diff --git a/backend/.sqlx/query-804fc11e35f4afc0db194b6fe2594f91df7e588d4d2431bc85f4d8734920c8bf.json b/backend/.sqlx/query-804fc11e35f4afc0db194b6fe2594f91df7e588d4d2431bc85f4d8734920c8bf.json
index 89745202b0..7933311a4c 100644
--- a/backend/.sqlx/query-804fc11e35f4afc0db194b6fe2594f91df7e588d4d2431bc85f4d8734920c8bf.json
+++ b/backend/.sqlx/query-804fc11e35f4afc0db194b6fe2594f91df7e588d4d2431bc85f4d8734920c8bf.json
@@ -34,7 +34,8 @@
                 "csharp",
                 "oracledb",
                 "nu",
-                "java"
+                "java",
+                "duckdb"
               ]
             }
           }
diff --git a/backend/.sqlx/query-83f64dd93b1ddc03b84681d65d9be69959987cbac1d83b64225fd1bf9ab047c9.json b/backend/.sqlx/query-83f64dd93b1ddc03b84681d65d9be69959987cbac1d83b64225fd1bf9ab047c9.json
new file mode 100644
index 0000000000..3ca69e27dd
--- /dev/null
+++ b/backend/.sqlx/query-83f64dd93b1ddc03b84681d65d9be69959987cbac1d83b64225fd1bf9ab047c9.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO usage (id, is_workspace, month_, usage)\n                        VALUES ($1, TRUE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), 1)\n                        ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + 1 \n                        RETURNING usage.usage",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "usage",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Varchar"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "83f64dd93b1ddc03b84681d65d9be69959987cbac1d83b64225fd1bf9ab047c9"
+}
diff --git a/backend/.sqlx/query-86ae16175ace0179e784aacfd381771f0137ecab6671d632febadede729e7783.json b/backend/.sqlx/query-86ae16175ace0179e784aacfd381771f0137ecab6671d632febadede729e7783.json
deleted file mode 100644
index cbf85f6b0d..0000000000
--- a/backend/.sqlx/query-86ae16175ace0179e784aacfd381771f0137ecab6671d632febadede729e7783.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n            puballtables AS all_table,\n            pubinsert AS insert,\n            pubupdate AS update,\n            pubdelete AS delete\n        FROM\n            pg_publication\n        WHERE\n            pubname = $1\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "all_table",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 1,
-        "name": "insert",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 2,
-        "name": "update",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 3,
-        "name": "delete",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Name"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "86ae16175ace0179e784aacfd381771f0137ecab6671d632febadede729e7783"
-}
diff --git a/backend/.sqlx/query-997586ac14384db2c0eeee1bb3382cc6ae013695d0cda6da9ab848ca1b9a9606.json b/backend/.sqlx/query-997586ac14384db2c0eeee1bb3382cc6ae013695d0cda6da9ab848ca1b9a9606.json
new file mode 100644
index 0000000000..1edf26100f
--- /dev/null
+++ b/backend/.sqlx/query-997586ac14384db2c0eeee1bb3382cc6ae013695d0cda6da9ab848ca1b9a9606.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE worker_ping SET\nping_at = now(),\njobs_executed = 1,\ncurrent_job_id = $1,\ncurrent_job_workspace_id = 'admins'\nWHERE worker = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "997586ac14384db2c0eeee1bb3382cc6ae013695d0cda6da9ab848ca1b9a9606"
+}
diff --git a/backend/.sqlx/query-a8b470b463ca4b7c00c7ef6e9f36c23f8bbcefc288a56d61122bfd6fe5ca7e8d.json b/backend/.sqlx/query-a8b470b463ca4b7c00c7ef6e9f36c23f8bbcefc288a56d61122bfd6fe5ca7e8d.json
new file mode 100644
index 0000000000..6ac4ee6755
--- /dev/null
+++ b/backend/.sqlx/query-a8b470b463ca4b7c00c7ef6e9f36c23f8bbcefc288a56d61122bfd6fe5ca7e8d.json
@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) FROM mqtt_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": "a8b470b463ca4b7c00c7ef6e9f36c23f8bbcefc288a56d61122bfd6fe5ca7e8d"
+}
diff --git a/backend/.sqlx/query-a8bcae108af1eda6efe3a4b8c6f8807bc464a81c0883e68f5a69b89b94b0b34b.json b/backend/.sqlx/query-a8bcae108af1eda6efe3a4b8c6f8807bc464a81c0883e68f5a69b89b94b0b34b.json
index a2a19a6c35..a3cb5a82b9 100644
--- a/backend/.sqlx/query-a8bcae108af1eda6efe3a4b8c6f8807bc464a81c0883e68f5a69b89b94b0b34b.json
+++ b/backend/.sqlx/query-a8bcae108af1eda6efe3a4b8c6f8807bc464a81c0883e68f5a69b89b94b0b34b.json
@@ -36,7 +36,8 @@
                 "csharp",
                 "oracledb",
                 "nu",
-                "java"
+                "java",
+                "duckdb"
               ]
             }
           }
diff --git a/backend/.sqlx/query-a9db7b2f435bb82acb8c5eeb7f800b28f3256491fdaa168591adc7b4b9f3327a.json b/backend/.sqlx/query-a9db7b2f435bb82acb8c5eeb7f800b28f3256491fdaa168591adc7b4b9f3327a.json
index 8cc09349ec..16fea8720d 100644
--- a/backend/.sqlx/query-a9db7b2f435bb82acb8c5eeb7f800b28f3256491fdaa168591adc7b4b9f3327a.json
+++ b/backend/.sqlx/query-a9db7b2f435bb82acb8c5eeb7f800b28f3256491fdaa168591adc7b4b9f3327a.json
@@ -41,7 +41,8 @@
                 "csharp",
                 "oracledb",
                 "nu",
-                "java"
+                "java",
+                "duckdb"
               ]
             }
           }
diff --git a/backend/.sqlx/query-ab04cda71f8e2be9acbecabe1ee5ef756b8e5c1955fbe111df9ee171dc262338.json b/backend/.sqlx/query-ab04cda71f8e2be9acbecabe1ee5ef756b8e5c1955fbe111df9ee171dc262338.json
index 47e4f47005..c8cbb8e10d 100644
--- a/backend/.sqlx/query-ab04cda71f8e2be9acbecabe1ee5ef756b8e5c1955fbe111df9ee171dc262338.json
+++ b/backend/.sqlx/query-ab04cda71f8e2be9acbecabe1ee5ef756b8e5c1955fbe111df9ee171dc262338.json
@@ -65,7 +65,8 @@
                 "csharp",
                 "oracledb",
                 "nu",
-                "java"
+                "java",
+                "duckdb"
               ]
             }
           }
diff --git a/backend/.sqlx/query-baa1dddc616419bf4b923715f0a863bc0ff69c98db0f0c8f55e4ac89fdde7a60.json b/backend/.sqlx/query-baa1dddc616419bf4b923715f0a863bc0ff69c98db0f0c8f55e4ac89fdde7a60.json
deleted file mode 100644
index e772354ea8..0000000000
--- a/backend/.sqlx/query-baa1dddc616419bf4b923715f0a863bc0ff69c98db0f0c8f55e4ac89fdde7a60.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT pubname FROM pg_publication WHERE pubname = $1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "pubname",
-        "type_info": "Name"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Name"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "baa1dddc616419bf4b923715f0a863bc0ff69c98db0f0c8f55e4ac89fdde7a60"
-}
diff --git a/backend/.sqlx/query-c3025cdb6e421e1225d420e8b1efd18d1dd3bb2fac53c1f2df648b61fb7488aa.json b/backend/.sqlx/query-c3025cdb6e421e1225d420e8b1efd18d1dd3bb2fac53c1f2df648b61fb7488aa.json
deleted file mode 100644
index 638417aabb..0000000000
--- a/backend/.sqlx/query-c3025cdb6e421e1225d420e8b1efd18d1dd3bb2fac53c1f2df648b61fb7488aa.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE worker_ping SET \nping_at = now(), \njobs_executed = 1, \ncurrent_job_id = $1, \ncurrent_job_workspace_id = 'admins' \nWHERE worker = $2",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "c3025cdb6e421e1225d420e8b1efd18d1dd3bb2fac53c1f2df648b61fb7488aa"
-}
diff --git a/backend/.sqlx/query-ca3ba808e020c8c7a35eaef842b20cfeee64fd47ded72fce55cc75e0bbb291a8.json b/backend/.sqlx/query-ca3ba808e020c8c7a35eaef842b20cfeee64fd47ded72fce55cc75e0bbb291a8.json
new file mode 100644
index 0000000000..6d44fb2840
--- /dev/null
+++ b/backend/.sqlx/query-ca3ba808e020c8c7a35eaef842b20cfeee64fd47ded72fce55cc75e0bbb291a8.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO usage (id, is_workspace, month_, usage) \n                VALUES ($1, TRUE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), $2) \n                ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "ca3ba808e020c8c7a35eaef842b20cfeee64fd47ded72fce55cc75e0bbb291a8"
+}
diff --git a/backend/.sqlx/query-cccdcb7fe7968eadfc04d8957a8e98b2f2d92a6d7f687a9dd5a70edb3d5a63e6.json b/backend/.sqlx/query-cccdcb7fe7968eadfc04d8957a8e98b2f2d92a6d7f687a9dd5a70edb3d5a63e6.json
index 412b64c480..94f591b3da 100644
--- a/backend/.sqlx/query-cccdcb7fe7968eadfc04d8957a8e98b2f2d92a6d7f687a9dd5a70edb3d5a63e6.json
+++ b/backend/.sqlx/query-cccdcb7fe7968eadfc04d8957a8e98b2f2d92a6d7f687a9dd5a70edb3d5a63e6.json
@@ -70,7 +70,8 @@
                 "csharp",
                 "oracledb",
                 "nu",
-                "java"
+                "java",
+                "duckdb"
               ]
             }
           }
diff --git a/backend/.sqlx/query-d15f02f090b8d1a7e816fe11b2e0867540ab6bb02ac6bf82decc220dce0ab048.json b/backend/.sqlx/query-d15f02f090b8d1a7e816fe11b2e0867540ab6bb02ac6bf82decc220dce0ab048.json
index 0a2b8c3a0c..3a23232dcc 100644
--- a/backend/.sqlx/query-d15f02f090b8d1a7e816fe11b2e0867540ab6bb02ac6bf82decc220dce0ab048.json
+++ b/backend/.sqlx/query-d15f02f090b8d1a7e816fe11b2e0867540ab6bb02ac6bf82decc220dce0ab048.json
@@ -42,7 +42,8 @@
                 "csharp",
                 "oracledb",
                 "nu",
-                "java"
+                "java",
+                "duckdb"
               ]
             }
           }
diff --git a/backend/.sqlx/query-e38240e6d50bfe60e1c2b649588eb41dcef121ed161db04b2568ac2d990aed7c.json b/backend/.sqlx/query-e38240e6d50bfe60e1c2b649588eb41dcef121ed161db04b2568ac2d990aed7c.json
deleted file mode 100644
index 1ff35d7227..0000000000
--- a/backend/.sqlx/query-e38240e6d50bfe60e1c2b649588eb41dcef121ed161db04b2568ac2d990aed7c.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO usage (id, is_workspace, month_, usage) \n                VALUES ($1, FALSE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), $2) \n                ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + $2",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "e38240e6d50bfe60e1c2b649588eb41dcef121ed161db04b2568ac2d990aed7c"
-}
diff --git a/backend/.sqlx/query-f1dbcb6e6d82d17c19eb88c0e67dc1cb8baf5bd40b75a2a9cd3ebac440fda632.json b/backend/.sqlx/query-f1dbcb6e6d82d17c19eb88c0e67dc1cb8baf5bd40b75a2a9cd3ebac440fda632.json
new file mode 100644
index 0000000000..b58fad894b
--- /dev/null
+++ b/backend/.sqlx/query-f1dbcb6e6d82d17c19eb88c0e67dc1cb8baf5bd40b75a2a9cd3ebac440fda632.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE v2_job_queue q SET suspend = 0\n                             FROM v2_job j, v2_job_status f\n                             WHERE q.workspace_id = $1 AND q.suspend = $3 AND j.parent_job = $2\n                                 AND f.id = j.id AND q.id = j.id\n                                 AND (f.flow_status->'step')::int = 0",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Uuid",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f1dbcb6e6d82d17c19eb88c0e67dc1cb8baf5bd40b75a2a9cd3ebac440fda632"
+}
diff --git a/backend/.sqlx/query-f22964772dc2d67aee437bbbd08b64792c00da1d713d7ca8f9904ccce7bfdae7.json b/backend/.sqlx/query-f22964772dc2d67aee437bbbd08b64792c00da1d713d7ca8f9904ccce7bfdae7.json
index b3a352de55..b400be3485 100644
--- a/backend/.sqlx/query-f22964772dc2d67aee437bbbd08b64792c00da1d713d7ca8f9904ccce7bfdae7.json
+++ b/backend/.sqlx/query-f22964772dc2d67aee437bbbd08b64792c00da1d713d7ca8f9904ccce7bfdae7.json
@@ -147,7 +147,8 @@
                 "csharp",
                 "oracledb",
                 "nu",
-                "java"
+                "java",
+                "duckdb"
               ]
             }
           }
diff --git a/backend/.sqlx/query-fd5754fe3c6346ae28818a9d60d144a40f8884f47e5bbdd2824e939dafd8f154.json b/backend/.sqlx/query-fd5754fe3c6346ae28818a9d60d144a40f8884f47e5bbdd2824e939dafd8f154.json
deleted file mode 100644
index e797ab8805..0000000000
--- a/backend/.sqlx/query-fd5754fe3c6346ae28818a9d60d144a40f8884f47e5bbdd2824e939dafd8f154.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n            schemaname AS schema_name,\n            tablename AS table_name,\n            CASE\n                WHEN array_length(attnames, 1) = (SELECT COUNT(*) FROM information_schema.columns WHERE table_schema = pg_publication_tables.schemaname AND table_name = pg_publication_tables.tablename)\n                THEN NULL\n                ELSE attnames\n            END AS columns,\n            rowfilter AS where_clause\n            FROM\n                pg_publication_tables\n            WHERE\n                pubname = $1;\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "schema_name",
-        "type_info": "Name"
-      },
-      {
-        "ordinal": 1,
-        "name": "table_name",
-        "type_info": "Name"
-      },
-      {
-        "ordinal": 2,
-        "name": "columns",
-        "type_info": "NameArray"
-      },
-      {
-        "ordinal": 3,
-        "name": "where_clause",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Name"
-      ]
-    },
-    "nullable": [
-      true,
-      true,
-      null,
-      true
-    ]
-  },
-  "hash": "fd5754fe3c6346ae28818a9d60d144a40f8884f47e5bbdd2824e939dafd8f154"
-}
diff --git a/backend/.sqlx/query-ff0403790674cdb07022af71c2377afbd8b3a660b3be27514b517c077c63c238.json b/backend/.sqlx/query-ff0403790674cdb07022af71c2377afbd8b3a660b3be27514b517c077c63c238.json
index c7644fa79a..4e911403de 100644
--- a/backend/.sqlx/query-ff0403790674cdb07022af71c2377afbd8b3a660b3be27514b517c077c63c238.json
+++ b/backend/.sqlx/query-ff0403790674cdb07022af71c2377afbd8b3a660b3be27514b517c077c63c238.json
@@ -65,7 +65,8 @@
                 "csharp",
                 "oracledb",
                 "nu",
-                "java"
+                "java",
+                "duckdb"
               ]
             }
           }
diff --git a/backend/CLAUDE.md b/backend/CLAUDE.md
deleted file mode 100644
index 382c7a04a9..0000000000
--- a/backend/CLAUDE.md
+++ /dev/null
@@ -1,104 +0,0 @@
-# Windmill Backend - Rust Best Practices
-
-## Project Structure
-
-Windmill uses a workspace-based architecture with multiple crates:
-
-- **windmill-api**: API server functionality
-- **windmill-worker**: Job execution
-- **windmill-common**: Shared code used by all crates
-- **windmill-queue**: Job & flow queuing
-- **windmill-audit**: Audit logging
-- Other specialized crates (git-sync, autoscaling, etc.)
-
-## Adding New Code
-
-### Module Organization
-
-- Place new code in the appropriate crate based on functionality
-- For API endpoints, create or modify files in `windmill-api/src/` organized by domain
-- For shared functionality, use `windmill-common/src/`
-- Use the `_ee.rs` suffix for enterprise-only modules
-- Follow existing patterns for file structure and organization
-
-### Error Handling
-
-- Use the custom `Error` enum from `windmill-common::error`
-- Return `Result<T, Error>` or `JsonResult<T>` for functions that can fail
-- Use the `?` operator for error propagation
-- Add location tracking to errors using `#[track_caller]`
-
-### Database Operations
-
-- Use `sqlx` for database operations with prepared statements
-- Leverage existing database helper functions in `db.rs` modules
-- Use transactions for multi-step operations
-- Handle database errors properly
-
-### API Endpoints
-
-- Follow existing patterns in the `windmill-api` crate
-- Use axum's routing system and extractors
-- Group related routes together
-- Use consistent response formats (JSON)
-- Follow proper authentication and authorization patterns
-
-## Performance Optimizations
-
-When generating code, especially involving `serde`, `sqlx`, and `tokio`, prioritize performance by applying the following principles:
-
-### Serde Optimizations (Serialization & Deserialization)
-
-- **Specify Structure Explicitly:** When defining structs for Serde (`#[derive(Serialize, Deserialize)]`), use `#[serde(...` attributes extensively. This includes:
-  - `#[serde(rename = "...")]` or `#[serde(alias = "...")]` to map external names precisely, avoiding dynamic lookups.
-  - `#[serde(default)]` for optional fields with default values, reducing parsing complexity.
-  - `#[serde(skip_serializing_if = "...")]` to avoid writing fields that meet a certain condition (e.g., `Option::is_none()`, `Vec::is_empty()`, or a custom function), reducing output size and serialization work.
-  - `#[serde(skip_serializing)]` or `#[serde(skip_deserializing)]` for fields that should _not_ be included.
-- **Prefer Borrowing:** Where possible and safe (data lifetime allows), use `Cow<'a, str>` or `&'a str` (with `#[serde(borrow)]`) instead of `String` for string fields during deserialization. This avoids allocating new strings, enabling zero-copy reading from the input buffer. Apply this principle to byte slices (`&'a [u8]` / `Cow<'a, [u8]>`) and potentially borrowed vectors as well.
-- **Avoid Intermediate `Value`:** Unless the data structure is truly dynamic or unknown at compile time, deserialize directly into a well-defined struct or enum rather than into `serde_json::Value` (or equivalent for other formats). This avoids unnecessary heap allocations and type switching.
-
-### SQLx Optimizations (Database Interaction)
-
-- **Select Only Necessary Columns:** In `SELECT` queries, list specific column names rather than using `SELECT *`. This reduces data transferred from the database and the work needed for hydration/deserialization.
-- **Batch Operations:** For multiple `INSERT`, `UPDATE`, or `DELETE` statements, prefer executing them in a single query if the database and driver support it efficiently (e.g., `INSERT INTO ... VALUES (...), (...), ...`). This minimizes round trips to the database.
-- **Avoid N+1 Queries:** Do not loop through results of one query and execute a separate query for each item (e.g., fetching users, then querying for each user's profile in a loop). Instead, use JOINs or a single query with an `IN` clause to fetch related data efficiently.
-- **Deserialize Directly:** Use `#[derive(FromRow)]` on structs and ensure the struct fields match the selected columns in the query. This allows SQLx to hydrate objects directly, avoiding intermediate data structures.
-- **Parameterize Queries:** Always use SQLx's query methods (`.bind(...)`) to pass values as parameters rather than string formatting. This prevents SQL injection and allows the database to cache query plans, improving performance on repeated executions.
-
-### Tokio Optimizations (Asynchronous Runtime)
-
-- **Avoid Blocking Operations:** **Crucially**, never perform blocking operations (synchronous file I/O, `std::thread::sleep`, CPU-bound loops, `std::sync::Mutex::lock`, blocking network calls without `tokio::net`) directly within an `async fn` or a standard `tokio::spawn` task. Blocking pauses the entire worker thread, potentially starving other tasks. Use `tokio::task::spawn_blocking` for CPU-intensive work or blocking I/O.
-- **Use Tokio's Async Primitives:** Prefer `tokio::sync` (channels, mutexes, semaphores), `tokio::io`, `tokio::net`, and `tokio::time` over their `std` counterparts in asynchronous contexts. These are designed to yield control back to the scheduler.
-- **Manage Concurrency:** Be mindful of how many tasks are spawned. Creating a new task for every tiny piece of work can introduce overhead. Group related asynchronous operations where appropriate.
-- **Handle Shared State Efficiently:** Use `Arc` for shared ownership in concurrent tasks. When shared state needs mutation, prefer `tokio::sync::Mutex` over `std::sync::Mutex` in `async` code. Consider `tokio::sync::RwLock` if reads significantly outnumber writes. Minimize the duration for which locks are held.
-- **Understand `.await`:** Place `.await` strategically to allow the runtime to switch to other ready tasks. Ensure that `.await` points to genuinely asynchronous operations.
-- **Backpressure:** If dealing with data streams or queues between tasks, implement backpressure mechanisms (e.g., bounded channels like `tokio::sync::mpsc::channel`) to prevent one component from overwhelming another or critical resources like the database.
-
-## Enterprise Features
-
-- Use feature flags for enterprise functionality
-- Conditionally compile with `#[cfg(feature = "enterprise")]`
-- Isolate enterprise code in separate modules
-
-## Code Style
-
-- Group imports by external and internal crates
-- Place struct/enum definitions before implementations
-- Group similar functionality together
-- Use descriptive naming consistent with the codebase
-- Follow existing patterns for async code using tokio
-
-## Testing
-
-- Write unit tests for core functionality
-- Use the `#[cfg(test)]` module for test code
-- For database tests, use the existing test utilities
-
-## Common Crates Used
-
-- **tokio**: For async runtime
-- **axum**: For web server and routing
-- **sqlx**: For database operations
-- **serde**: For serialization/deserialization
-- **tracing**: For logging and diagnostics
-- **reqwest**: For HTTP client functionality
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 445dad0222..edaea2c45a 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -175,9 +175,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "0.6.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -190,33 +190,33 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.8"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6680de5231bd6ee4c6191b8a1325daa282b415391ec9d3a37bd34f2060dc73fa"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
@@ -286,57 +286,25 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "arrow"
-version = "54.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5ec52ba94edeed950e4a41f75d35376df196e8cb04437f7280a5aa49f20f796"
-dependencies = [
- "arrow-arith 54.3.1",
- "arrow-array 54.3.1",
- "arrow-buffer 54.3.1",
- "arrow-cast 54.3.1",
- "arrow-data 54.3.1",
- "arrow-ord 54.3.1",
- "arrow-row 54.3.1",
- "arrow-schema 54.3.1",
- "arrow-select 54.3.1",
- "arrow-string 54.3.1",
-]
-
 [[package]]
 name = "arrow"
 version = "55.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1bb018b6960c87fd9d025009820406f74e83281185a8bdcb44880d2aa5c9a87"
 dependencies = [
- "arrow-arith 55.1.0",
- "arrow-array 55.1.0",
- "arrow-buffer 55.1.0",
- "arrow-cast 55.1.0",
+ "arrow-arith",
+ "arrow-array",
+ "arrow-buffer",
+ "arrow-cast",
  "arrow-csv",
- "arrow-data 55.1.0",
+ "arrow-data",
  "arrow-ipc",
  "arrow-json",
- "arrow-ord 55.1.0",
- "arrow-row 55.1.0",
- "arrow-schema 55.1.0",
- "arrow-select 55.1.0",
- "arrow-string 55.1.0",
-]
-
-[[package]]
-name = "arrow-arith"
-version = "54.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc766fdacaf804cb10c7c70580254fcdb5d55cdfda2bc57b02baf5223a3af9e"
-dependencies = [
- "arrow-array 54.3.1",
- "arrow-buffer 54.3.1",
- "arrow-data 54.3.1",
- "arrow-schema 54.3.1",
- "chrono",
- "num",
+ "arrow-ord",
+ "arrow-row",
+ "arrow-schema",
+ "arrow-select",
+ "arrow-string",
 ]
 
 [[package]]
@@ -345,30 +313,14 @@ version = "55.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44de76b51473aa888ecd6ad93ceb262fb8d40d1f1154a4df2f069b3590aa7575"
 dependencies = [
- "arrow-array 55.1.0",
- "arrow-buffer 55.1.0",
- "arrow-data 55.1.0",
- "arrow-schema 55.1.0",
+ "arrow-array",
+ "arrow-buffer",
+ "arrow-data",
+ "arrow-schema",
  "chrono",
  "num",
 ]
 
-[[package]]
-name = "arrow-array"
-version = "54.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12fcdb3f1d03f69d3ec26ac67645a8fe3f878d77b5ebb0b15d64a116c212985"
-dependencies = [
- "ahash 0.8.12",
- "arrow-buffer 54.3.1",
- "arrow-data 54.3.1",
- "arrow-schema 54.3.1",
- "chrono",
- "half",
- "hashbrown 0.15.3",
- "num",
-]
-
 [[package]]
 name = "arrow-array"
 version = "55.1.0"
@@ -376,24 +328,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29ed77e22744475a9a53d00026cf8e166fe73cf42d89c4c4ae63607ee1cfcc3f"
 dependencies = [
  "ahash 0.8.12",
- "arrow-buffer 55.1.0",
- "arrow-data 55.1.0",
- "arrow-schema 55.1.0",
+ "arrow-buffer",
+ "arrow-data",
+ "arrow-schema",
  "chrono",
  "chrono-tz",
  "half",
- "hashbrown 0.15.3",
- "num",
-]
-
-[[package]]
-name = "arrow-buffer"
-version = "54.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "263f4801ff1839ef53ebd06f99a56cecd1dbaf314ec893d93168e2e860e0291c"
-dependencies = [
- "bytes",
- "half",
+ "hashbrown 0.15.4",
  "num",
 ]
 
@@ -408,38 +349,17 @@ dependencies = [
  "num",
 ]
 
-[[package]]
-name = "arrow-cast"
-version = "54.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede6175fbc039dfc946a61c1b6d42fd682fcecf5ab5d148fbe7667705798cac9"
-dependencies = [
- "arrow-array 54.3.1",
- "arrow-buffer 54.3.1",
- "arrow-data 54.3.1",
- "arrow-schema 54.3.1",
- "arrow-select 54.3.1",
- "atoi",
- "base64 0.22.1",
- "chrono",
- "comfy-table",
- "half",
- "lexical-core",
- "num",
- "ryu",
-]
-
 [[package]]
 name = "arrow-cast"
 version = "55.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f39e1d774ece9292697fcbe06b5584401b26bd34be1bec25c33edae65c2420ff"
 dependencies = [
- "arrow-array 55.1.0",
- "arrow-buffer 55.1.0",
- "arrow-data 55.1.0",
- "arrow-schema 55.1.0",
- "arrow-select 55.1.0",
+ "arrow-array",
+ "arrow-buffer",
+ "arrow-data",
+ "arrow-schema",
+ "arrow-select",
  "atoi",
  "base64 0.22.1",
  "chrono",
@@ -456,9 +376,9 @@ version = "55.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9055c972a07bf12c2a827debfd34f88d3b93da1941d36e1d9fee85eebe38a12a"
 dependencies = [
- "arrow-array 55.1.0",
- "arrow-cast 55.1.0",
- "arrow-schema 55.1.0",
+ "arrow-array",
+ "arrow-cast",
+ "arrow-schema",
  "chrono",
  "csv",
  "csv-core",
@@ -466,26 +386,14 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "arrow-data"
-version = "54.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61cfdd7d99b4ff618f167e548b2411e5dd2c98c0ddebedd7df433d34c20a4429"
-dependencies = [
- "arrow-buffer 54.3.1",
- "arrow-schema 54.3.1",
- "half",
- "num",
-]
-
 [[package]]
 name = "arrow-data"
 version = "55.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf75ac27a08c7f48b88e5c923f267e980f27070147ab74615ad85b5c5f90473d"
 dependencies = [
- "arrow-buffer 55.1.0",
- "arrow-schema 55.1.0",
+ "arrow-buffer",
+ "arrow-schema",
  "half",
  "num",
 ]
@@ -496,10 +404,10 @@ version = "55.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a222f0d93772bd058d1268f4c28ea421a603d66f7979479048c429292fac7b2e"
 dependencies = [
- "arrow-array 55.1.0",
- "arrow-buffer 55.1.0",
- "arrow-data 55.1.0",
- "arrow-schema 55.1.0",
+ "arrow-array",
+ "arrow-buffer",
+ "arrow-data",
+ "arrow-schema",
  "flatbuffers",
  "lz4_flex",
 ]
@@ -510,11 +418,11 @@ version = "55.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9085342bbca0f75e8cb70513c0807cc7351f1fbf5cb98192a67d5e3044acb033"
 dependencies = [
- "arrow-array 55.1.0",
- "arrow-buffer 55.1.0",
- "arrow-cast 55.1.0",
- "arrow-data 55.1.0",
- "arrow-schema 55.1.0",
+ "arrow-array",
+ "arrow-buffer",
+ "arrow-cast",
+ "arrow-data",
+ "arrow-schema",
  "chrono",
  "half",
  "indexmap 2.9.0",
@@ -526,43 +434,17 @@ dependencies = [
  "simdutf8",
 ]
 
-[[package]]
-name = "arrow-ord"
-version = "54.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0a3334a743bd2a1479dbc635540617a3923b4b2f6870f37357339e6b5363c21"
-dependencies = [
- "arrow-array 54.3.1",
- "arrow-buffer 54.3.1",
- "arrow-data 54.3.1",
- "arrow-schema 54.3.1",
- "arrow-select 54.3.1",
-]
-
 [[package]]
 name = "arrow-ord"
 version = "55.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab2f1065a5cad7b9efa9e22ce5747ce826aa3855766755d4904535123ef431e7"
 dependencies = [
- "arrow-array 55.1.0",
- "arrow-buffer 55.1.0",
- "arrow-data 55.1.0",
- "arrow-schema 55.1.0",
- "arrow-select 55.1.0",
-]
-
-[[package]]
-name = "arrow-row"
-version = "54.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d1d7a7291d2c5107e92140f75257a99343956871f3d3ab33a7b41532f79cb68"
-dependencies = [
- "arrow-array 54.3.1",
- "arrow-buffer 54.3.1",
- "arrow-data 54.3.1",
- "arrow-schema 54.3.1",
- "half",
+ "arrow-array",
+ "arrow-buffer",
+ "arrow-data",
+ "arrow-schema",
+ "arrow-select",
 ]
 
 [[package]]
@@ -571,40 +453,20 @@ version = "55.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3703a0e3e92d23c3f756df73d2dc9476873f873a76ae63ef9d3de17fda83b2d8"
 dependencies = [
- "arrow-array 55.1.0",
- "arrow-buffer 55.1.0",
- "arrow-data 55.1.0",
- "arrow-schema 55.1.0",
+ "arrow-array",
+ "arrow-buffer",
+ "arrow-data",
+ "arrow-schema",
  "half",
 ]
 
-[[package]]
-name = "arrow-schema"
-version = "54.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39cfaf5e440be44db5413b75b72c2a87c1f8f0627117d110264048f2969b99e9"
-dependencies = [
- "bitflags 2.9.1",
-]
-
 [[package]]
 name = "arrow-schema"
 version = "55.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73a47aa0c771b5381de2b7f16998d351a6f4eb839f1e13d48353e17e873d969b"
-
-[[package]]
-name = "arrow-select"
-version = "54.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69efcd706420e52cd44f5c4358d279801993846d1c2a8e52111853d61d55a619"
 dependencies = [
- "ahash 0.8.12",
- "arrow-array 54.3.1",
- "arrow-buffer 54.3.1",
- "arrow-data 54.3.1",
- "arrow-schema 54.3.1",
- "num",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -614,41 +476,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24b7b85575702b23b85272b01bc1c25a01c9b9852305e5d0078c79ba25d995d4"
 dependencies = [
  "ahash 0.8.12",
- "arrow-array 55.1.0",
- "arrow-buffer 55.1.0",
- "arrow-data 55.1.0",
- "arrow-schema 55.1.0",
+ "arrow-array",
+ "arrow-buffer",
+ "arrow-data",
+ "arrow-schema",
  "num",
 ]
 
-[[package]]
-name = "arrow-string"
-version = "54.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21546b337ab304a32cfc0770f671db7411787586b45b78b4593ae78e64e2b03"
-dependencies = [
- "arrow-array 54.3.1",
- "arrow-buffer 54.3.1",
- "arrow-data 54.3.1",
- "arrow-schema 54.3.1",
- "arrow-select 54.3.1",
- "memchr",
- "num",
- "regex",
- "regex-syntax 0.8.5",
-]
-
 [[package]]
 name = "arrow-string"
 version = "55.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9260fddf1cdf2799ace2b4c2fc0356a9789fa7551e0953e35435536fecefebbd"
 dependencies = [
- "arrow-array 55.1.0",
- "arrow-buffer 55.1.0",
- "arrow-data 55.1.0",
- "arrow-schema 55.1.0",
- "arrow-select 55.1.0",
+ "arrow-array",
+ "arrow-buffer",
+ "arrow-data",
+ "arrow-schema",
+ "arrow-select",
  "memchr",
  "num",
  "regex",
@@ -791,7 +636,7 @@ dependencies = [
  "bytes",
  "http 1.3.1",
  "rand 0.8.5",
- "reqwest 0.12.17",
+ "reqwest 0.12.19",
  "serde",
  "serde-aux",
  "serde_json",
@@ -991,9 +836,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sqs"
-version = "1.71.0"
+version = "1.72.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0519921fc7065a54b8dec1d10de2893d99a61d030b9f8eb00ee83eb62d2a2676"
+checksum = "e7c66032c543428209106e3a104402289d9f18f77c7eb3de8f6e165256c42c38"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1013,9 +858,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.71.0"
+version = "1.72.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a4fd09d6e863655d99cd2260f271c6d1030dc6bfad68e19e126d2e4c8ceb18"
+checksum = "13118ad30741222f67b1a18e5071385863914da05124652b38e172d6d3d9ce31"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1035,9 +880,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.72.0"
+version = "1.73.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3224ab02ebb3074467a33d57caf6fcb487ca36f3697fdd381b0428dc72380696"
+checksum = "f879a8572b4683a8f84f781695bebf2f25cf11a81a2693c31fc0e0215c2c1726"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1057,9 +902,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.72.0"
+version = "1.73.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6933f189ed1255e78175fbd73fb200c0aae7240d220ed3346f567b0ddca3083"
+checksum = "f1e9c3c24e36183e2f698235ed38dcfbbdff1d09b9232dc866c4be3011e0b47e"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1133,13 +978,14 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http-client"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e44697a9bded898dcd0b1cb997430d949b87f4f8940d91023ae9062bf218250"
+checksum = "073d330f94bdf1f47bb3e0f5d45dda1e372a54a553c39ab6e9646902c8c81594"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
+ "h2 0.3.26",
  "h2 0.4.10",
  "http 0.2.12",
  "http 1.3.1",
@@ -1147,7 +993,7 @@ dependencies = [
  "hyper 0.14.32",
  "hyper 1.6.0",
  "hyper-rustls 0.24.2",
- "hyper-rustls 0.27.6",
+ "hyper-rustls 0.27.7",
  "hyper-util",
  "pin-project-lite",
  "rustls 0.21.12",
@@ -1351,9 +1197,9 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973"
 
 [[package]]
 name = "backon"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd0b50b1b78dbadd44ab18b3c794e496f3a139abb9fbc27d9c94c4eebbb96496"
+checksum = "302eaff5357a264a2c42f127ecb8bac761cf99749fc3dc95677e2743991f99e7"
 dependencies = [
  "fastrand",
  "gloo-timers",
@@ -1426,9 +1272,9 @@ dependencies = [
 
 [[package]]
 name = "base64ct"
-version = "1.7.3"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
+checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
 
 [[package]]
 name = "better_scoped_tls"
@@ -1793,9 +1639,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.17.0"
+version = "3.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee"
 dependencies = [
  "allocator-api2",
 ]
@@ -1835,9 +1681,9 @@ dependencies = [
 
 [[package]]
 name = "bytemuck"
-version = "1.23.0"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
+checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -2013,9 +1859,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.24"
+version = "1.2.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7"
+checksum = "956a5e21988b87f372569b66183b78babf23ebc2e744b733e4350a752c4dafac"
 dependencies = [
  "jobserver",
  "libc",
@@ -2133,9 +1979,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.39"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f"
+checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -2143,9 +1989,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.39"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51"
+checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2155,9 +2001,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.32"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
+checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -2167,9 +2013,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "clipboard-win"
@@ -2228,9 +2074,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "comfy-table"
@@ -2728,7 +2574,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.10",
+ "parking_lot_core 0.9.11",
 ]
 
 [[package]]
@@ -2742,7 +2588,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.10",
+ "parking_lot_core 0.9.11",
 ]
 
 [[package]]
@@ -2763,9 +2609,9 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffe060b978f74ab446be722adb8a274e052e005bf6dfd171caadc3abaad10080"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "arrow-ipc",
- "arrow-schema 55.1.0",
+ "arrow-schema",
  "async-trait",
  "bytes",
  "bzip2",
@@ -2799,7 +2645,7 @@ dependencies = [
  "itertools 0.14.0",
  "log",
  "object_store",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "parquet",
  "rand 0.8.5",
  "regex",
@@ -2818,7 +2664,7 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61fe34f401bd03724a1f96d12108144f8cd495a3cdda2bf5e091822fb80b7e66"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "async-trait",
  "dashmap 6.1.0",
  "datafusion-common",
@@ -2834,7 +2680,7 @@ dependencies = [
  "itertools 0.14.0",
  "log",
  "object_store",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "tokio",
 ]
 
@@ -2844,7 +2690,7 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4411b8e3bce5e0fc7521e44f201def2e2d5d1b5f176fb56e8cdc9942c890f00"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "async-trait",
  "datafusion-catalog",
  "datafusion-common",
@@ -2868,7 +2714,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0734015d81c8375eb5d4869b7f7ecccc2ee8d6cb81948ef737cd0e7b743bd69c"
 dependencies = [
  "ahash 0.8.12",
- "arrow 55.1.0",
+ "arrow",
  "arrow-ipc",
  "base64 0.22.1",
  "half",
@@ -2902,7 +2748,7 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04e602dcdf2f50c2abf297cc2203c73531e6f48b29516af7695d338cf2a778b1"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "async-compression",
  "async-trait",
  "bytes",
@@ -2938,7 +2784,7 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bb2253952dc32296ed5b84077cb2e0257fea4be6373e1c376426e17ead4ef6"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "async-trait",
  "bytes",
  "datafusion-catalog",
@@ -2963,7 +2809,7 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b8c7f47a5d2fe03bfa521ec9bafdb8a5c82de8377f60967c3663f00c8790352"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "async-trait",
  "bytes",
  "datafusion-catalog",
@@ -2988,7 +2834,7 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27d15868ea39ed2dc266728b554f6304acd473de2142281ecfa1294bb7415923"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "async-trait",
  "bytes",
  "datafusion-catalog",
@@ -3007,7 +2853,7 @@ dependencies = [
  "itertools 0.14.0",
  "log",
  "object_store",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "parquet",
  "rand 0.8.5",
  "tokio",
@@ -3025,14 +2871,14 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06f004d100f49a3658c9da6fb0c3a9b760062d96cd4ad82ccc3b7b69a9fb2f84"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "dashmap 6.1.0",
  "datafusion-common",
  "datafusion-expr",
  "futures",
  "log",
  "object_store",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "rand 0.8.5",
  "tempfile",
  "url",
@@ -3044,7 +2890,7 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a4e4ce3802609be38eeb607ee72f6fe86c3091460de9dbfae9e18db423b3964"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "chrono",
  "datafusion-common",
  "datafusion-doc",
@@ -3065,7 +2911,7 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "422ac9cf3b22bbbae8cdf8ceb33039107fde1b5492693168f13bd566b1bcc839"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "datafusion-common",
  "indexmap 2.9.0",
  "itertools 0.14.0",
@@ -3078,8 +2924,8 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ddf0a0a2db5d2918349c978d42d80926c6aa2459cd8a3c533a84ec4bb63479e"
 dependencies = [
- "arrow 55.1.0",
- "arrow-buffer 55.1.0",
+ "arrow",
+ "arrow-buffer",
  "base64 0.22.1",
  "blake2",
  "blake3",
@@ -3108,7 +2954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "408a05dafdc70d05a38a29005b8b15e21b0238734dab1e98483fcb58038c5aba"
 dependencies = [
  "ahash 0.8.12",
- "arrow 55.1.0",
+ "arrow",
  "datafusion-common",
  "datafusion-doc",
  "datafusion-execution",
@@ -3129,7 +2975,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "756d21da2dd6c9bef97af1504970ff56cbf35d03fbd4ffd62827f02f4d2279d4"
 dependencies = [
  "ahash 0.8.12",
- "arrow 55.1.0",
+ "arrow",
  "datafusion-common",
  "datafusion-expr-common",
  "datafusion-physical-expr-common",
@@ -3141,8 +2987,8 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d8d50f6334b378930d992d801a10ac5b3e93b846b39e4a05085742572844537"
 dependencies = [
- "arrow 55.1.0",
- "arrow-ord 55.1.0",
+ "arrow",
+ "arrow-ord",
  "datafusion-common",
  "datafusion-doc",
  "datafusion-execution",
@@ -3162,13 +3008,13 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc9a97220736c8fff1446e936be90d57216c06f28969f9ffd3b72ac93c958c8a"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "async-trait",
  "datafusion-catalog",
  "datafusion-common",
  "datafusion-expr",
  "datafusion-physical-plan",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "paste",
 ]
 
@@ -3216,7 +3062,7 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "084d9f979c4b155346d3c34b18f4256e6904ded508e9554d90fed416415c3515"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "chrono",
  "datafusion-common",
  "datafusion-expr",
@@ -3236,7 +3082,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64c536062b0076f4e30084065d805f389f9fe38af0ca75bcbac86bc5e9fbab65"
 dependencies = [
  "ahash 0.8.12",
- "arrow 55.1.0",
+ "arrow",
  "datafusion-common",
  "datafusion-expr",
  "datafusion-expr-common",
@@ -3258,7 +3104,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8a92b53b3193fac1916a1c5b8e3f4347c526f6822e56b71faa5fb372327a863"
 dependencies = [
  "ahash 0.8.12",
- "arrow 55.1.0",
+ "arrow",
  "datafusion-common",
  "datafusion-expr-common",
  "hashbrown 0.14.5",
@@ -3271,7 +3117,7 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fa0a5ac94c7cf3da97bedabd69d6bbca12aef84b9b37e6e9e8c25286511b5e2"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "datafusion-common",
  "datafusion-execution",
  "datafusion-expr",
@@ -3291,9 +3137,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "690c615db468c2e5fe5085b232d8b1c088299a6c63d87fd960a354a71f7acb55"
 dependencies = [
  "ahash 0.8.12",
- "arrow 55.1.0",
- "arrow-ord 55.1.0",
- "arrow-schema 55.1.0",
+ "arrow",
+ "arrow-ord",
+ "arrow-schema",
  "async-trait",
  "chrono",
  "datafusion-common",
@@ -3309,7 +3155,7 @@ dependencies = [
  "indexmap 2.9.0",
  "itertools 0.14.0",
  "log",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project-lite",
  "tokio",
 ]
@@ -3320,7 +3166,7 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad229a134c7406c057ece00c8743c0c34b97f4e72f78b475fe17b66c5e14fa4f"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "async-trait",
  "dashmap 6.1.0",
  "datafusion-common",
@@ -3334,7 +3180,7 @@ dependencies = [
  "itertools 0.14.0",
  "log",
  "object_store",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "tokio",
 ]
 
@@ -3344,7 +3190,7 @@ version = "47.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64f6ab28b72b664c21a27b22a2ff815fd390ed224c26e89a93b5a8154a4e8607"
 dependencies = [
- "arrow 55.1.0",
+ "arrow",
  "bigdecimal",
  "datafusion-common",
  "datafusion-expr",
@@ -3385,7 +3231,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "serde",
- "sourcemap 9.2.1",
+ "sourcemap 9.2.2",
  "swc_atoms",
  "swc_common",
  "swc_config",
@@ -3463,7 +3309,7 @@ dependencies = [
  "indexmap 2.9.0",
  "log",
  "once_cell",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "serde",
  "serde_json",
  "sha2 0.10.9",
@@ -3545,7 +3391,7 @@ dependencies = [
  "indexmap 2.9.0",
  "libc",
  "memoffset",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "percent-encoding",
  "pin-project",
  "serde",
@@ -3670,7 +3516,7 @@ dependencies = [
  "http 1.3.1",
  "http-body-util",
  "hyper 1.6.0",
- "hyper-rustls 0.27.6",
+ "hyper-rustls 0.27.7",
  "hyper-util",
  "ipnet",
  "percent-encoding",
@@ -3790,7 +3636,7 @@ dependencies = [
  "log",
  "once_cell",
  "os_pipe",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project",
  "rand 0.8.5",
  "tokio",
@@ -4170,7 +4016,7 @@ dependencies = [
  "log",
  "node_resolver",
  "once_cell",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sys_traits",
  "thiserror 2.0.12",
  "url",
@@ -4276,7 +4122,7 @@ dependencies = [
  "deno_tls",
  "http-body-util",
  "hyper 1.6.0",
- "hyper-rustls 0.27.6",
+ "hyper-rustls 0.27.7",
  "hyper-util",
  "log",
  "once_cell",
@@ -4322,12 +4168,12 @@ dependencies = [
 
 [[package]]
 name = "deno_unsync"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47c618b51088b3ac67f15c69b3ed7620ba3a7d495e5a090186df9424b5ab623e"
+checksum = "6742a724e8becb372a74c650a1aefb8924a5b8107f7d75b3848763ea24b27a87"
 dependencies = [
- "futures",
- "parking_lot 0.12.3",
+ "futures-util",
+ "parking_lot 0.12.4",
  "tokio",
 ]
 
@@ -4806,17 +4652,16 @@ dependencies = [
 
 [[package]]
 name = "duckdb"
-version = "1.2.2"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49ac283b6621e3becf8014d1efa655522794075834c72f744573debef9c9f6c8"
+checksum = "379464d1fbb69d1bbda7c11d96fafde6f2bdb78c67e630e6339b048e6e45107e"
 dependencies = [
- "arrow 54.3.1",
+ "arrow",
  "cast",
  "fallible-iterator 0.3.0",
  "fallible-streaming-iterator",
  "hashlink 0.9.1",
  "libduckdb-sys",
- "memchr",
  "num-integer",
  "rust_decimal",
  "smallvec",
@@ -5270,9 +5115,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
 dependencies = [
  "crc32fast",
  "libz-rs-sys",
@@ -5483,7 +5328,7 @@ checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
 dependencies = [
  "futures-core",
  "lock_api",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
 ]
 
 [[package]]
@@ -5845,11 +5690,11 @@ dependencies = [
 
 [[package]]
 name = "getopts"
-version = "0.2.21"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+checksum = "cba6ae63eb948698e300f645f87c70f76630d505f23b8907cf1e193ee85048c1"
 dependencies = [
- "unicode-width 0.1.14",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -5990,7 +5835,7 @@ dependencies = [
  "google-cloud-token",
  "home",
  "jsonwebtoken 9.3.1",
- "reqwest 0.12.17",
+ "reqwest 0.12.19",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
@@ -6033,7 +5878,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d901aeb453fd80e51d64df4ee005014f6cf39f2d736dd64f7239c132d9d39a6a"
 dependencies = [
- "reqwest 0.12.17",
+ "reqwest 0.12.19",
  "thiserror 1.0.69",
  "tokio",
 ]
@@ -6105,7 +5950,7 @@ checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
 dependencies = [
  "bitflags 2.9.1",
  "gpu-descriptor-types",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
 ]
 
 [[package]]
@@ -6220,9 +6065,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.3"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -6255,7 +6100,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
 ]
 
 [[package]]
@@ -6286,9 +6131,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
 
 [[package]]
 name = "hex"
@@ -6357,7 +6202,7 @@ dependencies = [
  "ipconfig",
  "moka",
  "once_cell",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "rand 0.9.0",
  "resolv-conf",
  "serde",
@@ -6577,9 +6422,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.6"
+version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a01595e11bdcec50946522c32dde3fc6914743000a68b93000965f2f02406d"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
  "http 1.3.1",
  "hyper 1.6.0",
@@ -6637,9 +6482,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c293b6b3d21eca78250dc7dbebd6b9210ec5530e038cbfe0661b5c47ab06e8"
+checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -6883,7 +6728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
  "serde",
 ]
 
@@ -7349,9 +7194,9 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libduckdb-sys"
-version = "1.2.2"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12cac9d03484c43fefac8b2066a253c9b0b3b0cd02cbe02a9ea2312f7e382618"
+checksum = "25d3f1defe457d1ac0fbaef0fe6926953cb33419dd3c8dbac53882d020bee697"
 dependencies = [
  "autocfg",
  "cc",
@@ -7454,9 +7299,9 @@ dependencies = [
 
 [[package]]
 name = "libz-rs-sys"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a"
+checksum = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221"
 dependencies = [
  "zlib-rs",
 ]
@@ -7505,9 +7350,9 @@ checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -7548,7 +7393,7 @@ version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
 ]
 
 [[package]]
@@ -7557,7 +7402,7 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198"
 dependencies = [
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
 ]
 
 [[package]]
@@ -7606,9 +7451,9 @@ dependencies = [
 
 [[package]]
 name = "macro_rules_attribute"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13"
+checksum = "65049d7923698040cd0b1ddcced9b0eb14dd22c5f86ae59c3740eab64a676520"
 dependencies = [
  "macro_rules_attribute-proc_macro",
  "paste",
@@ -7616,9 +7461,9 @@ dependencies = [
 
 [[package]]
 name = "macro_rules_attribute-proc_macro"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568"
+checksum = "670fdfda89751bc4a84ac13eaa63e205cf0fd22b4c9a5fbfa085b63c1f1d3a30"
 
 [[package]]
 name = "magic-crypt"
@@ -7975,7 +7820,7 @@ dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
  "loom",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "portable-atomic",
  "rustc_version 0.4.1",
  "smallvec",
@@ -8084,7 +7929,7 @@ dependencies = [
  "tokio",
  "tokio-native-tls",
  "tokio-util",
- "twox-hash 2.1.0",
+ "twox-hash 2.1.1",
  "url",
 ]
 
@@ -8593,9 +8438,9 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -8639,7 +8484,7 @@ dependencies = [
  "getrandom 0.2.16",
  "http 1.3.1",
  "rand 0.8.5",
- "reqwest 0.12.17",
+ "reqwest 0.12.19",
  "serde",
  "serde_json",
  "serde_path_to_error",
@@ -8684,11 +8529,11 @@ dependencies = [
  "hyper 1.6.0",
  "itertools 0.14.0",
  "md-5 0.10.6",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "percent-encoding",
  "quick-xml 0.37.5",
  "rand 0.9.0",
- "reqwest 0.12.17",
+ "reqwest 0.12.19",
  "ring 0.17.14",
  "serde",
  "serde_json",
@@ -8816,9 +8661,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.72"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
  "bitflags 2.9.1",
  "cfg-if",
@@ -8857,9 +8702,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.108"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -9122,12 +8967,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.10",
+ "parking_lot_core 0.9.11",
 ]
 
 [[package]]
@@ -9146,9 +8991,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -9164,13 +9009,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be7b2d778f6b841d37083ebdf32e33a524acde1266b5884a8ca29bf00dfa1231"
 dependencies = [
  "ahash 0.8.12",
- "arrow-array 55.1.0",
- "arrow-buffer 55.1.0",
- "arrow-cast 55.1.0",
- "arrow-data 55.1.0",
+ "arrow-array",
+ "arrow-buffer",
+ "arrow-cast",
+ "arrow-data",
  "arrow-ipc",
- "arrow-schema 55.1.0",
- "arrow-select 55.1.0",
+ "arrow-schema",
+ "arrow-select",
  "base64 0.22.1",
  "brotli 8.0.1",
  "bytes",
@@ -9178,7 +9023,7 @@ dependencies = [
  "flate2",
  "futures",
  "half",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
  "lz4_flex",
  "num",
  "num-bigint",
@@ -9189,7 +9034,7 @@ dependencies = [
  "snap",
  "thrift",
  "tokio",
- "twox-hash 2.1.0",
+ "twox-hash 2.1.1",
  "zstd",
 ]
 
@@ -9473,9 +9318,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "postgres-native-tls"
@@ -9594,9 +9439,9 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.32"
+version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
+checksum = "9dee91521343f4c5c6a63edd65e54f31f5c92fe8978c40a4282f8372194c6a7d"
 dependencies = [
  "proc-macro2",
  "syn 2.0.101",
@@ -9617,7 +9462,7 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
 dependencies = [
- "toml_edit 0.22.26",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
@@ -9753,7 +9598,7 @@ dependencies = [
  "fnv",
  "lazy_static",
  "memchr",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "thiserror 2.0.12",
 ]
 
@@ -9920,8 +9765,8 @@ checksum = "6b450dad8382b1b95061d5ca1eb792081fb082adf48c678791fe917509596d5f"
 dependencies = [
  "ahash 0.8.12",
  "equivalent",
- "hashbrown 0.15.3",
- "parking_lot 0.12.3",
+ "hashbrown 0.15.4",
+ "parking_lot 0.12.4",
 ]
 
 [[package]]
@@ -10376,9 +10221,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.17"
+version = "0.12.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3f27698fc5799d2a281528a908bd874973953ca2e7bc2311637e10c263c723b"
+checksum = "a2f8e5513d63f2e5b386eb5106dc67eaf3f84e95258e210489136b8b92ad6119"
 dependencies = [
  "async-compression",
  "base64 0.22.1",
@@ -10391,7 +10236,7 @@ dependencies = [
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.6.0",
- "hyper-rustls 0.27.6",
+ "hyper-rustls 0.27.7",
  "hyper-tls 0.6.0",
  "hyper-util",
  "ipnet",
@@ -10434,7 +10279,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "http 1.3.1",
- "reqwest 0.12.17",
+ "reqwest 0.12.19",
  "serde",
  "thiserror 1.0.69",
  "tower-service",
@@ -10453,7 +10298,7 @@ dependencies = [
  "http 1.3.1",
  "hyper 1.6.0",
  "parking_lot 0.11.2",
- "reqwest 0.12.17",
+ "reqwest 0.12.19",
  "reqwest-middleware",
  "retry-policies",
  "thiserror 1.0.69",
@@ -11385,9 +11230,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
 dependencies = [
  "serde",
 ]
@@ -11672,9 +11517,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.15.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 dependencies = [
  "serde",
 ]
@@ -11733,9 +11578,9 @@ dependencies = [
 
 [[package]]
 name = "sourcemap"
-version = "9.2.1"
+version = "9.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdee719193ae5c919a3ee43f64c2c0dd87f9b9a451d67918a2a5ec2e3c70561c"
+checksum = "e22afbcb92ce02d23815b9795523c005cb9d3c214f8b7a66318541c240ea7935"
 dependencies = [
  "base64-simd 0.8.0",
  "bitvec",
@@ -11864,7 +11709,7 @@ dependencies = [
  "futures-intrusive",
  "futures-io",
  "futures-util",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
  "hashlink 0.10.0",
  "indexmap 2.9.0",
  "log",
@@ -12237,7 +12082,7 @@ dependencies = [
  "rustc-hash 1.1.0",
  "serde",
  "siphasher 0.3.11",
- "sourcemap 9.2.1",
+ "sourcemap 9.2.2",
  "swc_allocator",
  "swc_atoms",
  "swc_eq_ignore_macros",
@@ -12301,7 +12146,7 @@ dependencies = [
  "num-bigint",
  "once_cell",
  "serde",
- "sourcemap 9.2.1",
+ "sourcemap 9.2.2",
  "swc_allocator",
  "swc_atoms",
  "swc_common",
@@ -13195,7 +13040,7 @@ dependencies = [
  "bytes",
  "libc",
  "mio 1.0.4",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
@@ -13259,7 +13104,7 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "log",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "percent-encoding",
  "phf",
  "pin-project-lite",
@@ -13285,7 +13130,7 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "log",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "percent-encoding",
  "phf",
  "pin-project-lite",
@@ -13402,7 +13247,7 @@ dependencies = [
  "futures-io",
  "futures-sink",
  "futures-util",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
  "pin-project-lite",
  "slab",
  "tokio",
@@ -13443,9 +13288,9 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.9"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
 dependencies = [
  "serde",
 ]
@@ -13465,9 +13310,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.26"
+version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
  "indexmap 2.9.0",
  "toml_datetime",
@@ -13556,7 +13401,7 @@ dependencies = [
  "cookie 0.18.1",
  "futures-util",
  "http 1.3.1",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project-lite",
  "tower-layer",
  "tower-service",
@@ -13564,9 +13409,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.4"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdb0c213ca27a9f57ab69ddb290fd80d970922355b83ae380b395d3986b8a2e"
+checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
 dependencies = [
  "async-compression",
  "bitflags 2.9.1",
@@ -13624,9 +13469,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "1b1ffbcf9c6f6b99d386e7444eb608ba646ae452a36b39737deb9663b610f662"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -13635,9 +13480,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
  "valuable",
@@ -13671,7 +13516,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba3beec919fbdf99d719de8eda6adae3281f8a5b71ae40431f44dc7423053d34"
 dependencies = [
  "loki-api",
- "reqwest 0.12.17",
+ "reqwest 0.12.19",
  "serde",
  "serde_json",
  "snap",
@@ -13831,9 +13676,9 @@ dependencies = [
 
 [[package]]
 name = "twox-hash"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7b17f197b3050ba473acf9181f7b1d3b66d1cf7356c6cc57886662276e65908"
+checksum = "8b907da542cbced5261bd3256de1b3a1bf340a3d37f93425a07362a1d687de56"
 
 [[package]]
 name = "typed-arena"
@@ -14526,7 +14371,7 @@ dependencies = [
  "log",
  "naga",
  "once_cell",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "profiling",
  "raw-window-handle",
  "ron",
@@ -14568,7 +14413,7 @@ dependencies = [
  "ndk-sys",
  "objc",
  "once_cell",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "profiling",
  "range-alloc",
  "raw-window-handle",
@@ -14667,7 +14512,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "axum",
@@ -14687,7 +14532,7 @@ dependencies = [
  "prometheus",
  "quote",
  "rand 0.9.0",
- "reqwest 0.12.17",
+ "reqwest 0.12.19",
  "rustls 0.23.27",
  "serde",
  "serde_json",
@@ -14718,7 +14563,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "argon2",
@@ -14777,7 +14622,7 @@ dependencies = [
  "rand 0.9.0",
  "rdkafka",
  "regex",
- "reqwest 0.12.17",
+ "reqwest 0.12.19",
  "rmcp",
  "rsa",
  "rumqttc",
@@ -14827,7 +14672,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -14842,7 +14687,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "chrono",
  "serde",
@@ -14855,7 +14700,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "serde",
@@ -14869,7 +14714,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -14911,7 +14756,7 @@ dependencies = [
  "quick_cache",
  "rand 0.9.0",
  "regex",
- "reqwest 0.12.17",
+ "reqwest 0.12.19",
  "reqwest-middleware",
  "reqwest-retry",
  "semver 1.0.26",
@@ -14945,7 +14790,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "regex",
  "serde",
@@ -14959,7 +14804,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "bytes",
@@ -14982,7 +14827,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "itertools 0.14.0",
  "lazy_static",
@@ -14994,7 +14839,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -15003,7 +14848,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -15015,7 +14860,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-csharp"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -15027,7 +14872,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -15039,7 +14884,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -15051,7 +14896,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-java"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -15063,7 +14908,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-nu"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "nu-parser",
@@ -15074,7 +14919,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -15085,7 +14930,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -15096,7 +14941,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -15119,7 +14964,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -15136,7 +14981,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -15148,7 +14993,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -15166,7 +15011,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "getrandom 0.2.16",
@@ -15190,7 +15035,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -15200,7 +15045,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -15217,7 +15062,7 @@ dependencies = [
  "lazy_static",
  "prometheus",
  "regex",
- "reqwest 0.12.17",
+ "reqwest 0.12.19",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -15233,7 +15078,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -15243,7 +15088,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.493.2"
+version = "1.496.3"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -15295,7 +15140,7 @@ dependencies = [
  "prometheus",
  "rand 0.9.0",
  "regex",
- "reqwest 0.12.17",
+ "reqwest 0.12.19",
  "reqwest-middleware",
  "rust_decimal",
  "serde",
@@ -15411,7 +15256,7 @@ dependencies = [
  "windows-interface 0.59.1",
  "windows-link",
  "windows-result 0.3.4",
- "windows-strings 0.4.2",
+ "windows-strings",
 ]
 
 [[package]]
@@ -15509,13 +15354,13 @@ dependencies = [
 
 [[package]]
 name = "windows-registry"
-version = "0.4.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
+checksum = "b3bab093bdd303a1240bb99b8aba8ea8a69ee19d34c9e2ef9594e708a4878820"
 dependencies = [
+ "windows-link",
  "windows-result 0.3.4",
- "windows-strings 0.3.1",
- "windows-targets 0.53.0",
+ "windows-strings",
 ]
 
 [[package]]
@@ -15536,15 +15381,6 @@ dependencies = [
  "windows-link",
 ]
 
-[[package]]
-name = "windows-strings"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
-dependencies = [
- "windows-link",
-]
-
 [[package]]
 name = "windows-strings"
 version = "0.4.2"
@@ -16082,9 +15918,9 @@ dependencies = [
 
 [[package]]
 name = "zlib-rs"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8"
+checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a"
 
 [[package]]
 name = "zstd"
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index ea651b94e0..84cb427c69 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.493.2"
+version = "1.496.3"
 authors.workspace = true
 edition.workspace = true
 
@@ -32,7 +32,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.493.2"
+version = "1.496.3"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
@@ -49,6 +49,7 @@ lto = "thin"
 
 [features]
 default = []
+private = ["windmill-api/private", "windmill-autoscaling/private", "windmill-common/private", "windmill-git-sync/private", "windmill-indexer/private", "windmill-queue/private", "windmill-worker/private"]
 agent_worker_server = ["windmill-api/agent_worker_server"]
 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"]
 enterprise_saml = ["windmill-api/enterprise_saml", "oauth2"]
@@ -94,8 +95,10 @@ php = ["windmill-worker/php"]
 csharp = ["windmill-worker/csharp"]
 nu = ["windmill-worker/nu"]
 java = ["windmill-worker/java"]
-all_languages = [ "python", "deno_core", "rust", "mysql", "oracledb", "duckdb", "mssql", "bigquery", "csharp", "nu", "php", "java"]
-
+all_languages = ["python", "deno_core", "rust", "mysql", "oracledb", "duckdb", "mssql", "bigquery", "csharp", "nu", "php", "java"]
+# For windows we have another set of languages enabled
+# NOTE: DuckDB is ignored because of compilation problems
+all_languages_windows = ["python", "deno_core", "rust", "mysql", "oracledb", "mssql", "bigquery", "csharp", "nu", "php", "java"]
 
 [patch.crates-io]
 object_store = { git = "https://github.com/apache/arrow-rs-object-store", rev = "36752c975d4f29e20b57c91f81a10872dcd48ae7" } 
diff --git a/backend/all_features_oss.sh b/backend/all_features_oss.sh
new file mode 100755
index 0000000000..5871bc656f
--- /dev/null
+++ b/backend/all_features_oss.sh
@@ -0,0 +1,20 @@
+# This script outputs all features except private. Usage :
+#  > cargo build --features $(./all_features_oss.sh)
+
+#!/bin/bash
+
+# Path to the Cargo.toml file
+CARGO_TOML_PATH="./Cargo.toml"
+
+# Extract features from Cargo.toml and output them separated by commas
+if [[ -f "$CARGO_TOML_PATH" ]]; then
+    grep -A 100 '\[features\]' "$CARGO_TOML_PATH" | \
+    sed -n '/\[features\]/,/^\[/p' | \
+    grep -E '^[a-zA-Z0-9_-]+' | \
+    grep -v 'private' | \
+    cut -d' ' -f1 | \
+    paste -sd ',' -
+else
+    echo "Cargo.toml not found at $CARGO_TOML_PATH"
+    exit 1
+fi
\ No newline at end of file
diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index be1e897bcd..fe8033ab6e 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-32039f675060b5996951708368bdefe14278d5cd
\ No newline at end of file
+ab4f856708a056973faea19f10eda5efff546176
diff --git a/backend/migrations/20250604181226_auth_cache_invalidation.down.sql b/backend/migrations/20250604181226_auth_cache_invalidation.down.sql
new file mode 100644
index 0000000000..b7f0f12204
--- /dev/null
+++ b/backend/migrations/20250604181226_auth_cache_invalidation.down.sql
@@ -0,0 +1,4 @@
+-- Remove token invalidation notification trigger
+
+DROP TRIGGER IF EXISTS token_invalidation_trigger ON token;
+DROP FUNCTION IF EXISTS notify_token_invalidation();
diff --git a/backend/migrations/20250604181226_auth_cache_invalidation.up.sql b/backend/migrations/20250604181226_auth_cache_invalidation.up.sql
new file mode 100644
index 0000000000..11be3961c0
--- /dev/null
+++ b/backend/migrations/20250604181226_auth_cache_invalidation.up.sql
@@ -0,0 +1,17 @@
+-- Add token invalidation notification trigger
+
+CREATE OR REPLACE FUNCTION notify_token_invalidation()
+RETURNS TRIGGER AS $$
+BEGIN
+    -- Only notify for session token deletions when the invalidation settings are enabled
+    IF OLD.label = 'session' AND OLD.email IS NOT NULL THEN
+        PERFORM pg_notify('notify_token_invalidation', OLD.token);
+    END IF;
+    RETURN OLD;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER token_invalidation_trigger
+AFTER DELETE ON token
+FOR EACH ROW
+EXECUTE FUNCTION notify_token_invalidation();
diff --git a/backend/src/ee.rs b/backend/src/ee_oss.rs
similarity index 53%
rename from backend/src/ee.rs
rename to backend/src/ee_oss.rs
index 91816cd1ba..4791a243a3 100644
--- a/backend/src/ee.rs
+++ b/backend/src/ee_oss.rs
@@ -1,8 +1,13 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::ee::*;
+
+#[cfg(not(feature = "private"))]
 pub async fn set_license_key(_license_key: String) -> () {
     // Implementation is not open source
 }
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 pub async fn verify_license_key() -> () {
     // Implementation is not open source
 }
diff --git a/backend/src/main.rs b/backend/src/main.rs
index a4148d93c6..e469123a53 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -28,7 +28,9 @@ use uuid::Uuid;
 use windmill_api::HTTP_CLIENT;
 
 #[cfg(feature = "enterprise")]
-use windmill_common::ee::{maybe_renew_license_key_on_start, LICENSE_KEY_ID, LICENSE_KEY_VALID};
+use windmill_common::ee_oss::{
+    maybe_renew_license_key_on_start, LICENSE_KEY_ID, LICENSE_KEY_VALID,
+};
 
 use windmill_common::{
     agent_workers::build_agent_http_client,
@@ -49,9 +51,12 @@ use windmill_common::{
         TIMEOUT_WAIT_RESULT_SETTING,
     },
     scripts::ScriptLang,
-    stats_ee::schedule_stats,
+    stats_oss::schedule_stats,
     triggers::TriggerKind,
-    utils::{hostname, rd_string, Mode, GIT_VERSION, MODE_AND_ADDONS},
+    utils::{
+        create_default_worker_suffix, create_ssh_agent_worker_suffix, worker_name_with_suffix,
+        Mode, GIT_VERSION, HOSTNAME, MODE_AND_ADDONS,
+    },
     worker::{
         reload_custom_tags_setting, Connection, HUB_CACHE_DIR, TMP_DIR, TMP_LOGS_DIR, WORKER_GROUP,
     },
@@ -75,8 +80,7 @@ use windmill_worker::{
     get_hub_script_content_and_requirements, BUN_BUNDLE_CACHE_DIR, BUN_CACHE_DIR, CSHARP_CACHE_DIR,
     DENO_CACHE_DIR, DENO_CACHE_DIR_DEPS, DENO_CACHE_DIR_NPM, GO_BIN_CACHE_DIR, GO_CACHE_DIR,
     JAVA_CACHE_DIR, NU_CACHE_DIR, POWERSHELL_CACHE_DIR, PY310_CACHE_DIR, PY311_CACHE_DIR,
-    PY312_CACHE_DIR, PY313_CACHE_DIR, RUST_CACHE_DIR, TAR_JAVA_CACHE_DIR, TAR_PY310_CACHE_DIR,
-    TAR_PY311_CACHE_DIR, TAR_PY312_CACHE_DIR, TAR_PY313_CACHE_DIR, UV_CACHE_DIR,
+    PY312_CACHE_DIR, PY313_CACHE_DIR, RUST_CACHE_DIR, TAR_JAVA_CACHE_DIR, UV_CACHE_DIR,
 };
 
 use crate::monitor::{
@@ -98,7 +102,9 @@ const DEFAULT_NUM_WORKERS: usize = 1;
 const DEFAULT_PORT: u16 = 8000;
 const DEFAULT_SERVER_BIND_ADDR: Ipv4Addr = Ipv4Addr::new(0, 0, 0, 0);
 
-mod ee;
+#[cfg(feature = "private")]
+pub mod ee;
+mod ee_oss;
 mod monitor;
 
 pub fn setup_deno_runtime() -> anyhow::Result<()> {
@@ -261,7 +267,7 @@ async fn windmill_main() -> anyhow::Result<()> {
         tracing::error!("Failed to install rustls crypto provider");
     }
 
-    let hostname = hostname();
+    let hostname = HOSTNAME.to_owned();
 
     let mode_and_addons = MODE_AND_ADDONS.clone();
     let mode = mode_and_addons.mode;
@@ -340,7 +346,7 @@ async fn windmill_main() -> anyhow::Result<()> {
             "Creating http client for cluster using base internal url {}",
             std::env::var("BASE_INTERNAL_URL").unwrap_or_default()
         );
-        let suffix = windmill_common::utils::worker_suffix(&hostname, &rd_string(5));
+        let suffix = create_ssh_agent_worker_suffix(&hostname);
         (
             Connection::Http(build_agent_http_client(&suffix)),
             Some(suffix),
@@ -552,7 +558,7 @@ Windmill Community Edition {GIT_VERSION}
                 _ = indexer_rx.recv() => {
                     tracing::info!("Received killpill, aborting index initialization");
                 },
-                res = windmill_indexer::completed_runs_ee::init_index(&db) => {
+                res = windmill_indexer::completed_runs_oss::init_index(&db) => {
                         let res = res?;
                         reader = Some(res.0);
                         writer = Some(res.1);
@@ -574,7 +580,7 @@ Windmill Community Edition {GIT_VERSION}
             async {
                 if let Some(db) = conn.as_sql() {
                     if let Some(index_writer) = index_writer2 {
-                        windmill_indexer::completed_runs_ee::run_indexer(
+                        windmill_indexer::completed_runs_oss::run_indexer(
                             db.clone(),
                             index_writer,
                             indexer_rx,
@@ -596,7 +602,7 @@ Windmill Community Edition {GIT_VERSION}
                     _ = indexer_rx.recv() => {
                         tracing::info!("Received killpill, aborting index initialization");
                     },
-                    res = windmill_indexer::service_logs_ee::init_index(&db, killpill_tx.clone()) => {
+                    res = windmill_indexer::service_logs_oss::init_index(&db, killpill_tx.clone()) => {
                             let res = res?;
                             reader = Some(res.0);
                             writer = Some(res.1);
@@ -618,7 +624,7 @@ Windmill Community Edition {GIT_VERSION}
             async {
                 if let Some(db) = conn.as_sql() {
                     if let Some(log_index_writer) = log_index_writer2 {
-                        windmill_indexer::service_logs_ee::run_indexer(
+                        windmill_indexer::service_logs_oss::run_indexer(
                             db.clone(),
                             log_index_writer,
                             log_indexer_rx,
@@ -675,19 +681,21 @@ Windmill Community Edition {GIT_VERSION}
                 let base_internal_url = base_internal_rx.await?;
                 if worker_mode {
                     let mut workers = vec![];
+
                     for i in 0..num_workers {
-                        let suffix: String = if i == 0 && first_suffix.as_ref().is_some() {
+                        let suffix = if i == 0 && first_suffix.is_some() {
                             first_suffix.as_ref().unwrap().clone()
                         } else {
-                            windmill_common::utils::worker_suffix(&hostname, &rd_string(5))
+                            create_default_worker_suffix(&hostname)
                         };
+
                         let worker_conn = WorkerConn {
                             conn: if i == 0 || mode != Mode::Agent {
                                 conn.clone()
                             } else {
                                 Connection::Http(build_agent_http_client(&suffix))
                             },
-                            worker_name: windmill_common::utils::worker_name_with_suffix(
+                            worker_name: worker_name_with_suffix(
                                 mode == Mode::Agent,
                                 WORKER_GROUP.as_str(),
                                 &suffix,
@@ -852,6 +860,11 @@ Windmill Community Edition {GIT_VERSION}
                                                         }
                                                     };
                                                 },
+                                                "notify_token_invalidation" => {
+                                                    let token = n.payload();
+                                                    tracing::info!("Token invalidation detected for token: {}...", &token[..token.len().min(8)]);
+                                                    windmill_api::auth::invalidate_token_from_cache(token);
+                                                },
                                                 "notify_global_setting_change" => {
                                                     tracing::info!("Global setting change detected: {}", n.payload());
                                                     match n.payload() {
@@ -884,7 +897,7 @@ Windmill Community Edition {GIT_VERSION}
                                                             if let Err(e) = load_tag_per_workspace_workspaces(&db).await {
                                                                 tracing::error!("Error loading default tag per workspace workspaces: {e:#}");
                                                             }
-                                                        }
+                                                        },
                                                         SMTP_SETTING => {
                                                             reload_smtp_config(&db).await;
                                                         },
@@ -1001,7 +1014,6 @@ Windmill Community Edition {GIT_VERSION}
                                                                 tracing::error!(error = %e, "Could not reload critical alert UI setting");
                                                             }
                                                         },
-
                                                         a @_ => {
                                                             tracing::info!("Unrecognized Global Setting Change Payload: {:?}", a);
                                                         }
@@ -1086,7 +1098,7 @@ Windmill Community Edition {GIT_VERSION}
                             tracing::info!("Reloading config after 12 hours");
                             initial_load(&conn, tx.clone(), worker_mode, server_mode, #[cfg(feature = "parquet")] disable_s3_store).await;
                             #[cfg(feature = "enterprise")]
-                            ee::verify_license_key().await;
+                            ee_oss::verify_license_key().await;
                         }
                     }
                 },
@@ -1174,6 +1186,7 @@ async fn listen_pg(url: &str) -> Option<PgListener> {
         "notify_webhook_change",
         "notify_workspace_envs_change",
         "notify_runnable_version_change",
+        "notify_token_invalidation",
     ];
 
     #[cfg(feature = "http_trigger")]
@@ -1267,10 +1280,6 @@ pub async fn run_workers(
         PY311_CACHE_DIR,
         PY312_CACHE_DIR,
         PY313_CACHE_DIR,
-        TAR_PY310_CACHE_DIR,
-        TAR_PY311_CACHE_DIR,
-        TAR_PY312_CACHE_DIR,
-        TAR_PY313_CACHE_DIR,
         BUN_BUNDLE_CACHE_DIR,
         GO_CACHE_DIR,
         GO_BIN_CACHE_DIR,
diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs
index d2a5657c6c..7b1cfc6d5f 100644
--- a/backend/src/monitor.rs
+++ b/backend/src/monitor.rs
@@ -29,9 +29,9 @@ use windmill_api::{
 };
 
 #[cfg(feature = "enterprise")]
-use windmill_common::ee::low_disk_alerts;
+use windmill_common::ee_oss::low_disk_alerts;
 #[cfg(feature = "enterprise")]
-use windmill_common::ee::{jobs_waiting_alerts, worker_groups_alerts};
+use windmill_common::ee_oss::{jobs_waiting_alerts, worker_groups_alerts};
 
 use windmill_common::client::AuthedClient;
 #[cfg(feature = "oauth2")]
@@ -41,7 +41,7 @@ use windmill_common::s3_helpers::reload_object_store_setting;
 use windmill_common::{
     agent_workers::DECODED_AGENT_TOKEN,
     auth::create_token_for_owner,
-    ee::CriticalErrorChannel,
+    ee_oss::CriticalErrorChannel,
     error,
     flow_status::{FlowStatus, FlowStatusModule},
     global_settings::{
@@ -87,9 +87,9 @@ use windmill_worker::{
 use windmill_common::s3_helpers::ObjectStoreReload;
 
 #[cfg(feature = "enterprise")]
-use crate::ee::verify_license_key;
+use crate::ee_oss::verify_license_key;
 
-use crate::ee::set_license_key;
+use crate::ee_oss::set_license_key;
 
 #[cfg(feature = "prometheus")]
 lazy_static::lazy_static! {
@@ -1609,7 +1609,7 @@ pub async fn reload_base_url_setting(conn: &Connection) -> error::Result<()> {
 
         if let Some(q) = q_oauth {
             if let Ok(v) = serde_json::from_value::<
-                Option<HashMap<String, windmill_api::oauth2_ee::OAuthClient>>,
+                Option<HashMap<String, windmill_api::oauth2_oss::OAuthClient>>,
             >(q.clone())
             {
                 v
@@ -1630,7 +1630,7 @@ pub async fn reload_base_url_setting(conn: &Connection) -> error::Result<()> {
     {
         if let Some(db) = conn.as_sql() {
             let mut l = windmill_api::OAUTH_CLIENTS.write().await;
-            *l = windmill_api::oauth2_ee::build_oauth_clients(&base_url, oauths, db).await
+            *l = windmill_api::oauth2_oss::build_oauth_clients(&base_url, oauths, db).await
             .map_err(|e| tracing::error!("Error building oauth clients (is the oauth.json mounted and in correct format? Use '{}' as minimal oauth.json): {}", "{}", e))
             .unwrap();
         }
@@ -1914,12 +1914,12 @@ async fn handle_zombie_jobs(db: &Pool<Postgres>, base_internal_url: &str, worker
         .await
         .expect("could not create job token");
 
-        let client = AuthedClient {
-            base_internal_url: base_internal_url.to_string(),
+        let client = AuthedClient::new(
+            base_internal_url.to_string(),
+            job.workspace_id.to_string(),
             token,
-            workspace: job.workspace_id.to_string(),
-            force_client: None,
-        };
+            None,
+        );
 
         let last_ping = job.last_ping.clone();
         let error_message = format!(
@@ -1938,7 +1938,7 @@ async fn handle_zombie_jobs(db: &Pool<Postgres>, base_internal_url: &str, worker
             None,
             error::Error::ExecutionErr(error_message),
             true,
-            same_worker_tx_never_used,
+            Some(&same_worker_tx_never_used),
             "",
             worker_name,
             send_result_never_used,
diff --git a/backend/substitute_ee_code.sh b/backend/substitute_ee_code.sh
index 28b890990b..a1819c75b2 100755
--- a/backend/substitute_ee_code.sh
+++ b/backend/substitute_ee_code.sh
@@ -4,8 +4,8 @@ script_dirpath="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 root_dirpath="$(cd "${script_dirpath}/.." && pwd)"
 
 REVERT="NO"
-REVERT_PREVIOUS="NO"
 COPY="NO"
+MOVE_NEW_FILES="NO"
 EE_CODE_DIR="../windmill-ee-private/"
 
 while [[ $# -gt 0 ]]; do
@@ -16,13 +16,7 @@ while [[ $# -gt 0 ]]; do
       # this to work (commit hooks should prevent this from happening, as well as the fact
       # that we're using symlinks by default).
       REVERT="YES"
-      shift
-      ;;
-    --revert-previous)
-      # This is a special case of --revert that will revert to the previous commit.
-      REVERT="YES"
-      REVERT_PREVIOUS="YES"
-      echo "Reverting to previous commit"
+      MOVE_NEW_FILES="YES"
       shift
       ;;
     -c|--copy)
@@ -33,6 +27,11 @@ while [[ $# -gt 0 ]]; do
       COPY="YES"
       shift # past argument
       ;;
+    -m|--move-new-files)
+      # This moves all new EE files from the public repository to the private repository.
+      MOVE_NEW_FILES="YES"
+      shift # past argument
+      ;;
     -d|--dir)
       # Path to the local directory of the windmill-ee-private repository. By defaults, it
       # assumes it is cloned next to the Windmill OSS repo.
@@ -70,29 +69,34 @@ if [ "$REVERT" == "YES" ]; then
   for ee_file in $(find ${EE_CODE_DIR} -name "*ee.rs"); do
     ce_file="${ee_file/${EE_CODE_DIR}/}"
     ce_file="${root_dirpath}/backend/${ce_file}"
-    if [ "$REVERT_PREVIOUS" == "YES" ]; then
-      git checkout HEAD@{3} ${ce_file} || true
-    else
-      git restore --staged ${ce_file} || true
-      git restore ${ce_file} || true
-    fi
+    rm ${ce_file} || true
   done
-else
+elif [ "$MOVE_NEW_FILES" == "NO" ]; then
   # This replaces all files in current repo with alternative EE files in windmill-ee-private
   for ee_file in $(find "${EE_CODE_DIR}" -name "*ee.rs"); do
-    ce_file="${ee_file/${EE_CODE_DIR}/}"
-    ce_file="${root_dirpath}/backend/${ce_file}"
-    if [[ -f "${ce_file}" ]]; then
-      rm "${ce_file}"
-      if [ "$COPY" == "YES" ]; then
-        cp "${ee_file}" "${ce_file}"
-        echo "File copied '${ee_file}' -->> '${ce_file}'"
-      else
-        ln -s "${ee_file}" "${ce_file}"
-        echo "Symlink created '${ee_file}' -->> '${ce_file}'"
-      fi
+  ce_file="${ee_file/${EE_CODE_DIR}/}"
+  ce_file="${root_dirpath}/backend/${ce_file}"
+    if [ "$COPY" == "YES" ]; then
+      cp "${ee_file}" "${ce_file}"
+      echo "File copied '${ee_file}' -->> '${ce_file}'"
     else
-      echo "File ${ce_file} is not a file, ignoring"
+      ln -s "${ee_file}" "${ce_file}" || true
+      echo "Symlink created '${ee_file}' -->> '${ce_file}'"
     fi
   done
 fi
+
+if [ "$MOVE_NEW_FILES" == "YES" ]; then
+  for ce_file in $(find "${root_dirpath}"/backend/windmill-*/src/ -name "*ee.rs"); do
+    backend_dirpath="${root_dirpath}/backend/"
+    ee_file="${ce_file/${backend_dirpath}/}"
+    ee_file="${EE_CODE_DIR}${ee_file}"
+    if [ ! -f "${ee_file}" ]; then
+      mv "${ce_file}" "${ee_file}"
+      if [ ! "$REVERT" == "YES" ]; then
+        ln -s "${ee_file}" "${ce_file}"
+      fi
+      echo "File moved '${ce_file}' -->> '${ee_file}'"
+    fi
+  done
+fi
\ No newline at end of file
diff --git a/backend/tests/worker.rs b/backend/tests/worker.rs
index c8299796f8..8792b2eb1d 100644
--- a/backend/tests/worker.rs
+++ b/backend/tests/worker.rs
@@ -3969,8 +3969,7 @@ async fn assert_lockfile(
 #[cfg(feature = "python")]
 #[sqlx::test(fixtures("base", "lockfile_python"))]
 async fn test_requirements_python(db: Pool<Postgres>) {
-    let content = r#"
-# py: 3.11.11
+    let content = r#"# py: ==3.11.11
 # requirements:
 # tiny==0.1.3
 
@@ -3997,8 +3996,7 @@ def main():
 #[sqlx::test(fixtures("base", "lockfile_python"))]
 async fn test_extra_requirements_python(db: Pool<Postgres>) {
     {
-        let content = r#"
-# py: ==3.11.11
+        let content = r#"# py: ==3.11.11
 # extra_requirements:
 # tiny
 
@@ -4025,8 +4023,7 @@ def main():
 #[cfg(feature = "python")]
 #[sqlx::test(fixtures("base", "lockfile_python"))]
 async fn test_extra_requirements_python2(db: Pool<Postgres>) {
-    let content = r#"
-# py: ==3.11.11
+    let content = r#"# py: ==3.11.11
 # extra_requirements:
 # tiny==0.1.3
 
@@ -4048,8 +4045,7 @@ def main():
 #[cfg(feature = "python")]
 #[sqlx::test(fixtures("base", "lockfile_python"))]
 async fn test_pins_python(db: Pool<Postgres>) {
-    let content = r#"
-# py: ==3.11.11
+    let content = r#"# py: ==3.11.11
 # extra_requirements:
 # tiny==0.1.3
 # bottle==0.13.2
diff --git a/backend/update_sqlx.sh b/backend/update_sqlx.sh
index 11b5196ad8..09824d9e24 100755
--- a/backend/update_sqlx.sh
+++ b/backend/update_sqlx.sh
@@ -10,7 +10,6 @@ if [[ "$(uname)" == "Darwin" ]]; then
 fi
 
 cargo sqlx prepare --workspace -- --all-targets --all-features
-./substitute_ee_code.sh -r --dir ../windmill-ee-private
 
 # Undo the samael changes on macOS
 if [[ "$(uname)" == "Darwin" ]]; then
diff --git a/backend/windmill-api/Cargo.toml b/backend/windmill-api/Cargo.toml
index 9f6de0c5ca..cfb175cb0f 100644
--- a/backend/windmill-api/Cargo.toml
+++ b/backend/windmill-api/Cargo.toml
@@ -10,6 +10,7 @@ path = "src/lib.rs"
 
 [features]
 default = []
+private = ["windmill-audit/private"]
 enterprise = ["windmill-queue/enterprise", "windmill-audit/enterprise", "windmill-git-sync/enterprise", "windmill-common/enterprise", "windmill-worker/enterprise"]
 stripe = []
 agent_worker_server = []
diff --git a/backend/windmill-api/openapi-deref.json b/backend/windmill-api/openapi-deref.json
index 91214e99b4..1186be6069 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.423.2",
+    "version": "1.492.1",
     "title": "Windmill API",
     "contact": {
       "name": "Windmill Team",
@@ -197,6 +197,14 @@
           },
           {
             "$ref": "#/components/parameters/ActionKind"
+          },
+          {
+            "name": "all_workspaces",
+            "in": "query",
+            "description": "get audit logs for all workspaces",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -618,6 +626,9 @@
                   "is_super_admin": {
                     "type": "boolean"
                   },
+                  "is_devops": {
+                    "type": "boolean"
+                  },
                   "name": {
                     "type": "string"
                   }
@@ -873,6 +884,27 @@
         }
       }
     },
+    "/github_app/connected_repositories": {
+      "get": {
+        "summary": "get connected repositories",
+        "operationId": "getGlobalConnectedRepositories",
+        "tags": [
+          "git_sync"
+        ],
+        "responses": {
+          "200": {
+            "description": "connected repositories",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GithubInstallations"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/workspaces/list": {
       "get": {
         "summary": "list all workspaces visible to me",
@@ -1329,9 +1361,24 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/CriticalAlert"
+                  "type": "object",
+                  "properties": {
+                    "alerts": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/CriticalAlert"
+                      }
+                    },
+                    "total_rows": {
+                      "type": "integer",
+                      "description": "Total number of rows matching the query.",
+                      "example": 100
+                    },
+                    "total_pages": {
+                      "type": "integer",
+                      "description": "Total number of pages based on the page size.",
+                      "example": 10
+                    }
                   }
                 }
               }
@@ -1670,9 +1717,19 @@
         "tags": [
           "user"
         ],
+        "parameters": [
+          {
+            "name": "if_expiring_in_less_than_s",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "description": "free usage",
+            "description": "new token",
             "content": {
               "text/plain": {
                 "schema": {
@@ -1910,6 +1967,220 @@
         }
       }
     },
+    "/w/{workspace}/github_app/token": {
+      "post": {
+        "summary": "get github app token",
+        "operationId": "getGithubAppToken",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "jwt job token",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "job_token": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "job_token"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "github app token",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "token": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "token"
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/github_app/install_from_workspace": {
+      "post": {
+        "tags": [
+          "Git Sync"
+        ],
+        "summary": "Install a GitHub installation from another workspace",
+        "operationId": "installFromWorkspace",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "source_workspace_id": {
+                    "type": "string",
+                    "description": "The ID of the workspace containing the installation to copy"
+                  },
+                  "installation_id": {
+                    "type": "number",
+                    "description": "The ID of the GitHub installation to copy"
+                  }
+                },
+                "required": [
+                  "source_workspace_id",
+                  "installation_id"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Installation successfully copied"
+          }
+        }
+      }
+    },
+    "/w/{workspace}/github_app/installation/{installation_id}": {
+      "delete": {
+        "summary": "Delete a GitHub installation from a workspace",
+        "operationId": "deleteFromWorkspace",
+        "description": "Removes a GitHub installation from the specified workspace. Requires admin privileges.",
+        "tags": [
+          "Git Sync"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "installation_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            },
+            "description": "The ID of the GitHub installation to delete"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Installation successfully deleted"
+          }
+        }
+      }
+    },
+    "/w/{workspace}/github_app/export/{installationId}": {
+      "get": {
+        "summary": "Export GitHub installation JWT token",
+        "description": "Exports the JWT token for a specific GitHub installation in the workspace",
+        "operationId": "exportInstallation",
+        "tags": [
+          "Git Sync"
+        ],
+        "parameters": [
+          {
+            "name": "workspace",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "installationId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully exported the JWT token",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "jwt_token": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/github_app/import": {
+      "post": {
+        "summary": "Import GitHub installation from JWT token",
+        "description": "Imports a GitHub installation from a JWT token exported from another instance",
+        "operationId": "importInstallation",
+        "tags": [
+          "Git Sync"
+        ],
+        "parameters": [
+          {
+            "name": "workspace",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "jwt_token"
+                ],
+                "properties": {
+                  "jwt_token": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Successfully imported the installation"
+          }
+        }
+      }
+    },
     "/users/accept_invite": {
       "post": {
         "summary": "accept invite to workspace",
@@ -2374,6 +2645,46 @@
         }
       }
     },
+    "/w/{workspace}/workspaces/change_workspace_color": {
+      "post": {
+        "summary": "change workspace id",
+        "operationId": "changeWorkspaceColor",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "color": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "status",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/users/whois/{username}": {
       "get": {
         "summary": "whois",
@@ -2408,6 +2719,43 @@
         }
       }
     },
+    "/w/{workspace}/workspaces/operator_settings": {
+      "post": {
+        "operationId": "updateOperatorSettings",
+        "summary": "Update operator settings for a workspace",
+        "description": "Updates the operator settings for a specific workspace. Requires workspace admin privileges.",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/OperatorSettings"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Operator settings updated successfully",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/users/exists/{email}": {
       "get": {
         "summary": "exists email",
@@ -2540,6 +2888,15 @@
                     "slack_command_script": {
                       "type": "string"
                     },
+                    "teams_team_id": {
+                      "type": "string"
+                    },
+                    "teams_command_script": {
+                      "type": "string"
+                    },
+                    "teams_team_name": {
+                      "type": "string"
+                    },
                     "auto_invite_domain": {
                       "type": "string"
                     },
@@ -2552,9 +2909,6 @@
                     "plan": {
                       "type": "string"
                     },
-                    "automatic_billing": {
-                      "type": "boolean"
-                    },
                     "customer_id": {
                       "type": "string"
                     },
@@ -2564,11 +2918,8 @@
                     "deploy_to": {
                       "type": "string"
                     },
-                    "ai_resource": {
-                      "$ref": "#/components/schemas/AiResource"
-                    },
-                    "code_completion_enabled": {
-                      "type": "boolean"
+                    "ai_config": {
+                      "$ref": "#/components/schemas/AIConfig"
                     },
                     "error_handler": {
                       "type": "string"
@@ -2593,11 +2944,18 @@
                     },
                     "default_scripts": {
                       "$ref": "#/components/schemas/WorkspaceDefaultScripts"
+                    },
+                    "mute_critical_alerts": {
+                      "type": "boolean"
+                    },
+                    "color": {
+                      "type": "string"
+                    },
+                    "operator_settings": {
+                      "$ref": "#/components/schemas/OperatorSettings"
                     }
                   },
                   "required": [
-                    "code_completion_enabled",
-                    "automatic_billing",
                     "error_handler_muted_on_cancel"
                   ]
                 }
@@ -2690,16 +3048,16 @@
                     "usage": {
                       "type": "number"
                     },
-                    "seats": {
-                      "type": "number"
+                    "owner": {
+                      "type": "string"
                     },
-                    "automatic_billing": {
-                      "type": "boolean"
+                    "status": {
+                      "type": "string"
                     }
                   },
                   "required": [
                     "premium",
-                    "automatic_billing"
+                    "owner"
                   ]
                 }
               }
@@ -2708,10 +3066,43 @@
         }
       }
     },
-    "/w/{workspace}/workspaces/set_automatic_billing": {
+    "/w/{workspace}/workspaces/threshold_alert": {
+      "get": {
+        "summary": "get threshold alert info",
+        "operationId": "getThresholdAlert",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "status",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "threshold_alert_amount": {
+                      "type": "number"
+                    },
+                    "last_alert_sent": {
+                      "type": "string",
+                      "format": "date-time"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
       "post": {
-        "summary": "set automatic billing",
-        "operationId": "setAutomaticBilling",
+        "summary": "set threshold alert info",
+        "operationId": "setThresholdAlert",
         "tags": [
           "workspace"
         ],
@@ -2721,23 +3112,17 @@
           }
         ],
         "requestBody": {
-          "description": "automatic billing",
+          "description": "threshold alert info",
           "required": true,
           "content": {
             "application/json": {
               "schema": {
                 "type": "object",
                 "properties": {
-                  "automatic_billing": {
-                    "type": "boolean"
-                  },
-                  "seats": {
+                  "threshold_alert_amount": {
                     "type": "number"
                   }
-                },
-                "required": [
-                  "automatic_billing"
-                ]
+                }
               }
             }
           }
@@ -2798,6 +3183,173 @@
         }
       }
     },
+    "/w/{workspace}/workspaces/edit_teams_command": {
+      "post": {
+        "summary": "edit teams command",
+        "operationId": "editTeamsCommand",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "WorkspaceInvite",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "slack_command_script": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "status",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/workspaces/available_teams_ids": {
+      "get": {
+        "summary": "list available teams ids",
+        "operationId": "listAvailableTeamsIds",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "status",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "team_name": {
+                        "type": "string"
+                      },
+                      "team_id": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/workspaces/available_teams_channels": {
+      "get": {
+        "summary": "list available teams channels",
+        "operationId": "listAvailableTeamsChannels",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "status",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "channel_name": {
+                        "type": "string"
+                      },
+                      "channel_id": {
+                        "type": "string"
+                      },
+                      "service_url": {
+                        "type": "string"
+                      },
+                      "tenant_id": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/workspaces/connect_teams": {
+      "post": {
+        "summary": "connect teams",
+        "operationId": "connectTeams",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "connect teams",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "team_id": {
+                    "type": "string"
+                  },
+                  "team_name": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "status",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/workspaces/run_slack_message_test_job": {
       "post": {
         "summary": "run a job that sends a message to Slack",
@@ -2851,6 +3403,59 @@
         }
       }
     },
+    "/w/{workspace}/workspaces/run_teams_message_test_job": {
+      "post": {
+        "summary": "run a job that sends a message to Teams",
+        "operationId": "runTeamsMessageTestJob",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "path to hub script to run and its corresponding args",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "hub_script_path": {
+                    "type": "string"
+                  },
+                  "channel": {
+                    "type": "string"
+                  },
+                  "test_msg": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "status",
+            "content": {
+              "text/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "job_uuid": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/workspaces/edit_deploy_to": {
       "post": {
         "summary": "edit deploy to",
@@ -3000,18 +3605,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "type": "object",
-                "required": [
-                  "code_completion_enabled"
-                ],
-                "properties": {
-                  "ai_resource": {
-                    "$ref": "#/components/schemas/AiResource"
-                  },
-                  "code_completion_enabled": {
-                    "type": "boolean"
-                  }
-                }
+                "$ref": "#/components/schemas/AIConfig"
               }
             }
           }
@@ -3046,25 +3640,9 @@
           "200": {
             "description": "status",
             "content": {
-              "text/plain": {
+              "application/json": {
                 "schema": {
-                  "type": "object",
-                  "properties": {
-                    "ai_provider": {
-                      "type": "string"
-                    },
-                    "exists_ai_resource": {
-                      "type": "boolean"
-                    },
-                    "code_completion_enabled": {
-                      "type": "boolean"
-                    }
-                  },
-                  "required": [
-                    "ai_provider",
-                    "exists_ai_resource",
-                    "code_completion_enabled"
-                  ]
+                  "$ref": "#/components/schemas/AIConfig"
                 }
               }
             }
@@ -3578,11 +4156,35 @@
                     },
                     "websocket_used": {
                       "type": "boolean"
+                    },
+                    "kafka_used": {
+                      "type": "boolean"
+                    },
+                    "nats_used": {
+                      "type": "boolean"
+                    },
+                    "postgres_used": {
+                      "type": "boolean"
+                    },
+                    "mqtt_used": {
+                      "type": "boolean"
+                    },
+                    "gcp_used": {
+                      "type": "boolean"
+                    },
+                    "sqs_used": {
+                      "type": "boolean"
                     }
                   },
                   "required": [
                     "http_routes_used",
-                    "websocket_used"
+                    "websocket_used",
+                    "kafka_used",
+                    "nats_used",
+                    "postgres_used",
+                    "mqtt_used",
+                    "gcp_used",
+                    "sqs_used"
                   ]
                 }
               }
@@ -4211,6 +4813,186 @@
         }
       }
     },
+    "/w/{workspace}/workspaces/critical_alerts": {
+      "get": {
+        "summary": "Get all critical alerts for this workspace",
+        "operationId": "workspaceGetCriticalAlerts",
+        "tags": [
+          "setting"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "in": "query",
+            "name": "page",
+            "schema": {
+              "type": "integer",
+              "default": 1,
+              "description": "The page number to retrieve (minimum value is 1)"
+            }
+          },
+          {
+            "in": "query",
+            "name": "page_size",
+            "schema": {
+              "type": "integer",
+              "default": 10,
+              "maximum": 100,
+              "description": "Number of alerts per page (maximum is 100)"
+            }
+          },
+          {
+            "in": "query",
+            "name": "acknowledged",
+            "schema": {
+              "type": "boolean",
+              "nullable": true,
+              "description": "Filter by acknowledgment status; true for acknowledged, false for unacknowledged, and omit for all alerts"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully retrieved all critical alerts",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "alerts": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/CriticalAlert"
+                      }
+                    },
+                    "total_rows": {
+                      "type": "integer",
+                      "description": "Total number of rows matching the query.",
+                      "example": 100
+                    },
+                    "total_pages": {
+                      "type": "integer",
+                      "description": "Total number of pages based on the page size.",
+                      "example": 10
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/workspaces/critical_alerts/{id}/acknowledge": {
+      "post": {
+        "summary": "Acknowledge a critical alert for this workspace",
+        "operationId": "workspaceAcknowledgeCriticalAlert",
+        "tags": [
+          "setting"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "in": "path",
+            "name": "id",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            },
+            "description": "The ID of the critical alert to acknowledge"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully acknowledged the critical alert",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "example": "Critical alert acknowledged"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/workspaces/critical_alerts/acknowledge_all": {
+      "post": {
+        "summary": "Acknowledge all unacknowledged critical alerts for this workspace",
+        "operationId": "workspaceAcknowledgeAllCriticalAlerts",
+        "tags": [
+          "setting"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully acknowledged all unacknowledged critical alerts.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "example": "All unacknowledged critical alerts acknowledged"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/workspaces/critical_alerts/mute": {
+      "post": {
+        "summary": "Mute critical alert UI for this workspace",
+        "operationId": "workspaceMuteCriticalAlertsUI",
+        "tags": [
+          "setting"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "Boolean flag to mute critical alerts.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "mute_critical_alerts": {
+                    "type": "boolean",
+                    "description": "Whether critical alerts should be muted.",
+                    "example": true
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Successfully updated mute critical alert settings.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "example": "Updated mute critical alert UI settings for workspace: workspace_id"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/oauth/login_callback/{client_name}": {
       "post": {
         "security": [],
@@ -4562,6 +5344,32 @@
         }
       }
     },
+    "/w/{workspace}/oauth/disconnect_teams": {
+      "post": {
+        "summary": "disconnect teams",
+        "operationId": "disconnectTeams",
+        "tags": [
+          "oauth"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "disconnected teams",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/oauth/list_logins": {
       "get": {
         "summary": "list oauth logins",
@@ -4675,6 +5483,78 @@
         }
       }
     },
+    "/teams/sync": {
+      "post": {
+        "operationId": "syncTeams",
+        "summary": "synchronize Microsoft Teams information (teams/channels)",
+        "tags": [
+          "teams"
+        ],
+        "responses": {
+          "200": {
+            "description": "Teams information successfully synchronized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/TeamInfo"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/teams/activities": {
+      "post": {
+        "summary": "send update to Microsoft Teams activity",
+        "description": "Respond to a Microsoft Teams activity after a workspace command is run",
+        "operationId": "sendMessageToConversation",
+        "tags": [
+          "teams"
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "conversation_id",
+                  "text"
+                ],
+                "properties": {
+                  "conversation_id": {
+                    "type": "string",
+                    "description": "The ID of the Teams conversation/activity"
+                  },
+                  "success": {
+                    "type": "boolean",
+                    "description": "Used for styling the card conditionally",
+                    "default": true
+                  },
+                  "text": {
+                    "type": "string",
+                    "description": "The message text to be sent in the Teams card"
+                  },
+                  "card_block": {
+                    "type": "object",
+                    "description": "The card block to be sent in the Teams card"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Activity processed successfully"
+          }
+        }
+      }
+    },
     "/w/{workspace}/resources/create": {
       "post": {
         "summary": "create resource",
@@ -5637,6 +6517,44 @@
         }
       }
     },
+    "/apps_u/public_app_by_custom_path/{custom_path}": {
+      "get": {
+        "summary": "get public app by custom path",
+        "operationId": "getPublicAppByCustomPath",
+        "tags": [
+          "app"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/CustomPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "app details",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "allOf": [
+                    {
+                      "$ref": "#/components/schemas/AppWithLastVersion"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "workspace_id": {
+                          "type": "string"
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/scripts/hub/get/{path}": {
       "get": {
         "summary": "get hub script content by path",
@@ -5986,7 +6904,7 @@
           },
           {
             "name": "last_parent_hash",
-            "description": "mask to filter scripts whom last parent in the chain has exact hash. \nBeware that each script stores only a limited number of parents. Hence\nthe last parent hash for a script is not necessarily its top-most parent.\nTo find the top-most parent you will have to jump from last to last hash\n until finding the parent\n",
+            "description": "mask to filter scripts whom last parent in the chain has exact hash.\nBeware that each script stores only a limited number of parents. Hence\nthe last parent hash for a script is not necessarily its top-most parent.\nTo find the top-most parent you will have to jump from last to last hash\n until finding the parent\n",
             "in": "query",
             "schema": {
               "type": "string"
@@ -6002,7 +6920,7 @@
           },
           {
             "name": "show_archived",
-            "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",
+            "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"
@@ -6289,6 +7207,24 @@
         "tags": [
           "worker"
         ],
+        "parameters": [
+          {
+            "name": "workspace",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            },
+            "required": false
+          },
+          {
+            "name": "show_workspace_restriction",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            },
+            "required": false
+          }
+        ],
         "responses": {
           "200": {
             "description": "list of custom tags",
@@ -6440,7 +7376,7 @@
     },
     "/w/{workspace}/scripts/delete/p/{path}": {
       "post": {
-        "summary": "delete all scripts at a given path (require admin)",
+        "summary": "delete script at a given path (require admin)",
         "operationId": "deleteScriptByPath",
         "tags": [
           "script"
@@ -6451,6 +7387,14 @@
           },
           {
             "$ref": "#/components/parameters/ScriptPath"
+          },
+          {
+            "name": "keep_captures",
+            "description": "keep captures",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -6625,6 +7569,38 @@
         }
       }
     },
+    "/w/{workspace}/scripts/list_paths_from_workspace_runnable/{path}": {
+      "get": {
+        "summary": "list script paths using provided script as a relative import",
+        "operationId": "listScriptPathsFromWorkspaceRunnable",
+        "tags": [
+          "script"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "list of script paths",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/scripts/get_latest_version/{path}": {
       "get": {
         "summary": "get scripts's latest version (hash)",
@@ -6645,7 +7621,6 @@
             "description": "Script version/hash",
             "content": {
               "application/json": {
-                "required": false,
                 "schema": {
                   "$ref": "#/components/schemas/ScriptHistory"
                 }
@@ -6895,6 +7870,96 @@
         }
       }
     },
+    "/w/{workspace}/jobs/list_selected_job_groups": {
+      "post": {
+        "summary": "list selected jobs script/flow schemas grouped by (kind, path)",
+        "operationId": "listSelectedJobGroups",
+        "tags": [
+          "job"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "script args",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "result",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "kind": {
+                        "type": "string",
+                        "enum": [
+                          "script",
+                          "flow"
+                        ]
+                      },
+                      "script_path": {
+                        "type": "string"
+                      },
+                      "latest_schema": {
+                        "type": "object"
+                      },
+                      "schemas": {
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "schema": {
+                              "type": "object"
+                            },
+                            "script_hash": {
+                              "type": "string"
+                            },
+                            "job_ids": {
+                              "type": "array",
+                              "items": {
+                                "type": "string"
+                              }
+                            }
+                          },
+                          "required": [
+                            "schema",
+                            "script_hash",
+                            "job_ids"
+                          ]
+                        }
+                      }
+                    },
+                    "required": [
+                      "kind",
+                      "script_path",
+                      "latest_schema",
+                      "schemas"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/jobs/run/p/{path}": {
       "post": {
         "summary": "run script by path",
@@ -7491,7 +8556,6 @@
             "description": "Flow version",
             "content": {
               "application/json": {
-                "required": false,
                 "schema": {
                   "$ref": "#/components/schemas/FlowVersion"
                 }
@@ -7501,6 +8565,41 @@
         }
       }
     },
+    "/w/{workspace}/flows/list_paths_from_workspace_runnable/{runnable_kind}/{path}": {
+      "get": {
+        "summary": "list flow paths from workspace runnable",
+        "operationId": "listFlowPathsFromWorkspaceRunnable",
+        "tags": [
+          "flow"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/RunnableKind"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "list of flow paths",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/flows/get/v/{version}/p/{path}": {
       "get": {
         "summary": "get flow version",
@@ -7510,7 +8609,6 @@
             "$ref": "#/components/parameters/WorkspaceId"
           },
           {
-            "type": "string",
             "name": "version",
             "in": "path",
             "required": true,
@@ -7548,7 +8646,6 @@
             "$ref": "#/components/parameters/WorkspaceId"
           },
           {
-            "type": "string",
             "name": "version",
             "in": "path",
             "required": true,
@@ -7632,6 +8729,40 @@
         }
       }
     },
+    "/w/{workspace}/flows/deployment_status/p/{path}": {
+      "get": {
+        "summary": "get flow deployment status",
+        "operationId": "getFlowDeploymentStatus",
+        "tags": [
+          "flow"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "flow status",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "lock_error_logs": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/flows/get_triggers_count/{path}": {
       "get": {
         "summary": "get triggers count of flow",
@@ -7970,6 +9101,14 @@
           },
           {
             "$ref": "#/components/parameters/ScriptPath"
+          },
+          {
+            "name": "keep_captures",
+            "description": "keep captures",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -8267,6 +9406,9 @@
                   },
                   "deployment_message": {
                     "type": "string"
+                  },
+                  "custom_path": {
+                    "type": "string"
                   }
                 },
                 "required": [
@@ -8293,6 +9435,81 @@
         }
       }
     },
+    "/w/{workspace}/apps/create_raw": {
+      "post": {
+        "summary": "create app raw",
+        "operationId": "createAppRaw",
+        "tags": [
+          "app"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "new app",
+          "required": true,
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "app": {
+                    "type": "object",
+                    "properties": {
+                      "path": {
+                        "type": "string"
+                      },
+                      "value": {},
+                      "summary": {
+                        "type": "string"
+                      },
+                      "policy": {
+                        "$ref": "#/components/schemas/Policy"
+                      },
+                      "draft_only": {
+                        "type": "boolean"
+                      },
+                      "deployment_message": {
+                        "type": "string"
+                      },
+                      "custom_path": {
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "path",
+                      "value",
+                      "summary",
+                      "policy"
+                    ]
+                  },
+                  "js": {
+                    "type": "string"
+                  },
+                  "css": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "app created",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/apps/exists/{path}": {
       "get": {
         "summary": "does an app exisst at path",
@@ -8358,6 +9575,35 @@
         }
       }
     },
+    "/w/{workspace}/apps/get/lite/{path}": {
+      "get": {
+        "summary": "get app lite by path",
+        "operationId": "getAppLiteByPath",
+        "tags": [
+          "app"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "app lite details",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AppWithLastVersion"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/apps/get/draft/{path}": {
       "get": {
         "summary": "get app by path with draft",
@@ -8439,7 +9685,6 @@
             "description": "App version",
             "content": {
               "application/json": {
-                "required": false,
                 "schema": {
                   "$ref": "#/components/schemas/AppHistory"
                 }
@@ -8449,6 +9694,41 @@
         }
       }
     },
+    "/w/{workspace}/apps/list_paths_from_workspace_runnable/{runnable_kind}/{path}": {
+      "get": {
+        "summary": "list app paths from workspace runnable",
+        "operationId": "listAppPathsFromWorkspaceRunnable",
+        "tags": [
+          "app"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/RunnableKind"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "list of app paths",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/apps/history_update/a/{id}/v/{version}": {
       "post": {
         "summary": "update app history",
@@ -8808,6 +10088,9 @@
                   },
                   "deployment_message": {
                     "type": "string"
+                  },
+                  "custom_path": {
+                    "type": "string"
                   }
                 }
               }
@@ -8828,6 +10111,155 @@
         }
       }
     },
+    "/w/{workspace}/apps/update_raw/{path}": {
+      "post": {
+        "summary": "update app",
+        "operationId": "updateAppRaw",
+        "tags": [
+          "app"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "requestBody": {
+          "description": "update app",
+          "required": true,
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "app": {
+                    "type": "object",
+                    "properties": {
+                      "path": {
+                        "type": "string"
+                      },
+                      "summary": {
+                        "type": "string"
+                      },
+                      "value": {},
+                      "policy": {
+                        "$ref": "#/components/schemas/Policy"
+                      },
+                      "deployment_message": {
+                        "type": "string"
+                      },
+                      "custom_path": {
+                        "type": "string"
+                      }
+                    }
+                  },
+                  "js": {
+                    "type": "string"
+                  },
+                  "css": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "app updated",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/apps/custom_path_exists/{custom_path}": {
+      "get": {
+        "summary": "check if custom path exists",
+        "operationId": "customPathExists",
+        "tags": [
+          "app"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/CustomPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "custom path exists",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/apps/sign_s3_objects": {
+      "post": {
+        "summary": "sign s3 objects, to be used by anonymous users in public apps",
+        "operationId": "signS3Objects",
+        "tags": [
+          "app"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "s3 objects to sign",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "s3_objects": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/components/schemas/S3Object"
+                    }
+                  }
+                },
+                "required": [
+                  "s3_objects"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "signed s3 objects",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/S3Object"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/apps_u/execute_component/{path}": {
       "post": {
         "summary": "executeComponent",
@@ -8857,6 +10289,9 @@
                   "path": {
                     "type": "string"
                   },
+                  "version": {
+                    "type": "integer"
+                  },
                   "args": {},
                   "raw_code": {
                     "type": "object",
@@ -8882,6 +10317,9 @@
                       "language"
                     ]
                   },
+                  "id": {
+                    "type": "integer"
+                  },
                   "force_viewer_static_fields": {
                     "type": "object"
                   },
@@ -8917,6 +10355,146 @@
         }
       }
     },
+    "/w/{workspace}/apps_u/upload_s3_file/{path}": {
+      "post": {
+        "summary": "upload s3 file from app",
+        "operationId": "uploadS3FileFromApp",
+        "tags": [
+          "app"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          },
+          {
+            "name": "file_key",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "file_extension",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "s3_resource_path",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "resource_type",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "storage",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "content_type",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "content_disposition",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "File content",
+          "required": true,
+          "content": {
+            "application/octet-stream": {
+              "schema": {
+                "type": "string",
+                "format": "binary"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "file uploaded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "file_key": {
+                      "type": "string"
+                    },
+                    "delete_token": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "file_key",
+                    "delete_token"
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/apps_u/delete_s3_file": {
+      "delete": {
+        "summary": "delete s3 file from app",
+        "operationId": "deleteS3FileFromApp",
+        "tags": [
+          "app"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "delete_token",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "file deleted",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/jobs/run/f/{path}": {
       "post": {
         "summary": "run flow by path",
@@ -9003,6 +10581,90 @@
         }
       }
     },
+    "/w/{workspace}/jobs/run/batch_rerun_jobs": {
+      "post": {
+        "summary": "re-run multiple jobs",
+        "operationId": "batchReRunJobs",
+        "tags": [
+          "job"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "list of job ids to re run and arg tranforms",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "job_ids",
+                  "script_options_by_path",
+                  "flow_options_by_path"
+                ],
+                "properties": {
+                  "job_ids": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "script_options_by_path": {
+                    "type": "object",
+                    "additionalProperties": {
+                      "type": "object",
+                      "properties": {
+                        "input_transforms": {
+                          "type": "object",
+                          "additionalProperties": {
+                            "$ref": "#/components/schemas/InputTransform"
+                          }
+                        },
+                        "use_latest_version": {
+                          "type": "boolean"
+                        }
+                      }
+                    }
+                  },
+                  "flow_options_by_path": {
+                    "type": "object",
+                    "additionalProperties": {
+                      "type": "object",
+                      "properties": {
+                        "input_transforms": {
+                          "type": "object",
+                          "additionalProperties": {
+                            "$ref": "#/components/schemas/InputTransform"
+                          }
+                        },
+                        "use_latest_version": {
+                          "type": "boolean"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "stream of created job uuids separated by \\n. Lines may start with 'Error:'",
+            "content": {
+              "text/event-stream": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/jobs/restart/f/{id}/from/{step_id}/{branch_or_iteration_n}": {
       "post": {
         "summary": "restart a completed flow at a given step",
@@ -9426,6 +11088,9 @@
           {
             "$ref": "#/components/parameters/ParentJob"
           },
+          {
+            "$ref": "#/components/parameters/Worker"
+          },
           {
             "$ref": "#/components/parameters/ScriptExactPath"
           },
@@ -9465,6 +11130,9 @@
           {
             "$ref": "#/components/parameters/ResultFilter"
           },
+          {
+            "$ref": "#/components/parameters/AllowWildcards"
+          },
           {
             "$ref": "#/components/parameters/Tag"
           },
@@ -9587,10 +11255,213 @@
         }
       }
     },
-    "/w/{workspace}/jobs/queue/list_filtered_uuids": {
+    "/w/{workspace}/jobs/completed/count_jobs": {
+      "get": {
+        "summary": "count number of completed jobs with filter",
+        "operationId": "countCompletedJobs",
+        "tags": [
+          "job"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "completed_after_s_ago",
+            "in": "query",
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "success",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "tags",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "all_workspaces",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Count of completed jobs",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/jobs/list_filtered_uuids": {
       "get": {
         "summary": "get the ids of all jobs matching the given filters",
-        "operationId": "listFilteredUuids",
+        "operationId": "listFilteredJobsUuids",
+        "tags": [
+          "job"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/CreatedBy"
+          },
+          {
+            "$ref": "#/components/parameters/Label"
+          },
+          {
+            "$ref": "#/components/parameters/Worker"
+          },
+          {
+            "$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/CreatedBefore"
+          },
+          {
+            "$ref": "#/components/parameters/CreatedAfter"
+          },
+          {
+            "$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/Suspended"
+          },
+          {
+            "$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": "uuids of jobs",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/jobs/queue/list_filtered_uuids": {
+      "get": {
+        "summary": "get the ids of all queued jobs matching the given filters",
+        "operationId": "listFilteredQueueUuids",
         "tags": [
           "job"
         ],
@@ -9646,6 +11517,9 @@
           {
             "$ref": "#/components/parameters/ResultFilter"
           },
+          {
+            "$ref": "#/components/parameters/AllowWildcards"
+          },
           {
             "$ref": "#/components/parameters/Tag"
           },
@@ -9760,6 +11634,9 @@
           {
             "$ref": "#/components/parameters/Label"
           },
+          {
+            "$ref": "#/components/parameters/Worker"
+          },
           {
             "$ref": "#/components/parameters/ParentJob"
           },
@@ -9793,6 +11670,9 @@
           {
             "$ref": "#/components/parameters/ResultFilter"
           },
+          {
+            "$ref": "#/components/parameters/AllowWildcards"
+          },
           {
             "$ref": "#/components/parameters/Tag"
           },
@@ -9869,6 +11749,9 @@
           {
             "$ref": "#/components/parameters/Label"
           },
+          {
+            "$ref": "#/components/parameters/Worker"
+          },
           {
             "$ref": "#/components/parameters/ParentJob"
           },
@@ -9926,6 +11809,9 @@
           {
             "$ref": "#/components/parameters/ResultFilter"
           },
+          {
+            "$ref": "#/components/parameters/AllowWildcards"
+          },
           {
             "$ref": "#/components/parameters/Page"
           },
@@ -10294,7 +12180,9 @@
             "description": "job log",
             "content": {
               "text/plain": {
-                "type": "string"
+                "schema": {
+                  "type": "string"
+                }
               }
             }
           }
@@ -10728,6 +12616,158 @@
         }
       }
     },
+    "/w/{workspace}/jobs/slack_approval/{id}": {
+      "get": {
+        "summary": "generate interactive slack approval for suspended job",
+        "operationId": "getSlackApprovalPayload",
+        "tags": [
+          "job"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/JobId"
+          },
+          {
+            "name": "approver",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "message",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "slack_resource_path",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "channel_id",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "flow_step_id",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "default_args_json",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "dynamic_enums_json",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Interactive slack approval message sent successfully"
+          }
+        }
+      }
+    },
+    "/w/{workspace}/jobs/teams_approval/{id}": {
+      "get": {
+        "summary": "generate interactive teams approval for suspended job",
+        "operationId": "getTeamsApprovalPayload",
+        "tags": [
+          "job"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/JobId"
+          },
+          {
+            "name": "approver",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "message",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "team_name",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "channel_name",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "flow_step_id",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "default_args_json",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "dynamic_enums_json",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Interactive slack approval message sent successfully"
+          }
+        }
+      }
+    },
     "/w/{workspace}/jobs_u/resume/{id}/{resume_id}/{signature}": {
       "get": {
         "summary": "resume a job for a suspended flow",
@@ -11172,6 +13212,9 @@
                   },
                   "timezone": {
                     "type": "string"
+                  },
+                  "cron_version": {
+                    "type": "string"
                   }
                 },
                 "required": [
@@ -11823,10 +13866,15 @@
                       "delete",
                       "patch"
                     ]
+                  },
+                  "trigger_path": {
+                    "type": "string"
+                  },
+                  "workspaced_route": {
+                    "type": "boolean"
                   }
                 },
                 "required": [
-                  "kind",
                   "route_path",
                   "http_method"
                 ]
@@ -12118,6 +14166,2452 @@
         }
       }
     },
+    "/w/{workspace}/websocket_triggers/test": {
+      "post": {
+        "summary": "test websocket connection",
+        "operationId": "testWebsocketConnection",
+        "tags": [
+          "websocket_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "test websocket connection",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "url": {
+                    "type": "string"
+                  },
+                  "url_runnable_args": {
+                    "$ref": "#/components/schemas/ScriptArgs"
+                  },
+                  "can_return_message": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "url",
+                  "can_return_message"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "successfuly connected to websocket",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/kafka_triggers/create": {
+      "post": {
+        "summary": "create kafka trigger",
+        "operationId": "createKafkaTrigger",
+        "tags": [
+          "kafka_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "new kafka trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NewKafkaTrigger"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "kafka trigger created",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/kafka_triggers/update/{path}": {
+      "post": {
+        "summary": "update kafka trigger",
+        "operationId": "updateKafkaTrigger",
+        "tags": [
+          "kafka_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EditKafkaTrigger"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "kafka trigger updated",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/kafka_triggers/delete/{path}": {
+      "delete": {
+        "summary": "delete kafka trigger",
+        "operationId": "deleteKafkaTrigger",
+        "tags": [
+          "kafka_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "kafka trigger deleted",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/kafka_triggers/get/{path}": {
+      "get": {
+        "summary": "get kafka trigger",
+        "operationId": "getKafkaTrigger",
+        "tags": [
+          "kafka_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "kafka trigger deleted",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/KafkaTrigger"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/kafka_triggers/list": {
+      "get": {
+        "summary": "list kafka triggers",
+        "operationId": "listKafkaTriggers",
+        "tags": [
+          "kafka_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": "kafka trigger list",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/KafkaTrigger"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/kafka_triggers/exists/{path}": {
+      "get": {
+        "summary": "does kafka trigger exists",
+        "operationId": "existsKafkaTrigger",
+        "tags": [
+          "kafka_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "kafka trigger exists",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/kafka_triggers/setenabled/{path}": {
+      "post": {
+        "summary": "set enabled kafka trigger",
+        "operationId": "setKafkaTriggerEnabled",
+        "tags": [
+          "kafka_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated kafka trigger enable",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "enabled": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "enabled"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "kafka trigger enabled set",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/kafka_triggers/test": {
+      "post": {
+        "summary": "test kafka connection",
+        "operationId": "testKafkaConnection",
+        "tags": [
+          "kafka_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "test kafka connection",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "connection": {
+                    "type": "object"
+                  }
+                },
+                "required": [
+                  "connection"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "successfuly connected to kafka brokers",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/nats_triggers/create": {
+      "post": {
+        "summary": "create nats trigger",
+        "operationId": "createNatsTrigger",
+        "tags": [
+          "nats_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "new nats trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NewNatsTrigger"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "nats trigger created",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/nats_triggers/update/{path}": {
+      "post": {
+        "summary": "update nats trigger",
+        "operationId": "updateNatsTrigger",
+        "tags": [
+          "nats_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EditNatsTrigger"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "nats trigger updated",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/nats_triggers/delete/{path}": {
+      "delete": {
+        "summary": "delete nats trigger",
+        "operationId": "deleteNatsTrigger",
+        "tags": [
+          "nats_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "nats trigger deleted",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/nats_triggers/get/{path}": {
+      "get": {
+        "summary": "get nats trigger",
+        "operationId": "getNatsTrigger",
+        "tags": [
+          "nats_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "nats trigger deleted",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NatsTrigger"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/nats_triggers/list": {
+      "get": {
+        "summary": "list nats triggers",
+        "operationId": "listNatsTriggers",
+        "tags": [
+          "nats_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": "nats trigger list",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NatsTrigger"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/nats_triggers/exists/{path}": {
+      "get": {
+        "summary": "does nats trigger exists",
+        "operationId": "existsNatsTrigger",
+        "tags": [
+          "nats_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "nats trigger exists",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/nats_triggers/setenabled/{path}": {
+      "post": {
+        "summary": "set enabled nats trigger",
+        "operationId": "setNatsTriggerEnabled",
+        "tags": [
+          "nats_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated nats trigger enable",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "enabled": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "enabled"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "nats trigger enabled set",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/nats_triggers/test": {
+      "post": {
+        "summary": "test NATS connection",
+        "operationId": "testNatsConnection",
+        "tags": [
+          "nats_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "test nats connection",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "connection": {
+                    "type": "object"
+                  }
+                },
+                "required": [
+                  "connection"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "successfuly connected to NATS servers",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/sqs_triggers/create": {
+      "post": {
+        "summary": "create sqs trigger",
+        "operationId": "createSqsTrigger",
+        "tags": [
+          "sqs_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "new sqs trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NewSqsTrigger"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "sqs trigger created",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/sqs_triggers/update/{path}": {
+      "post": {
+        "summary": "update sqs trigger",
+        "operationId": "updateSqsTrigger",
+        "tags": [
+          "sqs_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EditSqsTrigger"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "sqs trigger updated",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/sqs_triggers/delete/{path}": {
+      "delete": {
+        "summary": "delete sqs trigger",
+        "operationId": "deleteSqsTrigger",
+        "tags": [
+          "sqs_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "sqs trigger deleted",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/sqs_triggers/get/{path}": {
+      "get": {
+        "summary": "get sqs trigger",
+        "operationId": "getSqsTrigger",
+        "tags": [
+          "sqs_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "sqs trigger deleted",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SqsTrigger"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/sqs_triggers/list": {
+      "get": {
+        "summary": "list sqs triggers",
+        "operationId": "listSqsTriggers",
+        "tags": [
+          "sqs_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": "sqs trigger list",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/SqsTrigger"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/sqs_triggers/exists/{path}": {
+      "get": {
+        "summary": "does sqs trigger exists",
+        "operationId": "existsSqsTrigger",
+        "tags": [
+          "sqs_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "sqs trigger exists",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/sqs_triggers/setenabled/{path}": {
+      "post": {
+        "summary": "set enabled sqs trigger",
+        "operationId": "setSqsTriggerEnabled",
+        "tags": [
+          "sqs_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated sqs trigger enable",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "enabled": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "enabled"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "sqs trigger enabled set",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/sqs_triggers/test": {
+      "post": {
+        "summary": "test sqs connection",
+        "operationId": "testSqsConnection",
+        "tags": [
+          "sqs_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "test sqs connection",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "connection": {
+                    "type": "object"
+                  }
+                },
+                "required": [
+                  "connection"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "successfuly connected to sqs",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/mqtt_triggers/create": {
+      "post": {
+        "summary": "create mqtt trigger",
+        "operationId": "createMqttTrigger",
+        "tags": [
+          "mqtt_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "new mqtt trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NewMqttTrigger"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "mqtt trigger created",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/mqtt_triggers/update/{path}": {
+      "post": {
+        "summary": "update mqtt trigger",
+        "operationId": "updateMqttTrigger",
+        "tags": [
+          "mqtt_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EditMqttTrigger"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "mqtt trigger updated",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/mqtt_triggers/delete/{path}": {
+      "delete": {
+        "summary": "delete mqtt trigger",
+        "operationId": "deleteMqttTrigger",
+        "tags": [
+          "mqtt_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "mqtt trigger deleted",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/mqtt_triggers/get/{path}": {
+      "get": {
+        "summary": "get mqtt trigger",
+        "operationId": "getMqttTrigger",
+        "tags": [
+          "mqtt_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "mqtt trigger deleted",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MqttTrigger"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/mqtt_triggers/list": {
+      "get": {
+        "summary": "list mqtt triggers",
+        "operationId": "listMqttTriggers",
+        "tags": [
+          "mqtt_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": "mqtt trigger list",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/MqttTrigger"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/mqtt_triggers/exists/{path}": {
+      "get": {
+        "summary": "does mqtt trigger exists",
+        "operationId": "existsMqttTrigger",
+        "tags": [
+          "mqtt_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "mqtt trigger exists",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/mqtt_triggers/setenabled/{path}": {
+      "post": {
+        "summary": "set enabled mqtt trigger",
+        "operationId": "setMqttTriggerEnabled",
+        "tags": [
+          "mqtt_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated mqtt trigger enable",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "enabled": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "enabled"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "mqtt trigger enabled set",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/mqtt_triggers/test": {
+      "post": {
+        "summary": "test mqtt connection",
+        "operationId": "testMqttConnection",
+        "tags": [
+          "mqtt_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "test mqtt connection",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "connection": {
+                    "type": "object"
+                  }
+                },
+                "required": [
+                  "connection"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "successfully connected to mqtt",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/gcp_triggers/create": {
+      "post": {
+        "summary": "create gcp trigger",
+        "operationId": "createGcpTrigger",
+        "tags": [
+          "gcp_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "new gcp trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GcpTriggerData"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "gcp trigger created",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/gcp_triggers/update/{path}": {
+      "post": {
+        "summary": "update gcp trigger",
+        "operationId": "updateGcpTrigger",
+        "tags": [
+          "gcp_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GcpTriggerData"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "gcp trigger updated",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/gcp_triggers/delete/{path}": {
+      "delete": {
+        "summary": "delete gcp trigger",
+        "operationId": "deleteGcpTrigger",
+        "tags": [
+          "gcp_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "gcp trigger deleted",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/gcp_triggers/get/{path}": {
+      "get": {
+        "summary": "get gcp trigger",
+        "operationId": "getGcpTrigger",
+        "tags": [
+          "gcp_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "gcp trigger deleted",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GcpTrigger"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/gcp_triggers/list": {
+      "get": {
+        "summary": "list gcp triggers",
+        "operationId": "listGcpTriggers",
+        "tags": [
+          "gcp_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": "gcp trigger list",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/GcpTrigger"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/gcp_triggers/exists/{path}": {
+      "get": {
+        "summary": "does gcp trigger exists",
+        "operationId": "existsGcpTrigger",
+        "tags": [
+          "gcp_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "gcp trigger exists",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/gcp_triggers/setenabled/{path}": {
+      "post": {
+        "summary": "set enabled gcp trigger",
+        "operationId": "setGcpTriggerEnabled",
+        "tags": [
+          "gcp_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated gcp trigger enable",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "enabled": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "enabled"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "gcp trigger enabled set",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/gcp_triggers/test": {
+      "post": {
+        "summary": "test gcp connection",
+        "operationId": "testGcpConnection",
+        "tags": [
+          "gcp_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "test gcp connection",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "connection": {
+                    "type": "object"
+                  }
+                },
+                "required": [
+                  "connection"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "try to connect to a gcp broker",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/gcp_triggers/subscriptions/delete/{path}": {
+      "delete": {
+        "summary": "delete gcp trigger",
+        "operationId": "deleteGcpSubscription",
+        "tags": [
+          "gcp_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "args to delete subscription from google cloud",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DeleteGcpSubscription"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "gcp trigger deleted",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/gcp_triggers/topics/list/{path}": {
+      "get": {
+        "summary": "list all topics of google cloud service",
+        "operationId": "listGoogleTopics",
+        "tags": [
+          "gcp_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "get all google topics",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/gcp_triggers/subscriptions/list/{path}": {
+      "post": {
+        "summary": "list all subscription of a give topic from google cloud service",
+        "operationId": "listAllTGoogleTopicSubscriptions",
+        "tags": [
+          "gcp_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "args to get subscription's topic from google cloud",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GetAllTopicSubscription"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "get all google topic subscriptions name",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/is_valid_postgres_configuration/{path}": {
+      "get": {
+        "summary": "check if postgres configuration is set to logical",
+        "operationId": "isValidPostgresConfiguration",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "boolean that indicates if postgres is set to logical level or not",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/create_template_script": {
+      "post": {
+        "summary": "create template script",
+        "operationId": "createTemplateScript",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "template script",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TemplateScript"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "custom id to retrieve template script",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/get_template_script/{id}": {
+      "get": {
+        "summary": "get template script",
+        "operationId": "getTemplateScript",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Id"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "template script",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/slot/list/{path}": {
+      "get": {
+        "summary": "list postgres replication slot",
+        "operationId": "listPostgresReplicationSlot",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "list postgres slot",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/SlotList"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/slot/create/{path}": {
+      "post": {
+        "summary": "create replication slot for postgres",
+        "operationId": "createPostgresReplicationSlot",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "new slot for postgres",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Slot"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "slot created",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/slot/delete/{path}": {
+      "delete": {
+        "summary": "delete postgres replication slot",
+        "operationId": "deletePostgresReplicationSlot",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "replication slot of postgres",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Slot"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "postgres replication slot deleted",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/publication/list/{path}": {
+      "get": {
+        "summary": "list postgres publication",
+        "operationId": "listPostgresPublication",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "database publication list",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/publication/get/{publication}/{path}": {
+      "get": {
+        "summary": "get postgres publication",
+        "operationId": "getPostgresPublication",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          },
+          {
+            "$ref": "#/components/parameters/PublicationName"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "postgres publication get",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PublicationData"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/publication/create/{publication}/{path}": {
+      "post": {
+        "summary": "create publication for postgres",
+        "operationId": "createPostgresPublication",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          },
+          {
+            "$ref": "#/components/parameters/PublicationName"
+          }
+        ],
+        "requestBody": {
+          "description": "new publication for postgres",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PublicationData"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "publication created",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/publication/update/{publication}/{path}": {
+      "post": {
+        "summary": "update publication for postgres",
+        "operationId": "updatePostgresPublication",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          },
+          {
+            "$ref": "#/components/parameters/PublicationName"
+          }
+        ],
+        "requestBody": {
+          "description": "update publication for postgres",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PublicationData"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "publication updated",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/publication/delete/{publication}/{path}": {
+      "delete": {
+        "summary": "delete postgres publication",
+        "operationId": "deletePostgresPublication",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          },
+          {
+            "$ref": "#/components/parameters/PublicationName"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "postgres publication deleted",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/create": {
+      "post": {
+        "summary": "create postgres trigger",
+        "operationId": "createPostgresTrigger",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "new postgres trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NewPostgresTrigger"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "postgres trigger created",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/update/{path}": {
+      "post": {
+        "summary": "update postgres trigger",
+        "operationId": "updatePostgresTrigger",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EditPostgresTrigger"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "postgres trigger updated",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/delete/{path}": {
+      "delete": {
+        "summary": "delete postgres trigger",
+        "operationId": "deletePostgresTrigger",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "postgres trigger deleted",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/get/{path}": {
+      "get": {
+        "summary": "get postgres trigger",
+        "operationId": "getPostgresTrigger",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "get postgres trigger",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PostgresTrigger"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/list": {
+      "get": {
+        "summary": "list postgres triggers",
+        "operationId": "listPostgresTriggers",
+        "tags": [
+          "postgres_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": "postgres trigger list",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/PostgresTrigger"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/exists/{path}": {
+      "get": {
+        "summary": "does postgres trigger exists",
+        "operationId": "existsPostgresTrigger",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "postgres trigger exists",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/setenabled/{path}": {
+      "post": {
+        "summary": "set enabled postgres trigger",
+        "operationId": "setPostgresTriggerEnabled",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated postgres trigger enable",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "enabled": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "enabled"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "postgres trigger enabled set",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/postgres_triggers/test": {
+      "post": {
+        "summary": "test postgres connection",
+        "operationId": "testPostgresConnection",
+        "tags": [
+          "postgres_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "description": "test postgres connection",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "database": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "database"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "successfuly connected to postgres",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/groups/list": {
       "get": {
         "summary": "list instance groups",
@@ -12989,6 +17483,35 @@
         }
       }
     },
+    "/w/{workspace}/folders/exists/{name}": {
+      "get": {
+        "summary": "exists folder",
+        "operationId": "existsFolder",
+        "tags": [
+          "folder"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Name"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "folder exists",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/folders/getusage/{name}": {
       "get": {
         "summary": "get folder usage",
@@ -13343,7 +17866,9 @@
             "description": "a config",
             "content": {
               "application/json": {
-                "schema": {}
+                "schema": {
+                  "$ref": "#/components/schemas/Configs"
+                }
               }
             }
           }
@@ -13467,6 +17992,81 @@
         }
       }
     },
+    "/configs/list_available_python_versions": {
+      "get": {
+        "summary": "Get currently available python versions provided by UV.",
+        "operationId": "listAvailablePythonVersions",
+        "tags": [
+          "config"
+        ],
+        "responses": {
+          "200": {
+            "description": "List of python versions",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/agent_workers/create_agent_token": {
+      "post": {
+        "summary": "create agent token",
+        "operationId": "createAgentToken",
+        "tags": [
+          "agent_workers"
+        ],
+        "requestBody": {
+          "description": "agent token",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "worker_group": {
+                    "type": "string"
+                  },
+                  "tags": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "exp": {
+                    "type": "integer"
+                  }
+                },
+                "required": [
+                  "worker_group",
+                  "tags",
+                  "exp"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "agent token created",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/acls/get/{kind}/{path}": {
       "get": {
         "summary": "get granular acls",
@@ -13498,7 +18098,13 @@
                 "app",
                 "raw_app",
                 "http_trigger",
-                "websocket_trigger"
+                "websocket_trigger",
+                "kafka_trigger",
+                "nats_trigger",
+                "postgres_trigger",
+                "mqtt_trigger",
+                "gcp_trigger",
+                "sqs_trigger"
               ]
             }
           }
@@ -13551,7 +18157,13 @@
                 "app",
                 "raw_app",
                 "http_trigger",
-                "websocket_trigger"
+                "websocket_trigger",
+                "kafka_trigger",
+                "nats_trigger",
+                "postgres_trigger",
+                "mqtt_trigger",
+                "gcp_trigger",
+                "sqs_trigger"
               ]
             }
           }
@@ -13623,7 +18235,13 @@
                 "app",
                 "raw_app",
                 "http_trigger",
-                "websocket_trigger"
+                "websocket_trigger",
+                "kafka_trigger",
+                "nats_trigger",
+                "postgres_trigger",
+                "mqtt_trigger",
+                "gcp_trigger",
+                "sqs_trigger"
               ]
             }
           }
@@ -13661,32 +18279,66 @@
         }
       }
     },
-    "/w/{workspace}/capture_u/{path}": {
+    "/w/{workspace}/capture/set_config": {
       "post": {
-        "summary": "update flow preview capture",
-        "operationId": "updateCapture",
+        "summary": "set capture config",
+        "operationId": "setCaptureConfig",
         "tags": [
           "capture"
         ],
         "parameters": [
           {
             "$ref": "#/components/parameters/WorkspaceId"
-          },
-          {
-            "$ref": "#/components/parameters/Path"
           }
         ],
+        "requestBody": {
+          "description": "capture config",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "trigger_kind": {
+                    "$ref": "#/components/schemas/CaptureTriggerKind"
+                  },
+                  "path": {
+                    "type": "string"
+                  },
+                  "is_flow": {
+                    "type": "boolean"
+                  },
+                  "trigger_config": {
+                    "type": "object"
+                  }
+                },
+                "required": [
+                  "trigger_kind",
+                  "path",
+                  "is_flow"
+                ]
+              }
+            }
+          }
+        },
         "responses": {
-          "204": {
-            "description": "flow preview captured"
+          "200": {
+            "description": "capture config set",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object"
+                }
+              }
+            }
           }
         }
       }
     },
-    "/w/{workspace}/capture/{path}": {
-      "put": {
-        "summary": "create flow preview capture",
-        "operationId": "createCapture",
+    "/w/{workspace}/capture/ping_config/{trigger_kind}/{runnable_kind}/{path}": {
+      "post": {
+        "summary": "ping capture config",
+        "operationId": "pingCaptureConfig",
         "tags": [
           "capture"
         ],
@@ -13694,18 +18346,162 @@
           {
             "$ref": "#/components/parameters/WorkspaceId"
           },
+          {
+            "name": "trigger_kind",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "$ref": "#/components/schemas/CaptureTriggerKind"
+            }
+          },
+          {
+            "$ref": "#/components/parameters/RunnableKind"
+          },
           {
             "$ref": "#/components/parameters/Path"
           }
         ],
         "responses": {
-          "201": {
-            "description": "flow preview capture created"
+          "200": {
+            "description": "capture config pinged"
           }
         }
-      },
+      }
+    },
+    "/w/{workspace}/capture/get_configs/{runnable_kind}/{path}": {
       "get": {
-        "summary": "get flow preview capture",
+        "summary": "get capture configs for a script or flow",
+        "operationId": "getCaptureConfigs",
+        "tags": [
+          "capture"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/RunnableKind"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "capture configs for a script or flow",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/CaptureConfig"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/capture/list/{runnable_kind}/{path}": {
+      "get": {
+        "summary": "list captures for a script or flow",
+        "operationId": "listCaptures",
+        "tags": [
+          "capture"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/RunnableKind"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          },
+          {
+            "name": "trigger_kind",
+            "in": "query",
+            "schema": {
+              "$ref": "#/components/schemas/CaptureTriggerKind"
+            }
+          },
+          {
+            "$ref": "#/components/parameters/Page"
+          },
+          {
+            "$ref": "#/components/parameters/PerPage"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "list of captures for a script or flow",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Capture"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/capture/move/{runnable_kind}/{path}": {
+      "post": {
+        "summary": "move captures and configs for a script or flow",
+        "operationId": "moveCapturesAndConfigs",
+        "tags": [
+          "capture"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/RunnableKind"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "move captures and configs to a new path",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "new_path": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "captures and configs moved",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/capture/{id}": {
+      "get": {
+        "summary": "get a capture",
         "operationId": "getCapture",
         "tags": [
           "capture"
@@ -13715,20 +18511,49 @@
             "$ref": "#/components/parameters/WorkspaceId"
           },
           {
-            "$ref": "#/components/parameters/Path"
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
           }
         ],
         "responses": {
           "200": {
-            "description": "captured flow preview",
+            "description": "capture",
             "content": {
               "application/json": {
-                "schema": {}
+                "schema": {
+                  "$ref": "#/components/schemas/Capture"
+                }
               }
             }
+          }
+        }
+      },
+      "delete": {
+        "summary": "delete a capture",
+        "operationId": "deleteCapture",
+        "tags": [
+          "capture"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
           },
-          "404": {
-            "description": "capture does not exist for this flow"
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "capture deleted"
           }
         }
       }
@@ -13839,6 +18664,16 @@
           },
           {
             "$ref": "#/components/parameters/PerPage"
+          },
+          {
+            "$ref": "#/components/parameters/ArgsFilter"
+          },
+          {
+            "name": "include_preview",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -14142,6 +18977,9 @@
                   "properties": {
                     "connection_settings_str": {
                       "type": "string"
+                    },
+                    "azure_container_path": {
+                      "type": "string"
                     }
                   },
                   "required": [
@@ -14994,7 +19832,7 @@
     },
     "/w/{workspace}/job_helpers/download_s3_file": {
       "get": {
-        "summary": "Download file to S3 bucket",
+        "summary": "Download file from S3 bucket",
         "operationId": "fileDownload",
         "tags": [
           "helpers"
@@ -15508,6 +20346,9 @@
           {
             "$ref": "#/components/parameters/ResultFilter"
           },
+          {
+            "$ref": "#/components/parameters/AllowWildcards"
+          },
           {
             "$ref": "#/components/parameters/Page"
           },
@@ -15595,6 +20436,14 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "pagination_offset",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
           }
         ],
         "responses": {
@@ -15609,12 +20458,7 @@
                       "description": "a list of the terms that couldn't be parsed (and thus ignored)",
                       "type": "array",
                       "items": {
-                        "type": "object",
-                        "properties": {
-                          "dancer": {
-                            "type": "string"
-                          }
-                        }
+                        "type": "string"
                       }
                     },
                     "hits": {
@@ -15623,6 +20467,25 @@
                       "items": {
                         "$ref": "#/components/schemas/JobSearchHit"
                       }
+                    },
+                    "hit_count": {
+                      "description": "how many jobs matched in total",
+                      "type": "number"
+                    },
+                    "index_metadata": {
+                      "description": "Metadata about the index current state",
+                      "type": "object",
+                      "properties": {
+                        "indexed_until": {
+                          "description": "Datetime of the most recently indexed job",
+                          "type": "string",
+                          "format": "date-time"
+                        },
+                        "lost_lock_ownership": {
+                          "description": "Is the current indexer service being replaced",
+                          "type": "boolean"
+                        }
+                      }
                     }
                   }
                 }
@@ -15737,14 +20600,6 @@
               "type": "string"
             }
           },
-          {
-            "name": "hosts",
-            "in": "query",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
           {
             "name": "min_ts",
             "in": "query",
@@ -15790,6 +20645,41 @@
           }
         }
       }
+    },
+    "/srch/index/delete/{idx_name}": {
+      "delete": {
+        "summary": "Restart container and delete the index to recreate it.",
+        "operationId": "clearIndex",
+        "tags": [
+          "indexSearch"
+        ],
+        "parameters": [
+          {
+            "name": "idx_name",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "JobIndex",
+                "ServiceLogIndex"
+              ]
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "idx to be deleted and container restarting",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
     }
   },
   "components": {
@@ -15805,6 +20695,14 @@
       }
     },
     "parameters": {
+      "Id": {
+        "name": "id",
+        "in": "path",
+        "required": true,
+        "schema": {
+          "type": "string"
+        }
+      },
       "Key": {
         "name": "key",
         "in": "path",
@@ -15821,6 +20719,14 @@
           "type": "string"
         }
       },
+      "PublicationName": {
+        "name": "publication",
+        "in": "path",
+        "required": true,
+        "schema": {
+          "type": "string"
+        }
+      },
       "VersionId": {
         "name": "version",
         "in": "path",
@@ -15886,6 +20792,14 @@
           "type": "string"
         }
       },
+      "CustomPath": {
+        "name": "custom_path",
+        "in": "path",
+        "required": true,
+        "schema": {
+          "type": "string"
+        }
+      },
       "PathId": {
         "name": "id",
         "in": "path",
@@ -15950,6 +20864,14 @@
           "type": "string"
         }
       },
+      "Worker": {
+        "name": "worker",
+        "description": "worker this job was ran on",
+        "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",
@@ -16144,6 +21066,14 @@
           "type": "boolean"
         }
       },
+      "AllowWildcards": {
+        "name": "allow_wildcards",
+        "description": "allow wildcards (*) in the filter of label, tag, worker",
+        "in": "query",
+        "schema": {
+          "type": "boolean"
+        }
+      },
       "ArgsFilter": {
         "name": "args",
         "description": "filter on jobs containing those args as a json subset (@> in postgres)",
@@ -16259,24 +21189,135 @@
         "schema": {
           "type": "string"
         }
+      },
+      "RunnableKind": {
+        "name": "runnable_kind",
+        "in": "path",
+        "required": true,
+        "schema": {
+          "type": "string",
+          "enum": [
+            "script",
+            "flow"
+          ]
+        }
       }
     },
     "schemas": {
-      "AiResource": {
+      "InputTransform": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/schemas-InputTransform"
+          }
+        ]
+      },
+      "AIProvider": {
+        "type": "string",
+        "enum": [
+          "openai",
+          "azure_openai",
+          "anthropic",
+          "mistral",
+          "deepseek",
+          "googleai",
+          "groq",
+          "openrouter",
+          "togetherai",
+          "customai"
+        ]
+      },
+      "AIProviderModel": {
         "type": "object",
         "properties": {
-          "path": {
+          "model": {
             "type": "string"
           },
           "provider": {
-            "type": "string"
+            "$ref": "#/components/schemas/AIProvider"
           }
         },
         "required": [
-          "path",
+          "model",
           "provider"
         ]
       },
+      "AIProviderConfig": {
+        "type": "object",
+        "properties": {
+          "resource_path": {
+            "type": "string"
+          },
+          "models": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "resource_path",
+          "models"
+        ]
+      },
+      "AIConfig": {
+        "type": "object",
+        "properties": {
+          "providers": {
+            "type": "object",
+            "additionalProperties": {
+              "$ref": "#/components/schemas/AIProviderConfig"
+            }
+          },
+          "default_model": {
+            "$ref": "#/components/schemas/AIProviderModel"
+          },
+          "code_completion_model": {
+            "$ref": "#/components/schemas/AIProviderModel"
+          }
+        }
+      },
+      "Alert": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "tags_to_monitor": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "jobs_num_threshold": {
+            "type": "integer"
+          },
+          "alert_cooldown_seconds": {
+            "type": "integer"
+          },
+          "alert_time_threshold_seconds": {
+            "type": "integer"
+          }
+        },
+        "required": [
+          "name",
+          "tags_to_monitor",
+          "jobs_num_threshold",
+          "alert_cooldown_seconds",
+          "alert_time_threshold_seconds"
+        ]
+      },
+      "Configs": {
+        "type": "object",
+        "nullable": true,
+        "properties": {
+          "alerts": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Alert"
+            }
+          }
+        }
+      },
       "Script": {
         "type": "object",
         "properties": {
@@ -16337,25 +21378,7 @@
             "type": "string"
           },
           "language": {
-            "type": "string",
-            "enum": [
-              "python3",
-              "deno",
-              "go",
-              "bash",
-              "powershell",
-              "postgresql",
-              "mysql",
-              "bigquery",
-              "snowflake",
-              "mssql",
-              "graphql",
-              "nativets",
-              "bun",
-              "php",
-              "rust",
-              "ansible"
-            ]
+            "$ref": "#/components/schemas/ScriptLang"
           },
           "kind": {
             "type": "string",
@@ -16364,7 +21387,8 @@
               "failure",
               "trigger",
               "command",
-              "approval"
+              "approval",
+              "preprocessor"
             ]
           },
           "starred": {
@@ -16426,6 +21450,9 @@
           },
           "has_preprocessor": {
             "type": "boolean"
+          },
+          "on_behalf_of_email": {
+            "type": "string"
           }
         },
         "required": [
@@ -16475,25 +21502,7 @@
             "type": "string"
           },
           "language": {
-            "type": "string",
-            "enum": [
-              "python3",
-              "deno",
-              "go",
-              "bash",
-              "powershell",
-              "postgresql",
-              "mysql",
-              "bigquery",
-              "snowflake",
-              "mssql",
-              "graphql",
-              "nativets",
-              "bun",
-              "php",
-              "rust",
-              "ansible"
-            ]
+            "$ref": "#/components/schemas/ScriptLang"
           },
           "kind": {
             "type": "string",
@@ -16502,7 +21511,8 @@
               "failure",
               "trigger",
               "command",
-              "approval"
+              "approval",
+              "preprocessor"
             ]
           },
           "tag": {
@@ -16561,6 +21571,9 @@
           },
           "has_preprocessor": {
             "type": "boolean"
+          },
+          "on_behalf_of_email": {
+            "type": "string"
           }
         },
         "required": [
@@ -16758,7 +21771,10 @@
               "script_hub",
               "identity",
               "deploymentcallback",
-              "singlescriptflow"
+              "singlescriptflow",
+              "flowscript",
+              "flownode",
+              "appscript"
             ]
           },
           "schedule_path": {
@@ -16766,7 +21782,7 @@
           },
           "permissioned_as": {
             "type": "string",
-            "description": "The user (u/userfoo) or group (g/groupfoo) whom \nthe execution of this script will be permissioned_as and by extension its DT_TOKEN.\n"
+            "description": "The user (u/userfoo) or group (g/groupfoo) whom\nthe execution of this script will be permissioned_as and by extension its DT_TOKEN.\n"
           },
           "flow_status": {
             "$ref": "#/components/schemas/FlowStatus"
@@ -16778,25 +21794,7 @@
             "type": "boolean"
           },
           "language": {
-            "type": "string",
-            "enum": [
-              "python3",
-              "deno",
-              "go",
-              "bash",
-              "powershell",
-              "postgresql",
-              "mysql",
-              "bigquery",
-              "snowflake",
-              "mssql",
-              "graphql",
-              "nativets",
-              "bun",
-              "php",
-              "rust",
-              "ansible"
-            ]
+            "$ref": "#/components/schemas/ScriptLang"
           },
           "email": {
             "type": "string"
@@ -16821,6 +21819,12 @@
           },
           "suspend": {
             "type": "number"
+          },
+          "preprocessed": {
+            "type": "boolean"
+          },
+          "worker": {
+            "type": "string"
           }
         },
         "required": [
@@ -16907,7 +21911,10 @@
               "script_hub",
               "identity",
               "deploymentcallback",
-              "singlescriptflow"
+              "singlescriptflow",
+              "flowscript",
+              "flownode",
+              "appscript"
             ]
           },
           "schedule_path": {
@@ -16915,7 +21922,7 @@
           },
           "permissioned_as": {
             "type": "string",
-            "description": "The user (u/userfoo) or group (g/groupfoo) whom \nthe execution of this script will be permissioned_as and by extension its DT_TOKEN.\n"
+            "description": "The user (u/userfoo) or group (g/groupfoo) whom\nthe execution of this script will be permissioned_as and by extension its DT_TOKEN.\n"
           },
           "flow_status": {
             "$ref": "#/components/schemas/FlowStatus"
@@ -16927,25 +21934,7 @@
             "type": "boolean"
           },
           "language": {
-            "type": "string",
-            "enum": [
-              "python3",
-              "deno",
-              "go",
-              "bash",
-              "powershell",
-              "postgresql",
-              "mysql",
-              "bigquery",
-              "snowflake",
-              "mssql",
-              "graphql",
-              "nativets",
-              "bun",
-              "php",
-              "rust",
-              "ansible"
-            ]
+            "$ref": "#/components/schemas/ScriptLang"
           },
           "is_skipped": {
             "type": "boolean"
@@ -16976,6 +21965,12 @@
           },
           "aggregate_wait_time_ms": {
             "type": "number"
+          },
+          "preprocessed": {
+            "type": "boolean"
+          },
+          "worker": {
+            "type": "string"
           }
         },
         "required": [
@@ -17065,6 +22060,9 @@
           "is_admin": {
             "type": "boolean"
           },
+          "name": {
+            "type": "string"
+          },
           "is_super_admin": {
             "type": "boolean"
           },
@@ -17670,6 +22668,31 @@
           "has_preprocessor"
         ]
       },
+      "ScriptLang": {
+        "type": "string",
+        "enum": [
+          "python3",
+          "deno",
+          "go",
+          "bash",
+          "powershell",
+          "postgresql",
+          "mysql",
+          "bigquery",
+          "snowflake",
+          "mssql",
+          "oracledb",
+          "graphql",
+          "nativets",
+          "bun",
+          "php",
+          "rust",
+          "ansible",
+          "csharp",
+          "nu",
+          "java"
+        ]
+      },
       "Preview": {
         "type": "object",
         "properties": {
@@ -17679,29 +22702,14 @@
           "path": {
             "type": "string"
           },
+          "script_hash": {
+            "type": "string"
+          },
           "args": {
             "$ref": "#/components/schemas/ScriptArgs"
           },
           "language": {
-            "type": "string",
-            "enum": [
-              "python3",
-              "deno",
-              "go",
-              "bash",
-              "powershell",
-              "postgresql",
-              "mysql",
-              "bigquery",
-              "snowflake",
-              "mssql",
-              "graphql",
-              "nativets",
-              "bun",
-              "php",
-              "rust",
-              "ansible"
-            ]
+            "$ref": "#/components/schemas/ScriptLang"
           },
           "tag": {
             "type": "string"
@@ -18004,6 +23012,9 @@
           "summary": {
             "type": "string"
           },
+          "description": {
+            "type": "string"
+          },
           "no_flow_overlap": {
             "type": "boolean"
           },
@@ -18013,6 +23024,9 @@
           "paused_until": {
             "type": "string",
             "format": "date-time"
+          },
+          "cron_version": {
+            "type": "string"
           }
         },
         "required": [
@@ -18125,12 +23139,18 @@
           "summary": {
             "type": "string"
           },
+          "description": {
+            "type": "string"
+          },
           "tag": {
             "type": "string"
           },
           "paused_until": {
             "type": "string",
             "format": "date-time"
+          },
+          "cron_version": {
+            "type": "string"
           }
         },
         "required": [
@@ -18193,12 +23213,18 @@
           "summary": {
             "type": "string"
           },
+          "description": {
+            "type": "string"
+          },
           "tag": {
             "type": "string"
           },
           "paused_until": {
             "type": "string",
             "format": "date-time"
+          },
+          "cron_version": {
+            "type": "string"
           }
         },
         "required": [
@@ -18209,12 +23235,27 @@
           "args"
         ]
       },
-      "HttpTrigger": {
+      "TriggerExtraProperty": {
         "type": "object",
         "properties": {
           "path": {
             "type": "string"
           },
+          "script_path": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          },
+          "extra_perms": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "boolean"
+            }
+          },
+          "workspace_id": {
+            "type": "string"
+          },
           "edited_by": {
             "type": "string"
           },
@@ -18222,9 +23263,40 @@
             "type": "string",
             "format": "date-time"
           },
-          "script_path": {
-            "type": "string"
-          },
+          "is_flow": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "path",
+          "script_path",
+          "email",
+          "extra_perms",
+          "workspace_id",
+          "edited_by",
+          "edited_at",
+          "is_flow"
+        ]
+      },
+      "AuthenticationMethod": {
+        "type": "string",
+        "enum": [
+          "none",
+          "windmill",
+          "api_key",
+          "basic_http",
+          "custom_script",
+          "signature"
+        ]
+      },
+      "HttpTrigger": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/TriggerExtraProperty"
+          }
+        ],
+        "type": "object",
+        "properties": {
           "route_path": {
             "type": "string"
           },
@@ -18245,21 +23317,6 @@
               "s3"
             ]
           },
-          "is_flow": {
-            "type": "boolean"
-          },
-          "extra_perms": {
-            "type": "object",
-            "additionalProperties": {
-              "type": "boolean"
-            }
-          },
-          "email": {
-            "type": "string"
-          },
-          "workspace_id": {
-            "type": "string"
-          },
           "http_method": {
             "type": "string",
             "enum": [
@@ -18270,26 +23327,37 @@
               "patch"
             ]
           },
+          "authentication_resource_path": {
+            "type": "string"
+          },
           "is_async": {
             "type": "boolean"
           },
-          "requires_auth": {
+          "authentication_method": {
+            "$ref": "#/components/schemas/AuthenticationMethod"
+          },
+          "is_static_website": {
+            "type": "boolean"
+          },
+          "workspaced_route": {
+            "type": "boolean"
+          },
+          "wrap_body": {
+            "type": "boolean"
+          },
+          "raw_string": {
             "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"
+          "authentication_method",
+          "http_method",
+          "is_static_website",
+          "workspaced_route",
+          "wrap_body",
+          "raw_string"
         ]
       },
       "NewHttpTrigger": {
@@ -18304,6 +23372,9 @@
           "route_path": {
             "type": "string"
           },
+          "workspaced_route": {
+            "type": "boolean"
+          },
           "static_asset_config": {
             "type": "object",
             "properties": {
@@ -18334,10 +23405,22 @@
               "patch"
             ]
           },
+          "authentication_resource_path": {
+            "type": "string"
+          },
           "is_async": {
             "type": "boolean"
           },
-          "requires_auth": {
+          "authentication_method": {
+            "$ref": "#/components/schemas/AuthenticationMethod"
+          },
+          "is_static_website": {
+            "type": "boolean"
+          },
+          "wrap_body": {
+            "type": "boolean"
+          },
+          "raw_string": {
             "type": "boolean"
           }
         },
@@ -18347,8 +23430,9 @@
           "route_path",
           "is_flow",
           "is_async",
-          "requires_auth",
-          "http_method"
+          "authentication_method",
+          "http_method",
+          "is_static_website"
         ]
       },
       "EditHttpTrigger": {
@@ -18363,6 +23447,9 @@
           "route_path": {
             "type": "string"
           },
+          "workspaced_route": {
+            "type": "boolean"
+          },
           "static_asset_config": {
             "type": "object",
             "properties": {
@@ -18380,6 +23467,9 @@
               "s3"
             ]
           },
+          "authentication_resource_path": {
+            "type": "string"
+          },
           "is_flow": {
             "type": "boolean"
           },
@@ -18396,7 +23486,16 @@
           "is_async": {
             "type": "boolean"
           },
-          "requires_auth": {
+          "authentication_method": {
+            "$ref": "#/components/schemas/AuthenticationMethod"
+          },
+          "is_static_website": {
+            "type": "boolean"
+          },
+          "wrap_body": {
+            "type": "boolean"
+          },
+          "raw_string": {
             "type": "boolean"
           }
         },
@@ -18406,8 +23505,9 @@
           "is_flow",
           "kind",
           "is_async",
-          "requires_auth",
-          "http_method"
+          "authentication_method",
+          "http_method",
+          "is_static_website"
         ]
       },
       "TriggersCount": {
@@ -18435,43 +23535,38 @@
           },
           "websocket_count": {
             "type": "number"
+          },
+          "postgres_count": {
+            "type": "number"
+          },
+          "kafka_count": {
+            "type": "number"
+          },
+          "nats_count": {
+            "type": "number"
+          },
+          "mqtt_count": {
+            "type": "number"
+          },
+          "gcp_count": {
+            "type": "number"
+          },
+          "sqs_count": {
+            "type": "number"
           }
         }
       },
       "WebsocketTrigger": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/TriggerExtraProperty"
+          }
+        ],
         "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"
           },
@@ -18509,22 +23604,16 @@
           },
           "url_runnable_args": {
             "$ref": "#/components/schemas/ScriptArgs"
+          },
+          "can_return_message": {
+            "type": "boolean"
           }
         },
         "required": [
-          "path",
-          "edited_by",
-          "edited_at",
-          "script_path",
           "url",
-          "extra_perms",
-          "is_flow",
-          "email",
-          "workspace_id",
           "enabled",
           "filters",
-          "initial_messages",
-          "url_runnable_args"
+          "can_return_message"
         ]
       },
       "NewWebsocketTrigger": {
@@ -18569,6 +23658,9 @@
           },
           "url_runnable_args": {
             "$ref": "#/components/schemas/ScriptArgs"
+          },
+          "can_return_message": {
+            "type": "boolean"
           }
         },
         "required": [
@@ -18577,8 +23669,7 @@
           "url",
           "is_flow",
           "filters",
-          "initial_messages",
-          "url_runnable_args"
+          "can_return_message"
         ]
       },
       "EditWebsocketTrigger": {
@@ -18620,6 +23711,9 @@
           },
           "url_runnable_args": {
             "$ref": "#/components/schemas/ScriptArgs"
+          },
+          "can_return_message": {
+            "type": "boolean"
           }
         },
         "required": [
@@ -18628,8 +23722,7 @@
           "url",
           "is_flow",
           "filters",
-          "initial_messages",
-          "url_runnable_args"
+          "can_return_message"
         ]
       },
       "WebsocketTriggerInitialMessage": {
@@ -18674,6 +23767,936 @@
           }
         ]
       },
+      "MqttQoS": {
+        "type": "string",
+        "enum": [
+          "qos0",
+          "qos1",
+          "qos2"
+        ]
+      },
+      "MqttV3Config": {
+        "type": "object",
+        "properties": {
+          "clean_session": {
+            "type": "boolean"
+          }
+        }
+      },
+      "MqttV5Config": {
+        "type": "object",
+        "properties": {
+          "clean_start": {
+            "type": "boolean"
+          },
+          "topic_alias": {
+            "type": "number"
+          },
+          "session_expiry_interval": {
+            "type": "number"
+          }
+        }
+      },
+      "MqttSubscribeTopic": {
+        "type": "object",
+        "properties": {
+          "qos": {
+            "$ref": "#/components/schemas/MqttQoS"
+          },
+          "topic": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "qos",
+          "topic"
+        ]
+      },
+      "MqttClientVersion": {
+        "type": "string",
+        "enum": [
+          "v3",
+          "v5"
+        ]
+      },
+      "MqttTrigger": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/TriggerExtraProperty"
+          }
+        ],
+        "type": "object",
+        "properties": {
+          "mqtt_resource_path": {
+            "type": "string"
+          },
+          "subscribe_topics": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MqttSubscribeTopic"
+            }
+          },
+          "v3_config": {
+            "$ref": "#/components/schemas/MqttV3Config"
+          },
+          "v5_config": {
+            "$ref": "#/components/schemas/MqttV5Config"
+          },
+          "client_id": {
+            "type": "string"
+          },
+          "client_version": {
+            "$ref": "#/components/schemas/MqttClientVersion"
+          },
+          "server_id": {
+            "type": "string"
+          },
+          "last_server_ping": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "error": {
+            "type": "string"
+          },
+          "enabled": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "enabled",
+          "subscribe_topics",
+          "mqtt_resource_path"
+        ]
+      },
+      "NewMqttTrigger": {
+        "type": "object",
+        "properties": {
+          "mqtt_resource_path": {
+            "type": "string"
+          },
+          "subscribe_topics": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MqttSubscribeTopic"
+            }
+          },
+          "client_id": {
+            "type": "string"
+          },
+          "v3_config": {
+            "$ref": "#/components/schemas/MqttV3Config"
+          },
+          "v5_config": {
+            "$ref": "#/components/schemas/MqttV5Config"
+          },
+          "client_version": {
+            "$ref": "#/components/schemas/MqttClientVersion"
+          },
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "enabled": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "path",
+          "script_path",
+          "is_flow",
+          "subscribe_topics",
+          "mqtt_resource_path"
+        ]
+      },
+      "EditMqttTrigger": {
+        "type": "object",
+        "properties": {
+          "mqtt_resource_path": {
+            "type": "string"
+          },
+          "subscribe_topics": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MqttSubscribeTopic"
+            }
+          },
+          "client_id": {
+            "type": "string"
+          },
+          "v3_config": {
+            "$ref": "#/components/schemas/MqttV3Config"
+          },
+          "v5_config": {
+            "$ref": "#/components/schemas/MqttV5Config"
+          },
+          "client_version": {
+            "$ref": "#/components/schemas/MqttClientVersion"
+          },
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "enabled": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "path",
+          "script_path",
+          "is_flow",
+          "enabled",
+          "subscribe_topics",
+          "mqtt_resource_path"
+        ]
+      },
+      "DeliveryType": {
+        "type": "string",
+        "enum": [
+          "push",
+          "pull"
+        ]
+      },
+      "PushConfig": {
+        "type": "object",
+        "properties": {
+          "audience": {
+            "type": "string"
+          },
+          "authenticate": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "authenticate",
+          "base_endpoint"
+        ]
+      },
+      "GcpTrigger": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/TriggerExtraProperty"
+          }
+        ],
+        "type": "object",
+        "properties": {
+          "gcp_resource_path": {
+            "type": "string"
+          },
+          "topic_id": {
+            "type": "string"
+          },
+          "subscription_id": {
+            "type": "string"
+          },
+          "server_id": {
+            "type": "string"
+          },
+          "delivery_type": {
+            "$ref": "#/components/schemas/DeliveryType"
+          },
+          "delivery_config": {
+            "$ref": "#/components/schemas/PushConfig"
+          },
+          "subscription_mode": {
+            "$ref": "#/components/schemas/SubscriptionMode"
+          },
+          "last_server_ping": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "error": {
+            "type": "string"
+          },
+          "enabled": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "gcp_resource_path",
+          "topic_id",
+          "subscription_id",
+          "enabled",
+          "delivery_type",
+          "subscription_mode"
+        ]
+      },
+      "SubscriptionMode": {
+        "type": "string",
+        "enum": [
+          "existing",
+          "create_update"
+        ],
+        "description": "The mode of subscription. 'existing' means using an existing GCP subscription, while 'create_update' involves creating or updating a new subscription."
+      },
+      "GcpTriggerData": {
+        "type": "object",
+        "properties": {
+          "gcp_resource_path": {
+            "type": "string"
+          },
+          "subscription_mode": {
+            "$ref": "#/components/schemas/SubscriptionMode"
+          },
+          "topic_id": {
+            "type": "string"
+          },
+          "subscription_id": {
+            "type": "string"
+          },
+          "base_endpoint": {
+            "type": "string"
+          },
+          "delivery_type": {
+            "$ref": "#/components/schemas/DeliveryType"
+          },
+          "delivery_config": {
+            "$ref": "#/components/schemas/PushConfig"
+          },
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "enabled": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "path",
+          "script_path",
+          "is_flow",
+          "gcp_resource_path",
+          "topic_id",
+          "subscription_mode"
+        ]
+      },
+      "GetAllTopicSubscription": {
+        "type": "object",
+        "properties": {
+          "topic_id": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "topic_id"
+        ]
+      },
+      "DeleteGcpSubscription": {
+        "type": "object",
+        "properties": {
+          "subscription_id": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "subscription_id"
+        ]
+      },
+      "AwsAuthResourceType": {
+        "type": "string",
+        "enum": [
+          "oidc",
+          "credentials"
+        ]
+      },
+      "SqsTrigger": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/TriggerExtraProperty"
+          }
+        ],
+        "type": "object",
+        "properties": {
+          "queue_url": {
+            "type": "string"
+          },
+          "aws_auth_resource_type": {
+            "$ref": "#/components/schemas/AwsAuthResourceType"
+          },
+          "aws_resource_path": {
+            "type": "string"
+          },
+          "message_attributes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "server_id": {
+            "type": "string"
+          },
+          "last_server_ping": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "error": {
+            "type": "string"
+          },
+          "enabled": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "queue_url",
+          "aws_resource_path",
+          "enabled",
+          "aws_auth_resource_type"
+        ]
+      },
+      "NewSqsTrigger": {
+        "type": "object",
+        "properties": {
+          "queue_url": {
+            "type": "string"
+          },
+          "aws_auth_resource_type": {
+            "$ref": "#/components/schemas/AwsAuthResourceType"
+          },
+          "aws_resource_path": {
+            "type": "string"
+          },
+          "message_attributes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "enabled": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "queue_url",
+          "aws_resource_path",
+          "path",
+          "script_path",
+          "is_flow",
+          "aws_auth_resource_type"
+        ]
+      },
+      "EditSqsTrigger": {
+        "type": "object",
+        "properties": {
+          "queue_url": {
+            "type": "string"
+          },
+          "aws_auth_resource_type": {
+            "$ref": "#/components/schemas/AwsAuthResourceType"
+          },
+          "aws_resource_path": {
+            "type": "string"
+          },
+          "message_attributes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "enabled": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "queue_url",
+          "aws_resource_path",
+          "path",
+          "script_path",
+          "is_flow",
+          "enabled",
+          "aws_auth_resource_type"
+        ]
+      },
+      "Slot": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "SlotList": {
+        "type": "object",
+        "properties": {
+          "slot_name": {
+            "type": "string"
+          },
+          "active": {
+            "type": "boolean"
+          }
+        }
+      },
+      "PublicationData": {
+        "type": "object",
+        "properties": {
+          "table_to_track": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Relations"
+            }
+          },
+          "transaction_to_track": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "transaction_to_track"
+        ]
+      },
+      "TableToTrack": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "table_name": {
+              "type": "string"
+            },
+            "columns_name": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "where_clause": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "table_name"
+          ]
+        }
+      },
+      "Relations": {
+        "type": "object",
+        "properties": {
+          "schema_name": {
+            "type": "string"
+          },
+          "table_to_track": {
+            "$ref": "#/components/schemas/TableToTrack"
+          }
+        },
+        "required": [
+          "schema_name",
+          "table_to_track"
+        ]
+      },
+      "Language": {
+        "type": "string",
+        "enum": [
+          "Typescript"
+        ]
+      },
+      "TemplateScript": {
+        "type": "object",
+        "properties": {
+          "postgres_resource_path": {
+            "type": "string"
+          },
+          "relations": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Relations"
+            }
+          },
+          "language": {
+            "$ref": "#/components/schemas/Language"
+          }
+        },
+        "required": [
+          "postgres_resource_path",
+          "relations",
+          "language"
+        ]
+      },
+      "PostgresTrigger": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/TriggerExtraProperty"
+          }
+        ],
+        "type": "object",
+        "properties": {
+          "enabled": {
+            "type": "boolean"
+          },
+          "postgres_resource_path": {
+            "type": "string"
+          },
+          "publication_name": {
+            "type": "string"
+          },
+          "server_id": {
+            "type": "string"
+          },
+          "replication_slot_name": {
+            "type": "string"
+          },
+          "error": {
+            "type": "string"
+          },
+          "last_server_ping": {
+            "type": "string",
+            "format": "date-time"
+          }
+        },
+        "required": [
+          "enabled",
+          "postgres_resource_path",
+          "replication_slot_name",
+          "publication_name"
+        ]
+      },
+      "NewPostgresTrigger": {
+        "type": "object",
+        "properties": {
+          "replication_slot_name": {
+            "type": "string"
+          },
+          "publication_name": {
+            "type": "string"
+          },
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "enabled": {
+            "type": "boolean"
+          },
+          "postgres_resource_path": {
+            "type": "string"
+          },
+          "publication": {
+            "$ref": "#/components/schemas/PublicationData"
+          }
+        },
+        "required": [
+          "path",
+          "script_path",
+          "is_flow",
+          "enabled",
+          "postgres_resource_path"
+        ]
+      },
+      "EditPostgresTrigger": {
+        "type": "object",
+        "properties": {
+          "replication_slot_name": {
+            "type": "string"
+          },
+          "publication_name": {
+            "type": "string"
+          },
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "enabled": {
+            "type": "boolean"
+          },
+          "postgres_resource_path": {
+            "type": "string"
+          },
+          "publication": {
+            "$ref": "#/components/schemas/PublicationData"
+          }
+        },
+        "required": [
+          "path",
+          "script_path",
+          "is_flow",
+          "enabled",
+          "postgres_resource_path",
+          "publication_name",
+          "replication_slot_name"
+        ]
+      },
+      "KafkaTrigger": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/TriggerExtraProperty"
+          }
+        ],
+        "type": "object",
+        "properties": {
+          "kafka_resource_path": {
+            "type": "string"
+          },
+          "group_id": {
+            "type": "string"
+          },
+          "topics": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "server_id": {
+            "type": "string"
+          },
+          "last_server_ping": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "error": {
+            "type": "string"
+          },
+          "enabled": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "kafka_resource_path",
+          "group_id",
+          "topics",
+          "enabled"
+        ]
+      },
+      "NewKafkaTrigger": {
+        "type": "object",
+        "properties": {
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "kafka_resource_path": {
+            "type": "string"
+          },
+          "group_id": {
+            "type": "string"
+          },
+          "topics": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "enabled": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "path",
+          "script_path",
+          "is_flow",
+          "kafka_resource_path",
+          "group_id",
+          "topics"
+        ]
+      },
+      "EditKafkaTrigger": {
+        "type": "object",
+        "properties": {
+          "kafka_resource_path": {
+            "type": "string"
+          },
+          "group_id": {
+            "type": "string"
+          },
+          "topics": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "path",
+          "script_path",
+          "kafka_resource_path",
+          "group_id",
+          "topics",
+          "is_flow"
+        ]
+      },
+      "NatsTrigger": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/TriggerExtraProperty"
+          }
+        ],
+        "type": "object",
+        "properties": {
+          "nats_resource_path": {
+            "type": "string"
+          },
+          "use_jetstream": {
+            "type": "boolean"
+          },
+          "stream_name": {
+            "type": "string"
+          },
+          "consumer_name": {
+            "type": "string"
+          },
+          "subjects": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "server_id": {
+            "type": "string"
+          },
+          "last_server_ping": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "error": {
+            "type": "string"
+          },
+          "enabled": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "nats_resource_path",
+          "use_jetstream",
+          "subjects",
+          "enabled"
+        ]
+      },
+      "NewNatsTrigger": {
+        "type": "object",
+        "properties": {
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "nats_resource_path": {
+            "type": "string"
+          },
+          "use_jetstream": {
+            "type": "boolean"
+          },
+          "stream_name": {
+            "type": "string"
+          },
+          "consumer_name": {
+            "type": "string"
+          },
+          "subjects": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "enabled": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "path",
+          "script_path",
+          "is_flow",
+          "nats_resource_path",
+          "use_jetstream",
+          "subjects"
+        ]
+      },
+      "EditNatsTrigger": {
+        "type": "object",
+        "properties": {
+          "nats_resource_path": {
+            "type": "string"
+          },
+          "use_jetstream": {
+            "type": "boolean"
+          },
+          "stream_name": {
+            "type": "string"
+          },
+          "consumer_name": {
+            "type": "string"
+          },
+          "subjects": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "path",
+          "script_path",
+          "nats_resource_path",
+          "use_jetstream",
+          "subjects",
+          "is_flow"
+        ]
+      },
       "Group": {
         "type": "object",
         "properties": {
@@ -18850,12 +24873,19 @@
                 },
                 "username": {
                   "type": "string"
+                },
+                "color": {
+                  "type": "string"
+                },
+                "operator_settings": {
+                  "$ref": "#/components/schemas/OperatorSettings"
                 }
               },
               "required": [
                 "id",
                 "name",
-                "username"
+                "username",
+                "color"
               ]
             }
           }
@@ -18876,6 +24906,9 @@
           },
           "username": {
             "type": "string"
+          },
+          "color": {
+            "type": "string"
           }
         },
         "required": [
@@ -18897,6 +24930,9 @@
           },
           "domain": {
             "type": "string"
+          },
+          "color": {
+            "type": "string"
           }
         },
         "required": [
@@ -18944,6 +24980,9 @@
           "super_admin": {
             "type": "boolean"
           },
+          "devops": {
+            "type": "boolean"
+          },
           "verified": {
             "type": "boolean"
           },
@@ -18974,6 +25013,14 @@
           },
           {
             "$ref": "#/components/schemas/FlowMetadata"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "lock_error_logs": {
+                "type": "string"
+              }
+            }
           }
         ]
       },
@@ -19028,6 +25075,9 @@
           },
           "visible_to_runner_only": {
             "type": "boolean"
+          },
+          "on_behalf_of_email": {
+            "type": "string"
           }
         },
         "required": [
@@ -19066,6 +25116,9 @@
               },
               "visible_to_runner_only": {
                 "type": "boolean"
+              },
+              "on_behalf_of_email": {
+                "type": "string"
               }
             },
             "required": [
@@ -19135,6 +25188,20 @@
               "type": "object"
             }
           },
+          "allowed_s3_keys": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "s3_path": {
+                  "type": "string"
+                },
+                "resource": {
+                  "type": "string"
+                }
+              }
+            }
+          },
           "execution_mode": {
             "type": "string",
             "enum": [
@@ -19189,6 +25256,9 @@
               "publisher",
               "anonymous"
             ]
+          },
+          "raw_app": {
+            "type": "boolean"
           }
         },
         "required": [
@@ -19287,6 +25357,9 @@
             "additionalProperties": {
               "type": "boolean"
             }
+          },
+          "custom_path": {
+            "type": "string"
           }
         },
         "required": [
@@ -19404,16 +25477,13 @@
         ]
       },
       "HubScriptKind": {
-        "name": "kind",
-        "schema": {
-          "type": "string",
-          "enum": [
-            "script",
-            "failure",
-            "trigger",
-            "approval"
-          ]
-        }
+        "type": "string",
+        "enum": [
+          "script",
+          "failure",
+          "trigger",
+          "approval"
+        ]
       },
       "PolarsClientKwargs": {
         "type": "object",
@@ -19588,7 +25658,8 @@
                 "resourcetype",
                 "schedule",
                 "user",
-                "group"
+                "group",
+                "trigger"
               ]
             }
           },
@@ -19619,7 +25690,8 @@
                 "app",
                 "resource",
                 "variable",
-                "secret"
+                "secret",
+                "trigger"
               ]
             }
           }
@@ -19677,7 +25749,8 @@
                 "resourcetype",
                 "schedule",
                 "user",
-                "group"
+                "group",
+                "trigger"
               ]
             }
           }
@@ -19775,25 +25848,7 @@
             "type": "string"
           },
           "language": {
-            "type": "string",
-            "enum": [
-              "python3",
-              "deno",
-              "go",
-              "bash",
-              "powershell",
-              "postgresql",
-              "mysql",
-              "bigquery",
-              "snowflake",
-              "mssql",
-              "graphql",
-              "nativets",
-              "bun",
-              "php",
-              "rust",
-              "ansible"
-            ]
+            "$ref": "#/components/schemas/ScriptLang"
           }
         },
         "required": [
@@ -20000,6 +26055,286 @@
             "type": "boolean",
             "nullable": true,
             "description": "Acknowledgment status of the alert, can be true, false, or null if not set"
+          },
+          "workspace_id": {
+            "type": "string",
+            "nullable": true,
+            "description": "Workspace id if the alert is in the scope of a workspace"
+          }
+        }
+      },
+      "CaptureTriggerKind": {
+        "type": "string",
+        "enum": [
+          "webhook",
+          "http",
+          "websocket",
+          "kafka",
+          "email",
+          "nats",
+          "postgres",
+          "sqs",
+          "mqtt",
+          "gcp"
+        ]
+      },
+      "Capture": {
+        "type": "object",
+        "properties": {
+          "trigger_kind": {
+            "$ref": "#/components/schemas/CaptureTriggerKind"
+          },
+          "main_args": {},
+          "preprocessor_args": {},
+          "id": {
+            "type": "integer"
+          },
+          "created_at": {
+            "type": "string",
+            "format": "date-time"
+          }
+        },
+        "required": [
+          "trigger_kind",
+          "main_args",
+          "preprocessor_args",
+          "id",
+          "created_at"
+        ]
+      },
+      "CaptureConfig": {
+        "type": "object",
+        "properties": {
+          "trigger_config": {},
+          "trigger_kind": {
+            "$ref": "#/components/schemas/CaptureTriggerKind"
+          },
+          "error": {
+            "type": "string"
+          },
+          "last_server_ping": {
+            "type": "string",
+            "format": "date-time"
+          }
+        },
+        "required": [
+          "trigger_kind"
+        ]
+      },
+      "OperatorSettings": {
+        "nullable": true,
+        "type": "object",
+        "required": [
+          "runs",
+          "schedules",
+          "resources",
+          "variables",
+          "triggers",
+          "audit_logs",
+          "groups",
+          "folders",
+          "workers"
+        ],
+        "properties": {
+          "runs": {
+            "type": "boolean",
+            "description": "Whether operators can view runs"
+          },
+          "schedules": {
+            "type": "boolean",
+            "description": "Whether operators can view schedules"
+          },
+          "resources": {
+            "type": "boolean",
+            "description": "Whether operators can view resources"
+          },
+          "variables": {
+            "type": "boolean",
+            "description": "Whether operators can view variables"
+          },
+          "audit_logs": {
+            "type": "boolean",
+            "description": "Whether operators can view audit logs"
+          },
+          "triggers": {
+            "type": "boolean",
+            "description": "Whether operators can view triggers"
+          },
+          "groups": {
+            "type": "boolean",
+            "description": "Whether operators can view groups page"
+          },
+          "folders": {
+            "type": "boolean",
+            "description": "Whether operators can view folders page"
+          },
+          "workers": {
+            "type": "boolean",
+            "description": "Whether operators can view workers page"
+          }
+        }
+      },
+      "TeamInfo": {
+        "type": "object",
+        "required": [
+          "team_id",
+          "team_name",
+          "channels"
+        ],
+        "properties": {
+          "team_id": {
+            "type": "string",
+            "description": "The unique identifier of the Microsoft Teams team",
+            "example": "19:abc123def456@thread.tacv2"
+          },
+          "team_name": {
+            "type": "string",
+            "description": "The display name of the Microsoft Teams team",
+            "example": "Engineering Team"
+          },
+          "channels": {
+            "type": "array",
+            "description": "List of channels within the team",
+            "items": {
+              "$ref": "#/components/schemas/ChannelInfo"
+            }
+          }
+        }
+      },
+      "ChannelInfo": {
+        "type": "object",
+        "required": [
+          "channel_id",
+          "channel_name",
+          "tenant_id",
+          "service_url"
+        ],
+        "properties": {
+          "channel_id": {
+            "type": "string",
+            "description": "The unique identifier of the channel",
+            "example": "19:channel123@thread.tacv2"
+          },
+          "channel_name": {
+            "type": "string",
+            "description": "The display name of the channel",
+            "example": "General"
+          },
+          "tenant_id": {
+            "type": "string",
+            "description": "The Microsoft Teams tenant identifier",
+            "example": "12345678-1234-1234-1234-123456789012"
+          },
+          "service_url": {
+            "type": "string",
+            "description": "The service URL for the channel",
+            "example": "https://smba.trafficmanager.net/amer/12345678-1234-1234-1234-123456789012/"
+          }
+        }
+      },
+      "GithubInstallations": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "workspace_id": {
+              "type": "string"
+            },
+            "installation_id": {
+              "type": "number"
+            },
+            "account_id": {
+              "type": "string"
+            },
+            "repositories": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "type": "string"
+                  },
+                  "url": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "name",
+                  "url"
+                ]
+              }
+            }
+          },
+          "required": [
+            "installation_id",
+            "account_id",
+            "repositories"
+          ]
+        }
+      },
+      "WorkspaceGithubInstallation": {
+        "type": "object",
+        "properties": {
+          "account_id": {
+            "type": "string"
+          },
+          "installation_id": {
+            "type": "number"
+          }
+        },
+        "required": [
+          "account_id",
+          "installation_id"
+        ]
+      },
+      "S3Object": {
+        "type": "object",
+        "properties": {
+          "s3": {
+            "type": "string"
+          },
+          "filename": {
+            "type": "string"
+          },
+          "storage": {
+            "type": "string"
+          },
+          "presigned": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "s3"
+        ]
+      },
+      "TeamsChannel": {
+        "type": "object",
+        "required": [
+          "team_id",
+          "team_name",
+          "channel_id",
+          "channel_name"
+        ],
+        "properties": {
+          "team_id": {
+            "type": "string",
+            "description": "Microsoft Teams team ID",
+            "minLength": 1
+          },
+          "team_name": {
+            "type": "string",
+            "description": "Microsoft Teams team name",
+            "minLength": 1
+          },
+          "channel_id": {
+            "type": "string",
+            "description": "Microsoft Teams channel ID",
+            "minLength": 1
+          },
+          "channel_name": {
+            "type": "string",
+            "description": "Microsoft Teams channel name",
+            "minLength": 1
           }
         }
       },
@@ -20037,7 +26372,7 @@
           "type"
         ]
       },
-      "InputTransform": {
+      "schemas-InputTransform": {
         "oneOf": [
           {
             "$ref": "#/components/schemas/StaticTransform"
@@ -20060,7 +26395,7 @@
           "input_transforms": {
             "type": "object",
             "additionalProperties": {
-              "$ref": "#/components/schemas/InputTransform"
+              "$ref": "#/components/schemas/schemas-InputTransform"
             }
           },
           "content": {
@@ -20080,6 +26415,7 @@
               "bigquery",
               "snowflake",
               "mssql",
+              "oracledb",
               "graphql",
               "nativets",
               "php"
@@ -20126,7 +26462,7 @@
           "input_transforms": {
             "type": "object",
             "additionalProperties": {
-              "$ref": "#/components/schemas/InputTransform"
+              "$ref": "#/components/schemas/schemas-InputTransform"
             }
           },
           "path": {
@@ -20160,7 +26496,7 @@
           "input_transforms": {
             "type": "object",
             "additionalProperties": {
-              "$ref": "#/components/schemas/InputTransform"
+              "$ref": "#/components/schemas/schemas-InputTransform"
             }
           },
           "path": {
@@ -20189,32 +26525,10 @@
             "$ref": "#/components/schemas/FlowModuleValue"
           },
           "stop_after_if": {
-            "type": "object",
-            "properties": {
-              "skip_if_stopped": {
-                "type": "boolean"
-              },
-              "expr": {
-                "type": "string"
-              }
-            },
-            "required": [
-              "expr"
-            ]
+            "$ref": "#/components/schemas/StopAfterIf"
           },
           "stop_after_all_iters_if": {
-            "type": "object",
-            "properties": {
-              "skip_if_stopped": {
-                "type": "boolean"
-              },
-              "expr": {
-                "type": "string"
-              }
-            },
-            "required": [
-              "expr"
-            ]
+            "$ref": "#/components/schemas/StopAfterIf"
           },
           "skip_if": {
             "type": "object",
@@ -20228,7 +26542,7 @@
             ]
           },
           "sleep": {
-            "$ref": "#/components/schemas/InputTransform"
+            "$ref": "#/components/schemas/schemas-InputTransform"
           },
           "cache_ttl": {
             "type": "number"
@@ -20272,7 +26586,7 @@
                 "type": "boolean"
               },
               "user_groups_required": {
-                "$ref": "#/components/schemas/InputTransform"
+                "$ref": "#/components/schemas/schemas-InputTransform"
               },
               "self_approval_disabled": {
                 "type": "boolean"
@@ -20310,7 +26624,7 @@
             }
           },
           "iterator": {
-            "$ref": "#/components/schemas/InputTransform"
+            "$ref": "#/components/schemas/schemas-InputTransform"
           },
           "skip_failures": {
             "type": "boolean"
@@ -20515,6 +26829,23 @@
           }
         }
       },
+      "StopAfterIf": {
+        "type": "object",
+        "properties": {
+          "skip_if_stopped": {
+            "type": "boolean"
+          },
+          "expr": {
+            "type": "string"
+          },
+          "error_message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "expr"
+        ]
+      },
       "Retry": {
         "type": "object",
         "properties": {
diff --git a/backend/windmill-api/openapi-deref.yaml b/backend/windmill-api/openapi-deref.yaml
index c8893f824c..4c13a9c7f8 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.423.2
+  version: 1.492.1
   title: Windmill API
   contact:
     name: Windmill Team
@@ -87,7 +87,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: &ref_30
+          schema: &ref_34
             type: integer
       responses:
         '200':
@@ -233,24 +233,24 @@ paths:
         - name: before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: &ref_120
+          schema: &ref_183
             type: string
             format: date-time
         - name: after
           description: filter on created after (exclusive) timestamp
           in: query
-          schema: &ref_121
+          schema: &ref_184
             type: string
             format: date-time
         - name: username
           description: filter on exact username of user
           in: query
-          schema: &ref_130
+          schema: &ref_189
             type: string
         - name: operation
           description: filter on exact or prefix name of operation
           in: query
-          schema: &ref_131
+          schema: &ref_190
             type: string
         - name: operations
           in: query
@@ -265,18 +265,23 @@ paths:
         - name: resource
           description: filter on exact or prefix name of resource
           in: query
-          schema: &ref_132
+          schema: &ref_191
             type: string
         - name: action_kind
           description: filter on type of operation
           in: query
-          schema: &ref_133
+          schema: &ref_192
             type: string
             enum:
               - Create
               - Update
               - Delete
               - Execute
+        - name: all_workspaces
+          in: query
+          description: get audit logs for all workspaces
+          schema:
+            type: boolean
       responses:
         '200':
           description: a list of audit logs
@@ -302,12 +307,12 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_145
+              properties: &ref_210
                 email:
                   type: string
                 password:
                   type: string
-              required: &ref_146
+              required: &ref_211
                 - email
                 - password
       responses:
@@ -375,6 +380,8 @@ paths:
                     type: string
                   is_admin:
                     type: boolean
+                  name:
+                    type: string
                   is_super_admin:
                     type: boolean
                   created_at:
@@ -430,7 +437,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_147
+              properties: &ref_212
                 is_admin:
                   type: boolean
                 operator:
@@ -458,7 +465,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: &ref_23
+          schema: &ref_26
             type: string
       responses:
         '200':
@@ -611,6 +618,8 @@ paths:
               properties:
                 is_super_admin:
                   type: boolean
+                is_devops:
+                  type: boolean
                 name:
                   type: string
       responses:
@@ -792,6 +801,44 @@ paths:
             text/plain:
               schema:
                 type: string
+  /github_app/connected_repositories:
+    get:
+      summary: get connected repositories
+      operationId: getGlobalConnectedRepositories
+      tags:
+        - git_sync
+      responses:
+        '200':
+          description: connected repositories
+          content:
+            application/json:
+              schema:
+                type: array
+                items: &ref_331
+                  type: object
+                  properties:
+                    workspace_id:
+                      type: string
+                    installation_id:
+                      type: number
+                    account_id:
+                      type: string
+                    repositories:
+                      type: array
+                      items:
+                        type: object
+                        properties:
+                          name:
+                            type: string
+                          url:
+                            type: string
+                        required:
+                          - name
+                          - url
+                  required:
+                    - installation_id
+                    - account_id
+                    - repositories
   /workspaces/list:
     get:
       summary: list all workspaces visible to me
@@ -816,6 +863,8 @@ paths:
                       type: string
                     domain:
                       type: string
+                    color:
+                      type: string
                   required: &ref_8
                     - id
                     - name
@@ -846,7 +895,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_185
+                properties: &ref_280
                   email:
                     type: string
                   workspaces:
@@ -860,11 +909,55 @@ paths:
                           type: string
                         username:
                           type: string
+                        color:
+                          type: string
+                        operator_settings:
+                          nullable: true
+                          type: object
+                          required: &ref_12
+                            - runs
+                            - schedules
+                            - resources
+                            - variables
+                            - triggers
+                            - audit_logs
+                            - groups
+                            - folders
+                            - workers
+                          properties: &ref_13
+                            runs:
+                              type: boolean
+                              description: Whether operators can view runs
+                            schedules:
+                              type: boolean
+                              description: Whether operators can view schedules
+                            resources:
+                              type: boolean
+                              description: Whether operators can view resources
+                            variables:
+                              type: boolean
+                              description: Whether operators can view variables
+                            audit_logs:
+                              type: boolean
+                              description: Whether operators can view audit logs
+                            triggers:
+                              type: boolean
+                              description: Whether operators can view triggers
+                            groups:
+                              type: boolean
+                              description: Whether operators can view groups page
+                            folders:
+                              type: boolean
+                              description: Whether operators can view folders page
+                            workers:
+                              type: boolean
+                              description: Whether operators can view workers page
                       required:
                         - id
                         - name
                         - username
-                required: &ref_186
+                        - color
+                required: &ref_281
                   - email
                   - workspaces
   /workspaces/list_as_superadmin:
@@ -906,14 +999,16 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_187
+              properties: &ref_282
                 id:
                   type: string
                 name:
                   type: string
                 username:
                   type: string
-              required: &ref_188
+                color:
+                  type: string
+              required: &ref_283
                 - id
                 - name
       responses:
@@ -1143,29 +1238,46 @@ paths:
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  type: object
-                  properties: &ref_230
-                    id:
-                      type: integer
-                      description: Unique identifier for the alert
-                    alert_type:
-                      type: string
-                      description: Type of alert (e.g., critical_error)
-                    message:
-                      type: string
-                      description: The message content of the alert
-                    created_at:
-                      type: string
-                      format: date-time
-                      description: Time when the alert was created
-                    acknowledged:
-                      type: boolean
-                      nullable: true
-                      description: >-
-                        Acknowledgment status of the alert, can be true, false,
-                        or null if not set
+                type: object
+                properties:
+                  alerts:
+                    type: array
+                    items:
+                      type: object
+                      properties: &ref_29
+                        id:
+                          type: integer
+                          description: Unique identifier for the alert
+                        alert_type:
+                          type: string
+                          description: Type of alert (e.g., critical_error)
+                        message:
+                          type: string
+                          description: The message content of the alert
+                        created_at:
+                          type: string
+                          format: date-time
+                          description: Time when the alert was created
+                        acknowledged:
+                          type: boolean
+                          nullable: true
+                          description: >-
+                            Acknowledgment status of the alert, can be true,
+                            false, or null if not set
+                        workspace_id:
+                          type: string
+                          nullable: true
+                          description: >-
+                            Workspace id if the alert is in the scope of a
+                            workspace
+                  total_rows:
+                    type: integer
+                    description: Total number of rows matching the query.
+                    example: 100
+                  total_pages:
+                    type: integer
+                    description: Total number of pages based on the page size.
+                    example: 10
   /settings/critical_alerts/{id}/acknowledge:
     post:
       summary: Acknowledge a critical alert
@@ -1356,12 +1468,12 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_223
+                  properties: &ref_318
                     name:
                       type: string
                     value:
                       type: object
-                  required: &ref_224
+                  required: &ref_319
                     - name
                     - value
   /users/email:
@@ -1383,9 +1495,15 @@ paths:
       operationId: refreshUserToken
       tags:
         - user
+      parameters:
+        - name: if_expiring_in_less_than_s
+          in: query
+          required: false
+          schema:
+            type: integer
       responses:
         '200':
-          description: free usage
+          description: new token
           content:
             text/plain:
               schema:
@@ -1502,7 +1620,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_12
+                properties: &ref_14
                   email:
                     type: string
                   login_type:
@@ -1512,6 +1630,8 @@ paths:
                       - github
                   super_admin:
                     type: boolean
+                  devops:
+                    type: boolean
                   verified:
                     type: boolean
                   name:
@@ -1522,7 +1642,7 @@ paths:
                     type: string
                   operator_only:
                     type: boolean
-                required: &ref_13
+                required: &ref_15
                   - email
                   - login_type
                   - super_admin
@@ -1542,7 +1662,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_14
+                  properties: &ref_16
                     workspace_id:
                       type: string
                     email:
@@ -1551,7 +1671,7 @@ paths:
                       type: boolean
                     operator:
                       type: boolean
-                  required: &ref_15
+                  required: &ref_17
                     - workspace_id
                     - email
                     - is_admin
@@ -1576,6 +1696,154 @@ paths:
                 type: object
                 properties: *ref_10
                 required: *ref_11
+  /w/{workspace}/github_app/token:
+    post:
+      summary: get github app token
+      operationId: getGithubAppToken
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: jwt job token
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                job_token:
+                  type: string
+              required:
+                - job_token
+      responses:
+        '200':
+          description: github app token
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  token:
+                    type: string
+                required:
+                  - token
+  /w/{workspace}/github_app/install_from_workspace:
+    post:
+      tags:
+        - Git Sync
+      summary: Install a GitHub installation from another workspace
+      operationId: installFromWorkspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                source_workspace_id:
+                  type: string
+                  description: The ID of the workspace containing the installation to copy
+                installation_id:
+                  type: number
+                  description: The ID of the GitHub installation to copy
+              required:
+                - source_workspace_id
+                - installation_id
+      responses:
+        '200':
+          description: Installation successfully copied
+  /w/{workspace}/github_app/installation/{installation_id}:
+    delete:
+      summary: Delete a GitHub installation from a workspace
+      operationId: deleteFromWorkspace
+      description: >-
+        Removes a GitHub installation from the specified workspace. Requires
+        admin privileges.
+      tags:
+        - Git Sync
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: installation_id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+          description: The ID of the GitHub installation to delete
+      responses:
+        '200':
+          description: Installation successfully deleted
+  /w/{workspace}/github_app/export/{installationId}:
+    get:
+      summary: Export GitHub installation JWT token
+      description: >-
+        Exports the JWT token for a specific GitHub installation in the
+        workspace
+      operationId: exportInstallation
+      tags:
+        - Git Sync
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: installationId
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Successfully exported the JWT token
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  jwt_token:
+                    type: string
+  /w/{workspace}/github_app/import:
+    post:
+      summary: Import GitHub installation from JWT token
+      description: >-
+        Imports a GitHub installation from a JWT token exported from another
+        instance
+      operationId: importInstallation
+      tags:
+        - Git Sync
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - jwt_token
+              properties:
+                jwt_token:
+                  type: string
+      responses:
+        '200':
+          description: Successfully imported the installation
   /users/accept_invite:
     post:
       summary: accept invite to workspace
@@ -1886,6 +2154,32 @@ paths:
             text/plain:
               schema:
                 type: string
+  /w/{workspace}/workspaces/change_workspace_color:
+    post:
+      summary: change workspace id
+      operationId: changeWorkspaceColor
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                color:
+                  type: string
+      responses:
+        '200':
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
   /w/{workspace}/users/whois/{username}:
     get:
       summary: whois
@@ -1911,6 +2205,36 @@ paths:
                 type: object
                 properties: *ref_10
                 required: *ref_11
+  /w/{workspace}/workspaces/operator_settings:
+    post:
+      operationId: updateOperatorSettings
+      summary: Update operator settings for a workspace
+      description: >-
+        Updates the operator settings for a specific workspace. Requires
+        workspace admin privileges.
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              nullable: true
+              type: object
+              required: *ref_12
+              properties: *ref_13
+      responses:
+        '200':
+          description: Operator settings updated successfully
+          content:
+            text/plain:
+              schema:
+                type: string
   /users/exists/{email}:
     get:
       summary: exists email
@@ -1959,8 +2283,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_12
-                  required: *ref_13
+                  properties: *ref_14
+                  required: *ref_15
   /w/{workspace}/workspaces/list_pending_invites:
     get:
       summary: list pending invites for a workspace
@@ -1981,8 +2305,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_14
-                  required: *ref_15
+                  properties: *ref_16
+                  required: *ref_17
   /w/{workspace}/workspaces/get_settings:
     get:
       summary: get settings
@@ -2010,6 +2334,12 @@ paths:
                     type: string
                   slack_command_script:
                     type: string
+                  teams_team_id:
+                    type: string
+                  teams_command_script:
+                    type: string
+                  teams_team_name:
+                    type: string
                   auto_invite_domain:
                     type: string
                   auto_invite_operator:
@@ -2018,36 +2348,64 @@ paths:
                     type: boolean
                   plan:
                     type: string
-                  automatic_billing:
-                    type: boolean
                   customer_id:
                     type: string
                   webhook:
                     type: string
                   deploy_to:
                     type: string
-                  ai_resource:
+                  ai_config:
                     type: object
-                    properties: &ref_16
-                      path:
-                        type: string
-                      provider:
-                        type: string
-                    required: &ref_17
-                      - path
-                      - provider
-                  code_completion_enabled:
-                    type: boolean
+                    properties: &ref_20
+                      providers:
+                        type: object
+                        additionalProperties:
+                          type: object
+                          properties: &ref_197
+                            resource_path:
+                              type: string
+                            models:
+                              type: array
+                              items:
+                                type: string
+                          required: &ref_198
+                            - resource_path
+                            - models
+                      default_model:
+                        type: object
+                        properties: &ref_18
+                          model:
+                            type: string
+                          provider:
+                            type: string
+                            enum: &ref_196
+                              - openai
+                              - azure_openai
+                              - anthropic
+                              - mistral
+                              - deepseek
+                              - googleai
+                              - groq
+                              - openrouter
+                              - togetherai
+                              - customai
+                        required: &ref_19
+                          - model
+                          - provider
+                      code_completion_model:
+                        type: object
+                        properties: *ref_18
+                        required: *ref_19
                   error_handler:
                     type: string
                   error_handler_extra_args:
                     type: object
-                    additionalProperties: &ref_18 {}
+                    additionalProperties: &ref_21 {}
                   error_handler_muted_on_cancel:
                     type: boolean
                   large_file_storage:
                     type: object
-                    properties: &ref_19
+                    properties: &ref_22
                       type:
                         type: string
                         enum:
@@ -2081,7 +2439,7 @@ paths:
                               type: boolean
                   git_sync:
                     type: object
-                    properties: &ref_20
+                    properties: &ref_23
                       include_path:
                         type: array
                         items:
@@ -2102,11 +2460,12 @@ paths:
                             - schedule
                             - user
                             - group
+                            - trigger
                       repositories:
                         type: array
                         items:
                           type: object
-                          properties: &ref_207
+                          properties: &ref_302
                             script_path:
                               type: string
                             git_repo_resource_path:
@@ -2131,12 +2490,13 @@ paths:
                                   - schedule
                                   - user
                                   - group
-                          required: &ref_208
+                                  - trigger
+                          required: &ref_303
                             - script_path
                             - git_repo_resource_path
                   deploy_ui:
                     type: object
-                    properties: &ref_21
+                    properties: &ref_24
                       include_path:
                         type: array
                         items:
@@ -2152,11 +2512,12 @@ paths:
                             - resource
                             - variable
                             - secret
+                            - trigger
                   default_app:
                     type: string
                   default_scripts:
                     type: object
-                    properties: &ref_22
+                    properties: &ref_25
                       order:
                         type: array
                         items:
@@ -2168,9 +2529,16 @@ paths:
                       default_script_content:
                         additionalProperties:
                           type: string
+                  mute_critical_alerts:
+                    type: boolean
+                  color:
+                    type: string
+                  operator_settings:
+                    nullable: true
+                    type: object
+                    required: *ref_12
+                    properties: *ref_13
                 required:
-                  - code_completion_enabled
-                  - automatic_billing
                   - error_handler_muted_on_cancel
   /w/{workspace}/workspaces/get_deploy_to:
     get:
@@ -2234,17 +2602,40 @@ paths:
                     type: boolean
                   usage:
                     type: number
-                  seats:
-                    type: number
-                  automatic_billing:
-                    type: boolean
+                  owner:
+                    type: string
+                  status:
+                    type: string
                 required:
                   - premium
-                  - automatic_billing
-  /w/{workspace}/workspaces/set_automatic_billing:
+                  - owner
+  /w/{workspace}/workspaces/threshold_alert:
+    get:
+      summary: get threshold alert info
+      operationId: getThresholdAlert
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      responses:
+        '200':
+          description: status
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  threshold_alert_amount:
+                    type: number
+                  last_alert_sent:
+                    type: string
+                    format: date-time
     post:
-      summary: set automatic billing
-      operationId: setAutomaticBilling
+      summary: set threshold alert info
+      operationId: setThresholdAlert
       tags:
         - workspace
       parameters:
@@ -2253,19 +2644,15 @@ paths:
           required: true
           schema: *ref_0
       requestBody:
-        description: automatic billing
+        description: threshold alert info
         required: true
         content:
           application/json:
             schema:
               type: object
               properties:
-                automatic_billing:
-                  type: boolean
-                seats:
+                threshold_alert_amount:
                   type: number
-              required:
-                - automatic_billing
       responses:
         '200':
           description: status
@@ -2301,6 +2688,118 @@ paths:
             text/plain:
               schema:
                 type: string
+  /w/{workspace}/workspaces/edit_teams_command:
+    post:
+      summary: edit teams command
+      operationId: editTeamsCommand
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: WorkspaceInvite
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                slack_command_script:
+                  type: string
+      responses:
+        '200':
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/workspaces/available_teams_ids:
+    get:
+      summary: list available teams ids
+      operationId: listAvailableTeamsIds
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      responses:
+        '200':
+          description: status
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    team_name:
+                      type: string
+                    team_id:
+                      type: string
+  /w/{workspace}/workspaces/available_teams_channels:
+    get:
+      summary: list available teams channels
+      operationId: listAvailableTeamsChannels
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      responses:
+        '200':
+          description: status
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    channel_name:
+                      type: string
+                    channel_id:
+                      type: string
+                    service_url:
+                      type: string
+                    tenant_id:
+                      type: string
+  /w/{workspace}/workspaces/connect_teams:
+    post:
+      summary: connect teams
+      operationId: connectTeams
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: connect teams
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                team_id:
+                  type: string
+                team_name:
+                  type: string
+      responses:
+        '200':
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
   /w/{workspace}/workspaces/run_slack_message_test_job:
     post:
       summary: run a job that sends a message to Slack
@@ -2336,6 +2835,41 @@ paths:
                 properties:
                   job_uuid:
                     type: string
+  /w/{workspace}/workspaces/run_teams_message_test_job:
+    post:
+      summary: run a job that sends a message to Teams
+      operationId: runTeamsMessageTestJob
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: path to hub script to run and its corresponding args
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                hub_script_path:
+                  type: string
+                channel:
+                  type: string
+                test_msg:
+                  type: string
+      responses:
+        '200':
+          description: status
+          content:
+            text/json:
+              schema:
+                type: object
+                properties:
+                  job_uuid:
+                    type: string
   /w/{workspace}/workspaces/edit_deploy_to:
     post:
       summary: edit deploy to
@@ -2441,15 +2975,7 @@ paths:
           application/json:
             schema:
               type: object
-              required:
-                - code_completion_enabled
-              properties:
-                ai_resource:
-                  type: object
-                  properties: *ref_16
-                  required: *ref_17
-                code_completion_enabled:
-                  type: boolean
+              properties: *ref_20
       responses:
         '200':
           description: status
@@ -2472,20 +2998,10 @@ paths:
         '200':
           description: status
           content:
-            text/plain:
+            application/json:
               schema:
                 type: object
-                properties:
-                  ai_provider:
-                    type: string
-                  exists_ai_resource:
-                    type: boolean
-                  code_completion_enabled:
-                    type: boolean
-                required:
-                  - ai_provider
-                  - exists_ai_resource
-                  - code_completion_enabled
+                properties: *ref_20
   /w/{workspace}/workspaces/edit_error_handler:
     post:
       summary: edit error handler
@@ -2509,7 +3025,7 @@ paths:
                   type: string
                 error_handler_extra_args:
                   type: object
-                  additionalProperties: *ref_18
+                  additionalProperties: *ref_21
                 error_handler_muted_on_cancel:
                   type: boolean
       responses:
@@ -2540,7 +3056,7 @@ paths:
               properties:
                 large_file_storage:
                   type: object
-                  properties: *ref_19
+                  properties: *ref_22
       responses:
         '200':
           description: status
@@ -2568,7 +3084,7 @@ paths:
               properties:
                 git_sync_settings:
                   type: object
-                  properties: *ref_20
+                  properties: *ref_23
       responses:
         '200':
           description: status
@@ -2596,7 +3112,7 @@ paths:
               properties:
                 deploy_ui_settings:
                   type: object
-                  properties: *ref_21
+                  properties: *ref_24
       responses:
         '200':
           description: status
@@ -2648,7 +3164,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: *ref_22
+              properties: *ref_25
       responses:
         '200':
           description: status
@@ -2673,7 +3189,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_22
+                properties: *ref_25
   /w/{workspace}/workspaces/set_environment_variable:
     post:
       summary: set environment variable
@@ -2799,7 +3315,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_19
+                properties: *ref_22
   /w/{workspace}/workspaces/usage:
     get:
       summary: get usage
@@ -2841,9 +3357,27 @@ paths:
                     type: boolean
                   websocket_used:
                     type: boolean
+                  kafka_used:
+                    type: boolean
+                  nats_used:
+                    type: boolean
+                  postgres_used:
+                    type: boolean
+                  mqtt_used:
+                    type: boolean
+                  gcp_used:
+                    type: boolean
+                  sqs_used:
+                    type: boolean
                 required:
                   - http_routes_used
                   - websocket_used
+                  - kafka_used
+                  - nats_used
+                  - postgres_used
+                  - mqtt_used
+                  - gcp_used
+                  - sqs_used
   /w/{workspace}/users/list:
     get:
       summary: list users
@@ -2886,7 +3420,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_144
+                  properties: &ref_209
                     email:
                       type: string
                     executions:
@@ -2947,7 +3481,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_148
+              properties: &ref_213
                 label:
                   type: string
                 expiration:
@@ -2979,7 +3513,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_149
+              properties: &ref_214
                 label:
                   type: string
                 expiration:
@@ -2989,7 +3523,7 @@ paths:
                   type: string
                 workspace_id:
                   type: string
-              required: &ref_150
+              required: &ref_215
                 - impersonate_email
       responses:
         '201':
@@ -3045,7 +3579,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_40
+                  properties: &ref_47
                     label:
                       type: string
                     expiration:
@@ -3065,7 +3599,7 @@ paths:
                         type: string
                     email:
                       type: string
-                  required: &ref_41
+                  required: &ref_48
                     - token_prefix
                     - created_at
                     - last_used_at
@@ -3114,7 +3648,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_153
+              properties: &ref_218
                 path:
                   type: string
                 value:
@@ -3130,7 +3664,7 @@ paths:
                 expires_at:
                   type: string
                   format: date-time
-              required: &ref_154
+              required: &ref_219
                 - path
                 - value
                 - is_secret
@@ -3181,7 +3715,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: variable deleted
@@ -3203,7 +3737,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
         - name: already_encrypted
           in: query
           schema:
@@ -3215,7 +3749,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_155
+              properties: &ref_220
                 path:
                   type: string
                 value:
@@ -3245,7 +3779,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
         - name: decrypt_secret
           description: |
             ask to decrypt secret if this variable is secret
@@ -3267,7 +3801,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_24
+                properties: &ref_27
                   workspace_id:
                     type: string
                   path:
@@ -3297,7 +3831,7 @@ paths:
                   expires_at:
                     type: string
                     format: date-time
-                required: &ref_25
+                required: &ref_28
                   - workspace_id
                   - path
                   - is_secret
@@ -3316,7 +3850,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: variable
@@ -3338,7 +3872,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: variable
@@ -3378,8 +3912,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_24
-                  required: *ref_25
+                  properties: *ref_27
+                  required: *ref_28
   /w/{workspace}/variables/list_contextual:
     get:
       summary: list contextual variables
@@ -3400,7 +3934,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_151
+                  properties: &ref_216
                     name:
                       type: string
                     value:
@@ -3409,11 +3943,141 @@ paths:
                       type: string
                     is_custom:
                       type: boolean
-                  required: &ref_152
+                  required: &ref_217
                     - name
                     - value
                     - description
                     - is_custom
+  /w/{workspace}/workspaces/critical_alerts:
+    get:
+      summary: Get all critical alerts for this workspace
+      operationId: workspaceGetCriticalAlerts
+      tags:
+        - setting
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - in: query
+          name: page
+          schema:
+            type: integer
+            default: 1
+            description: The page number to retrieve (minimum value is 1)
+        - in: query
+          name: page_size
+          schema:
+            type: integer
+            default: 10
+            maximum: 100
+            description: Number of alerts per page (maximum is 100)
+        - in: query
+          name: acknowledged
+          schema:
+            type: boolean
+            nullable: true
+            description: >-
+              Filter by acknowledgment status; true for acknowledged, false for
+              unacknowledged, and omit for all alerts
+      responses:
+        '200':
+          description: Successfully retrieved all critical alerts
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  alerts:
+                    type: array
+                    items:
+                      type: object
+                      properties: *ref_29
+                  total_rows:
+                    type: integer
+                    description: Total number of rows matching the query.
+                    example: 100
+                  total_pages:
+                    type: integer
+                    description: Total number of pages based on the page size.
+                    example: 10
+  /w/{workspace}/workspaces/critical_alerts/{id}/acknowledge:
+    post:
+      summary: Acknowledge a critical alert for this workspace
+      operationId: workspaceAcknowledgeCriticalAlert
+      tags:
+        - setting
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: integer
+          description: The ID of the critical alert to acknowledge
+      responses:
+        '200':
+          description: Successfully acknowledged the critical alert
+          content:
+            application/json:
+              schema:
+                type: string
+                example: Critical alert acknowledged
+  /w/{workspace}/workspaces/critical_alerts/acknowledge_all:
+    post:
+      summary: Acknowledge all unacknowledged critical alerts for this workspace
+      operationId: workspaceAcknowledgeAllCriticalAlerts
+      tags:
+        - setting
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      responses:
+        '200':
+          description: Successfully acknowledged all unacknowledged critical alerts.
+          content:
+            application/json:
+              schema:
+                type: string
+                example: All unacknowledged critical alerts acknowledged
+  /w/{workspace}/workspaces/critical_alerts/mute:
+    post:
+      summary: Mute critical alert UI for this workspace
+      operationId: workspaceMuteCriticalAlertsUI
+      tags:
+        - setting
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: Boolean flag to mute critical alerts.
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                mute_critical_alerts:
+                  type: boolean
+                  description: Whether critical alerts should be muted.
+                  example: true
+      responses:
+        '200':
+          description: Successfully updated mute critical alert settings.
+          content:
+            application/json:
+              schema:
+                type: string
+                example: >-
+                  Updated mute critical alert UI settings for workspace:
+                  workspace_id
   /oauth/login_callback/{client_name}:
     post:
       security: []
@@ -3425,7 +4089,7 @@ paths:
         - name: client_name
           in: path
           required: true
-          schema: &ref_26
+          schema: &ref_30
             type: string
       requestBody:
         description: Partially filled script
@@ -3526,7 +4190,7 @@ paths:
         - name: client_name
           in: path
           required: true
-          schema: *ref_26
+          schema: *ref_30
       requestBody:
         description: code endpoint
         required: true
@@ -3549,7 +4213,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_200
+                properties: &ref_295
                   access_token:
                     type: string
                   expires_in:
@@ -3560,7 +4224,7 @@ paths:
                     type: array
                     items:
                       type: string
-                required: &ref_201
+                required: &ref_296
                   - access_token
   /w/{workspace}/oauth/create_account:
     post:
@@ -3611,7 +4275,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: &ref_27
+          schema: &ref_31
             type: integer
       requestBody:
         description: variable path
@@ -3646,7 +4310,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_27
+          schema: *ref_31
       responses:
         '200':
           description: disconnected client
@@ -3672,6 +4336,24 @@ paths:
             text/plain:
               schema:
                 type: string
+  /w/{workspace}/oauth/disconnect_teams:
+    post:
+      summary: disconnect teams
+      operationId: disconnectTeams
+      tags:
+        - oauth
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      responses:
+        '200':
+          description: disconnected teams
+          content:
+            text/plain:
+              schema:
+                type: string
   /oauth/list_logins:
     get:
       summary: list oauth logins
@@ -3743,6 +4425,95 @@ paths:
                     type: array
                     items:
                       type: string
+  /teams/sync:
+    post:
+      operationId: syncTeams
+      summary: synchronize Microsoft Teams information (teams/channels)
+      tags:
+        - teams
+      responses:
+        '200':
+          description: Teams information successfully synchronized
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  required: &ref_327
+                    - team_id
+                    - team_name
+                    - channels
+                  properties: &ref_328
+                    team_id:
+                      type: string
+                      description: The unique identifier of the Microsoft Teams team
+                      example: 19:abc123def456@thread.tacv2
+                    team_name:
+                      type: string
+                      description: The display name of the Microsoft Teams team
+                      example: Engineering Team
+                    channels:
+                      type: array
+                      description: List of channels within the team
+                      items:
+                        type: object
+                        required: &ref_329
+                          - channel_id
+                          - channel_name
+                          - tenant_id
+                          - service_url
+                        properties: &ref_330
+                          channel_id:
+                            type: string
+                            description: The unique identifier of the channel
+                            example: 19:channel123@thread.tacv2
+                          channel_name:
+                            type: string
+                            description: The display name of the channel
+                            example: General
+                          tenant_id:
+                            type: string
+                            description: The Microsoft Teams tenant identifier
+                            example: 12345678-1234-1234-1234-123456789012
+                          service_url:
+                            type: string
+                            description: The service URL for the channel
+                            example: >-
+                              https://smba.trafficmanager.net/amer/12345678-1234-1234-1234-123456789012/
+  /teams/activities:
+    post:
+      summary: send update to Microsoft Teams activity
+      description: Respond to a Microsoft Teams activity after a workspace command is run
+      operationId: sendMessageToConversation
+      tags:
+        - teams
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - conversation_id
+                - text
+              properties:
+                conversation_id:
+                  type: string
+                  description: The ID of the Teams conversation/activity
+                success:
+                  type: boolean
+                  description: Used for styling the card conditionally
+                  default: true
+                text:
+                  type: string
+                  description: The message text to be sent in the Teams card
+                card_block:
+                  type: object
+                  description: The card block to be sent in the Teams card
+      responses:
+        '200':
+          description: Activity processed successfully
   /w/{workspace}/resources/create:
     post:
       summary: create resource
@@ -3765,7 +4536,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_162
+              properties: &ref_227
                 path:
                   type: string
                 value: {}
@@ -3773,7 +4544,7 @@ paths:
                   type: string
                 resource_type:
                   type: string
-              required: &ref_163
+              required: &ref_228
                 - path
                 - value
                 - resource_type
@@ -3798,7 +4569,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: resource deleted
@@ -3820,7 +4591,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       requestBody:
         description: updated resource
         required: true
@@ -3828,7 +4599,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_164
+              properties: &ref_229
                 path:
                   type: string
                 description:
@@ -3855,7 +4626,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       requestBody:
         description: updated resource
         required: true
@@ -3886,7 +4657,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: resource
@@ -3894,7 +4665,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_165
+                properties: &ref_230
                   workspace_id:
                     type: string
                   path:
@@ -3915,7 +4686,7 @@ paths:
                   edited_at:
                     type: string
                     format: date-time
-                required: &ref_166
+                required: &ref_231
                   - path
                   - resource_type
                   - is_oauth
@@ -3933,7 +4704,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
         - name: job_id
           description: job id
           in: query
@@ -3960,7 +4731,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: resource value
@@ -3981,7 +4752,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: does resource exists
@@ -4031,7 +4802,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_167
+                  properties: &ref_232
                     workspace_id:
                       type: string
                     path:
@@ -4062,7 +4833,7 @@ paths:
                     edited_at:
                       type: string
                       format: date-time
-                  required: &ref_168
+                  required: &ref_233
                     - path
                     - resource_type
                     - is_oauth
@@ -4109,7 +4880,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: &ref_103
+          schema: &ref_163
             type: string
       responses:
         '200':
@@ -4146,7 +4917,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_28
+              properties: &ref_32
                 workspace_id:
                   type: string
                 name:
@@ -4161,7 +4932,7 @@ paths:
                   format: date-time
                 format_extension:
                   type: string
-              required: &ref_29
+              required: &ref_33
                 - name
       responses:
         '201':
@@ -4201,7 +4972,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: resource_type deleted
@@ -4223,7 +4994,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       requestBody:
         description: updated resource_type
         required: true
@@ -4231,7 +5002,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_169
+              properties: &ref_234
                 schema: {}
                 description:
                   type: string
@@ -4256,7 +5027,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: resource_type deleted
@@ -4264,8 +5035,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_28
-                required: *ref_29
+                properties: *ref_32
+                required: *ref_33
   /w/{workspace}/resources/type/exists/{path}:
     get:
       summary: does resource_type exists
@@ -4280,7 +5051,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: does resource_type exist
@@ -4308,8 +5079,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_28
-                  required: *ref_29
+                  properties: *ref_32
+                  required: *ref_33
   /w/{workspace}/resources/type/listnames:
     get:
       summary: list resource_types names
@@ -4448,7 +5219,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_30
+          schema: *ref_34
       responses:
         '200':
           description: flow
@@ -4459,51 +5230,51 @@ paths:
                 properties:
                   flow:
                     type: object
-                    properties: &ref_54
+                    properties: &ref_61
                       summary:
                         type: string
                       description:
                         type: string
                       value:
                         type: object
-                        properties: &ref_66
+                        properties: &ref_78
                           modules:
                             type: array
                             items:
                               type: object
-                              properties: &ref_33
+                              properties: &ref_37
                                 id:
                                   type: string
                                 value:
-                                  oneOf: &ref_251
+                                  oneOf: &ref_352
                                     - type: object
-                                      properties: &ref_235
+                                      properties: &ref_336
                                         input_transforms:
                                           type: object
                                           additionalProperties:
-                                            oneOf: &ref_31
+                                            oneOf: &ref_35
                                               - type: object
-                                                properties: &ref_231
+                                                properties: &ref_332
                                                   value: {}
                                                   type:
                                                     type: string
                                                     enum:
                                                       - javascript
-                                                required: &ref_232
+                                                required: &ref_333
                                                   - expr
                                                   - type
                                               - type: object
-                                                properties: &ref_233
+                                                properties: &ref_334
                                                   expr:
                                                     type: string
                                                   type:
                                                     type: string
                                                     enum:
                                                       - javascript
-                                                required: &ref_234
+                                                required: &ref_335
                                                   - expr
                                                   - type
-                                            discriminator: &ref_32
+                                            discriminator: &ref_36
                                               propertyName: type
                                               mapping:
                                                 static: '#/components/schemas/StaticTransform'
@@ -4524,6 +5295,7 @@ paths:
                                             - bigquery
                                             - snowflake
                                             - mssql
+                                            - oracledb
                                             - graphql
                                             - nativets
                                             - php
@@ -4545,18 +5317,18 @@ paths:
                                           type: string
                                         is_trigger:
                                           type: boolean
-                                      required: &ref_236
+                                      required: &ref_337
                                         - type
                                         - content
                                         - language
                                         - input_transforms
                                     - type: object
-                                      properties: &ref_237
+                                      properties: &ref_338
                                         input_transforms:
                                           type: object
                                           additionalProperties:
-                                            oneOf: *ref_31
-                                            discriminator: *ref_32
+                                            oneOf: *ref_35
+                                            discriminator: *ref_36
                                         path:
                                           type: string
                                         hash:
@@ -4569,40 +5341,40 @@ paths:
                                           type: string
                                         is_trigger:
                                           type: boolean
-                                      required: &ref_238
+                                      required: &ref_339
                                         - type
                                         - path
                                         - input_transforms
                                     - type: object
-                                      properties: &ref_239
+                                      properties: &ref_340
                                         input_transforms:
                                           type: object
                                           additionalProperties:
-                                            oneOf: *ref_31
-                                            discriminator: *ref_32
+                                            oneOf: *ref_35
+                                            discriminator: *ref_36
                                         path:
                                           type: string
                                         type:
                                           type: string
                                           enum:
                                             - flow
-                                      required: &ref_240
+                                      required: &ref_341
                                         - type
                                         - path
                                         - input_transforms
                                     - type: object
-                                      properties: &ref_241
+                                      properties: &ref_342
                                         modules:
                                           type: array
                                           items:
                                             type: object
-                                            properties: *ref_33
-                                            required: &ref_34
+                                            properties: *ref_37
+                                            required: &ref_38
                                               - value
                                               - id
                                         iterator:
-                                          oneOf: *ref_31
-                                          discriminator: *ref_32
+                                          oneOf: *ref_35
+                                          discriminator: *ref_36
                                         skip_failures:
                                           type: boolean
                                         type:
@@ -4613,19 +5385,19 @@ paths:
                                           type: boolean
                                         parallelism:
                                           type: integer
-                                      required: &ref_242
+                                      required: &ref_343
                                         - modules
                                         - iterator
                                         - skip_failures
                                         - type
                                     - type: object
-                                      properties: &ref_243
+                                      properties: &ref_344
                                         modules:
                                           type: array
                                           items:
                                             type: object
-                                            properties: *ref_33
-                                            required: *ref_34
+                                            properties: *ref_37
+                                            required: *ref_38
                                         skip_failures:
                                           type: boolean
                                         type:
@@ -4636,12 +5408,12 @@ paths:
                                           type: boolean
                                         parallelism:
                                           type: integer
-                                      required: &ref_244
+                                      required: &ref_345
                                         - modules
                                         - skip_failures
                                         - type
                                     - type: object
-                                      properties: &ref_245
+                                      properties: &ref_346
                                         branches:
                                           type: array
                                           items:
@@ -4655,8 +5427,8 @@ paths:
                                                 type: array
                                                 items:
                                                   type: object
-                                                  properties: *ref_33
-                                                  required: *ref_34
+                                                  properties: *ref_37
+                                                  required: *ref_38
                                             required:
                                               - modules
                                               - expr
@@ -4664,20 +5436,20 @@ paths:
                                           type: array
                                           items:
                                             type: object
-                                            properties: *ref_33
-                                            required: *ref_34
+                                            properties: *ref_37
+                                            required: *ref_38
                                           required:
                                             - modules
                                         type:
                                           type: string
                                           enum:
                                             - branchone
-                                      required: &ref_246
+                                      required: &ref_347
                                         - branches
                                         - default
                                         - type
                                     - type: object
-                                      properties: &ref_247
+                                      properties: &ref_348
                                         branches:
                                           type: array
                                           items:
@@ -4691,8 +5463,8 @@ paths:
                                                 type: array
                                                 items:
                                                   type: object
-                                                  properties: *ref_33
-                                                  required: *ref_34
+                                                  properties: *ref_37
+                                                  required: *ref_38
                                             required:
                                               - modules
                                               - expr
@@ -4702,20 +5474,20 @@ paths:
                                             - branchall
                                         parallel:
                                           type: boolean
-                                      required: &ref_248
+                                      required: &ref_349
                                         - branches
                                         - type
                                     - type: object
-                                      properties: &ref_249
+                                      properties: &ref_350
                                         type:
                                           type: string
                                           enum:
                                             - identity
                                         flow:
                                           type: boolean
-                                      required: &ref_250
+                                      required: &ref_351
                                         - type
-                                  discriminator: &ref_252
+                                  discriminator: &ref_353
                                     propertyName: type
                                     mapping:
                                       rawscript: '#/components/schemas/RawScript'
@@ -4728,22 +5500,19 @@ paths:
                                       identity: '#/components/schemas/Identity'
                                 stop_after_if:
                                   type: object
-                                  properties:
+                                  properties: &ref_39
                                     skip_if_stopped:
                                       type: boolean
                                     expr:
                                       type: string
-                                  required:
+                                    error_message:
+                                      type: string
+                                  required: &ref_40
                                     - expr
                                 stop_after_all_iters_if:
                                   type: object
-                                  properties:
-                                    skip_if_stopped:
-                                      type: boolean
-                                    expr:
-                                      type: string
-                                  required:
-                                    - expr
+                                  properties: *ref_39
+                                  required: *ref_40
                                 skip_if:
                                   type: object
                                   properties:
@@ -4752,8 +5521,8 @@ paths:
                                   required:
                                     - expr
                                 sleep:
-                                  oneOf: *ref_31
-                                  discriminator: *ref_32
+                                  oneOf: *ref_35
+                                  discriminator: *ref_36
                                 cache_ttl:
                                   type: number
                                 timeout:
@@ -4783,8 +5552,8 @@ paths:
                                     user_auth_required:
                                       type: boolean
                                     user_groups_required:
-                                      oneOf: *ref_31
-                                      discriminator: *ref_32
+                                      oneOf: *ref_35
+                                      discriminator: *ref_36
                                     self_approval_disabled:
                                       type: boolean
                                     hide_cancel:
@@ -4797,7 +5566,7 @@ paths:
                                   type: boolean
                                 retry:
                                   type: object
-                                  properties: &ref_95
+                                  properties: &ref_114
                                     constant:
                                       type: object
                                       properties:
@@ -4818,15 +5587,15 @@ paths:
                                           type: integer
                                           minimum: 0
                                           maximum: 100
-                              required: *ref_34
+                              required: *ref_38
                           failure_module:
                             type: object
-                            properties: *ref_33
-                            required: *ref_34
+                            properties: *ref_37
+                            required: *ref_38
                           preprocessor_module:
                             type: object
-                            properties: *ref_33
-                            required: *ref_34
+                            properties: *ref_37
+                            required: *ref_38
                           same_worker:
                             type: boolean
                           concurrent_limit:
@@ -4843,11 +5612,11 @@ paths:
                             type: number
                           early_return:
                             type: string
-                        required: &ref_67
+                        required: &ref_79
                           - modules
                       schema:
                         type: object
-                    required: &ref_55
+                    required: &ref_62
                       - summary
                       - value
   /apps/hub/list:
@@ -4900,7 +5669,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_30
+          schema: *ref_34
       responses:
         '200':
           description: app
@@ -4920,6 +5689,108 @@ paths:
                       - value
                 required:
                   - app
+  /apps_u/public_app_by_custom_path/{custom_path}:
+    get:
+      summary: get public app by custom path
+      operationId: getPublicAppByCustomPath
+      tags:
+        - app
+      parameters:
+        - name: custom_path
+          in: path
+          required: true
+          schema: &ref_74
+            type: string
+      responses:
+        '200':
+          description: app details
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - type: object
+                    properties: &ref_69
+                      id:
+                        type: integer
+                      workspace_id:
+                        type: string
+                      path:
+                        type: string
+                      summary:
+                        type: string
+                      versions:
+                        type: array
+                        items:
+                          type: integer
+                      created_by:
+                        type: string
+                      created_at:
+                        type: string
+                        format: date-time
+                      value:
+                        type: object
+                      policy:
+                        type: object
+                        properties: &ref_68
+                          triggerables:
+                            type: object
+                            additionalProperties:
+                              type: object
+                          triggerables_v2:
+                            type: object
+                            additionalProperties:
+                              type: object
+                          s3_inputs:
+                            type: array
+                            items:
+                              type: object
+                          allowed_s3_keys:
+                            type: array
+                            items:
+                              type: object
+                              properties:
+                                s3_path:
+                                  type: string
+                                resource:
+                                  type: string
+                          execution_mode:
+                            type: string
+                            enum:
+                              - viewer
+                              - publisher
+                              - anonymous
+                          on_behalf_of:
+                            type: string
+                          on_behalf_of_email:
+                            type: string
+                      execution_mode:
+                        type: string
+                        enum:
+                          - viewer
+                          - publisher
+                          - anonymous
+                      extra_perms:
+                        type: object
+                        additionalProperties:
+                          type: boolean
+                      custom_path:
+                        type: string
+                    required: &ref_70
+                      - id
+                      - workspace_id
+                      - path
+                      - summary
+                      - versions
+                      - created_by
+                      - created_at
+                      - value
+                      - policy
+                      - execution_mode
+                      - extra_perms
+                  - type: object
+                    properties:
+                      workspace_id:
+                        type: string
   /scripts/hub/get/{path}:
     get:
       summary: get hub script content by path
@@ -4930,7 +5801,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: &ref_35
+          schema: &ref_41
             type: string
       responses:
         '200':
@@ -4949,7 +5820,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: script details
@@ -5019,14 +5890,12 @@ paths:
                         version_id:
                           type: number
                         kind:
-                          name: kind
-                          schema: &ref_36
-                            type: string
-                            enum:
-                              - script
-                              - failure
-                              - trigger
-                              - approval
+                          type: string
+                          enum: &ref_42
+                            - script
+                            - failure
+                            - trigger
+                            - approval
                         votes:
                           type: number
                         views:
@@ -5092,8 +5961,8 @@ paths:
                     app:
                       type: string
                     kind:
-                      name: kind
-                      schema: *ref_36
+                      type: string
+                      enum: *ref_42
                     score:
                       type: number
                   required:
@@ -5154,12 +6023,12 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: &ref_52
+          schema: &ref_59
             type: boolean
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: &ref_53
+          schema: &ref_60
             type: string
         - name: path_start
           description: mask to filter matching starting path
@@ -5178,8 +6047,7 @@ paths:
             type: string
         - name: last_parent_hash
           description: >
-            mask to filter scripts whom last parent in the chain has exact
-            hash. 
+            mask to filter scripts whom last parent in the chain has exact hash.
 
             Beware that each script stores only a limited number of parents.
             Hence
@@ -5214,7 +6082,7 @@ paths:
             when multiple archived hash share the same path, only the ones with
             the latest create_at
 
-            are 
+            are
 
             ed.
           in: query
@@ -5273,7 +6141,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_37
+                  properties: &ref_44
                     workspace_id:
                       type: string
                     hash:
@@ -5316,7 +6184,7 @@ paths:
                       type: string
                     language:
                       type: string
-                      enum:
+                      enum: &ref_43
                         - python3
                         - deno
                         - go
@@ -5327,12 +6195,16 @@ paths:
                         - bigquery
                         - snowflake
                         - mssql
+                        - oracledb
                         - graphql
                         - nativets
                         - bun
                         - php
                         - rust
                         - ansible
+                        - csharp
+                        - nu
+                        - java
                     kind:
                       type: string
                       enum:
@@ -5341,6 +6213,7 @@ paths:
                         - trigger
                         - command
                         - approval
+                        - preprocessor
                     starred:
                       type: boolean
                     tag:
@@ -5381,7 +6254,9 @@ paths:
                       type: string
                     has_preprocessor:
                       type: boolean
-                  required: &ref_38
+                    on_behalf_of_email:
+                      type: string
+                  required: &ref_45
                     - hash
                     - path
                     - summary
@@ -5479,7 +6354,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: draft deleted
@@ -5505,7 +6380,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_42
+              properties: &ref_49
                 path:
                   type: string
                 parent_hash:
@@ -5524,23 +6399,7 @@ paths:
                   type: string
                 language:
                   type: string
-                  enum:
-                    - python3
-                    - deno
-                    - go
-                    - bash
-                    - powershell
-                    - postgresql
-                    - mysql
-                    - bigquery
-                    - snowflake
-                    - mssql
-                    - graphql
-                    - nativets
-                    - bun
-                    - php
-                    - rust
-                    - ansible
+                  enum: *ref_43
                 kind:
                   type: string
                   enum:
@@ -5549,6 +6408,7 @@ paths:
                     - trigger
                     - command
                     - approval
+                    - preprocessor
                 tag:
                   type: string
                 draft_only:
@@ -5587,7 +6447,9 @@ paths:
                   type: string
                 has_preprocessor:
                   type: boolean
-              required: &ref_43
+                on_behalf_of_email:
+                  type: string
+              required: &ref_50
                 - path
                 - summary
                 - description
@@ -5614,7 +6476,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       requestBody:
         description: Workspace error handler enabled
         required: true
@@ -5640,6 +6502,17 @@ paths:
       operationId: getCustomTags
       tags:
         - worker
+      parameters:
+        - name: workspace
+          in: query
+          schema:
+            type: string
+          required: false
+        - name: show_workspace_restriction
+          in: query
+          schema:
+            type: boolean
+          required: false
       responses:
         '200':
           description: list of custom tags
@@ -5691,7 +6564,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: script archived
@@ -5713,7 +6586,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: &ref_39
+          schema: &ref_46
             type: string
       responses:
         '200':
@@ -5722,8 +6595,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_37
-                required: *ref_38
+                properties: *ref_44
+                required: *ref_45
   /w/{workspace}/scripts/delete/h/{hash}:
     post:
       summary: delete script by hash (erase content but keep hash, require admin)
@@ -5738,7 +6611,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_39
+          schema: *ref_46
       responses:
         '200':
           description: script details
@@ -5746,11 +6619,11 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_37
-                required: *ref_38
+                properties: *ref_44
+                required: *ref_45
   /w/{workspace}/scripts/delete/p/{path}:
     post:
-      summary: delete all scripts at a given path (require admin)
+      summary: delete script at a given path (require admin)
       operationId: deleteScriptByPath
       tags:
         - script
@@ -5762,7 +6635,12 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
+        - name: keep_captures
+          description: keep captures
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: script path
@@ -5784,7 +6662,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
         - name: with_starred_info
           in: query
           schema:
@@ -5796,8 +6674,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_37
-                required: *ref_38
+                properties: *ref_44
+                required: *ref_45
   /w/{workspace}/scripts/get_triggers_count/{path}:
     get:
       summary: get triggers count of script
@@ -5812,7 +6690,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: triggers count
@@ -5820,7 +6698,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_59
+                properties: &ref_66
                   primary_schedule:
                     type: object
                     properties:
@@ -5836,6 +6714,18 @@ paths:
                     type: number
                   websocket_count:
                     type: number
+                  postgres_count:
+                    type: number
+                  kafka_count:
+                    type: number
+                  nats_count:
+                    type: number
+                  mqtt_count:
+                    type: number
+                  gcp_count:
+                    type: number
+                  sqs_count:
+                    type: number
   /w/{workspace}/scripts/list_tokens/{path}:
     get:
       summary: get tokens with script scope
@@ -5850,7 +6740,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: tokens list
@@ -5860,8 +6750,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_40
-                  required: *ref_41
+                  properties: *ref_47
+                  required: *ref_48
   /w/{workspace}/scripts/get/draft/{path}:
     get:
       summary: get script by path with draft
@@ -5876,23 +6766,23 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: script details
           content:
             application/json:
               schema:
-                allOf: &ref_137
+                allOf: &ref_202
                   - type: object
-                    properties: *ref_42
-                    required: *ref_43
+                    properties: *ref_49
+                    required: *ref_50
                   - type: object
                     properties:
                       draft:
                         type: object
-                        properties: *ref_42
-                        required: *ref_43
+                        properties: *ref_49
+                        required: *ref_50
                       hash:
                         type: string
                     required:
@@ -5911,7 +6801,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: script history
@@ -5921,13 +6811,37 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_44
+                  properties: &ref_51
                     script_hash:
                       type: string
                     deployment_msg:
                       type: string
-                  required: &ref_45
+                  required: &ref_52
                     - script_hash
+  /w/{workspace}/scripts/list_paths_from_workspace_runnable/{path}:
+    get:
+      summary: list script paths using provided script as a relative import
+      operationId: listScriptPathsFromWorkspaceRunnable
+      tags:
+        - script
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_41
+      responses:
+        '200':
+          description: list of script paths
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
   /w/{workspace}/scripts/get_latest_version/{path}:
     get:
       summary: get scripts's latest version (hash)
@@ -5940,7 +6854,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       tags:
         - script
       responses:
@@ -5948,11 +6862,10 @@ paths:
           description: Script version/hash
           content:
             application/json:
-              required: false
               schema:
                 type: object
-                properties: *ref_44
-                required: *ref_45
+                properties: *ref_51
+                required: *ref_52
   /w/{workspace}/scripts/history_update/h/{hash}/p/{path}:
     post:
       summary: update history of a script
@@ -5967,11 +6880,11 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_39
+          schema: *ref_46
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       requestBody:
         description: Script deployment message
         required: true
@@ -6003,7 +6916,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: script content
@@ -6027,12 +6940,12 @@ paths:
         - name: token
           in: path
           required: true
-          schema: &ref_126
+          schema: &ref_187
             type: string
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: script content
@@ -6054,7 +6967,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: does it exists
@@ -6076,7 +6989,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_39
+          schema: *ref_46
         - name: with_starred_info
           in: query
           schema:
@@ -6088,8 +7001,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_37
-                required: *ref_38
+                properties: *ref_44
+                required: *ref_45
   /w/{workspace}/scripts/raw/h/{path}:
     get:
       summary: raw script by hash
@@ -6104,7 +7017,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: script content
@@ -6126,7 +7039,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_39
+          schema: *ref_46
       responses:
         '200':
           description: script details
@@ -6139,6 +7052,68 @@ paths:
                     type: string
                   lock_error_logs:
                     type: string
+  /w/{workspace}/jobs/list_selected_job_groups:
+    post:
+      summary: list selected jobs script/flow schemas grouped by (kind, path)
+      operationId: listSelectedJobGroups
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: script args
+        required: true
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                type: string
+                format: uuid
+      responses:
+        '200':
+          description: result
+          content:
+            text/plain:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    kind:
+                      type: string
+                      enum:
+                        - script
+                        - flow
+                    script_path:
+                      type: string
+                    latest_schema:
+                      type: object
+                    schemas:
+                      type: array
+                      items:
+                        type: object
+                        properties:
+                          schema:
+                            type: object
+                          script_hash:
+                            type: string
+                          job_ids:
+                            type: array
+                            items:
+                              type: string
+                        required:
+                          - schema
+                          - script_hash
+                          - job_ids
+                  required:
+                    - kind
+                    - script_path
+                    - latest_schema
+                    - schemas
   /w/{workspace}/jobs/run/p/{path}:
     post:
       summary: run script by path
@@ -6153,7 +7128,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
         - name: scheduled_for
           description: when to schedule this job (leave empty for immediate run)
           in: query
@@ -6175,20 +7150,20 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: &ref_46
+          schema: &ref_53
             type: string
             format: uuid
         - name: tag
           description: Override the tag to use
           in: query
-          schema: &ref_48
+          schema: &ref_55
             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_49
+          schema: &ref_56
             type: string
         - name: job_id
           description: >-
@@ -6197,7 +7172,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: &ref_47
+          schema: &ref_54
             type: string
             format: uuid
         - name: invisible_to_owner
@@ -6212,7 +7187,7 @@ paths:
           application/json:
             schema:
               type: object
-              additionalProperties: *ref_18
+              additionalProperties: *ref_21
       responses:
         '201':
           description: job created
@@ -6235,13 +7210,13 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
         - 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_46
+          schema: *ref_53
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -6249,7 +7224,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_47
+          schema: *ref_54
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -6258,14 +7233,14 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: &ref_50
+          schema: &ref_57
             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_51
+          schema: &ref_58
             type: string
       requestBody:
         description: script args
@@ -6274,7 +7249,7 @@ paths:
           application/json:
             schema:
               type: object
-              additionalProperties: *ref_18
+              additionalProperties: *ref_21
       responses:
         '200':
           description: job result
@@ -6295,23 +7270,23 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
         - 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_46
+          schema: *ref_53
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_48
+          schema: *ref_55
         - 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_49
+          schema: *ref_56
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -6319,7 +7294,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_47
+          schema: *ref_54
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -6328,13 +7303,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_50
+          schema: *ref_57
         - 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_51
+          schema: *ref_58
       requestBody:
         description: script args
         required: true
@@ -6342,7 +7317,7 @@ paths:
           application/json:
             schema:
               type: object
-              additionalProperties: *ref_18
+              additionalProperties: *ref_21
       responses:
         '200':
           description: job result
@@ -6362,23 +7337,23 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
         - 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_46
+          schema: *ref_53
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_48
+          schema: *ref_55
         - 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_49
+          schema: *ref_56
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -6386,7 +7361,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_47
+          schema: *ref_54
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -6395,13 +7370,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_50
+          schema: *ref_57
         - 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_51
+          schema: *ref_58
         - name: payload
           description: >
             The base64 encoded payload that has been encoded as a JSON. e.g how
@@ -6409,7 +7384,7 @@ paths:
 
             `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
           in: query
-          schema: &ref_94
+          schema: &ref_113
             type: string
       responses:
         '200':
@@ -6431,7 +7406,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -6440,13 +7415,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_50
+          schema: *ref_57
         - 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_51
+          schema: *ref_58
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -6454,7 +7429,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_47
+          schema: *ref_54
       requestBody:
         description: script args
         required: true
@@ -6462,7 +7437,7 @@ paths:
           application/json:
             schema:
               type: object
-              additionalProperties: *ref_18
+              additionalProperties: *ref_21
       responses:
         '200':
           description: job result
@@ -6483,7 +7458,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -6492,13 +7467,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_50
+          schema: *ref_57
         - 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_51
+          schema: *ref_58
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -6506,7 +7481,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_47
+          schema: *ref_54
       requestBody:
         description: script args
         required: true
@@ -6514,7 +7489,7 @@ paths:
           application/json:
             schema:
               type: object
-              additionalProperties: *ref_18
+              additionalProperties: *ref_21
       responses:
         '200':
           description: job result
@@ -6617,11 +7592,11 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_52
+          schema: *ref_59
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_53
+          schema: *ref_60
         - name: path_start
           description: mask to filter matching starting path
           in: query
@@ -6675,12 +7650,12 @@ paths:
                 type: array
                 items:
                   allOf:
-                    - allOf: &ref_58
+                    - allOf: &ref_65
                         - type: object
-                          properties: *ref_54
-                          required: *ref_55
+                          properties: *ref_61
+                          required: *ref_62
                         - type: object
-                          properties: &ref_190
+                          properties: &ref_285
                             workspace_id:
                               type: string
                             path:
@@ -6694,7 +7669,7 @@ paths:
                               type: boolean
                             extra_perms:
                               type: object
-                              additionalProperties: &ref_189
+                              additionalProperties: &ref_284
                                 type: boolean
                             starred:
                               type: boolean
@@ -6712,12 +7687,18 @@ paths:
                               type: number
                             visible_to_runner_only:
                               type: boolean
-                          required: &ref_191
+                            on_behalf_of_email:
+                              type: string
+                          required: &ref_286
                             - path
                             - edited_by
                             - edited_at
                             - archived
                             - extra_perms
+                        - type: object
+                          properties:
+                            lock_error_logs:
+                              type: string
                     - type: object
                       properties:
                         has_draft:
@@ -6736,7 +7717,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       tags:
         - flow
       responses:
@@ -6748,7 +7729,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_56
+                  properties: &ref_63
                     id:
                       type: integer
                     created_at:
@@ -6756,7 +7737,7 @@ paths:
                       format: date-time
                     deployment_msg:
                       type: string
-                  required: &ref_57
+                  required: &ref_64
                     - id
                     - created_at
   /w/{workspace}/flows/get_latest_version/{path}:
@@ -6771,7 +7752,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       tags:
         - flow
       responses:
@@ -6779,11 +7760,42 @@ paths:
           description: Flow version
           content:
             application/json:
-              required: false
               schema:
                 type: object
-                properties: *ref_56
-                required: *ref_57
+                properties: *ref_63
+                required: *ref_64
+  /w/{workspace}/flows/list_paths_from_workspace_runnable/{runnable_kind}/{path}:
+    get:
+      summary: list flow paths from workspace runnable
+      operationId: listFlowPathsFromWorkspaceRunnable
+      tags:
+        - flow
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: runnable_kind
+          in: path
+          required: true
+          schema: &ref_73
+            type: string
+            enum:
+              - script
+              - flow
+        - name: path
+          in: path
+          required: true
+          schema: *ref_41
+      responses:
+        '200':
+          description: list of flow paths
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
   /w/{workspace}/flows/get/v/{version}/p/{path}:
     get:
       summary: get flow version
@@ -6793,8 +7805,7 @@ paths:
           in: path
           required: true
           schema: *ref_0
-        - type: string
-          name: version
+        - name: version
           in: path
           required: true
           schema:
@@ -6802,7 +7813,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       tags:
         - flow
       responses:
@@ -6811,7 +7822,7 @@ paths:
           content:
             application/json:
               schema:
-                allOf: *ref_58
+                allOf: *ref_65
   /w/{workspace}/flows/history_update/v/{version}/p/{path}:
     post:
       summary: update flow history
@@ -6821,8 +7832,7 @@ paths:
           in: path
           required: true
           schema: *ref_0
-        - type: string
-          name: version
+        - name: version
           in: path
           required: true
           schema:
@@ -6830,7 +7840,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       requestBody:
         description: Flow deployment message
         required: true
@@ -6866,7 +7876,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
         - name: with_starred_info
           in: query
           schema:
@@ -6877,7 +7887,32 @@ paths:
           content:
             application/json:
               schema:
-                allOf: *ref_58
+                allOf: *ref_65
+  /w/{workspace}/flows/deployment_status/p/{path}:
+    get:
+      summary: get flow deployment status
+      operationId: getFlowDeploymentStatus
+      tags:
+        - flow
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_41
+      responses:
+        '200':
+          description: flow status
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  lock_error_logs:
+                    type: string
   /w/{workspace}/flows/get_triggers_count/{path}:
     get:
       summary: get triggers count of flow
@@ -6892,7 +7927,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: triggers count
@@ -6900,7 +7935,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_59
+                properties: *ref_66
   /w/{workspace}/flows/list_tokens/{path}:
     get:
       summary: get tokens with flow scope
@@ -6915,7 +7950,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: tokens list
@@ -6925,8 +7960,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_40
-                  required: *ref_41
+                  properties: *ref_47
+                  required: *ref_48
   /w/{workspace}/flows/toggle_workspace_error_handler/{path}:
     post:
       summary: Toggle ON and OFF the workspace error handler for a given flow
@@ -6941,7 +7976,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       requestBody:
         description: Workspace error handler enabled
         required: true
@@ -6973,7 +8008,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: flow details with draft
@@ -6981,11 +8016,11 @@ paths:
             application/json:
               schema:
                 allOf:
-                  - allOf: *ref_58
+                  - allOf: *ref_65
                   - type: object
                     properties:
                       draft:
-                        allOf: *ref_58
+                        allOf: *ref_65
   /w/{workspace}/flows/exists/{path}:
     get:
       summary: exists flow by path
@@ -7000,7 +8035,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: flow details
@@ -7026,10 +8061,10 @@ paths:
           application/json:
             schema:
               allOf:
-                - allOf: &ref_60
+                - allOf: &ref_67
                     - type: object
-                      properties: *ref_54
-                      required: *ref_55
+                      properties: *ref_61
+                      required: *ref_62
                     - type: object
                       properties:
                         path:
@@ -7046,6 +8081,8 @@ paths:
                           type: number
                         visible_to_runner_only:
                           type: boolean
+                        on_behalf_of_email:
+                          type: string
                       required:
                         - path
                 - type: object
@@ -7075,7 +8112,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       requestBody:
         description: Partially filled flow
         required: true
@@ -7083,7 +8120,7 @@ paths:
           application/json:
             schema:
               allOf:
-                - allOf: *ref_60
+                - allOf: *ref_67
                 - type: object
                   properties:
                     deployment_message:
@@ -7109,7 +8146,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       requestBody:
         description: archiveFlow
         required: true
@@ -7141,7 +8178,12 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
+        - name: keep_captures
+          description: keep captures
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: flow delete
@@ -7171,11 +8213,11 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_52
+          schema: *ref_59
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_53
+          schema: *ref_60
         - name: path_start
           description: mask to filter matching starting path
           in: query
@@ -7202,7 +8244,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_197
+                  properties: &ref_292
                     workspace_id:
                       type: string
                     path:
@@ -7220,7 +8262,7 @@ paths:
                     edited_at:
                       type: string
                       format: date-time
-                  required: &ref_198
+                  required: &ref_293
                     - workspace_id
                     - path
                     - summary
@@ -7241,7 +8283,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: app exists
@@ -7263,12 +8305,12 @@ paths:
         - name: version
           in: path
           required: true
-          schema: &ref_125
+          schema: &ref_186
             type: number
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: app details
@@ -7325,11 +8367,11 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_52
+          schema: *ref_59
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_53
+          schema: *ref_60
         - name: path_start
           description: mask to filter matching starting path
           in: query
@@ -7370,7 +8412,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_195
+                  properties: &ref_290
                     id:
                       type: integer
                     workspace_id:
@@ -7396,7 +8438,9 @@ paths:
                         - viewer
                         - publisher
                         - anonymous
-                  required: &ref_196
+                    raw_app:
+                      type: boolean
+                  required: &ref_291
                     - id
                     - workspace_id
                     - path
@@ -7431,33 +8475,13 @@ paths:
                   type: string
                 policy:
                   type: object
-                  properties: &ref_61
-                    triggerables:
-                      type: object
-                      additionalProperties:
-                        type: object
-                    triggerables_v2:
-                      type: object
-                      additionalProperties:
-                        type: object
-                    s3_inputs:
-                      type: array
-                      items:
-                        type: object
-                    execution_mode:
-                      type: string
-                      enum:
-                        - viewer
-                        - publisher
-                        - anonymous
-                    on_behalf_of:
-                      type: string
-                    on_behalf_of_email:
-                      type: string
+                  properties: *ref_68
                 draft_only:
                   type: boolean
                 deployment_message:
                   type: string
+                custom_path:
+                  type: string
               required:
                 - path
                 - value
@@ -7470,6 +8494,58 @@ paths:
             text/plain:
               schema:
                 type: string
+  /w/{workspace}/apps/create_raw:
+    post:
+      summary: create app raw
+      operationId: createAppRaw
+      tags:
+        - app
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: new app
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                app:
+                  type: object
+                  properties:
+                    path:
+                      type: string
+                    value: {}
+                    summary:
+                      type: string
+                    policy:
+                      type: object
+                      properties: *ref_68
+                    draft_only:
+                      type: boolean
+                    deployment_message:
+                      type: string
+                    custom_path:
+                      type: string
+                  required:
+                    - path
+                    - value
+                    - summary
+                    - policy
+                js:
+                  type: string
+                css:
+                  type: string
+      responses:
+        '201':
+          description: app created
+          content:
+            text/plain:
+              schema:
+                type: string
   /w/{workspace}/apps/exists/{path}:
     get:
       summary: does an app exisst at path
@@ -7484,7 +8560,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: app exists
@@ -7506,7 +8582,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
         - name: with_starred_info
           in: query
           schema:
@@ -7518,51 +8594,32 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_62
-                  id:
-                    type: integer
-                  workspace_id:
-                    type: string
-                  path:
-                    type: string
-                  summary:
-                    type: string
-                  versions:
-                    type: array
-                    items:
-                      type: integer
-                  created_by:
-                    type: string
-                  created_at:
-                    type: string
-                    format: date-time
-                  value:
-                    type: object
-                  policy:
-                    type: object
-                    properties: *ref_61
-                  execution_mode:
-                    type: string
-                    enum:
-                      - viewer
-                      - publisher
-                      - anonymous
-                  extra_perms:
-                    type: object
-                    additionalProperties:
-                      type: boolean
-                required: &ref_63
-                  - id
-                  - workspace_id
-                  - path
-                  - summary
-                  - versions
-                  - created_by
-                  - created_at
-                  - value
-                  - policy
-                  - execution_mode
-                  - extra_perms
+                properties: *ref_69
+                required: *ref_70
+  /w/{workspace}/apps/get/lite/{path}:
+    get:
+      summary: get app lite by path
+      operationId: getAppLiteByPath
+      tags:
+        - app
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_41
+      responses:
+        '200':
+          description: app lite details
+          content:
+            application/json:
+              schema:
+                type: object
+                properties: *ref_69
+                required: *ref_70
   /w/{workspace}/apps/get/draft/{path}:
     get:
       summary: get app by path with draft
@@ -7577,17 +8634,17 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: app details with draft
           content:
             application/json:
               schema:
-                allOf: &ref_199
+                allOf: &ref_294
                   - type: object
-                    properties: *ref_62
-                    required: *ref_63
+                    properties: *ref_69
+                    required: *ref_70
                   - type: object
                     properties:
                       draft_only:
@@ -7607,7 +8664,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       responses:
         '200':
           description: app history
@@ -7617,12 +8674,12 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_64
+                  properties: &ref_71
                     version:
                       type: integer
                     deployment_msg:
                       type: string
-                  required: &ref_65
+                  required: &ref_72
                     - version
   /w/{workspace}/apps/get_latest_version/{path}:
     get:
@@ -7636,7 +8693,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       tags:
         - app
       responses:
@@ -7644,11 +8701,38 @@ paths:
           description: App version
           content:
             application/json:
-              required: false
               schema:
                 type: object
-                properties: *ref_64
-                required: *ref_65
+                properties: *ref_71
+                required: *ref_72
+  /w/{workspace}/apps/list_paths_from_workspace_runnable/{runnable_kind}/{path}:
+    get:
+      summary: list app paths from workspace runnable
+      operationId: listAppPathsFromWorkspaceRunnable
+      tags:
+        - app
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: runnable_kind
+          in: path
+          required: true
+          schema: *ref_73
+        - name: path
+          in: path
+          required: true
+          schema: *ref_41
+      responses:
+        '200':
+          description: list of app paths
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
   /w/{workspace}/apps/history_update/a/{id}/v/{version}:
     post:
       summary: update app history
@@ -7663,11 +8747,11 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_30
+          schema: *ref_34
         - name: version
           in: path
           required: true
-          schema: &ref_127
+          schema: &ref_188
             type: integer
       requestBody:
         description: App deployment message
@@ -7700,7 +8784,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: app details
@@ -7708,8 +8792,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_62
-                required: *ref_63
+                properties: *ref_69
+                required: *ref_70
   /w/{workspace}/apps_u/public_resource/{path}:
     get:
       summary: get public resource
@@ -7724,7 +8808,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: resource value
@@ -7745,7 +8829,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: app secret
@@ -7767,7 +8851,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_30
+          schema: *ref_34
       responses:
         '200':
           description: app details
@@ -7775,8 +8859,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_62
-                required: *ref_63
+                properties: *ref_69
+                required: *ref_70
   /w/{workspace}/raw_apps/create:
     post:
       summary: create raw app
@@ -7827,7 +8911,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       requestBody:
         description: updateraw  app
         required: true
@@ -7863,7 +8947,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: app deleted
@@ -7885,7 +8969,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: app deleted
@@ -7907,7 +8991,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       requestBody:
         description: update app
         required: true
@@ -7923,9 +9007,11 @@ paths:
                 value: {}
                 policy:
                   type: object
-                  properties: *ref_61
+                  properties: *ref_68
                 deployment_message:
                   type: string
+                custom_path:
+                  type: string
       responses:
         '200':
           description: app updated
@@ -7933,6 +9019,124 @@ paths:
             text/plain:
               schema:
                 type: string
+  /w/{workspace}/apps/update_raw/{path}:
+    post:
+      summary: update app
+      operationId: updateAppRaw
+      tags:
+        - app
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_41
+      requestBody:
+        description: update app
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                app:
+                  type: object
+                  properties:
+                    path:
+                      type: string
+                    summary:
+                      type: string
+                    value: {}
+                    policy:
+                      type: object
+                      properties: *ref_68
+                    deployment_message:
+                      type: string
+                    custom_path:
+                      type: string
+                js:
+                  type: string
+                css:
+                  type: string
+      responses:
+        '200':
+          description: app updated
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/apps/custom_path_exists/{custom_path}:
+    get:
+      summary: check if custom path exists
+      operationId: customPathExists
+      tags:
+        - app
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: custom_path
+          in: path
+          required: true
+          schema: *ref_74
+      responses:
+        '200':
+          description: custom path exists
+          content:
+            application/json:
+              schema:
+                type: boolean
+  /w/{workspace}/apps/sign_s3_objects:
+    post:
+      summary: sign s3 objects, to be used by anonymous users in public apps
+      operationId: signS3Objects
+      tags:
+        - app
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: s3 objects to sign
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                s3_objects:
+                  type: array
+                  items:
+                    type: object
+                    properties: &ref_75
+                      s3:
+                        type: string
+                      filename:
+                        type: string
+                      storage:
+                        type: string
+                      presigned:
+                        type: string
+                    required: &ref_76
+                      - s3
+              required:
+                - s3_objects
+      responses:
+        '200':
+          description: signed s3 objects
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: *ref_75
+                  required: *ref_76
   /w/{workspace}/apps_u/execute_component/{path}:
     post:
       summary: executeComponent
@@ -7947,7 +9151,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
       requestBody:
         description: update app
         required: true
@@ -7960,6 +9164,8 @@ paths:
                   type: string
                 path:
                   type: string
+                version:
+                  type: integer
                 args: {}
                 raw_code:
                   type: object
@@ -7977,6 +9183,8 @@ paths:
                   required:
                     - content
                     - language
+                id:
+                  type: integer
                 force_viewer_static_fields:
                   type: object
                 force_viewer_one_of_fields:
@@ -7995,6 +9203,99 @@ paths:
             text/plain:
               schema:
                 type: string
+  /w/{workspace}/apps_u/upload_s3_file/{path}:
+    post:
+      summary: upload s3 file from app
+      operationId: uploadS3FileFromApp
+      tags:
+        - app
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+        - name: file_key
+          in: query
+          required: false
+          schema:
+            type: string
+        - name: file_extension
+          in: query
+          required: false
+          schema:
+            type: string
+        - name: s3_resource_path
+          in: query
+          required: false
+          schema:
+            type: string
+        - name: resource_type
+          in: query
+          required: false
+          schema:
+            type: string
+        - name: storage
+          in: query
+          schema:
+            type: string
+        - name: content_type
+          in: query
+          schema:
+            type: string
+        - name: content_disposition
+          in: query
+          schema:
+            type: string
+      requestBody:
+        description: File content
+        required: true
+        content:
+          application/octet-stream:
+            schema:
+              type: string
+              format: binary
+      responses:
+        '200':
+          description: file uploaded
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  file_key:
+                    type: string
+                  delete_token:
+                    type: string
+                required:
+                  - file_key
+                  - delete_token
+  /w/{workspace}/apps_u/delete_s3_file:
+    delete:
+      summary: delete s3 file from app
+      operationId: deleteS3FileFromApp
+      tags:
+        - app
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: delete_token
+          in: query
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: file deleted
+          content:
+            text/plain:
+              schema:
+                type: string
   /w/{workspace}/jobs/run/f/{path}:
     post:
       summary: run flow by path
@@ -8009,7 +9310,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_35
+          schema: *ref_41
         - name: scheduled_for
           description: when to schedule this job (leave empty for immediate run)
           in: query
@@ -8031,11 +9332,11 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_46
+          schema: *ref_53
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_48
+          schema: *ref_55
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -8043,7 +9344,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_47
+          schema: *ref_54
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -8052,7 +9353,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_50
+          schema: *ref_57
         - name: invisible_to_owner
           description: make the run invisible to the the flow owner (default false)
           in: query
@@ -8065,7 +9366,7 @@ paths:
           application/json:
             schema:
               type: object
-              additionalProperties: *ref_18
+              additionalProperties: *ref_21
       responses:
         '201':
           description: job created
@@ -8074,6 +9375,66 @@ paths:
               schema:
                 type: string
                 format: uuid
+  /w/{workspace}/jobs/run/batch_rerun_jobs:
+    post:
+      summary: re-run multiple jobs
+      operationId: batchReRunJobs
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: list of job ids to re run and arg tranforms
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - job_ids
+                - script_options_by_path
+                - flow_options_by_path
+              properties:
+                job_ids:
+                  type: array
+                  items:
+                    type: string
+                script_options_by_path:
+                  type: object
+                  additionalProperties:
+                    type: object
+                    properties:
+                      input_transforms:
+                        type: object
+                        additionalProperties:
+                          allOf: &ref_77
+                            - oneOf: *ref_35
+                              discriminator: *ref_36
+                      use_latest_version:
+                        type: boolean
+                flow_options_by_path:
+                  type: object
+                  additionalProperties:
+                    type: object
+                    properties:
+                      input_transforms:
+                        type: object
+                        additionalProperties:
+                          allOf: *ref_77
+                      use_latest_version:
+                        type: boolean
+      responses:
+        '201':
+          description: >-
+            stream of created job uuids separated by \n. Lines may start with
+            'Error:'
+          content:
+            text/event-stream:
+              schema:
+                type: string
   /w/{workspace}/jobs/restart/f/{id}/from/{step_id}/{branch_or_iteration_n}:
     post:
       summary: restart a completed flow at a given step
@@ -8088,7 +9449,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: &ref_91
+          schema: &ref_110
             type: string
             format: uuid
         - name: step_id
@@ -8121,11 +9482,11 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_46
+          schema: *ref_53
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_48
+          schema: *ref_55
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -8133,7 +9494,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_47
+          schema: *ref_54
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -8142,7 +9503,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_50
+          schema: *ref_57
         - name: invisible_to_owner
           description: make the run invisible to the the flow owner (default false)
           in: query
@@ -8155,7 +9516,7 @@ paths:
           application/json:
             schema:
               type: object
-              additionalProperties: *ref_18
+              additionalProperties: *ref_21
       responses:
         '201':
           description: job created
@@ -8178,7 +9539,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_39
+          schema: *ref_46
         - name: scheduled_for
           description: when to schedule this job (leave empty for immediate run)
           in: query
@@ -8200,17 +9561,17 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_46
+          schema: *ref_53
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_48
+          schema: *ref_55
         - 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_49
+          schema: *ref_56
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -8218,7 +9579,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_47
+          schema: *ref_54
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -8227,7 +9588,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_50
+          schema: *ref_57
         - name: invisible_to_owner
           description: make the run invisible to the the script owner (default false)
           in: query
@@ -8267,7 +9628,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_50
+          schema: *ref_57
         - name: invisible_to_owner
           description: make the run invisible to the the script owner (default false)
           in: query
@@ -8280,7 +9641,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_47
+          schema: *ref_54
       requestBody:
         description: preview
         required: true
@@ -8288,33 +9649,19 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_156
+              properties: &ref_221
                 content:
                   type: string
                 path:
                   type: string
+                script_hash:
+                  type: string
                 args:
                   type: object
-                  additionalProperties: *ref_18
+                  additionalProperties: *ref_21
                 language:
                   type: string
-                  enum:
-                    - python3
-                    - deno
-                    - go
-                    - bash
-                    - powershell
-                    - postgresql
-                    - mysql
-                    - bigquery
-                    - snowflake
-                    - mssql
-                    - graphql
-                    - nativets
-                    - bun
-                    - php
-                    - rust
-                    - ansible
+                  enum: *ref_43
                 tag:
                   type: string
                 kind:
@@ -8327,7 +9674,7 @@ paths:
                   type: boolean
                 lock:
                   type: string
-              required: &ref_157
+              required: &ref_222
                 - args
       responses:
         '201':
@@ -8365,11 +9712,11 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_158
+              properties: &ref_223
                 args:
                   type: object
-                  additionalProperties: *ref_18
-              required: &ref_159
+                  additionalProperties: *ref_21
+              required: &ref_224
                 - args
       responses:
         '201':
@@ -8402,31 +9749,15 @@ paths:
                   type: array
                   items:
                     type: object
-                    properties: &ref_217
+                    properties: &ref_312
                       raw_code:
                         type: string
                       path:
                         type: string
                       language:
                         type: string
-                        enum:
-                          - python3
-                          - deno
-                          - go
-                          - bash
-                          - powershell
-                          - postgresql
-                          - mysql
-                          - bigquery
-                          - snowflake
-                          - mssql
-                          - graphql
-                          - nativets
-                          - bun
-                          - php
-                          - rust
-                          - ansible
-                    required: &ref_218
+                        enum: *ref_43
+                    required: &ref_313
                       - raw_code
                       - path
                       - language
@@ -8466,7 +9797,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_50
+          schema: *ref_57
         - name: invisible_to_owner
           description: make the run invisible to the the script owner (default false)
           in: query
@@ -8479,7 +9810,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_47
+          schema: *ref_54
       requestBody:
         description: preview
         required: true
@@ -8487,21 +9818,21 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_192
+              properties: &ref_287
                 value:
                   type: object
-                  properties: *ref_66
-                  required: *ref_67
+                  properties: *ref_78
+                  required: *ref_79
                 path:
                   type: string
                 args:
                   type: object
-                  additionalProperties: *ref_18
+                  additionalProperties: *ref_21
                 tag:
                   type: string
                 restarted_from:
                   type: object
-                  properties: &ref_194
+                  properties: &ref_289
                     flow_job_id:
                       type: string
                       format: uuid
@@ -8509,7 +9840,7 @@ paths:
                       type: string
                     branch_or_iteration_n:
                       type: integer
-              required: &ref_193
+              required: &ref_288
                 - value
                 - content
                 - args
@@ -8535,94 +9866,104 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_52
+          schema: *ref_59
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_53
+          schema: *ref_60
         - 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_46
+          schema: *ref_53
+        - name: worker
+          description: worker this job was ran on
+          in: query
+          schema: &ref_82
+            type: string
         - name: script_path_exact
           description: mask to filter exact matching path
           in: query
-          schema: &ref_70
+          schema: &ref_83
             type: string
         - name: script_path_start
           description: mask to filter matching starting path
           in: query
-          schema: &ref_71
+          schema: &ref_84
             type: string
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: &ref_72
+          schema: &ref_85
             type: string
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: &ref_73
+          schema: &ref_86
             type: string
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: &ref_74
+          schema: &ref_87
             type: string
             format: date-time
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: &ref_75
+          schema: &ref_88
             type: string
             format: date-time
         - name: success
           description: filter on successful jobs
           in: query
-          schema: &ref_76
+          schema: &ref_96
             type: boolean
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: &ref_77
+          schema: &ref_90
             type: boolean
         - name: job_kinds
           description: >-
             filter on job kind (values 'preview', 'script', 'dependencies',
             'flow') separated by,
           in: query
-          schema: &ref_78
+          schema: &ref_91
             type: string
         - name: suspended
           description: filter on suspended jobs
           in: query
-          schema: &ref_79
+          schema: &ref_92
             type: boolean
         - name: running
           description: filter on running jobs
           in: query
-          schema: &ref_80
+          schema: &ref_89
             type: boolean
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: &ref_81
+          schema: &ref_93
             type: string
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: &ref_82
+          schema: &ref_95
             type: string
+        - name: allow_wildcards
+          description: allow wildcards (*) in the filter of label, tag, worker
+          in: query
+          schema: &ref_97
+            type: boolean
         - name: tag
           description: filter on jobs with a given tag/worker group
           in: query
-          schema: &ref_83
+          schema: &ref_94
             type: string
         - name: page
           description: which page to return (start at 1, default 1)
@@ -8653,7 +9994,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_89
+                  properties: &ref_108
                     workspace_id:
                       type: string
                     id:
@@ -8681,7 +10022,7 @@ paths:
                       type: string
                     args:
                       type: object
-                      additionalProperties: *ref_18
+                      additionalProperties: *ref_21
                     logs:
                       type: string
                     raw_code:
@@ -8717,20 +10058,20 @@ paths:
                     permissioned_as:
                       type: string
                       description: >
-                        The user (u/userfoo) or group (g/groupfoo) whom 
+                        The user (u/userfoo) or group (g/groupfoo) whom
 
                         the execution of this script will be permissioned_as and
                         by extension its DT_TOKEN.
                     flow_status:
                       type: object
-                      properties: &ref_84
+                      properties: &ref_99
                         step:
                           type: integer
                         modules:
                           type: array
                           items:
                             type: object
-                            properties: &ref_68
+                            properties: &ref_80
                               type:
                                 type: string
                                 enum:
@@ -8807,20 +10148,20 @@ paths:
                                   format: uuid
                               skipped:
                                 type: boolean
-                            required: &ref_69
+                            required: &ref_81
                               - type
                         user_states:
                           additionalProperties: true
                         preprocessor_module:
                           allOf:
                             - type: object
-                              properties: *ref_68
-                              required: *ref_69
+                              properties: *ref_80
+                              required: *ref_81
                         failure_module:
                           allOf:
                             - type: object
-                              properties: *ref_68
-                              required: *ref_69
+                              properties: *ref_80
+                              required: *ref_81
                             - type: object
                               properties:
                                 parent_module:
@@ -8835,35 +10176,19 @@ paths:
                               items:
                                 type: string
                                 format: uuid
-                      required: &ref_85
+                      required: &ref_100
                         - step
                         - modules
                         - failure_module
                     raw_flow:
                       type: object
-                      properties: *ref_66
-                      required: *ref_67
+                      properties: *ref_78
+                      required: *ref_79
                     is_flow_step:
                       type: boolean
                     language:
                       type: string
-                      enum:
-                        - python3
-                        - deno
-                        - go
-                        - bash
-                        - powershell
-                        - postgresql
-                        - mysql
-                        - bigquery
-                        - snowflake
-                        - mssql
-                        - graphql
-                        - nativets
-                        - bun
-                        - php
-                        - rust
-                        - ansible
+                      enum: *ref_43
                     email:
                       type: string
                     visible_to_owner:
@@ -8880,7 +10205,11 @@ paths:
                       type: number
                     suspend:
                       type: number
-                  required: &ref_90
+                    preprocessed:
+                      type: boolean
+                    worker:
+                      type: string
+                  required: &ref_109
                     - id
                     - running
                     - canceled
@@ -8945,10 +10274,221 @@ paths:
                     type: integer
                 required:
                   - database_length
-  /w/{workspace}/jobs/queue/list_filtered_uuids:
+  /w/{workspace}/jobs/completed/count_jobs:
+    get:
+      summary: count number of completed jobs with filter
+      operationId: countCompletedJobs
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: completed_after_s_ago
+          in: query
+          schema:
+            type: integer
+        - name: success
+          in: query
+          schema:
+            type: boolean
+        - name: tags
+          in: query
+          schema:
+            type: string
+        - name: all_workspaces
+          in: query
+          schema:
+            type: boolean
+      responses:
+        '200':
+          description: Count of completed jobs
+          content:
+            application/json:
+              schema:
+                type: integer
+  /w/{workspace}/jobs/list_filtered_uuids:
     get:
       summary: get the ids of all jobs matching the given filters
-      operationId: listFilteredUuids
+      operationId: listFilteredJobsUuids
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: created_by
+          description: mask to filter exact matching user creator
+          in: query
+          schema: *ref_60
+        - 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_98
+            type: string
+        - name: worker
+          description: worker this job was ran on
+          in: query
+          schema: *ref_82
+        - 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_53
+        - name: script_path_exact
+          description: mask to filter exact matching path
+          in: query
+          schema: *ref_83
+        - name: script_path_start
+          description: mask to filter matching starting path
+          in: query
+          schema: *ref_84
+        - name: schedule_path
+          description: mask to filter by schedule path
+          in: query
+          schema: *ref_85
+        - name: script_hash
+          description: mask to filter exact matching path
+          in: query
+          schema: *ref_86
+        - name: started_before
+          description: filter on started before (inclusive) timestamp
+          in: query
+          schema: *ref_87
+        - name: started_after
+          description: filter on started after (exclusive) timestamp
+          in: query
+          schema: *ref_88
+        - name: created_before
+          description: filter on created before (inclusive) timestamp
+          in: query
+          schema: &ref_101
+            type: string
+            format: date-time
+        - name: created_after
+          description: filter on created after (exclusive) timestamp
+          in: query
+          schema: &ref_102
+            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_103
+            type: string
+            format: date-time
+        - name: running
+          description: filter on running jobs
+          in: query
+          schema: *ref_89
+        - name: scheduled_for_before_now
+          description: filter on jobs scheduled_for before now (hence waitinf for a worker)
+          in: query
+          schema: *ref_90
+        - 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_104
+            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_105
+            type: string
+            format: date-time
+        - name: job_kinds
+          description: >-
+            filter on job kind (values 'preview', 'script', 'dependencies',
+            'flow') separated by,
+          in: query
+          schema: *ref_91
+        - name: suspended
+          description: filter on suspended jobs
+          in: query
+          schema: *ref_92
+        - name: args
+          description: >-
+            filter on jobs containing those args as a json subset (@> in
+            postgres)
+          in: query
+          schema: *ref_93
+        - name: tag
+          description: filter on jobs with a given tag/worker group
+          in: query
+          schema: *ref_94
+        - name: result
+          description: >-
+            filter on jobs containing those result as a json subset (@> in
+            postgres)
+          in: query
+          schema: *ref_95
+        - 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: uuids of jobs
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+  /w/{workspace}/jobs/queue/list_filtered_uuids:
+    get:
+      summary: get the ids of all queued jobs matching the given filters
+      operationId: listFilteredQueueUuids
       tags:
         - job
       parameters:
@@ -8959,79 +10499,83 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_52
+          schema: *ref_59
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_53
+          schema: *ref_60
         - 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_46
+          schema: *ref_53
         - name: script_path_exact
           description: mask to filter exact matching path
           in: query
-          schema: *ref_70
+          schema: *ref_83
         - name: script_path_start
           description: mask to filter matching starting path
           in: query
-          schema: *ref_71
+          schema: *ref_84
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_72
+          schema: *ref_85
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_73
+          schema: *ref_86
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_74
+          schema: *ref_87
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_75
+          schema: *ref_88
         - name: success
           description: filter on successful jobs
           in: query
-          schema: *ref_76
+          schema: *ref_96
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: *ref_77
+          schema: *ref_90
         - name: job_kinds
           description: >-
             filter on job kind (values 'preview', 'script', 'dependencies',
             'flow') separated by,
           in: query
-          schema: *ref_78
+          schema: *ref_91
         - name: suspended
           description: filter on suspended jobs
           in: query
-          schema: *ref_79
+          schema: *ref_92
         - name: running
           description: filter on running jobs
           in: query
-          schema: *ref_80
+          schema: *ref_89
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_81
+          schema: *ref_93
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_82
+          schema: *ref_95
+        - name: allow_wildcards
+          description: allow wildcards (*) in the filter of label, tag, worker
+          in: query
+          schema: *ref_97
         - name: tag
           description: filter on jobs with a given tag/worker group
           in: query
-          schema: *ref_83
+          schema: *ref_94
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -9109,75 +10653,82 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_52
+          schema: *ref_59
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_53
+          schema: *ref_60
         - 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_86
-            type: string
+          schema: *ref_98
+        - name: worker
+          description: worker this job was ran on
+          in: query
+          schema: *ref_82
         - 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_46
+          schema: *ref_53
         - name: script_path_exact
           description: mask to filter exact matching path
           in: query
-          schema: *ref_70
+          schema: *ref_83
         - name: script_path_start
           description: mask to filter matching starting path
           in: query
-          schema: *ref_71
+          schema: *ref_84
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_72
+          schema: *ref_85
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_73
+          schema: *ref_86
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_74
+          schema: *ref_87
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_75
+          schema: *ref_88
         - name: success
           description: filter on successful jobs
           in: query
-          schema: *ref_76
+          schema: *ref_96
         - name: job_kinds
           description: >-
             filter on job kind (values 'preview', 'script', 'dependencies',
             'flow') separated by,
           in: query
-          schema: *ref_78
+          schema: *ref_91
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_81
+          schema: *ref_93
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_82
+          schema: *ref_95
+        - name: allow_wildcards
+          description: allow wildcards (*) in the filter of label, tag, worker
+          in: query
+          schema: *ref_97
         - name: tag
           description: filter on jobs with a given tag/worker group
           in: query
-          schema: *ref_83
+          schema: *ref_94
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -9215,7 +10766,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_87
+                  properties: &ref_106
                     workspace_id:
                       type: string
                     id:
@@ -9242,7 +10793,7 @@ paths:
                       type: string
                     args:
                       type: object
-                      additionalProperties: *ref_18
+                      additionalProperties: *ref_21
                     result: {}
                     logs:
                       type: string
@@ -9278,39 +10829,23 @@ paths:
                     permissioned_as:
                       type: string
                       description: >
-                        The user (u/userfoo) or group (g/groupfoo) whom 
+                        The user (u/userfoo) or group (g/groupfoo) whom
 
                         the execution of this script will be permissioned_as and
                         by extension its DT_TOKEN.
                     flow_status:
                       type: object
-                      properties: *ref_84
-                      required: *ref_85
+                      properties: *ref_99
+                      required: *ref_100
                     raw_flow:
                       type: object
-                      properties: *ref_66
-                      required: *ref_67
+                      properties: *ref_78
+                      required: *ref_79
                     is_flow_step:
                       type: boolean
                     language:
                       type: string
-                      enum:
-                        - python3
-                        - deno
-                        - go
-                        - bash
-                        - powershell
-                        - postgresql
-                        - mysql
-                        - bigquery
-                        - snowflake
-                        - mssql
-                        - graphql
-                        - nativets
-                        - bun
-                        - php
-                        - rust
-                        - ansible
+                      enum: *ref_43
                     is_skipped:
                       type: boolean
                     email:
@@ -9331,7 +10866,11 @@ paths:
                       type: number
                     aggregate_wait_time_ms:
                       type: number
-                  required: &ref_88
+                    preprocessed:
+                      type: boolean
+                    worker:
+                      type: string
+                  required: &ref_107
                     - id
                     - created_by
                     - duration_ms
@@ -9360,115 +10899,113 @@ paths:
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_53
+          schema: *ref_60
         - 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_86
+          schema: *ref_98
+        - name: worker
+          description: worker this job was ran on
+          in: query
+          schema: *ref_82
         - 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_46
+          schema: *ref_53
         - name: script_path_exact
           description: mask to filter exact matching path
           in: query
-          schema: *ref_70
+          schema: *ref_83
         - name: script_path_start
           description: mask to filter matching starting path
           in: query
-          schema: *ref_71
+          schema: *ref_84
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_72
+          schema: *ref_85
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_73
+          schema: *ref_86
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_74
+          schema: *ref_87
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_75
+          schema: *ref_88
         - name: created_before
           description: filter on created before (inclusive) timestamp
           in: query
-          schema: &ref_128
-            type: string
-            format: date-time
+          schema: *ref_101
         - name: created_after
           description: filter on created after (exclusive) timestamp
           in: query
-          schema: &ref_129
-            type: string
-            format: date-time
+          schema: *ref_102
         - 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_122
-            type: string
-            format: date-time
+          schema: *ref_103
         - name: running
           description: filter on running jobs
           in: query
-          schema: *ref_80
+          schema: *ref_89
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: *ref_77
+          schema: *ref_90
         - 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_123
-            type: string
-            format: date-time
+          schema: *ref_104
         - 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_124
-            type: string
-            format: date-time
+          schema: *ref_105
         - name: job_kinds
           description: >-
             filter on job kind (values 'preview', 'script', 'dependencies',
             'flow') separated by,
           in: query
-          schema: *ref_78
+          schema: *ref_91
         - name: suspended
           description: filter on suspended jobs
           in: query
-          schema: *ref_79
+          schema: *ref_92
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_81
+          schema: *ref_93
         - name: tag
           description: filter on jobs with a given tag/worker group
           in: query
-          schema: *ref_83
+          schema: *ref_94
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_82
+          schema: *ref_95
+        - name: allow_wildcards
+          description: allow wildcards (*) in the filter of label, tag, worker
+          in: query
+          schema: *ref_97
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -9517,11 +11054,11 @@ paths:
               schema:
                 type: array
                 items:
-                  oneOf: &ref_92
+                  oneOf: &ref_111
                     - allOf:
                         - type: object
-                          properties: *ref_87
-                          required: *ref_88
+                          properties: *ref_106
+                          required: *ref_107
                         - type: object
                           properties:
                             type:
@@ -9530,15 +11067,15 @@ paths:
                                 - CompletedJob
                     - allOf:
                         - type: object
-                          properties: *ref_89
-                          required: *ref_90
+                          properties: *ref_108
+                          required: *ref_109
                         - type: object
                           properties:
                             type:
                               type: string
                               enum:
                                 - QueuedJob
-                  discriminator: &ref_93
+                  discriminator: &ref_112
                     propertyName: type
   /jobs/db_clock:
     get:
@@ -9605,7 +11142,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
         - name: no_logs
           in: query
           schema:
@@ -9616,8 +11153,8 @@ paths:
           content:
             application/json:
               schema:
-                oneOf: *ref_92
-                discriminator: *ref_93
+                oneOf: *ref_111
+                discriminator: *ref_112
   /w/{workspace}/jobs_u/get_root_job_id/{id}:
     get:
       summary: get root job id
@@ -9632,7 +11169,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
       responses:
         '200':
           description: get root job id
@@ -9654,7 +11191,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
       responses:
         '200':
           description: job details
@@ -9676,7 +11213,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
       responses:
         '200':
           description: job args
@@ -9697,7 +11234,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
         - name: running
           in: query
           schema:
@@ -9732,9 +11269,9 @@ paths:
                     type: integer
                   flow_status:
                     type: object
-                    additionalProperties: &ref_160
+                    additionalProperties: &ref_225
                       type: object
-                      properties: &ref_161
+                      properties: &ref_226
                         scheduled_for:
                           type: string
                           format: date-time
@@ -9766,7 +11303,8 @@ paths:
           description: job log
           content:
             text/plain:
-              type: string
+              schema:
+                type: string
   /w/{workspace}/jobs_u/get_flow_debug_info/{id}:
     get:
       summary: get flow debug info
@@ -9781,7 +11319,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
       responses:
         '200':
           description: flow debug info details
@@ -9802,7 +11340,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
       responses:
         '200':
           description: job details
@@ -9810,8 +11348,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_87
-                required: *ref_88
+                properties: *ref_106
+                required: *ref_107
   /w/{workspace}/jobs_u/completed/get_result/{id}:
     get:
       summary: get completed job result
@@ -9826,7 +11364,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
         - name: suspended_job
           in: query
           schema:
@@ -9863,10 +11401,10 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
         - name: get_started
           in: query
-          schema: &ref_135
+          schema: &ref_194
             type: boolean
       responses:
         '200':
@@ -9900,7 +11438,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
       responses:
         '200':
           description: job details
@@ -9908,8 +11446,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_87
-                required: *ref_88
+                properties: *ref_106
+                required: *ref_107
   /w/{workspace}/jobs_u/queue/cancel/{id}:
     post:
       summary: cancel queued or running job
@@ -9924,7 +11462,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
       requestBody:
         description: reason
         required: true
@@ -9956,7 +11494,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       requestBody:
         description: reason
         required: true
@@ -9988,7 +11526,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
       requestBody:
         description: reason
         required: true
@@ -10020,7 +11558,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
         - name: resume_id
           in: path
           required: true
@@ -10051,7 +11589,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
         - name: resume_id
           in: path
           required: true
@@ -10079,6 +11617,108 @@ paths:
                   - approvalPage
                   - resume
                   - cancel
+  /w/{workspace}/jobs/slack_approval/{id}:
+    get:
+      summary: generate interactive slack approval for suspended job
+      operationId: getSlackApprovalPayload
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: id
+          in: path
+          required: true
+          schema: *ref_110
+        - name: approver
+          in: query
+          schema:
+            type: string
+        - name: message
+          in: query
+          schema:
+            type: string
+        - name: slack_resource_path
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: channel_id
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: flow_step_id
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: default_args_json
+          in: query
+          required: false
+          schema:
+            type: string
+        - name: dynamic_enums_json
+          in: query
+          required: false
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Interactive slack approval message sent successfully
+  /w/{workspace}/jobs/teams_approval/{id}:
+    get:
+      summary: generate interactive teams approval for suspended job
+      operationId: getTeamsApprovalPayload
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: id
+          in: path
+          required: true
+          schema: *ref_110
+        - name: approver
+          in: query
+          schema:
+            type: string
+        - name: message
+          in: query
+          schema:
+            type: string
+        - name: team_name
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: channel_name
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: flow_step_id
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: default_args_json
+          in: query
+          required: false
+          schema:
+            type: string
+        - name: dynamic_enums_json
+          in: query
+          required: false
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Interactive slack approval message sent successfully
   /w/{workspace}/jobs_u/resume/{id}/{resume_id}/{signature}:
     get:
       summary: resume a job for a suspended flow
@@ -10093,7 +11733,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
         - name: payload
           description: >
             The base64 encoded payload that has been encoded as a JSON. e.g how
@@ -10101,7 +11741,7 @@ paths:
 
             `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
           in: query
-          schema: *ref_94
+          schema: *ref_113
         - name: resume_id
           in: path
           required: true
@@ -10136,7 +11776,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
         - name: resume_id
           in: path
           required: true
@@ -10178,7 +11818,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
         - name: key
           in: path
           required: true
@@ -10210,7 +11850,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
         - name: key
           in: path
           required: true
@@ -10236,7 +11876,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
       requestBody:
         required: true
         content:
@@ -10264,7 +11904,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
         - name: resume_id
           in: path
           required: true
@@ -10299,7 +11939,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
         - name: resume_id
           in: path
           required: true
@@ -10341,7 +11981,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
         - name: resume_id
           in: path
           required: true
@@ -10365,8 +12005,8 @@ paths:
                 type: object
                 properties:
                   job:
-                    oneOf: *ref_92
-                    discriminator: *ref_93
+                    oneOf: *ref_111
+                    discriminator: *ref_112
                   approvers:
                     type: array
                     items:
@@ -10400,6 +12040,8 @@ paths:
                   type: string
                 timezone:
                   type: string
+                cron_version:
+                  type: string
               required:
                 - schedule
                 - timezone
@@ -10431,7 +12073,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_171
+              properties: &ref_236
                 path:
                   type: string
                 schedule:
@@ -10444,7 +12086,7 @@ paths:
                   type: boolean
                 args:
                   type: object
-                  additionalProperties: *ref_18
+                  additionalProperties: *ref_21
                 enabled:
                   type: boolean
                 on_failure:
@@ -10455,34 +12097,38 @@ paths:
                   type: boolean
                 on_failure_extra_args:
                   type: object
-                  additionalProperties: *ref_18
+                  additionalProperties: *ref_21
                 on_recovery:
                   type: string
                 on_recovery_times:
                   type: number
                 on_recovery_extra_args:
                   type: object
-                  additionalProperties: *ref_18
+                  additionalProperties: *ref_21
                 on_success:
                   type: string
                 on_success_extra_args:
                   type: object
-                  additionalProperties: *ref_18
+                  additionalProperties: *ref_21
                 ws_error_handler_muted:
                   type: boolean
                 retry:
                   type: object
-                  properties: *ref_95
+                  properties: *ref_114
                 no_flow_overlap:
                   type: boolean
                 summary:
                   type: string
+                description:
+                  type: string
                 tag:
                   type: string
                 paused_until:
                   type: string
                   format: date-time
-              required: &ref_172
+                cron_version:
+                  type: string
+              required: &ref_237
                 - path
                 - schedule
                 - timezone
@@ -10510,7 +12156,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       requestBody:
         description: updated schedule
         required: true
@@ -10518,14 +12164,14 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_173
+              properties: &ref_238
                 schedule:
                   type: string
                 timezone:
                   type: string
                 args:
                   type: object
-                  additionalProperties: *ref_18
+                  additionalProperties: *ref_21
                 on_failure:
                   type: string
                 on_failure_times:
@@ -10534,34 +12180,38 @@ paths:
                   type: boolean
                 on_failure_extra_args:
                   type: object
-                  additionalProperties: *ref_18
+                  additionalProperties: *ref_21
                 on_recovery:
                   type: string
                 on_recovery_times:
                   type: number
                 on_recovery_extra_args:
                   type: object
-                  additionalProperties: *ref_18
+                  additionalProperties: *ref_21
                 on_success:
                   type: string
                 on_success_extra_args:
                   type: object
-                  additionalProperties: *ref_18
+                  additionalProperties: *ref_21
                 ws_error_handler_muted:
                   type: boolean
                 retry:
                   type: object
-                  properties: *ref_95
+                  properties: *ref_114
                 no_flow_overlap:
                   type: boolean
                 summary:
                   type: string
+                description:
+                  type: string
                 tag:
                   type: string
                 paused_until:
                   type: string
                   format: date-time
-              required: &ref_174
+                cron_version:
+                  type: string
+              required: &ref_239
                 - schedule
                 - timezone
                 - script_path
@@ -10588,7 +12238,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       requestBody:
         description: updated schedule enable
         required: true
@@ -10622,7 +12272,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: schedule deleted
@@ -10644,7 +12294,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: schedule deleted
@@ -10652,7 +12302,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_96
+                properties: &ref_115
                   path:
                     type: string
                   edited_by:
@@ -10672,7 +12322,7 @@ paths:
                     type: boolean
                   args:
                     type: object
-                    additionalProperties: *ref_18
+                    additionalProperties: *ref_21
                   extra_perms:
                     type: object
                     additionalProperties:
@@ -10689,26 +12339,28 @@ paths:
                     type: boolean
                   on_failure_extra_args:
                     type: object
-                    additionalProperties: *ref_18
+                    additionalProperties: *ref_21
                   on_recovery:
                     type: string
                   on_recovery_times:
                     type: number
                   on_recovery_extra_args:
                     type: object
-                    additionalProperties: *ref_18
+                    additionalProperties: *ref_21
                   on_success:
                     type: string
                   on_success_extra_args:
                     type: object
-                    additionalProperties: *ref_18
+                    additionalProperties: *ref_21
                   ws_error_handler_muted:
                     type: boolean
                   retry:
                     type: object
-                    properties: *ref_95
+                    properties: *ref_114
                   summary:
                     type: string
+                  description:
+                    type: string
                   no_flow_overlap:
                     type: boolean
                   tag:
@@ -10716,7 +12368,9 @@ paths:
                   paused_until:
                     type: string
                     format: date-time
-                required: &ref_97
+                  cron_version:
+                    type: string
+                required: &ref_116
                   - path
                   - edited_by
                   - edited_at
@@ -10741,7 +12395,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: schedule exists
@@ -10773,7 +12427,7 @@ paths:
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_81
+          schema: *ref_93
         - name: path
           description: filter by path
           in: query
@@ -10796,8 +12450,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_96
-                  required: *ref_97
+                  properties: *ref_115
+                  required: *ref_116
   /w/{workspace}/schedules/list_with_jobs:
     get:
       summary: list schedules with last 20 jobs
@@ -10825,10 +12479,10 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: &ref_170
+                  allOf: &ref_235
                     - type: object
-                      properties: *ref_96
-                      required: *ref_97
+                      properties: *ref_115
+                      required: *ref_116
                     - type: object
                       properties:
                         jobs:
@@ -10907,13 +12561,15 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_175
+              properties: &ref_240
                 path:
                   type: string
                 script_path:
                   type: string
                 route_path:
                   type: string
+                workspaced_route:
+                  type: boolean
                 static_asset_config:
                   type: object
                   properties:
@@ -10935,18 +12591,34 @@ paths:
                     - put
                     - delete
                     - patch
+                authentication_resource_path:
+                  type: string
                 is_async:
                   type: boolean
-                requires_auth:
+                authentication_method:
+                  type: string
+                  enum: &ref_117
+                    - none
+                    - windmill
+                    - api_key
+                    - basic_http
+                    - custom_script
+                    - signature
+                is_static_website:
                   type: boolean
-              required: &ref_176
+                wrap_body:
+                  type: boolean
+                raw_string:
+                  type: boolean
+              required: &ref_241
                 - path
                 - script_path
                 - route_path
                 - is_flow
                 - is_async
-                - requires_auth
+                - authentication_method
                 - http_method
+                - is_static_website
       responses:
         '201':
           description: http trigger created
@@ -10968,7 +12640,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       requestBody:
         description: updated trigger
         required: true
@@ -10976,13 +12648,15 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_177
+              properties: &ref_242
                 path:
                   type: string
                 script_path:
                   type: string
                 route_path:
                   type: string
+                workspaced_route:
+                  type: boolean
                 static_asset_config:
                   type: object
                   properties:
@@ -10994,6 +12668,8 @@ paths:
                       type: string
                   required:
                     - s3
+                authentication_resource_path:
+                  type: string
                 is_flow:
                   type: boolean
                 http_method:
@@ -11006,16 +12682,24 @@ paths:
                     - patch
                 is_async:
                   type: boolean
-                requires_auth:
+                authentication_method:
+                  type: string
+                  enum: *ref_117
+                is_static_website:
                   type: boolean
-              required: &ref_178
+                wrap_body:
+                  type: boolean
+                raw_string:
+                  type: boolean
+              required: &ref_243
                 - path
                 - script_path
                 - is_flow
                 - kind
                 - is_async
-                - requires_auth
+                - authentication_method
                 - http_method
+                - is_static_website
       responses:
         '200':
           description: http trigger updated
@@ -11037,7 +12721,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: http trigger deleted
@@ -11059,24 +12743,46 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: http trigger deleted
           content:
             application/json:
               schema:
+                allOf: &ref_118
+                  - type: object
+                    properties: &ref_122
+                      path:
+                        type: string
+                      script_path:
+                        type: string
+                      email:
+                        type: string
+                      extra_perms:
+                        type: object
+                        additionalProperties:
+                          type: boolean
+                      workspace_id:
+                        type: string
+                      edited_by:
+                        type: string
+                      edited_at:
+                        type: string
+                        format: date-time
+                      is_flow:
+                        type: boolean
+                    required: &ref_123
+                      - path
+                      - script_path
+                      - email
+                      - extra_perms
+                      - workspace_id
+                      - edited_by
+                      - edited_at
+                      - is_flow
                 type: object
-                properties: &ref_98
-                  path:
-                    type: string
-                  edited_by:
-                    type: string
-                  edited_at:
-                    type: string
-                    format: date-time
-                  script_path:
-                    type: string
+                properties: &ref_119
                   route_path:
                     type: string
                   static_asset_config:
@@ -11090,16 +12796,6 @@ paths:
                         type: string
                     required:
                       - s3
-                  is_flow:
-                    type: boolean
-                  extra_perms:
-                    type: object
-                    additionalProperties:
-                      type: boolean
-                  email:
-                    type: string
-                  workspace_id:
-                    type: string
                   http_method:
                     type: string
                     enum:
@@ -11108,23 +12804,30 @@ paths:
                       - put
                       - delete
                       - patch
+                  authentication_resource_path:
+                    type: string
                   is_async:
                     type: boolean
-                  requires_auth:
+                  authentication_method:
+                    type: string
+                    enum: *ref_117
+                  is_static_website:
                     type: boolean
-                required: &ref_99
-                  - path
-                  - edited_by
-                  - edited_at
-                  - script_path
+                  workspaced_route:
+                    type: boolean
+                  wrap_body:
+                    type: boolean
+                  raw_string:
+                    type: boolean
+                required: &ref_120
                   - route_path
-                  - extra_perms
-                  - is_flow
-                  - email
-                  - workspace_id
                   - is_async
-                  - requires_auth
+                  - authentication_method
                   - http_method
+                  - is_static_website
+                  - workspaced_route
+                  - wrap_body
+                  - raw_string
   /w/{workspace}/http_triggers/list:
     get:
       summary: list http triggers
@@ -11165,9 +12868,10 @@ paths:
               schema:
                 type: array
                 items:
+                  allOf: *ref_118
                   type: object
-                  properties: *ref_98
-                  required: *ref_99
+                  properties: *ref_119
+                  required: *ref_120
   /w/{workspace}/http_triggers/exists/{path}:
     get:
       summary: does http trigger exists
@@ -11182,7 +12886,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: http trigger exists
@@ -11219,8 +12923,11 @@ paths:
                     - put
                     - delete
                     - patch
+                trigger_path:
+                  type: string
+                workspaced_route:
+                  type: boolean
               required:
-                - kind
                 - route_path
                 - http_method
       responses:
@@ -11248,7 +12955,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_179
+              properties: &ref_244
                 path:
                   type: string
                 script_path:
@@ -11273,7 +12980,7 @@ paths:
                 initial_messages:
                   type: array
                   items:
-                    anyOf: &ref_100
+                    anyOf: &ref_121
                       - type: object
                         properties:
                           raw_message:
@@ -11289,7 +12996,7 @@ paths:
                                 type: string
                               args:
                                 type: object
-                                additionalProperties: *ref_18
+                                additionalProperties: *ref_21
                               is_flow:
                                 type: boolean
                             required:
@@ -11300,15 +13007,16 @@ paths:
                           - runnable_result
                 url_runnable_args:
                   type: object
-                  additionalProperties: *ref_18
-              required: &ref_180
+                  additionalProperties: *ref_21
+                can_return_message:
+                  type: boolean
+              required: &ref_245
                 - path
                 - script_path
                 - url
                 - is_flow
                 - filters
-                - initial_messages
-                - url_runnable_args
+                - can_return_message
       responses:
         '201':
           description: websocket trigger created
@@ -11330,7 +13038,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       requestBody:
         description: updated trigger
         required: true
@@ -11338,7 +13046,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_181
+              properties: &ref_246
                 url:
                   type: string
                 path:
@@ -11361,18 +13069,19 @@ paths:
                 initial_messages:
                   type: array
                   items:
-                    anyOf: *ref_100
+                    anyOf: *ref_121
                 url_runnable_args:
                   type: object
-                  additionalProperties: *ref_18
-              required: &ref_182
+                  additionalProperties: *ref_21
+                can_return_message:
+                  type: boolean
+              required: &ref_247
                 - path
                 - script_path
                 - url
                 - is_flow
                 - filters
-                - initial_messages
-                - url_runnable_args
+                - can_return_message
       responses:
         '200':
           description: websocket trigger updated
@@ -11394,7 +13103,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: websocket trigger deleted
@@ -11416,36 +13125,21 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: websocket trigger deleted
           content:
             application/json:
               schema:
+                allOf: &ref_124
+                  - type: object
+                    properties: *ref_122
+                    required: *ref_123
                 type: object
-                properties: &ref_101
-                  path:
-                    type: string
-                  edited_by:
-                    type: string
-                  edited_at:
-                    type: string
-                    format: date-time
-                  script_path:
-                    type: string
+                properties: &ref_125
                   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:
@@ -11469,24 +13163,17 @@ paths:
                   initial_messages:
                     type: array
                     items:
-                      anyOf: *ref_100
+                      anyOf: *ref_121
                   url_runnable_args:
                     type: object
-                    additionalProperties: *ref_18
-                required: &ref_102
-                  - path
-                  - edited_by
-                  - edited_at
-                  - script_path
+                    additionalProperties: *ref_21
+                  can_return_message:
+                    type: boolean
+                required: &ref_126
                   - url
-                  - extra_perms
-                  - is_flow
-                  - email
-                  - workspace_id
                   - enabled
                   - filters
-                  - initial_messages
-                  - url_runnable_args
+                  - can_return_message
   /w/{workspace}/websocket_triggers/list:
     get:
       summary: list websocket triggers
@@ -11527,9 +13214,10 @@ paths:
               schema:
                 type: array
                 items:
+                  allOf: *ref_124
                   type: object
-                  properties: *ref_101
-                  required: *ref_102
+                  properties: *ref_125
+                  required: *ref_126
   /w/{workspace}/websocket_triggers/exists/{path}:
     get:
       summary: does websocket trigger exists
@@ -11544,7 +13232,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: websocket trigger exists
@@ -11566,7 +13254,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       requestBody:
         description: updated websocket trigger enable
         required: true
@@ -11586,6 +13274,2400 @@ paths:
             text/plain:
               schema:
                 type: string
+  /w/{workspace}/websocket_triggers/test:
+    post:
+      summary: test websocket connection
+      operationId: testWebsocketConnection
+      tags:
+        - websocket_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: test websocket connection
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                url:
+                  type: string
+                url_runnable_args:
+                  type: object
+                  additionalProperties: *ref_21
+                can_return_message:
+                  type: boolean
+              required:
+                - url
+                - can_return_message
+      responses:
+        '200':
+          description: successfuly connected to websocket
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/kafka_triggers/create:
+    post:
+      summary: create kafka trigger
+      operationId: createKafkaTrigger
+      tags:
+        - kafka_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: new kafka trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_270
+                path:
+                  type: string
+                script_path:
+                  type: string
+                is_flow:
+                  type: boolean
+                kafka_resource_path:
+                  type: string
+                group_id:
+                  type: string
+                topics:
+                  type: array
+                  items:
+                    type: string
+                enabled:
+                  type: boolean
+              required: &ref_271
+                - path
+                - script_path
+                - is_flow
+                - kafka_resource_path
+                - group_id
+                - topics
+      responses:
+        '201':
+          description: kafka trigger created
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/kafka_triggers/update/{path}:
+    post:
+      summary: update kafka trigger
+      operationId: updateKafkaTrigger
+      tags:
+        - kafka_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: updated trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_272
+                kafka_resource_path:
+                  type: string
+                group_id:
+                  type: string
+                topics:
+                  type: array
+                  items:
+                    type: string
+                path:
+                  type: string
+                script_path:
+                  type: string
+                is_flow:
+                  type: boolean
+              required: &ref_273
+                - path
+                - script_path
+                - kafka_resource_path
+                - group_id
+                - topics
+                - is_flow
+      responses:
+        '200':
+          description: kafka trigger updated
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/kafka_triggers/delete/{path}:
+    delete:
+      summary: delete kafka trigger
+      operationId: deleteKafkaTrigger
+      tags:
+        - kafka_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: kafka trigger deleted
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/kafka_triggers/get/{path}:
+    get:
+      summary: get kafka trigger
+      operationId: getKafkaTrigger
+      tags:
+        - kafka_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: kafka trigger deleted
+          content:
+            application/json:
+              schema:
+                allOf: &ref_127
+                  - type: object
+                    properties: *ref_122
+                    required: *ref_123
+                type: object
+                properties: &ref_128
+                  kafka_resource_path:
+                    type: string
+                  group_id:
+                    type: string
+                  topics:
+                    type: array
+                    items:
+                      type: string
+                  server_id:
+                    type: string
+                  last_server_ping:
+                    type: string
+                    format: date-time
+                  error:
+                    type: string
+                  enabled:
+                    type: boolean
+                required: &ref_129
+                  - kafka_resource_path
+                  - group_id
+                  - topics
+                  - enabled
+  /w/{workspace}/kafka_triggers/list:
+    get:
+      summary: list kafka triggers
+      operationId: listKafkaTriggers
+      tags:
+        - kafka_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: kafka trigger list
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  allOf: *ref_127
+                  type: object
+                  properties: *ref_128
+                  required: *ref_129
+  /w/{workspace}/kafka_triggers/exists/{path}:
+    get:
+      summary: does kafka trigger exists
+      operationId: existsKafkaTrigger
+      tags:
+        - kafka_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: kafka trigger exists
+          content:
+            application/json:
+              schema:
+                type: boolean
+  /w/{workspace}/kafka_triggers/setenabled/{path}:
+    post:
+      summary: set enabled kafka trigger
+      operationId: setKafkaTriggerEnabled
+      tags:
+        - kafka_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: updated kafka trigger enable
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                enabled:
+                  type: boolean
+              required:
+                - enabled
+      responses:
+        '200':
+          description: kafka trigger enabled set
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/kafka_triggers/test:
+    post:
+      summary: test kafka connection
+      operationId: testKafkaConnection
+      tags:
+        - kafka_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: test kafka connection
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                connection:
+                  type: object
+              required:
+                - connection
+      responses:
+        '200':
+          description: successfuly connected to kafka brokers
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/nats_triggers/create:
+    post:
+      summary: create nats trigger
+      operationId: createNatsTrigger
+      tags:
+        - nats_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: new nats trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_274
+                path:
+                  type: string
+                script_path:
+                  type: string
+                is_flow:
+                  type: boolean
+                nats_resource_path:
+                  type: string
+                use_jetstream:
+                  type: boolean
+                stream_name:
+                  type: string
+                consumer_name:
+                  type: string
+                subjects:
+                  type: array
+                  items:
+                    type: string
+                enabled:
+                  type: boolean
+              required: &ref_275
+                - path
+                - script_path
+                - is_flow
+                - nats_resource_path
+                - use_jetstream
+                - subjects
+      responses:
+        '201':
+          description: nats trigger created
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/nats_triggers/update/{path}:
+    post:
+      summary: update nats trigger
+      operationId: updateNatsTrigger
+      tags:
+        - nats_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: updated trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_276
+                nats_resource_path:
+                  type: string
+                use_jetstream:
+                  type: boolean
+                stream_name:
+                  type: string
+                consumer_name:
+                  type: string
+                subjects:
+                  type: array
+                  items:
+                    type: string
+                path:
+                  type: string
+                script_path:
+                  type: string
+                is_flow:
+                  type: boolean
+              required: &ref_277
+                - path
+                - script_path
+                - nats_resource_path
+                - use_jetstream
+                - subjects
+                - is_flow
+      responses:
+        '200':
+          description: nats trigger updated
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/nats_triggers/delete/{path}:
+    delete:
+      summary: delete nats trigger
+      operationId: deleteNatsTrigger
+      tags:
+        - nats_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: nats trigger deleted
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/nats_triggers/get/{path}:
+    get:
+      summary: get nats trigger
+      operationId: getNatsTrigger
+      tags:
+        - nats_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: nats trigger deleted
+          content:
+            application/json:
+              schema:
+                allOf: &ref_130
+                  - type: object
+                    properties: *ref_122
+                    required: *ref_123
+                type: object
+                properties: &ref_131
+                  nats_resource_path:
+                    type: string
+                  use_jetstream:
+                    type: boolean
+                  stream_name:
+                    type: string
+                  consumer_name:
+                    type: string
+                  subjects:
+                    type: array
+                    items:
+                      type: string
+                  server_id:
+                    type: string
+                  last_server_ping:
+                    type: string
+                    format: date-time
+                  error:
+                    type: string
+                  enabled:
+                    type: boolean
+                required: &ref_132
+                  - nats_resource_path
+                  - use_jetstream
+                  - subjects
+                  - enabled
+  /w/{workspace}/nats_triggers/list:
+    get:
+      summary: list nats triggers
+      operationId: listNatsTriggers
+      tags:
+        - nats_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: nats trigger list
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  allOf: *ref_130
+                  type: object
+                  properties: *ref_131
+                  required: *ref_132
+  /w/{workspace}/nats_triggers/exists/{path}:
+    get:
+      summary: does nats trigger exists
+      operationId: existsNatsTrigger
+      tags:
+        - nats_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: nats trigger exists
+          content:
+            application/json:
+              schema:
+                type: boolean
+  /w/{workspace}/nats_triggers/setenabled/{path}:
+    post:
+      summary: set enabled nats trigger
+      operationId: setNatsTriggerEnabled
+      tags:
+        - nats_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: updated nats trigger enable
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                enabled:
+                  type: boolean
+              required:
+                - enabled
+      responses:
+        '200':
+          description: nats trigger enabled set
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/nats_triggers/test:
+    post:
+      summary: test NATS connection
+      operationId: testNatsConnection
+      tags:
+        - nats_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: test nats connection
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                connection:
+                  type: object
+              required:
+                - connection
+      responses:
+        '200':
+          description: successfuly connected to NATS servers
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/sqs_triggers/create:
+    post:
+      summary: create sqs trigger
+      operationId: createSqsTrigger
+      tags:
+        - sqs_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: new sqs trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_257
+                queue_url:
+                  type: string
+                aws_auth_resource_type:
+                  type: string
+                  enum: &ref_133
+                    - oidc
+                    - credentials
+                aws_resource_path:
+                  type: string
+                message_attributes:
+                  type: array
+                  items:
+                    type: string
+                path:
+                  type: string
+                script_path:
+                  type: string
+                is_flow:
+                  type: boolean
+                enabled:
+                  type: boolean
+              required: &ref_258
+                - queue_url
+                - aws_resource_path
+                - path
+                - script_path
+                - is_flow
+                - aws_auth_resource_type
+      responses:
+        '201':
+          description: sqs trigger created
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/sqs_triggers/update/{path}:
+    post:
+      summary: update sqs trigger
+      operationId: updateSqsTrigger
+      tags:
+        - sqs_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: updated trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_259
+                queue_url:
+                  type: string
+                aws_auth_resource_type:
+                  type: string
+                  enum: *ref_133
+                aws_resource_path:
+                  type: string
+                message_attributes:
+                  type: array
+                  items:
+                    type: string
+                path:
+                  type: string
+                script_path:
+                  type: string
+                is_flow:
+                  type: boolean
+                enabled:
+                  type: boolean
+              required: &ref_260
+                - queue_url
+                - aws_resource_path
+                - path
+                - script_path
+                - is_flow
+                - enabled
+                - aws_auth_resource_type
+      responses:
+        '200':
+          description: sqs trigger updated
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/sqs_triggers/delete/{path}:
+    delete:
+      summary: delete sqs trigger
+      operationId: deleteSqsTrigger
+      tags:
+        - sqs_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: sqs trigger deleted
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/sqs_triggers/get/{path}:
+    get:
+      summary: get sqs trigger
+      operationId: getSqsTrigger
+      tags:
+        - sqs_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: sqs trigger deleted
+          content:
+            application/json:
+              schema:
+                allOf: &ref_134
+                  - type: object
+                    properties: *ref_122
+                    required: *ref_123
+                type: object
+                properties: &ref_135
+                  queue_url:
+                    type: string
+                  aws_auth_resource_type:
+                    type: string
+                    enum: *ref_133
+                  aws_resource_path:
+                    type: string
+                  message_attributes:
+                    type: array
+                    items:
+                      type: string
+                  server_id:
+                    type: string
+                  last_server_ping:
+                    type: string
+                    format: date-time
+                  error:
+                    type: string
+                  enabled:
+                    type: boolean
+                required: &ref_136
+                  - queue_url
+                  - aws_resource_path
+                  - enabled
+                  - aws_auth_resource_type
+  /w/{workspace}/sqs_triggers/list:
+    get:
+      summary: list sqs triggers
+      operationId: listSqsTriggers
+      tags:
+        - sqs_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: sqs trigger list
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  allOf: *ref_134
+                  type: object
+                  properties: *ref_135
+                  required: *ref_136
+  /w/{workspace}/sqs_triggers/exists/{path}:
+    get:
+      summary: does sqs trigger exists
+      operationId: existsSqsTrigger
+      tags:
+        - sqs_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: sqs trigger exists
+          content:
+            application/json:
+              schema:
+                type: boolean
+  /w/{workspace}/sqs_triggers/setenabled/{path}:
+    post:
+      summary: set enabled sqs trigger
+      operationId: setSqsTriggerEnabled
+      tags:
+        - sqs_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: updated sqs trigger enable
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                enabled:
+                  type: boolean
+              required:
+                - enabled
+      responses:
+        '200':
+          description: sqs trigger enabled set
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/sqs_triggers/test:
+    post:
+      summary: test sqs connection
+      operationId: testSqsConnection
+      tags:
+        - sqs_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: test sqs connection
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                connection:
+                  type: object
+              required:
+                - connection
+      responses:
+        '200':
+          description: successfuly connected to sqs
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/mqtt_triggers/create:
+    post:
+      summary: create mqtt trigger
+      operationId: createMqttTrigger
+      tags:
+        - mqtt_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: new mqtt trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_249
+                mqtt_resource_path:
+                  type: string
+                subscribe_topics:
+                  type: array
+                  items:
+                    type: object
+                    properties: &ref_137
+                      qos:
+                        type: string
+                        enum: &ref_248
+                          - qos0
+                          - qos1
+                          - qos2
+                      topic:
+                        type: string
+                    required: &ref_138
+                      - qos
+                      - topic
+                client_id:
+                  type: string
+                v3_config:
+                  type: object
+                  properties: &ref_139
+                    clean_session:
+                      type: boolean
+                v5_config:
+                  type: object
+                  properties: &ref_140
+                    clean_start:
+                      type: boolean
+                    topic_alias:
+                      type: number
+                    session_expiry_interval:
+                      type: number
+                client_version:
+                  type: string
+                  enum: &ref_141
+                    - v3
+                    - v5
+                path:
+                  type: string
+                script_path:
+                  type: string
+                is_flow:
+                  type: boolean
+                enabled:
+                  type: boolean
+              required: &ref_250
+                - path
+                - script_path
+                - is_flow
+                - subscribe_topics
+                - mqtt_resource_path
+      responses:
+        '201':
+          description: mqtt trigger created
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/mqtt_triggers/update/{path}:
+    post:
+      summary: update mqtt trigger
+      operationId: updateMqttTrigger
+      tags:
+        - mqtt_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: updated trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_251
+                mqtt_resource_path:
+                  type: string
+                subscribe_topics:
+                  type: array
+                  items:
+                    type: object
+                    properties: *ref_137
+                    required: *ref_138
+                client_id:
+                  type: string
+                v3_config:
+                  type: object
+                  properties: *ref_139
+                v5_config:
+                  type: object
+                  properties: *ref_140
+                client_version:
+                  type: string
+                  enum: *ref_141
+                path:
+                  type: string
+                script_path:
+                  type: string
+                is_flow:
+                  type: boolean
+                enabled:
+                  type: boolean
+              required: &ref_252
+                - path
+                - script_path
+                - is_flow
+                - enabled
+                - subscribe_topics
+                - mqtt_resource_path
+      responses:
+        '200':
+          description: mqtt trigger updated
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/mqtt_triggers/delete/{path}:
+    delete:
+      summary: delete mqtt trigger
+      operationId: deleteMqttTrigger
+      tags:
+        - mqtt_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: mqtt trigger deleted
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/mqtt_triggers/get/{path}:
+    get:
+      summary: get mqtt trigger
+      operationId: getMqttTrigger
+      tags:
+        - mqtt_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: mqtt trigger deleted
+          content:
+            application/json:
+              schema:
+                allOf: &ref_142
+                  - type: object
+                    properties: *ref_122
+                    required: *ref_123
+                type: object
+                properties: &ref_143
+                  mqtt_resource_path:
+                    type: string
+                  subscribe_topics:
+                    type: array
+                    items:
+                      type: object
+                      properties: *ref_137
+                      required: *ref_138
+                  v3_config:
+                    type: object
+                    properties: *ref_139
+                  v5_config:
+                    type: object
+                    properties: *ref_140
+                  client_id:
+                    type: string
+                  client_version:
+                    type: string
+                    enum: *ref_141
+                  server_id:
+                    type: string
+                  last_server_ping:
+                    type: string
+                    format: date-time
+                  error:
+                    type: string
+                  enabled:
+                    type: boolean
+                required: &ref_144
+                  - enabled
+                  - subscribe_topics
+                  - mqtt_resource_path
+  /w/{workspace}/mqtt_triggers/list:
+    get:
+      summary: list mqtt triggers
+      operationId: listMqttTriggers
+      tags:
+        - mqtt_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: mqtt trigger list
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  allOf: *ref_142
+                  type: object
+                  properties: *ref_143
+                  required: *ref_144
+  /w/{workspace}/mqtt_triggers/exists/{path}:
+    get:
+      summary: does mqtt trigger exists
+      operationId: existsMqttTrigger
+      tags:
+        - mqtt_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: mqtt trigger exists
+          content:
+            application/json:
+              schema:
+                type: boolean
+  /w/{workspace}/mqtt_triggers/setenabled/{path}:
+    post:
+      summary: set enabled mqtt trigger
+      operationId: setMqttTriggerEnabled
+      tags:
+        - mqtt_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: updated mqtt trigger enable
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                enabled:
+                  type: boolean
+              required:
+                - enabled
+      responses:
+        '200':
+          description: mqtt trigger enabled set
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/mqtt_triggers/test:
+    post:
+      summary: test mqtt connection
+      operationId: testMqttConnection
+      tags:
+        - mqtt_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: test mqtt connection
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                connection:
+                  type: object
+              required:
+                - connection
+      responses:
+        '200':
+          description: successfully connected to mqtt
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/gcp_triggers/create:
+    post:
+      summary: create gcp trigger
+      operationId: createGcpTrigger
+      tags:
+        - gcp_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: new gcp trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_145
+                gcp_resource_path:
+                  type: string
+                subscription_mode:
+                  type: string
+                  enum: &ref_150
+                    - existing
+                    - create_update
+                  description: >-
+                    The mode of subscription. 'existing' means using an existing
+                    GCP subscription, while 'create_update' involves creating or
+                    updating a new subscription.
+                topic_id:
+                  type: string
+                subscription_id:
+                  type: string
+                base_endpoint:
+                  type: string
+                delivery_type:
+                  type: string
+                  enum: &ref_147
+                    - push
+                    - pull
+                delivery_config:
+                  type: object
+                  properties: &ref_148
+                    audience:
+                      type: string
+                    authenticate:
+                      type: boolean
+                  required: &ref_149
+                    - authenticate
+                    - base_endpoint
+                path:
+                  type: string
+                script_path:
+                  type: string
+                is_flow:
+                  type: boolean
+                enabled:
+                  type: boolean
+              required: &ref_146
+                - path
+                - script_path
+                - is_flow
+                - gcp_resource_path
+                - topic_id
+                - subscription_mode
+      responses:
+        '201':
+          description: gcp trigger created
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/gcp_triggers/update/{path}:
+    post:
+      summary: update gcp trigger
+      operationId: updateGcpTrigger
+      tags:
+        - gcp_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: updated trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: *ref_145
+              required: *ref_146
+      responses:
+        '200':
+          description: gcp trigger updated
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/gcp_triggers/delete/{path}:
+    delete:
+      summary: delete gcp trigger
+      operationId: deleteGcpTrigger
+      tags:
+        - gcp_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: gcp trigger deleted
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/gcp_triggers/get/{path}:
+    get:
+      summary: get gcp trigger
+      operationId: getGcpTrigger
+      tags:
+        - gcp_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: gcp trigger deleted
+          content:
+            application/json:
+              schema:
+                allOf: &ref_151
+                  - type: object
+                    properties: *ref_122
+                    required: *ref_123
+                type: object
+                properties: &ref_152
+                  gcp_resource_path:
+                    type: string
+                  topic_id:
+                    type: string
+                  subscription_id:
+                    type: string
+                  server_id:
+                    type: string
+                  delivery_type:
+                    type: string
+                    enum: *ref_147
+                  delivery_config:
+                    type: object
+                    properties: *ref_148
+                    required: *ref_149
+                  subscription_mode:
+                    type: string
+                    enum: *ref_150
+                    description: >-
+                      The mode of subscription. 'existing' means using an
+                      existing GCP subscription, while 'create_update' involves
+                      creating or updating a new subscription.
+                  last_server_ping:
+                    type: string
+                    format: date-time
+                  error:
+                    type: string
+                  enabled:
+                    type: boolean
+                required: &ref_153
+                  - gcp_resource_path
+                  - topic_id
+                  - subscription_id
+                  - enabled
+                  - delivery_type
+                  - subscription_mode
+  /w/{workspace}/gcp_triggers/list:
+    get:
+      summary: list gcp triggers
+      operationId: listGcpTriggers
+      tags:
+        - gcp_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: gcp trigger list
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  allOf: *ref_151
+                  type: object
+                  properties: *ref_152
+                  required: *ref_153
+  /w/{workspace}/gcp_triggers/exists/{path}:
+    get:
+      summary: does gcp trigger exists
+      operationId: existsGcpTrigger
+      tags:
+        - gcp_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: gcp trigger exists
+          content:
+            application/json:
+              schema:
+                type: boolean
+  /w/{workspace}/gcp_triggers/setenabled/{path}:
+    post:
+      summary: set enabled gcp trigger
+      operationId: setGcpTriggerEnabled
+      tags:
+        - gcp_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: updated gcp trigger enable
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                enabled:
+                  type: boolean
+              required:
+                - enabled
+      responses:
+        '200':
+          description: gcp trigger enabled set
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/gcp_triggers/test:
+    post:
+      summary: test gcp connection
+      operationId: testGcpConnection
+      tags:
+        - gcp_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: test gcp connection
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                connection:
+                  type: object
+              required:
+                - connection
+      responses:
+        '200':
+          description: try to connect to a gcp broker
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/gcp_triggers/subscriptions/delete/{path}:
+    delete:
+      summary: delete gcp trigger
+      operationId: deleteGcpSubscription
+      tags:
+        - gcp_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: args to delete subscription from google cloud
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_255
+                subscription_id:
+                  type: string
+              required: &ref_256
+                - subscription_id
+      responses:
+        '200':
+          description: gcp trigger deleted
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/gcp_triggers/topics/list/{path}:
+    get:
+      summary: list all topics of google cloud service
+      operationId: listGoogleTopics
+      tags:
+        - gcp_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: get all google topics
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+  /w/{workspace}/gcp_triggers/subscriptions/list/{path}:
+    post:
+      summary: list all subscription of a give topic from google cloud service
+      operationId: listAllTGoogleTopicSubscriptions
+      tags:
+        - gcp_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: args to get subscription's topic from google cloud
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_253
+                topic_id:
+                  type: string
+              required: &ref_254
+                - topic_id
+      responses:
+        '200':
+          description: get all google topic subscriptions name
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+  /w/{workspace}/postgres_triggers/is_valid_postgres_configuration/{path}:
+    get:
+      summary: check if postgres configuration is set to logical
+      operationId: isValidPostgresConfiguration
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: boolean that indicates if postgres is set to logical level or not
+          content:
+            application/json:
+              schema:
+                type: boolean
+  /w/{workspace}/postgres_triggers/create_template_script:
+    post:
+      summary: create template script
+      operationId: createTemplateScript
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: template script
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_264
+                postgres_resource_path:
+                  type: string
+                relations:
+                  type: array
+                  items:
+                    type: object
+                    properties: &ref_155
+                      schema_name:
+                        type: string
+                      table_to_track:
+                        type: array
+                        items: &ref_262
+                          type: object
+                          properties:
+                            table_name:
+                              type: string
+                            columns_name:
+                              type: array
+                              items:
+                                type: string
+                            where_clause:
+                              type: string
+                          required:
+                            - table_name
+                    required: &ref_156
+                      - schema_name
+                      - table_to_track
+                language:
+                  type: string
+                  enum: &ref_263
+                    - Typescript
+              required: &ref_265
+                - postgres_resource_path
+                - relations
+                - language
+      responses:
+        '200':
+          description: custom id to retrieve template script
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/postgres_triggers/get_template_script/{id}:
+    get:
+      summary: get template script
+      operationId: getTemplateScript
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: id
+          in: path
+          required: true
+          schema: &ref_185
+            type: string
+      responses:
+        '200':
+          description: template script
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/postgres_triggers/slot/list/{path}:
+    get:
+      summary: list postgres replication slot
+      operationId: listPostgresReplicationSlot
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: list postgres slot
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: &ref_261
+                    slot_name:
+                      type: string
+                    active:
+                      type: boolean
+  /w/{workspace}/postgres_triggers/slot/create/{path}:
+    post:
+      summary: create replication slot for postgres
+      operationId: createPostgresReplicationSlot
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: new slot for postgres
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_154
+                name:
+                  type: string
+      responses:
+        '201':
+          description: slot created
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/postgres_triggers/slot/delete/{path}:
+    delete:
+      summary: delete postgres replication slot
+      operationId: deletePostgresReplicationSlot
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: replication slot of postgres
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: *ref_154
+      responses:
+        '200':
+          description: postgres replication slot deleted
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/postgres_triggers/publication/list/{path}:
+    get:
+      summary: list postgres publication
+      operationId: listPostgresPublication
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: database publication list
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+  /w/{workspace}/postgres_triggers/publication/get/{publication}/{path}:
+    get:
+      summary: get postgres publication
+      operationId: getPostgresPublication
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+        - name: publication
+          in: path
+          required: true
+          schema: &ref_157
+            type: string
+      responses:
+        '200':
+          description: postgres publication get
+          content:
+            application/json:
+              schema:
+                type: object
+                properties: &ref_158
+                  table_to_track:
+                    type: array
+                    items:
+                      type: object
+                      properties: *ref_155
+                      required: *ref_156
+                  transaction_to_track:
+                    type: array
+                    items:
+                      type: string
+                required: &ref_159
+                  - transaction_to_track
+  /w/{workspace}/postgres_triggers/publication/create/{publication}/{path}:
+    post:
+      summary: create publication for postgres
+      operationId: createPostgresPublication
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+        - name: publication
+          in: path
+          required: true
+          schema: *ref_157
+      requestBody:
+        description: new publication for postgres
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: *ref_158
+              required: *ref_159
+      responses:
+        '201':
+          description: publication created
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/postgres_triggers/publication/update/{publication}/{path}:
+    post:
+      summary: update publication for postgres
+      operationId: updatePostgresPublication
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+        - name: publication
+          in: path
+          required: true
+          schema: *ref_157
+      requestBody:
+        description: update publication for postgres
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: *ref_158
+              required: *ref_159
+      responses:
+        '201':
+          description: publication updated
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/postgres_triggers/publication/delete/{publication}/{path}:
+    delete:
+      summary: delete postgres publication
+      operationId: deletePostgresPublication
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+        - name: publication
+          in: path
+          required: true
+          schema: *ref_157
+      responses:
+        '200':
+          description: postgres publication deleted
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/postgres_triggers/create:
+    post:
+      summary: create postgres trigger
+      operationId: createPostgresTrigger
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: new postgres trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_266
+                replication_slot_name:
+                  type: string
+                publication_name:
+                  type: string
+                path:
+                  type: string
+                script_path:
+                  type: string
+                is_flow:
+                  type: boolean
+                enabled:
+                  type: boolean
+                postgres_resource_path:
+                  type: string
+                publication:
+                  type: object
+                  properties: *ref_158
+                  required: *ref_159
+              required: &ref_267
+                - path
+                - script_path
+                - is_flow
+                - enabled
+                - postgres_resource_path
+      responses:
+        '201':
+          description: postgres trigger created
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/postgres_triggers/update/{path}:
+    post:
+      summary: update postgres trigger
+      operationId: updatePostgresTrigger
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: updated trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_268
+                replication_slot_name:
+                  type: string
+                publication_name:
+                  type: string
+                path:
+                  type: string
+                script_path:
+                  type: string
+                is_flow:
+                  type: boolean
+                enabled:
+                  type: boolean
+                postgres_resource_path:
+                  type: string
+                publication:
+                  type: object
+                  properties: *ref_158
+                  required: *ref_159
+              required: &ref_269
+                - path
+                - script_path
+                - is_flow
+                - enabled
+                - postgres_resource_path
+                - publication_name
+                - replication_slot_name
+      responses:
+        '200':
+          description: postgres trigger updated
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/postgres_triggers/delete/{path}:
+    delete:
+      summary: delete postgres trigger
+      operationId: deletePostgresTrigger
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: postgres trigger deleted
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/postgres_triggers/get/{path}:
+    get:
+      summary: get postgres trigger
+      operationId: getPostgresTrigger
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: get postgres trigger
+          content:
+            application/json:
+              schema:
+                allOf: &ref_160
+                  - type: object
+                    properties: *ref_122
+                    required: *ref_123
+                type: object
+                properties: &ref_161
+                  enabled:
+                    type: boolean
+                  postgres_resource_path:
+                    type: string
+                  publication_name:
+                    type: string
+                  server_id:
+                    type: string
+                  replication_slot_name:
+                    type: string
+                  error:
+                    type: string
+                  last_server_ping:
+                    type: string
+                    format: date-time
+                required: &ref_162
+                  - enabled
+                  - postgres_resource_path
+                  - replication_slot_name
+                  - publication_name
+  /w/{workspace}/postgres_triggers/list:
+    get:
+      summary: list postgres triggers
+      operationId: listPostgresTriggers
+      tags:
+        - postgres_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: postgres trigger list
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  allOf: *ref_160
+                  type: object
+                  properties: *ref_161
+                  required: *ref_162
+  /w/{workspace}/postgres_triggers/exists/{path}:
+    get:
+      summary: does postgres trigger exists
+      operationId: existsPostgresTrigger
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: postgres trigger exists
+          content:
+            application/json:
+              schema:
+                type: boolean
+  /w/{workspace}/postgres_triggers/setenabled/{path}:
+    post:
+      summary: set enabled postgres trigger
+      operationId: setPostgresTriggerEnabled
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: updated postgres trigger enable
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                enabled:
+                  type: boolean
+              required:
+                - enabled
+      responses:
+        '200':
+          description: postgres trigger enabled set
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/postgres_triggers/test:
+    post:
+      summary: test postgres connection
+      operationId: testPostgresConnection
+      tags:
+        - postgres_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      requestBody:
+        description: test postgres connection
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                database:
+                  type: string
+              required:
+                - database
+      responses:
+        '200':
+          description: successfuly connected to postgres
+          content:
+            text/plain:
+              schema:
+                type: string
   /groups/list:
     get:
       summary: list instance groups
@@ -11601,7 +15683,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_104
+                  properties: &ref_164
                     name:
                       type: string
                     summary:
@@ -11610,7 +15692,7 @@ paths:
                       type: array
                       items:
                         type: string
-                  required: &ref_105
+                  required: &ref_165
                     - name
   /groups/get/{name}:
     get:
@@ -11622,7 +15704,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       responses:
         '200':
           description: instance group
@@ -11630,8 +15712,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_104
-                required: *ref_105
+                properties: *ref_164
+                required: *ref_165
   /groups/create:
     post:
       summary: create instance group
@@ -11669,7 +15751,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       requestBody:
         description: update instance group
         required: true
@@ -11699,7 +15781,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       responses:
         '200':
           description: instance group deleted
@@ -11717,7 +15799,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       requestBody:
         description: user to add to instance group
         required: true
@@ -11747,7 +15829,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       requestBody:
         description: user to remove from instance group
         required: true
@@ -11782,7 +15864,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_106
+                  properties: &ref_166
                     name:
                       type: string
                     summary:
@@ -11797,7 +15879,7 @@ paths:
                       type: string
                     external_id:
                       type: string
-                  required: &ref_107
+                  required: &ref_167
                     - name
   /groups/overwrite:
     post:
@@ -11814,8 +15896,8 @@ paths:
               type: array
               items:
                 type: object
-                properties: *ref_106
-                required: *ref_107
+                properties: *ref_166
+                required: *ref_167
       responses:
         '200':
           description: success message
@@ -11851,7 +15933,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_108
+                  properties: &ref_168
                     name:
                       type: string
                     summary:
@@ -11864,7 +15946,7 @@ paths:
                       type: object
                       additionalProperties:
                         type: boolean
-                  required: &ref_109
+                  required: &ref_169
                     - name
   /w/{workspace}/groups/listnames:
     get:
@@ -11937,7 +16019,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       requestBody:
         description: updated group
         required: true
@@ -11969,7 +16051,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       responses:
         '200':
           description: group deleted
@@ -11991,7 +16073,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       responses:
         '200':
           description: group
@@ -11999,8 +16081,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_108
-                required: *ref_109
+                properties: *ref_168
+                required: *ref_169
   /w/{workspace}/groups/adduser/{name}:
     post:
       summary: add user to group
@@ -12015,7 +16097,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       requestBody:
         description: added user to group
         required: true
@@ -12047,7 +16129,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       requestBody:
         description: added user to group
         required: true
@@ -12093,7 +16175,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_110
+                  properties: &ref_170
                     name:
                       type: string
                     owners:
@@ -12111,7 +16193,7 @@ paths:
                     edited_at:
                       type: string
                       format: date-time
-                  required: &ref_111
+                  required: &ref_171
                     - name
                     - owners
                     - extra_perms
@@ -12193,7 +16275,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       requestBody:
         description: update folder
         required: true
@@ -12232,7 +16314,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       responses:
         '200':
           description: folder deleted
@@ -12254,7 +16336,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       responses:
         '200':
           description: folder
@@ -12262,8 +16344,30 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_110
-                required: *ref_111
+                properties: *ref_170
+                required: *ref_171
+  /w/{workspace}/folders/exists/{name}:
+    get:
+      summary: exists folder
+      operationId: existsFolder
+      tags:
+        - folder
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: name
+          in: path
+          required: true
+          schema: *ref_163
+      responses:
+        '200':
+          description: folder exists
+          content:
+            application/json:
+              schema:
+                type: boolean
   /w/{workspace}/folders/getusage/{name}:
     get:
       summary: get folder usage
@@ -12278,7 +16382,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       responses:
         '200':
           description: folder
@@ -12320,7 +16424,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       requestBody:
         description: owner user to folder
         required: true
@@ -12354,7 +16458,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       requestBody:
         description: added owner to folder
         required: true
@@ -12408,7 +16512,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_183
+                  properties: &ref_278
                     worker:
                       type: string
                     worker_instance:
@@ -12450,7 +16554,7 @@ paths:
                       type: number
                     wm_memory_usage:
                       type: number
-                  required: &ref_184
+                  required: &ref_279
                     - worker
                     - worker_instance
                     - ping_at
@@ -12558,13 +16662,39 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       responses:
         '200':
           description: a config
           content:
             application/json:
-              schema: {}
+              schema:
+                type: object
+                nullable: true
+                properties: &ref_201
+                  alerts:
+                    type: array
+                    items:
+                      type: object
+                      properties: &ref_199
+                        name:
+                          type: string
+                        tags_to_monitor:
+                          type: array
+                          items:
+                            type: string
+                        jobs_num_threshold:
+                          type: integer
+                        alert_cooldown_seconds:
+                          type: integer
+                        alert_time_threshold_seconds:
+                          type: integer
+                      required: &ref_200
+                        - name
+                        - tags_to_monitor
+                        - jobs_num_threshold
+                        - alert_cooldown_seconds
+                        - alert_time_threshold_seconds
   /configs/update/{name}:
     post:
       summary: Update config
@@ -12575,7 +16705,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       requestBody:
         description: worker group
         required: true
@@ -12598,7 +16728,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_103
+          schema: *ref_163
       responses:
         '200':
           description: Delete config
@@ -12621,12 +16751,12 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_225
+                  properties: &ref_320
                     name:
                       type: string
                     config:
                       type: object
-                  required: &ref_226
+                  required: &ref_321
                     - name
   /configs/list_autoscaling_events/{worker_group}:
     get:
@@ -12649,7 +16779,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_229
+                  properties: &ref_324
                     id:
                       type: integer
                       format: int64
@@ -12664,6 +16794,54 @@ paths:
                     applied_at:
                       type: string
                       format: date-time
+  /configs/list_available_python_versions:
+    get:
+      summary: Get currently available python versions provided by UV.
+      operationId: listAvailablePythonVersions
+      tags:
+        - config
+      responses:
+        '200':
+          description: List of python versions
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+  /agent_workers/create_agent_token:
+    post:
+      summary: create agent token
+      operationId: createAgentToken
+      tags:
+        - agent_workers
+      requestBody:
+        description: agent token
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                worker_group:
+                  type: string
+                tags:
+                  type: array
+                  items:
+                    type: string
+                exp:
+                  type: integer
+              required:
+                - worker_group
+                - tags
+                - exp
+      responses:
+        '200':
+          description: agent token created
+          content:
+            application/json:
+              schema:
+                type: string
   /w/{workspace}/acls/get/{kind}/{path}:
     get:
       summary: get granular acls
@@ -12678,7 +16856,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
         - name: kind
           in: path
           required: true
@@ -12696,6 +16874,12 @@ paths:
               - raw_app
               - http_trigger
               - websocket_trigger
+              - kafka_trigger
+              - nats_trigger
+              - postgres_trigger
+              - mqtt_trigger
+              - gcp_trigger
+              - sqs_trigger
       responses:
         '200':
           description: acls
@@ -12719,7 +16903,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
         - name: kind
           in: path
           required: true
@@ -12737,6 +16921,12 @@ paths:
               - raw_app
               - http_trigger
               - websocket_trigger
+              - kafka_trigger
+              - nats_trigger
+              - postgres_trigger
+              - mqtt_trigger
+              - gcp_trigger
+              - sqs_trigger
       requestBody:
         description: acl to add
         required: true
@@ -12772,7 +16962,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
         - name: kind
           in: path
           required: true
@@ -12790,6 +16980,12 @@ paths:
               - raw_app
               - http_trigger
               - websocket_trigger
+              - kafka_trigger
+              - nats_trigger
+              - postgres_trigger
+              - mqtt_trigger
+              - gcp_trigger
+              - sqs_trigger
       requestBody:
         description: acl to add
         required: true
@@ -12809,10 +17005,10 @@ paths:
             text/plain:
               schema:
                 type: string
-  /w/{workspace}/capture_u/{path}:
+  /w/{workspace}/capture/set_config:
     post:
-      summary: update flow preview capture
-      operationId: updateCapture
+      summary: set capture config
+      operationId: setCaptureConfig
       tags:
         - capture
       parameters:
@@ -12820,17 +17016,48 @@ paths:
           in: path
           required: true
           schema: *ref_0
-        - name: path
-          in: path
-          required: true
-          schema: *ref_23
+      requestBody:
+        description: capture config
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                trigger_kind:
+                  type: string
+                  enum: &ref_172
+                    - webhook
+                    - http
+                    - websocket
+                    - kafka
+                    - email
+                    - nats
+                    - postgres
+                    - sqs
+                    - mqtt
+                    - gcp
+                path:
+                  type: string
+                is_flow:
+                  type: boolean
+                trigger_config:
+                  type: object
+              required:
+                - trigger_kind
+                - path
+                - is_flow
       responses:
-        '204':
-          description: flow preview captured
-  /w/{workspace}/capture/{path}:
-    put:
-      summary: create flow preview capture
-      operationId: createCapture
+        '200':
+          description: capture config set
+          content:
+            application/json:
+              schema:
+                type: object
+  /w/{workspace}/capture/ping_config/{trigger_kind}/{runnable_kind}/{path}:
+    post:
+      summary: ping capture config
+      operationId: pingCaptureConfig
       tags:
         - capture
       parameters:
@@ -12838,15 +17065,160 @@ paths:
           in: path
           required: true
           schema: *ref_0
+        - name: trigger_kind
+          in: path
+          required: true
+          schema:
+            type: string
+            enum: *ref_172
+        - name: runnable_kind
+          in: path
+          required: true
+          schema: *ref_73
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
-        '201':
-          description: flow preview capture created
+        '200':
+          description: capture config pinged
+  /w/{workspace}/capture/get_configs/{runnable_kind}/{path}:
     get:
-      summary: get flow preview capture
+      summary: get capture configs for a script or flow
+      operationId: getCaptureConfigs
+      tags:
+        - capture
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: runnable_kind
+          in: path
+          required: true
+          schema: *ref_73
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      responses:
+        '200':
+          description: capture configs for a script or flow
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: &ref_325
+                    trigger_config: {}
+                    trigger_kind:
+                      type: string
+                      enum: *ref_172
+                    error:
+                      type: string
+                    last_server_ping:
+                      type: string
+                      format: date-time
+                  required: &ref_326
+                    - trigger_kind
+  /w/{workspace}/capture/list/{runnable_kind}/{path}:
+    get:
+      summary: list captures for a script or flow
+      operationId: listCaptures
+      tags:
+        - capture
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: runnable_kind
+          in: path
+          required: true
+          schema: *ref_73
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+        - name: trigger_kind
+          in: query
+          schema:
+            type: string
+            enum: *ref_172
+        - 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: list of captures for a script or flow
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: &ref_173
+                    trigger_kind:
+                      type: string
+                      enum: *ref_172
+                    main_args: {}
+                    preprocessor_args: {}
+                    id:
+                      type: integer
+                    created_at:
+                      type: string
+                      format: date-time
+                  required: &ref_174
+                    - trigger_kind
+                    - main_args
+                    - preprocessor_args
+                    - id
+                    - created_at
+  /w/{workspace}/capture/move/{runnable_kind}/{path}:
+    post:
+      summary: move captures and configs for a script or flow
+      operationId: moveCapturesAndConfigs
+      tags:
+        - capture
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: runnable_kind
+          in: path
+          required: true
+          schema: *ref_73
+        - name: path
+          in: path
+          required: true
+          schema: *ref_26
+      requestBody:
+        description: move captures and configs to a new path
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                new_path:
+                  type: string
+      responses:
+        '200':
+          description: captures and configs moved
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/capture/{id}:
+    get:
+      summary: get a capture
       operationId: getCapture
       tags:
         - capture
@@ -12855,18 +17227,38 @@ paths:
           in: path
           required: true
           schema: *ref_0
-        - name: path
+        - name: id
           in: path
           required: true
-          schema: *ref_23
+          schema:
+            type: integer
       responses:
         '200':
-          description: captured flow preview
+          description: capture
           content:
             application/json:
-              schema: {}
-        '404':
-          description: capture does not exist for this flow
+              schema:
+                type: object
+                properties: *ref_173
+                required: *ref_174
+    delete:
+      summary: delete a capture
+      operationId: deleteCapture
+      tags:
+        - capture
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: capture deleted
   /w/{workspace}/favorites/star:
     post:
       summary: star item
@@ -12938,13 +17330,13 @@ paths:
           schema: *ref_0
         - name: runnable_id
           in: query
-          schema: &ref_112
+          schema: &ref_175
             type: string
         - name: runnable_type
           in: query
-          schema: &ref_113
+          schema: &ref_176
             type: string
-            enum: &ref_142
+            enum: &ref_207
               - ScriptHash
               - ScriptPath
               - FlowPath
@@ -12956,6 +17348,16 @@ paths:
           description: number of items to return for a given page (default 30, max 100)
           in: query
           schema: *ref_6
+        - name: args
+          description: >-
+            filter on jobs containing those args as a json subset (@> in
+            postgres)
+          in: query
+          schema: *ref_93
+        - name: include_preview
+          in: query
+          schema:
+            type: boolean
       responses:
         '200':
           description: Input history for completed jobs
@@ -12965,7 +17367,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_114
+                  properties: &ref_177
                     id:
                       type: string
                     name:
@@ -12979,7 +17381,7 @@ paths:
                       type: boolean
                     success:
                       type: boolean
-                  required: &ref_115
+                  required: &ref_178
                     - id
                     - name
                     - args
@@ -13029,10 +17431,10 @@ paths:
           schema: *ref_0
         - name: runnable_id
           in: query
-          schema: *ref_112
+          schema: *ref_175
         - name: runnable_type
           in: query
-          schema: *ref_113
+          schema: *ref_176
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -13050,8 +17452,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_114
-                  required: *ref_115
+                  properties: *ref_177
+                  required: *ref_178
   /w/{workspace}/inputs/create:
     post:
       summary: Create an Input for future use in a script or flow
@@ -13065,10 +17467,10 @@ paths:
           schema: *ref_0
         - name: runnable_id
           in: query
-          schema: *ref_112
+          schema: *ref_175
         - name: runnable_type
           in: query
-          schema: *ref_113
+          schema: *ref_176
       requestBody:
         description: Input
         required: true
@@ -13076,12 +17478,12 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_138
+              properties: &ref_203
                 name:
                   type: string
                 args:
                   type: object
-              required: &ref_139
+              required: &ref_204
                 - name
                 - args
                 - created_by
@@ -13111,14 +17513,14 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_140
+              properties: &ref_205
                 id:
                   type: string
                 name:
                   type: string
                 is_public:
                   type: boolean
-              required: &ref_141
+              required: &ref_206
                 - id
                 - name
                 - is_public
@@ -13144,7 +17546,7 @@ paths:
         - name: input
           in: path
           required: true
-          schema: &ref_134
+          schema: &ref_193
             type: string
       responses:
         '200':
@@ -13177,7 +17579,7 @@ paths:
               properties:
                 s3_resource:
                   type: object
-                  properties: &ref_116
+                  properties: &ref_179
                     bucket:
                       type: string
                     region:
@@ -13192,7 +17594,7 @@ paths:
                       type: string
                     pathStyle:
                       type: boolean
-                  required: &ref_117
+                  required: &ref_180
                     - bucket
                     - region
                     - endPoint
@@ -13243,6 +17645,8 @@ paths:
                 properties:
                   connection_settings_str:
                     type: string
+                  azure_container_path:
+                    type: string
                 required:
                   - connection_settings_str
   /w/{workspace}/job_helpers/polars_connection_settings:
@@ -13268,8 +17672,8 @@ paths:
               properties:
                 s3_resource:
                   type: object
-                  properties: *ref_116
-                  required: *ref_117
+                  properties: *ref_179
+                  required: *ref_180
       responses:
         '200':
           description: Connection settings
@@ -13290,10 +17694,10 @@ paths:
                     type: boolean
                   client_kwargs:
                     type: object
-                    properties: &ref_118
+                    properties: &ref_181
                       region_name:
                         type: string
-                    required: &ref_119
+                    required: &ref_182
                       - region_name
                 required:
                   - endpoint_url
@@ -13348,8 +17752,8 @@ paths:
                         type: boolean
                       client_kwargs:
                         type: object
-                        properties: *ref_118
-                        required: *ref_119
+                        properties: *ref_181
+                        required: *ref_182
                     required:
                       - endpoint_url
                       - use_ssl
@@ -13407,8 +17811,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_116
-                required: *ref_117
+                properties: *ref_179
+                required: *ref_180
   /w/{workspace}/job_helpers/test_connection:
     get:
       summary: Test connection to the workspace object storage
@@ -13472,10 +17876,10 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties: &ref_202
+                      properties: &ref_297
                         s3:
                           type: string
-                      required: &ref_203
+                      required: &ref_298
                         - s3
                   restricted_access:
                     type: boolean
@@ -13508,7 +17912,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_204
+                properties: &ref_299
                   mime_type:
                     type: string
                   size_in_bytes:
@@ -13572,7 +17976,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_205
+                properties: &ref_300
                   msg:
                     type: string
                   content:
@@ -13584,7 +17988,7 @@ paths:
                       - Csv
                       - Parquet
                       - Unknown
-                required: &ref_206
+                required: &ref_301
                   - content_type
   /w/{workspace}/job_helpers/load_parquet_preview/{path}:
     get:
@@ -13600,7 +18004,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
         - name: offset
           in: query
           schema:
@@ -13649,7 +18053,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
         - name: search_col
           in: query
           schema:
@@ -13686,7 +18090,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
         - name: offset
           in: query
           schema:
@@ -13847,7 +18251,7 @@ paths:
                   - file_key
   /w/{workspace}/job_helpers/download_s3_file:
     get:
-      summary: Download file to S3 bucket
+      summary: Download file from S3 bucket
       operationId: fileDownload
       tags:
         - helpers
@@ -13930,7 +18334,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
       requestBody:
         description: parameters for statistics retrieval
         required: true
@@ -13959,46 +18363,46 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties: &ref_209
+                      properties: &ref_304
                         id:
                           type: string
                         name:
                           type: string
-                      required: &ref_210
+                      required: &ref_305
                         - id
                   scalar_metrics:
                     type: array
                     items:
                       type: object
-                      properties: &ref_211
+                      properties: &ref_306
                         metric_id:
                           type: string
                         value:
                           type: number
-                      required: &ref_212
+                      required: &ref_307
                         - id
                         - value
                   timeseries_metrics:
                     type: array
                     items:
                       type: object
-                      properties: &ref_213
+                      properties: &ref_308
                         metric_id:
                           type: string
                         values:
                           type: array
                           items:
                             type: object
-                            properties: &ref_215
+                            properties: &ref_310
                               timestamp:
                                 type: string
                                 format: date-time
                               value:
                                 type: number
-                            required: &ref_216
+                            required: &ref_311
                               - timestamp
                               - value
-                      required: &ref_214
+                      required: &ref_309
                         - id
                         - values
   /w/{workspace}/job_metrics/set_progress/{id}:
@@ -14015,7 +18419,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
       requestBody:
         description: parameters for statistics retrieval
         required: true
@@ -14049,7 +18453,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
       responses:
         '200':
           description: job progress between 0 and 99
@@ -14067,11 +18471,11 @@ paths:
         - name: before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_120
+          schema: *ref_183
         - name: after
           description: filter on created after (exclusive) timestamp
           in: query
-          schema: *ref_121
+          schema: *ref_184
         - name: with_error
           in: query
           required: false
@@ -14120,7 +18524,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_23
+          schema: *ref_26
       responses:
         '200':
           description: log stream
@@ -14143,12 +18547,12 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_219
+                  properties: &ref_314
                     concurrency_key:
                       type: string
                     total_running:
                       type: number
-                  required: &ref_220
+                  required: &ref_315
                     - concurrency_key
                     - total_running
   /concurrency_groups/prune/{concurrency_id}:
@@ -14161,7 +18565,7 @@ paths:
         - name: concurrency_id
           in: path
           required: true
-          schema: &ref_136
+          schema: &ref_195
             type: string
       responses:
         '200':
@@ -14181,7 +18585,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_91
+          schema: *ref_110
       responses:
         '200':
           description: concurrency key for given job
@@ -14214,93 +18618,97 @@ paths:
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_53
+          schema: *ref_60
         - 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_86
+          schema: *ref_98
         - 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_46
+          schema: *ref_53
         - name: script_path_exact
           description: mask to filter exact matching path
           in: query
-          schema: *ref_70
+          schema: *ref_83
         - name: script_path_start
           description: mask to filter matching starting path
           in: query
-          schema: *ref_71
+          schema: *ref_84
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_72
+          schema: *ref_85
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_73
+          schema: *ref_86
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_74
+          schema: *ref_87
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_75
+          schema: *ref_88
         - 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_122
+          schema: *ref_103
         - name: running
           description: filter on running jobs
           in: query
-          schema: *ref_80
+          schema: *ref_89
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: *ref_77
+          schema: *ref_90
         - 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_123
+          schema: *ref_104
         - 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_124
+          schema: *ref_105
         - name: job_kinds
           description: >-
             filter on job kind (values 'preview', 'script', 'dependencies',
             'flow') separated by,
           in: query
-          schema: *ref_78
+          schema: *ref_91
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_81
+          schema: *ref_93
         - name: tag
           description: filter on jobs with a given tag/worker group
           in: query
-          schema: *ref_83
+          schema: *ref_94
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_82
+          schema: *ref_95
+        - name: allow_wildcards
+          description: allow wildcards (*) in the filter of label, tag, worker
+          in: query
+          schema: *ref_97
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -14348,17 +18756,17 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_221
+                properties: &ref_316
                   jobs:
                     type: array
                     items:
-                      oneOf: *ref_92
-                      discriminator: *ref_93
+                      oneOf: *ref_111
+                      discriminator: *ref_112
                   obscured_jobs:
                     type: array
                     items:
                       type: object
-                      properties: &ref_143
+                      properties: &ref_208
                         typ:
                           type: string
                         started_at:
@@ -14371,7 +18779,7 @@ paths:
                       Obscured jobs omitted for security because of too specific
                       filtering
                     type: boolean
-                required: &ref_222
+                required: &ref_317
                   - jobs
                   - obscured_jobs
   /srch/w/{workspace}/index/search/job:
@@ -14390,6 +18798,11 @@ paths:
           required: true
           schema:
             type: string
+        - name: pagination_offset
+          in: query
+          required: false
+          schema:
+            type: integer
       responses:
         '200':
           description: search results
@@ -14404,18 +18817,29 @@ paths:
                       ignored)
                     type: array
                     items:
-                      type: object
-                      properties:
-                        dancer:
-                          type: string
+                      type: string
                   hits:
                     description: the jobs that matched the query
                     type: array
                     items:
                       type: object
-                      properties: &ref_227
+                      properties: &ref_322
                         dancer:
                           type: string
+                  hit_count:
+                    description: how many jobs matched in total
+                    type: number
+                  index_metadata:
+                    description: Metadata about the index current state
+                    type: object
+                    properties:
+                      indexed_until:
+                        description: Datetime of the most recently indexed job
+                        type: string
+                        format: date-time
+                      lost_lock_ownership:
+                        description: Is the current indexer service being replaced
+                        type: boolean
   /srch/index/search/service_logs:
     get:
       summary: Search through service logs with a string query
@@ -14475,7 +18899,7 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties: &ref_228
+                      properties: &ref_323
                         dancer:
                           type: string
   /srch/index/search/count_service_logs:
@@ -14490,11 +18914,6 @@ paths:
           required: true
           schema:
             type: string
-        - name: hosts
-          in: query
-          required: true
-          schema:
-            type: string
         - name: min_ts
           in: query
           required: false
@@ -14525,6 +18944,28 @@ paths:
                   count_per_host:
                     description: count of log lines that matched the query per hostname
                     type: object
+  /srch/index/delete/{idx_name}:
+    delete:
+      summary: Restart container and delete the index to recreate it.
+      operationId: clearIndex
+      tags:
+        - indexSearch
+      parameters:
+        - name: idx_name
+          in: path
+          required: true
+          schema:
+            type: string
+            enum:
+              - JobIndex
+              - ServiceLogIndex
+      responses:
+        '200':
+          description: idx to be deleted and container restarting
+          content:
+            text/plain:
+              schema:
+                type: string
 components:
   securitySchemes:
     bearerAuth:
@@ -14535,6 +18976,11 @@ components:
       in: cookie
       name: token
   parameters:
+    Id:
+      name: id
+      in: path
+      required: true
+      schema: *ref_185
     Key:
       name: key
       in: path
@@ -14545,61 +18991,71 @@ components:
       in: path
       required: true
       schema: *ref_0
+    PublicationName:
+      name: publication
+      in: path
+      required: true
+      schema: *ref_157
     VersionId:
       name: version
       in: path
       required: true
-      schema: *ref_125
+      schema: *ref_186
     Token:
       name: token
       in: path
       required: true
-      schema: *ref_126
+      schema: *ref_187
     AccountId:
       name: id
       in: path
       required: true
-      schema: *ref_27
+      schema: *ref_31
     ClientName:
       name: client_name
       in: path
       required: true
-      schema: *ref_26
+      schema: *ref_30
     ScriptPath:
       name: path
       in: path
       required: true
-      schema: *ref_35
+      schema: *ref_41
     ScriptHash:
       name: hash
       in: path
       required: true
-      schema: *ref_39
+      schema: *ref_46
     JobId:
       name: id
       in: path
       required: true
-      schema: *ref_91
+      schema: *ref_110
     Path:
       name: path
       in: path
       required: true
-      schema: *ref_23
+      schema: *ref_26
+    CustomPath:
+      name: custom_path
+      in: path
+      required: true
+      schema: *ref_74
     PathId:
       name: id
       in: path
       required: true
-      schema: *ref_30
+      schema: *ref_34
     PathVersion:
       name: version
       in: path
       required: true
-      schema: *ref_127
+      schema: *ref_188
     Name:
       name: name
       in: path
       required: true
-      schema: *ref_103
+      schema: *ref_163
     Page:
       name: page
       description: which page to return (start at 1, default 1)
@@ -14614,12 +19070,12 @@ components:
       name: order_desc
       description: order by desc order (default true)
       in: query
-      schema: *ref_52
+      schema: *ref_59
     CreatedBy:
       name: created_by
       description: mask to filter exact matching user creator
       in: query
-      schema: *ref_53
+      schema: *ref_60
     Label:
       name: label
       description: >-
@@ -14627,26 +19083,31 @@ components:
         with as a result an object containing a string in the array at key
         'wm_labels')
       in: query
-      schema: *ref_86
+      schema: *ref_98
+    Worker:
+      name: worker
+      description: worker this job was ran on
+      in: query
+      schema: *ref_82
     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_46
+      schema: *ref_53
     WorkerTag:
       name: tag
       description: Override the tag to use
       in: query
-      schema: *ref_48
+      schema: *ref_55
     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_49
+      schema: *ref_56
     NewJobId:
       name: job_id
       description: >-
@@ -14654,7 +19115,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_47
+      schema: *ref_54
     IncludeHeader:
       name: include_header
       description: >
@@ -14664,14 +19125,14 @@ components:
         Header's key lowercased and '-'' replaced to '_' such that
         'Content-Type' becomes the 'content_type' arg key
       in: query
-      schema: *ref_50
+      schema: *ref_57
     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_51
+      schema: *ref_58
     Payload:
       name: payload
       description: >
@@ -14680,253 +19141,283 @@ components:
 
         `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
       in: query
-      schema: *ref_94
+      schema: *ref_113
     ScriptStartPath:
       name: script_path_start
       description: mask to filter matching starting path
       in: query
-      schema: *ref_71
+      schema: *ref_84
     SchedulePath:
       name: schedule_path
       description: mask to filter by schedule path
       in: query
-      schema: *ref_72
+      schema: *ref_85
     ScriptExactPath:
       name: script_path_exact
       description: mask to filter exact matching path
       in: query
-      schema: *ref_70
+      schema: *ref_83
     ScriptExactHash:
       name: script_hash
       description: mask to filter exact matching path
       in: query
-      schema: *ref_73
+      schema: *ref_86
     CreatedBefore:
       name: created_before
       description: filter on created before (inclusive) timestamp
       in: query
-      schema: *ref_128
+      schema: *ref_101
     CreatedAfter:
       name: created_after
       description: filter on created after (exclusive) timestamp
       in: query
-      schema: *ref_129
+      schema: *ref_102
     StartedBefore:
       name: started_before
       description: filter on started before (inclusive) timestamp
       in: query
-      schema: *ref_74
+      schema: *ref_87
     StartedAfter:
       name: started_after
       description: filter on started after (exclusive) timestamp
       in: query
-      schema: *ref_75
+      schema: *ref_88
     Before:
       name: before
       description: filter on started before (inclusive) timestamp
       in: query
-      schema: *ref_120
+      schema: *ref_183
     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_123
+      schema: *ref_104
     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_124
+      schema: *ref_105
     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_122
+      schema: *ref_103
     Success:
       name: success
       description: filter on successful jobs
       in: query
-      schema: *ref_76
+      schema: *ref_96
     ScheduledForBeforeNow:
       name: scheduled_for_before_now
       description: filter on jobs scheduled_for before now (hence waitinf for a worker)
       in: query
-      schema: *ref_77
+      schema: *ref_90
     Suspended:
       name: suspended
       description: filter on suspended jobs
       in: query
-      schema: *ref_79
+      schema: *ref_92
     Running:
       name: running
       description: filter on running jobs
       in: query
-      schema: *ref_80
+      schema: *ref_89
+    AllowWildcards:
+      name: allow_wildcards
+      description: allow wildcards (*) in the filter of label, tag, worker
+      in: query
+      schema: *ref_97
     ArgsFilter:
       name: args
       description: filter on jobs containing those args as a json subset (@> in postgres)
       in: query
-      schema: *ref_81
+      schema: *ref_93
     Tag:
       name: tag
       description: filter on jobs with a given tag/worker group
       in: query
-      schema: *ref_83
+      schema: *ref_94
     ResultFilter:
       name: result
       description: filter on jobs containing those result as a json subset (@> in postgres)
       in: query
-      schema: *ref_82
+      schema: *ref_95
     After:
       name: after
       description: filter on created after (exclusive) timestamp
       in: query
-      schema: *ref_121
+      schema: *ref_184
     Username:
       name: username
       description: filter on exact username of user
       in: query
-      schema: *ref_130
+      schema: *ref_189
     Operation:
       name: operation
       description: filter on exact or prefix name of operation
       in: query
-      schema: *ref_131
+      schema: *ref_190
     ResourceName:
       name: resource
       description: filter on exact or prefix name of resource
       in: query
-      schema: *ref_132
+      schema: *ref_191
     ActionKind:
       name: action_kind
       description: filter on type of operation
       in: query
-      schema: *ref_133
+      schema: *ref_192
     JobKinds:
       name: job_kinds
       description: >-
         filter on job kind (values 'preview', 'script', 'dependencies', 'flow')
         separated by,
       in: query
-      schema: *ref_78
+      schema: *ref_91
     RunnableId:
       name: runnable_id
       in: query
-      schema: *ref_112
+      schema: *ref_175
     RunnableTypeQuery:
       name: runnable_type
       in: query
-      schema: *ref_113
+      schema: *ref_176
     InputId:
       name: input
       in: path
       required: true
-      schema: *ref_134
+      schema: *ref_193
     GetStarted:
       name: get_started
       in: query
-      schema: *ref_135
+      schema: *ref_194
     ConcurrencyId:
       name: concurrency_id
       in: path
       required: true
-      schema: *ref_136
+      schema: *ref_195
+    RunnableKind:
+      name: runnable_kind
+      in: path
+      required: true
+      schema: *ref_73
   schemas:
-    AiResource:
+    InputTransform:
+      allOf: *ref_77
+    AIProvider:
+      type: string
+      enum: *ref_196
+    AIProviderModel:
       type: object
-      properties: *ref_16
-      required: *ref_17
+      properties: *ref_18
+      required: *ref_19
+    AIProviderConfig:
+      type: object
+      properties: *ref_197
+      required: *ref_198
+    AIConfig:
+      type: object
+      properties: *ref_20
+    Alert:
+      type: object
+      properties: *ref_199
+      required: *ref_200
+    Configs:
+      type: object
+      nullable: true
+      properties: *ref_201
     Script:
-      type: object
-      properties: *ref_37
-      required: *ref_38
-    NewScript:
-      type: object
-      properties: *ref_42
-      required: *ref_43
-    NewScriptWithDraft:
-      allOf: *ref_137
-    ScriptHistory:
       type: object
       properties: *ref_44
       required: *ref_45
+    NewScript:
+      type: object
+      properties: *ref_49
+      required: *ref_50
+    NewScriptWithDraft:
+      allOf: *ref_202
+    ScriptHistory:
+      type: object
+      properties: *ref_51
+      required: *ref_52
     ScriptArgs:
       type: object
-      additionalProperties: *ref_18
+      additionalProperties: *ref_21
     Input:
       type: object
-      properties: *ref_114
-      required: *ref_115
+      properties: *ref_177
+      required: *ref_178
     CreateInput:
       type: object
-      properties: *ref_138
-      required: *ref_139
+      properties: *ref_203
+      required: *ref_204
     UpdateInput:
       type: object
-      properties: *ref_140
-      required: *ref_141
+      properties: *ref_205
+      required: *ref_206
     RunnableType:
       type: string
-      enum: *ref_142
+      enum: *ref_207
     QueuedJob:
       type: object
-      properties: *ref_89
-      required: *ref_90
+      properties: *ref_108
+      required: *ref_109
     CompletedJob:
       type: object
-      properties: *ref_87
-      required: *ref_88
+      properties: *ref_106
+      required: *ref_107
     ObscuredJob:
       type: object
-      properties: *ref_143
+      properties: *ref_208
     Job:
-      oneOf: *ref_92
-      discriminator: *ref_93
+      oneOf: *ref_111
+      discriminator: *ref_112
     User:
       type: object
       properties: *ref_10
       required: *ref_11
     UserUsage:
       type: object
-      properties: *ref_144
+      properties: *ref_209
     Login:
       type: object
-      properties: *ref_145
-      required: *ref_146
+      properties: *ref_210
+      required: *ref_211
     EditWorkspaceUser:
       type: object
-      properties: *ref_147
+      properties: *ref_212
     TruncatedToken:
       type: object
-      properties: *ref_40
-      required: *ref_41
+      properties: *ref_47
+      required: *ref_48
     NewToken:
       type: object
-      properties: *ref_148
+      properties: *ref_213
     NewTokenImpersonate:
       type: object
-      properties: *ref_149
-      required: *ref_150
+      properties: *ref_214
+      required: *ref_215
     ListableVariable:
       type: object
-      properties: *ref_24
-      required: *ref_25
+      properties: *ref_27
+      required: *ref_28
     ContextualVariable:
       type: object
-      properties: *ref_151
-      required: *ref_152
+      properties: *ref_216
+      required: *ref_217
     CreateVariable:
       type: object
-      properties: *ref_153
-      required: *ref_154
+      properties: *ref_218
+      required: *ref_219
     EditVariable:
       type: object
-      properties: *ref_155
+      properties: *ref_220
     AuditLog:
       type: object
       properties: *ref_1
@@ -15056,164 +19547,315 @@ components:
         - error
         - no_main_func
         - has_preprocessor
+    ScriptLang:
+      type: string
+      enum: *ref_43
     Preview:
       type: object
-      properties: *ref_156
-      required: *ref_157
+      properties: *ref_221
+      required: *ref_222
     WorkflowTask:
+      type: object
+      properties: *ref_223
+      required: *ref_224
+    WorkflowStatusRecord:
+      type: object
+      additionalProperties: *ref_225
+    WorkflowStatus:
+      type: object
+      properties: *ref_226
+    CreateResource:
+      type: object
+      properties: *ref_227
+      required: *ref_228
+    EditResource:
+      type: object
+      properties: *ref_229
+    Resource:
+      type: object
+      properties: *ref_230
+      required: *ref_231
+    ListableResource:
+      type: object
+      properties: *ref_232
+      required: *ref_233
+    ResourceType:
+      type: object
+      properties: *ref_32
+      required: *ref_33
+    EditResourceType:
+      type: object
+      properties: *ref_234
+    Schedule:
+      type: object
+      properties: *ref_115
+      required: *ref_116
+    ScheduleWJobs:
+      allOf: *ref_235
+    NewSchedule:
+      type: object
+      properties: *ref_236
+      required: *ref_237
+    EditSchedule:
+      type: object
+      properties: *ref_238
+      required: *ref_239
+    TriggerExtraProperty:
+      type: object
+      properties: *ref_122
+      required: *ref_123
+    AuthenticationMethod:
+      type: string
+      enum: *ref_117
+    HttpTrigger:
+      allOf: *ref_118
+      type: object
+      properties: *ref_119
+      required: *ref_120
+    NewHttpTrigger:
+      type: object
+      properties: *ref_240
+      required: *ref_241
+    EditHttpTrigger:
+      type: object
+      properties: *ref_242
+      required: *ref_243
+    TriggersCount:
+      type: object
+      properties: *ref_66
+    WebsocketTrigger:
+      allOf: *ref_124
+      type: object
+      properties: *ref_125
+      required: *ref_126
+    NewWebsocketTrigger:
+      type: object
+      properties: *ref_244
+      required: *ref_245
+    EditWebsocketTrigger:
+      type: object
+      properties: *ref_246
+      required: *ref_247
+    WebsocketTriggerInitialMessage:
+      anyOf: *ref_121
+    MqttQoS:
+      type: string
+      enum: *ref_248
+    MqttV3Config:
+      type: object
+      properties: *ref_139
+    MqttV5Config:
+      type: object
+      properties: *ref_140
+    MqttSubscribeTopic:
+      type: object
+      properties: *ref_137
+      required: *ref_138
+    MqttClientVersion:
+      type: string
+      enum: *ref_141
+    MqttTrigger:
+      allOf: *ref_142
+      type: object
+      properties: *ref_143
+      required: *ref_144
+    NewMqttTrigger:
+      type: object
+      properties: *ref_249
+      required: *ref_250
+    EditMqttTrigger:
+      type: object
+      properties: *ref_251
+      required: *ref_252
+    DeliveryType:
+      type: string
+      enum: *ref_147
+    PushConfig:
+      type: object
+      properties: *ref_148
+      required: *ref_149
+    GcpTrigger:
+      allOf: *ref_151
+      type: object
+      properties: *ref_152
+      required: *ref_153
+    SubscriptionMode:
+      type: string
+      enum: *ref_150
+      description: >-
+        The mode of subscription. 'existing' means using an existing GCP
+        subscription, while 'create_update' involves creating or updating a new
+        subscription.
+    GcpTriggerData:
+      type: object
+      properties: *ref_145
+      required: *ref_146
+    GetAllTopicSubscription:
+      type: object
+      properties: *ref_253
+      required: *ref_254
+    DeleteGcpSubscription:
+      type: object
+      properties: *ref_255
+      required: *ref_256
+    AwsAuthResourceType:
+      type: string
+      enum: *ref_133
+    SqsTrigger:
+      allOf: *ref_134
+      type: object
+      properties: *ref_135
+      required: *ref_136
+    NewSqsTrigger:
+      type: object
+      properties: *ref_257
+      required: *ref_258
+    EditSqsTrigger:
+      type: object
+      properties: *ref_259
+      required: *ref_260
+    Slot:
+      type: object
+      properties: *ref_154
+    SlotList:
+      type: object
+      properties: *ref_261
+    PublicationData:
       type: object
       properties: *ref_158
       required: *ref_159
-    WorkflowStatusRecord:
+    TableToTrack:
+      type: array
+      items: *ref_262
+    Relations:
       type: object
-      additionalProperties: *ref_160
-    WorkflowStatus:
+      properties: *ref_155
+      required: *ref_156
+    Language:
+      type: string
+      enum: *ref_263
+    TemplateScript:
+      type: object
+      properties: *ref_264
+      required: *ref_265
+    PostgresTrigger:
+      allOf: *ref_160
       type: object
       properties: *ref_161
-    CreateResource:
+      required: *ref_162
+    NewPostgresTrigger:
       type: object
-      properties: *ref_162
-      required: *ref_163
-    EditResource:
+      properties: *ref_266
+      required: *ref_267
+    EditPostgresTrigger:
       type: object
-      properties: *ref_164
-    Resource:
+      properties: *ref_268
+      required: *ref_269
+    KafkaTrigger:
+      allOf: *ref_127
       type: object
-      properties: *ref_165
-      required: *ref_166
-    ListableResource:
+      properties: *ref_128
+      required: *ref_129
+    NewKafkaTrigger:
       type: object
-      properties: *ref_167
-      required: *ref_168
-    ResourceType:
+      properties: *ref_270
+      required: *ref_271
+    EditKafkaTrigger:
       type: object
-      properties: *ref_28
-      required: *ref_29
-    EditResourceType:
+      properties: *ref_272
+      required: *ref_273
+    NatsTrigger:
+      allOf: *ref_130
       type: object
-      properties: *ref_169
-    Schedule:
+      properties: *ref_131
+      required: *ref_132
+    NewNatsTrigger:
       type: object
-      properties: *ref_96
-      required: *ref_97
-    ScheduleWJobs:
-      allOf: *ref_170
-    NewSchedule:
+      properties: *ref_274
+      required: *ref_275
+    EditNatsTrigger:
       type: object
-      properties: *ref_171
-      required: *ref_172
-    EditSchedule:
-      type: object
-      properties: *ref_173
-      required: *ref_174
-    HttpTrigger:
-      type: object
-      properties: *ref_98
-      required: *ref_99
-    NewHttpTrigger:
-      type: object
-      properties: *ref_175
-      required: *ref_176
-    EditHttpTrigger:
-      type: object
-      properties: *ref_177
-      required: *ref_178
-    TriggersCount:
-      type: object
-      properties: *ref_59
-    WebsocketTrigger:
-      type: object
-      properties: *ref_101
-      required: *ref_102
-    NewWebsocketTrigger:
-      type: object
-      properties: *ref_179
-      required: *ref_180
-    EditWebsocketTrigger:
-      type: object
-      properties: *ref_181
-      required: *ref_182
-    WebsocketTriggerInitialMessage:
-      anyOf: *ref_100
+      properties: *ref_276
+      required: *ref_277
     Group:
       type: object
-      properties: *ref_108
-      required: *ref_109
+      properties: *ref_168
+      required: *ref_169
     InstanceGroup:
       type: object
-      properties: *ref_104
-      required: *ref_105
+      properties: *ref_164
+      required: *ref_165
     Folder:
       type: object
-      properties: *ref_110
-      required: *ref_111
+      properties: *ref_170
+      required: *ref_171
     WorkerPing:
       type: object
-      properties: *ref_183
-      required: *ref_184
+      properties: *ref_278
+      required: *ref_279
     UserWorkspaceList:
       type: object
-      properties: *ref_185
-      required: *ref_186
+      properties: *ref_280
+      required: *ref_281
     CreateWorkspace:
       type: object
-      properties: *ref_187
-      required: *ref_188
+      properties: *ref_282
+      required: *ref_283
     Workspace:
       type: object
       properties: *ref_7
       required: *ref_8
     WorkspaceInvite:
       type: object
-      properties: *ref_14
-      required: *ref_15
+      properties: *ref_16
+      required: *ref_17
     GlobalUserInfo:
       type: object
-      properties: *ref_12
-      required: *ref_13
+      properties: *ref_14
+      required: *ref_15
     Flow:
-      allOf: *ref_58
+      allOf: *ref_65
     ExtraPerms:
       type: object
-      additionalProperties: *ref_189
+      additionalProperties: *ref_284
     FlowMetadata:
       type: object
-      properties: *ref_190
-      required: *ref_191
+      properties: *ref_285
+      required: *ref_286
     OpenFlowWPath:
-      allOf: *ref_60
+      allOf: *ref_67
     FlowPreview:
       type: object
-      properties: *ref_192
-      required: *ref_193
+      properties: *ref_287
+      required: *ref_288
     RestartedFrom:
       type: object
-      properties: *ref_194
+      properties: *ref_289
     Policy:
       type: object
-      properties: *ref_61
+      properties: *ref_68
     ListableApp:
       type: object
-      properties: *ref_195
-      required: *ref_196
+      properties: *ref_290
+      required: *ref_291
     ListableRawApp:
       type: object
-      properties: *ref_197
-      required: *ref_198
+      properties: *ref_292
+      required: *ref_293
     AppWithLastVersion:
       type: object
-      properties: *ref_62
-      required: *ref_63
+      properties: *ref_69
+      required: *ref_70
     AppWithLastVersionWDraft:
-      allOf: *ref_199
+      allOf: *ref_294
     AppHistory:
       type: object
-      properties: *ref_64
-      required: *ref_65
+      properties: *ref_71
+      required: *ref_72
     FlowVersion:
       type: object
-      properties: *ref_56
-      required: *ref_57
+      properties: *ref_63
+      required: *ref_64
     SlackToken:
       type: object
       properties:
@@ -15235,46 +19877,46 @@ components:
         - bot
     TokenResponse:
       type: object
-      properties: *ref_200
-      required: *ref_201
+      properties: *ref_295
+      required: *ref_296
     HubScriptKind:
-      name: kind
-      schema: *ref_36
+      type: string
+      enum: *ref_42
     PolarsClientKwargs:
       type: object
-      properties: *ref_118
-      required: *ref_119
+      properties: *ref_181
+      required: *ref_182
     LargeFileStorage:
       type: object
-      properties: *ref_19
+      properties: *ref_22
     WindmillLargeFile:
       type: object
-      properties: *ref_202
-      required: *ref_203
+      properties: *ref_297
+      required: *ref_298
     WindmillFileMetadata:
       type: object
-      properties: *ref_204
+      properties: *ref_299
     WindmillFilePreview:
       type: object
-      properties: *ref_205
-      required: *ref_206
+      properties: *ref_300
+      required: *ref_301
     S3Resource:
       type: object
-      properties: *ref_116
-      required: *ref_117
+      properties: *ref_179
+      required: *ref_180
     WorkspaceGitSyncSettings:
       type: object
-      properties: *ref_20
+      properties: *ref_23
     WorkspaceDeployUISettings:
       type: object
-      properties: *ref_21
+      properties: *ref_24
     WorkspaceDefaultScripts:
       type: object
-      properties: *ref_22
+      properties: *ref_25
     GitRepositorySettings:
       type: object
-      properties: *ref_207
-      required: *ref_208
+      properties: *ref_302
+      required: *ref_303
     UploadFilePart:
       type: object
       properties:
@@ -15287,126 +19929,195 @@ components:
         - tag
     MetricMetadata:
       type: object
-      properties: *ref_209
-      required: *ref_210
+      properties: *ref_304
+      required: *ref_305
     ScalarMetric:
       type: object
-      properties: *ref_211
-      required: *ref_212
+      properties: *ref_306
+      required: *ref_307
     TimeseriesMetric:
       type: object
-      properties: *ref_213
-      required: *ref_214
+      properties: *ref_308
+      required: *ref_309
     MetricDataPoint:
       type: object
-      properties: *ref_215
-      required: *ref_216
+      properties: *ref_310
+      required: *ref_311
     RawScriptForDependencies:
       type: object
-      properties: *ref_217
-      required: *ref_218
+      properties: *ref_312
+      required: *ref_313
     ConcurrencyGroup:
       type: object
-      properties: *ref_219
-      required: *ref_220
+      properties: *ref_314
+      required: *ref_315
     ExtendedJobs:
       type: object
-      properties: *ref_221
-      required: *ref_222
+      properties: *ref_316
+      required: *ref_317
     ExportedUser:
       type: object
       properties: *ref_3
       required: *ref_4
     GlobalSetting:
       type: object
-      properties: *ref_223
-      required: *ref_224
+      properties: *ref_318
+      required: *ref_319
     Config:
       type: object
-      properties: *ref_225
-      required: *ref_226
+      properties: *ref_320
+      required: *ref_321
     ExportedInstanceGroup:
       type: object
-      properties: *ref_106
-      required: *ref_107
+      properties: *ref_166
+      required: *ref_167
     JobSearchHit:
       type: object
-      properties: *ref_227
+      properties: *ref_322
     LogSearchHit:
       type: object
-      properties: *ref_228
+      properties: *ref_323
     AutoscalingEvent:
       type: object
-      properties: *ref_229
+      properties: *ref_324
     CriticalAlert:
       type: object
-      properties: *ref_230
+      properties: *ref_29
+    CaptureTriggerKind:
+      type: string
+      enum: *ref_172
+    Capture:
+      type: object
+      properties: *ref_173
+      required: *ref_174
+    CaptureConfig:
+      type: object
+      properties: *ref_325
+      required: *ref_326
+    OperatorSettings:
+      nullable: true
+      type: object
+      required: *ref_12
+      properties: *ref_13
+    TeamInfo:
+      type: object
+      required: *ref_327
+      properties: *ref_328
+    ChannelInfo:
+      type: object
+      required: *ref_329
+      properties: *ref_330
+    GithubInstallations:
+      type: array
+      items: *ref_331
+    WorkspaceGithubInstallation:
+      type: object
+      properties:
+        account_id:
+          type: string
+        installation_id:
+          type: number
+      required:
+        - account_id
+        - installation_id
+    S3Object:
+      type: object
+      properties: *ref_75
+      required: *ref_76
+    TeamsChannel:
+      type: object
+      required:
+        - team_id
+        - team_name
+        - channel_id
+        - channel_name
+      properties:
+        team_id:
+          type: string
+          description: Microsoft Teams team ID
+          minLength: 1
+        team_name:
+          type: string
+          description: Microsoft Teams team name
+          minLength: 1
+        channel_id:
+          type: string
+          description: Microsoft Teams channel ID
+          minLength: 1
+        channel_name:
+          type: string
+          description: Microsoft Teams channel name
+          minLength: 1
     StaticTransform:
       type: object
-      properties: *ref_231
-      required: *ref_232
+      properties: *ref_332
+      required: *ref_333
     JavascriptTransform:
       type: object
-      properties: *ref_233
-      required: *ref_234
-    InputTransform:
-      oneOf: *ref_31
-      discriminator: *ref_32
+      properties: *ref_334
+      required: *ref_335
+    schemas-InputTransform:
+      oneOf: *ref_35
+      discriminator: *ref_36
     RawScript:
       type: object
-      properties: *ref_235
-      required: *ref_236
+      properties: *ref_336
+      required: *ref_337
     PathScript:
       type: object
-      properties: *ref_237
-      required: *ref_238
+      properties: *ref_338
+      required: *ref_339
     PathFlow:
       type: object
-      properties: *ref_239
-      required: *ref_240
+      properties: *ref_340
+      required: *ref_341
     FlowModule:
       type: object
-      properties: *ref_33
-      required: *ref_34
+      properties: *ref_37
+      required: *ref_38
     ForloopFlow:
       type: object
-      properties: *ref_241
-      required: *ref_242
+      properties: *ref_342
+      required: *ref_343
     WhileloopFlow:
       type: object
-      properties: *ref_243
-      required: *ref_244
+      properties: *ref_344
+      required: *ref_345
     BranchOne:
       type: object
-      properties: *ref_245
-      required: *ref_246
+      properties: *ref_346
+      required: *ref_347
     BranchAll:
       type: object
-      properties: *ref_247
-      required: *ref_248
+      properties: *ref_348
+      required: *ref_349
     Identity:
       type: object
-      properties: *ref_249
-      required: *ref_250
+      properties: *ref_350
+      required: *ref_351
     FlowModuleValue:
-      oneOf: *ref_251
-      discriminator: *ref_252
+      oneOf: *ref_352
+      discriminator: *ref_353
+    StopAfterIf:
+      type: object
+      properties: *ref_39
+      required: *ref_40
     Retry:
       type: object
-      properties: *ref_95
+      properties: *ref_114
     FlowValue:
       type: object
-      properties: *ref_66
-      required: *ref_67
+      properties: *ref_78
+      required: *ref_79
     OpenFlow:
       type: object
-      properties: *ref_54
-      required: *ref_55
+      properties: *ref_61
+      required: *ref_62
     FlowStatusModule:
       type: object
-      properties: *ref_68
-      required: *ref_69
+      properties: *ref_80
+      required: *ref_81
     FlowStatus:
       type: object
-      properties: *ref_84
-      required: *ref_85
+      properties: *ref_99
+      required: *ref_100
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index d1b0a39de5..049e8e3efb 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.493.2
+  version: 1.496.3
   title: Windmill API
 
   contact:
@@ -377,6 +377,9 @@ paths:
                   type: string
                 company:
                   type: string
+                skip_email:
+                  type: boolean
+                  description: Skip sending email notifications to the user
               required:
                 - email
                 - password
@@ -4498,6 +4501,13 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: languages
+          in: query
+          description: |
+            Filter to only include scripts written in the given languages.
+            Accepts multiple values as a comma-separated list.
+          schema:
+            type: string
       responses:
         "200":
           description: All scripts
@@ -4893,8 +4903,6 @@ paths:
           description: Script version/hash
           content:
             application/json:
-              required: false
-
               schema:
                 $ref: "#/components/schemas/ScriptHistory"
 
@@ -5456,8 +5464,6 @@ paths:
           description: Flow version
           content:
             application/json:
-              required: false
-
               schema:
                 $ref: "#/components/schemas/FlowVersion"
 
@@ -5487,8 +5493,7 @@ paths:
       operationId: getFlowVersion
       parameters:
         - $ref: "#/components/parameters/WorkspaceId"
-        - type: string
-          name: version
+        - name: version
           in: path
           required: true
           schema:
@@ -5510,8 +5515,7 @@ paths:
       operationId: updateFlowHistory
       parameters:
         - $ref: "#/components/parameters/WorkspaceId"
-        - type: string
-          name: version
+        - name: version
           in: path
           required: true
           schema:
@@ -6139,10 +6143,8 @@ paths:
           description: App version
           content:
             application/json:
-              required: false
               schema:
                 $ref: "#/components/schemas/AppHistory"
-
   /w/{workspace}/apps/list_paths_from_workspace_runnable/{runnable_kind}/{path}:
     get:
       summary: list app paths from workspace runnable
@@ -6731,11 +6733,6 @@ paths:
       responses:
         "201":
           description: stream of created job uuids separated by \n. Lines may start with 'Error:'
-          example: |
-            a1a74c0d-708e-4539-9768-e8b3d37996bd
-            f0949132-5b30-48fe-bac8-873f047df810
-            Error: Could not re-run 0b885808-ae89-4458-af95-c1ca3a13b0a5
-            52b9c01d-1125-4bbb-8bee-d41f26b70066
           content:
             text/event-stream:
               schema:
@@ -7592,7 +7589,8 @@ paths:
           description: job log
           content:
             text/plain:
-              type: string
+              schema:
+                type: string
 
   /w/{workspace}/jobs_u/get_flow_debug_info/{id}:
     get:
@@ -8453,6 +8451,31 @@ paths:
         "201":
           description: default error handler set
 
+  /w/{workspace}/http_triggers/create_many:
+    post:
+      summary: create many HTTP triggers
+      operationId: createHttpTriggers
+      tags:
+        - http_trigger
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+      requestBody:
+        description: new http trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                $ref: "#/components/schemas/NewHttpTrigger"
+      responses:
+        "201":
+          description: http trigger created
+          content:
+            text/plain:
+              schema:
+                type: string
+
   /w/{workspace}/http_triggers/create:
     post:
       summary: create http trigger
@@ -8604,8 +8627,7 @@ paths:
                 route_path:
                   type: string
                 http_method:
-                  type: string
-                  enum: ["get", "post", "put", "delete", "patch"]
+                  $ref: "#/components/schemas/HttpMethod"
                 trigger_path:
                   type: string
                 workspaced_route:
@@ -9830,6 +9852,23 @@ paths:
                 items:
                   type: string
 
+  /w/{workspace}/postgres_triggers/postgres/version/{path}:
+    get:
+      summary: get postgres version
+      operationId: getPostgresVersion
+      tags:
+        - postgres_trigger
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/Path"
+      responses:
+        "200":
+          description: postgres version
+          content:
+            application/json:
+              schema:
+                type: string
+  
   /w/{workspace}/postgres_triggers/is_valid_postgres_configuration/{path}:
     get:
       summary: check if postgres configuration is set to logical
@@ -12469,7 +12508,6 @@ paths:
             text/plain:
               schema:
                 type: string
-
   /concurrency_groups/list:
     get:
       summary: List all concurrency groups
@@ -13175,7 +13213,51 @@ components:
         enum: [script, flow]
 
   schemas:
-    $ref: "../../openflow.openapi.yaml#/components/schemas"
+    # NOTE: Not so many generators and validators support this format:
+    # $ref: "../../openflow.openapi.yaml#/components/schemas"
+    # This is why it is better to inline each of schemas for better compat
+    # Do not change next line. It is used by python-client for pre-processing
+    # -- INLINE START --
+    OpenFlow:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/OpenFlow"
+    FlowValue:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/FlowValue"
+    Retry:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
+    StopAfterIf:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/StopAfterIf"
+    FlowModule:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/FlowModule"
+    InputTransform:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/InputTransform"
+    StaticTransform:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/StaticTransform"
+    JavascriptTransform:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/JavascriptTransform"
+    FlowModuleValue:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/FlowModuleValue"
+    RawScript:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/RawScript"
+    PathScript:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/PathScript"
+    PathFlow:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/PathFlow"
+    ForloopFlow:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/ForloopFlow"
+    WhileloopFlow:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/WhileloopFlow"
+    BranchOne:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/BranchOne"
+    BranchAll:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/BranchAll"
+    Identity:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/Identity"
+    FlowStatus:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/FlowStatus"
+    FlowStatusModule:
+      $ref: "../../openflow.openapi.yaml#/components/schemas/FlowStatusModule"
+    # -- INLINE END --
+    # Do not change line above
 
     AIProvider:
       type: string
@@ -14672,6 +14754,15 @@ components:
         - custom_script
         - signature
 
+    HttpMethod:
+      type: string
+      enum:
+        - get
+        - post
+        - put
+        - delete
+        - patch
+
     HttpTrigger:
       allOf:
         - $ref: "#/components/schemas/TriggerExtraProperty"
@@ -14691,13 +14782,7 @@ components:
           required:
             - s3
         http_method:
-          type: string
-          enum:
-            - get
-            - post
-            - put
-            - delete
-            - patch
+          $ref: "#/components/schemas/HttpMethod"
         authentication_resource_path:
           type: string
         is_async:
@@ -14748,13 +14833,7 @@ components:
         is_flow:
           type: boolean
         http_method:
-          type: string
-          enum:
-            - get
-            - post
-            - put
-            - delete
-            - patch
+          $ref: "#/components/schemas/HttpMethod"
         authentication_resource_path:
           type: string
         is_async:
@@ -14805,13 +14884,7 @@ components:
         is_flow:
           type: boolean
         http_method:
-          type: string
-          enum:
-            - get
-            - post
-            - put
-            - delete
-            - patch
+          $ref: "#/components/schemas/HttpMethod"
         is_async:
           type: boolean
         authentication_method:
@@ -16225,10 +16298,8 @@ components:
         - access_token
 
     HubScriptKind:
-      name: kind
-      schema:
-        type: string
-        enum: [script, failure, trigger, approval]
+      type: string
+      enum: [script, failure, trigger, approval]
 
     PolarsClientKwargs:
       type: object
diff --git a/backend/windmill-api/src/agent_workers_ee.rs b/backend/windmill-api/src/agent_workers_oss.rs
similarity index 76%
rename from backend/windmill-api/src/agent_workers_ee.rs
rename to backend/windmill-api/src/agent_workers_oss.rs
index 1b5a210d13..655058c493 100644
--- a/backend/windmill-api/src/agent_workers_ee.rs
+++ b/backend/windmill-api/src/agent_workers_oss.rs
@@ -1,3 +1,7 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::agent_workers_ee::*;
+
 /*
  * Author: Ruben Fiszel
  * Copyright: Windmill Labs, Inc 2042
@@ -6,16 +10,21 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
+#[cfg(not(feature = "private"))]
 use crate::db::DB;
 
+#[cfg(not(feature = "private"))]
 use axum::Router;
 
+#[cfg(not(feature = "private"))]
 use serde::{Deserialize, Serialize};
 
+#[cfg(not(feature = "private"))]
 pub fn global_service() -> Router {
     Router::new()
 }
 
+#[cfg(not(feature = "private"))]
 pub fn workspaced_service(
     db: DB,
     _base_internal_url: String,
@@ -36,6 +45,7 @@ pub fn workspaced_service(
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
+#[cfg(not(feature = "private"))]
 pub struct AgentAuth {
     pub worker_group: String,
     pub suffix: Option<String>,
@@ -43,8 +53,10 @@ pub struct AgentAuth {
     pub exp: Option<usize>,
 }
 
+#[cfg(not(feature = "private"))]
 pub struct AgentCache {}
 
+#[cfg(not(feature = "private"))]
 impl AgentCache {
     pub fn new() -> Self {
         AgentCache {}
diff --git a/backend/windmill-api/src/ai.rs b/backend/windmill-api/src/ai.rs
index 6b33a70730..86e69fe233 100644
--- a/backend/windmill-api/src/ai.rs
+++ b/backend/windmill-api/src/ai.rs
@@ -10,7 +10,7 @@ use reqwest::{Client, RequestBuilder};
 use serde::{Deserialize, Serialize};
 use serde_json::value::RawValue;
 use std::collections::HashMap;
-use windmill_audit::{audit_ee::audit_log, ActionKind};
+use windmill_audit::{audit_oss::audit_log, ActionKind};
 use windmill_common::error::{to_anyhow, Error, Result};
 
 lazy_static::lazy_static! {
diff --git a/backend/windmill-api/src/apps.rs b/backend/windmill-api/src/apps.rs
index 533da11d1c..9dfe40b5b9 100644
--- a/backend/windmill-api/src/apps.rs
+++ b/backend/windmill-api/src/apps.rs
@@ -18,7 +18,7 @@ use crate::{
 };
 #[cfg(feature = "parquet")]
 use crate::{
-    job_helpers_ee::{
+    job_helpers_oss::{
         download_s3_file_internal, get_random_file_name, get_s3_resource,
         get_workspace_s3_resource, upload_file_from_req, DownloadFileQuery,
     },
@@ -48,7 +48,7 @@ use sha2::{Digest, Sha256};
 use sql_builder::{bind::Bind, SqlBuilder};
 use sqlx::{types::Uuid, FromRow};
 use std::str;
-use windmill_audit::audit_ee::audit_log;
+use windmill_audit::audit_oss::audit_log;
 use windmill_audit::ActionKind;
 use windmill_common::{
     apps::{AppScriptId, ListAppQuery},
diff --git a/backend/windmill-api/src/apps_ee.rs b/backend/windmill-api/src/apps_ee.rs
deleted file mode 100644
index a7737664b9..0000000000
--- a/backend/windmill-api/src/apps_ee.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-use axum::Router;
-
-pub fn global_unauthed_service() -> Router {
-    Router::new()
-}
diff --git a/backend/windmill-api/src/apps_oss.rs b/backend/windmill-api/src/apps_oss.rs
new file mode 100644
index 0000000000..346fff9ff1
--- /dev/null
+++ b/backend/windmill-api/src/apps_oss.rs
@@ -0,0 +1,11 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::apps_ee::*;
+
+#[cfg(not(feature = "private"))]
+use axum::Router;
+
+#[cfg(not(feature = "private"))]
+pub fn global_unauthed_service() -> Router {
+    Router::new()
+}
diff --git a/backend/windmill-api/src/args.rs b/backend/windmill-api/src/args.rs
index e3a2adb38f..0b8f4d5210 100644
--- a/backend/windmill-api/src/args.rs
+++ b/backend/windmill-api/src/args.rs
@@ -85,7 +85,7 @@ impl RawWebhookArgs {
         db: &DB,
         w_id: &str,
     ) -> Result<HashMap<String, Box<RawValue>>, Error> {
-        use crate::job_helpers_ee::{
+        use crate::job_helpers_oss::{
             get_random_file_name, get_workspace_s3_resource, upload_file_internal,
         };
         use futures::TryStreamExt;
diff --git a/backend/windmill-api/src/audit.rs b/backend/windmill-api/src/audit.rs
index 47ba881014..336fd32881 100644
--- a/backend/windmill-api/src/audit.rs
+++ b/backend/windmill-api/src/audit.rs
@@ -28,7 +28,7 @@ async fn get_audit(
     Path((w_id, id)): Path<(String, i32)>,
 ) -> JsonResult<AuditLog> {
     let tx = user_db.begin(&authed).await?;
-    let audit = windmill_audit::audit_ee::get_audit(tx, id, &w_id).await?;
+    let audit = windmill_audit::audit_oss::get_audit(tx, id, &w_id).await?;
     Ok(Json(audit))
 }
 async fn list_audit(
@@ -39,6 +39,6 @@ async fn list_audit(
     Query(lq): Query<ListAuditLogQuery>,
 ) -> JsonResult<Vec<AuditLog>> {
     let tx = user_db.begin(&authed).await?;
-    let rows = windmill_audit::audit_ee::list_audit(tx, w_id, pagination, lq).await?;
+    let rows = windmill_audit::audit_oss::list_audit(tx, w_id, pagination, lq).await?;
     Ok(Json(rows))
 }
diff --git a/backend/windmill-api/src/auth.rs b/backend/windmill-api/src/auth.rs
index 2936b74957..6af5ea1e50 100644
--- a/backend/windmill-api/src/auth.rs
+++ b/backend/windmill-api/src/auth.rs
@@ -1,5 +1,5 @@
 #[cfg(feature = "enterprise")]
-use crate::ee::ExternalJwks;
+use crate::ee_oss::ExternalJwks;
 use axum::{
     async_trait,
     extract::{FromRequestParts, OriginalUri, Query},
@@ -26,6 +26,20 @@ use windmill_common::{
     users::{COOKIE_NAME, SUPERADMIN_SECRET_EMAIL},
 };
 
+lazy_static::lazy_static! {
+    // Global auth cache accessible from main.rs for direct invalidation
+    pub static ref AUTH_CACHE: Cache<(String, String), ExpiringAuthCache> = Cache::new(300);
+}
+
+// Global function to invalidate a specific token from cache
+pub fn invalidate_token_from_cache(token: &str) {
+    // Remove all cache entries for this token (across all workspaces)
+    AUTH_CACHE.retain(|(_workspace_id, cached_token), _cached_value| {
+        cached_token != token
+    });
+    tracing::info!("Invalidated token from auth cache: {}...", &token[..token.len().min(8)]);
+}
+
 #[derive(Clone)]
 pub struct ExpiringAuthCache {
     pub authed: ApiAuthed,
@@ -33,7 +47,6 @@ pub struct ExpiringAuthCache {
 }
 
 pub struct AuthCache {
-    cache: Cache<(String, String), ExpiringAuthCache>,
     db: DB,
     superadmin_secret: Option<String>,
     #[cfg(feature = "enterprise")]
@@ -47,7 +60,6 @@ impl AuthCache {
         #[cfg(feature = "enterprise")] ext_jwks: Option<Arc<RwLock<ExternalJwks>>>,
     ) -> Self {
         AuthCache {
-            cache: Cache::new(300),
             db,
             superadmin_secret,
             #[cfg(feature = "enterprise")]
@@ -56,7 +68,7 @@ impl AuthCache {
     }
 
     pub async fn invalidate(&self, w_id: &str, token: String) {
-        self.cache.remove(&(w_id.to_string(), token));
+        AUTH_CACHE.remove(&(w_id.to_string(), token));
     }
 
     pub async fn get_authed(&self, w_id: Option<String>, token: &str) -> Option<ApiAuthed> {
@@ -64,14 +76,14 @@ impl AuthCache {
             w_id.as_ref().unwrap_or(&"".to_string()).to_string(),
             token.to_string(),
         );
-        let s = self.cache.get(&key).map(|c| c.to_owned());
+        let s = AUTH_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(
+                let authed_and_exp = match crate::ee_oss::jwt_ext_auth(
                     w_id.as_ref(),
                     token.trim_start_matches("jwt_ext_"),
                     self.ext_jwks.clone(),
@@ -86,7 +98,7 @@ impl AuthCache {
                 };
 
                 if let Some((authed, exp)) = authed_and_exp.clone() {
-                    self.cache.insert(
+                    AUTH_CACHE.insert(
                         key,
                         ExpiringAuthCache {
                             authed: authed.clone(),
@@ -123,7 +135,7 @@ impl AuthCache {
                             username_override,
                         };
 
-                        self.cache.insert(
+                        AUTH_CACHE.insert(
                             key,
                             ExpiringAuthCache {
                                 authed: authed.clone(),
@@ -317,7 +329,7 @@ impl AuthCache {
                         }
                     };
                     if let Some(authed) = authed_o.as_ref() {
-                        self.cache.insert(
+                        AUTH_CACHE.insert(
                             key,
                             ExpiringAuthCache {
                                 authed: authed.clone(),
diff --git a/backend/windmill-api/src/capture.rs b/backend/windmill-api/src/capture.rs
index 07127e53a1..0c2d9f3946 100644
--- a/backend/windmill-api/src/capture.rs
+++ b/backend/windmill-api/src/capture.rs
@@ -15,7 +15,7 @@ use {
 
 #[cfg(all(feature = "enterprise", feature = "gcp_trigger"))]
 use {
-    crate::gcp_triggers_ee::{
+    crate::gcp_triggers_oss::{
         manage_google_subscription, process_google_push_request, validate_jwt_token,
         CreateUpdateConfig, SubscriptionMode,
     },
@@ -23,7 +23,10 @@ use {
     http::HeaderMap,
 };
 
-#[cfg(all(feature = "enterprise", feature = "gcp_trigger"))]
+#[cfg(any(
+    all(feature = "enterprise", feature = "gcp_trigger"),
+    feature = "postgres_trigger"
+))]
 use windmill_common::utils::empty_as_none;
 
 #[cfg(all(feature = "enterprise", feature = "sqs_trigger"))]
@@ -33,25 +36,28 @@ use windmill_common::auth::aws::AwsAuthResourceType;
     feature = "http_trigger",
     all(feature = "enterprise", feature = "gcp_trigger")
 ))]
-use {serde::de::DeserializeOwned, windmill_common::error::Error};
+use serde::de::DeserializeOwned;
+
+#[cfg(any(
+    feature = "http_trigger",
+    feature = "postgres_trigger",
+    all(feature = "enterprise", feature = "gcp_trigger")
+))]
+use windmill_common::error::Error;
 
 #[cfg(all(feature = "enterprise", feature = "kafka"))]
-use crate::kafka_triggers_ee::KafkaTriggerConfigConnection;
+use crate::kafka_triggers_oss::KafkaTriggerConfigConnection;
 
 #[cfg(feature = "mqtt_trigger")]
 use crate::mqtt_triggers::{MqttClientVersion, MqttV3Config, MqttV5Config, SubscribeTopic};
 
 #[cfg(all(feature = "enterprise", feature = "nats"))]
-use crate::nats_triggers_ee::NatsTriggerConfigConnection;
+use crate::nats_triggers_oss::NatsTriggerConfigConnection;
 
 #[cfg(feature = "postgres_trigger")]
-use {
-    crate::postgres_triggers::{
-        create_logical_replication_slot_query, create_publication_query, drop_publication_query,
-        generate_random_string, get_database_connection, PublicationData,
-    },
-    itertools::Itertools,
-    pg_escape::quote_literal,
+use crate::postgres_triggers::{
+    create_logical_replication_slot, create_pg_publication, generate_random_string,
+    get_default_pg_connection, PublicationData,
 };
 
 use crate::{
@@ -200,9 +206,12 @@ pub struct MqttTriggerConfig {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct PostgresTriggerConfig {
     pub postgres_resource_path: String,
+    #[serde(default, deserialize_with = "empty_as_none")]
     pub publication_name: Option<String>,
+    #[serde(default, deserialize_with = "empty_as_none")]
     pub replication_slot_name: Option<String>,
     pub publication: PublicationData,
+    pub basic_mode: Option<bool>,
 }
 
 #[cfg(feature = "websocket")]
@@ -292,57 +301,55 @@ async fn set_postgres_trigger_config(
     user_db: UserDB,
     mut capture_config: NewCaptureConfig,
 ) -> Result<NewCaptureConfig> {
-    let Some(TriggerConfig::Postgres(mut postgres_config)) = capture_config.trigger_config else {
-        return Err(windmill_common::error::Error::BadRequest(
-            "Invalid postgres config".to_string(),
-        ));
+    use windmill_common::error::to_anyhow;
+
+    let Some(TriggerConfig::Postgres(postgres_config)) = capture_config.trigger_config.as_mut()
+    else {
+        return Err(Error::BadRequest("Invalid postgres config".to_string()));
     };
 
-    let mut connection = get_database_connection(
-        authed,
-        Some(user_db),
-        &db,
-        &postgres_config.postgres_resource_path,
-        &w_id,
-    )
-    .await?;
+    if postgres_config.basic_mode.unwrap_or(false) {
+        let mut pg_connection = get_default_pg_connection(
+            authed,
+            Some(user_db),
+            &db,
+            &postgres_config.postgres_resource_path,
+            &w_id,
+        )
+        .await?;
 
-    let publication_name = postgres_config
-        .publication_name
-        .get_or_insert(format!("windmill_capture_{}", generate_random_string()));
-    let replication_slot_name = postgres_config
-        .replication_slot_name
-        .get_or_insert(publication_name.clone());
+        let tx = pg_connection.transaction().await.map_err(to_anyhow)?;
 
-    let query = drop_publication_query(&publication_name);
+        let publication_name = format!("windmill_capture_{}", generate_random_string());
+        let replication_slot_name = publication_name.clone();
 
-    sqlx::query(&query).execute(&mut connection).await?;
+        create_logical_replication_slot(tx.client(), &replication_slot_name)
+            .await
+            .map_err(to_anyhow)?;
 
-    let query = create_publication_query(
-        &publication_name,
-        postgres_config.publication.table_to_track.as_deref(),
-        &postgres_config
-            .publication
-            .transaction_to_track
-            .iter()
-            .map(AsRef::as_ref)
-            .collect_vec(),
-    );
+        create_pg_publication(
+            tx.client(),
+            &publication_name,
+            postgres_config.publication.table_to_track.as_deref(),
+            &postgres_config.publication.transaction_to_track,
+        )
+        .await
+        .map_err(to_anyhow)?;
 
-    sqlx::query(&query).execute(&mut connection).await?;
+        tx.commit().await.map_err(to_anyhow)?;
 
-    let query = format!(
-        "SELECT 1 from pg_replication_slots WHERE slot_name = {}",
-        quote_literal(replication_slot_name)
-    );
-
-    let row = sqlx::query(&query).fetch_optional(&mut connection).await?;
-
-    if row.is_none() {
-        let query = create_logical_replication_slot_query(&replication_slot_name);
-        sqlx::query(&query).execute(&mut connection).await?;
+        postgres_config.publication_name = Some(publication_name);
+        postgres_config.replication_slot_name = Some(replication_slot_name);
+    } else {
+        if postgres_config.publication_name.is_none()
+            || postgres_config.replication_slot_name.is_none()
+        {
+            return Err(Error::BadRequest(
+                "Publication name and slot name required in advanced mode".to_string(),
+            ));
+        }
     }
-    capture_config.trigger_config = Some(TriggerConfig::Postgres(postgres_config));
+
     Ok(capture_config)
 }
 
@@ -366,9 +373,7 @@ async fn set_gcp_trigger_config(
     mut capture_config: NewCaptureConfig,
 ) -> Result<NewCaptureConfig> {
     let Some(TriggerConfig::Gcp(mut gcp_config)) = capture_config.trigger_config else {
-        return Err(windmill_common::error::Error::BadRequest(
-            "Invalid GCP Pub/Sub config".to_string(),
-        ));
+        return Err(Error::BadRequest("Invalid GCP Pub/Sub config".to_string()));
     };
 
     let config = manage_google_subscription(
@@ -903,7 +908,7 @@ async fn gcp_payload(
     headers: HeaderMap,
     request: Request,
 ) -> Result<StatusCode> {
-    use crate::{gcp_triggers_ee::GcpTrigger, trigger_helpers::TriggerJobArgs};
+    use crate::{gcp_triggers_oss::GcpTrigger, trigger_helpers::TriggerJobArgs};
 
     let is_flow = matches!(runnable_kind, RunnableKind::Flow);
     let (gcp_trigger_config, owner, email): (GcpTriggerConfig, _, _) =
diff --git a/backend/windmill-api/src/configs.rs b/backend/windmill-api/src/configs.rs
index e8770b2b5e..9110d104c8 100644
--- a/backend/windmill-api/src/configs.rs
+++ b/backend/windmill-api/src/configs.rs
@@ -14,7 +14,7 @@ use axum::{
 
 use serde::{Deserialize, Serialize};
 use sqlx::FromRow;
-use windmill_audit::audit_ee::audit_log;
+use windmill_audit::audit_oss::audit_log;
 use windmill_audit::ActionKind;
 use windmill_common::{
     error::{self},
diff --git a/backend/windmill-api/src/db.rs b/backend/windmill-api/src/db.rs
index 85f1ee485f..c8f76dd817 100644
--- a/backend/windmill-api/src/db.rs
+++ b/backend/windmill-api/src/db.rs
@@ -16,7 +16,7 @@ use sqlx::{
 };
 
 use tokio::task::JoinHandle;
-use windmill_audit::audit_ee::{AuditAuthor, AuditAuthorable};
+use windmill_audit::audit_oss::{AuditAuthor, AuditAuthorable};
 use windmill_common::{
     db::{Authable, Authed},
     error::Error,
@@ -804,6 +804,14 @@ async fn fix_job_completed_index(db: &DB) -> Result<(), Error> {
             .execute(db)
             .await?;
     });
+
+    run_windmill_migration!("v2_job_queue_suspend", db, |tx| {
+        sqlx::query!(
+            "CREATE INDEX CONCURRENTLY IF NOT EXISTS v2_job_queue_suspend ON v2_job_queue (workspace_id, suspend) WHERE suspend > 0;"
+        )
+        .execute(db)
+        .await?;
+    });
     Ok(())
 }
 
diff --git a/backend/windmill-api/src/ee.rs b/backend/windmill-api/src/ee_oss.rs
similarity index 61%
rename from backend/windmill-api/src/ee.rs
rename to backend/windmill-api/src/ee_oss.rs
index cddb639e95..3fb1271a73 100644
--- a/backend/windmill-api/src/ee.rs
+++ b/backend/windmill-api/src/ee_oss.rs
@@ -1,15 +1,21 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::ee::*;
+
+#[cfg(not(feature = "private"))]
 use anyhow::anyhow;
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 use std::sync::Arc;
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 use tokio::sync::RwLock;
 
+#[cfg(not(feature = "private"))]
 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"))
 }
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 pub async fn jwt_ext_auth(
     _w_id: Option<&String>,
     _token: &str,
@@ -20,10 +26,10 @@ pub async fn jwt_ext_auth(
     Err(anyhow!("External JWT auth is not open source"))
 }
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 pub struct ExternalJwks;
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 impl ExternalJwks {
     pub async fn load() -> Option<Arc<RwLock<Self>>> {
         // Implementation is not open source
diff --git a/backend/windmill-api/src/flows.rs b/backend/windmill-api/src/flows.rs
index e34b2cacaf..505656da47 100644
--- a/backend/windmill-api/src/flows.rs
+++ b/backend/windmill-api/src/flows.rs
@@ -31,7 +31,7 @@ use hyper::StatusCode;
 use serde::{Deserialize, Serialize};
 use sql_builder::prelude::*;
 use sqlx::{FromRow, Postgres, Transaction};
-use windmill_audit::audit_ee::audit_log;
+use windmill_audit::audit_oss::audit_log;
 use windmill_audit::ActionKind;
 use windmill_common::utils::query_elems_from_hub;
 use windmill_common::worker::to_raw_value;
diff --git a/backend/windmill-api/src/folders.rs b/backend/windmill-api/src/folders.rs
index 5047a96cad..1e4d2e09c0 100644
--- a/backend/windmill-api/src/folders.rs
+++ b/backend/windmill-api/src/folders.rs
@@ -23,7 +23,7 @@ use axum::{
 };
 use lazy_static::lazy_static;
 use regex::Regex;
-use windmill_audit::audit_ee::audit_log;
+use windmill_audit::audit_oss::audit_log;
 use windmill_audit::ActionKind;
 use windmill_common::{
     db::UserDB,
diff --git a/backend/windmill-api/src/gcp_triggers_ee.rs b/backend/windmill-api/src/gcp_triggers_oss.rs
similarity index 76%
rename from backend/windmill-api/src/gcp_triggers_ee.rs
rename to backend/windmill-api/src/gcp_triggers_oss.rs
index 0dc672580c..78005309bc 100644
--- a/backend/windmill-api/src/gcp_triggers_ee.rs
+++ b/backend/windmill-api/src/gcp_triggers_oss.rs
@@ -1,29 +1,38 @@
-use crate::db::{ApiAuthed, DB};
-use crate::trigger_helpers::TriggerJobArgs;
-use axum::{extract::Request, Router};
-use http::HeaderMap;
-use serde::{Deserialize, Serialize};
-use serde_json::value::RawValue;
-use sqlx::prelude::FromRow;
-use sqlx::types::Json as SqlxJson;
-use std::collections::HashMap;
-use windmill_common::db::UserDB;
-use windmill_common::worker::to_raw_value;
-use windmill_common::{
-    error::{Error as WindmillError, Result as WindmillResult},
-    triggers::TriggerKind,
-    utils::empty_as_none,
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::gcp_triggers_ee::*;
+
+#[cfg(not(feature = "private"))]
+use {
+    crate::db::{ApiAuthed, DB},
+    crate::trigger_helpers::TriggerJobArgs,
+    axum::{extract::Request, Router},
+    http::HeaderMap,
+    serde::{Deserialize, Serialize},
+    serde_json::value::RawValue,
+    sqlx::prelude::FromRow,
+    sqlx::types::Json as SqlxJson,
+    std::collections::HashMap,
+    windmill_common::db::UserDB,
+    windmill_common::worker::to_raw_value,
+    windmill_common::{
+        error::{Error as WindmillError, Result as WindmillResult},
+        triggers::TriggerKind,
+        utils::empty_as_none,
+    },
 };
 
 #[derive(sqlx::Type, Debug, Deserialize, Serialize)]
 #[serde(rename_all(serialize = "lowercase", deserialize = "lowercase"))]
 #[sqlx(type_name = "DELIVERY_MODE", rename_all = "lowercase")]
 #[allow(unused)]
+#[cfg(not(feature = "private"))]
 pub enum DeliveryType {
     Pull,
     Push,
 }
 
+#[cfg(not(feature = "private"))]
 impl Default for DeliveryType {
     fn default() -> Self {
         Self::Pull
@@ -32,6 +41,7 @@ impl Default for DeliveryType {
 
 #[derive(FromRow, Deserialize, Serialize, Debug)]
 #[allow(unused)]
+#[cfg(not(feature = "private"))]
 pub struct PushConfig {
     #[serde(deserialize_with = "empty_as_none")]
     route_path: Option<String>,
@@ -42,6 +52,7 @@ pub struct PushConfig {
 }
 #[derive(Default, Debug, Serialize, Deserialize)]
 #[allow(unused)]
+#[cfg(not(feature = "private"))]
 pub struct CreateUpdateConfig {
     pub delivery_type: DeliveryType,
     #[serde(default, deserialize_with = "empty_as_none")]
@@ -50,6 +61,7 @@ pub struct CreateUpdateConfig {
 }
 
 #[derive(Debug, Deserialize, Serialize)]
+#[cfg(not(feature = "private"))]
 pub struct ExistingGcpSubscription {
     pub subscription_id: String,
     pub base_endpoint: String,
@@ -58,15 +70,18 @@ pub struct ExistingGcpSubscription {
 #[derive(Debug, Deserialize, Serialize, sqlx::Type)]
 #[serde(rename_all = "snake_case")]
 #[sqlx(type_name = "GCP_SUBSCRIPTION_MODE", rename_all = "snake_case")]
+#[cfg(not(feature = "private"))]
 pub enum SubscriptionMode {
     Existing,
     CreateUpdate,
 }
 
+#[cfg(not(feature = "private"))]
 pub fn workspaced_service() -> Router {
     Router::new()
 }
 
+#[cfg(not(feature = "private"))]
 pub fn start_consuming_gcp_pubsub_event(
     _db: DB,
     mut _killpill_rx: tokio::sync::broadcast::Receiver<()>,
@@ -74,6 +89,7 @@ pub fn start_consuming_gcp_pubsub_event(
     // implementation is not open source
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn manage_google_subscription(
     _authed: ApiAuthed,
     _db: &DB,
@@ -91,6 +107,7 @@ pub async fn manage_google_subscription(
     Ok(CreateUpdateConfig::default())
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn process_google_push_request(
     _headers: HeaderMap,
     _request: Request,
@@ -98,6 +115,7 @@ pub async fn process_google_push_request(
     Ok((String::new(), HashMap::new()))
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn validate_jwt_token(
     _db: &DB,
     _user_db: UserDB,
@@ -110,11 +128,13 @@ pub async fn validate_jwt_token(
     Ok(())
 }
 
+#[cfg(not(feature = "private"))]
 pub fn gcp_push_route_handler() -> Router {
     Router::new()
 }
 
 #[derive(FromRow, Deserialize, Serialize, Debug)]
+#[cfg(not(feature = "private"))]
 pub struct GcpTrigger {
     pub gcp_resource_path: String,
     pub subscription_id: String,
@@ -135,7 +155,7 @@ pub struct GcpTrigger {
     pub last_server_ping: Option<chrono::DateTime<chrono::Utc>>,
     pub enabled: bool,
 }
-
+#[cfg(not(feature = "private"))]
 impl TriggerJobArgs<String> for GcpTrigger {
     fn v1_payload_fn(payload: String) -> HashMap<String, Box<RawValue>> {
         HashMap::from([("payload".to_string(), to_raw_value(&payload))])
diff --git a/backend/windmill-api/src/git_sync_ee.rs b/backend/windmill-api/src/git_sync_ee.rs
deleted file mode 100644
index b72afac189..0000000000
--- a/backend/windmill-api/src/git_sync_ee.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use axum::routing::Router;
-
-pub fn workspaced_service() -> Router {
-    Router::new()
-}
-
-pub fn global_service() -> Router {
-    Router::new()
-}
\ No newline at end of file
diff --git a/backend/windmill-api/src/git_sync_oss.rs b/backend/windmill-api/src/git_sync_oss.rs
new file mode 100644
index 0000000000..0451d88699
--- /dev/null
+++ b/backend/windmill-api/src/git_sync_oss.rs
@@ -0,0 +1,16 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::git_sync_ee::*;
+
+#[cfg(not(feature = "private"))]
+use axum::routing::Router;
+
+#[cfg(not(feature = "private"))]
+pub fn workspaced_service() -> Router {
+    Router::new()
+}
+
+#[cfg(not(feature = "private"))]
+pub fn global_service() -> Router {
+    Router::new()
+}
diff --git a/backend/windmill-api/src/groups.rs b/backend/windmill-api/src/groups.rs
index e25d3ee7da..d5da9c25f5 100644
--- a/backend/windmill-api/src/groups.rs
+++ b/backend/windmill-api/src/groups.rs
@@ -14,7 +14,7 @@ use axum::{
     routing::{delete, get, post},
     Json, Router,
 };
-use windmill_audit::audit_ee::audit_log;
+use windmill_audit::audit_oss::audit_log;
 use windmill_audit::ActionKind;
 use windmill_common::worker::CLOUD_HOSTED;
 use windmill_common::{
diff --git a/backend/windmill-api/src/http_trigger_args.rs b/backend/windmill-api/src/http_trigger_args.rs
index 6aab75e46e..8fb96d42f0 100644
--- a/backend/windmill-api/src/http_trigger_args.rs
+++ b/backend/windmill-api/src/http_trigger_args.rs
@@ -21,7 +21,7 @@ use crate::{
 
 pub struct RawHttpTriggerArgs(pub RawWebhookArgs);
 
-#[derive(Serialize, Deserialize, sqlx::Type, Debug, Clone, Hash, Eq, PartialEq)]
+#[derive(Serialize, Deserialize, sqlx::Type, Debug, Clone, Copy, Hash, Eq, PartialEq)]
 #[sqlx(type_name = "HTTP_METHOD", rename_all = "lowercase")]
 #[serde(rename_all = "lowercase")]
 pub enum HttpMethod {
diff --git a/backend/windmill-api/src/http_triggers.rs b/backend/windmill-api/src/http_triggers.rs
index b17c8205ad..22a534d1ef 100644
--- a/backend/windmill-api/src/http_triggers.rs
+++ b/backend/windmill-api/src/http_triggers.rs
@@ -1,7 +1,7 @@
 #[cfg(feature = "http_trigger")]
 use crate::http_trigger_args::{HttpMethod, RawHttpTriggerArgs};
 #[cfg(feature = "parquet")]
-use crate::job_helpers_ee::get_workspace_s3_resource;
+use crate::job_helpers_oss::get_workspace_s3_resource;
 use crate::resources::try_get_resource_from_db_as;
 use crate::trigger_helpers::{get_runnable_format, RunnableId};
 use crate::utils::{non_empty_str, ExpiringCacheEntry};
@@ -14,6 +14,7 @@ use crate::{
     },
     users::fetch_api_authed,
 };
+use anyhow::anyhow;
 use axum::response::Response;
 use axum::{
     extract::{Path, Query},
@@ -28,13 +29,14 @@ use quick_cache::sync::Cache;
 use serde::{Deserialize, Serialize};
 use sql_builder::{bind::Bind, SqlBuilder};
 use sqlx::prelude::FromRow;
-use sqlx::PgTransaction;
+use sqlx::PgConnection;
 use std::borrow::Cow;
+use std::collections::HashSet;
 use std::{collections::HashMap, sync::Arc};
 use tokio::sync::{RwLock, RwLockReadGuard};
 use tower_http::cors::CorsLayer;
-use windmill_audit::{audit_ee::audit_log, ActionKind};
-use windmill_common::error::Error;
+use windmill_audit::{audit_oss::audit_log, ActionKind};
+use windmill_common::error::{Error, Result as WindmillResult};
 #[cfg(feature = "parquet")]
 use windmill_common::s3_helpers::build_object_store_client;
 use windmill_common::{
@@ -79,6 +81,7 @@ pub fn routes_global_service() -> Router {
 pub fn workspaced_service() -> Router {
     Router::new()
         .route("/create", post(create_trigger))
+        .route("/create_many", post(create_many_http_trigger))
         .route("/list", get(list_triggers))
         .route("/get/*path", get(get_trigger))
         .route("/update/*path", post(update_trigger))
@@ -273,7 +276,7 @@ async fn get_trigger(
 fn validate_authentication_method(
     authentication_method: AuthenticationMethod,
     raw_string: Option<bool>,
-) -> error::Result<()> {
+) -> WindmillResult<()> {
     match (authentication_method, raw_string) {
         (AuthenticationMethod::CustomScript, raw) if !raw.unwrap_or(false) == true => {
             return Err(Error::BadRequest(
@@ -287,57 +290,21 @@ fn validate_authentication_method(
     Ok(())
 }
 
-async fn increase_trigger_version_and_commit(mut tx: PgTransaction<'_>) -> error::Result<()> {
+async fn increase_trigger_version(tx: &mut PgConnection) -> WindmillResult<()> {
     sqlx::query!("SELECT nextval('http_trigger_version_seq')",)
-        .fetch_one(&mut *tx)
+        .fetch_one(tx)
         .await?;
 
-    tx.commit().await?;
-
     Ok(())
 }
 
-async fn create_trigger(
-    authed: ApiAuthed,
-    Extension(db): Extension<DB>,
-    Extension(user_db): Extension<UserDB>,
-    Path(w_id): Path<String>,
-    Json(ct): Json<NewTrigger>,
-) -> error::Result<(StatusCode, String)> {
-    require_admin(authed.is_admin, &authed.username)?;
-
-    if !VALID_ROUTE_PATH_RE.is_match(&ct.route_path) {
-        return Err(error::Error::BadRequest("Invalid route path".to_string()));
-    }
-
-    validate_authentication_method(ct.authentication_method, ct.raw_string)?;
-
-    // route path key is extracted from the route path to check for uniqueness
-    // it replaces /?:{key} with :key
-    // it will also remove the leading / if present, not an issue as we only allow : after slashes
-    let route_path_key = ROUTE_PATH_KEY_RE.replace_all(&ct.route_path, ":key");
-    let exists = route_path_key_exists(
-        &route_path_key,
-        &ct.http_method,
-        &w_id,
-        None,
-        ct.workspaced_route,
-        &db,
-    )
-    .await?;
-    if exists {
-        return Err(error::Error::BadRequest(
-            "A route already exists with this path".to_string(),
-        ));
-    }
-
-    if *CLOUD_HOSTED && (ct.is_static_website || ct.static_asset_config.is_some()) {
-        return Err(error::Error::BadRequest(
-            "Static website and static asset are not supported on cloud".to_string(),
-        ));
-    }
-
-    let mut tx = user_db.begin(&authed).await?;
+async fn create_trigger_inner(
+    tx: &mut PgConnection,
+    w_id: &str,
+    authed: &ApiAuthed,
+    new_http_trigger: &NewTrigger,
+    route_path_key: &str,
+) -> WindmillResult<()> {
     sqlx::query!(
         r#"
         INSERT INTO http_trigger (
@@ -365,51 +332,199 @@ async fn create_trigger(
         )
         "#,
         w_id,
-        ct.path,
-        ct.route_path,
+        new_http_trigger.path,
+        new_http_trigger.route_path,
         &route_path_key,
-        ct.workspaced_route,
-        ct.authentication_resource_path,
-        ct.wrap_body.unwrap_or(false),
-        ct.raw_string.unwrap_or(false),
-        ct.script_path,
-        ct.is_flow,
-        ct.is_async,
-        ct.authentication_method as _,
-        ct.http_method as _,
-        ct.static_asset_config as _,
+        new_http_trigger.workspaced_route,
+        new_http_trigger.authentication_resource_path,
+        new_http_trigger.wrap_body.unwrap_or(false),
+        new_http_trigger.raw_string.unwrap_or(false),
+        new_http_trigger.script_path,
+        new_http_trigger.is_flow,
+        new_http_trigger.is_async,
+        new_http_trigger.authentication_method as _,
+        new_http_trigger.http_method as _,
+        new_http_trigger.static_asset_config as _,
         &authed.username,
         &authed.email,
-        ct.is_static_website
+        new_http_trigger.is_static_website
     )
     .execute(&mut *tx)
     .await?;
 
     audit_log(
         &mut *tx,
-        &authed,
+        authed,
         "http_triggers.create",
         ActionKind::Create,
         &w_id,
-        Some(ct.path.as_str()),
+        Some(new_http_trigger.path.as_str()),
         None,
     )
     .await?;
 
-    increase_trigger_version_and_commit(tx).await?;
+    increase_trigger_version(tx).await?;
+
+    Ok(())
+}
+
+fn check_no_duplicates<'trigger>(
+    new_http_triggers: &[NewTrigger],
+    route_path_key: &[Cow<'trigger, str>],
+) -> Result<(), Error> {
+    let mut seen = HashSet::with_capacity(new_http_triggers.len());
+
+    for (i, trigger) in new_http_triggers.iter().enumerate() {
+        if !seen.insert((&route_path_key[i], trigger.http_method, trigger.workspaced_route)) {
+            return Err(Error::BadRequest(format!(
+            "Duplicate HTTP route detected: '{}'. Each HTTP route must have a unique 'route_path'.",
+            &trigger.route_path
+        )));
+        }
+    }
+
+    Ok(())
+}
+
+async fn create_many_http_trigger(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Extension(user_db): Extension<UserDB>,
+    Path(w_id): Path<String>,
+    Json(new_http_triggers): Json<Vec<NewTrigger>>,
+) -> WindmillResult<(StatusCode, String)> {
+    require_admin(authed.is_admin, &authed.username)?;
+
+    let error_wrapper = |path: &str, error: Error| -> Error {
+        anyhow!(
+            "Error occurred for HTTP route at route path: {}, error: {}",
+            path,
+            error
+        )
+        .into()
+    };
+
+    let mut route_path_keys = Vec::with_capacity(new_http_triggers.len());
+
+    for new_http_trigger in new_http_triggers.iter() {
+        let route_path_key = validate_http_trigger(&db, &w_id, new_http_trigger)
+            .await
+            .map_err(|err| error_wrapper(&new_http_trigger.route_path, err))?;
+
+        route_path_keys.push(route_path_key);
+    }
+
+    check_no_duplicates(&new_http_triggers, &route_path_keys)?;
+
+    let mut tx = user_db.begin(&authed).await?;
+
+    for (i, new_http_trigger) in new_http_triggers.iter().enumerate() {
+        create_trigger_inner(
+            &mut tx,
+            &w_id,
+            &authed,
+            new_http_trigger,
+            &route_path_keys[i],
+        )
+        .await
+        .map_err(|err| error_wrapper(&new_http_trigger.route_path, err))?;
+    }
+
+    tx.commit().await?;
+
+    for http_trigger in new_http_triggers.into_iter() {
+        handle_deployment_metadata(
+            &authed.email,
+            &authed.username,
+            &db,
+            &w_id,
+            windmill_git_sync::DeployedObject::HttpTrigger { path: http_trigger.path.clone() },
+            Some(format!("HTTP route '{}' created", http_trigger.path)),
+            true,
+        )
+        .await?;
+    }
+
+    Ok((StatusCode::CREATED, format!("Created all HTTP routes")))
+}
+
+async fn validate_http_trigger<'trigger>(
+    db: &DB,
+    w_id: &str,
+    new_http_trigger: &'trigger NewTrigger,
+) -> WindmillResult<Cow<'trigger, str>> {
+    if !VALID_ROUTE_PATH_RE.is_match(&new_http_trigger.route_path) {
+        return Err(error::Error::BadRequest("Invalid route path".to_string()));
+    }
+
+    validate_authentication_method(
+        new_http_trigger.authentication_method,
+        new_http_trigger.raw_string,
+    )?;
+
+    // route path key is extracted from the route path to check for uniqueness
+    // it replaces /?:{key} with :key
+    // it will also remove the leading / if present, not an issue as we only allow : after slashes
+    let route_path_key = ROUTE_PATH_KEY_RE.replace_all(&new_http_trigger.route_path, ":key");
+
+    let exists = route_path_key_exists(
+        &route_path_key,
+        &new_http_trigger.http_method,
+        &w_id,
+        None,
+        new_http_trigger.workspaced_route,
+        db,
+    )
+    .await?;
+
+    if exists {
+        return Err(error::Error::BadRequest(
+            "A route already exists with this path".to_string(),
+        ));
+    }
+
+    if *CLOUD_HOSTED
+        && (new_http_trigger.is_static_website || new_http_trigger.static_asset_config.is_some())
+    {
+        return Err(error::Error::BadRequest(
+            "Static website and static asset are not supported on cloud".to_string(),
+        ));
+    }
+
+    Ok(route_path_key)
+}
+
+async fn create_trigger(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Extension(user_db): Extension<UserDB>,
+    Path(w_id): Path<String>,
+    Json(new_http_trigger): Json<NewTrigger>,
+) -> WindmillResult<(StatusCode, String)> {
+    require_admin(authed.is_admin, &authed.username)?;
+
+    let route_path_key = validate_http_trigger(&db, &w_id, &new_http_trigger).await?;
+
+    let mut tx = user_db.begin(&authed).await?;
+
+    let http_trigger_path = new_http_trigger.path.clone();
+
+    create_trigger_inner(&mut tx, &w_id, &authed, &new_http_trigger, &route_path_key).await?;
+
+    tx.commit().await?;
 
     handle_deployment_metadata(
         &authed.email,
         &authed.username,
         &db,
         &w_id,
-        windmill_git_sync::DeployedObject::HttpTrigger { path: ct.path.clone() },
-        Some(format!("HTTP trigger '{}' created", ct.path)),
+        windmill_git_sync::DeployedObject::HttpTrigger { path: new_http_trigger.path.clone() },
+        Some(format!("HTTP route '{}' created", new_http_trigger.path)),
         true,
     )
     .await?;
 
-    Ok((StatusCode::CREATED, format!("{}", ct.path)))
+    Ok((StatusCode::CREATED, format!("{}", http_trigger_path)))
 }
 
 async fn update_trigger(
@@ -418,8 +533,9 @@ async fn update_trigger(
     Extension(db): Extension<DB>,
     Path((w_id, path)): Path<(String, StripPath)>,
     Json(ct): Json<EditTrigger>,
-) -> error::Result<String> {
+) -> WindmillResult<String> {
     let path = path.to_path();
+
     if *CLOUD_HOSTED && (ct.is_static_website || ct.static_asset_config.is_some()) {
         return Err(error::Error::BadRequest(
             "Static website and static asset are not supported on cloud".to_string(),
@@ -563,7 +679,9 @@ async fn update_trigger(
     )
     .await?;
 
-    increase_trigger_version_and_commit(tx).await?;
+    increase_trigger_version(&mut tx).await?;
+
+    tx.commit().await?;
 
     handle_deployment_metadata(
         &authed.email,
@@ -571,7 +689,7 @@ async fn update_trigger(
         &db,
         &w_id,
         windmill_git_sync::DeployedObject::HttpTrigger { path: ct.path.clone() },
-        Some(format!("HTTP trigger '{}' updated", ct.path)),
+        Some(format!("HTTP route '{}' updated", ct.path)),
         true,
     )
     .await?;
@@ -584,7 +702,7 @@ async fn delete_trigger(
     Extension(db): Extension<DB>,
     Extension(user_db): Extension<UserDB>,
     Path((w_id, path)): Path<(String, StripPath)>,
-) -> error::Result<String> {
+) -> WindmillResult<String> {
     require_admin(authed.is_admin, &authed.username)?;
     let path = path.to_path();
     let mut tx = user_db.begin(&authed).await?;
@@ -609,7 +727,9 @@ async fn delete_trigger(
     )
     .await?;
 
-    increase_trigger_version_and_commit(tx).await?;
+    increase_trigger_version(&mut tx).await?;
+
+    tx.commit().await?;
 
     handle_deployment_metadata(
         &authed.email,
@@ -617,12 +737,12 @@ async fn delete_trigger(
         &db,
         &w_id,
         windmill_git_sync::DeployedObject::HttpTrigger { path: path.to_string() },
-        Some(format!("HTTP trigger '{}' deleted", path)),
+        Some(format!("HTTP route '{}' deleted", path)),
         true,
     )
     .await?;
 
-    Ok(format!("HTTP trigger {path} deleted"))
+    Ok(format!("HTTP route {path} deleted"))
 }
 
 async fn exists_trigger(
@@ -660,7 +780,7 @@ async fn route_path_key_exists(
     trigger_path: Option<&str>,
     workspaced_route: Option<bool>,
     db: &DB,
-) -> error::Result<bool> {
+) -> WindmillResult<bool> {
     let exists = if *CLOUD_HOSTED {
         sqlx::query_scalar!(
             r#"
@@ -861,7 +981,7 @@ pub async fn refresh_routers(db: &DB) -> Result<(bool, RwLockReadGuard<'_, Route
                         .insert(format!("{}/*wm_subpath", full_path), trigger.clone())
                         .unwrap_or_else(|e| {
                             tracing::warn!(
-                                "Failed to consider http trigger route {}/*wm_subpath: {:?}",
+                                "Failed to consider HTTP route {}/*wm_subpath: {:?}",
                                 full_path,
                                 e,
                             );
@@ -870,11 +990,7 @@ pub async fn refresh_routers(db: &DB) -> Result<(bool, RwLockReadGuard<'_, Route
                 router
                     .insert(full_path.clone(), trigger.clone())
                     .unwrap_or_else(|e| {
-                        tracing::warn!(
-                            "Failed to consider http trigger route {}: {:?}",
-                            full_path,
-                            e,
-                        );
+                        tracing::warn!("Failed to consider HTTP route {}: {:?}", full_path, e,);
                     });
             }
 
@@ -898,7 +1014,7 @@ async fn get_http_route_trigger(
     db: &DB,
     user_db: UserDB,
     method: &http::Method,
-) -> error::Result<(TriggerRoute, String, HashMap<String, String>, ApiAuthed)> {
+) -> WindmillResult<(TriggerRoute, String, HashMap<String, String>, ApiAuthed)> {
     let http_method: HttpMethod = method.try_into()?;
 
     let requested_path = format!("/{}", route_path);
@@ -947,11 +1063,11 @@ async fn get_http_route_trigger(
             );
             let exists = match HTTP_ACCESS_CACHE.get(&cache_key) {
                 Some(cache_entry) if cache_entry.expiry > std::time::Instant::now() => {
-                    tracing::debug!("HTTP access cache hit for trigger {}", trigger.path);
+                    tracing::debug!("HTTP access cache hit for route {}", trigger.path);
                     true
                 }
                 _ => {
-                    tracing::debug!("HTTP access cache miss for trigger {}", trigger.path);
+                    tracing::debug!("HTTP access cache miss for route {}", trigger.path);
                     let mut tx = user_db.begin(&authed).await?;
                     let exists = sqlx::query_scalar!(
                         r#"
@@ -1002,7 +1118,7 @@ async fn get_http_route_trigger(
         trigger.email.clone(),
         &trigger.workspace_id,
         &db,
-        Some(username_override.unwrap_or(format!("http-{}", trigger.path))),
+        Some(username_override.unwrap_or(format!("HTTP-{}", trigger.path))),
     )
     .await?;
 
@@ -1030,6 +1146,14 @@ async fn route_job(
     .await
     .map_err(|e| e.into_response())?;
 
+    if trigger.script_path.is_empty() && trigger.static_asset_config.is_none() {
+        return Err(Error::BadRequest(format!(
+            "Script path of HTTP route at path: {} must not be empty",
+            trigger.path
+        ))
+        .into_response());
+    }
+
     let args = args
         .process_args(
             &authed,
@@ -1066,11 +1190,11 @@ async fn route_job(
 
             let authentication_method = match HTTP_AUTH_CACHE.get(&cache_key) {
                 Some(cache_entry) if cache_entry.expiry > std::time::Instant::now() => {
-                    tracing::debug!("HTTP auth method cache hit for trigger {}", trigger.path);
+                    tracing::debug!("HTTP auth method cache hit for route {}", trigger.path);
                     cache_entry.value
                 }
                 _ => {
-                    tracing::debug!("HTTP auth method cache miss for trigger {}", trigger.path);
+                    tracing::debug!("HTTP auth method cache miss for route {}", trigger.path);
                     let auth_method = try_get_resource_from_db_as::<
                         crate::http_trigger_auth::AuthenticationMethod,
                     >(
diff --git a/backend/windmill-api/src/indexer_ee.rs b/backend/windmill-api/src/indexer_ee.rs
deleted file mode 100644
index 2ccca92c27..0000000000
--- a/backend/windmill-api/src/indexer_ee.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use axum::Router;
-
-pub fn workspaced_service() -> Router {
-    Router::new()
-}
-
-pub fn global_service() -> Router {
-    Router::new()
-}
diff --git a/backend/windmill-api/src/indexer_oss.rs b/backend/windmill-api/src/indexer_oss.rs
new file mode 100644
index 0000000000..eee87acdcb
--- /dev/null
+++ b/backend/windmill-api/src/indexer_oss.rs
@@ -0,0 +1,16 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::indexer_ee::*;
+
+#[cfg(not(feature = "private"))]
+use axum::Router;
+
+#[cfg(not(feature = "private"))]
+pub fn workspaced_service() -> Router {
+    Router::new()
+}
+
+#[cfg(not(feature = "private"))]
+pub fn global_service() -> Router {
+    Router::new()
+}
diff --git a/backend/windmill-api/src/inkeep_oss.rs b/backend/windmill-api/src/inkeep_oss.rs
new file mode 100644
index 0000000000..ca1ffebd21
--- /dev/null
+++ b/backend/windmill-api/src/inkeep_oss.rs
@@ -0,0 +1,11 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::inkeep_ee::*;
+
+#[cfg(not(feature = "private"))]
+use axum::Router;
+
+#[cfg(not(feature = "private"))]
+pub fn global_service() -> Router {
+    Router::new()
+}
diff --git a/backend/windmill-api/src/job_helpers_ee.rs b/backend/windmill-api/src/job_helpers_oss.rs
similarity index 70%
rename from backend/windmill-api/src/job_helpers_ee.rs
rename to backend/windmill-api/src/job_helpers_oss.rs
index 4e14d16c5f..53d4a796a1 100644
--- a/backend/windmill-api/src/job_helpers_ee.rs
+++ b/backend/windmill-api/src/job_helpers_oss.rs
@@ -1,34 +1,45 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::job_helpers_ee::*;
+
+#[cfg(not(feature = "private"))]
 use axum::Router;
+#[cfg(not(feature = "private"))]
 use serde::Serialize;
+#[cfg(not(feature = "private"))]
 use uuid::Uuid;
+#[cfg(not(feature = "private"))]
 use windmill_common::s3_helpers::StorageResourceType;
 
-#[cfg(feature = "parquet")]
+#[cfg(all(feature = "parquet", not(feature = "private")))]
 use crate::db::{ApiAuthed, DB};
-#[cfg(feature = "parquet")]
+#[cfg(all(feature = "parquet", not(feature = "private")))]
 use object_store::{ObjectStore, PutMultipartOpts};
-#[cfg(feature = "parquet")]
+#[cfg(all(feature = "parquet", not(feature = "private")))]
 use std::sync::Arc;
+#[cfg(not(feature = "private"))]
 use windmill_common::error;
-#[cfg(feature = "parquet")]
+#[cfg(all(feature = "parquet", not(feature = "private")))]
 use windmill_common::{db::UserDB, s3_helpers::ObjectStoreResource};
 
-#[cfg(feature = "parquet")]
+#[cfg(all(feature = "parquet", not(feature = "private")))]
 use bytes::Bytes;
-#[cfg(feature = "parquet")]
+#[cfg(all(feature = "parquet", not(feature = "private")))]
 use futures::Stream;
 
-#[cfg(feature = "parquet")]
+#[cfg(all(feature = "parquet", not(feature = "private")))]
 use axum::response::Response;
-#[cfg(feature = "parquet")]
+#[cfg(all(feature = "parquet", not(feature = "private")))]
 use serde::Deserialize;
 
 #[derive(Serialize)]
+#[cfg(not(feature = "private"))]
 pub struct UploadFileResponse {
     pub file_key: String,
 }
 
 #[derive(Deserialize)]
+#[cfg(not(feature = "private"))]
 pub struct LoadImagePreviewQuery {
     #[allow(dead_code)]
     pub file_key: String,
@@ -37,6 +48,7 @@ pub struct LoadImagePreviewQuery {
 }
 
 #[derive(Deserialize)]
+#[cfg(not(feature = "private"))]
 pub struct DownloadFileQuery {
     #[allow(dead_code)]
     pub file_key: String,
@@ -46,11 +58,12 @@ pub struct DownloadFileQuery {
     pub s3_resource_path: Option<String>,
 }
 
+#[cfg(not(feature = "private"))]
 pub fn workspaced_service() -> Router {
     Router::new()
 }
 
-#[cfg(feature = "parquet")]
+#[cfg(all(feature = "parquet", not(feature = "private")))]
 pub async fn get_workspace_s3_resource<'c>(
     _authed: &ApiAuthed,
     _db: &DB,
@@ -63,10 +76,12 @@ pub async fn get_workspace_s3_resource<'c>(
     Ok((None, None))
 }
 
+#[cfg(not(feature = "private"))]
 pub fn get_random_file_name(_file_extension: Option<String>) -> String {
     unimplemented!("Not implemented in Windmill's Open Source repository")
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn get_s3_resource<'c>(
     _authed: &ApiAuthed,
     _db: &DB,
@@ -82,7 +97,7 @@ pub async fn get_s3_resource<'c>(
     ))
 }
 
-#[cfg(feature = "parquet")]
+#[cfg(all(feature = "parquet", not(feature = "private")))]
 pub async fn upload_file_from_req(
     _s3_client: Arc<dyn ObjectStore>,
     _file_key: &str,
@@ -94,7 +109,7 @@ pub async fn upload_file_from_req(
     ))
 }
 
-#[cfg(feature = "parquet")]
+#[cfg(all(feature = "parquet", not(feature = "private")))]
 pub async fn upload_file_internal(
     _s3_client: Arc<dyn ObjectStore>,
     _file_key: &str,
@@ -106,7 +121,7 @@ pub async fn upload_file_internal(
     ))
 }
 
-#[cfg(feature = "parquet")]
+#[cfg(all(feature = "parquet", not(feature = "private")))]
 pub async fn download_s3_file_internal(
     _authed: ApiAuthed,
     _db: &DB,
diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs
index cf9e7d06de..8b0b5e5e76 100644
--- a/backend/windmill-api/src/jobs.rs
+++ b/backend/windmill-api/src/jobs.rs
@@ -26,6 +26,7 @@ use tokio::io::AsyncReadExt;
 #[cfg(feature = "prometheus")]
 use tokio::time::Instant;
 use tower::ServiceBuilder;
+use windmill_common::auth::is_super_admin_email;
 use windmill_common::error::JsonResult;
 use windmill_common::flow_status::{JobResult, RestartedFrom};
 use windmill_common::jobs::{format_completed_job_result, format_result, ENTRYPOINT_OVERRIDE};
@@ -64,7 +65,7 @@ use sqlx::types::JsonRawValue;
 use sqlx::{types::Uuid, FromRow, Postgres, Transaction};
 use tower_http::cors::{Any, CorsLayer};
 use urlencoding::encode;
-use windmill_audit::audit_ee::{audit_log, AuditAuthor};
+use windmill_audit::audit_oss::{audit_log, AuditAuthor};
 use windmill_audit::ActionKind;
 use windmill_common::worker::{to_raw_value, CUSTOM_TAGS_PER_WORKSPACE};
 use windmill_common::{
@@ -3140,28 +3141,27 @@ pub fn add_raw_string(
 }
 
 async fn check_tag_available_for_workspace(
+    db: &DB,
     w_id: &str,
     tag: &Option<String>,
     authed: &ApiAuthed,
 ) -> error::Result<()> {
     if let Some(tag) = tag {
-        if tag == "" {
+        if tag.is_empty() {
             return Ok(());
         }
 
         let tags = get_scope_tags(authed);
+        let mut is_tag_available_in_workspace = None;
+        let mut is_tag_in_workspace_custom_tags = false;
 
-        if let Some(tags) = tags {
-            if !tags.contains(&tag.as_str()) {
-                return Err(Error::BadRequest(format!(
-                    "Tag {tag} is not available in your scope"
-                )));
-            }
+        if let Some(tags) = tags.as_ref() {
+            is_tag_available_in_workspace = Some(tags.contains(&tag.as_str()));
         }
 
         let custom_tags_per_w = CUSTOM_TAGS_PER_WORKSPACE.read().await;
         if custom_tags_per_w.0.contains(&tag.to_string()) {
-            Ok(())
+            is_tag_in_workspace_custom_tags = true;
         } else if custom_tags_per_w.1.contains_key(tag)
             && custom_tags_per_w
                 .1
@@ -3169,21 +3169,38 @@ async fn check_tag_available_for_workspace(
                 .unwrap()
                 .contains(&w_id.to_string())
         {
-            Ok(())
-        } else {
+            is_tag_in_workspace_custom_tags = true;
+        }
+
+        match is_tag_available_in_workspace {
+            Some(true) | None => {
+                if is_tag_in_workspace_custom_tags {
+                    return Ok(());
+                }
+            }
+            _ => {}
+        }
+
+        if !is_super_admin_email(db, &authed.email).await? {
+            if tags.is_some() && is_tag_available_in_workspace.is_some() {
+                return Err(Error::BadRequest(format!(
+                    "Tag {tag} is not available in your scope"
+                )));
+            }
+
             return Err(error::Error::BadRequest(format!(
-                "Tag {tag} cannot be used on workspace {w_id}: (CUSTOM_TAGS: {:?})",
+                "Only super admins are allowed to use tags that are not included in the allowed CUSTOM_TAGS: {:?}",
                 custom_tags_per_w
             )));
         }
-    } else {
-        Ok(())
     }
+
+    return Ok(());
 }
 
 #[cfg(feature = "enterprise")]
 pub async fn check_license_key_valid() -> error::Result<()> {
-    use windmill_common::ee::LICENSE_KEY_VALID;
+    use windmill_common::ee_oss::LICENSE_KEY_VALID;
 
     let valid = *LICENSE_KEY_VALID.read().await;
     if !valid {
@@ -3509,7 +3526,7 @@ pub async fn run_flow_by_path_inner(
 
     let tag = run_query.tag.clone().or(tag);
 
-    check_tag_available_for_workspace(&w_id, &tag, &authed).await?;
+    check_tag_available_for_workspace(&db, &w_id, &tag, &authed).await?;
     let scheduled_for = run_query.get_scheduled_for(&db).await?;
 
     let (email, permissioned_as, push_authed, tx) =
@@ -3701,7 +3718,7 @@ pub async fn run_script_by_path_inner(
     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, &authed).await?;
+    check_tag_available_for_workspace(&db, &w_id, &tag, &authed).await?;
 
     let (email, permissioned_as, push_authed, tx) =
         if let Some(on_behalf_of) = on_behalf_of.as_ref() {
@@ -3772,7 +3789,7 @@ pub async fn run_workflow_as_code(
 
     #[cfg(feature = "enterprise")]
     check_license_key_valid().await?;
-    check_tag_available_for_workspace(&w_id, &run_query.tag, &authed).await?;
+    check_tag_available_for_workspace(&db, &w_id, &run_query.tag, &authed).await?;
 
     if *CLOUD_HOSTED {
         tracing::info!("workflow_as_code_tracing id {i} ");
@@ -4369,7 +4386,7 @@ pub async fn run_wait_result_job_by_path_get(
     drop(tx);
 
     let tag = run_query.tag.clone().or(tag);
-    check_tag_available_for_workspace(&w_id, &tag, &authed).await?;
+    check_tag_available_for_workspace(&db, &w_id, &tag, &authed).await?;
 
     let (email, permissioned_as, push_authed, tx) =
         if let Some(on_behalf_of) = on_behalf_authed.as_ref() {
@@ -4509,7 +4526,7 @@ pub async fn run_wait_result_script_by_path_internal(
     drop(tx);
 
     let tag = run_query.tag.clone().or(tag);
-    check_tag_available_for_workspace(&w_id, &tag, &authed).await?;
+    check_tag_available_for_workspace(&db, &w_id, &tag, &authed).await?;
 
     let (email, permissioned_as, push_authed, tx) =
         if let Some(on_behalf_of) = on_behalf_of.as_ref() {
@@ -4610,7 +4627,7 @@ pub async fn run_wait_result_script_by_hash(
     check_scopes(&authed, || format!("run:script/{path}"))?;
 
     let tag = run_query.tag.clone().or(tag);
-    check_tag_available_for_workspace(&w_id, &tag, &authed).await?;
+    check_tag_available_for_workspace(&db, &w_id, &tag, &authed).await?;
 
     let (email, permissioned_as, push_authed, tx) = if let Some(email) = on_behalf_of_email.as_ref()
     {
@@ -4730,7 +4747,7 @@ pub async fn run_wait_result_flow_by_path_internal(
     drop(tx);
 
     let tag = run_query.tag.clone().or(tag);
-    check_tag_available_for_workspace(&w_id, &tag, &authed).await?;
+    check_tag_available_for_workspace(&db, &w_id, &tag, &authed).await?;
 
     let (email, permissioned_as, push_authed, tx) =
         if let Some(on_behalf_of_email) = on_behalf_of_email.as_ref() {
@@ -4804,7 +4821,7 @@ async fn run_preview_script(
     }
     let scheduled_for = run_query.get_scheduled_for(&db).await?;
     let tag = run_query.tag.clone().or(preview.tag.clone());
-    check_tag_available_for_workspace(&w_id, &tag, &authed).await?;
+    check_tag_available_for_workspace(&db, &w_id, &tag, &authed).await?;
     let tx = PushIsolationLevel::Isolated(user_db.clone(), authed.clone().into());
 
     let (uuid, tx) = push(
@@ -4886,7 +4903,7 @@ async fn run_bundle_preview_script(
 
             let scheduled_for = run_query.get_scheduled_for(&db).await?;
             let tag = run_query.tag.clone().or(preview.tag.clone());
-            check_tag_available_for_workspace(&w_id, &tag, &authed).await?;
+            check_tag_available_for_workspace(&db, &w_id, &tag, &authed).await?;
             let ltx = PushIsolationLevel::Isolated(user_db.clone(), authed.clone().into());
 
             let args = preview.args.unwrap_or_default();
@@ -5470,7 +5487,7 @@ async fn run_preview_flow_job(
     }
     let scheduled_for = run_query.get_scheduled_for(&db).await?;
     let tag = run_query.tag.clone().or(raw_flow.tag.clone());
-    check_tag_available_for_workspace(&w_id, &tag, &authed).await?;
+    check_tag_available_for_workspace(&db, &w_id, &tag, &authed).await?;
     let tx = PushIsolationLevel::Isolated(user_db.clone(), authed.clone().into());
 
     let (uuid, tx) = push(
@@ -5565,7 +5582,7 @@ pub async fn run_job_by_hash_inner(
     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, &authed).await?;
+    check_tag_available_for_workspace(&db, &w_id, &tag, &authed).await?;
 
     let (email, permissioned_as, push_authed, tx) = if let Some(email) = on_behalf_of_email.as_ref()
     {
diff --git a/backend/windmill-api/src/kafka_triggers_ee.rs b/backend/windmill-api/src/kafka_triggers_oss.rs
similarity index 76%
rename from backend/windmill-api/src/kafka_triggers_ee.rs
rename to backend/windmill-api/src/kafka_triggers_oss.rs
index 0a24151ae3..9d698e2fbf 100644
--- a/backend/windmill-api/src/kafka_triggers_ee.rs
+++ b/backend/windmill-api/src/kafka_triggers_oss.rs
@@ -1,14 +1,24 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::kafka_triggers_ee::*;
+
+#[cfg(not(feature = "private"))]
 use crate::db::DB;
+#[cfg(not(feature = "private"))]
 use axum::Router;
+#[cfg(not(feature = "private"))]
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]
+#[cfg(not(feature = "private"))]
 pub struct KafkaResourceSecurity {}
 
+#[cfg(not(feature = "private"))]
 pub fn workspaced_service() -> Router {
     Router::new()
 }
 
+#[cfg(not(feature = "private"))]
 pub fn start_kafka_consumers(
     _db: DB,
     mut _killpill_rx: tokio::sync::broadcast::Receiver<()>,
@@ -17,9 +27,11 @@ pub fn start_kafka_consumers(
 }
 
 #[derive(Serialize, Deserialize)]
+#[cfg(not(feature = "private"))]
 pub enum KafkaTriggerConfigConnection {}
 
 #[derive(Serialize, Clone)]
+#[cfg(not(feature = "private"))]
 pub struct KafkaTrigger {
     pub workspace_id: String,
     pub path: String,
@@ -39,4 +51,4 @@ pub struct KafkaTrigger {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub error: Option<String>,
     pub enabled: bool,
-}
\ No newline at end of file
+}
diff --git a/backend/windmill-api/src/lib.rs b/backend/windmill-api/src/lib.rs
index d79639f0ab..8a42902508 100644
--- a/backend/windmill-api/src/lib.rs
+++ b/backend/windmill-api/src/lib.rs
@@ -8,15 +8,15 @@
 
 use crate::db::ApiAuthed;
 #[cfg(feature = "enterprise")]
-use crate::ee::ExternalJwks;
+use crate::ee_oss::ExternalJwks;
 #[cfg(feature = "embedding")]
 use crate::embeddings::load_embeddings_db;
 #[cfg(feature = "oauth2")]
-use crate::oauth2_ee::AllClients;
+use crate::oauth2_oss::AllClients;
 #[cfg(feature = "oauth2")]
-use crate::oauth2_ee::SlackVerifier;
+use crate::oauth2_oss::SlackVerifier;
 #[cfg(feature = "smtp")]
-use crate::smtp_server_ee::SmtpServer;
+use crate::smtp_server_oss::SmtpServer;
 
 #[cfg(feature = "mcp")]
 use crate::mcp::{setup_mcp_server, Runner as McpRunner};
@@ -28,7 +28,7 @@ use crate::{
 };
 
 #[cfg(feature = "agent_worker_server")]
-use agent_workers_ee::AgentCache;
+use agent_workers_oss::AgentCache;
 
 use anyhow::Context;
 use argon2::Argon2;
@@ -58,22 +58,26 @@ use windmill_common::db::UserDB;
 use windmill_common::worker::CLOUD_HOSTED;
 use windmill_common::{utils::GIT_VERSION, BASE_URL, INSTANCE_NAME};
 
-use crate::scim_ee::has_scim_token;
+use crate::scim_oss::has_scim_token;
 use windmill_common::error::AppError;
 
+#[cfg(all(feature = "agent_worker_server", feature = "private"))]
+pub mod agent_workers_ee;
 #[cfg(feature = "agent_worker_server")]
-mod agent_workers_ee;
+mod agent_workers_oss;
 mod ai;
 mod apps;
 pub mod args;
 mod audit;
-mod auth;
+pub mod auth;
 mod capture;
 mod concurrency_groups;
 mod configs;
 mod db;
 mod drafts;
+#[cfg(feature = "private")]
 pub mod ee;
+pub mod ee_oss;
 pub mod embeddings;
 mod favorite;
 mod flows;
@@ -86,56 +90,93 @@ mod http_trigger_args;
 mod http_trigger_auth;
 #[cfg(feature = "http_trigger")]
 pub mod http_triggers;
-mod indexer_ee;
+#[cfg(feature = "private")]
+pub mod indexer_ee;
+mod indexer_oss;
+#[cfg(feature = "private")]
+mod inkeep_ee;
+mod inkeep_oss;
 mod inputs;
 mod integration;
 #[cfg(feature = "postgres_trigger")]
 mod postgres_triggers;
 
 mod approvals;
+#[cfg(all(feature = "enterprise", feature = "private"))]
+pub mod apps_ee;
 #[cfg(feature = "enterprise")]
-mod apps_ee;
+mod apps_oss;
+#[cfg(all(feature = "enterprise", feature = "gcp_trigger", feature = "private"))]
+pub mod gcp_triggers_ee;
 #[cfg(all(feature = "enterprise", feature = "gcp_trigger"))]
-mod gcp_triggers_ee;
+mod gcp_triggers_oss;
+#[cfg(all(feature = "enterprise", feature = "private"))]
+pub mod git_sync_ee;
 #[cfg(feature = "enterprise")]
-mod git_sync_ee;
+mod git_sync_oss;
+#[cfg(all(feature = "parquet", feature = "private"))]
+pub mod job_helpers_ee;
 #[cfg(feature = "parquet")]
-mod job_helpers_ee;
+mod job_helpers_oss;
 pub mod job_metrics;
 pub mod jobs;
+#[cfg(all(feature = "enterprise", feature = "kafka", feature = "private"))]
+pub mod kafka_triggers_ee;
 #[cfg(all(feature = "enterprise", feature = "kafka"))]
-mod kafka_triggers_ee;
+mod kafka_triggers_oss;
 #[cfg(feature = "mqtt_trigger")]
 mod mqtt_triggers;
+#[cfg(all(feature = "enterprise", feature = "nats", feature = "private"))]
+pub mod nats_triggers_ee;
 #[cfg(all(feature = "enterprise", feature = "nats"))]
-mod nats_triggers_ee;
-#[cfg(feature = "oauth2")]
+mod nats_triggers_oss;
+#[cfg(all(feature = "oauth2", feature = "private"))]
 pub mod oauth2_ee;
-mod oidc_ee;
+#[cfg(feature = "oauth2")]
+pub mod oauth2_oss;
+#[cfg(feature = "private")]
+pub mod oidc_ee;
+mod oidc_oss;
 mod raw_apps;
 mod resources;
-mod saml_ee;
+#[cfg(feature = "private")]
+pub mod saml_ee;
+mod saml_oss;
 mod schedule;
-mod scim_ee;
+#[cfg(feature = "private")]
+pub mod scim_ee;
+mod scim_oss;
 mod scripts;
 mod service_logs;
 mod settings;
 mod slack_approvals;
+#[cfg(all(feature = "smtp", feature = "private"))]
+pub mod smtp_server_ee;
 #[cfg(feature = "smtp")]
-mod smtp_server_ee;
+mod smtp_server_oss;
+#[cfg(all(feature = "enterprise", feature = "sqs_trigger", feature = "private"))]
+pub mod sqs_triggers_ee;
 #[cfg(all(feature = "enterprise", feature = "sqs_trigger"))]
-mod sqs_triggers_ee;
-mod teams_approvals_ee;
+mod sqs_triggers_oss;
+#[cfg(feature = "private")]
+pub mod teams_approvals_ee;
+mod teams_approvals_oss;
 mod trigger_helpers;
 
 mod static_assets;
+#[cfg(all(feature = "stripe", feature = "enterprise", feature = "private"))]
+pub mod stripe_ee;
 #[cfg(all(feature = "stripe", feature = "enterprise"))]
-mod stripe_ee;
-mod teams_ee;
+mod stripe_oss;
+#[cfg(feature = "private")]
+pub mod teams_ee;
+mod teams_oss;
 mod tracing_init;
 mod triggers;
 mod users;
-mod users_ee;
+#[cfg(feature = "private")]
+pub mod users_ee;
+mod users_oss;
 mod utils;
 mod variables;
 pub mod webhook_util;
@@ -143,9 +184,11 @@ pub mod webhook_util;
 mod websocket_triggers;
 mod workers;
 mod workspaces;
-mod workspaces_ee;
+#[cfg(feature = "private")]
+pub mod workspaces_ee;
 mod workspaces_export;
 mod workspaces_extra;
+mod workspaces_oss;
 
 #[cfg(feature = "mcp")]
 mod mcp;
@@ -218,9 +261,9 @@ type IndexReader = ();
 type ServiceLogIndexReader = ();
 
 #[cfg(feature = "tantivy")]
-type IndexReader = windmill_indexer::completed_runs_ee::IndexReader;
+type IndexReader = windmill_indexer::completed_runs_oss::IndexReader;
 #[cfg(feature = "tantivy")]
-type ServiceLogIndexReader = windmill_indexer::service_logs_ee::ServiceLogIndexReader;
+type ServiceLogIndexReader = windmill_indexer::service_logs_oss::ServiceLogIndexReader;
 
 pub async fn run_server(
     db: DB,
@@ -278,7 +321,7 @@ pub async fn run_server(
         .allow_headers([http::header::CONTENT_TYPE, http::header::AUTHORIZATION])
         .allow_origin(Any);
 
-    let sp_extension = Arc::new(saml_ee::build_sp_extension().await?);
+    let sp_extension = Arc::new(saml_oss::build_sp_extension().await?);
 
     if server_mode {
         #[cfg(feature = "embedding")]
@@ -317,7 +360,7 @@ pub async fn run_server(
     let job_helpers_service = {
         #[cfg(feature = "parquet")]
         {
-            job_helpers_ee::workspaced_service()
+            job_helpers_oss::workspaced_service()
         }
 
         #[cfg(not(feature = "parquet"))]
@@ -329,7 +372,7 @@ pub async fn run_server(
     let kafka_triggers_service = {
         #[cfg(all(feature = "enterprise", feature = "kafka"))]
         {
-            kafka_triggers_ee::workspaced_service()
+            kafka_triggers_oss::workspaced_service()
         }
 
         #[cfg(not(all(feature = "enterprise", feature = "kafka")))]
@@ -341,7 +384,7 @@ pub async fn run_server(
     let nats_triggers_service = {
         #[cfg(all(feature = "enterprise", feature = "nats"))]
         {
-            nats_triggers_ee::workspaced_service()
+            nats_triggers_oss::workspaced_service()
         }
 
         #[cfg(not(all(feature = "enterprise", feature = "nats")))]
@@ -365,7 +408,7 @@ pub async fn run_server(
     let gcp_triggers_service = {
         #[cfg(all(feature = "enterprise", feature = "gcp_trigger"))]
         {
-            gcp_triggers_ee::workspaced_service()
+            gcp_triggers_oss::workspaced_service()
         }
 
         #[cfg(not(all(feature = "enterprise", feature = "gcp_trigger")))]
@@ -377,7 +420,7 @@ pub async fn run_server(
     let sqs_triggers_service = {
         #[cfg(all(feature = "enterprise", feature = "sqs_trigger"))]
         {
-            sqs_triggers_ee::workspaced_service()
+            sqs_triggers_oss::workspaced_service()
         }
 
         #[cfg(not(all(feature = "enterprise", feature = "sqs_trigger")))]
@@ -432,13 +475,13 @@ pub async fn run_server(
         #[cfg(all(feature = "enterprise", feature = "kafka"))]
         {
             let kafka_killpill_rx = killpill_rx.resubscribe();
-            kafka_triggers_ee::start_kafka_consumers(db.clone(), kafka_killpill_rx);
+            kafka_triggers_oss::start_kafka_consumers(db.clone(), kafka_killpill_rx);
         }
 
         #[cfg(all(feature = "enterprise", feature = "nats"))]
         {
             let nats_killpill_rx = killpill_rx.resubscribe();
-            nats_triggers_ee::start_nats_consumers(db.clone(), nats_killpill_rx);
+            nats_triggers_oss::start_nats_consumers(db.clone(), nats_killpill_rx);
         }
 
         #[cfg(feature = "postgres_trigger")]
@@ -456,13 +499,13 @@ pub async fn run_server(
         #[cfg(all(feature = "enterprise", feature = "sqs_trigger"))]
         {
             let sqs_killpill_rx = killpill_rx.resubscribe();
-            sqs_triggers_ee::start_sqs(db.clone(), sqs_killpill_rx);
+            sqs_triggers_oss::start_sqs(db.clone(), sqs_killpill_rx);
         }
 
         #[cfg(all(feature = "enterprise", feature = "gcp_trigger"))]
         {
             let gcp_killpill_rx = killpill_rx.resubscribe();
-            gcp_triggers_ee::start_consuming_gcp_pubsub_event(db.clone(), gcp_killpill_rx);
+            gcp_triggers_oss::start_consuming_gcp_pubsub_event(db.clone(), gcp_killpill_rx);
         }
     }
 
@@ -497,7 +540,7 @@ pub async fn run_server(
     #[cfg(feature = "agent_worker_server")]
     let (agent_workers_router, agent_workers_bg_processor, agent_workers_killpill_tx) =
         if server_mode {
-            agent_workers_ee::workspaced_service(db.clone(), _base_internal_url.clone())
+            agent_workers_oss::workspaced_service(db.clone(), _base_internal_url.clone())
         } else {
             (Router::new(), vec![], None)
         };
@@ -535,7 +578,7 @@ pub async fn run_server(
                         .nest("/oauth", {
                             #[cfg(feature = "oauth2")]
                             {
-                                oauth2_ee::workspaced_service()
+                                oauth2_oss::workspaced_service()
                             }
 
                             #[cfg(not(feature = "oauth2"))]
@@ -552,7 +595,7 @@ pub async fn run_server(
                         )
                         .nest("/variables", variables::workspaced_service())
                         .nest("/workspaces", workspaces::workspaced_service())
-                        .nest("/oidc", oidc_ee::workspaced_service())
+                        .nest("/oidc", oidc_oss::workspaced_service())
                         .nest("/http_triggers", http_triggers_service)
                         .nest("/websocket_triggers", websocket_triggers_service)
                         .nest("/kafka_triggers", kafka_triggers_service)
@@ -579,22 +622,23 @@ pub async fn run_server(
                 .nest("/schedules", schedule::global_service())
                 .nest("/embeddings", embeddings::global_service())
                 .nest("/ai", ai::global_service())
+                .nest("/inkeep", inkeep_oss::global_service())
                 .route_layer(from_extractor::<ApiAuthed>())
                 .route_layer(from_extractor::<users::Tokened>())
                 .nest("/jobs", jobs::global_root_service())
                 .nest(
                     "/srch/w/:workspace_id/index",
-                    indexer_ee::workspaced_service(),
+                    indexer_oss::workspaced_service(),
                 )
-                .nest("/srch/index", indexer_ee::global_service())
-                .nest("/oidc", oidc_ee::global_service())
+                .nest("/srch/index", indexer_oss::global_service())
+                .nest("/oidc", oidc_oss::global_service())
                 .nest(
                     "/saml",
-                    saml_ee::global_service().layer(Extension(Arc::clone(&sp_extension))),
+                    saml_oss::global_service().layer(Extension(Arc::clone(&sp_extension))),
                 )
                 .nest(
                     "/scim",
-                    scim_ee::global_service()
+                    scim_oss::global_service()
                         .route_layer(axum::middleware::from_fn(has_scim_token)),
                 )
                 .nest("/concurrency_groups", concurrency_groups::global_service())
@@ -602,7 +646,7 @@ pub async fn run_server(
                 .nest("/apps_u", {
                     #[cfg(feature = "enterprise")]
                     {
-                        apps_ee::global_unauthed_service()
+                        apps_oss::global_unauthed_service()
                     }
 
                     #[cfg(not(feature = "enterprise"))]
@@ -621,7 +665,7 @@ pub async fn run_server(
                 .nest("/agent_workers", {
                     #[cfg(feature = "agent_worker_server")]
                     {
-                        agent_workers_ee::global_service().layer(Extension(agent_cache.clone()))
+                        agent_workers_oss::global_service().layer(Extension(agent_cache.clone()))
                     }
                     #[cfg(not(feature = "agent_worker_server"))]
                     {
@@ -646,7 +690,7 @@ pub async fn run_server(
                 .nest("/teams", {
                     #[cfg(feature = "enterprise")]
                     {
-                        teams_ee::teams_service()
+                        teams_oss::teams_service()
                     }
 
                     #[cfg(not(feature = "enterprise"))]
@@ -660,12 +704,12 @@ pub async fn run_server(
                 )
                 .route(
                     "/w/:workspace_id/jobs/teams_approval/:job_id",
-                    get(teams_approvals_ee::request_teams_approval),
+                    get(teams_approvals_oss::request_teams_approval),
                 )
                 .nest("/w/:workspace_id/github_app", {
                     #[cfg(feature = "enterprise")]
                     {
-                        git_sync_ee::workspaced_service()
+                        git_sync_oss::workspaced_service()
                     }
 
                     #[cfg(not(feature = "enterprise"))]
@@ -674,7 +718,7 @@ pub async fn run_server(
                 .nest("/github_app", {
                     #[cfg(feature = "enterprise")]
                     {
-                        git_sync_ee::global_service()
+                        git_sync_oss::global_service()
                     }
 
                     #[cfg(not(feature = "enterprise"))]
@@ -695,7 +739,7 @@ pub async fn run_server(
                 .nest("/oauth", {
                     #[cfg(feature = "oauth2")]
                     {
-                        oauth2_ee::global_service().layer(Extension(Arc::clone(&sp_extension)))
+                        oauth2_oss::global_service().layer(Extension(Arc::clone(&sp_extension)))
                     }
 
                     #[cfg(not(feature = "oauth2"))]
@@ -721,7 +765,7 @@ pub async fn run_server(
                     {
                         #[cfg(all(feature = "enterprise", feature = "gcp_trigger"))]
                         {
-                            gcp_triggers_ee::gcp_push_route_handler()
+                            gcp_triggers_oss::gcp_push_route_handler()
                         }
                         #[cfg(not(all(feature = "enterprise", feature = "gcp_trigger")))]
                         {
@@ -842,7 +886,7 @@ async fn ee_license() -> &'static str {
 
 #[cfg(feature = "enterprise")]
 async fn ee_license() -> String {
-    use windmill_common::ee::{LICENSE_KEY_ID, LICENSE_KEY_VALID};
+    use windmill_common::ee_oss::{LICENSE_KEY_ID, LICENSE_KEY_VALID};
 
     if *LICENSE_KEY_VALID.read().await {
         LICENSE_KEY_ID.read().await.clone()
diff --git a/backend/windmill-api/src/mqtt_triggers.rs b/backend/windmill-api/src/mqtt_triggers.rs
index 9f3fd19827..70b78ca913 100644
--- a/backend/windmill-api/src/mqtt_triggers.rs
+++ b/backend/windmill-api/src/mqtt_triggers.rs
@@ -39,7 +39,7 @@ use sql_builder::{bind::Bind, SqlBuilder};
 use sqlx::{FromRow, Type};
 use std::collections::HashMap;
 use std::time::Duration;
-use windmill_audit::{audit_ee::audit_log, ActionKind};
+use windmill_audit::{audit_oss::audit_log, ActionKind};
 use windmill_common::{
     db::UserDB,
     error::{self, JsonResult},
diff --git a/backend/windmill-api/src/nats_triggers_ee.rs b/backend/windmill-api/src/nats_triggers_oss.rs
similarity index 79%
rename from backend/windmill-api/src/nats_triggers_ee.rs
rename to backend/windmill-api/src/nats_triggers_oss.rs
index 649d3a3837..28bf1e70e2 100644
--- a/backend/windmill-api/src/nats_triggers_ee.rs
+++ b/backend/windmill-api/src/nats_triggers_oss.rs
@@ -1,22 +1,34 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::nats_triggers_ee::*;
+
+#[cfg(not(feature = "private"))]
 use crate::db::DB;
+#[cfg(not(feature = "private"))]
 use axum::Router;
+#[cfg(not(feature = "private"))]
 use serde::{Deserialize, Serialize};
 
+#[cfg(not(feature = "private"))]
 #[derive(Serialize, Deserialize)]
 pub struct NatsResourceAuth {}
 
+#[cfg(not(feature = "private"))]
 pub fn workspaced_service() -> Router {
     Router::new()
 }
 
+#[cfg(not(feature = "private"))]
 pub fn start_nats_consumers(_db: DB, mut _killpill_rx: tokio::sync::broadcast::Receiver<()>) -> () {
     // implementation is not open source
 }
 
 #[derive(Serialize, Deserialize)]
+#[cfg(not(feature = "private"))]
 pub enum NatsTriggerConfigConnection {}
 
 #[derive(Serialize, Clone)]
+#[cfg(not(feature = "private"))]
 pub struct NatsTrigger {
     pub workspace_id: String,
     pub path: String,
@@ -40,4 +52,4 @@ pub struct NatsTrigger {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub error: Option<String>,
     pub enabled: bool,
-}
\ No newline at end of file
+}
diff --git a/backend/windmill-api/src/oauth2_ee.rs b/backend/windmill-api/src/oauth2_oss.rs
similarity index 76%
rename from backend/windmill-api/src/oauth2_ee.rs
rename to backend/windmill-api/src/oauth2_oss.rs
index 49d2155cf3..04e0e1b202 100644
--- a/backend/windmill-api/src/oauth2_ee.rs
+++ b/backend/windmill-api/src/oauth2_oss.rs
@@ -1,3 +1,7 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::oauth2_ee::*;
+
 /*
  * Author: Ruben Fiszel
  * Copyright: Windmill Labs, Inc 2022
@@ -6,39 +10,50 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
+#[cfg(not(feature = "private"))]
 use std::{collections::HashMap, fmt::Debug};
 
+#[cfg(not(feature = "private"))]
 use axum::{routing::get, Json, Router};
+#[cfg(not(feature = "private"))]
 use hmac::Mac;
 
-#[cfg(feature = "oauth2")]
+#[cfg(all(feature = "oauth2", not(feature = "private")))]
 use itertools::Itertools;
-#[cfg(feature = "oauth2")]
+#[cfg(all(feature = "oauth2", not(feature = "private")))]
 use oauth2::{Client as OClient, *};
+#[cfg(not(feature = "private"))]
 use serde::{Deserialize, Serialize};
+#[cfg(not(feature = "private"))]
 use sqlx::{Postgres, Transaction};
-#[cfg(feature = "oauth2")]
+#[cfg(all(feature = "oauth2", not(feature = "private")))]
 use windmill_common::more_serde::maybe_number_opt;
 
-#[cfg(feature = "oauth2")]
+#[cfg(all(feature = "oauth2", not(feature = "private")))]
 use crate::OAUTH_CLIENTS;
+#[cfg(not(feature = "private"))]
 use windmill_common::error;
+#[cfg(not(feature = "private"))]
 use windmill_common::oauth2::*;
 
+#[cfg(not(feature = "private"))]
 use crate::db::DB;
+#[cfg(not(feature = "private"))]
 use std::str;
 
+#[cfg(not(feature = "private"))]
 pub fn global_service() -> Router {
     Router::new()
         .route("/list_logins", get(list_logins))
         .route("/list_connects", get(list_connects))
 }
 
+#[cfg(not(feature = "private"))]
 pub fn workspaced_service() -> Router {
     Router::new()
 }
 
-#[cfg(feature = "oauth2")]
+#[cfg(all(feature = "oauth2", not(feature = "private")))]
 #[derive(Debug, Clone)]
 pub struct ClientWithScopes {
     _client: OClient,
@@ -48,9 +63,10 @@ pub struct ClientWithScopes {
     _allowed_domains: Option<Vec<String>>,
     _userinfo_url: Option<String>,
 }
-#[cfg(feature = "oauth2")]
+#[cfg(all(feature = "oauth2", not(feature = "private")))]
 pub type BasicClientsMap = HashMap<String, ClientWithScopes>;
 
+#[cfg(not(feature = "private"))]
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct OAuthConfig {
     auth_url: String,
@@ -62,6 +78,7 @@ pub struct OAuthConfig {
     req_body_auth: Option<bool>,
 }
 
+#[cfg(not(feature = "private"))]
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct OAuthClient {
     id: String,
@@ -71,7 +88,7 @@ pub struct OAuthClient {
     login_config: Option<OAuthConfig>,
 }
 
-#[cfg(feature = "oauth2")]
+#[cfg(all(feature = "oauth2", not(feature = "private")))]
 #[derive(Debug)]
 pub struct AllClients {
     pub logins: BasicClientsMap,
@@ -79,7 +96,7 @@ pub struct AllClients {
     pub slack: Option<OClient>,
 }
 
-#[cfg(feature = "oauth2")]
+#[cfg(all(feature = "oauth2", not(feature = "private")))]
 pub async fn build_oauth_clients(
     _base_url: &str,
     _oauths_from_config: Option<HashMap<String, OAuthClient>>,
@@ -93,7 +110,7 @@ pub async fn build_oauth_clients(
     });
 }
 
-#[cfg(feature = "oauth2")]
+#[cfg(all(feature = "oauth2", not(feature = "private")))]
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct TokenResponse {
     access_token: AccessToken,
@@ -107,17 +124,20 @@ pub struct TokenResponse {
     scope: Option<Vec<Scope>>,
 }
 
+#[cfg(not(feature = "private"))]
 #[derive(Serialize)]
 struct Logins {
     oauth: Vec<String>,
     saml: Option<String>,
 }
+#[cfg(not(feature = "private"))]
 async fn list_logins() -> error::JsonResult<Logins> {
     // Implementation is not open source
     return Ok(Json(Logins { oauth: vec![], saml: None }));
 }
 
-#[cfg(feature = "oauth2")]
+#[allow(unused)]
+#[cfg(all(feature = "oauth2", not(feature = "private")))]
 async fn list_connects() -> error::JsonResult<Vec<String>> {
     Ok(Json(
         (&OAUTH_CLIENTS.read().await.connects)
@@ -127,12 +147,14 @@ async fn list_connects() -> error::JsonResult<Vec<String>> {
     ))
 }
 
-#[cfg(not(feature = "oauth2"))]
-async fn list_connects() -> error::JsonResult<Vec<String>> {
+#[allow(unused)]
+#[cfg(not(all(feature = "oauth2", not(feature = "private"))))]
+async fn list_connects() -> windmill_common::error::JsonResult<Vec<String>> {
     // Implementation is not open source
-    return Ok(Json(vec![]));
+    return Ok(axum::Json(vec![]));
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn _refresh_token<'c>(
     _tx: Transaction<'c, Postgres>,
     _path: &str,
@@ -146,6 +168,7 @@ pub async fn _refresh_token<'c>(
     ))
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn check_nb_of_user(db: &DB) -> error::Result<()> {
     let nb_users_sso =
         sqlx::query_scalar!("SELECT COUNT(*) FROM password WHERE login_type != 'password'",)
@@ -171,10 +194,11 @@ pub async fn check_nb_of_user(db: &DB) -> error::Result<()> {
 }
 
 #[derive(Clone, Debug)]
+#[cfg(not(feature = "private"))]
 pub struct SlackVerifier {
     _mac: HmacSha256,
 }
-
+#[cfg(not(feature = "private"))]
 impl SlackVerifier {
     pub fn new<S: AsRef<[u8]>>(secret: S) -> anyhow::Result<SlackVerifier> {
         HmacSha256::new_from_slice(secret.as_ref())
diff --git a/backend/windmill-api/src/oidc_ee.rs b/backend/windmill-api/src/oidc_oss.rs
similarity index 68%
rename from backend/windmill-api/src/oidc_ee.rs
rename to backend/windmill-api/src/oidc_oss.rs
index 248b990f54..4042c2a53b 100644
--- a/backend/windmill-api/src/oidc_ee.rs
+++ b/backend/windmill-api/src/oidc_oss.rs
@@ -1,3 +1,7 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::oidc_ee::*;
+
 /*
  * Author: Ruben Fiszel
  * Copyright: Windmill Labs, Inc 2023
@@ -6,12 +10,15 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
+#[cfg(not(feature = "private"))]
 use axum::Router;
 
+#[cfg(not(feature = "private"))]
 pub fn global_service() -> Router {
     Router::new()
 }
 
+#[cfg(not(feature = "private"))]
 pub fn workspaced_service() -> Router {
     Router::new()
 }
diff --git a/backend/windmill-api/src/postgres_triggers/handler.rs b/backend/windmill-api/src/postgres_triggers/handler.rs
index 933582670c..73e35c9e2f 100644
--- a/backend/windmill-api/src/postgres_triggers/handler.rs
+++ b/backend/windmill-api/src/postgres_triggers/handler.rs
@@ -6,7 +6,6 @@ use std::collections::{
 use crate::{
     db::{ApiAuthed, DB},
     postgres_triggers::mapper::{Mapper, MappingInfo},
-    resources::try_get_resource_from_db_as,
 };
 use axum::{
     extract::{Path, Query},
@@ -16,25 +15,25 @@ use http::StatusCode;
 use itertools::Itertools;
 use pg_escape::{quote_identifier, quote_literal};
 use quick_cache::sync::Cache;
-use rust_postgres::types::Type;
+use rust_postgres::{types::Type, Client};
 use serde::{Deserialize, Deserializer, Serialize};
 use sql_builder::{bind::Bind, SqlBuilder};
-use sqlx::{postgres::types::Oid, FromRow, PgConnection};
-use windmill_audit::{audit_ee::audit_log, ActionKind};
-use windmill_common::error::Error;
+use sqlx::FromRow;
+use windmill_audit::{audit_oss::audit_log, ActionKind};
 use windmill_common::{
     db::UserDB,
-    error::{self, JsonResult, Result},
-    utils::{not_found_if_none, paginate, Pagination, StripPath, empty_as_none},
+    error::{self, to_anyhow, Error, JsonResult, Result},
+    utils::{empty_as_none, not_found_if_none, paginate, Pagination, StripPath},
     worker::CLOUD_HOSTED,
 };
 use windmill_git_sync::{handle_deployment_metadata, DeployedObject};
 
 use super::{
-    create_logical_replication_slot_query, create_publication_query, drop_publication_query,
-    generate_random_string, get_database_connection, get_raw_postgres_connection,
-    ERROR_PUBLICATION_NAME_NOT_EXISTS, ERROR_REPLICATION_SLOT_NOT_EXISTS,
+    check_if_valid_publication_for_postgres_version, create_logical_replication_slot,
+    create_pg_publication, drop_publication, generate_random_string, get_default_pg_connection,
+    ERROR_PUBLICATION_NAME_NOT_EXISTS,
 };
+use anyhow::anyhow;
 use lazy_static::lazy_static;
 
 #[derive(FromRow, Serialize, Deserialize, Debug)]
@@ -53,15 +52,17 @@ pub struct Postgres {
 #[derive(Debug, Clone, FromRow, Serialize, Deserialize)]
 pub struct TableToTrack {
     pub table_name: String,
+    #[serde(default, deserialize_with = "empty_as_none")]
     pub where_clause: Option<String>,
-    pub columns_name: Vec<String>,
+    #[serde(default, deserialize_with = "empty_as_none")]
+    pub columns_name: Option<Vec<String>>,
 }
 
 impl TableToTrack {
     fn new(
         table_name: String,
         where_clause: Option<String>,
-        columns_name: Vec<String>,
+        columns_name: Option<Vec<String>>,
     ) -> TableToTrack {
         TableToTrack { table_name, where_clause, columns_name }
     }
@@ -99,7 +100,6 @@ pub struct EditPostgresTrigger {
 }
 
 #[derive(Deserialize, Serialize, Debug)]
-
 pub struct NewPostgresTrigger {
     path: String,
     script_path: String,
@@ -124,7 +124,7 @@ pub async fn test_postgres_connection(
     Json(test_postgres): Json<TestPostgres>,
 ) -> Result<()> {
     let connect_f = async {
-        get_database_connection(
+        get_default_pg_connection(
             authed,
             Some(user_db),
             &db,
@@ -189,7 +189,7 @@ where
                         ));
                     }
 
-                    if !track_specific_columns_in_table && !table_to_track.columns_name.is_empty() {
+                    if !track_specific_columns_in_table && table_to_track.columns_name.is_some() {
                         track_specific_columns_in_table = true;
                     }
                 }
@@ -267,39 +267,18 @@ impl PostgresPublicationReplication {
     }
 }
 
-async fn check_if_publication_exist(
-    connection: &mut PgConnection,
-    publication_name: &str,
-) -> Result<()> {
-    sqlx::query!(
-        "SELECT pubname FROM pg_publication WHERE pubname = $1",
-        publication_name
-    )
-    .fetch_one(connection)
-    .await
-    .map_err(|err| match err {
-        sqlx::Error::RowNotFound => {
-            Error::BadRequest(ERROR_PUBLICATION_NAME_NOT_EXISTS.to_string())
-        }
-        err => Error::SqlErr { error: err, location: "pg_trigger".to_string() },
-    })?;
-    Ok(())
-}
-
 async fn check_if_logical_replication_slot_exist(
-    connection: &mut PgConnection,
+    pg_connection: &mut Client,
     replication_slot_name: &str,
-) -> Result<()> {
-    sqlx::query!(
-        "SELECT slot_name FROM pg_replication_slots where slot_name = $1",
-        &replication_slot_name
-    )
-    .fetch_one(connection)
-    .await
-    .map_err(|err| match err {
-        _ => Error::BadRequest(ERROR_REPLICATION_SLOT_NOT_EXISTS.to_string()),
-    })?;
-    Ok(())
+) -> Result<bool> {
+    let row = pg_connection
+        .query_opt(
+            "SELECT slot_name FROM pg_replication_slots WHERE slot_name = $1",
+            &[&replication_slot_name],
+        )
+        .await
+        .map_err(to_anyhow)?;
+    Ok(row.is_some())
 }
 
 async fn create_custom_slot_and_publication_inner(
@@ -310,33 +289,31 @@ async fn create_custom_slot_and_publication_inner(
     w_id: &str,
     publication: &PublicationData,
 ) -> Result<PostgresPublicationReplication> {
-    let publication_name = format!("windmill_trigger_{}", generate_random_string());
-    let replication_slot_name = publication_name.clone();
-
-    let query = create_publication_query(
-        &publication_name,
-        publication.table_to_track.as_deref(),
-        &publication
-            .transaction_to_track
-            .iter()
-            .map(AsRef::as_ref)
-            .collect_vec(),
-    );
-
-    let mut connection = get_database_connection(
+    let mut pg_connection = get_default_pg_connection(
         authed.clone(),
-        Some(user_db.clone()),
+        Some(user_db),
         &db,
         &postgres_resource_path,
         &w_id,
     )
+    .await
+    .map_err(to_anyhow)?;
+
+    let tx = pg_connection.transaction().await.map_err(to_anyhow)?;
+
+    let publication_name = format!("windmill_trigger_{}", generate_random_string());
+    let replication_slot_name = publication_name.clone();
+
+    create_logical_replication_slot(tx.client(), &replication_slot_name).await?;
+    create_pg_publication(
+        &tx.client(),
+        &publication_name,
+        publication.table_to_track.as_deref(),
+        &publication.transaction_to_track,
+    )
     .await?;
 
-    sqlx::query(&query).execute(&mut connection).await?;
-
-    let query = create_logical_replication_slot_query(&replication_slot_name);
-
-    sqlx::query(&query).execute(&mut connection).await?;
+    tx.commit().await.map_err(to_anyhow)?;
 
     Ok(PostgresPublicationReplication::new(
         publication_name,
@@ -344,6 +321,38 @@ async fn create_custom_slot_and_publication_inner(
     ))
 }
 
+pub async fn get_postgres_version_internal(pg_connection: &Client) -> Result<String> {
+    let row = pg_connection
+        .query_one("SHOW server_version;", &[])
+        .await
+        .map_err(to_anyhow)?;
+
+    let postgres_version: String = row.get(0);
+
+    Ok(postgres_version)
+}
+
+pub async fn get_postgres_version(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Extension(user_db): Extension<UserDB>,
+    Path((w_id, postgres_resource_path)): Path<(String, String)>,
+) -> Result<String> {
+    let pg_connection = get_default_pg_connection(
+        authed.clone(),
+        Some(user_db),
+        &db,
+        &postgres_resource_path,
+        &w_id,
+    )
+    .await
+    .map_err(to_anyhow)?;
+
+    let postgres_version = get_postgres_version_internal(&pg_connection).await?;
+
+    Ok(postgres_version)
+}
+
 pub async fn create_postgres_trigger(
     authed: ApiAuthed,
     Extension(user_db): Extension<UserDB>,
@@ -377,6 +386,7 @@ pub async fn create_postgres_trigger(
         if publication.is_none() {
             return Err(Error::BadRequest("publication must be set".to_string()));
         }
+
         let PostgresPublicationReplication { publication_name, replication_slot_name } =
             create_custom_slot_and_publication_inner(
                 authed.clone(),
@@ -577,7 +587,7 @@ impl PublicationData {
     }
 }
 
-#[derive(Debug, Serialize)]
+#[derive(FromRow, Debug, Serialize)]
 pub struct SlotList {
     slot_name: Option<String>,
     active: Option<bool>,
@@ -589,30 +599,37 @@ pub async fn list_slot_name(
     Extension(db): Extension<DB>,
     Path((w_id, postgres_resource_path)): Path<(String, String)>,
 ) -> Result<Json<Vec<SlotList>>> {
-    let mut connection = get_database_connection(
+    let pg_connection: Client = get_default_pg_connection(
         authed.clone(),
         Some(user_db.clone()),
         &db,
         &postgres_resource_path,
         &w_id,
     )
-    .await?;
+    .await
+    .map_err(to_anyhow)?;
 
-    let slots = sqlx::query_as!(
-        SlotList,
-        r#"
-        SELECT 
-            slot_name,
-            active
-        FROM
-            pg_replication_slots 
-        WHERE 
-            plugin = 'pgoutput' AND
-            slot_type = 'logical';
-        "#
-    )
-    .fetch_all(&mut connection)
-    .await?;
+    let rows = pg_connection
+        .query(
+            r#"
+            SELECT 
+                slot_name,
+                active
+            FROM
+                pg_replication_slots 
+            WHERE 
+                plugin = 'pgoutput' AND
+                slot_type = 'logical';
+            "#,
+            &[],
+        )
+        .await
+        .map_err(to_anyhow)?;
+
+    let slots = rows
+        .into_iter()
+        .map(|row| SlotList { slot_name: row.get("slot_name"), active: row.get("active") })
+        .collect();
 
     Ok(Json(slots))
 }
@@ -629,22 +646,54 @@ pub async fn create_slot(
     Path((w_id, postgres_resource_path)): Path<(String, String)>,
     Json(Slot { name }): Json<Slot>,
 ) -> Result<String> {
-    let mut connection = get_database_connection(
+    let pg_connection = get_default_pg_connection(
         authed.clone(),
         Some(user_db.clone()),
         &db,
         &postgres_resource_path,
         &w_id,
     )
-    .await?;
+    .await
+    .map_err(to_anyhow)?;
 
-    let query = create_logical_replication_slot_query(&name);
-
-    sqlx::query(&query).execute(&mut connection).await?;
+    create_logical_replication_slot(&pg_connection, &name).await?;
 
     Ok(format!("Replication slot {} created!", name))
 }
 
+pub async fn drop_logical_replication_slot(pg_connection: &Client, slot_name: &str) -> Result<()> {
+    let row = pg_connection
+        .query_opt(
+            r#"
+            SELECT 
+                active_pid 
+            FROM 
+                pg_replication_slots 
+            WHERE 
+                slot_name = $1
+            "#,
+            &[&slot_name],
+        )
+        .await
+        .map_err(to_anyhow)?;
+
+    let active_pid = row.map(|r| r.get::<_, Option<i32>>(0)).flatten();
+
+    if let Some(pid) = active_pid {
+        pg_connection
+            .execute("SELECT pg_terminate_backend($1)", &[&pid])
+            .await
+            .map_err(to_anyhow)?;
+    }
+
+    pg_connection
+        .execute("SELECT pg_drop_replication_slot($1)", &[&slot_name])
+        .await
+        .map_err(to_anyhow)?;
+
+    Ok(())
+}
+
 pub async fn drop_slot_name(
     authed: ApiAuthed,
     Extension(user_db): Extension<UserDB>,
@@ -652,48 +701,17 @@ pub async fn drop_slot_name(
     Path((w_id, postgres_resource_path)): Path<(String, String)>,
     Json(Slot { name }): Json<Slot>,
 ) -> Result<String> {
-    let database = try_get_resource_from_db_as::<Postgres>(
-        authed,
-        Some(user_db),
-        &db,
-        &postgres_resource_path,
-        &w_id,
-    )
-    .await?;
+    let pg_connection =
+        get_default_pg_connection(authed, Some(user_db), &db, &postgres_resource_path, &w_id)
+            .await
+            .map_err(to_anyhow)?;
 
-    let mut connection = get_raw_postgres_connection(&database).await?;
-
-    let active_pid = sqlx::query_scalar!(
-        r#"SELECT 
-            active_pid 
-        FROM 
-            pg_replication_slots 
-        WHERE 
-            slot_name = $1
-        "#,
-        &name
-    )
-    .fetch_optional(&mut connection)
-    .await?
-    .flatten();
-
-    if let Some(pid) = active_pid {
-        sqlx::query("SELECT pg_terminate_backend($1)")
-            .bind(pid)
-            .execute(&mut connection)
-            .await?;
-    }
-    sqlx::query("SELECT pg_drop_replication_slot($1)")
-        .bind(&name)
-        .execute(&mut connection)
-        .await?;
+    drop_logical_replication_slot(&pg_connection, &name)
+        .await
+        .map_err(to_anyhow)?;
 
     Ok(format!("Replication slot {} deleted!", name))
 }
-#[derive(Debug, Serialize)]
-struct PublicationName {
-    publication_name: String,
-}
 
 pub async fn list_database_publication(
     authed: ApiAuthed,
@@ -701,25 +719,27 @@ pub async fn list_database_publication(
     Extension(db): Extension<DB>,
     Path((w_id, postgres_resource_path)): Path<(String, String)>,
 ) -> Result<Json<Vec<String>>> {
-    let mut connection = get_database_connection(
+    let pg_connection = get_default_pg_connection(
         authed.clone(),
         Some(user_db.clone()),
         &db,
         &postgres_resource_path,
         &w_id,
     )
-    .await?;
+    .await
+    .map_err(to_anyhow)?;
 
-    let publication_names = sqlx::query_as!(
-        PublicationName,
-        "SELECT pubname AS publication_name FROM pg_publication;"
-    )
-    .fetch_all(&mut connection)
-    .await?;
+    let rows = pg_connection
+        .query(
+            "SELECT pubname AS publication_name FROM pg_publication;",
+            &[],
+        )
+        .await
+        .map_err(to_anyhow)?;
 
-    let publications = publication_names
-        .iter()
-        .map(|publication| publication.publication_name.to_owned())
+    let publications = rows
+        .into_iter()
+        .map(|row| row.get::<_, String>("publication_name"))
         .collect_vec();
 
     Ok(Json(publications))
@@ -731,21 +751,22 @@ pub async fn get_publication_info(
     Extension(db): Extension<DB>,
     Path((w_id, publication_name, postgres_resource_path)): Path<(String, String, String)>,
 ) -> Result<Json<PublicationData>> {
-    let mut connection = get_database_connection(
+    let mut pg_connection = get_default_pg_connection(
         authed.clone(),
         Some(user_db.clone()),
         &db,
         &postgres_resource_path,
         &w_id,
     )
-    .await?;
+    .await
+    .map_err(to_anyhow)?;
 
     let publication_data =
-        get_publication_scope_and_transaction(&mut connection, &publication_name).await;
+        get_publication_scope_and_transaction(&mut pg_connection, &publication_name).await;
 
     let (all_table, transaction_to_track) = match publication_data {
-        Ok(pub_data) => pub_data,
-        Err(Error::SqlErr { error: sqlx::Error::RowNotFound, .. }) => {
+        Ok(Some(pub_data)) => pub_data,
+        Ok(None) => {
             return Err(Error::NotFound(
                 ERROR_PUBLICATION_NAME_NOT_EXISTS.to_string(),
             ))
@@ -754,7 +775,7 @@ pub async fn get_publication_info(
     };
 
     let table_to_track = if !all_table {
-        Some(get_tracked_relations(&mut connection, &publication_name).await?)
+        Some(get_tracked_relations(&mut pg_connection, &publication_name).await?)
     } else {
         None
     };
@@ -771,24 +792,29 @@ pub async fn create_publication(
     Path((w_id, publication_name, postgres_resource_path)): Path<(String, String, String)>,
     Json(publication_data): Json<PublicationData>,
 ) -> Result<String> {
-    let PublicationData { table_to_track, transaction_to_track } = publication_data;
-
-    let mut connection = get_database_connection(
+    let mut pg_connection = get_default_pg_connection(
         authed.clone(),
         Some(user_db.clone()),
         &db,
         &postgres_resource_path,
         &w_id,
     )
-    .await?;
+    .await
+    .map_err(to_anyhow)?;
 
-    let query = create_publication_query(
+    let PublicationData { table_to_track, transaction_to_track } = publication_data;
+
+    let tx = pg_connection.transaction().await.map_err(to_anyhow)?;
+
+    create_pg_publication(
+        tx.client(),
         &publication_name,
         table_to_track.as_deref(),
-        &transaction_to_track.iter().map(AsRef::as_ref).collect_vec(),
-    );
+        &transaction_to_track,
+    )
+    .await?;
 
-    sqlx::query(&query).execute(&mut connection).await?;
+    tx.commit().await.map_err(to_anyhow)?;
 
     Ok(format!(
         "Publication {} successfully created!",
@@ -802,18 +828,17 @@ pub async fn delete_publication(
     Extension(db): Extension<DB>,
     Path((w_id, publication_name, postgres_resource_path)): Path<(String, String, String)>,
 ) -> Result<String> {
-    let mut connection = get_database_connection(
+    let mut pg_connection = get_default_pg_connection(
         authed.clone(),
         Some(user_db.clone()),
         &db,
         &postgres_resource_path,
         &w_id,
     )
-    .await?;
+    .await
+    .map_err(to_anyhow)?;
 
-    let query = drop_publication_query(&publication_name);
-
-    sqlx::query(&query).execute(&mut connection).await?;
+    drop_publication(&mut pg_connection, &publication_name).await?;
 
     Ok(format!(
         "Publication {} successfully deleted!",
@@ -821,57 +846,68 @@ pub async fn delete_publication(
     ))
 }
 
-pub fn get_update_publication_query(
+pub async fn update_pg_publication(
+    pg_connection: &Client,
     publication_name: &str,
     PublicationData { table_to_track, transaction_to_track }: PublicationData,
-    all_table: bool,
-) -> Vec<String> {
-    let quoted_publication_name = quote_identifier(&publication_name);
-
+    all_table: Option<bool>,
+) -> Result<()> {
+    let quoted_publication_name = quote_identifier(publication_name);
     let transaction_to_track_as_str = transaction_to_track.iter().join(",");
-    let mut queries = Vec::with_capacity(2);
     match table_to_track {
         Some(ref relations) if !relations.is_empty() => {
-            if all_table {
-                queries.push(drop_publication_query(&publication_name));
-                queries.push(create_publication_query(
-                    &publication_name,
+            // If all_table is None, the publication does not exist yet
+            if all_table.unwrap_or(true) {
+                if all_table.is_some_and(|all_table| all_table) {
+                    drop_publication(pg_connection, publication_name)
+                        .await
+                        .map_err(to_anyhow)?;
+                }
+                create_pg_publication(
+                    pg_connection,
+                    publication_name,
                     table_to_track.as_deref(),
-                    &transaction_to_track.iter().map(AsRef::as_ref).collect_vec(),
-                ));
+                    &transaction_to_track,
+                )
+                .await
+                .map_err(to_anyhow)?;
             } else {
-                let mut query = String::from("");
+                let pg_14 = check_if_valid_publication_for_postgres_version(
+                    pg_connection,
+                    table_to_track.as_deref(),
+                )
+                .await
+                .map_err(to_anyhow)?;
+
+                let mut query = format!("ALTER PUBLICATION {} SET ", quoted_publication_name);
+                let mut first = true;
 
-                query.push_str("ALTER PUBLICATION ");
-                query.push_str(&quoted_publication_name);
-                query.push_str(" SET");
                 for (i, schema) in relations.iter().enumerate() {
                     if schema.table_to_track.is_empty() {
-                        query.push_str(" TABLES IN SCHEMA ");
-                        let quoted_schema = quote_identifier(&schema.schema_name);
-                        query.push_str(&quoted_schema);
+                        query.push_str("TABLES IN SCHEMA ");
+                        query.push_str(&quote_identifier(&schema.schema_name));
                     } else {
-                        query.push_str(" TABLE ONLY ");
+                        if pg_14 && first {
+                            query.push_str("TABLE ONLY ");
+                            first = false;
+                        } else if !pg_14 {
+                            query.push_str("TABLE ONLY ");
+                        }
+
                         for (j, table) in schema.table_to_track.iter().enumerate() {
                             let table_name = quote_identifier(&table.table_name);
                             let schema_name = quote_identifier(&schema.schema_name);
-                            let full_name = format!("{}.{}", &schema_name, &table_name);
+                            let full_name = format!("{}.{}", schema_name, table_name);
                             query.push_str(&full_name);
-                            if !table.columns_name.is_empty() {
-                                query.push_str(" (");
-                                let columns = table
-                                    .columns_name
-                                    .iter()
-                                    .map(|column| quote_identifier(column))
-                                    .join(", ");
-                                query.push_str(&columns);
-                                query.push_str(") ");
+
+                            if let Some(columns) = table.columns_name.as_ref() {
+                                let cols =
+                                    columns.iter().map(|col| quote_identifier(col)).join(", ");
+                                query.push_str(&format!(" ({})", cols));
                             }
 
                             if let Some(where_clause) = &table.where_clause {
-                                query.push_str(" WHERE (");
-                                query.push_str(where_clause);
-                                query.push(')');
+                                query.push_str(&format!(" WHERE ({})", where_clause));
                             }
 
                             if j + 1 != schema.table_to_track.len() {
@@ -879,39 +915,43 @@ pub fn get_update_publication_query(
                             }
                         }
                     }
-                    if i < relations.len() - 1 {
-                        query.push(',');
+
+                    if i + 1 != relations.len() {
+                        query.push_str(", ");
                     }
                 }
-                query.push(';');
 
-                queries.push(query);
+                pg_connection
+                    .execute(&query, &[])
+                    .await
+                    .map_err(to_anyhow)?;
 
-                let mut query = String::new();
-
-                query.push_str("ALTER PUBLICATION ");
-                query.push_str(&quoted_publication_name);
-                query.push_str(&format!(
-                    " SET (publish = '{}');",
-                    transaction_to_track_as_str
-                ));
-                queries.push(query);
+                let publish_query = format!(
+                    "ALTER PUBLICATION {} SET (publish = '{}');",
+                    quoted_publication_name, transaction_to_track_as_str
+                );
+                pg_connection
+                    .execute(&publish_query, &[])
+                    .await
+                    .map_err(to_anyhow)?;
             }
         }
         _ => {
-            queries.push(drop_publication_query(&publication_name));
-            let to_execute = format!(
-                r#"
-                CREATE
-                    PUBLICATION {} FOR ALL TABLES WITH (publish = '{}');
-                "#,
+            drop_publication(pg_connection, publication_name)
+                .await
+                .map_err(to_anyhow)?;
+            let create_all_query = format!(
+                "CREATE PUBLICATION {} FOR ALL TABLES WITH (publish = '{}');",
                 quoted_publication_name, transaction_to_track_as_str
             );
-            queries.push(to_execute);
+            pg_connection
+                .execute(&create_all_query, &[])
+                .await
+                .map_err(to_anyhow)?;
         }
-    };
+    }
 
-    queries
+    Ok(())
 }
 
 pub async fn alter_publication(
@@ -921,25 +961,32 @@ pub async fn alter_publication(
     Path((w_id, publication_name, postgres_resource_path)): Path<(String, String, String)>,
     Json(publication_data): Json<PublicationData>,
 ) -> Result<String> {
-    let mut connection = get_database_connection(
+    let mut pg_connection = get_default_pg_connection(
         authed.clone(),
         Some(user_db.clone()),
         &db,
         &postgres_resource_path,
         &w_id,
     )
-    .await?;
+    .await
+    .map_err(to_anyhow)?;
 
-    check_if_publication_exist(&mut connection, &publication_name).await?;
+    let tx = pg_connection.transaction().await.map_err(to_anyhow)?;
 
-    let (all_table, _) =
-        get_publication_scope_and_transaction(&mut connection, &publication_name).await?;
+    let publication = get_publication_scope_and_transaction(tx.client(), &publication_name)
+        .await
+        .map_err(to_anyhow)?;
 
-    let queries = get_update_publication_query(&publication_name, publication_data, all_table);
+    update_pg_publication(
+        tx.client(),
+        &publication_name,
+        publication_data,
+        publication.map(|publication| publication.0),
+    )
+    .await
+    .map_err(to_anyhow)?;
 
-    for query in queries {
-        sqlx::query(&query).execute(&mut connection).await?;
-    }
+    tx.commit().await.map_err(to_anyhow)?;
 
     Ok(format!(
         "Publication {} updated with success",
@@ -947,104 +994,126 @@ pub async fn alter_publication(
     ))
 }
 
-async fn get_publication_scope_and_transaction(
-    connection: &mut PgConnection,
+pub async fn get_publication_scope_and_transaction(
+    pg_connection: &Client,
     publication_name: &str,
-) -> std::result::Result<(bool, Vec<String>), Error> {
-    #[derive(Debug, Deserialize, FromRow)]
-    struct PublicationTransaction {
-        all_table: bool,
-        insert: bool,
-        update: bool,
-        delete: bool,
-    }
+) -> Result<Option<(bool, Vec<String>)>> {
+    let row_opt = pg_connection
+        .query_opt(
+            r#"
+            SELECT
+                puballtables AS all_table,
+                pubinsert AS insert,
+                pubupdate AS update,
+                pubdelete AS delete
+            FROM
+                pg_publication
+            WHERE
+                pubname = $1
+            "#,
+            &[&publication_name],
+        )
+        .await
+        .map_err(to_anyhow)?;
 
-    let transaction = sqlx::query_as!(
-        PublicationTransaction,
-        r#"
-        SELECT
-            puballtables AS all_table,
-            pubinsert AS insert,
-            pubupdate AS update,
-            pubdelete AS delete
-        FROM
-            pg_publication
-        WHERE
-            pubname = $1
-        "#,
-        publication_name
-    )
-    .fetch_one(&mut *connection)
-    .await?;
+    let row = match row_opt {
+        Some(r) => r,
+        None => return Ok(None),
+    };
+
+    let all_table: bool = row.get("all_table");
+    let pub_insert: bool = row.get("insert");
+    let pub_update: bool = row.get("update");
+    let pub_delete: bool = row.get("delete");
 
     let mut transaction_to_track = Vec::with_capacity(3);
-
-    if transaction.insert {
+    if pub_insert {
         transaction_to_track.push("insert".to_string());
     }
-    if transaction.update {
+    if pub_update {
         transaction_to_track.push("update".to_string());
     }
-    if transaction.delete {
+    if pub_delete {
         transaction_to_track.push("delete".to_string());
     }
 
-    Ok((transaction.all_table, transaction_to_track))
+    Ok(Some((all_table, transaction_to_track)))
 }
 
-async fn get_tracked_relations(
-    connection: &mut PgConnection,
+pub async fn get_tracked_relations(
+    pg_connection: &Client,
     publication_name: &str,
 ) -> Result<Vec<Relations>> {
-    #[derive(Debug, Deserialize, FromRow)]
-    struct PublicationData {
-        schema_name: Option<String>,
-        table_name: Option<String>,
-        columns: Option<Vec<String>>,
-        where_clause: Option<String>,
-    }
+    let pg_version = get_postgres_version_internal(pg_connection).await?;
 
-    let publications = sqlx::query_as!(
-        PublicationData,
+    let query = if pg_version.starts_with("14") {
         r#"
-            SELECT
+        SELECT
             schemaname AS schema_name,
             tablename AS table_name,
-            CASE
-                WHEN array_length(attnames, 1) = (SELECT COUNT(*) FROM information_schema.columns WHERE table_schema = pg_publication_tables.schemaname AND table_name = pg_publication_tables.tablename)
-                THEN NULL
-                ELSE attnames
-            END AS columns,
+            NULL::text[] AS columns,
+            NULL::text AS where_clause
+        FROM
+            pg_publication_tables
+        WHERE
+            pubname = $1;
+        "#
+    } else {
+        r#"
+        SELECT
+            schemaname AS schema_name,
+            tablename AS table_name,
+            attnames AS columns,
             rowfilter AS where_clause
-            FROM
-                pg_publication_tables
-            WHERE
-                pubname = $1;
-            "#,
-        publication_name
-    )
-    .fetch_all(&mut *connection)
-    .await?;
+        FROM
+            pg_publication_tables
+        WHERE
+            pubname = $1;
+        "#
+    };
+
+    let rows = pg_connection
+        .query(query, &[&publication_name])
+        .await
+        .map_err(to_anyhow)?;
 
     let mut table_to_track: HashMap<String, Relations> = HashMap::new();
 
-    for publication in publications {
-        let schema_name = publication.schema_name.unwrap();
+    for row in rows {
+        let schema_name: Option<String> = row.get("schema_name");
+        let table_name: Option<String> = row.get("table_name");
+        let columns: Option<Vec<String>> = row.get("columns");
+        let where_clause: Option<String> = row.get("where_clause");
+
+        let schema_name = schema_name.ok_or_else::<Error, _>( || {
+            anyhow!(
+                "Unexpected NULL `schema_name` in publication entry (pubname: `{}`). This should never happen unless PostgreSQL internals are corrupted.",
+                publication_name,
+            ).into()
+        }
+        )?;
+
+        let table_name = table_name.ok_or_else::<Error, _>(|| {
+            anyhow!(
+                "Unexpected NULL `table_name` for schema `{}` in publication `{}`. This should never happen unless PostgreSQL internals are corrupted.",
+                schema_name,
+                publication_name,
+            ).into()
+        })?;
+
         let entry = table_to_track.entry(schema_name.clone());
-        let table_to_track = TableToTrack::new(
-            publication.table_name.unwrap(),
-            publication.where_clause,
-            publication.columns.unwrap_or_default(),
-        );
+        let table_to_track = TableToTrack::new(table_name, where_clause, columns);
+
         match entry {
-            Occupied(mut occuped) => {
+            std::collections::hash_map::Entry::Occupied(mut occuped) => {
                 occuped.get_mut().add_new_table(table_to_track);
             }
-            Vacant(vacant) => {
+            std::collections::hash_map::Entry::Vacant(vacant) => {
                 vacant.insert(Relations::new(schema_name, vec![table_to_track]));
             }
         }
     }
+
     Ok(table_to_track.into_values().collect_vec())
 }
 
@@ -1111,27 +1180,49 @@ pub async fn update_postgres_trigger(
         publication,
     } = postgres_trigger;
 
-    let mut connection = get_database_connection(
+    let mut pg_connection = get_default_pg_connection(
         authed.clone(),
         Some(user_db.clone()),
         &db,
         &postgres_resource_path,
         &w_id,
     )
-    .await?;
+    .await
+    .map_err(to_anyhow)?;
 
-    check_if_logical_replication_slot_exist(&mut connection, &replication_slot_name).await?;
+    let exists =
+        check_if_logical_replication_slot_exist(&mut pg_connection, &replication_slot_name).await?;
+
+    let tx = pg_connection.transaction().await.map_err(to_anyhow)?;
+
+    if !exists {
+        tracing::debug!(
+            "Logical replication slot named: {} does not exists creating it...",
+            &replication_slot_name
+        );
+        create_logical_replication_slot(tx.client(), &replication_slot_name)
+            .await
+            .map_err(to_anyhow)?;
+    }
 
     if let Some(publication) = publication {
-        check_if_publication_exist(&mut connection, &publication_name).await?;
-        let (all_table, _) =
-            get_publication_scope_and_transaction(&mut connection, &publication_name).await?;
+        let publication_data =
+            get_publication_scope_and_transaction(tx.client(), &publication_name)
+                .await
+                .map_err(to_anyhow)?;
 
-        let queries = get_update_publication_query(&publication_name, publication, all_table);
-        for query in queries {
-            sqlx::query(&query).execute(&mut connection).await?;
-        }
+        update_pg_publication(
+            tx.client(),
+            &publication_name,
+            publication,
+            publication_data.map(|publication| publication.0),
+        )
+        .await
+        .map_err(to_anyhow)?;
     }
+
+    tx.commit().await.map_err(to_anyhow)?;
+
     let mut tx = user_db.begin(&authed).await?;
 
     sqlx::query!(
@@ -1350,52 +1441,40 @@ pub async fn create_template_script(
     Json(template_script): Json<TemplateScript>,
 ) -> Result<String> {
     let TemplateScript { postgres_resource_path, relations, language } = template_script;
-    if relations.is_none() {
-        return Err(Error::BadRequest(
-            "You must at least choose schema to fetch table from".to_string(),
-        ));
-    }
 
-    let mut connection = get_database_connection(
+    let relations = match relations {
+        Some(r) => r,
+        None => return Err(anyhow!("You must at least choose schema to fetch table from").into()),
+    };
+
+    let pg_connection: Client = get_default_pg_connection(
         authed.clone(),
         Some(user_db.clone()),
         &db,
         &postgres_resource_path,
         &w_id,
     )
-    .await?;
+    .await
+    .map_err(to_anyhow)?;
 
-    #[derive(Debug, FromRow, Deserialize)]
-    struct ColumnInfo {
-        table_schema: Option<String>,
-        table_name: Option<String>,
-        column_name: Option<String>,
-        oid: Oid,
-        is_nullable: bool,
-    }
-
-    let relations = relations.unwrap();
     let mut schema_or_fully_qualified_name = Vec::with_capacity(relations.len());
-    let mut columns_list = Vec::new();
+    let mut columns_list = Vec::with_capacity(relations.len());
+
     for relation in relations {
         if !relation.table_to_track.is_empty() {
-            for table_to_track in relation.table_to_track {
-                let fully_qualified_name =
-                    format!("{}.{}", &relation.schema_name, table_to_track.table_name);
+            for table in relation.table_to_track {
+                let fully_qualified_name = format!("{}.{}", relation.schema_name, table.table_name);
                 schema_or_fully_qualified_name.push(quote_literal(&fully_qualified_name));
-
-                let columns = if !table_to_track.columns_name.is_empty() {
-                    quote_literal(&table_to_track.columns_name.join(","))
-                } else {
-                    "''".to_string()
-                };
+                let columns = table
+                    .columns_name
+                    .map(|c| quote_literal(&c.join(",")))
+                    .unwrap_or_else(|| "''".to_string());
                 columns_list.push(columns);
             }
-            continue;
+        } else {
+            schema_or_fully_qualified_name.push(quote_literal(&relation.schema_name));
+            columns_list.push("''".to_string());
         }
-
-        schema_or_fully_qualified_name.push(quote_literal(&relation.schema_name));
-        columns_list.push(String::from("''"));
     }
 
     let tables_name = schema_or_fully_qualified_name.join(",");
@@ -1415,8 +1494,7 @@ pub async fn create_template_script(
                     WHEN tcm.column_list = '' THEN NULL
                     ELSE string_to_array(tcm.column_list, ',')
                 END AS columns
-            FROM
-                table_column_mapping tcm
+            FROM table_column_mapping tcm
         )
         SELECT
             ns.nspname AS table_schema,
@@ -1424,22 +1502,16 @@ pub async fn create_template_script(
             attr.attname AS column_name,
             attr.atttypid AS oid,
             attr.attnotnull AS is_nullable
-        FROM
-            pg_attribute attr
-        JOIN
-            pg_class cls
-            ON attr.attrelid = cls.oid
-        JOIN
-            pg_namespace ns
-            ON cls.relnamespace = ns.oid
-        JOIN
-            parsed_columns pc
+        FROM pg_attribute attr
+        JOIN pg_class cls ON attr.attrelid = cls.oid
+        JOIN pg_namespace ns ON cls.relnamespace = ns.oid
+        JOIN parsed_columns pc
             ON ns.nspname || '.' || cls.relname = pc.table_name
             OR ns.nspname = pc.table_name
         WHERE
-            attr.attnum > 0 -- Exclude system columns
-            AND NOT attr.attisdropped -- Exclude dropped columns
-            AND cls.relkind = 'r' -- Restrict to base tables
+            attr.attnum > 0
+            AND NOT attr.attisdropped
+            AND cls.relkind = 'r'
             AND (
                 pc.columns IS NULL
                 OR attr.attname = ANY(pc.columns)
@@ -1448,55 +1520,52 @@ pub async fn create_template_script(
         tables_name, columns_list
     );
 
-    let rows: Vec<ColumnInfo> = sqlx::query_as(&query)
-        .fetch_all(&mut connection)
-        .await
-        .map_err(|e| error::Error::SqlErr { error: e, location: "pg_trigger".to_string() })?;
+    let rows = pg_connection.query(&query, &[]).await.map_err(to_anyhow)?;
 
-    let mut mapper: HashMap<String, HashMap<String, Vec<MappingInfo>>> = HashMap::new();
+    let mut schema_map: HashMap<String, HashMap<String, Vec<MappingInfo>>> = HashMap::new();
+
+    #[derive(Debug)]
+    struct ColumnInfo {
+        table_schema: String,
+        table_name: String,
+        column_name: String,
+        oid: u32,
+        is_nullable: bool,
+    }
 
     for row in rows {
-        let ColumnInfo { table_schema, table_name, column_name, oid, is_nullable } = row;
-
-        let entry = mapper.entry(table_schema.unwrap());
+        let info = ColumnInfo {
+            table_schema: row.get("table_schema"),
+            table_name: row.get("table_name"),
+            column_name: row.get("column_name"),
+            oid: row.get::<_, u32>("oid"),
+            is_nullable: row.get::<_, bool>("is_nullable"),
+        };
 
         let mapped_info =
-            MappingInfo::new(column_name.unwrap(), Type::from_oid(oid.0), is_nullable);
+            MappingInfo::new(info.column_name, Type::from_oid(info.oid), info.is_nullable);
 
-        match entry {
-            Occupied(mut occupied) => {
-                let entry = occupied.get_mut().entry(table_name.unwrap());
-                match entry {
-                    Occupied(mut occuped) => {
-                        let mapping_info = occuped.get_mut();
-                        mapping_info.push(mapped_info);
-                    }
-                    Vacant(vacant) => {
-                        let mut mapping_info = Vec::with_capacity(10);
-                        mapping_info.push(mapped_info);
-                        vacant.insert(mapping_info);
-                    }
+        match schema_map.entry(info.table_schema) {
+            Occupied(mut schema_entry) => match schema_entry.get_mut().entry(info.table_name) {
+                Occupied(mut table_entry) => {
+                    table_entry.get_mut().push(mapped_info);
                 }
-            }
-            Vacant(vacant) => {
-                let mut mapping_info = Vec::with_capacity(10);
-                mapping_info.push(mapped_info);
-                vacant.insert(HashMap::from([(table_name.unwrap(), mapping_info)]));
+                Vacant(v) => {
+                    v.insert(vec![mapped_info]);
+                }
+            },
+            Vacant(schema_vacant) => {
+                let mut table_map = HashMap::new();
+                table_map.insert(info.table_name, vec![mapped_info]);
+                schema_vacant.insert(table_map);
             }
         }
     }
 
-    let mapper = Mapper::new(mapper, language);
-
-    let create_template_id = |w_id: &str| -> String {
-        let uuid = uuid::Uuid::new_v4().to_string();
-        let id = format!("{}-{}", &w_id, &uuid);
-
-        id
-    };
-
+    let mapper = Mapper::new(schema_map, language);
     let template = mapper.get_template();
-    let id = create_template_id(&w_id);
+
+    let id = format!("{}-{}", w_id, uuid::Uuid::new_v4());
 
     TEMPLATE.insert(id.clone(), template);
 
@@ -1509,24 +1578,24 @@ pub async fn is_database_in_logical_level(
     Extension(db): Extension<DB>,
     Path((w_id, postgres_resource_path)): Path<(String, String)>,
 ) -> error::JsonResult<bool> {
-    let mut connection = get_database_connection(
+    let pg_connection = get_default_pg_connection(
         authed.clone(),
         Some(user_db.clone()),
         &db,
         &postgres_resource_path,
         &w_id,
     )
-    .await?;
+    .await
+    .map_err(to_anyhow)?;
 
-    let wal_level = sqlx::query_scalar!("SHOW WAL_LEVEL;")
-        .fetch_optional(&mut connection)
-        .await?
-        .flatten();
+    let row_opt = pg_connection
+        .query_opt("SHOW wal_level;", &[])
+        .await
+        .map_err(to_anyhow)?;
 
-    let is_logical = match wal_level.as_deref() {
-        Some("logical") => true,
-        _ => false,
-    };
+    let wal_level: Option<String> = row_opt.map(|row| row.get(0));
+
+    let is_logical = matches!(wal_level.as_deref(), Some("logical"));
 
     Ok(Json(is_logical))
 }
diff --git a/backend/windmill-api/src/postgres_triggers/mod.rs b/backend/windmill-api/src/postgres_triggers/mod.rs
index d557ca67cc..096f0c78d0 100644
--- a/backend/windmill-api/src/postgres_triggers/mod.rs
+++ b/backend/windmill-api/src/postgres_triggers/mod.rs
@@ -7,15 +7,13 @@ use crate::{
 };
 use chrono::Utc;
 use itertools::Itertools;
-use pg_escape::{quote_identifier, quote_literal};
+use native_tls::{Certificate, TlsConnector};
+use pg_escape::quote_identifier;
 use rand::Rng;
+use rust_postgres::{config::SslMode, Client, Config, NoTls};
+use rust_postgres_native_tls::MakeTlsConnector;
 use serde_json::value::RawValue;
-use sqlx::{
-    postgres::{PgConnectOptions, PgSslMode},
-    Connection, PgConnection,
-};
 use std::collections::HashMap;
-use std::str::FromStr;
 
 use axum::{
     routing::{delete, get, post},
@@ -25,12 +23,17 @@ pub use handler::PostgresTrigger;
 use handler::{
     alter_publication, create_postgres_trigger, create_publication, create_slot,
     create_template_script, delete_postgres_trigger, delete_publication, drop_slot_name,
-    exists_postgres_trigger, get_postgres_trigger, get_publication_info, get_template_script,
+    exists_postgres_trigger, get_postgres_trigger, get_postgres_version,
+    get_postgres_version_internal, get_publication_info, get_template_script,
     is_database_in_logical_level, list_database_publication, list_postgres_triggers,
     list_slot_name, set_enabled, test_postgres_connection, update_postgres_trigger, Postgres,
     Relations,
 };
-use windmill_common::{db::UserDB, error::Error, utils::StripPath};
+use windmill_common::{
+    db::UserDB,
+    error::{to_anyhow, Error, Result},
+    utils::StripPath,
+};
 mod bool;
 mod converter;
 mod handler;
@@ -47,76 +50,184 @@ const ERROR_REPLICATION_SLOT_NOT_EXISTS: &str = r#"The replication slot associat
 
 const ERROR_PUBLICATION_NAME_NOT_EXISTS: &str = r#"The publication associated with this trigger no longer exists. Recreate a new publication or select an existing one in the advanced tab, or delete and recreate a new trigger"#;
 
-pub async fn get_database_connection(
+fn build_tls_connector(
+    ssl_mode: SslMode,
+    root_certificate_pem: Option<&String>,
+) -> Result<Option<MakeTlsConnector>> {
+    let get_tls_builder_for_verify = |root_certificate: Option<&String>| {
+        let mut builder = TlsConnector::builder();
+        if let Some(root_certificate) = root_certificate {
+            let root_certificate_pem =
+                Certificate::from_pem(root_certificate.as_bytes()).map_err(to_anyhow)?;
+            builder.add_root_certificate(root_certificate_pem);
+        }
+        Ok::<_, Error>(builder)
+    };
+    let connector = match ssl_mode {
+        SslMode::Disable => return Ok(None),
+        SslMode::Require | SslMode::Prefer => {
+            let mut builder = TlsConnector::builder();
+            builder.danger_accept_invalid_certs(true);
+            builder.danger_accept_invalid_hostnames(true);
+            builder
+        }
+
+        SslMode::VerifyCa => {
+            let mut builder = get_tls_builder_for_verify(root_certificate_pem)?;
+            builder.danger_accept_invalid_hostnames(true);
+            builder
+        }
+
+        SslMode::VerifyFull => {
+            let builder = get_tls_builder_for_verify(root_certificate_pem)?;
+            builder
+        }
+        _ => unreachable!(),
+    };
+
+    Ok(Some(MakeTlsConnector::new(
+        connector.build().map_err(to_anyhow)?,
+    )))
+}
+
+pub async fn get_raw_postgres_connection(
+    database: &Postgres,
+    logical_mode: bool,
+) -> Result<Client> {
+    let ssl_mode = match database.sslmode.as_ref() {
+            "disable" => SslMode::Disable,
+            "" | "prefer" | "allow" => SslMode::Prefer,
+            "require" => SslMode::Require,
+            "verify-ca" => SslMode::VerifyCa,
+            "verify-full" => SslMode::VerifyFull,
+            ssl_mode => {
+                return Err(Error::BadRequest(
+                    format!("Invalid ssl mode for postgres: {}, please put a valid ssl_mode among the following available ssl mode: ['disable', 'allow', 'prefer', 'verify-ca', 'verify-full']", ssl_mode),
+                ))
+            }
+        };
+
+    let mut config = Config::new();
+    config
+        .dbname(&database.dbname)
+        .host(&database.host)
+        .user(&database.user)
+        .ssl_mode(ssl_mode);
+
+    if logical_mode {
+        config.replication_mode(rust_postgres::config::ReplicationMode::Logical);
+    }
+
+    if let Some(port) = database.port {
+        config.port(port);
+    };
+
+    if !database.password.is_empty() {
+        config.password(&database.password);
+    }
+
+    let connector = build_tls_connector(ssl_mode, database.root_certificate_pem.as_ref())?;
+
+    let client = if let Some(connector) = connector {
+        let (client, connection) = config.connect(connector).await.map_err(to_anyhow)?;
+        tokio::spawn(async move {
+            if let Err(e) = connection.await {
+                tracing::debug!("{:#?}", e);
+            };
+            tracing::info!("Successfully Connected into database");
+        });
+        client
+    } else {
+        let (client, connection) = config.connect(NoTls).await.map_err(to_anyhow)?;
+        tokio::spawn(async move {
+            if let Err(e) = connection.await {
+                tracing::debug!("{:#?}", e);
+            };
+            tracing::info!("Successfully Connected into database");
+        });
+        client
+    };
+
+    Ok(client)
+}
+
+pub async fn get_pg_connection(
     authed: ApiAuthed,
     user_db: Option<UserDB>,
     db: &DB,
     postgres_resource_path: &str,
     w_id: &str,
-) -> std::result::Result<PgConnection, windmill_common::error::Error> {
+    logical_mode: bool,
+) -> Result<Client> {
     let database =
         try_get_resource_from_db_as::<Postgres>(authed, user_db, db, postgres_resource_path, w_id)
             .await?;
 
-    Ok(get_raw_postgres_connection(&database).await?)
+    Ok(get_raw_postgres_connection(&database, logical_mode).await?)
 }
 
-pub async fn get_raw_postgres_connection(
-    db: &Postgres,
-) -> std::result::Result<PgConnection, Error> {
-    let options = {
-        let sslmode = if !db.sslmode.is_empty() {
-            PgSslMode::from_str(&db.sslmode)?
-        } else {
-            PgSslMode::Prefer
-        };
-        let options = {
-            let inner_options = PgConnectOptions::new()
-                .host(&db.host)
-                .database(&db.dbname)
-                .ssl_mode(sslmode)
-                .username(&db.user);
+pub async fn get_default_pg_connection(
+    authed: ApiAuthed,
+    user_db: Option<UserDB>,
+    db: &DB,
+    postgres_resource_path: &str,
+    w_id: &str,
+) -> Result<Client> {
+    get_pg_connection(authed, user_db, db, postgres_resource_path, w_id, false).await
+}
 
-            if let Some(port) = db.port {
-                inner_options.port(port)
-            } else {
-                inner_options
-            }
-        };
+pub async fn create_logical_replication_slot(tx: &Client, slot_name: &str) -> Result<()> {
+    tx.execute(
+        &format!("SELECT * FROM pg_create_logical_replication_slot($1, 'pgoutput')"),
+        &[&slot_name],
+    )
+    .await
+    .map_err(to_anyhow)?;
+    Ok(())
+}
 
-        let options = if let Some(root_certificate_pem) = &db.root_certificate_pem {
-            options.ssl_root_cert_from_pem(root_certificate_pem.as_bytes().to_vec())
-        } else {
-            options
-        };
+async fn check_if_valid_publication_for_postgres_version(
+    pg_connection: &Client,
+    table_to_track: Option<&[Relations]>,
+) -> Result<bool> {
+    let postgres_version = get_postgres_version_internal(pg_connection).await?;
 
-        if !db.password.is_empty() {
-            options.password(&db.password)
-        } else {
-            options
+    let pg_14 = postgres_version.starts_with("14");
+    if pg_14 {
+        let unsupported_publication = table_to_track
+            .and_then(|relations| {
+                relations.iter().find(|relation| {
+                    let invalid_relation = relation.table_to_track.iter().find(|table_to_track| {
+                        table_to_track.where_clause.is_some()
+                            || table_to_track.columns_name.is_some()
+                    });
+
+                    relation.table_to_track.is_empty() || invalid_relation.is_some()
+                })
+            })
+            .is_some();
+
+        if unsupported_publication {
+            return Err(Error::BadRequest(
+                    "Your PostgreSQL database is running version 14, which does not support the following publication features: \
+                    - WHERE clause filtering, \
+                    - selective column tracking, and \
+                    - tracking all tables within a schema.\n\
+                    These features are only available in PostgreSQL 15 and above.".to_string(),
+                ));
         }
-    };
-    Ok(PgConnection::connect_with(&options).await?)
+    }
+    Ok(pg_14)
 }
 
-pub fn create_logical_replication_slot_query(name: &str) -> String {
-    let query = format!(
-        r#"
-        SELECT 
-                *
-        FROM
-            pg_create_logical_replication_slot({}, 'pgoutput');"#,
-        quote_literal(&name)
-    );
-
-    query
-}
-
-pub fn create_publication_query(
+pub async fn create_pg_publication(
+    pg_connection: &Client,
     publication_name: &str,
     table_to_track: Option<&[Relations]>,
-    transaction_to_track: &[&str],
-) -> String {
+    transaction_to_track: &[String],
+) -> Result<()> {
+    let pg_14 =
+        check_if_valid_publication_for_postgres_version(pg_connection, table_to_track).await?;
     let mut query = String::from("CREATE PUBLICATION ");
 
     query.push_str(&quote_identifier(publication_name));
@@ -124,21 +235,26 @@ pub fn create_publication_query(
     match table_to_track {
         Some(database_component) if !database_component.is_empty() => {
             query.push_str(" FOR");
+            let mut first = true;
             for (i, schema) in database_component.iter().enumerate() {
                 if schema.table_to_track.is_empty() {
                     query.push_str(" TABLES IN SCHEMA ");
                     query.push_str(&quote_identifier(&schema.schema_name));
                 } else {
-                    query.push_str(" TABLE ONLY ");
+                    if pg_14 && first {
+                        query.push_str(" TABLE ONLY ");
+                        first = false
+                    } else if !pg_14 {
+                        query.push_str(" TABLE ONLY ");
+                    }
                     for (j, table) in schema.table_to_track.iter().enumerate() {
                         let table_name = quote_identifier(&table.table_name);
                         let schema_name = quote_identifier(&schema.schema_name);
                         let full_name = format!("{}.{}", &schema_name, &table_name);
                         query.push_str(&full_name);
-                        if !table.columns_name.is_empty() {
+                        if let Some(columns) = table.columns_name.as_ref() {
                             query.push_str(" (");
-                            let columns = table
-                                .columns_name
+                            let columns = columns
                                 .iter()
                                 .map(|column| quote_identifier(column))
                                 .join(", ");
@@ -174,22 +290,24 @@ pub fn create_publication_query(
         query.push_str("');");
     }
 
-    query
+    pg_connection
+        .execute(&query, &[])
+        .await
+        .map_err(to_anyhow)?;
+    Ok(())
 }
 
-pub fn drop_publication_query(publication_name: &str) -> String {
+pub async fn drop_publication(pg_connection: &Client, publication_name: &str) -> Result<()> {
     let mut query = String::from("DROP PUBLICATION IF EXISTS ");
     let quoted_publication_name = quote_identifier(publication_name);
     query.push_str(&quoted_publication_name);
-    query.push_str(";");
-    query
-}
 
-pub fn drop_logical_replication_slot_query(replication_slot_name: &str) -> String {
-    format!(
-        "SELECT pg_drop_replication_slot({});",
-        quote_literal(&replication_slot_name)
-    )
+    pg_connection
+        .execute(&query, &[])
+        .await
+        .map_err(to_anyhow)?;
+
+    Ok(())
 }
 
 pub fn generate_random_string() -> String {
@@ -228,6 +346,10 @@ fn slot_service() -> Router {
         .route("/delete/*path", delete(drop_slot_name))
 }
 
+fn postgres_service() -> Router {
+    Router::new().route("/version/*path", get(get_postgres_version))
+}
+
 pub fn workspaced_service() -> Router {
     Router::new()
         .route("/test", post(test_postgres_connection))
@@ -246,6 +368,7 @@ pub fn workspaced_service() -> Router {
         )
         .nest("/publication", publication_service())
         .nest("/slot", slot_service())
+        .nest("/postgres", postgres_service())
 }
 
 async fn run_job(
diff --git a/backend/windmill-api/src/postgres_triggers/trigger.rs b/backend/windmill-api/src/postgres_triggers/trigger.rs
index 71daffb4a9..4598ca1a18 100644
--- a/backend/windmill-api/src/postgres_triggers/trigger.rs
+++ b/backend/windmill-api/src/postgres_triggers/trigger.rs
@@ -19,25 +19,27 @@ use crate::{
 use bytes::{BufMut, Bytes, BytesMut};
 use chrono::TimeZone;
 use futures::{pin_mut, SinkExt, StreamExt};
-use native_tls::{Certificate, TlsConnector};
 use pg_escape::{quote_identifier, quote_literal};
 use rand::seq::SliceRandom;
-use rust_postgres::{config::SslMode, Client, Config, CopyBothDuplex, NoTls, SimpleQueryMessage};
-use rust_postgres_native_tls::MakeTlsConnector;
+use rust_postgres::{Client, CopyBothDuplex, SimpleQueryMessage};
 use serde::Deserialize;
 use serde_json::value::RawValue;
 use sqlx::types::Json as SqlxJson;
 
 use windmill_common::{
-    db::UserDB, error, triggers::TriggerKind, utils::report_critical_error, worker::to_raw_value,
+    db::UserDB,
+    error::{self, to_anyhow},
+    triggers::TriggerKind,
+    utils::report_critical_error,
+    worker::to_raw_value,
     INSTANCE_NAME,
 };
 
 use super::{
-    drop_logical_replication_slot_query, drop_publication_query, get_database_connection,
-    handler::{Postgres, PostgresTrigger},
+    drop_publication, get_default_pg_connection, get_raw_postgres_connection,
+    handler::{drop_logical_replication_slot, Postgres, PostgresTrigger},
     replication_message::PrimaryKeepAliveBody,
-    ERROR_PUBLICATION_NAME_NOT_EXISTS, ERROR_REPLICATION_SLOT_NOT_EXISTS,
+    Error, ERROR_PUBLICATION_NAME_NOT_EXISTS, ERROR_REPLICATION_SLOT_NOT_EXISTS,
 };
 
 pub struct LogicalReplicationSettings {
@@ -69,109 +71,11 @@ impl RowExist for Vec<SimpleQueryMessage> {
     }
 }
 
-#[derive(thiserror::Error, Debug)]
-enum Error {
-    #[error("Error from database: {0}")]
-    Postgres(#[from] rust_postgres::Error),
-    #[error("Error : {0}")]
-    Common(#[from] windmill_common::error::Error),
-    #[error("Tls Error: {0}")]
-    Tls(#[from] native_tls::Error),
-}
-
-fn build_tls_connector(
-    ssl_mode: SslMode,
-    root_certificate_pem: Option<&String>,
-) -> Result<Option<MakeTlsConnector>, Error> {
-    let get_tls_builder_for_verify = |root_certificate: Option<&String>| {
-        let mut builder = TlsConnector::builder();
-        if let Some(root_certificate) = root_certificate {
-            let root_certificate_pem = Certificate::from_pem(root_certificate.as_bytes()).map_err(|e| {
-                Error::Common(error::Error::BadConfig(format!("Invalid Certs: {e:#}")))
-            })?;
-            builder.add_root_certificate(root_certificate_pem);
-        }
-        Ok::<_, Error>(builder)
-    };
-    let connector = match ssl_mode {
-        SslMode::Disable => return Ok(None),
-        SslMode::Require | SslMode::Prefer => {
-            let mut builder = TlsConnector::builder();
-            builder.danger_accept_invalid_certs(true);
-            builder.danger_accept_invalid_hostnames(true);
-            builder
-        }
-
-        SslMode::VerifyCa => {
-            let mut builder = get_tls_builder_for_verify(root_certificate_pem)?;
-            builder.danger_accept_invalid_hostnames(true);
-            builder
-        }
-
-        SslMode::VerifyFull => {
-            let builder = get_tls_builder_for_verify(root_certificate_pem)?;
-            builder
-        }
-        _ => unreachable!(),
-    };
-
-    Ok(Some(MakeTlsConnector::new(connector.build()?)))
-}
-
 pub struct PostgresSimpleClient(Client);
 
 impl PostgresSimpleClient {
     async fn new(database: &Postgres) -> Result<Self, Error> {
-        let ssl_mode = match database.sslmode.as_ref() {
-            "disable" => SslMode::Disable,
-            "" | "prefer" | "allow" => SslMode::Prefer,
-            "require" => SslMode::Require,
-            "verify-ca" => SslMode::VerifyCa,
-            "verify-full" => SslMode::VerifyFull,
-            ssl_mode => {
-                return Err(Error::Common(windmill_common::error::Error::BadRequest(
-                    format!("Invalid ssl mode for postgres: {}, please put a valid ssl_mode among the following avalible ssl mode: ['disable', 'allow', 'prefer', 'verify-ca', 'verify-full']", ssl_mode),
-                )))
-            }
-        };
-
-        let mut config = Config::new();
-        config
-            .dbname(&database.dbname)
-            .host(&database.host)
-            .user(&database.user)
-            .ssl_mode(ssl_mode)
-            .replication_mode(rust_postgres::config::ReplicationMode::Logical);
-
-        if let Some(port) = database.port {
-            config.port(port);
-        };
-
-        if !database.password.is_empty() {
-            config.password(&database.password);
-        }
-
-        let connector = build_tls_connector(ssl_mode, database.root_certificate_pem.as_ref())?;
-
-        let client = if let Some(connector) = connector {
-            let (client, connection) = config.connect(connector).await?;
-            tokio::spawn(async move {
-                if let Err(e) = connection.await {
-                    tracing::debug!("{:#?}", e);
-                };
-                tracing::info!("Successfully Connected into database");
-            });
-            client
-        } else {
-            let (client, connection) = config.connect(NoTls).await?;
-            tokio::spawn(async move {
-                if let Err(e) = connection.await {
-                    tracing::debug!("{:#?}", e);
-                };
-                tracing::info!("Successfully Connected into database");
-            });
-            client
-        };
+        let client = get_raw_postgres_connection(database, true).await?;
 
         Ok(PostgresSimpleClient(client))
     }
@@ -202,7 +106,8 @@ impl PostgresSimpleClient {
         Ok((
             self.0
                 .copy_both_simple::<bytes::Bytes>(query.as_str())
-                .await?,
+                .await
+                .map_err(to_anyhow)?,
             LogicalReplicationSettings::new(false),
         ))
     }
@@ -527,12 +432,13 @@ impl PostgresConfig {
                 "SELECT pubname FROM pg_publication WHERE pubname = {}",
                 quote_literal(&publication_name)
             ))
-            .await?;
+            .await
+            .map_err(to_anyhow)?;
 
         if !publication.row_exist() {
-            return Err(Error::Common(error::Error::BadConfig(
+            return Err(Error::BadConfig(
                 ERROR_PUBLICATION_NAME_NOT_EXISTS.to_string(),
-            )));
+            ));
         }
 
         let replication_slot = client
@@ -540,17 +446,19 @@ impl PostgresConfig {
                 "SELECT slot_name FROM pg_replication_slots WHERE slot_name = {}",
                 quote_literal(&replication_slot_name)
             ))
-            .await?;
+            .await
+            .map_err(to_anyhow)?;
 
         if !replication_slot.row_exist() {
-            return Err(Error::Common(error::Error::BadConfig(
+            return Err(Error::BadConfig(
                 ERROR_REPLICATION_SLOT_NOT_EXISTS.to_string(),
-            )));
+            ));
         }
 
         let (logical_replication_stream, logical_replication_settings) = client
             .get_logical_replication_stream(&publication_name, &replication_slot_name)
-            .await?;
+            .await
+            .map_err(to_anyhow)?;
 
         Ok((logical_replication_stream, logical_replication_settings))
     }
@@ -585,7 +493,7 @@ impl PostgresConfig {
 
                 let user_db = UserDB::new(db.clone());
 
-                let mut connection = get_database_connection(
+                let mut pg_connection = get_default_pg_connection(
                     authed.clone(),
                     Some(user_db.clone()),
                     &db,
@@ -594,13 +502,12 @@ impl PostgresConfig {
                 )
                 .await?;
 
-                let query = drop_logical_replication_slot_query(replication_slot_name);
+                if capture.trigger_config.basic_mode.unwrap_or(false) {
+                    drop_logical_replication_slot(&mut pg_connection, replication_slot_name)
+                        .await?;
 
-                let _ = sqlx::query(&query).execute(&mut connection).await;
-
-                let query = drop_publication_query(publication_name);
-
-                let _ = sqlx::query(&query).execute(&mut connection).await;
+                    drop_publication(&mut pg_connection, publication_name).await?;
+                }
 
                 Ok(())
             }
diff --git a/backend/windmill-api/src/raw_apps.rs b/backend/windmill-api/src/raw_apps.rs
index bb2763b73d..3a895bab97 100644
--- a/backend/windmill-api/src/raw_apps.rs
+++ b/backend/windmill-api/src/raw_apps.rs
@@ -22,7 +22,7 @@ use serde::{Deserialize, Serialize};
 use sql_builder::{bind::Bind, SqlBuilder};
 use sqlx::FromRow;
 use std::str;
-use windmill_audit::audit_ee::audit_log;
+use windmill_audit::audit_oss::audit_log;
 use windmill_audit::ActionKind;
 use windmill_common::{
     apps::ListAppQuery,
diff --git a/backend/windmill-api/src/resources.rs b/backend/windmill-api/src/resources.rs
index 8a2fab0434..d2d58c918d 100644
--- a/backend/windmill-api/src/resources.rs
+++ b/backend/windmill-api/src/resources.rs
@@ -26,7 +26,7 @@ use serde_json::{value::RawValue, Value};
 use sql_builder::{bind::Bind, quote, SqlBuilder};
 use sqlx::{FromRow, Postgres, Transaction};
 use uuid::Uuid;
-use windmill_audit::audit_ee::{audit_log, AuditAuthor};
+use windmill_audit::audit_oss::{audit_log, AuditAuthor};
 use windmill_audit::ActionKind;
 use windmill_common::{
     db::UserDB,
diff --git a/backend/windmill-api/src/saml_ee.rs b/backend/windmill-api/src/saml_oss.rs
similarity index 75%
rename from backend/windmill-api/src/saml_ee.rs
rename to backend/windmill-api/src/saml_oss.rs
index b3f1d4653c..0f4f4aa7f6 100644
--- a/backend/windmill-api/src/saml_ee.rs
+++ b/backend/windmill-api/src/saml_oss.rs
@@ -7,18 +7,27 @@
  */
 #![allow(non_snake_case)]
 
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::saml_ee::*;
+
+#[cfg(not(feature = "private"))]
 use axum::{routing::post, Router};
 
+#[cfg(not(feature = "private"))]
 pub struct ServiceProviderExt();
 
+#[cfg(not(feature = "private"))]
 pub async fn build_sp_extension() -> anyhow::Result<ServiceProviderExt> {
     return Ok(ServiceProviderExt());
 }
 
+#[cfg(not(feature = "private"))]
 pub fn global_service() -> Router {
     Router::new().route("/acs", post(acs))
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn acs() -> String {
     // Implementation is not open source as it is a Windmill Enterprise Edition feature
     "SAML available only in enterprise version".to_string()
diff --git a/backend/windmill-api/src/schedule.rs b/backend/windmill-api/src/schedule.rs
index 90d91c846c..3cb13798d9 100644
--- a/backend/windmill-api/src/schedule.rs
+++ b/backend/windmill-api/src/schedule.rs
@@ -22,7 +22,7 @@ use serde::{Deserialize, Serialize};
 use sql_builder::{prelude::Bind, SqlBuilder};
 use sqlx::{Postgres, Transaction};
 use std::str::FromStr;
-use windmill_audit::audit_ee::audit_log;
+use windmill_audit::audit_oss::audit_log;
 use windmill_audit::ActionKind;
 use windmill_common::{
     db::UserDB,
diff --git a/backend/windmill-api/src/scim_ee.rs b/backend/windmill-api/src/scim_oss.rs
similarity index 72%
rename from backend/windmill-api/src/scim_ee.rs
rename to backend/windmill-api/src/scim_oss.rs
index f11097f874..5210411466 100644
--- a/backend/windmill-api/src/scim_ee.rs
+++ b/backend/windmill-api/src/scim_oss.rs
@@ -1,3 +1,7 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::scim_ee::*;
+
 /*
  * Author: Ruben Fiszel
  * Copyright: Windmill Labs, Inc 2023
@@ -6,17 +10,22 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
+#[cfg(not(feature = "private"))]
 use axum::{middleware::Next, response::Response, routing::get, Router};
+#[cfg(not(feature = "private"))]
 use hyper::Request;
 
+#[cfg(not(feature = "private"))]
 pub fn global_service() -> Router {
     Router::new().route("/ee", get(ee))
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn ee() -> String {
     return "Enterprise Edition".to_string();
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn has_scim_token<B>(_request: Request<B>, _next: Next) -> Response {
     //Not implemented in open-source version
     todo!()
diff --git a/backend/windmill-api/src/scripts.rs b/backend/windmill-api/src/scripts.rs
index a827fa5079..8ac824e4c1 100644
--- a/backend/windmill-api/src/scripts.rs
+++ b/backend/windmill-api/src/scripts.rs
@@ -38,7 +38,7 @@ use std::{
     hash::{Hash, Hasher},
     sync::Arc,
 };
-use windmill_audit::audit_ee::audit_log;
+use windmill_audit::audit_oss::audit_log;
 use windmill_audit::ActionKind;
 use windmill_worker::process_relative_imports;
 
@@ -206,7 +206,6 @@ async fn list_scripts(
     Query(lq): Query<ListScriptQuery>,
 ) -> JsonResult<Vec<ListableScript>> {
     let (per_page, offset) = paginate(pagination);
-
     let mut sqlb = SqlBuilder::select_from("script as o")
         .fields(&[
             "hash",
@@ -321,6 +320,16 @@ async fn list_scripts(
             .fields(&["dm.deployment_msg"]);
     }
 
+    if let Some(languages) = lq.languages {
+        sqlb.and_where_in(
+            "language",
+            &languages
+                .iter()
+                .map(|language| quote(language.as_str()))
+                .collect_vec(),
+        );
+    }
+
     let sql = sqlb.sql().map_err(|e| Error::internal_err(e.to_string()))?;
     let mut tx = user_db.begin(&authed).await?;
     let rows = sqlx::query_as::<_, ListableScript>(&sql)
@@ -1280,6 +1289,11 @@ async fn raw_script_by_path_unpinned(
     raw_script_by_path_internal(path, user_db, db, authed, w_id, true).await
 }
 
+lazy_static::lazy_static! {
+    static ref DEBUG_RAW_SCRIPT_ENDPOINTS: bool =
+        std::env::var("DEBUG_RAW_SCRIPT_ENDPOINTS").is_ok();
+}
+
 async fn raw_script_by_path_internal(
     path: StripPath,
     user_db: UserDB,
@@ -1332,6 +1346,19 @@ async fn raw_script_by_path_internal(
                 "Script {path} exists but {} does not have permissions to access it",
                 authed.username
             )));
+        } else {
+            if *DEBUG_RAW_SCRIPT_ENDPOINTS {
+                let other_script_o = sqlx::query_scalar!(
+                    "SELECT path FROM script WHERE workspace_id = $1 AND archived = false",
+                    w_id
+                )
+                .fetch_all(&db)
+                .await?;
+                tracing::info!(
+                    "Script {path} does not exist in workspace {w_id} but these paths do: {:?}",
+                    other_script_o.join(", ")
+                )
+            }
         }
     }
 
diff --git a/backend/windmill-api/src/settings.rs b/backend/windmill-api/src/settings.rs
index b589713b91..9dfb687e51 100644
--- a/backend/windmill-api/src/settings.rs
+++ b/backend/windmill-api/src/settings.rs
@@ -10,7 +10,7 @@ use std::time::Duration;
 
 use crate::{
     db::{ApiAuthed, DB},
-    ee::validate_license_key,
+    ee_oss::validate_license_key,
     utils::{generate_instance_username_for_all_users, require_super_admin},
     HTTP_CLIENT,
 };
@@ -29,9 +29,9 @@ use crate::utils::require_devops_role;
 
 use serde::Deserialize;
 #[cfg(feature = "enterprise")]
-use windmill_common::ee::{send_critical_alert, CriticalAlertKind, CriticalErrorChannel};
+use windmill_common::ee_oss::{send_critical_alert, CriticalAlertKind, CriticalErrorChannel};
 use windmill_common::{
-    email_ee::send_email,
+    email_oss::send_email,
     error::{self, JsonResult, Result},
     global_settings::{
         AUTOMATE_USERNAME_CREATION_SETTING, CRITICAL_ALERT_MUTE_UI_SETTING, EMAIL_DOMAIN_SETTING,
@@ -326,10 +326,10 @@ 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(
+    windmill_common::stats_oss::send_stats(
         &HTTP_CLIENT,
         &db,
-        windmill_common::stats_ee::SendStatsReason::Manual,
+        windmill_common::stats_oss::SendStatsReason::Manual,
     )
     .await?;
 
@@ -390,11 +390,11 @@ pub async fn renew_license_key(
     authed: ApiAuthed,
 ) -> Result<String> {
     require_super_admin(&db, &authed.email).await?;
-    let result = windmill_common::ee::renew_license_key(
+    let result = windmill_common::ee_oss::renew_license_key(
         &HTTP_CLIENT,
         &db,
         license_key,
-        windmill_common::ee::RenewReason::Manual,
+        windmill_common::ee_oss::RenewReason::Manual,
     )
     .await;
 
@@ -424,7 +424,7 @@ pub async fn create_customer_portal_session(
     Query(LicenseQuery { license_key }): Query<LicenseQuery>,
 ) -> Result<String> {
     let url =
-        windmill_common::ee::create_customer_portal_session(&HTTP_CLIENT, license_key).await?;
+        windmill_common::ee_oss::create_customer_portal_session(&HTTP_CLIENT, license_key).await?;
 
     return Ok(url);
 }
diff --git a/backend/windmill-api/src/smtp_server_ee.rs b/backend/windmill-api/src/smtp_server_oss.rs
similarity index 69%
rename from backend/windmill-api/src/smtp_server_ee.rs
rename to backend/windmill-api/src/smtp_server_oss.rs
index 48e274f6a1..7d2b72c7f1 100644
--- a/backend/windmill-api/src/smtp_server_ee.rs
+++ b/backend/windmill-api/src/smtp_server_oss.rs
@@ -1,7 +1,15 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::smtp_server_ee::*;
+
+#[cfg(not(feature = "private"))]
 use crate::{auth::AuthCache, db::DB};
+#[cfg(not(feature = "private"))]
 use std::{net::SocketAddr, sync::Arc};
+#[cfg(not(feature = "private"))]
 use windmill_common::db::UserDB;
 
+#[cfg(not(feature = "private"))]
 pub struct SmtpServer {
     pub auth_cache: Arc<AuthCache>,
     pub db: DB,
@@ -9,6 +17,7 @@ pub struct SmtpServer {
     pub base_internal_url: String,
 }
 
+#[cfg(not(feature = "private"))]
 impl SmtpServer {
     pub async fn start_listener_thread(self: Arc<Self>, _addr: SocketAddr) -> anyhow::Result<()> {
         let _ = self.auth_cache;
diff --git a/backend/windmill-api/src/sqs_triggers_ee.rs b/backend/windmill-api/src/sqs_triggers_oss.rs
similarity index 75%
rename from backend/windmill-api/src/sqs_triggers_ee.rs
rename to backend/windmill-api/src/sqs_triggers_oss.rs
index da9b288f6b..6e01641a5e 100644
--- a/backend/windmill-api/src/sqs_triggers_ee.rs
+++ b/backend/windmill-api/src/sqs_triggers_oss.rs
@@ -1,18 +1,28 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::sqs_triggers_ee::*;
+
+#[cfg(not(feature = "private"))]
 use crate::db::DB;
+#[cfg(not(feature = "private"))]
 use axum::Router;
+#[cfg(not(feature = "private"))]
 use serde::{Deserialize, Serialize};
+#[cfg(not(feature = "private"))]
 use windmill_common::auth::aws::AwsAuthResourceType;
 
-
+#[cfg(not(feature = "private"))]
 pub fn workspaced_service() -> Router {
     Router::new()
 }
 
+#[cfg(not(feature = "private"))]
 pub fn start_sqs(_db: DB, mut _killpill_rx: tokio::sync::broadcast::Receiver<()>) -> () {
     // implementation is not open source
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
+#[cfg(not(feature = "private"))]
 pub struct SqsTrigger {
     pub queue_url: String,
     pub aws_auth_resource_type: AwsAuthResourceType,
@@ -30,4 +40,4 @@ pub struct SqsTrigger {
     pub server_id: Option<String>,
     pub last_server_ping: Option<chrono::DateTime<chrono::Utc>>,
     pub enabled: bool,
-}
\ No newline at end of file
+}
diff --git a/backend/windmill-api/src/stripe_ee.rs b/backend/windmill-api/src/stripe_ee.rs
deleted file mode 100644
index 6934cad3bc..0000000000
--- a/backend/windmill-api/src/stripe_ee.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-use axum::Router;
-
-pub fn add_stripe_routes(router: Router) -> Router {
-    return router;
-}
diff --git a/backend/windmill-api/src/stripe_oss.rs b/backend/windmill-api/src/stripe_oss.rs
new file mode 100644
index 0000000000..206a78dc53
--- /dev/null
+++ b/backend/windmill-api/src/stripe_oss.rs
@@ -0,0 +1,11 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::stripe_ee::*;
+
+#[cfg(not(feature = "private"))]
+use axum::Router;
+
+#[cfg(not(feature = "private"))]
+pub fn add_stripe_routes(router: Router) -> Router {
+    return router;
+}
diff --git a/backend/windmill-api/src/teams_approvals_ee.rs b/backend/windmill-api/src/teams_approvals_oss.rs
similarity index 51%
rename from backend/windmill-api/src/teams_approvals_ee.rs
rename to backend/windmill-api/src/teams_approvals_oss.rs
index 05698b98e3..df5826aa71 100644
--- a/backend/windmill-api/src/teams_approvals_ee.rs
+++ b/backend/windmill-api/src/teams_approvals_oss.rs
@@ -1,7 +1,14 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::teams_approvals_ee::*;
+
+#[cfg(not(feature = "private"))]
 use hyper::StatusCode;
 
+#[cfg(not(feature = "private"))]
 use windmill_common::error::Error;
 
+#[cfg(not(feature = "private"))]
 pub async fn request_teams_approval() -> Result<StatusCode, Error> {
     Err(Error::InternalErr("enterprise feature only".to_string()))
-}
\ No newline at end of file
+}
diff --git a/backend/windmill-api/src/teams_ee.rs b/backend/windmill-api/src/teams_oss.rs
similarity index 70%
rename from backend/windmill-api/src/teams_ee.rs
rename to backend/windmill-api/src/teams_oss.rs
index 46cbe72059..95d4883690 100644
--- a/backend/windmill-api/src/teams_ee.rs
+++ b/backend/windmill-api/src/teams_oss.rs
@@ -1,39 +1,50 @@
-use http::status::StatusCode;
-#[cfg(feature = "enterprise")]
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::teams_ee::*;
+
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 use axum::Router;
+#[cfg(not(feature = "private"))]
+use http::status::StatusCode;
+#[cfg(not(feature = "private"))]
 use windmill_common::error::Error;
 
+#[cfg(not(feature = "private"))]
 pub async fn edit_teams_command() -> Result<StatusCode, Error> {
     return Err(Error::BadRequest(
         "Teams only available on enterprise".to_string(),
     ));
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn workspaces_list_available_teams_ids() -> Result<StatusCode, Error> {
     return Err(Error::BadRequest(
         "Teams only available on enterprise".to_string(),
     ));
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn connect_teams() -> Result<StatusCode, Error> {
     return Err(Error::BadRequest(
         "Teams only available on enterprise".to_string(),
     ));
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn run_teams_message_test_job() -> Result<StatusCode, Error> {
     return Err(Error::BadRequest(
         "Teams only available on enterprise".to_string(),
     ));
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn workspaces_list_available_teams_channels() -> Result<StatusCode, Error> {
     return Err(Error::BadRequest(
         "Teams only available on enterprise".to_string(),
     ));
 }
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 pub fn teams_service() -> Router {
     Router::new()
-}
\ No newline at end of file
+}
diff --git a/backend/windmill-api/src/triggers.rs b/backend/windmill-api/src/triggers.rs
index 7101bdd2a9..c1cccb1c98 100644
--- a/backend/windmill-api/src/triggers.rs
+++ b/backend/windmill-api/src/triggers.rs
@@ -21,6 +21,9 @@ pub struct TriggersCount {
     kafka_count: i64,
     nats_count: i64,
     postgres_count: i64,
+    mqtt_count: i64,
+    sqs_count: i64,
+    gcp_count: i64,
 }
 pub(crate) async fn get_triggers_count_internal(
     db: &DB,
@@ -97,6 +100,36 @@ pub(crate) async fn get_triggers_count_internal(
     .await?
     .unwrap_or(0);
 
+    let mqtt_count = sqlx::query_scalar!(
+        "SELECT COUNT(*) FROM mqtt_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 sqs_count = sqlx::query_scalar!(
+        "SELECT COUNT(*) FROM sqs_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 gcp_count = sqlx::query_scalar!(
+        "SELECT COUNT(*) FROM gcp_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[]",
@@ -141,6 +174,9 @@ pub(crate) async fn get_triggers_count_internal(
         kafka_count,
         nats_count,
         postgres_count,
+        mqtt_count,
+        gcp_count,
+        sqs_count,
     }))
 }
 
diff --git a/backend/windmill-api/src/users.rs b/backend/windmill-api/src/users.rs
index 1f8529fe6a..da77337703 100644
--- a/backend/windmill-api/src/users.rs
+++ b/backend/windmill-api/src/users.rs
@@ -42,7 +42,7 @@ use sqlx::FromRow;
 use time::OffsetDateTime;
 use tower_cookies::{Cookie, Cookies};
 use tracing::Instrument;
-use windmill_audit::audit_ee::{audit_log, AuditAuthor};
+use windmill_audit::audit_oss::{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;
@@ -334,6 +334,7 @@ pub struct NewUser {
     pub super_admin: bool,
     pub name: Option<String>,
     pub company: Option<String>,
+    pub skip_email: Option<bool>,
 }
 
 #[derive(Deserialize)]
@@ -1507,7 +1508,7 @@ async fn create_user(
     Extension(argon2): Extension<Arc<Argon2<'_>>>,
     Json(nu): Json<NewUser>,
 ) -> Result<(StatusCode, String)> {
-    crate::users_ee::create_user(authed, db, webhook, argon2, nu).await
+    crate::users_oss::create_user(authed, db, webhook, argon2, nu).await
 }
 
 async fn delete_workspace_user(
@@ -1581,7 +1582,7 @@ async fn set_password(
     Json(ep): Json<EditPassword>,
 ) -> Result<String> {
     let email = authed.email.clone();
-    crate::users_ee::set_password(db, argon2, authed, &email, ep).await
+    crate::users_oss::set_password(db, argon2, authed, &email, ep).await
 }
 
 async fn set_password_of_user(
@@ -1592,7 +1593,7 @@ async fn set_password_of_user(
     Json(ep): Json<EditPassword>,
 ) -> Result<String> {
     require_super_admin(&db, &authed.email).await?;
-    crate::users_ee::set_password(db, argon2, authed, &email, ep).await
+    crate::users_oss::set_password(db, argon2, authed, &email, ep).await
 }
 
 async fn set_login_type(
diff --git a/backend/windmill-api/src/users_ee.rs b/backend/windmill-api/src/users_oss.rs
similarity index 71%
rename from backend/windmill-api/src/users_ee.rs
rename to backend/windmill-api/src/users_oss.rs
index 7a11239a2f..88a12eb710 100644
--- a/backend/windmill-api/src/users_ee.rs
+++ b/backend/windmill-api/src/users_oss.rs
@@ -1,15 +1,27 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::users_ee::*;
+
+#[cfg(not(feature = "private"))]
 use std::sync::Arc;
 
+#[cfg(not(feature = "private"))]
 use crate::db::ApiAuthed;
 
+#[cfg(not(feature = "private"))]
 use crate::users::{EditPassword, NewUser};
+#[cfg(not(feature = "private"))]
 use crate::{db::DB, webhook_util::WebhookShared};
+#[cfg(not(feature = "private"))]
 use argon2::Argon2;
 
+#[cfg(not(feature = "private"))]
 use http::StatusCode;
 
+#[cfg(not(feature = "private"))]
 use windmill_common::error::{Error, Result};
 
+#[cfg(not(feature = "private"))]
 pub async fn create_user(
     _authed: ApiAuthed,
     _db: DB,
@@ -22,6 +34,7 @@ pub async fn create_user(
     ))
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn set_password(
     _db: DB,
     _argon2: Arc<Argon2<'_>>,
@@ -34,6 +47,7 @@ pub async fn set_password(
     ))
 }
 
+#[cfg(not(feature = "private"))]
 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/variables.rs b/backend/windmill-api/src/variables.rs
index e810f95750..7dc6a85b49 100644
--- a/backend/windmill-api/src/variables.rs
+++ b/backend/windmill-api/src/variables.rs
@@ -20,7 +20,7 @@ use axum::{
 use hyper::StatusCode;
 use serde_json::Value;
 
-use windmill_audit::audit_ee::{audit_log, AuditAuthorable};
+use windmill_audit::audit_oss::{audit_log, AuditAuthorable};
 use windmill_audit::ActionKind;
 use windmill_common::{
     db::UserDB,
@@ -186,7 +186,7 @@ async fn get_variable(
                 #[cfg(feature = "oauth2")]
                 {
                     Some(
-                        crate::oauth2_ee::_refresh_token(
+                        crate::oauth2_oss::_refresh_token(
                             tx,
                             &variable.path,
                             &w_id,
@@ -653,7 +653,7 @@ pub async fn get_value_internal<'c>(
         if variable.is_expired.unwrap_or(false) && variable.account.is_some() {
             #[cfg(feature = "oauth2")]
             {
-                crate::oauth2_ee::_refresh_token(
+                crate::oauth2_oss::_refresh_token(
                     tx,
                     &variable.path,
                     &w_id,
diff --git a/backend/windmill-api/src/websocket_triggers.rs b/backend/windmill-api/src/websocket_triggers.rs
index 8bd165844c..8c263b1f62 100644
--- a/backend/windmill-api/src/websocket_triggers.rs
+++ b/backend/windmill-api/src/websocket_triggers.rs
@@ -20,7 +20,7 @@ use std::{collections::HashMap, fmt};
 use tokio::net::TcpStream;
 use tokio_tungstenite::{connect_async, tungstenite::Message, MaybeTlsStream, WebSocketStream};
 use uuid::Uuid;
-use windmill_audit::{audit_ee::audit_log, ActionKind};
+use windmill_audit::{audit_oss::audit_log, ActionKind};
 use windmill_common::{
     db::UserDB,
     error::{self, to_anyhow, JsonResult},
diff --git a/backend/windmill-api/src/workspaces.rs b/backend/windmill-api/src/workspaces.rs
index 75c9a8d034..b8e8a813f3 100644
--- a/backend/windmill-api/src/workspaces.rs
+++ b/backend/windmill-api/src/workspaces.rs
@@ -10,7 +10,7 @@ use std::collections::HashMap;
 
 use crate::ai::{AIConfig, AI_REQUEST_CACHE};
 use crate::db::ApiAuthed;
-use crate::users_ee::send_email_if_possible;
+use crate::users_oss::send_email_if_possible;
 use crate::utils::get_instance_username_or_create_pending;
 use crate::BASE_URL;
 use crate::{
@@ -30,7 +30,7 @@ use chrono::Utc;
 use regex::Regex;
 
 use uuid::Uuid;
-use windmill_audit::audit_ee::audit_log;
+use windmill_audit::audit_oss::audit_log;
 use windmill_audit::ActionKind;
 use windmill_common::db::UserDB;
 use windmill_common::s3_helpers::LargeFileStorage;
@@ -58,7 +58,7 @@ use sqlx::{FromRow, Postgres, Transaction};
 use windmill_common::oauth2::InstanceEvent;
 use windmill_common::utils::not_found_if_none;
 
-use crate::teams_ee::{
+use crate::teams_oss::{
     connect_teams, edit_teams_command, run_teams_message_test_job,
     workspaces_list_available_teams_channels, workspaces_list_available_teams_ids,
 };
@@ -145,7 +145,7 @@ pub fn workspaced_service() -> Router {
 
     #[cfg(all(feature = "stripe", feature = "enterprise"))]
     {
-        crate::stripe_ee::add_stripe_routes(router)
+        crate::stripe_oss::add_stripe_routes(router)
     }
 
     #[cfg(not(feature = "stripe"))]
@@ -640,7 +640,7 @@ async fn edit_auto_invite(
     Path(w_id): Path<String>,
     Json(ea): Json<EditAutoInvite>,
 ) -> Result<String> {
-    crate::workspaces_ee::edit_auto_invite(authed, db, w_id, ea).await
+    crate::workspaces_oss::edit_auto_invite(authed, db, w_id, ea).await
 }
 
 async fn edit_webhook(
diff --git a/backend/windmill-api/src/workspaces_export.rs b/backend/windmill-api/src/workspaces_export.rs
index cd2be0f708..b3ad6dbdd7 100644
--- a/backend/windmill-api/src/workspaces_export.rs
+++ b/backend/windmill-api/src/workspaces_export.rs
@@ -622,7 +622,7 @@ pub(crate) async fn tarball_workspace(
         #[cfg(all(feature = "enterprise", feature = "kafka"))]
         {
             let kafka_triggers = sqlx::query_as!(
-                crate::kafka_triggers_ee::KafkaTrigger,
+                crate::kafka_triggers_oss::KafkaTrigger,
                 "SELECT * FROM kafka_trigger
                  WHERE workspace_id = $1",
                 &w_id
@@ -644,7 +644,7 @@ pub(crate) async fn tarball_workspace(
         #[cfg(all(feature = "enterprise", feature = "sqs_trigger"))]
         {
             let sqs_triggers = sqlx::query_as!(
-                crate::sqs_triggers_ee::SqsTrigger,
+                crate::sqs_triggers_oss::SqsTrigger,
                 r#"
                 SELECT
                     aws_auth_resource_type AS "aws_auth_resource_type: _",
@@ -684,7 +684,7 @@ pub(crate) async fn tarball_workspace(
         #[cfg(all(feature = "enterprise", feature = "gcp_trigger"))]
         {
             let gcp_triggers = sqlx::query_as!(
-                crate::gcp_triggers_ee::GcpTrigger,
+                crate::gcp_triggers_oss::GcpTrigger,
                 r#"
                 SELECT
                     gcp_resource_path,
@@ -726,7 +726,7 @@ pub(crate) async fn tarball_workspace(
         #[cfg(all(feature = "enterprise", feature = "nats"))]
         {
             let nats_triggers = sqlx::query_as!(
-                crate::nats_triggers_ee::NatsTrigger,
+                crate::nats_triggers_oss::NatsTrigger,
                 "SELECT * FROM nats_trigger
                  WHERE workspace_id = $1",
                 &w_id
diff --git a/backend/windmill-api/src/workspaces_extra.rs b/backend/windmill-api/src/workspaces_extra.rs
index 07570df5c3..51a224d0e2 100644
--- a/backend/windmill-api/src/workspaces_extra.rs
+++ b/backend/windmill-api/src/workspaces_extra.rs
@@ -8,7 +8,7 @@ use axum::{
     Json,
 };
 
-use windmill_audit::audit_ee::audit_log;
+use windmill_audit::audit_oss::audit_log;
 use windmill_audit::ActionKind;
 
 use windmill_common::worker::CLOUD_HOSTED;
diff --git a/backend/windmill-api/src/workspaces_ee.rs b/backend/windmill-api/src/workspaces_oss.rs
similarity index 70%
rename from backend/windmill-api/src/workspaces_ee.rs
rename to backend/windmill-api/src/workspaces_oss.rs
index aa8799e233..4f55539da1 100644
--- a/backend/windmill-api/src/workspaces_ee.rs
+++ b/backend/windmill-api/src/workspaces_oss.rs
@@ -1,8 +1,14 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::workspaces_ee::*;
+
+#[cfg(not(feature = "private"))]
 use crate::{
     db::{ApiAuthed, DB},
     workspaces::EditAutoInvite,
 };
 
+#[cfg(not(feature = "private"))]
 pub async fn edit_auto_invite(
     _authed: ApiAuthed,
     _db: DB,
diff --git a/backend/windmill-audit/Cargo.toml b/backend/windmill-audit/Cargo.toml
index 8b202b4abf..5a9ea376b6 100644
--- a/backend/windmill-audit/Cargo.toml
+++ b/backend/windmill-audit/Cargo.toml
@@ -10,6 +10,7 @@ path = "./src/lib.rs"
 
 [features]
 enterprise = ["windmill-common/enterprise"]
+private = []
 
 [dependencies]
 serde.workspace = true
diff --git a/backend/windmill-audit/src/audit_ee.rs b/backend/windmill-audit/src/audit_oss.rs
similarity index 78%
rename from backend/windmill-audit/src/audit_ee.rs
rename to backend/windmill-audit/src/audit_oss.rs
index 97a8e6bbcf..d29daaa7ae 100644
--- a/backend/windmill-audit/src/audit_ee.rs
+++ b/backend/windmill-audit/src/audit_oss.rs
@@ -1,3 +1,7 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::audit_ee::*;
+
 /*
  * Author: Ruben Fiszel
  * Copyright: Windmill Labs, Inc 2022
@@ -5,23 +9,26 @@
  * Please see the included NOTICE for copyright information and
  * LICENSE-AGPL for a copy of the license.
  */
-use std::collections::HashMap;
-
-use windmill_common::{
-    error::{Error, Result},
-    utils::Pagination,
+#[cfg(not(feature = "private"))]
+use {
+    crate::{ActionKind, AuditLog, ListAuditLogQuery},
+    sqlx::{Postgres, Transaction},
+    std::collections::HashMap,
+    windmill_common::{
+        error::{Error, Result},
+        utils::Pagination,
+    },
 };
 
-use crate::{ActionKind, AuditLog, ListAuditLogQuery};
-use sqlx::{Postgres, Transaction};
-
 #[derive(Clone)]
+#[cfg(not(feature = "private"))]
 pub struct AuditAuthor {
     pub username: String,
     pub email: String,
     pub username_override: Option<String>,
 }
 
+#[cfg(not(feature = "private"))]
 impl AuditAuthorable for AuditAuthor {
     fn email(&self) -> &str {
         &self.email
@@ -36,12 +43,14 @@ impl AuditAuthorable for AuditAuthor {
     }
 }
 
+#[cfg(not(feature = "private"))]
 pub trait AuditAuthorable {
     fn username(&self) -> &str;
     fn email(&self) -> &str;
     fn username_override(&self) -> Option<&str>;
 }
 
+#[cfg(not(feature = "private"))]
 #[tracing::instrument(level = "trace", skip_all)]
 pub async fn audit_log<'c, E: sqlx::Executor<'c, Database = Postgres>>(
     _db: E,
@@ -56,6 +65,7 @@ pub async fn audit_log<'c, E: sqlx::Executor<'c, Database = Postgres>>(
     Ok(())
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn list_audit(
     _tx: Transaction<'_, Postgres>,
     _w_id: String,
@@ -66,6 +76,7 @@ pub async fn list_audit(
     return Ok(vec![]);
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn get_audit(tx: Transaction<'_, Postgres>, _id: i32, _w_id: &str) -> Result<AuditLog> {
     // Implementation is not open source as Audit logs is a Windmill Enterprise Edition feature
     tx.commit().await?;
diff --git a/backend/windmill-audit/src/lib.rs b/backend/windmill-audit/src/lib.rs
index 10894798fb..15bda522c1 100644
--- a/backend/windmill-audit/src/lib.rs
+++ b/backend/windmill-audit/src/lib.rs
@@ -1,7 +1,9 @@
 use serde::{Deserialize, Serialize};
 use sqlx::FromRow;
 
+#[cfg(feature = "private")]
 pub mod audit_ee;
+pub mod audit_oss;
 
 #[derive(sqlx::Type, Serialize, Deserialize, Debug)]
 #[sqlx(type_name = "ACTION_KIND", rename_all = "lowercase")]
diff --git a/backend/windmill-autoscaling/Cargo.toml b/backend/windmill-autoscaling/Cargo.toml
index fbebaf0fd7..7e4bc623ad 100644
--- a/backend/windmill-autoscaling/Cargo.toml
+++ b/backend/windmill-autoscaling/Cargo.toml
@@ -10,6 +10,7 @@ path = "./src/lib.rs"
 
 [features]
 enterprise = ["windmill-queue/enterprise", "windmill-common/enterprise"]
+private = []
 default = []
 
 [dependencies]
diff --git a/backend/windmill-autoscaling/src/autoscaling_ee.rs b/backend/windmill-autoscaling/src/autoscaling_ee.rs
deleted file mode 100644
index 1c9defbede..0000000000
--- a/backend/windmill-autoscaling/src/autoscaling_ee.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-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/autoscaling_oss.rs b/backend/windmill-autoscaling/src/autoscaling_oss.rs
new file mode 100644
index 0000000000..c9cbdc3ee0
--- /dev/null
+++ b/backend/windmill-autoscaling/src/autoscaling_oss.rs
@@ -0,0 +1,12 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::autoscaling_ee::*;
+
+#[cfg(not(feature = "private"))]
+use windmill_common::DB;
+
+#[cfg(not(feature = "private"))]
+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
index 28b9319244..1b9d6b94bf 100644
--- a/backend/windmill-autoscaling/src/lib.rs
+++ b/backend/windmill-autoscaling/src/lib.rs
@@ -1,2 +1,4 @@
-mod autoscaling_ee;
-pub use autoscaling_ee::*;
+#[cfg(feature = "private")]
+pub mod autoscaling_ee;
+mod autoscaling_oss;
+pub use autoscaling_oss::*;
diff --git a/backend/windmill-common/Cargo.toml b/backend/windmill-common/Cargo.toml
index 17764b1253..6a7a3b124b 100644
--- a/backend/windmill-common/Cargo.toml
+++ b/backend/windmill-common/Cargo.toml
@@ -7,6 +7,7 @@ edition.workspace = true
 [features]
 default = []
 enterprise = []
+private = []
 jemalloc = ["dep:tikv-jemalloc-ctl"]
 tantivy = []
 prometheus = ["dep:prometheus"]
diff --git a/backend/windmill-common/src/agent_workers.rs b/backend/windmill-common/src/agent_workers.rs
index 7c91ec2165..52c7e2d70c 100644
--- a/backend/windmill-common/src/agent_workers.rs
+++ b/backend/windmill-common/src/agent_workers.rs
@@ -36,6 +36,7 @@ pub struct AgentAuth {
 }
 
 pub const AGENT_JWT_PREFIX: &str = "jwt_agent_";
+
 pub fn build_agent_http_client(worker_suffix: &str) -> HttpClient {
     let client = ClientBuilder::new(
         reqwest::Client::builder()
diff --git a/backend/windmill-common/src/client.rs b/backend/windmill-common/src/client.rs
index 0c5394c6e6..6bc1d12ef9 100644
--- a/backend/windmill-common/src/client.rs
+++ b/backend/windmill-common/src/client.rs
@@ -17,6 +17,15 @@ pub struct AuthedClient {
 }
 
 impl AuthedClient {
+    pub fn new(
+        base_internal_url: String,
+        workspace: String,
+        token: String,
+        force_client: Option<reqwest::Client>,
+    ) -> AuthedClient {
+        AuthedClient { base_internal_url, workspace, token, force_client }
+    }
+
     pub async fn get(&self, url: &str, query: Vec<(&str, String)>) -> anyhow::Result<Response> {
         self.force_client
             .as_ref()
diff --git a/backend/windmill-common/src/ee.rs b/backend/windmill-common/src/ee_oss.rs
similarity index 63%
rename from backend/windmill-common/src/ee.rs
rename to backend/windmill-common/src/ee_oss.rs
index 7acb430f1b..51b1efd2e2 100644
--- a/backend/windmill-common/src/ee.rs
+++ b/backend/windmill-common/src/ee_oss.rs
@@ -1,24 +1,35 @@
-#[cfg(feature = "enterprise")]
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::ee::*;
+
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 use crate::db::DB;
-use crate::ee::LicensePlan::Community;
-#[cfg(feature = "enterprise")]
+#[cfg(not(feature = "private"))]
+use crate::ee_oss::LicensePlan::Community;
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 use crate::error;
+#[cfg(not(feature = "private"))]
 use serde::Deserialize;
+#[cfg(not(feature = "private"))]
 use std::sync::Arc;
+#[cfg(not(feature = "private"))]
 use tokio::sync::RwLock;
 
+#[cfg(not(feature = "private"))]
 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()));
 }
 
+#[cfg(not(feature = "private"))]
 pub enum LicensePlan {
     Community,
     Pro,
     Enterprise,
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn get_license_plan() -> LicensePlan {
     // Implementation is not open source
     return Community;
@@ -26,6 +37,7 @@ pub async fn get_license_plan() -> LicensePlan {
 
 #[derive(Deserialize)]
 #[serde(untagged)]
+#[cfg(not(feature = "private"))]
 pub enum CriticalErrorChannel {
     Email { email: String },
     Slack { slack_channel: String },
@@ -33,6 +45,7 @@ pub enum CriticalErrorChannel {
 }
 
 #[derive(Deserialize)]
+#[cfg(not(feature = "private"))]
 pub struct TeamsChannel {
     pub team_id: String,
     pub team_name: String,
@@ -40,6 +53,7 @@ pub struct TeamsChannel {
     pub channel_name: String,
 }
 
+#[cfg(not(feature = "private"))]
 pub enum CriticalAlertKind {
     #[cfg(feature = "enterprise")]
     CriticalError,
@@ -47,7 +61,7 @@ pub enum CriticalAlertKind {
     RecoveredCriticalError,
 }
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 pub async fn send_critical_alert(
     _error_message: String,
     _db: &DB,
@@ -56,7 +70,7 @@ pub async fn send_critical_alert(
 ) {
 }
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 pub async fn maybe_renew_license_key_on_start(
     _http_client: &reqwest::Client,
     _db: &crate::db::DB,
@@ -66,14 +80,14 @@ pub async fn maybe_renew_license_key_on_start(
     force_renew_now
 }
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 pub enum RenewReason {
     Manual,
     Schedule,
     OnStart,
 }
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 pub async fn renew_license_key(
     _http_client: &reqwest::Client,
     _db: &crate::db::DB,
@@ -84,7 +98,7 @@ pub async fn renew_license_key(
     "".to_string()
 }
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 pub async fn create_customer_portal_session(
     _http_client: &reqwest::Client,
     _key: Option<String>,
@@ -93,14 +107,18 @@ pub async fn create_customer_portal_session(
     Ok("".to_string())
 }
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 pub async fn worker_groups_alerts(_db: &DB) {}
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 pub async fn jobs_waiting_alerts(_db: &DB) {}
 
-#[cfg(feature = "enterprise")]
-pub async fn low_disk_alerts(_db: &DB, _server_mode: bool, _worker_mode: bool, _workers: Vec<String>) {
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
+pub async fn low_disk_alerts(
+    _db: &DB,
+    _server_mode: bool,
+    _worker_mode: bool,
+    _workers: Vec<String>,
+) {
     // Implementation is not open source
 }
-
diff --git a/backend/windmill-common/src/email_ee.rs b/backend/windmill-common/src/email_oss.rs
similarity index 61%
rename from backend/windmill-common/src/email_ee.rs
rename to backend/windmill-common/src/email_oss.rs
index 42aebbeec3..e6a340523e 100644
--- a/backend/windmill-common/src/email_ee.rs
+++ b/backend/windmill-common/src/email_oss.rs
@@ -1,5 +1,11 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::email_ee::*;
+
+#[cfg(not(feature = "private"))]
 use crate::server::Smtp;
 
+#[cfg(not(feature = "private"))]
 pub async fn send_email(
     _subject: &str,
     _content: &str,
diff --git a/backend/windmill-common/src/job_s3_helpers_ee.rs b/backend/windmill-common/src/job_s3_helpers_oss.rs
similarity index 76%
rename from backend/windmill-common/src/job_s3_helpers_ee.rs
rename to backend/windmill-common/src/job_s3_helpers_oss.rs
index d5d6ac4052..b7ebd57f3e 100644
--- a/backend/windmill-common/src/job_s3_helpers_ee.rs
+++ b/backend/windmill-common/src/job_s3_helpers_oss.rs
@@ -1,5 +1,11 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::job_s3_helpers_ee::*;
+
+#[cfg(not(feature = "private"))]
 use crate::s3_helpers::{ObjectStoreResource, StorageResourceType};
 
+#[cfg(not(feature = "private"))]
 pub async fn get_s3_resource_internal<'c>(
     _resource_type: StorageResourceType,
     _s3_resource_value_raw: serde_json::Value,
@@ -9,11 +15,13 @@ pub async fn get_s3_resource_internal<'c>(
     todo!()
 }
 
+#[cfg(not(feature = "private"))]
 pub enum TokenGenerator<'c> {
     AsClient(&'c crate::client::AuthedClient),
     AsServerInstance(),
 }
 
+#[cfg(not(feature = "private"))]
 impl<'c> TokenGenerator<'c> {
     pub async fn gen_token(
         &self,
@@ -24,7 +32,7 @@ impl<'c> TokenGenerator<'c> {
     }
 }
 
-#[cfg(feature = "parquet")]
+#[cfg(all(feature = "parquet", not(feature = "private")))]
 pub(crate) async fn generate_s3_aws_oidc_resource<'c>(
     _clone: crate::s3_helpers::S3AwsOidcResource,
     _token_generator: TokenGenerator<'c>,
diff --git a/backend/windmill-common/src/lib.rs b/backend/windmill-common/src/lib.rs
index 6d92cd8f55..315916d0d4 100644
--- a/backend/windmill-common/src/lib.rs
+++ b/backend/windmill-common/src/lib.rs
@@ -19,7 +19,7 @@ use std::{
 
 use tokio::sync::broadcast;
 
-use ee::CriticalErrorChannel;
+use ee_oss::CriticalErrorChannel;
 use error::Error;
 use scripts::ScriptLang;
 use sqlx::{Pool, Postgres};
@@ -32,8 +32,12 @@ pub mod bench;
 pub mod cache;
 pub mod client;
 pub mod db;
+#[cfg(feature = "private")]
 pub mod ee;
+pub mod ee_oss;
+#[cfg(feature = "private")]
 pub mod email_ee;
+pub mod email_oss;
 pub mod error;
 pub mod external_ip;
 pub mod flow_status;
@@ -41,25 +45,35 @@ pub mod flows;
 pub mod global_settings;
 pub mod indexer;
 pub mod job_metrics;
-#[cfg(feature = "parquet")]
+#[cfg(all(feature = "parquet", feature = "private"))]
 pub mod job_s3_helpers_ee;
+#[cfg(feature = "parquet")]
+pub mod job_s3_helpers_oss;
 
-#[cfg(all(feature = "enterprise", feature = "openidconnect"))]
+#[cfg(all(feature = "enterprise", feature = "openidconnect", feature = "private"))]
 pub mod oidc_ee;
+#[cfg(all(feature = "enterprise", feature = "openidconnect"))]
+pub mod oidc_oss;
 
 pub mod jobs;
 pub mod jwt;
 pub mod more_serde;
 pub mod oauth2;
+#[cfg(feature = "private")]
 pub mod otel_ee;
+pub mod otel_oss;
 pub mod queue;
 pub mod s3_helpers;
 pub mod schedule;
 pub mod schema;
 pub mod scripts;
 pub mod server;
+#[cfg(feature = "private")]
 pub mod stats_ee;
+pub mod stats_oss;
+#[cfg(feature = "private")]
 pub mod teams_ee;
+pub mod teams_oss;
 pub mod tracing_init;
 pub mod users;
 pub mod utils;
diff --git a/backend/windmill-common/src/oidc_ee.rs b/backend/windmill-common/src/oidc_ee.rs
deleted file mode 100644
index e7a157b04d..0000000000
--- a/backend/windmill-common/src/oidc_ee.rs
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Author: Ruben Fiszel
- * Copyright: Windmill Labs, Inc 2023
- * 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.
- */
-
-use serde::{Deserialize, Serialize};
-use tokio::sync::RwLock;
-#[cfg(all(feature = "enterprise", feature = "openidconnect"))]
-use {
-    crate::db::DB,
-    crate::{auth::IdToken as WindmillIdToken, error::Result},
-    anyhow,
-    openidconnect::{
-        core::{CoreJwsSigningAlgorithm, CoreRsaPrivateSigningKey},
-        IssuerUrl, JsonWebKeyId,
-    },
-    std::process::Command,
-};
-
-#[cfg(feature = "openidconnect")]
-use openidconnect::AdditionalClaims;
-
-#[cfg(feature = "openidconnect")]
-impl AdditionalClaims for JobClaim {}
-
-#[cfg(feature = "openidconnect")]
-impl AdditionalClaims for WorkspaceClaim {}
-
-#[cfg(feature = "openidconnect")]
-impl AdditionalClaims for InstanceClaim {}
-
-#[derive(Clone, Debug, Default, Deserialize, PartialEq, Eq, Serialize)]
-pub struct WorkspaceClaim {
-    pub workspace: String,
-}
-
-#[derive(Clone, Debug, Default, Deserialize, PartialEq, Eq, Serialize)]
-pub struct InstanceClaim {}
-
-#[derive(Clone, Debug, Default, Deserialize, PartialEq, Eq, Serialize)]
-pub struct JobClaim {
-    pub job_id: String,
-    pub path: Option<String>,
-    pub flow_path: Option<String>,
-    pub groups: Vec<String>,
-    pub username: String,
-    pub email: String,
-    pub workspace: String,
-}
-
-lazy_static::lazy_static! {
-    static ref PRIVATE_KEY: RwLock<Option<String>> = RwLock::new(None);
-}
-
-pub async fn generate_id_token<T: AdditionalClaims>(
-    db: Option<&DB>,
-    claim: T,
-    audience: &str,
-    identifier: String,
-    email: Option<String>,
-) -> Result<WindmillIdToken> {
-    use chrono::{Duration, Utc};
-    use openidconnect::{
-        core::{CoreGenderClaim, CoreJweContentEncryptionAlgorithm},
-        Audience, EndUserEmail, IdToken, IdTokenClaims, StandardClaims, SubjectIdentifier,
-    };
-
-    let private_key = get_private_key(db).await?;
-
-    let issue_url = format!("{}/api/oidc/", crate::BASE_URL.read().await.clone());
-    let issue_time = Utc::now();
-    let expiration = issue_time + Duration::try_hours(48).unwrap();
-    let id_token = IdToken::<
-        T,
-        CoreGenderClaim,
-        CoreJweContentEncryptionAlgorithm,
-        CoreJwsSigningAlgorithm,
-    >::new(
-        IdTokenClaims::<T, CoreGenderClaim>::new(
-            // Specify the issuer URL for the OpenID Connect Provider.
-            IssuerUrl::new(issue_url)
-                .map_err(|e| anyhow::anyhow!("Failed to generate IssueUrl: {}", e))?,
-            // The audience is usually a single entry with the client ID of the client for whom
-            // the ID token is intended. This is a required claim.
-            vec![Audience::new(audience.to_string())],
-            // The ID token expiration is usually much shorter than that of the access or refresh
-            // tokens issued to clients.
-            expiration,
-            // The issue time is usually the current time.
-            issue_time,
-            // Set the standard claims defined by the OpenID Connect Core spec.
-            StandardClaims::new(
-                // Stable subject identifiers are recommended in place of e-mail addresses or other
-                // potentially unstable identifiers. This is the only required claim.
-                SubjectIdentifier::new(identifier),
-            )
-            // Optional: specify the user's e-mail address. This should only be provided if the
-            // client has been granted the 'profile' or 'email' scopes.
-            .set_email(email.map(|x| EndUserEmail::new(x)))
-            // Optional: specify whether the provider has verified the user's e-mail address.
-            .set_email_verified(Some(true)),
-            // OpenID Connect Providers may supply custom claims by providing a struct that
-            // implements the AdditionalClaims trait. This requires manually using the
-            // generic IdTokenClaims struct rather than the CoreIdTokenClaims type alias,
-            // however.
-            claim,
-        ),
-        // The private key used for signing the ID token. For confidential clients (those able
-        // to maintain a client secret), a CoreHmacKey can also be used, in conjunction
-        // with one of the CoreJwsSigningAlgorithm::HmacSha* signing algorithms. When using an
-        // HMAC-based signing algorithm, the UTF-8 representation of the client secret should
-        // be used as the HMAC key.
-        &CoreRsaPrivateSigningKey::from_pem(
-            &private_key,
-            Some(JsonWebKeyId::new("windmill".to_string())),
-        )
-        .map_err(|e| anyhow::anyhow!("Invalid private key: {}", e))?,
-        // Uses the RS256 signature algorithm. This crate supports any RS*, PS*, or HS*
-        // signature algorithm.
-        CoreJwsSigningAlgorithm::RsaSsaPkcs1V15Sha256,
-        // When returning the ID token alongside an access token (e.g., in the Authorization Code
-        // flow), it is recommended to pass the access token here to set the `at_hash` claim
-        // automatically.
-        None,
-        // When returning the ID token alongside an authorization code (e.g., in the implicit
-        // flow), it is recommended to pass the authorization code here to set the `c_hash` claim
-        // automatically.
-        None,
-    )
-    .map_err(|e| anyhow::anyhow!("Failed to generate token: {}", e))?;
-
-    Ok(WindmillIdToken::new(id_token.to_string(), expiration))
-}
-
-#[cfg(all(feature = "enterprise", feature = "openidconnect"))]
-pub async fn get_private_key(db: Option<&DB>) -> anyhow::Result<String> {
-    if let Some(key) = PRIVATE_KEY.read().await.clone() {
-        return Ok(key);
-    } else if let Some(db) = db {
-        let key = sqlx::query_scalar!(
-            "SELECT value->>'private_key' FROM global_settings WHERE name = 'rsa_keys'",
-        )
-        .fetch_optional(db)
-        .await?
-        .flatten();
-
-        let key = key.filter(|s| !s.is_empty());
-
-        if let Some(key) = key {
-            return Ok(key);
-        } else {
-            let keys = gen_pems(db).await?;
-            return Ok(keys.private_key);
-        }
-    } else {
-        return Err(anyhow::anyhow!("Private key not found and no db provided"));
-    }
-}
-
-#[cfg(all(feature = "enterprise", feature = "openidconnect"))]
-#[derive(Debug, Clone, serde::Serialize)]
-struct Keys {
-    private_key: String,
-}
-
-#[cfg(all(feature = "enterprise", feature = "openidconnect"))]
-async fn gen_pems(db: &DB) -> anyhow::Result<Keys> {
-    use anyhow::anyhow;
-
-    let private_key_cmd = Command::new("openssl")
-        .arg("genrsa")
-        .arg("--traditional")
-        .arg("2048")
-        .output()
-        .expect("failed to execute process");
-
-    let private_key = String::from_utf8(private_key_cmd.stdout)?;
-
-    tracing::debug!("Generated private key: {}", private_key);
-
-    if private_key.is_empty() {
-        return Err(anyhow!("Failed to generate RSA key: key is empty"));
-    }
-
-    let keys = Keys { private_key };
-
-    sqlx::query!(
-        r#"INSERT INTO global_settings (name, value) VALUES ('rsa_keys', $1)"#,
-        serde_json::to_value(&keys).unwrap()
-    )
-    .execute(db)
-    .await?;
-
-    Ok(keys)
-}
diff --git a/backend/windmill-common/src/oidc_oss.rs b/backend/windmill-common/src/oidc_oss.rs
new file mode 100644
index 0000000000..0a42cee2ed
--- /dev/null
+++ b/backend/windmill-common/src/oidc_oss.rs
@@ -0,0 +1,92 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::oidc_ee::*;
+
+/*
+ * Author: Ruben Fiszel
+ * Copyright: Windmill Labs, Inc 2023
+ * 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.
+ */
+
+#[cfg(not(feature = "private"))]
+use serde::{Deserialize, Serialize};
+#[cfg(not(feature = "private"))]
+use tokio::sync::RwLock;
+#[cfg(all(
+    feature = "enterprise",
+    feature = "openidconnect",
+    not(feature = "private")
+))]
+use {
+    crate::db::DB,
+    crate::{
+        auth::IdToken as WindmillIdToken,
+        error::{Error, Result},
+    },
+    anyhow,
+};
+
+#[cfg(all(feature = "openidconnect", not(feature = "private")))]
+use openidconnect::AdditionalClaims;
+
+#[cfg(all(feature = "openidconnect", not(feature = "private")))]
+impl AdditionalClaims for JobClaim {}
+
+#[cfg(all(feature = "openidconnect", not(feature = "private")))]
+impl AdditionalClaims for WorkspaceClaim {}
+
+#[cfg(all(feature = "openidconnect", not(feature = "private")))]
+impl AdditionalClaims for InstanceClaim {}
+
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Eq, Serialize)]
+#[cfg(not(feature = "private"))]
+pub struct WorkspaceClaim {
+    pub workspace: String,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Eq, Serialize)]
+#[cfg(not(feature = "private"))]
+pub struct InstanceClaim {}
+
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Eq, Serialize)]
+#[cfg(not(feature = "private"))]
+pub struct JobClaim {
+    pub job_id: String,
+    pub path: Option<String>,
+    pub flow_path: Option<String>,
+    pub groups: Vec<String>,
+    pub username: String,
+    pub email: String,
+    pub workspace: String,
+}
+
+#[cfg(not(feature = "private"))]
+lazy_static::lazy_static! {
+    static ref PRIVATE_KEY: RwLock<Option<String>> = RwLock::new(None);
+}
+
+#[cfg(not(feature = "private"))]
+pub async fn generate_id_token<T: AdditionalClaims>(
+    _db: Option<&DB>,
+    _claim: T,
+    _audience: &str,
+    _identifier: String,
+    _email: Option<String>,
+) -> Result<WindmillIdToken> {
+    Err(Error::internal_err(
+        "Not implemented in Windmill's Open Source repository".to_string(),
+    ))
+}
+
+#[cfg(all(
+    feature = "enterprise",
+    feature = "openidconnect",
+    not(feature = "private")
+))]
+pub async fn get_private_key(_db: Option<&DB>) -> anyhow::Result<String> {
+    Err(anyhow::anyhow!(
+        "Not implemented in Windmill's Open Source repository"
+    ))
+}
diff --git a/backend/windmill-common/src/otel_ee.rs b/backend/windmill-common/src/otel_oss.rs
similarity index 60%
rename from backend/windmill-common/src/otel_ee.rs
rename to backend/windmill-common/src/otel_oss.rs
index f3ada162f6..9225915636 100644
--- a/backend/windmill-common/src/otel_ee.rs
+++ b/backend/windmill-common/src/otel_oss.rs
@@ -1,3 +1,7 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::otel_ee::*;
+
 /*
  * Author: Ruben Fiszel
  * Copyright: Windmill Labs, Inc 2022
@@ -6,43 +10,51 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
+#[cfg(not(feature = "private"))]
 use crate::{jobs::QueuedJob, utils::Mode};
+#[cfg(not(feature = "private"))]
 use uuid::Uuid;
 
+#[cfg(not(feature = "private"))]
 pub fn set_span_parent(_span: &tracing::Span, _rj: &Uuid) {}
 
-#[cfg(not(all(feature = "otel", feature = "enterprise")))]
+#[cfg(all(
+    not(all(feature = "otel", feature = "enterprise")),
+    not(feature = "private")
+))]
 pub(crate) type OtelProvider = Option<()>;
 
-#[cfg(all(feature = "otel", feature = "enterprise"))]
+#[cfg(all(feature = "otel", feature = "enterprise", not(feature = "private")))]
 pub(crate) type OtelProvider = Option<opentelemetry_sdk::metrics::SdkMeterProvider>;
 
-#[cfg(not(feature = "otel"))]
+#[cfg(all(not(feature = "otel"), not(feature = "private")))]
 pub fn otel_ctx() -> () {}
 
-#[cfg(feature = "otel")]
+#[cfg(all(feature = "otel", not(feature = "private")))]
 #[inline(always)]
 pub fn otel_ctx() -> opentelemetry::Context {
     opentelemetry::Context::current()
 }
 
-#[cfg(not(feature = "otel"))]
+#[cfg(all(not(feature = "otel"), not(feature = "private")))]
 impl<T: Sized> FutureExt for T {}
 
-#[cfg(not(feature = "otel"))]
+#[cfg(all(not(feature = "otel"), not(feature = "private")))]
 pub trait FutureExt: Sized {
     fn with_context(self, _otel_cx: ()) -> Self {
         self
     }
 }
 
+#[cfg(not(feature = "private"))]
 use tracing_subscriber::EnvFilter;
 
+#[cfg(not(feature = "private"))]
 pub(crate) fn init_logs_bridge(_mode: &Mode, _hostname: &str, _env: &str) -> Option<EnvFilter> {
     None
 }
 
-#[cfg(all(feature = "otel", feature = "enterprise"))]
+#[cfg(all(feature = "otel", feature = "enterprise", not(feature = "private")))]
 pub(crate) fn init_otlp_tracer(
     _mode: &Mode,
     _hostname: &str,
@@ -51,8 +63,10 @@ pub(crate) fn init_otlp_tracer(
     None
 }
 
+#[cfg(not(feature = "private"))]
 pub(crate) fn init_meter_provider(_mode: &Mode, _hostname: &str, _env: &str) -> OtelProvider {
     None
 }
 
+#[cfg(not(feature = "private"))]
 pub fn add_root_flow_job_to_otlp(_queued_job: &QueuedJob, _success: bool) {}
diff --git a/backend/windmill-common/src/s3_helpers.rs b/backend/windmill-common/src/s3_helpers.rs
index 7e7c48851e..171958f5cd 100644
--- a/backend/windmill-common/src/s3_helpers.rs
+++ b/backend/windmill-common/src/s3_helpers.rs
@@ -147,7 +147,7 @@ pub enum ObjectStoreReload {
 #[cfg(feature = "parquet")]
 pub async fn reload_object_store_setting(db: &crate::DB) -> ObjectStoreReload {
     use crate::{
-        ee::{get_license_plan, LicensePlan},
+        ee_oss::{get_license_plan, LicensePlan},
         global_settings::{load_value_from_global_settings, OBJECT_STORE_CONFIG_SETTING},
         s3_helpers::ObjectSettings,
     };
@@ -613,8 +613,8 @@ pub async fn build_object_store_from_settings(
             build_azure_blob_client(&azure_blob_resource).map(|x| ExpirableObjectStore::from(x))
         }
         ObjectSettings::AwsOidc(ref s3_aws_oidc_settings) => {
-            let token_generator = crate::job_s3_helpers_ee::TokenGenerator::AsServerInstance();
-            let res = crate::job_s3_helpers_ee::generate_s3_aws_oidc_resource(
+            let token_generator = crate::job_s3_helpers_oss::TokenGenerator::AsServerInstance();
+            let res = crate::job_s3_helpers_oss::generate_s3_aws_oidc_resource(
                 s3_aws_oidc_settings.clone(),
                 token_generator,
                 init_private_key,
diff --git a/backend/windmill-common/src/scripts.rs b/backend/windmill-common/src/scripts.rs
index dda9daf0f4..ffa7bd486a 100644
--- a/backend/windmill-common/src/scripts.rs
+++ b/backend/windmill-common/src/scripts.rs
@@ -9,6 +9,7 @@
 use std::{
     fmt::{self, Display},
     hash::{Hash, Hasher},
+    str::FromStr,
 };
 
 use crate::{
@@ -21,6 +22,7 @@ use crate::worker::HUB_CACHE_DIR;
 use anyhow::Context;
 use backon::ConstantBuilder;
 use backon::{BackoffBuilder, Retryable};
+use itertools::Itertools;
 use serde::de::Error as _;
 use serde::{ser::SerializeSeq, Deserialize, Deserializer, Serialize};
 
@@ -85,6 +87,40 @@ impl ScriptLang {
     }
 }
 
+impl FromStr for ScriptLang {
+    type Err = Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let language = match s.to_lowercase().as_str() {
+            "bun" => ScriptLang::Bun,
+            "bunnative" => ScriptLang::Bunnative,
+            "nativets" => ScriptLang::Nativets,
+            "deno" => ScriptLang::Deno,
+            "python3" => ScriptLang::Python3,
+            "go" => ScriptLang::Go,
+            "bash" => ScriptLang::Bash,
+            "powershell" => ScriptLang::Powershell,
+            "postgresql" => ScriptLang::Postgresql,
+            "mysql" => ScriptLang::Mysql,
+            "bigquery" => ScriptLang::Bigquery,
+            "snowflake" => ScriptLang::Snowflake,
+            "mssql" => ScriptLang::Mssql,
+            "graphql" => ScriptLang::Graphql,
+            "oracledb" => ScriptLang::OracleDB,
+            "php" => ScriptLang::Php,
+            "rust" => ScriptLang::Rust,
+            "ansible" => ScriptLang::Ansible,
+            "csharp" => ScriptLang::CSharp,
+            "nu" => ScriptLang::Nu,
+            "java" => ScriptLang::Java,
+            language => {
+                return Err(anyhow::anyhow!("{} is currently not supported", language).into())
+            }
+        };
+
+        Ok(language)
+    }
+}
+
 #[derive(Eq, PartialEq, Debug, Hash, Clone, Copy, sqlx::Type)]
 #[sqlx(transparent)]
 pub struct ScriptHash(pub i64);
@@ -367,7 +403,7 @@ where
     deserializer.deserialize_any(StringOrArrayVisitor)
 }
 
-#[derive(Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct ListScriptQuery {
     pub path_start: Option<String>,
     pub path_exact: Option<String>,
@@ -384,6 +420,29 @@ pub struct ListScriptQuery {
     pub include_without_main: Option<bool>,
     pub include_draft_only: Option<bool>,
     pub with_deployment_msg: Option<bool>,
+    #[serde(default, deserialize_with = "from_seq")]
+    pub languages: Option<Vec<ScriptLang>>,
+}
+
+fn from_seq<'de, D>(deserializer: D) -> Result<Option<Vec<ScriptLang>>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let s = <String>::deserialize(deserializer)?;
+
+    let languages: Vec<ScriptLang> = s
+        .split(",")
+        .map(ScriptLang::from_str)
+        .try_collect()
+        .map_err(|e| serde::de::Error::custom(e.to_string()))?;
+
+    let languages = if languages.is_empty() {
+        None
+    } else {
+        Some(languages)
+    };
+
+    Ok(languages)
 }
 
 pub fn to_i64(s: &str) -> crate::error::Result<i64> {
diff --git a/backend/windmill-common/src/stats_ee.rs b/backend/windmill-common/src/stats_oss.rs
similarity index 73%
rename from backend/windmill-common/src/stats_ee.rs
rename to backend/windmill-common/src/stats_oss.rs
index 5d2dc82b82..829e6e3a5b 100644
--- a/backend/windmill-common/src/stats_ee.rs
+++ b/backend/windmill-common/src/stats_oss.rs
@@ -1,17 +1,26 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::stats_ee::*;
+
+#[cfg(not(feature = "private"))]
 use sqlx::Postgres;
 
+#[cfg(not(feature = "private"))]
 use crate::{error::Result, scripts::ScriptLang, DB};
 
+#[cfg(not(feature = "private"))]
 pub async fn get_disable_stats_setting(_db: &DB) -> bool {
     // stats details are closed source
 
     false
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn schedule_stats(_db: &DB, _http_client: &reqwest::Client) -> () {
     // stats details are closed source
 }
 
+#[cfg(not(feature = "private"))]
 #[derive(Debug, sqlx::FromRow, serde::Serialize)]
 struct JobsUsage {
     language: Option<ScriptLang>,
@@ -19,12 +28,14 @@ struct JobsUsage {
     count: i64,
 }
 
+#[cfg(not(feature = "private"))]
 pub enum SendStatsReason {
     Manual,
     Schedule,
     OnStart,
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn send_stats(
     _http_client: &reqwest::Client,
     _db: &DB,
@@ -34,11 +45,13 @@ pub async fn send_stats(
     Ok(())
 }
 
+#[cfg(not(feature = "private"))]
 pub struct ActiveUserUsage {
     pub author_count: Option<i32>,
     pub operator_count: Option<i32>,
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn get_user_usage<'c, E: sqlx::Executor<'c, Database = Postgres>>(
     _db: E,
 ) -> Result<ActiveUserUsage> {
diff --git a/backend/windmill-common/src/teams_ee.rs b/backend/windmill-common/src/teams_ee.rs
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/backend/windmill-common/src/teams_oss.rs b/backend/windmill-common/src/teams_oss.rs
new file mode 100644
index 0000000000..347ad8e6d7
--- /dev/null
+++ b/backend/windmill-common/src/teams_oss.rs
@@ -0,0 +1,5 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::teams_ee::*;
+
+
diff --git a/backend/windmill-common/src/tracing_init.rs b/backend/windmill-common/src/tracing_init.rs
index 5ed5cec752..77194ac0a9 100644
--- a/backend/windmill-common/src/tracing_init.rs
+++ b/backend/windmill-common/src/tracing_init.rs
@@ -48,7 +48,7 @@ pub fn initialize_tracing(
     hostname: &str,
     mode: &Mode,
     environment: &str,
-) -> (WorkerGuard, crate::otel_ee::OtelProvider) {
+) -> (WorkerGuard, crate::otel_oss::OtelProvider) {
     let style = std::env::var("RUST_LOG_STYLE").unwrap_or_else(|_| "auto".into());
 
     let rust_log_env = std::env::var("RUST_LOG");
@@ -70,16 +70,16 @@ pub fn initialize_tracing(
         LevelFilter::INFO
     };
 
-    let meter_provider = crate::otel_ee::init_meter_provider(mode, hostname, environment);
+    let meter_provider = crate::otel_oss::init_meter_provider(mode, hostname, environment);
 
     #[cfg(all(feature = "otel", feature = "enterprise"))]
-    let opentelemetry = crate::otel_ee::init_otlp_tracer(mode, hostname, environment)
+    let opentelemetry = crate::otel_oss::init_otlp_tracer(mode, hostname, environment)
         .map(|x| tracing_opentelemetry::layer().with_tracer(x));
 
     #[cfg(not(all(feature = "otel", feature = "enterprise")))]
     let opentelemetry: Option<EnvFilter> = None;
 
-    let logs_bridge = crate::otel_ee::init_logs_bridge(&mode, hostname, environment);
+    let logs_bridge = crate::otel_oss::init_logs_bridge(&mode, hostname, environment);
 
     use tracing_appender::rolling::{RollingFileAppender, Rotation};
 
diff --git a/backend/windmill-common/src/utils.rs b/backend/windmill-common/src/utils.rs
index 3f1a1bd385..7c2faea868 100644
--- a/backend/windmill-common/src/utils.rs
+++ b/backend/windmill-common/src/utils.rs
@@ -7,9 +7,9 @@
  */
 
 use crate::auth::is_devops_email;
-use crate::ee::LICENSE_KEY_ID;
+use crate::ee_oss::LICENSE_KEY_ID;
 #[cfg(feature = "enterprise")]
-use crate::ee::{send_critical_alert, CriticalAlertKind};
+use crate::ee_oss::{send_critical_alert, CriticalAlertKind};
 use crate::error::{to_anyhow, Error, Result};
 use crate::global_settings::UNIQUE_ID_SETTING;
 use crate::DB;
@@ -25,7 +25,8 @@ use semver::Version;
 use serde::{Deserialize, Deserializer, Serialize};
 use sha2::{Digest, Sha256};
 use sqlx::{Pool, Postgres};
-use std::str::FromStr;
+use std::{fs::DirBuilder as SyncDirBuilder, str::FromStr};
+use tokio::fs::DirBuilder as AsyncDirBuilder;
 
 pub const MAX_PER_PAGE: usize = 10000;
 pub const DEFAULT_PER_PAGE: usize = 1000;
@@ -33,6 +34,10 @@ pub const DEFAULT_PER_PAGE: usize = 1000;
 pub const GIT_VERSION: &str =
     git_version!(args = ["--tag", "--always"], fallback = "unknown-version");
 
+pub const AGENT_JWT_PREFIX: &str = "jwt_agent_";
+pub const WORKER_NAME_PREFIX: &str = "wk";
+pub const AGENT_WORKER_NAME_PREFIX: &str = "ag";
+
 use crate::CRITICAL_ALERT_MUTE_UI_ENABLED;
 use std::panic::{self, AssertUnwindSafe, Location};
 use std::sync::atomic::Ordering;
@@ -53,6 +58,12 @@ lazy_static::lazy_static! {
         }
     ).unwrap_or(Version::new(0, 1, 0));
 
+    pub static ref HOSTNAME :String = std::env::var("FORCE_HOSTNAME").unwrap_or_else(|_| {
+        gethostname()
+            .to_str()
+            .map(|x| x.to_string())
+            .unwrap_or_else(|| rd_string(5))
+    });
 
     pub static ref MODE_AND_ADDONS: ModeAndAddons = {
         let mut search_addon = false;
@@ -120,6 +131,10 @@ lazy_static::lazy_static! {
     };
 }
 
+lazy_static::lazy_static! {
+    pub static ref AGENT_TOKEN: String = std::env::var("AGENT_TOKEN").unwrap_or_default();
+}
+
 #[derive(Clone)]
 pub struct ModeAndAddons {
     pub indexer: bool,
@@ -167,15 +182,6 @@ pub async fn require_admin_or_devops(
     Ok(())
 }
 
-pub fn hostname() -> String {
-    std::env::var("FORCE_HOSTNAME").unwrap_or_else(|_| {
-        gethostname()
-            .to_str()
-            .map(|x| x.to_string())
-            .unwrap_or_else(|| rd_string(5))
-    })
-}
-
 fn instance_name(hostname: &str) -> String {
     hostname
         .replace(" ", "")
@@ -186,15 +192,30 @@ fn instance_name(hostname: &str) -> String {
         .to_string()
 }
 
-pub fn worker_suffix(hostname: &str, rd_string: &str) -> String {
-    format!("{}-{}", instance_name(hostname), rd_string)
+const DEFAULT_WORKER_SUFFIX_LEN: usize = 5;
+pub const SSH_AGENT_WORKER_SUFFIX: &'static str = "/ssh";
+
+pub fn create_worker_suffix(hostname: &str, rd_string_len: usize, ssh_ag_worker: bool) -> String {
+    let mut wk_suffix = format!("{}-{}", instance_name(hostname), rd_string(rd_string_len));
+    if ssh_ag_worker {
+        wk_suffix.push_str(SSH_AGENT_WORKER_SUFFIX);
+    }
+    wk_suffix
+}
+
+pub fn create_ssh_agent_worker_suffix(hostname: &str) -> String {
+    create_worker_suffix(hostname, DEFAULT_WORKER_SUFFIX_LEN, true)
+}
+
+pub fn create_default_worker_suffix(hostname: &str) -> String {
+    create_worker_suffix(hostname, DEFAULT_WORKER_SUFFIX_LEN, false)
 }
 
 pub fn worker_name_with_suffix(is_agent: bool, worker_group: &str, suffix: &str) -> String {
     if is_agent {
-        format!("ag-{}-{}", worker_group, suffix)
+        format!("{}-{}-{}", AGENT_WORKER_NAME_PREFIX, worker_group, suffix)
     } else {
-        format!("wk-{}-{}", worker_group, suffix)
+        format!("{}-{}-{}", WORKER_NAME_PREFIX, worker_group, suffix)
     }
 }
 
@@ -223,6 +244,21 @@ pub async fn now_from_db<'c, E: sqlx::PgExecutor<'c>>(
         .unwrap())
 }
 
+pub async fn create_directory_async(directory_path: &str) {
+    AsyncDirBuilder::new()
+        .recursive(true)
+        .create(directory_path)
+        .await
+        .expect("could not create dir");
+}
+
+pub fn create_directory_sync(directory_path: &str) {
+    SyncDirBuilder::new()
+        .recursive(true)
+        .create(directory_path)
+        .expect("could not create dir");
+}
+
 pub fn not_found_if_none<T, U: AsRef<str>>(opt: Option<T>, kind: &str, name: U) -> Result<T> {
     if let Some(o) = opt {
         Ok(o)
diff --git a/backend/windmill-common/src/worker.rs b/backend/windmill-common/src/worker.rs
index 6b11fa086f..1f09176512 100644
--- a/backend/windmill-common/src/worker.rs
+++ b/backend/windmill-common/src/worker.rs
@@ -1,4 +1,5 @@
 use anyhow::anyhow;
+use axum::http::HeaderMap;
 use bytes::Bytes;
 use const_format::concatcp;
 use itertools::Itertools;
@@ -34,7 +35,6 @@ use crate::{
 
 pub const DEFAULT_CLOUD_TIMEOUT: u64 = 900;
 pub const DEFAULT_SELFHOSTED_TIMEOUT: u64 = 604800; // 7 days
-
 lazy_static::lazy_static! {
     pub static ref WORKER_GROUP: String = std::env::var("WORKER_GROUP").unwrap_or_else(|_| {
         #[cfg(not(feature = "enterprise"))]
@@ -129,7 +129,7 @@ lazy_static::lazy_static! {
 
     pub static ref ALL_TAGS: Arc<RwLock<Vec<String>>> = Arc::new(RwLock::new(vec![]));
 
-    static ref CUSTOM_TAG_REGEX: Regex = Regex::new(r"^([\w-]+)\(((?:[\w-])+\+?)+\)$").unwrap();
+    static ref CUSTOM_TAG_REGEX: Regex = Regex::new(r"^([\w-]+)\(((?:[\w-]+\+)*[\w-]+)\)$").unwrap();
 
     pub static ref DISABLE_BUNDLING: bool = std::env::var("DISABLE_BUNDLING")
     .ok()
@@ -159,12 +159,20 @@ impl HttpClient {
     pub async fn post<T: Serialize, R: DeserializeOwned>(
         &self,
         url: &str,
+        headers: Option<HeaderMap>,
         body: &T,
     ) -> anyhow::Result<R> {
-        let response = self
+        let response_builder = self
             .0
             .post(format!("{}{}", *BASE_INTERNAL_URL, url))
-            .json(body)
+            .json(body);
+
+        let response_builder = match headers {
+            Some(headers) => response_builder.headers(headers),
+            None => response_builder,
+        };
+
+        let response = response_builder
             .send()
             .await
             .map_err(|e| anyhow::anyhow!(e))?;
@@ -259,7 +267,7 @@ fn format_pull_query(peek: String) -> String {
                 id, workspace_id, parent_job, created_by, created_at, runnable_id,
                 runnable_path, args, kind, trigger, trigger_kind,
                 permissioned_as, permissioned_as_email, script_lang,
-                flow_innermost_root_job, flow_step_id, 
+                flow_innermost_root_job, flow_step_id,
                 same_worker, pre_run_error, visible_to_owner, tag, concurrent_limit,
                 concurrency_time_window_s, timeout, cache_ttl, priority, raw_code, raw_lock,
                 raw_flow, script_entrypoint_override, preprocessed
@@ -267,13 +275,13 @@ fn format_pull_query(peek: String) -> String {
             WHERE id = (SELECT id FROM peek)
         ) SELECT j.id, j.workspace_id, j.parent_job, j.created_by, started_at, scheduled_for,
             j.runnable_id, j.runnable_path, j.args, canceled_by,
-            canceled_reason, j.kind, j.trigger, j.trigger_kind, j.permissioned_as, 
+            canceled_reason, j.kind, j.trigger, j.trigger_kind, j.permissioned_as,
             flow_status, j.script_lang,
-            j.same_worker, j.pre_run_error, j.visible_to_owner, 
+            j.same_worker, j.pre_run_error, j.visible_to_owner,
             j.tag, j.concurrent_limit, j.concurrency_time_window_s, j.flow_innermost_root_job,
             j.timeout, j.flow_step_id, j.cache_ttl, j.priority, j.raw_code, j.raw_lock, j.raw_flow,
             j.script_entrypoint_override, j.preprocessed, pj.runnable_path as parent_runnable_path,
-            COALESCE(p.email, j.permissioned_as_email) as permissioned_as_email, p.username as permissioned_as_username, p.is_admin as permissioned_as_is_admin, 
+            COALESCE(p.email, j.permissioned_as_email) as permissioned_as_email, p.username as permissioned_as_username, p.is_admin as permissioned_as_is_admin,
             p.is_operator as permissioned_as_is_operator, p.groups as permissioned_as_groups, p.folders as permissioned_as_folders
         FROM q, j
             LEFT JOIN v2_job_status f USING (id)
@@ -308,7 +316,7 @@ pub async fn store_suspended_pull_query(wc: &WorkerConfig) {
 }
 
 pub fn make_pull_query(tags: &[String]) -> String {
-    format_pull_query(format!(
+    let query = format_pull_query(format!(
         "SELECT id
         FROM v2_job_queue
         WHERE running = false AND tag IN ({}) AND scheduled_for <= now()
@@ -316,7 +324,8 @@ pub fn make_pull_query(tags: &[String]) -> String {
         FOR UPDATE SKIP LOCKED
         LIMIT 1",
         tags.iter().map(|x| format!("'{x}'")).join(", ")
-    ))
+    ));
+    query
 }
 
 pub async fn store_pull_query(wc: &WorkerConfig) {
@@ -1028,7 +1037,7 @@ pub async fn update_ping_http(
     Ok(())
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct JobCancelled {
     pub canceled_by: String,
     pub reason: String,
@@ -1060,11 +1069,11 @@ pub async fn update_ping_for_failed_init_script_query(
     db: &DB,
 ) -> anyhow::Result<()> {
     sqlx::query!(
-        "UPDATE worker_ping SET 
-ping_at = now(), 
-jobs_executed = 1, 
-current_job_id = $1, 
-current_job_workspace_id = 'admins' 
+        "UPDATE worker_ping SET
+ping_at = now(),
+jobs_executed = 1,
+current_job_id = $1,
+current_job_workspace_id = 'admins'
 WHERE worker = $2",
         last_job_id,
         worker_name
@@ -1510,7 +1519,7 @@ pub struct WorkerConfig {
 
 impl std::fmt::Debug for WorkerConfig {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "WorkerConfig {{ worker_tags: {:?}, priority_tags_sorted: {:?}, dedicated_worker: {:?}, init_bash: {:?}, cache_clear: {:?}, additional_python_paths: {:?}, pip_local_dependencies: {:?}, env_vars: {:?} }}", 
+        write!(f, "WorkerConfig {{ worker_tags: {:?}, priority_tags_sorted: {:?}, dedicated_worker: {:?}, init_bash: {:?}, cache_clear: {:?}, additional_python_paths: {:?}, pip_local_dependencies: {:?}, env_vars: {:?} }}",
         self.worker_tags, self.priority_tags_sorted, self.dedicated_worker, self.init_bash, self.cache_clear, self.additional_python_paths, self.pip_local_dependencies, self.env_vars.iter().map(|(k, v)| format!("{}: {}{} ({} chars)", k, &v[..3.min(v.len())], "***", v.len())).collect::<Vec<String>>().join(", "))
     }
 }
diff --git a/backend/windmill-git-sync/Cargo.toml b/backend/windmill-git-sync/Cargo.toml
index d5a8412fae..6a0499639a 100644
--- a/backend/windmill-git-sync/Cargo.toml
+++ b/backend/windmill-git-sync/Cargo.toml
@@ -9,6 +9,7 @@ name = "windmill_git_sync"
 path = "./src/lib.rs"
 
 [features]
+private = []
 enterprise = ["windmill-queue/enterprise", "windmill-common/enterprise"]
 default = []
 
diff --git a/backend/windmill-git-sync/src/git_sync_ee.rs b/backend/windmill-git-sync/src/git_sync_oss.rs
similarity index 69%
rename from backend/windmill-git-sync/src/git_sync_ee.rs
rename to backend/windmill-git-sync/src/git_sync_oss.rs
index cc245d3d0c..70e2b53640 100644
--- a/backend/windmill-git-sync/src/git_sync_ee.rs
+++ b/backend/windmill-git-sync/src/git_sync_oss.rs
@@ -1,7 +1,14 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::git_sync_ee::*;
+
+#[cfg(not(feature = "private"))]
 use windmill_common::error::Result;
 
+#[cfg(not(feature = "private"))]
 use crate::{DeployedObject, DB};
 
+#[cfg(not(feature = "private"))]
 pub async fn handle_deployment_metadata<'c>(
     _email: &str,
     _created_by: &str,
diff --git a/backend/windmill-git-sync/src/lib.rs b/backend/windmill-git-sync/src/lib.rs
index f1e0ed6ee3..d4e4ebf71f 100644
--- a/backend/windmill-git-sync/src/lib.rs
+++ b/backend/windmill-git-sync/src/lib.rs
@@ -10,9 +10,11 @@ use sqlx::{Pool, Postgres};
 
 use windmill_common::scripts::ScriptHash;
 
+#[cfg(feature = "private")]
 pub mod git_sync_ee;
+pub mod git_sync_oss;
 
-pub use git_sync_ee::handle_deployment_metadata;
+pub use git_sync_oss::handle_deployment_metadata;
 pub type DB = Pool<Postgres>;
 
 #[derive(Clone, Debug)]
diff --git a/backend/windmill-indexer/Cargo.toml b/backend/windmill-indexer/Cargo.toml
index 14ab53beef..ea95d6237d 100644
--- a/backend/windmill-indexer/Cargo.toml
+++ b/backend/windmill-indexer/Cargo.toml
@@ -11,6 +11,7 @@ path = "src/lib.rs"
 [features]
 default = []
 parquet = ["dep:object_store"]
+private = []
 enterprise = []
 
 [dependencies]
diff --git a/backend/windmill-indexer/src/completed_runs_ee.rs b/backend/windmill-indexer/src/completed_runs_oss.rs
similarity index 66%
rename from backend/windmill-indexer/src/completed_runs_ee.rs
rename to backend/windmill-indexer/src/completed_runs_oss.rs
index f5c6c98cf8..083f8744fa 100644
--- a/backend/windmill-indexer/src/completed_runs_ee.rs
+++ b/backend/windmill-indexer/src/completed_runs_oss.rs
@@ -1,17 +1,28 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::completed_runs_ee::*;
+
+#[cfg(not(feature = "private"))]
 use anyhow::anyhow;
+#[cfg(not(feature = "private"))]
 use sqlx::{Pool, Postgres};
+#[cfg(not(feature = "private"))]
 use windmill_common::error::Error;
 
+#[cfg(not(feature = "private"))]
 #[derive(Clone)]
 pub struct IndexReader;
 
+#[cfg(not(feature = "private"))]
 #[derive(Clone)]
 pub struct IndexWriter;
 
+#[cfg(not(feature = "private"))]
 pub async fn init_index(_db: &Pool<Postgres>) -> Result<(IndexReader, IndexWriter), Error> {
     Err(anyhow!("Cannot initialize index: not in EE").into())
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn run_indexer(
     _db: Pool<Postgres>,
     mut _index_writer: IndexWriter,
diff --git a/backend/windmill-indexer/src/indexer_ee.rs b/backend/windmill-indexer/src/indexer_ee.rs
deleted file mode 100644
index 8b13789179..0000000000
--- a/backend/windmill-indexer/src/indexer_ee.rs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/backend/windmill-indexer/src/indexer_oss.rs b/backend/windmill-indexer/src/indexer_oss.rs
new file mode 100644
index 0000000000..198c14e526
--- /dev/null
+++ b/backend/windmill-indexer/src/indexer_oss.rs
@@ -0,0 +1,5 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::indexer_ee::*;
+
+
diff --git a/backend/windmill-indexer/src/lib.rs b/backend/windmill-indexer/src/lib.rs
index 59c6a627f7..6c13b551d1 100644
--- a/backend/windmill-indexer/src/lib.rs
+++ b/backend/windmill-indexer/src/lib.rs
@@ -1,3 +1,9 @@
+#[cfg(feature = "private")]
 pub mod completed_runs_ee;
+pub mod completed_runs_oss;
+#[cfg(feature = "private")]
 pub mod indexer_ee;
+pub mod indexer_oss;
+#[cfg(feature = "private")]
 pub mod service_logs_ee;
+pub mod service_logs_oss;
diff --git a/backend/windmill-indexer/src/service_logs_ee.rs b/backend/windmill-indexer/src/service_logs_oss.rs
similarity index 68%
rename from backend/windmill-indexer/src/service_logs_ee.rs
rename to backend/windmill-indexer/src/service_logs_oss.rs
index e04575d3f5..b6e9017f88 100644
--- a/backend/windmill-indexer/src/service_logs_ee.rs
+++ b/backend/windmill-indexer/src/service_logs_oss.rs
@@ -1,13 +1,24 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::service_logs_ee::*;
+
+#[cfg(not(feature = "private"))]
 use anyhow::anyhow;
+#[cfg(not(feature = "private"))]
 use sqlx::{Pool, Postgres};
+#[cfg(not(feature = "private"))]
 use windmill_common::error::Error;
+#[cfg(not(feature = "private"))]
 use windmill_common::KillpillSender;
 #[derive(Clone)]
+#[cfg(not(feature = "private"))]
 pub struct ServiceLogIndexReader;
 
 #[derive(Clone)]
+#[cfg(not(feature = "private"))]
 pub struct ServiceLogIndexWriter;
 
+#[cfg(not(feature = "private"))]
 pub async fn init_index(
     _db: &Pool<Postgres>,
     mut _killpill_tx: KillpillSender,
@@ -15,6 +26,7 @@ pub async fn init_index(
     Err(anyhow!("Cannot initialize index: not in EE").into())
 }
 
+#[cfg(not(feature = "private"))]
 pub async fn run_indexer(
     _db: Pool<Postgres>,
     mut _index_writer: ServiceLogIndexWriter,
diff --git a/backend/windmill-queue/Cargo.toml b/backend/windmill-queue/Cargo.toml
index a90fa6ccf7..4458e8aa99 100644
--- a/backend/windmill-queue/Cargo.toml
+++ b/backend/windmill-queue/Cargo.toml
@@ -10,6 +10,7 @@ path = "src/lib.rs"
 
 [features]
 default = []
+private = []
 enterprise = ["windmill-common/enterprise"]
 cloud = []
 benchmark = ["windmill-common/benchmark"]
diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs
index de64071c42..3b0143c826 100644
--- a/backend/windmill-queue/src/jobs.rs
+++ b/backend/windmill-queue/src/jobs.rs
@@ -25,7 +25,7 @@ use sqlx::{types::Json, FromRow, Pool, Postgres, Transaction};
 use tokio::{sync::RwLock, time::sleep};
 use ulid::Ulid;
 use uuid::Uuid;
-use windmill_audit::audit_ee::{audit_log, AuditAuthor};
+use windmill_audit::audit_oss::{audit_log, AuditAuthor};
 use windmill_audit::ActionKind;
 
 #[cfg(feature = "benchmark")]
@@ -71,7 +71,7 @@ use windmill_common::BASE_URL;
 use windmill_common::users::SUPERADMIN_SYNC_EMAIL;
 
 use crate::flow_status::{update_flow_status_in_progress, update_workflow_as_code_status};
-use crate::jobs_ee::update_concurrency_counter;
+use crate::jobs_oss::update_concurrency_counter;
 use crate::schedule::{get_schedule_opt, push_scheduled_job};
 use crate::tags::per_workspace_tag;
 
@@ -391,6 +391,7 @@ pub async fn append_logs(
             if let Err(e) = client
             .post::<_, String>(
                 &format!("/api/w/{}/agent_workers/push_logs/{}", workspace.as_ref(), job_id),
+                None,
                 &logs.as_ref(),
             )
             .await {
@@ -1010,33 +1011,43 @@ pub async fn add_completed_job<T: Serialize + Send + Sync + ValidableJson>(
 
     #[cfg(feature = "cloud")]
     if *CLOUD_HOSTED && !queued_job.is_flow() && _duration > 1000 {
-        let additional_usage = _duration / 1000;
-        let w_id = &queued_job.workspace_id;
-        let premium_workspace = windmill_common::workspaces::is_premium_workspace(db, w_id).await;
-        let _ = sqlx::query!(
-            "INSERT INTO usage (id, is_workspace, month_, usage) 
-            VALUES ($1, TRUE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), $2) 
-            ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + $2",
-            w_id,
-            additional_usage as i32
-        )
-        .execute(db)
-        .await
-        .map_err(|e| Error::internal_err(format!("updating usage: {e:#}")));
-
-        if !premium_workspace {
+        let db = db.clone();
+        let w_id = queued_job.workspace_id.clone();
+        let email = queued_job.permissioned_as_email.clone();
+        let w_id2 = w_id.clone();
+        let email2 = email.clone();
+        tokio::task::spawn(async move {
+            let additional_usage = _duration / 1000;
+            let premium_workspace = windmill_common::workspaces::is_premium_workspace(&db, &w_id).await;
+            tokio::time::timeout(std::time::Duration::from_secs(10), async move {
             let _ = sqlx::query!(
                 "INSERT INTO usage (id, is_workspace, month_, usage) 
-                VALUES ($1, FALSE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), $2) 
+                VALUES ($1, TRUE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), $2) 
                 ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + $2",
-                queued_job.permissioned_as_email,
+                w_id,
                 additional_usage as i32
             )
-            .execute(db)
+            .execute(&db)
             .await
             .map_err(|e| Error::internal_err(format!("updating usage: {e:#}")));
-        }
+
+            if !premium_workspace {
+                let _ = sqlx::query!(
+                    "INSERT INTO usage (id, is_workspace, month_, usage) 
+                    VALUES ($1, FALSE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), $2) 
+                    ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + $2",
+                    email,
+                    additional_usage as i32
+                )
+                .execute(&db)
+                .await
+            .map_err(|e| Error::internal_err(format!("updating usage: {e:#}")));
+        }}).await.unwrap_or_else(|_| {
+            tracing::error!("Could not update usage for workspace {w_id2} and permissioned as {email2}, stopped after 10s");
+        });
+    });
     }
+    
 
     #[cfg(feature = "enterprise")]
     if !success {
@@ -2127,7 +2138,7 @@ pub struct PulledJob {
 // NOTE:
 // Precomputed by the server
 // Used to offload work from agent workers to server
-#[derive(Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 pub enum PrecomputedAgentInfo {
     Bun { local: String, remote: String },
     Python {
@@ -2138,7 +2149,7 @@ pub enum PrecomputedAgentInfo {
         requirements: Option<String> },
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct JobAndPerms {
     pub job: MiniPulledJob,
     pub raw_code: Option<String>,
@@ -2290,16 +2301,20 @@ pub async fn pull(
     db: &Pool<Postgres>,
     suspend_first: bool,
     worker_name: &str,
-    query_o: Option<(String, String)>,
+    query_o: Option<&(String, String)>,
     #[cfg(feature = "benchmark")] bench: &mut BenchmarkIter,
 ) -> windmill_common::error::Result<PulledJobResult> {
     loop {
-        if let Some((query_suspended, query_no_suspend)) = query_o.as_ref() {
+        if let Some((query_suspended, query_no_suspend)) = query_o {
             let njob = {
-                let job = sqlx::query_as::<_, PulledJob>(query_suspended)
+                let job = if query_suspended.is_empty() {
+                    None
+                } else {
+                    sqlx::query_as::<_, PulledJob>(query_suspended)
                     .bind(worker_name)
                     .fetch_optional(db)
-                    .await?;
+                    .await?
+                };
                 if let Some(job) = job {
                     PulledJobResult { job: Some(job), suspended: true }
                 } else {
@@ -2549,7 +2564,6 @@ async fn pull_single_job_and_mark_as_running_no_concurrency_limit<'c>(
             tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
             return Ok((None, false));
         }
-
         let r = if suspend_first {
             // tracing::info!("Pulling job with query: {}", query);
             sqlx::query_as::<_, PulledJob>(&query)
@@ -3265,35 +3279,40 @@ pub async fn push<'c, 'd>(
             job_payload,
             JobPayload::Flow { .. } | JobPayload::RawFlow { .. }
         ) {
-            let workspace_usage = sqlx::query_scalar!(
-                    "INSERT INTO usage (id, is_workspace, month_, usage)
-                    VALUES ($1, TRUE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), 1)
-                    ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + 1 
-                    RETURNING usage.usage",
-                    workspace_id
-                )
-                .fetch_one(_db)
-                .await
-                .map_err(|e| Error::internal_err(format!("updating usage: {e:#}")))?;
+            tokio::time::timeout(std::time::Duration::from_secs(10), async move {
+                let workspace_usage = sqlx::query_scalar!(
+                        "INSERT INTO usage (id, is_workspace, month_, usage)
+                        VALUES ($1, TRUE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), 1)
+                        ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + 1 
+                        RETURNING usage.usage",
+                        workspace_id
+                    )
+                    .fetch_one(_db)
+                    .await
+                    .map_err(|e| Error::internal_err(format!("updating usage: {e:#}")))?;
 
-            let user_usage = if !premium_workspace {
-                Some(sqlx::query_scalar!(
-                    "INSERT INTO usage (id, is_workspace, month_, usage)
-                    VALUES ($1, FALSE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), 1)
-                    ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + 1 
-                    RETURNING usage.usage",
-                    email
-                )
-                .fetch_one(_db)
-                .await
-                .map_err(|e| Error::internal_err(format!("updating usage: {e:#}")))?)
-            } else {
-                None
-            };
-            (Some(workspace_usage), user_usage)
+                let user_usage = if !premium_workspace {
+                    Some(sqlx::query_scalar!(
+                        "INSERT INTO usage (id, is_workspace, month_, usage)
+                        VALUES ($1, FALSE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), 1)
+                        ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + 1 
+                        RETURNING usage.usage",
+                        email
+                    )
+                    .fetch_one(_db)
+                    .await
+                    .map_err(|e| Error::internal_err(format!("updating usage: {e:#}")))?)
+                } else {
+                    None
+                };
+                Ok((Some(workspace_usage), user_usage))
+            }).await.unwrap_or_else(|e| {
+                tracing::error!("Could not update usage for workspace {workspace_id} and permissioned as {email}, stopped after 10s: {e:#}");
+                Err(Error::internal_err(format!("Could not update usage for workspace {workspace_id} and permissioned as {email}, stopped after 10s: {e:#}")))
+            })
         } else {
-            (None, None)
-        };
+            Ok((None, None))
+        }?;
 
         if !premium_workspace {
             let is_super_admin =
diff --git a/backend/windmill-queue/src/jobs_ee.rs b/backend/windmill-queue/src/jobs_oss.rs
similarity index 67%
rename from backend/windmill-queue/src/jobs_ee.rs
rename to backend/windmill-queue/src/jobs_oss.rs
index ea1f86b529..987a56bf0d 100644
--- a/backend/windmill-queue/src/jobs_ee.rs
+++ b/backend/windmill-queue/src/jobs_oss.rs
@@ -1,7 +1,15 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::jobs_ee::*;
+
+#[cfg(not(feature = "private"))]
 use chrono::{DateTime, Utc};
+#[cfg(not(feature = "private"))]
 use uuid::Uuid;
+#[cfg(not(feature = "private"))]
 use windmill_common::DB;
 
+#[cfg(not(feature = "private"))]
 #[allow(dead_code)]
 pub(crate) async fn update_concurrency_counter(
     _db: &DB,
diff --git a/backend/windmill-queue/src/lib.rs b/backend/windmill-queue/src/lib.rs
index 2496bdf818..9b6025e515 100644
--- a/backend/windmill-queue/src/lib.rs
+++ b/backend/windmill-queue/src/lib.rs
@@ -7,7 +7,9 @@
  */
 
 mod jobs;
+#[cfg(feature = "private")]
 pub mod jobs_ee;
+pub mod jobs_oss;
 pub mod schedule;
 pub use jobs::*;
 pub mod flow_status;
diff --git a/backend/windmill-queue/src/schedule.rs b/backend/windmill-queue/src/schedule.rs
index bb7d5df906..294ece7509 100644
--- a/backend/windmill-queue/src/schedule.rs
+++ b/backend/windmill-queue/src/schedule.rs
@@ -13,7 +13,7 @@ use sqlx::{PgExecutor, Postgres, Transaction};
 use std::collections::HashMap;
 use std::str::FromStr;
 use windmill_common::db::Authed;
-use windmill_common::ee::LICENSE_KEY_VALID;
+use windmill_common::ee_oss::LICENSE_KEY_VALID;
 use windmill_common::flows::Retry;
 use windmill_common::get_latest_flow_version_info_for_path;
 use windmill_common::jobs::JobPayload;
diff --git a/backend/windmill-worker/Cargo.toml b/backend/windmill-worker/Cargo.toml
index dbc8f2ab27..a3b36a5c04 100644
--- a/backend/windmill-worker/Cargo.toml
+++ b/backend/windmill-worker/Cargo.toml
@@ -10,6 +10,7 @@ path = "src/lib.rs"
 
 [features]
 default = []
+private = []
 prometheus = ["dep:prometheus", "windmill-common/prometheus"]
 enterprise = ["windmill-queue/enterprise", "windmill-git-sync/enterprise", "windmill-common/enterprise", "dep:pem", "dep:tokio-util"]
 mssql = ["dep:tiberius"]
@@ -31,7 +32,7 @@ csharp = ["dep:windmill-parser-csharp"]
 rust = ["dep:windmill-parser-rust"]
 nu = ["dep:windmill-parser-nu"]
 java = ["dep:windmill-parser-java"]
-duckdb = []
+duckdb = ["dep:duckdb"]
 
 [dependencies]
 windmill-queue.workspace = true
@@ -93,7 +94,7 @@ deno_permissions = { workspace = true, optional = true }
 deno_io = { workspace = true, optional = true }
 deno_error = { workspace = true, optional = true }
 async-stream.workspace = true
-duckdb.workspace = true
+duckdb = { workspace = true, optional = true }
 
 postgres-native-tls.workspace = true
 native-tls.workspace = true
diff --git a/backend/windmill-worker/nsjail/download.rust.config.proto b/backend/windmill-worker/nsjail/download.rust.config.proto
new file mode 100644
index 0000000000..7239a77b74
--- /dev/null
+++ b/backend/windmill-worker/nsjail/download.rust.config.proto
@@ -0,0 +1,117 @@
+name: "rust download script"
+
+mode: ONCE
+hostname: "rust"
+log_level: ERROR
+
+disable_rl: true
+
+cwd: "/tmp"
+
+clone_newnet: false
+
+keep_caps: false
+keep_env: true
+mount_proc: true
+
+mount {
+    src: "/bin"
+    dst: "/bin"
+	is_bind: true
+}
+
+mount {
+    src: "/lib"
+    dst: "/lib"
+	is_bind: true
+}
+
+
+mount {
+    src: "/lib64"
+    dst: "/lib64"
+	is_bind: true
+    mandatory: false
+}
+
+
+mount {
+    src: "/usr"
+    dst: "/usr"
+	is_bind: true
+}
+
+mount {
+	src: "/dev/null"
+	dst: "/dev/null"
+	is_bind: true
+	rw: true
+}
+
+mount {
+	dst: "/tmp"
+	fstype: "tmpfs"
+	rw: true
+    options: "size=500000000"
+}
+
+mount {
+    src: "/etc"
+    dst: "/etc"
+	is_bind: true
+}
+
+mount {
+    src: "/dev/random"
+    dst: "/dev/random"
+    is_bind: true
+}
+mount {
+    src: "{JOB_DIR}"
+    dst: "/tmp"
+    is_bind: true
+    rw: true
+}
+
+mount {
+    src: "/dev/urandom"
+    dst: "/dev/urandom"
+    is_bind: true
+}
+
+iface_no_lo: true
+
+mount {
+    src: "{BUILD}"
+    dst: "{BUILD}"
+    is_bind: true
+    mandatory: false
+    rw: true
+}
+mount {
+    src: "{CARGO_HOME}"
+    dst: "{CARGO_HOME}"
+    is_bind: true
+    # Readonly 
+    rw: false
+}
+
+mount {
+    src: "{BUILD}/registry"
+    dst: "{CARGO_HOME}/registry"
+    is_bind: true
+    mandatory: true
+    # Read-write
+    rw: true
+}
+
+mount {
+    src: "{BUILD}/git"
+    dst: "{CARGO_HOME}/git"
+    is_bind: true
+    mandatory: true
+    # Read-write
+    rw: true
+}
+
+{DEV}
diff --git a/backend/windmill-worker/nsjail/run.rust.config.proto b/backend/windmill-worker/nsjail/run.rust.config.proto
index 3357cd88a9..d5265f8ddd 100644
--- a/backend/windmill-worker/nsjail/run.rust.config.proto
+++ b/backend/windmill-worker/nsjail/run.rust.config.proto
@@ -104,3 +104,6 @@ mount {
 }
 
 {SHARED_MOUNT}
+
+{DEV}
+
diff --git a/backend/windmill-worker/src/agent_workers.rs b/backend/windmill-worker/src/agent_workers.rs
index 192ae7ae37..f5f5a3b0cc 100644
--- a/backend/windmill-worker/src/agent_workers.rs
+++ b/backend/windmill-worker/src/agent_workers.rs
@@ -1,3 +1,4 @@
+use reqwest::header::HeaderMap;
 use uuid::Uuid;
 use windmill_common::{agent_workers::QueueInitJob, worker::HttpClient};
 use windmill_queue::{JobAndPerms, JobCompleted};
@@ -6,14 +7,21 @@ pub async fn queue_init_job(client: &HttpClient, content: &str) -> anyhow::Resul
     client
         .post(
             "/api/agent_workers/queue_init_job",
+            None,
             &QueueInitJob { content: content.to_string() },
         )
         .await
         .and_then(|x: String| Uuid::parse_str(&x).map_err(|e| anyhow::anyhow!(e)))
 }
 
-pub async fn pull_job(client: &HttpClient) -> anyhow::Result<Option<JobAndPerms>> {
-    client.post("/api/agent_workers/pull_job", &()).await
+pub async fn pull_job(
+    client: &HttpClient,
+    headers: Option<HeaderMap>,
+    body: Option<bool>,
+) -> anyhow::Result<Option<JobAndPerms>> {
+    client
+        .post("/api/agent_workers/pull_job", headers, &body)
+        .await
 }
 
 pub async fn send_result(client: &HttpClient, jc: JobCompleted) -> anyhow::Result<String> {
@@ -23,6 +31,7 @@ pub async fn send_result(client: &HttpClient, jc: JobCompleted) -> anyhow::Resul
                 "/api/w/{}/agent_workers/send_result/{}",
                 jc.job.workspace_id, jc.job.id
             ),
+            None,
             &jc,
         )
         .await
diff --git a/backend/windmill-worker/src/common.rs b/backend/windmill-worker/src/common.rs
index 9955256d13..b419626845 100644
--- a/backend/windmill-worker/src/common.rs
+++ b/backend/windmill-worker/src/common.rs
@@ -492,6 +492,7 @@ pub async fn update_worker_ping_for_failed_init_script(
             if let Err(e) = client
                 .post::<_, ()>(
                     UPDATE_PING_URL,
+                    None,
                     &Ping {
                         last_job_executed: Some(last_job_id),
                         last_job_workspace_id: None,
@@ -728,7 +729,7 @@ async fn get_workspace_s3_resource_path(
     storage: Option<&String>,
 ) -> windmill_common::error::Result<Option<ObjectStoreResource>> {
     use windmill_common::{
-        job_s3_helpers_ee::get_s3_resource_internal, s3_helpers::StorageResourceType,
+        job_s3_helpers_oss::get_s3_resource_internal, s3_helpers::StorageResourceType,
     };
 
     let raw_lfs_opt = if let Some(storage) = storage {
@@ -786,7 +787,7 @@ async fn get_workspace_s3_resource_path(
     get_s3_resource_internal(
         rt,
         s3_resource_value_raw,
-        windmill_common::job_s3_helpers_ee::TokenGenerator::AsClient(client),
+        windmill_common::job_s3_helpers_oss::TokenGenerator::AsClient(client),
         db,
     )
     .await
@@ -1209,8 +1210,8 @@ pub async fn par_install_language_dependencies<'a>(
     }
     #[cfg(all(feature = "enterprise", feature = "parquet"))]
     let is_not_pro = !matches!(
-        windmill_common::ee::get_license_plan().await,
-        windmill_common::ee::LicensePlan::Pro
+        windmill_common::ee_oss::get_license_plan().await,
+        windmill_common::ee_oss::LicensePlan::Pro
     );
     #[cfg(all(feature = "enterprise", feature = "parquet"))]
     if is_not_pro && matches!(install_fn, InstallStrategy::AllAtOnce(_)) {
diff --git a/backend/windmill-worker/src/handle_child.rs b/backend/windmill-worker/src/handle_child.rs
index 3eb9e95dc9..467fac7c60 100644
--- a/backend/windmill-worker/src/handle_child.rs
+++ b/backend/windmill-worker/src/handle_child.rs
@@ -53,7 +53,7 @@ use futures::{
 
 use crate::common::{resolve_job_timeout, OccupancyMetrics};
 use crate::job_logger::{append_job_logs, append_with_limit};
-use crate::job_logger_ee::process_streaming_log_lines;
+use crate::job_logger_oss::process_streaming_log_lines;
 use crate::worker_utils::{ping_job_status, update_worker_ping_from_job};
 use crate::{MAX_RESULT_SIZE, MAX_WAIT_FOR_SIGINT, MAX_WAIT_FOR_SIGTERM};
 
@@ -227,6 +227,7 @@ pub async fn handle_child(
                         if let Err(err) = client
                             .post::<_, ()>(
                                 &format!("/api/agent_workers/set_job_cancelled/{}", job_id),
+                                None,
                                 &JobCancelled {
                                     canceled_by: "timeout".to_string(),
                                     reason: format!("duration > {}", timeout_duration.as_secs()),
diff --git a/backend/windmill-worker/src/job_logger.rs b/backend/windmill-worker/src/job_logger.rs
index f4abd1d0c2..626dfbce44 100644
--- a/backend/windmill-worker/src/job_logger.rs
+++ b/backend/windmill-worker/src/job_logger.rs
@@ -13,10 +13,10 @@ use std::sync::Arc;
 use uuid::Uuid;
 
 #[cfg(not(all(feature = "enterprise", feature = "parquet")))]
-use crate::job_logger_ee::default_disk_log_storage;
+use crate::job_logger_oss::default_disk_log_storage;
 
 #[cfg(all(feature = "enterprise", feature = "parquet"))]
-use crate::job_logger_ee::s3_storage;
+use crate::job_logger_oss::s3_storage;
 
 pub enum CompactLogs {
     #[cfg(not(all(feature = "enterprise", feature = "parquet")))]
diff --git a/backend/windmill-worker/src/job_logger_ee.rs b/backend/windmill-worker/src/job_logger_oss.rs
similarity index 68%
rename from backend/windmill-worker/src/job_logger_ee.rs
rename to backend/windmill-worker/src/job_logger_oss.rs
index 22772878ee..3ee3d29a3a 100644
--- a/backend/windmill-worker/src/job_logger_ee.rs
+++ b/backend/windmill-worker/src/job_logger_oss.rs
@@ -1,13 +1,14 @@
-use std::io;
-use std::sync::atomic::AtomicU32;
-use std::sync::Arc;
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::job_logger_ee::*;
 
-use uuid::Uuid;
-use windmill_common::DB;
+#[cfg(not(feature = "private"))]
+use {
+    crate::job_logger::CompactLogs, std::io, std::sync::atomic::AtomicU32, std::sync::Arc,
+    uuid::Uuid, windmill_common::DB,
+};
 
-use crate::job_logger::CompactLogs;
-
-#[cfg(all(feature = "enterprise", feature = "parquet"))]
+#[cfg(all(feature = "enterprise", feature = "parquet", not(feature = "private")))]
 pub(crate) async fn s3_storage(
     _job_id: &Uuid,
     _w_id: &str,
@@ -19,6 +20,7 @@ pub(crate) async fn s3_storage(
     tracing::info!("Logs length of {_job_id} has exceeded a threshold. Implementation to store excess on s3 in not OSS");
 }
 
+#[cfg(not(feature = "private"))]
 #[allow(dead_code)]
 pub(crate) async fn default_disk_log_storage(
     job_id: &Uuid,
@@ -32,6 +34,7 @@ pub(crate) async fn default_disk_log_storage(
     tracing::info!("Logs length of {job_id} has exceeded a threshold. Implementation to store excess on disk in not OSS");
 }
 
+#[cfg(not(feature = "private"))]
 pub(crate) fn process_streaming_log_lines(
     r: Result<Option<String>, io::Error>,
     _stderr: bool,
diff --git a/backend/windmill-worker/src/lib.rs b/backend/windmill-worker/src/lib.rs
index fa6eb10960..3dfeba5c42 100644
--- a/backend/windmill-worker/src/lib.rs
+++ b/backend/windmill-worker/src/lib.rs
@@ -27,7 +27,9 @@ mod go_executor;
 mod graphql_executor;
 mod handle_child;
 pub mod job_logger;
-mod job_logger_ee;
+#[cfg(feature = "private")]
+pub mod job_logger_ee;
+mod job_logger_oss;
 mod js_eval;
 #[cfg(feature = "mysql")]
 mod mysql_executor;
@@ -35,7 +37,9 @@ mod mysql_executor;
 mod nu_executor;
 #[cfg(feature = "oracledb")]
 mod oracledb_executor;
-mod otel_ee;
+#[cfg(feature = "private")]
+pub mod otel_ee;
+mod otel_oss;
 mod pg_executor;
 #[cfg(feature = "php")]
 mod php_executor;
@@ -53,9 +57,8 @@ mod worker_flow;
 mod worker_lockfiles;
 mod worker_utils;
 
-pub use worker_lockfiles::process_relative_imports;
-
 pub use worker::*;
+pub use worker_lockfiles::process_relative_imports;
 
 pub use result_processor::handle_job_error;
 
diff --git a/backend/windmill-worker/src/otel_ee.rs b/backend/windmill-worker/src/otel_ee.rs
deleted file mode 100644
index 311ffd6355..0000000000
--- a/backend/windmill-worker/src/otel_ee.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-use windmill_queue::MiniPulledJob;
-
-pub fn add_root_flow_job_to_otlp(_queued_job: &MiniPulledJob, _success: bool) {}
diff --git a/backend/windmill-worker/src/otel_oss.rs b/backend/windmill-worker/src/otel_oss.rs
new file mode 100644
index 0000000000..2f65c534b4
--- /dev/null
+++ b/backend/windmill-worker/src/otel_oss.rs
@@ -0,0 +1,9 @@
+#[cfg(feature = "private")]
+#[allow(unused)]
+pub use crate::otel_ee::*;
+
+#[cfg(not(feature = "private"))]
+use windmill_queue::MiniPulledJob;
+
+#[cfg(not(feature = "private"))]
+pub fn add_root_flow_job_to_otlp(_queued_job: &MiniPulledJob, _success: bool) {}
diff --git a/backend/windmill-worker/src/python_executor.rs b/backend/windmill-worker/src/python_executor.rs
index 76ee967656..35815e452c 100644
--- a/backend/windmill-worker/src/python_executor.rs
+++ b/backend/windmill-worker/src/python_executor.rs
@@ -20,7 +20,7 @@ use tokio::{
 };
 use uuid::Uuid;
 #[cfg(all(feature = "enterprise", feature = "parquet", unix))]
-use windmill_common::ee::{get_license_plan, LicensePlan};
+use windmill_common::ee_oss::{get_license_plan, LicensePlan};
 use windmill_common::{
     error::{
         self,
@@ -658,7 +658,7 @@ except BaseException as e:
 
     // Add /tmp/windmill/cache/python_x_y_z/global-site-packages to PYTHONPATH.
     // Usefull if certain wheels needs to be preinstalled before execution.
-    let global_site_packages_path = py_version.to_cache_dir() + "/global-site-packages";
+    let global_site_packages_path = py_version.to_cache_dir(true) + "/global-site-packages";
     let additional_python_paths_folders = {
         let mut paths = additional_python_paths.clone();
         if std::fs::metadata(&global_site_packages_path).is_ok() {
@@ -1489,7 +1489,7 @@ pub async fn handle_python_reqs(
         if req.starts_with('#') || req.starts_with('-') || req.trim().is_empty() {
             continue;
         }
-        let py_prefix = &py_version.to_cache_dir();
+        let py_prefix = &py_version.to_cache_dir(false);
 
         let venv_p = format!(
             "{py_prefix}/{}",
@@ -1740,7 +1740,7 @@ pub async fn handle_python_reqs(
                     tokio::select! {
                         // Cancel was called on the job
                         _ = kill_rx.recv() => return Err(anyhow::anyhow!("S3 pull was canceled")),
-                        pull = pull_from_tar(os, venv_p.clone(), py_version.to_cache_dir_top_level(), None, false) => {
+                        pull = pull_from_tar(os, venv_p.clone(), py_version.to_cache_dir_top_level(false), None, false) => {
                             if let Err(e) = pull {
                                 tracing::info!(
                                     workspace_id = %w_id,
@@ -1891,7 +1891,7 @@ pub async fn handle_python_reqs(
             #[cfg(all(feature = "enterprise", feature = "parquet", unix))]
             if s3_push {
                 if let Some(os) = windmill_common::s3_helpers::get_object_store().await {
-                    tokio::spawn(build_tar_and_push(os, venv_p.clone(), py_version.to_cache_dir_top_level(), None, false));
+                    tokio::spawn(build_tar_and_push(os, venv_p.clone(), py_version.to_cache_dir_top_level(false), None, false));
                 }
             }
 
diff --git a/backend/windmill-worker/src/python_versions.rs b/backend/windmill-worker/src/python_versions.rs
index 26be7aca65..2f12d34dc6 100644
--- a/backend/windmill-worker/src/python_versions.rs
+++ b/backend/windmill-worker/src/python_versions.rs
@@ -153,12 +153,18 @@ impl PyV {
         let valid = all_versions
             .clone()
             .into_iter()
-            .filter(|v| version_specifiers.iter().all(|vs| vs.contains(&*v)))
+            .filter(|v| version_specifiers.iter().all(|vs| (vs).contains(&*v)))
             .collect_vec();
 
         if !valid.is_empty() {
+            let mut result = valid[0].clone();
+            // Is there at least one version specifier that has PATCH digit?
+            let patch_vs = version_specifiers
+                .iter()
+                .any(|vs| vs.version().release().get(2).is_some());
+
             if select_latest {
-                return Ok(valid[0].clone());
+                return Ok(result.clone());
             }
 
             // Usually INSTANCE_PYTHON_VERSION
@@ -183,9 +189,10 @@ impl PyV {
             // - We will iterate until find the closest version to target.
             //   - If closest version has the same MINOR version, use it.
             //   - If it differs in MINOR version, take latest PATCH version.
-            //
-            let mut result = None;
 
+            let [major, minor, ..] = result.release() else {
+                return Err(Error::InternalErr(format!("Failed to parse \"{}\". Available python versions are supposed to be in SEMVER format (MAJOR.MINOR)", *result)));
+            };
             // This represents newest version with oldest MINOR:
             //
             // I Iterable   Newest in MINOR
@@ -195,12 +202,9 @@ impl PyV {
             // 4. 3.10.2 -> 3.10.2
             // 5. 3.10.1 -> 3.10.2
             // 6. 3.10.0 -> 3.10.2
-            let mut newest_in_minor = None;
-            for v in valid.iter() {
-                if result.is_none() {
-                    result.replace(v);
-                }
+            let mut newest_in_minor = (result.clone(), (*major, *minor));
 
+            for v in valid.iter() {
                 if v < &gv {
                     // We will not continue if we start looking into versions older than gravity version.
                     break;
@@ -212,37 +216,46 @@ impl PyV {
 
                 // Since we go top to down we can assume
                 // the first occurence of new minor version contains the latest patch version.
-                if matches!(newest_in_minor, Some((_, mm)) if mm != (major, minor))
-                    || newest_in_minor.is_none()
-                {
-                    newest_in_minor = Some((v.clone(), (major, minor)));
+                if newest_in_minor.1 != (*major, *minor) {
+                    newest_in_minor = (v.clone(), (*major, *minor));
                 }
 
                 if gravity_matcher.contains(v) {
                     // return as soon as gravity matcher has first hit.
-                    return Ok(v.clone());
+                    // Only in case version specifiers do specify PATCH version OR gravity version specify PATCH
+                    if patch_vs || gv.release().get(2).is_some() {
+                        return Ok(v.clone());
+                    } else {
+                        let Some(release_numbers) = v.release().get(0..=1) else {
+                            return Err(Error::InternalErr(format!(
+                                "Failed to get release numbers from: \"{}\". ",
+                                **v
+                            )));
+                        };
+                        return Ok(PyV(pep440_rs::Version::new(release_numbers)));
+                    }
                 }
                 // If we are still in the loop, it means that we are getting closer to gravity version
                 else {
-                    result = Some(v);
+                    result = v.clone();
                 }
             }
 
             let [gravity_major, gravity_minor, ..] = gv.release() else {
-                return Err(Error::internal_err(format!("Cannot get MAJOR or/and MINOR version of python gravity version ({}). Something might be wrong with INSTANCE_PYTHON_VERSION.", &*gv)));
+                return Err(Error::internal_err(format!("Cannot get MAJOR nor MINOR version of python gravity version ({}). Something might be wrong with INSTANCE_PYTHON_VERSION.", &*gv)));
             };
 
-            if let Some((v, mm)) = newest_in_minor {
-                if (gravity_major, gravity_minor) != mm {
-                    return Ok(v);
+            if (*gravity_major, *gravity_minor) != newest_in_minor.1 {
+                // Return full version only if there is PATCH versions in version specifiers
+                if patch_vs {
+                    return Ok(newest_in_minor.0);
+                } else {
+                    let mm = newest_in_minor.1;
+                    return Ok(PyV(pep440_rs::Version::new([mm.0, mm.1])));
                 }
             }
 
-            result
-                .ok_or(Error::internal_err(
-                    "No python candidates found. This is a bug!",
-                ))
-                .map(ToOwned::to_owned)
+            Ok(result)
         } else {
             Err(anyhow!(
                 "
@@ -265,14 +278,24 @@ impl PyV {
             .into())
         }
     }
-    /// e.g.: `/tmp/windmill/cache/python_3xy`
-    pub(crate) fn to_cache_dir(&self) -> String {
+    /// e.g.: `/tmp/windmill/cache/python_3_x_y`
+    pub(crate) fn to_cache_dir(&self, ignore_patch: bool) -> String {
         use windmill_common::worker::ROOT_CACHE_DIR;
-        format!("{ROOT_CACHE_DIR}{}", self.to_cache_dir_top_level())
+        format!(
+            "{ROOT_CACHE_DIR}{}",
+            self.to_cache_dir_top_level(ignore_patch)
+        )
     }
 
     /// e.g.: `python_3_x_y`
-    pub fn to_cache_dir_top_level(&self) -> String {
+    pub fn to_cache_dir_top_level(&self, ignore_patch: bool) -> String {
+        if ignore_patch {
+            if let [major, minor, ..] = self.release() {
+                return format!("python_{major}_{minor}");
+            }
+
+            tracing::warn!("failed to parse python's ({}) top level directory with no patch digit, fallback to full version.", self.to_string());
+        }
         format!("python_{}", self.to_string().replace(".", "_"))
     }
 
@@ -283,6 +306,7 @@ impl PyV {
     ) -> Self {
         let mut err = None;
         let pyv = match INSTANCE_PYTHON_VERSION.read().await.clone() {
+            Some(v) if &v == "default" => PyVAlias::default().into(),
             Some(v) => pep440_rs::Version::from_str(&v).unwrap_or_else(|_| {
                 let v = PyVAlias::default().into();
                 err = Some(format!("\nCannot parse INSTANCE_PYTHON_VERSION ({:?}), fallback to latest_stable ({v:?})", *INSTANCE_PYTHON_VERSION));
@@ -575,7 +599,7 @@ impl PyV {
         // For the default version directory created during startup (main.rs)
         DirBuilder::new()
             .recursive(true)
-            .create(self.to_cache_dir())
+            .create(self.to_cache_dir(false))
             .await
             .expect("could not create initial worker dir");
 
@@ -762,7 +786,7 @@ mod tests {
                 pyv("0.9.3"),
                 pyv("0.9.2"),
             ],
-            pyv("0.9.4"), //
+            pyv("0.9"), //
         )
         .await;
     }
@@ -785,7 +809,7 @@ mod tests {
                 pyv("0.8.1"),
                 pyv("0.8.0"),
             ],
-            pyv("1.0.2"), //
+            pyv("1.0"), //
         )
         .await;
     }
@@ -824,7 +848,7 @@ mod tests {
                 pyv("2.2.1"),
                 pyv("2.2.0"),
             ],
-            pyv("2.2.2"),
+            pyv("2.2"),
         )
         .await;
     }
@@ -845,4 +869,151 @@ mod tests {
         )
         .await;
     }
+    #[tokio::test]
+    async fn test_python_resolution_8() {
+        assert_resolution(
+            "2.2",
+            false,
+            vec![">2.2", ">=2.4", "<2.4.1"],
+            vec![
+                pyv("2.4.1"),
+                pyv("2.4.0"),
+                pyv("2.3.1"),
+                pyv("2.3.0"),
+                pyv("2.2.1"),
+                pyv("2.2.0"),
+                pyv("2.1.1"),
+                pyv("2.1.0"),
+            ],
+            pyv("2.4.0"),
+        )
+        .await;
+    }
+    #[tokio::test]
+    async fn test_python_resolution_9() {
+        assert_resolution(
+            "2.2",
+            true,
+            vec![">2.2", ">2.3", "<2.4.1"],
+            vec![
+                pyv("2.4.1"),
+                pyv("2.4.0"),
+                pyv("2.3.1"),
+                pyv("2.3.0"),
+                pyv("2.2.1"),
+                pyv("2.2.0"),
+                pyv("2.1.1"),
+                pyv("2.1.0"),
+            ],
+            pyv("2.4.0"),
+        )
+        .await;
+    }
+    #[tokio::test]
+    async fn test_python_resolution_10() {
+        assert_resolution(
+            "2.2",
+            false,
+            vec![">2.2", ">=2.4"],
+            vec![
+                pyv("2.4.1"),
+                pyv("2.4.0"),
+                pyv("2.3.1"),
+                pyv("2.3.0"),
+                pyv("2.2.1"),
+                pyv("2.2.0"),
+                pyv("2.1.1"),
+                pyv("2.1.0"),
+            ],
+            // vec![pyv("2.4.1"), pyv("2.3"), pyv("2.2"), pyv("2.1")],
+            pyv("2.4"),
+        )
+        .await;
+    }
+    #[tokio::test]
+    async fn test_python_resolution_11() {
+        assert_resolution(
+            "2.4.1",
+            false,
+            vec![">2.2", ">=2.3", "<2.4"],
+            vec![
+                pyv("2.4.1"),
+                pyv("2.4.0"),
+                pyv("2.3.1"),
+                pyv("2.3.0"),
+                pyv("2.2.1"),
+                pyv("2.2.0"),
+                pyv("2.1.1"),
+                pyv("2.1.0"),
+            ],
+            // vec![pyv("2.4.1"), pyv("2.3"), pyv("2.2"), pyv("2.1")],
+            pyv("2.3"),
+        )
+        .await;
+    }
+    #[tokio::test]
+    async fn test_python_resolution_12() {
+        assert_resolution(
+            "2.3",
+            false,
+            vec![">2.2", ">=2.3", "<2.4"],
+            vec![
+                pyv("2.4.1"),
+                pyv("2.4.0"),
+                pyv("2.3.1"),
+                pyv("2.3.0"),
+                pyv("2.2.1"),
+                pyv("2.2.0"),
+                pyv("2.1.1"),
+                pyv("2.1.0"),
+            ],
+            // vec![pyv("2.4.1"), pyv("2.3"), pyv("2.2"), pyv("2.1")],
+            pyv("2.3"),
+        )
+        .await;
+    }
+    #[tokio::test]
+    async fn test_python_resolution_13() {
+        assert_resolution(
+            "2.3.1",
+            false,
+            vec![">2.2", ">=2.3", "<2.4"],
+            vec![
+                pyv("2.4.1"),
+                pyv("2.4.0"),
+                pyv("2.3.1"),
+                pyv("2.3.0"),
+                pyv("2.2.1"),
+                pyv("2.2.0"),
+                pyv("2.1.1"),
+                pyv("2.1.0"),
+            ],
+            // vec![pyv("2.4.1"), pyv("2.3"), pyv("2.2"), pyv("2.1")],
+            pyv("2.3.1"),
+        )
+        .await;
+    }
+    #[tokio::test]
+    async fn test_python_resolution_14() {
+        assert_resolution(
+            "2.3.0",
+            false,
+            vec![],
+            vec![pyv("2.4.1"), pyv("2.4.0"), pyv("2.3.1")],
+            pyv("2.3.1"),
+        )
+        .await;
+    }
+
+    #[tokio::test]
+    async fn test_python_resolution_16() {
+        assert_resolution(
+            "2.3",
+            false,
+            vec![],
+            vec![pyv("2.4.1"), pyv("2.4.0"), pyv("2.3.1")],
+            pyv("2.3"),
+        )
+        .await;
+    }
 }
diff --git a/backend/windmill-worker/src/result_processor.rs b/backend/windmill-worker/src/result_processor.rs
index 342c53a301..5056851389 100644
--- a/backend/windmill-worker/src/result_processor.rs
+++ b/backend/windmill-worker/src/result_processor.rs
@@ -12,7 +12,7 @@ use std::{
 };
 use tracing::{field, Instrument};
 #[cfg(not(feature = "otel"))]
-use windmill_common::otel_ee::FutureExt;
+use windmill_common::otel_oss::FutureExt;
 
 use uuid::Uuid;
 
@@ -32,7 +32,7 @@ use windmill_queue::{
     append_logs, get_queued_job, CanceledBy, JobCompleted, MiniPulledJob, WrappedError,
 };
 
-use serde_json::{json, value::RawValue};
+use serde_json::{json, value::RawValue, Value};
 
 use tokio::task::JoinHandle;
 
@@ -41,10 +41,10 @@ use windmill_queue::{add_completed_job, add_completed_job_error};
 use crate::{
     bash_executor::ANSI_ESCAPE_RE,
     common::{error_to_value, read_result, save_in_cache},
-    otel_ee::add_root_flow_job_to_otlp,
+    otel_oss::add_root_flow_job_to_otlp,
     worker_flow::update_flow_status_after_job_completion,
     JobCompletedReceiver, JobCompletedSender, SameWorkerSender, SendResult, UpdateFlow,
-    INIT_SCRIPT_TAG,
+    INIT_SCRIPT_TAG, SAME_WORKER_REQUIREMENTS,
 };
 use windmill_common::client::AuthedClient;
 
@@ -54,7 +54,7 @@ async fn process_jc(
     base_internal_url: &str,
     db: &DB,
     worker_dir: &str,
-    same_worker_tx: &SameWorkerSender,
+    same_worker_tx: Option<&SameWorkerSender>,
     job_completed_sender: &JobCompletedSender,
     #[cfg(feature = "benchmark")] bench: &mut BenchmarkIter,
 ) {
@@ -76,7 +76,7 @@ async fn process_jc(
     } else {
         jc.job.id
     };
-    windmill_common::otel_ee::set_span_parent(&span, &rj);
+    windmill_common::otel_oss::set_span_parent(&span, &rj);
 
     if let Some(lg) = jc.job.script_lang.as_ref() {
         span.record("language", lg.as_str());
@@ -104,8 +104,8 @@ async fn process_jc(
         jc,
         &base_internal_url,
         &db,
-        &worker_dir,
-        &same_worker_tx,
+        worker_dir,
+        same_worker_tx,
         &worker_name,
         job_completed_sender.clone(),
         #[cfg(feature = "benchmark")]
@@ -119,6 +119,11 @@ async fn process_jc(
     }
 }
 
+enum JobCompletedRx {
+    JobCompleted(SendResult),
+    Killpill,
+}
+
 pub fn start_background_processor(
     job_completed_rx: JobCompletedReceiver,
     job_completed_sender: JobCompletedSender,
@@ -140,10 +145,6 @@ pub fn start_background_processor(
         #[cfg(feature = "benchmark")]
         let mut infos = BenchmarkInfo::new();
 
-        enum JobCompletedRx {
-            JobCompleted(SendResult),
-            Killpill,
-        }
         //if we have been killed, we want to drain the queue of jobs
         while let Some(sr) = {
             if has_been_killed && same_worker_queue_size.load(Ordering::SeqCst) == 0 {
@@ -186,7 +187,7 @@ pub fn start_background_processor(
                         &base_internal_url,
                         &db,
                         &worker_dir,
-                        &same_worker_tx,
+                        Some(&same_worker_tx),
                         &job_completed_sender,
                         #[cfg(feature = "benchmark")]
                         &mut bench,
@@ -229,19 +230,19 @@ pub fn start_background_processor(
                     tracing::info!(parent_flow = %flow, "updating flow status");
                     if let Err(e) = update_flow_status_after_job_completion(
                         &db,
-                        &AuthedClient {
-                            base_internal_url: base_internal_url.to_string(),
-                            workspace: w_id.clone(),
-                            token: token.clone(),
-                            force_client: None,
-                        },
+                        &AuthedClient::new(
+                            base_internal_url.to_string(),
+                            w_id.clone(),
+                            token.clone(),
+                            None,
+                        ),
                         flow,
                         &Uuid::nil(),
                         &w_id,
                         success,
                         Arc::new(result),
                         true,
-                        same_worker_tx.clone(),
+                        &same_worker_tx,
                         &worker_dir,
                         stop_early_override,
                         &worker_name,
@@ -276,7 +277,7 @@ pub fn start_background_processor(
 async fn send_job_completed(job_completed_tx: JobCompletedSender, jc: JobCompleted) {
     job_completed_tx
         .send_job(jc, true)
-        .with_context(windmill_common::otel_ee::otel_ctx())
+        .with_context(windmill_common::otel_oss::otel_ctx())
         .await
         .expect("send job completed")
 }
@@ -312,7 +313,7 @@ pub async fn process_result(
                     duration,
                 },
             )
-            .with_context(windmill_common::otel_ee::otel_ctx())
+            .with_context(windmill_common::otel_oss::otel_ctx())
             .await;
             Ok(true)
         }
@@ -374,7 +375,7 @@ pub async fn process_result(
                     duration,
                 },
             )
-            .with_context(windmill_common::otel_ee::otel_ctx())
+            .with_context(windmill_common::otel_oss::otel_ctx())
             .await;
             Ok(false)
         }
@@ -386,23 +387,19 @@ pub async fn handle_receive_completed_job(
     base_internal_url: &str,
     db: &DB,
     worker_dir: &str,
-    same_worker_tx: &SameWorkerSender,
+    same_worker_tx: Option<&SameWorkerSender>,
     worker_name: &str,
     job_completed_tx: JobCompletedSender,
     #[cfg(feature = "benchmark")] bench: &mut BenchmarkIter,
 ) -> Option<Arc<MiniPulledJob>> {
     let token = jc.token.clone();
     let workspace = jc.job.workspace_id.clone();
-    let client = AuthedClient {
-        base_internal_url: base_internal_url.to_string(),
-        workspace,
-        token,
-        force_client: None,
-    };
+    let client = AuthedClient::new(base_internal_url.to_string(), workspace, token, None);
     let job = jc.job.clone();
     let mem_peak = jc.mem_peak.clone();
     let canceled_by = jc.canceled_by.clone();
-    match process_completed_job(
+
+    let processed_completed_job = process_completed_job(
         jc,
         &client,
         db,
@@ -413,8 +410,9 @@ pub async fn handle_receive_completed_job(
         #[cfg(feature = "benchmark")]
         bench,
     )
-    .await
-    {
+    .await;
+
+    match processed_completed_job {
         Err(err) => {
             handle_job_error(
                 db,
@@ -454,7 +452,7 @@ pub async fn process_completed_job(
     client: &AuthedClient,
     db: &DB,
     worker_dir: &str,
-    same_worker_tx: SameWorkerSender,
+    same_worker_tx: Option<&SameWorkerSender>,
     worker_name: &str,
     job_completed_tx: JobCompletedSender,
     #[cfg(feature = "benchmark")] bench: &mut BenchmarkIter,
@@ -530,7 +528,7 @@ pub async fn process_completed_job(
                     true,
                     result,
                     false,
-                    same_worker_tx.clone(),
+                    &same_worker_tx.expect(SAME_WORKER_REQUIREMENTS).to_owned(),
                     &worker_dir,
                     None,
                     worker_name,
@@ -570,7 +568,7 @@ pub async fn process_completed_job(
                     false,
                     Arc::new(serde_json::value::to_raw_value(&result).unwrap()),
                     false,
-                    same_worker_tx,
+                    &same_worker_tx.expect(SAME_WORKER_REQUIREMENTS).to_owned(),
                     &worker_dir,
                     None,
                     worker_name,
@@ -587,6 +585,34 @@ pub async fn process_completed_job(
     return Ok(None);
 }
 
+async fn handle_non_flow_job_error(
+    db: &DB,
+    job: &MiniPulledJob,
+    mem_peak: i32,
+    canceled_by: Option<CanceledBy>,
+    err: Value,
+    worker_name: &str,
+) -> Result<WrappedError, Error> {
+    append_logs(
+        &job.id,
+        &job.workspace_id,
+        format!("Unexpected error during job execution:\n{err:#?}"),
+        &db.into(),
+    )
+    .await;
+    add_completed_job_error(
+        db,
+        job,
+        mem_peak,
+        canceled_by,
+        err,
+        worker_name,
+        false,
+        None,
+    )
+    .await
+}
+
 #[tracing::instrument(name = "job_error", level = "info", skip_all, fields(job_id = %job.id))]
 pub async fn handle_job_error(
     db: &DB,
@@ -596,7 +622,7 @@ pub async fn handle_job_error(
     canceled_by: Option<CanceledBy>,
     err: Error,
     unrecoverable: bool,
-    same_worker_tx: SameWorkerSender,
+    same_worker_tx: Option<&SameWorkerSender>,
     worker_dir: &str,
     worker_name: &str,
     job_completed_tx: JobCompletedSender,
@@ -605,22 +631,13 @@ pub async fn handle_job_error(
     let err = error_to_value(err);
 
     let update_job_future = || async {
-        append_logs(
-            &job.id,
-            &job.workspace_id,
-            format!("Unexpected error during job execution:\n{err:#?}"),
-            &db.into(),
-        )
-        .await;
-        add_completed_job_error(
+        handle_non_flow_job_error(
             db,
             job,
             mem_peak,
             canceled_by.clone(),
             err.clone(),
             worker_name,
-            false,
-            None,
         )
         .await
     };
@@ -649,7 +666,7 @@ pub async fn handle_job_error(
             false,
             Arc::new(serde_json::value::to_raw_value(&wrapped_error).unwrap()),
             unrecoverable,
-            same_worker_tx,
+            &same_worker_tx.expect(SAME_WORKER_REQUIREMENTS).clone(),
             worker_dir,
             None,
             worker_name,
diff --git a/backend/windmill-worker/src/rust_executor.rs b/backend/windmill-worker/src/rust_executor.rs
index 1a6a93ecca..045158511e 100644
--- a/backend/windmill-worker/src/rust_executor.rs
+++ b/backend/windmill-worker/src/rust_executor.rs
@@ -4,7 +4,11 @@ use uuid::Uuid;
 use windmill_parser_rust::parse_rust_deps_into_manifest;
 
 use itertools::Itertools;
-use tokio::{fs::File, io::AsyncReadExt, process::Command};
+use tokio::{
+    fs::{create_dir_all, File},
+    io::AsyncReadExt,
+    process::Command,
+};
 use windmill_common::{
     error::{self, Error},
     utils::calculate_hash,
@@ -19,8 +23,8 @@ use crate::{
         read_result, start_child_process, OccupancyMetrics,
     },
     handle_child::handle_child,
-    DISABLE_NSJAIL, DISABLE_NUSER, HOME_ENV, NSJAIL_PATH, PATH_ENV, PROXY_ENVS,
-    RUST_CACHE_DIR, TZ_ENV,
+    DISABLE_NSJAIL, DISABLE_NUSER, HOME_ENV, NSJAIL_PATH, PATH_ENV, PROXY_ENVS, RUST_CACHE_DIR,
+    TZ_ENV,
 };
 use windmill_common::client::AuthedClient;
 
@@ -28,12 +32,18 @@ use windmill_common::client::AuthedClient;
 use crate::SYSTEM_ROOT;
 
 const NSJAIL_CONFIG_RUN_RUST_CONTENT: &str = include_str!("../nsjail/run.rust.config.proto");
+const NSJAIL_CONFIG_COMPILE_RUST_CONTENT: &str =
+    include_str!("../nsjail/download.rust.config.proto");
 
 lazy_static::lazy_static! {
     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 = std::env::var("CARGO_PATH").unwrap_or_else(|_| format!("{}/bin/cargo", CARGO_HOME.as_str()));
+    // static ref CARGO_SWEEP_PATH: String = std::env::var("CARGO_SWEEP_PATH").unwrap_or_else(|_| format!("{}/bin/cargo-sweep", CARGO_HOME.as_str()));
+    static ref SWEEP_MAXSIZE: String = std::env::var("CARGO_SWEEP_MAXSIZE").unwrap_or("25GB".to_owned());
+    static ref NO_SHARED_BUILD_DIR: bool = std::env::var("RUST_NO_SHARED_BUILD_DIR").ok().map(|flag| flag == "true").unwrap_or(false);
+
 }
 
 #[cfg(windows)]
@@ -42,7 +52,21 @@ lazy_static::lazy_static! {
     static ref RUSTUP_HOME_DEFAULT: String = format!("{}\\.rustup", *HOME_DIR);
 }
 
-#[cfg(unix)]
+#[cfg(debug_assertions)]
+const DEV_CONF_NSJAIL: &'static str = r#"
+# Mount nix store for nixos to work properly
+mount {
+    src: "/nix/store"
+    dst: "/nix/store"
+    is_bind: true
+    mandatory: false
+}
+"#;
+
+#[cfg(not(debug_assertions))]
+const DEV_CONF_NSJAIL: &'static str = "";
+
+#[cfg(not(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);
@@ -176,54 +200,211 @@ pub async fn generate_cargo_lockfile(
     Ok(req_content)
 }
 
+async fn get_build_dir(
+    job: &MiniPulledJob,
+    job_dir: &str,
+    conn: &Connection,
+    worker_name: &str,
+    is_preview: bool,
+) -> anyhow::Result<String> {
+    let (bd, run_sweep) = job
+        .runnable_path
+        .as_ref()
+        .and_then(|p| {
+            if !is_preview || *NO_SHARED_BUILD_DIR {
+                None
+            } else {
+                if *DISABLE_NSJAIL {
+                    // If nsjail is disabled then entire worker has shared build directory
+                    // It drastically improves cache hit-rate.
+                    Some((format!("{RUST_CACHE_DIR}/build/{worker_name}"), true))
+                } else {
+                    // If nsjail is enabled, having global shared directory is vulnerability and target for an attack
+                    // Instead we either:
+                    // 1. Create different build directory for workspace script and user. Balanced caching while mainining high degree of security.
+                    // 2. If user is not known or something else goes wrong - use random build dir. This is equivalent to no cache at all.
+                    Some((
+                        format!(
+                            "{RUST_CACHE_DIR}/build/{}@{}@{}",
+                            &job.workspace_id,
+                            p.replace('/', "."),
+                            &job.created_by
+                        ),
+                        true,
+                    ))
+                }
+            }
+        })
+        .unwrap_or((format!("{RUST_CACHE_DIR}/build/{}", Uuid::new_v4()), false));
+
+    {
+        let (t, r, g) = (
+            create_dir_all(format!("{}/target", &bd)).await,
+            create_dir_all(format!("{}/registry", &bd)).await,
+            create_dir_all(format!("{}/git", &bd)).await,
+        );
+
+        t.and(r)
+            .and(g)
+            .map_err(|e| anyhow::anyhow!("Could not create build dir for rust.\ne: {e}"))?;
+    }
+
+    if run_sweep {
+        // Also run sweep to make sure target isn't using too much disk
+        let mut sweep_cmd = Command::new(CARGO_PATH.as_str());
+        sweep_cmd
+            .current_dir(job_dir)
+            .env_clear()
+            .env("PATH", PATH_ENV.as_str())
+            .env("CARGO_HOME", CARGO_HOME.as_str())
+            .env("HOME", HOME_ENV.as_str())
+            .env("CARGO_TARGET_DIR", &(bd.clone() + "/target"))
+            .env("RUSTUP_HOME", RUSTUP_HOME.as_str())
+            .args(["sweep", "--maxsize", SWEEP_MAXSIZE.as_str()])
+            .stdout(Stdio::piped())
+            .stderr(Stdio::piped());
+
+        #[cfg(windows)]
+        {
+            sweep_cmd.env("SystemRoot", SYSTEM_ROOT.as_str());
+            sweep_cmd.env(
+                "TMP",
+                std::env::var("TMP").unwrap_or_else(|_| "C:\\tmp".to_string()),
+            );
+            sweep_cmd.env("USERPROFILE", crate::USERPROFILE_ENV.as_str());
+        }
+
+        let (job_id, conn, w_id, wk_name) = (
+            job.id.clone(),
+            conn.clone(),
+            job.workspace_id.clone(),
+            worker_name.to_owned(),
+        );
+
+        tokio::spawn(async move {
+            if let Err(e) = match start_child_process(sweep_cmd, CARGO_PATH.as_str()).await {
+                Ok(sweep_process) => {
+                    handle_child(
+                        &job_id,
+                        &conn,
+                        &mut 0,
+                        &mut None,
+                        sweep_process,
+                        false,
+                        &wk_name,
+                        &w_id,
+                        "cargo sweep",
+                        None,
+                        false,
+                        &mut None,
+                        None,
+                    )
+                    .await
+                }
+                Err(e) => Err(e),
+            } {
+                tracing::warn!(
+                    workspace_id = %w_id,
+                    job_id = %job_id,
+                    "Failed to run `cargo sweep`. Rust cache may grow over time, cargo sweep is meant to clean up unused cache.\ne: {e}\n"
+                );
+            }
+        });
+    }
+    Ok(bd)
+}
+
 pub async fn build_rust_crate(
-    job_id: &Uuid,
+    job: &MiniPulledJob,
     mem_peak: &mut i32,
     canceled_by: &mut Option<CanceledBy>,
     job_dir: &str,
     conn: &Connection,
     worker_name: &str,
-    w_id: &str,
     base_internal_url: &str,
     hash: &str,
     occupancy_metrics: &mut OccupancyMetrics,
+    is_preview: bool,
 ) -> error::Result<String> {
     let bin_path = format!("{}/{hash}", RUST_CACHE_DIR);
 
-    let mut build_rust_cmd = Command::new(CARGO_PATH.as_str());
-    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())
-        .env("CARGO_HOME", CARGO_HOME.as_str())
-        .env("RUSTUP_HOME", RUSTUP_HOME.as_str())
-        .args(vec!["build", "--release"])
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped());
+    let build_dir = get_build_dir(job, job_dir, conn, worker_name, is_preview).await?;
 
-    #[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()),
-        );
-        build_rust_cmd.env("USERPROFILE", crate::USERPROFILE_ENV.as_str());
-    }
+    let child = if !*DISABLE_NSJAIL {
+        let _ = write_file(
+            job_dir,
+            "download.config.proto",
+            &NSJAIL_CONFIG_COMPILE_RUST_CONTENT
+                .replace("{JOB_DIR}", job_dir)
+                .replace("{CACHE_DIR}", RUST_CACHE_DIR)
+                .replace("{CARGO_HOME}", CARGO_HOME.as_str())
+                .replace("{DEV}", DEV_CONF_NSJAIL)
+                .replace("{BUILD}", &build_dir),
+        )?;
+        let mut nsjail_cmd = Command::new(NSJAIL_PATH.as_str());
+        nsjail_cmd
+            .current_dir(job_dir)
+            .env_clear()
+            .env("PATH", PATH_ENV.as_str())
+            .env("TZ", TZ_ENV.as_str())
+            .env("BASE_INTERNAL_URL", base_internal_url)
+            .envs(PROXY_ENVS.clone())
+            .env("HOME", HOME_ENV.as_str())
+            .env("CARGO_HOME", CARGO_HOME.as_str())
+            .env("RUSTUP_HOME", RUSTUP_HOME.as_str())
+            .env("CARGO_TARGET_DIR", &(build_dir.clone() + "/target"))
+            .args(vec![
+                "--config",
+                "download.config.proto",
+                "--",
+                CARGO_PATH.as_ref(),
+                "build",
+            ])
+            .stdout(Stdio::piped())
+            .stderr(Stdio::piped());
+        if !is_preview {
+            nsjail_cmd.arg("--release");
+        }
+        start_child_process(nsjail_cmd, NSJAIL_PATH.as_str()).await?
+    } else {
+        let mut build_rust_cmd = Command::new(CARGO_PATH.as_str());
+        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())
+            .env("CARGO_HOME", CARGO_HOME.as_str())
+            .env("RUSTUP_HOME", RUSTUP_HOME.as_str())
+            .env("CARGO_TARGET_DIR", &(build_dir.clone() + "/target"))
+            .args(vec!["build"])
+            .stdout(Stdio::piped())
+            .stderr(Stdio::piped());
 
-    let build_rust_process = start_child_process(build_rust_cmd, CARGO_PATH.as_str()).await?;
+        if !is_preview {
+            build_rust_cmd.arg("--release");
+        }
+        #[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()),
+            );
+            build_rust_cmd.env("USERPROFILE", crate::USERPROFILE_ENV.as_str());
+        }
+        start_child_process(build_rust_cmd, CARGO_PATH.as_str()).await?
+    };
     handle_child(
-        job_id,
+        &job.id,
         conn,
         mem_peak,
         canceled_by,
-        build_rust_process,
+        child,
         false,
         worker_name,
-        w_id,
+        &job.workspace_id,
         "rust build",
         None,
         false,
@@ -231,16 +412,19 @@ pub async fn build_rust_crate(
         None,
     )
     .await?;
-    append_logs(job_id, w_id, "\n\n", conn).await;
+    append_logs(&job.id, &job.workspace_id, "\n\n", conn).await;
 
     tokio::fs::copy(
-        &format!("{job_dir}/target/release/main"),
+        &format!(
+            "{build_dir}/target/{}/main",
+            if is_preview { "debug" } else { "release" },
+        ),
         format! {"{job_dir}/main"},
     )
     .await
     .map_err(|e| {
         Error::ExecutionErr(format!(
-            "could not copy built binary from [...]/target/release/main to {job_dir}/main: {e:?}"
+            "could not copy built binary from [...]/target/.../main to {job_dir}/main: {e:?}"
         ))
     })?;
 
@@ -298,6 +482,9 @@ pub async fn handle_rust_job(
     let bin_path = format!("{}/{hash}", RUST_CACHE_DIR);
     let remote_path = format!("{RUST_OBJECT_STORE_PREFIX}{hash}");
 
+    let reserved_variables =
+        get_reserved_variables(job, &client.token, conn, parent_runnable_path).await?;
+
     let (cache, cache_logs) =
         windmill_common::worker::load_cache(&bin_path, &remote_path, false).await;
 
@@ -332,16 +519,16 @@ pub async fn handle_rust_job(
         create_args_and_out_file(client, job, job_dir, conn).await?;
 
         build_rust_crate(
-            &job.id,
+            &job,
             mem_peak,
             canceled_by,
             job_dir,
             conn,
             worker_name,
-            &job.workspace_id,
             base_internal_url,
             &hash,
             occupancy_metrics,
+            requirements_o.is_none(),
         )
         .await?
     };
@@ -349,9 +536,6 @@ pub async fn handle_rust_job(
     let logs2 = format!("{cache_logs}\n\n--- RUST CODE EXECUTION ---\n");
     append_logs(&job.id, &job.workspace_id, logs2, conn).await;
 
-    let reserved_variables =
-        get_reserved_variables(job, &client.token, conn, parent_runnable_path).await?;
-
     let child = if !*DISABLE_NSJAIL {
         let _ = write_file(
             job_dir,
@@ -361,6 +545,7 @@ pub async fn handle_rust_job(
                 .replace("{CACHE_DIR}", RUST_CACHE_DIR)
                 .replace("{CACHE_HASH}", &hash)
                 .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string())
+                .replace("{DEV}", DEV_CONF_NSJAIL)
                 .replace("{SHARED_MOUNT}", shared_mount),
         )?;
         let mut nsjail_cmd = Command::new(NSJAIL_PATH.as_str());
diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index e15c24ef70..56ac7c00e0 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -18,23 +18,23 @@ use windmill_common::{
     cache::{future::FutureCachedExt, ScriptData, ScriptMetadata},
     schema::{should_validate_schema, SchemaValidator},
     scripts::PREVIEW_IS_TAR_CODEBASE_HASH,
-    utils::WarnAfterExt,
+    utils::{create_directory_async, WarnAfterExt},
     worker::{
-        write_file, Connection, HttpClient, MAX_TIMEOUT, ROOT_CACHE_DIR, ROOT_CACHE_NOMOUNT_DIR,
-        TMP_DIR,
+        make_pull_query, write_file, Connection, HttpClient, MAX_TIMEOUT, ROOT_CACHE_DIR,
+        ROOT_CACHE_NOMOUNT_DIR, TMP_DIR,
     },
     KillpillSender,
 };
 
 #[cfg(feature = "enterprise")]
-use windmill_common::ee::LICENSE_KEY_VALID;
+use windmill_common::ee_oss::LICENSE_KEY_VALID;
 
 use anyhow::Result;
 use const_format::concatcp;
 #[cfg(feature = "prometheus")]
 use prometheus::IntCounter;
 
-use tracing::{field, Instrument};
+use tracing::{field, Instrument, Span};
 #[cfg(feature = "prometheus")]
 use windmill_common::METRICS_DEBUG_ENABLED;
 #[cfg(feature = "prometheus")]
@@ -44,7 +44,7 @@ use serde::{Deserialize, Serialize};
 use sqlx::types::Json;
 use std::{
     collections::HashMap,
-    fs::DirBuilder,
+    fmt::Display,
     sync::{
         atomic::{AtomicBool, AtomicU16, Ordering},
         Arc,
@@ -168,15 +168,10 @@ use windmill_common::bench::{benchmark_init, BenchmarkInfo, BenchmarkIter};
 
 use windmill_common::add_time;
 
-pub const PY310_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "python_310");
-pub const PY311_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "python_311");
-pub const PY312_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "python_312");
-pub const PY313_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "python_313");
-
-pub const TAR_PY310_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "tar/python_310");
-pub const TAR_PY311_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "tar/python_311");
-pub const TAR_PY312_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "tar/python_312");
-pub const TAR_PY313_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "tar/python_313");
+pub const PY310_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "python_3_10");
+pub const PY311_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "python_3_11");
+pub const PY312_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "python_3_12");
+pub const PY313_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "python_3_13");
 
 pub const TAR_JAVA_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "tar/java");
 
@@ -210,6 +205,9 @@ const NUM_SECS_READINGS: u64 = 60;
 
 const INCLUDE_DEPS_PY_SH_CONTENT: &str = include_str!("../nsjail/download_deps.py.sh");
 
+const WORKER_SHELL_NAP_TIME_DURATION: u64 = 15;
+const TIMEOUT_TO_RESET_WORKER_SHELL_NAP_TIME_DURATION: u64 = 2 * 60;
+
 pub const DEFAULT_SLEEP_QUEUE: u64 = 50;
 
 // only 1 native job so that we don't have to worry about concurrency issues on non dedicated native jobs workers
@@ -247,6 +245,8 @@ lazy_static::lazy_static! {
 const DOTNET_DEFAULT_PATH: &str = "C:\\Program Files\\dotnet\\dotnet.exe";
 #[cfg(unix)]
 const DOTNET_DEFAULT_PATH: &str = "/usr/bin/dotnet";
+pub const SAME_WORKER_REQUIREMENTS: &'static str =
+    "SameWorkerSender is required because this job may be part of a flow";
 
 lazy_static::lazy_static! {
 
@@ -391,6 +391,31 @@ lazy_static::lazy_static! {
     pub static ref WIN_ENVS: Envs = vec![];
 }
 
+#[derive(Debug)]
+pub enum NextJob {
+    Sql(PulledJob),
+    Http(JobAndPerms),
+}
+
+impl NextJob {
+    pub fn job(self) -> MiniPulledJob {
+        match self {
+            NextJob::Sql(job) => job.job,
+            NextJob::Http(job) => job.job,
+        }
+    }
+}
+
+impl std::ops::Deref for NextJob {
+    type Target = MiniPulledJob;
+    fn deref(&self) -> &Self::Target {
+        match self {
+            NextJob::Sql(job) => &job.job,
+            NextJob::Http(job) => &job.job,
+        }
+    }
+}
+
 //only matter if CLOUD_HOSTED
 pub const MAX_RESULT_SIZE: usize = 1024 * 1024 * 2; // 2MB
 
@@ -431,20 +456,26 @@ impl JobCompletedReceiver {
 }
 
 impl JobCompletedSender {
+    pub fn new_job_completed_sender_sql(buffer_size: u8) -> (Self, JobCompletedReceiver) {
+        let (sender, receiver) = flume::bounded::<SendResult>(buffer_size as usize);
+        let (unbounded_sender, unbounded_rx) = flume::unbounded::<SendResult>();
+        let (killpill_tx, killpill_rx) = broadcast::channel::<()>(10);
+        (
+            Self::Sql(SqlJobCompletedSender { sender, unbounded_sender, killpill_tx }),
+            JobCompletedReceiver { bounded_rx: receiver, killpill_rx, unbounded_rx },
+        )
+    }
+
     pub fn new(conn: &Connection, buffer_size: u8) -> (Self, Option<JobCompletedReceiver>) {
         match conn {
             Connection::Sql(_) => {
-                let (sender, receiver) = flume::bounded::<SendResult>(buffer_size as usize);
-                let (unbounded_sender, unbounded_rx) = flume::unbounded::<SendResult>();
-                let (killpill_tx, killpill_rx) = broadcast::channel::<()>(10);
-                (
-                    Self::Sql(SqlJobCompletedSender { sender, unbounded_sender, killpill_tx }),
-                    Some(JobCompletedReceiver { bounded_rx: receiver, killpill_rx, unbounded_rx }),
-                )
+                let result = Self::new_job_completed_sender_sql(buffer_size);
+                (result.0, Some(result.1))
             }
             Connection::Http(client) => (Self::Http(client.clone()), None),
         }
     }
+
     pub fn new_never_used() -> (Self, Option<Receiver<SendResult>>) {
         (Self::NeverUsed, None)
     }
@@ -622,6 +653,233 @@ fn add_outstanding_wait_time(
     }
 }
 
+async fn extract_job_and_perms(job: NextJob, conn: &Connection) -> JobAndPerms {
+    match (job, conn) {
+        (NextJob::Sql(job), Connection::Sql(db)) => job.get_job_and_perms(db).await,
+        (NextJob::Sql(_), Connection::Http(_)) => panic!("sql job on http connection"),
+        (NextJob::Http(job), _) => job,
+    }
+}
+
+fn create_span(arc_job: &Arc<MiniPulledJob>, worker_name: &str, hostname: &str) -> Span {
+    let span = tracing::span!(tracing::Level::INFO, "job",
+        job_id = %arc_job.id, root_job = field::Empty, workspace_id = %arc_job.workspace_id,  worker = %worker_name, hostname = %hostname, tag = %arc_job.tag,
+        language = field::Empty,
+        script_path = field::Empty, flow_step_id = field::Empty, parent_job = field::Empty,
+        otel.name = field::Empty);
+
+    let rj = arc_job.flow_innermost_root_job.unwrap_or(arc_job.id);
+
+    if let Some(lg) = arc_job.script_lang.as_ref() {
+        span.record("language", lg.as_str());
+    }
+    if let Some(step_id) = arc_job.flow_step_id.as_ref() {
+        span.record("otel.name", format!("job {}", step_id).as_str());
+        span.record("flow_step_id", step_id.as_str());
+    } else {
+        span.record("otel.name", "job");
+    }
+    if let Some(parent_job) = arc_job.parent_job.as_ref() {
+        span.record("parent_job", parent_job.to_string().as_str());
+    }
+    if let Some(script_path) = arc_job.runnable_path.as_ref() {
+        span.record("script_path", script_path.as_str());
+    }
+    if let Some(root_job) = arc_job.flow_innermost_root_job.as_ref() {
+        span.record("root_job", root_job.to_string().as_str());
+    }
+
+    windmill_common::otel_oss::set_span_parent(&span, &rj);
+    span
+}
+
+pub async fn handle_all_job_kind_error(
+    conn: &Connection,
+    authed_client: &AuthedClient,
+    job: Arc<MiniPulledJob>,
+    err: Error,
+    same_worker_tx: Option<&SameWorkerSender>,
+    worker_dir: &str,
+    worker_name: &str,
+    job_completed_tx: JobCompletedSender,
+    #[cfg(feature = "benchmark")] bench: &mut BenchmarkIter,
+) {
+    match conn {
+        Connection::Sql(db) => {
+            handle_job_error(
+                db,
+                authed_client,
+                job.as_ref(),
+                0,
+                None,
+                err,
+                false,
+                same_worker_tx,
+                &worker_dir,
+                &worker_name,
+                job_completed_tx.clone(),
+                #[cfg(feature = "benchmark")]
+                bench,
+            )
+            .await;
+        }
+        Connection::Http(_) => {
+            job_completed_tx
+                .send_job(
+                    JobCompleted {
+                        preprocessed_args: None,
+                        job: job.clone(),
+                        result: Arc::new(windmill_common::worker::to_raw_value(&error_to_value(
+                            err,
+                        ))),
+                        result_columns: None,
+                        mem_peak: 0,
+                        canceled_by: None,
+                        success: false,
+                        cached_res_path: None,
+                        token: authed_client.token.clone(),
+                        duration: None,
+                    },
+                    false,
+                )
+                .await
+                .expect("send job completed");
+        }
+    }
+}
+
+pub fn start_interactive_worker_shell(
+    conn: Connection,
+    hostname: String,
+    worker_name: String,
+    mut killpill_rx: tokio::sync::broadcast::Receiver<()>,
+    job_completed_tx: JobCompletedSender,
+    base_internal_url: String,
+    worker_dir: String,
+) -> JoinHandle<()> {
+    tokio::spawn(async move {
+        let mut occupancy_metrics = OccupancyMetrics::new(Instant::now());
+
+        let mut last_executed_job: Option<Instant> =
+            Instant::now().checked_sub(Duration::from_millis(2500));
+
+        loop {
+            if let Ok(_) = killpill_rx.try_recv() {
+                break;
+            } else {
+                let pulled_job = match &conn {
+                    Connection::Sql(db) => {
+                        let query = ("".to_string(), make_pull_query(&[hostname.to_owned()]));
+
+                        #[cfg(feature = "benchmark")]
+                        let mut bench = windmill_common::bench::BenchmarkIter::new();
+                        let job = pull(
+                            &db,
+                            false,
+                            &worker_name,
+                            Some(&query),
+                            #[cfg(feature = "benchmark")]
+                            &mut bench,
+                        )
+                        .await;
+
+                        job.map(|x| x.job.map(NextJob::Sql))
+                    }
+                    Connection::Http(client) => {
+                        crate::agent_workers::pull_job(&client, None, Some(true))
+                            .await
+                            .map_err(|e| error::Error::InternalErr(e.to_string()))
+                            .map(|x| x.map(|y| NextJob::Http(y)))
+                    }
+                };
+
+                match pulled_job {
+                    Ok(Some(job)) => {
+                        tracing::debug!(worker = %worker_name, hostname = %hostname, "started handling of job {}", job.id);
+
+                        let job_dir = create_job_dir(&worker_dir, job.id).await;
+                        #[cfg(feature = "benchmark")]
+                        let mut bench = windmill_common::bench::BenchmarkIter::new();
+
+                        let JobAndPerms {
+                            job,
+                            raw_code,
+                            raw_lock,
+                            raw_flow,
+                            parent_runnable_path,
+                            token,
+                            precomputed_agent_info: precomputed_bundle,
+                        } = extract_job_and_perms(job, &conn).await;
+
+                        let authed_client = AuthedClient::new(
+                            base_internal_url.to_owned(),
+                            job.workspace_id.clone(),
+                            token,
+                            None,
+                        );
+
+                        let arc_job = Arc::new(job);
+
+                        let _ = handle_queued_job(
+                            arc_job.clone(),
+                            raw_code,
+                            raw_lock,
+                            raw_flow,
+                            parent_runnable_path,
+                            &conn,
+                            &authed_client,
+                            &hostname,
+                            &worker_name,
+                            &worker_dir,
+                            &job_dir,
+                            None,
+                            &base_internal_url,
+                            job_completed_tx.clone(),
+                            &mut occupancy_metrics,
+                            &mut killpill_rx,
+                            precomputed_bundle,
+                            #[cfg(feature = "benchmark")]
+                            &mut bench,
+                        )
+                        .await;
+
+                        last_executed_job = Some(Instant::now());
+                    }
+                    Ok(None) => {
+                        let now = Instant::now();
+                        match last_executed_job {
+                            Some(last)
+                                if now.duration_since(last).as_secs()
+                                    > TIMEOUT_TO_RESET_WORKER_SHELL_NAP_TIME_DURATION =>
+                            {
+                                tokio::time::sleep(Duration::from_secs(
+                                    WORKER_SHELL_NAP_TIME_DURATION,
+                                ))
+                                .await;
+                            }
+                            _ => {
+                                tokio::time::sleep(Duration::from_millis(*SLEEP_QUEUE)).await;
+                            }
+                        }
+                    }
+
+                    Err(err) => {
+                        tracing::error!(worker = %worker_name, hostname = %hostname, "Failed to pull jobs: {}", err);
+                    }
+                };
+            }
+        }
+    })
+}
+
+async fn create_job_dir(worker_directory: &str, job_id: impl Display) -> String {
+    let job_dir_path = format!("{}/{}", worker_directory, job_id);
+
+    create_directory_async(&job_dir_path).await;
+
+    job_dir_path
+}
+
 pub async fn run_worker(
     conn: &Connection,
     hostname: &str,
@@ -686,10 +944,7 @@ pub async fn run_worker(
         write_file(&HOME_ENV, ".netrc", netrc).expect("could not write netrc");
     }
 
-    DirBuilder::new()
-        .recursive(true)
-        .create(&worker_dir)
-        .expect("could not create initial worker dir");
+    create_directory_async(&worker_dir).await;
 
     if !*DISABLE_NSJAIL {
         let _ = write_file(
@@ -948,6 +1203,25 @@ pub async fn run_worker(
         )),
         _ => None,
     };
+    // If we're the first worker to run, we start another background process that listens for a specific tag.
+    // This tag is associated only with jobs using Bash as the script language.
+    // For agent workers, the expected tag format is the worker name suffixed with "-ssh".
+    // For regular workers, the tag is simply the machine's hostname and if not found the randomly generated hostname.
+    let interactive_shell = if i_worker == 1 {
+        let it_shell = start_interactive_worker_shell(
+            conn.clone(),
+            hostname.to_owned(),
+            worker_name.clone(),
+            killpill_rx.resubscribe(),
+            job_completed_tx.clone(),
+            base_internal_url.to_owned(),
+            worker_dir.clone(),
+        );
+
+        Some(it_shell)
+    } else {
+        None
+    };
 
     let mut last_executed_job: Option<Instant> = None;
 
@@ -1058,7 +1332,7 @@ pub async fn run_worker(
             if !valid_key {
                 tracing::error!(
                     worker = %worker_name, hostname = %hostname,
-                    "Invalid license key, workers require a valid license key, sleeping for 30s waiting for valid key to be set"
+                    "Invalid license key, workers require a valid license key, sleeping for 10s waiting for valid key to be set"
                 );
                 tokio::time::sleep(Duration::from_secs(10)).await;
                 continue;
@@ -1128,29 +1402,6 @@ pub async fn run_worker(
         } else {
             tracing::info!("benchmark not finished, still pulling jobs {}", infos.iters);
         }
-        enum NextJob {
-            Sql(PulledJob),
-            Http(JobAndPerms),
-        }
-
-        impl NextJob {
-            pub fn job(self) -> MiniPulledJob {
-                match self {
-                    NextJob::Sql(job) => job.job,
-                    NextJob::Http(job) => job.job,
-                }
-            }
-        }
-
-        impl std::ops::Deref for NextJob {
-            type Target = MiniPulledJob;
-            fn deref(&self) -> &Self::Target {
-                match self {
-                    NextJob::Sql(job) => &job.job,
-                    NextJob::Http(job) => &job.job,
-                }
-            }
-        }
 
         let next_job = {
             // println!("2: {:?}",  instant.elapsed());
@@ -1191,6 +1442,7 @@ pub async fn run_worker(
                                 "/api/agent_workers/same_worker_job/{}",
                                 same_worker_job.job_id
                             ),
+                            None,
                             &same_worker_job,
                         )
                         .await
@@ -1296,7 +1548,7 @@ pub async fn run_worker(
                         }
                         job.map(|x| x.job.map(NextJob::Sql))
                     }
-                    Connection::Http(client) => crate::agent_workers::pull_job(&client)
+                    Connection::Http(client) => crate::agent_workers::pull_job(&client, None, None)
                         .await
                         .map_err(|e| error::Error::InternalErr(e.to_string()))
                         .map(|x| x.map(|y| NextJob::Http(y))),
@@ -1344,6 +1596,7 @@ pub async fn run_worker(
                         }
                     }
                 }
+
                 if matches!(job.kind, JobKind::Noop) {
                     add_time!(bench, "send job completed START");
                     job_completed_tx
@@ -1425,20 +1678,12 @@ pub async fn run_worker(
                       // fields macro we can make a job id that only appears when
                       // the job is defined?
 
-                    let job_dir = format!("{worker_dir}/{}", job.id);
-
-                    DirBuilder::new()
-                        .recursive(true)
-                        .create(&job_dir)
-                        .expect("could not create job dir");
+                    let job_dir = create_job_dir(&worker_dir, job.id).await;
 
                     let same_worker = job.same_worker;
 
                     let folder = if job.script_lang == Some(ScriptLang::Go) {
-                        DirBuilder::new()
-                            .recursive(true)
-                            .create(&format!("{job_dir}/go"))
-                            .expect("could not create go dir");
+                        create_directory_async(&format!("{job_dir}/go")).await;
                         "/go"
                     } else {
                         ""
@@ -1450,26 +1695,22 @@ pub async fn run_worker(
                         if tokio::fs::metadata(target).await.is_err() {
                             let parent_flow = job.parent_job.unwrap();
                             let parent_shared_dir = format!("{worker_dir}/{parent_flow}/shared");
-                            DirBuilder::new()
-                                .recursive(true)
-                                .create(&parent_shared_dir)
-                                .expect("could not create parent shared dir");
-
+                            create_directory_async(&parent_shared_dir).await;
                             symlink(&parent_shared_dir, target)
                                 .await
                                 .expect("could not symlink target");
                         }
                     } else {
-                        DirBuilder::new()
-                            .recursive(true)
-                            .create(target)
-                            .expect("could not create shared dir");
+                        create_directory_async(target).await;
                     }
 
                     #[cfg(feature = "prometheus")]
                     let tag = job.tag.clone();
 
                     let is_init_script: bool = job.tag.as_str() == INIT_SCRIPT_TAG;
+                    let is_flow = job.is_flow();
+                    let job_id = job.id;
+
                     let JobAndPerms {
                         job,
                         raw_code,
@@ -1478,70 +1719,32 @@ pub async fn run_worker(
                         parent_runnable_path,
                         token,
                         precomputed_agent_info: precomputed_bundle,
-                    } = match (job, &conn) {
-                        (NextJob::Sql(job), Connection::Sql(db)) => job.get_job_and_perms(db).await,
-                        (NextJob::Sql(_), Connection::Http(_)) => {
-                            panic!("sql job on http connection")
-                        }
-                        (NextJob::Http(job), _) => job,
-                    };
+                    } = extract_job_and_perms(job, &conn).await;
 
-                    // let token = create_token(&db, &job, job_perms).await;
-                    let authed_client = AuthedClient {
-                        base_internal_url: base_internal_url.to_string(),
+                    let authed_client = AuthedClient::new(
+                        base_internal_url.to_owned(),
+                        job.workspace_id.clone(),
                         token,
-                        workspace: job.workspace_id.to_string(),
-                        force_client: None,
-                    };
+                        None,
+                    );
 
                     let arc_job = Arc::new(job);
-                    add_time!(bench, "handle_queued_job START");
 
-                    let span = tracing::span!(tracing::Level::INFO, "job",
-                            job_id = %arc_job.id, root_job = field::Empty, workspace_id = %arc_job.workspace_id,  worker = %worker_name, hostname = %hostname, tag = %arc_job.tag,
-                            language = field::Empty,
-                            script_path = field::Empty, flow_step_id = field::Empty, parent_job = field::Empty,
-                            otel.name = field::Empty);
-                    let rj = if let Some(root_job) = arc_job.flow_innermost_root_job {
-                        root_job
-                    } else {
-                        arc_job.id
-                    };
-                    if let Some(lg) = arc_job.script_lang.as_ref() {
-                        span.record("language", lg.as_str());
-                    }
-                    if let Some(step_id) = arc_job.flow_step_id.as_ref() {
-                        span.record("otel.name", format!("job {}", step_id).as_str());
-                        span.record("flow_step_id", step_id.as_str());
-                    } else {
-                        span.record("otel.name", "job");
-                    }
-                    if let Some(parent_job) = arc_job.parent_job.as_ref() {
-                        span.record("parent_job", parent_job.to_string().as_str());
-                    }
-                    if let Some(script_path) = arc_job.runnable_path.as_ref() {
-                        span.record("script_path", script_path.as_str());
-                    }
-                    if let Some(root_job) = arc_job.flow_innermost_root_job.as_ref() {
-                        span.record("root_job", root_job.to_string().as_str());
-                    }
+                    let span = create_span(&arc_job, &worker_name, hostname);
 
-                    windmill_common::otel_ee::set_span_parent(&span, &rj);
-                    // span.context().span().add_event_with_timestamp("job created".to_string(), arc_job.created_at.into(), vec![]);
-
-                    match handle_queued_job(
+                    let job_result = handle_queued_job(
                         arc_job.clone(),
                         raw_code,
                         raw_lock,
                         raw_flow,
                         parent_runnable_path,
-                        conn,
+                        &conn,
                         &authed_client,
-                        &hostname,
+                        hostname,
                         &worker_name,
                         &worker_dir,
                         &job_dir,
-                        same_worker_tx.clone(),
+                        Some(same_worker_tx.clone()),
                         base_internal_url,
                         job_completed_tx.clone(),
                         &mut occupancy_metrics,
@@ -1551,74 +1754,40 @@ pub async fn run_worker(
                         &mut bench,
                     )
                     .instrument(span)
-                    .await
-                    {
+                    .await;
+
+                    match job_result {
+                        Ok(false) if is_init_script => {
+                            tracing::error!("init script job failed, exiting");
+                            update_worker_ping_for_failed_init_script(conn, &worker_name, job_id)
+                                .await;
+                            break;
+                        }
                         Err(err) => {
-                            match conn {
-                                Connection::Sql(db) => {
-                                    handle_job_error(
-                                        db,
-                                        &authed_client,
-                                        arc_job.as_ref(),
-                                        0,
-                                        None,
-                                        err,
-                                        false,
-                                        same_worker_tx.clone(),
-                                        &worker_dir,
-                                        &worker_name,
-                                        job_completed_tx.clone(),
-                                        #[cfg(feature = "benchmark")]
-                                        &mut bench,
-                                    )
-                                    .await;
-                                }
-                                Connection::Http(_) => {
-                                    job_completed_tx
-                                        .send_job(
-                                            JobCompleted {
-                                                preprocessed_args: None,
-                                                job: arc_job.clone(),
-                                                result: Arc::new(
-                                                    windmill_common::worker::to_raw_value(
-                                                        &error_to_value(err),
-                                                    ),
-                                                ),
-                                                result_columns: None,
-                                                mem_peak: 0,
-                                                canceled_by: None,
-                                                success: false,
-                                                cached_res_path: None,
-                                                token: authed_client.token.clone(),
-                                                duration: None,
-                                            },
-                                            false,
-                                        )
-                                        .await
-                                        .expect("send job completed");
-                                }
-                            }
+                            handle_all_job_kind_error(
+                                &conn,
+                                &authed_client,
+                                arc_job.clone(),
+                                err,
+                                Some(&same_worker_tx),
+                                &worker_dir,
+                                &worker_name,
+                                job_completed_tx.clone(),
+                                #[cfg(feature = "benchmark")]
+                                &mut bench,
+                            )
+                            .await;
                             if is_init_script {
                                 tracing::error!("init script job failed (in handler), exiting");
                                 update_worker_ping_for_failed_init_script(
                                     conn,
                                     &worker_name,
-                                    arc_job.id,
+                                    job_id,
                                 )
                                 .await;
                                 break;
                             }
                         }
-                        Ok(false) if is_init_script => {
-                            tracing::error!("init script job failed, exiting");
-                            update_worker_ping_for_failed_init_script(
-                                conn,
-                                &worker_name,
-                                arc_job.id,
-                            )
-                            .await;
-                            break;
-                        }
                         _ => {}
                     }
 
@@ -1643,8 +1812,7 @@ pub async fn run_worker(
                         .await;
                     }
 
-                    if !KEEP_JOB_DIR.load(Ordering::Relaxed) && !(arc_job.is_flow() && same_worker)
-                    {
+                    if !KEEP_JOB_DIR.load(Ordering::Relaxed) && !(is_flow && same_worker) {
                         let _ = tokio::fs::remove_dir_all(job_dir).await;
                     }
                 }
@@ -1726,6 +1894,11 @@ pub async fn run_worker(
             tracing::error!("error in awaiting send_result process: {e:?}")
         }
     }
+    if let Some(interactive_shell) = interactive_shell {
+        if let Err(e) = interactive_shell.await {
+            tracing::error!("error in awaiting interactive_shell process: {e:?}")
+        }
+    }
     tracing::info!(worker = %worker_name, hostname = %hostname, "worker {} exited", worker_name);
     tracing::info!(worker = %worker_name, hostname = %hostname, "number of jobs executed: {}", jobs_executed);
 }
@@ -1814,7 +1987,7 @@ pub struct PreviousResult<'a> {
     pub previous_result: Option<&'a RawValue>,
 }
 
-async fn handle_queued_job(
+pub async fn handle_queued_job(
     job: Arc<MiniPulledJob>,
     raw_code: Option<String>,
     raw_lock: Option<String>,
@@ -1826,7 +1999,7 @@ async fn handle_queued_job(
     worker_name: &str,
     worker_dir: &str,
     job_dir: &str,
-    same_worker_tx: SameWorkerSender,
+    same_worker_tx: Option<SameWorkerSender>,
     base_internal_url: &str,
     job_completed_tx: JobCompletedSender,
     occupancy_metrics: &mut OccupancyMetrics,
@@ -1939,7 +2112,7 @@ async fn handle_queued_job(
                         .to_string();
                     append_logs(&job.id, &job.workspace_id, logs, conn).await;
                 }
-                job_completed_tx
+                let result = job_completed_tx
                     .send_job(
                         JobCompleted {
                             preprocessed_args: None,
@@ -1955,8 +2128,16 @@ async fn handle_queued_job(
                         },
                         true,
                     )
-                    .await
-                    .expect("send job completed");
+                    .await;
+
+                match result {
+                    Ok(_) => {
+                        tracing::debug!("Send job completed")
+                    }
+                    Err(err) => {
+                        tracing::error!("An error occurred while sending job completed: {:#?}", err)
+                    }
+                }
 
                 return Ok(true);
             }
@@ -1975,7 +2156,7 @@ async fn handle_queued_job(
                 db,
                 &client,
                 None,
-                same_worker_tx,
+                &same_worker_tx.expect(SAME_WORKER_REQUIREMENTS),
                 worker_dir,
                 job_completed_tx.clone(),
                 worker_name,
@@ -2144,7 +2325,6 @@ async fn handle_queued_job(
         {
             return Ok(false);
         }
-
         process_result(
             job,
             result.map(|x| Arc::new(x)),
diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index 6c0b133828..50773589da 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -66,7 +66,7 @@ use windmill_queue::{
 
 type DB = sqlx::Pool<sqlx::Postgres>;
 
-use windmill_audit::audit_ee::{audit_log, AuditAuthor};
+use windmill_audit::audit_oss::{audit_log, AuditAuthor};
 use windmill_audit::ActionKind;
 use windmill_queue::{canceled_job_to_result, push};
 
@@ -80,7 +80,7 @@ pub async fn update_flow_status_after_job_completion(
     success: bool,
     result: Arc<Box<RawValue>>,
     unrecoverable: bool,
-    same_worker_tx: SameWorkerSender,
+    same_worker_tx: &SameWorkerSender,
     worker_dir: &str,
     stop_early_override: Option<bool>,
     worker_name: &str,
@@ -89,6 +89,7 @@ pub async fn update_flow_status_after_job_completion(
 ) -> error::Result<Option<Arc<MiniPulledJob>>> {
     // this is manual tailrecursion because async_recursion blows up the stack
     potentially_crash_for_testing();
+
     let mut rec = RecUpdateFlowStatusAfterJobCompletion {
         flow,
         job_id_for_status: job_id_for_status.clone(),
@@ -109,7 +110,7 @@ pub async fn update_flow_status_after_job_completion(
             rec.success,
             rec.result,
             unrecoverable,
-            same_worker_tx.clone(),
+            same_worker_tx,
             worker_dir,
             rec.stop_early_override,
             rec.skip_error_handler,
@@ -134,7 +135,7 @@ pub async fn update_flow_status_after_job_completion(
                         error: json!(e.to_string()),
                     }))),
                     true,
-                    same_worker_tx.clone(),
+                    same_worker_tx,
                     worker_dir,
                     rec.stop_early_override,
                     rec.skip_error_handler,
@@ -147,6 +148,7 @@ pub async fn update_flow_status_after_job_completion(
             }
         };
         unrecoverable = false;
+
         match nrec {
             UpdateFlowStatusAfterJobCompletion::Done(job) => {
                 add_time!(bench, "update flow status internal END");
@@ -226,7 +228,7 @@ pub async fn update_flow_status_after_job_completion_internal(
     mut success: bool,
     result: Arc<Box<RawValue>>,
     unrecoverable: bool,
-    same_worker_tx: SameWorkerSender,
+    same_worker_tx: &SameWorkerSender,
     worker_dir: &str,
     stop_early_override: Option<bool>,
     skip_error_handler: bool,
@@ -625,9 +627,10 @@ pub async fn update_flow_status_after_job_completion_internal(
                         sqlx::query!(
                             "UPDATE v2_job_queue q SET suspend = 0
                              FROM v2_job j, v2_job_status f
-                             WHERE parent_job = $1
+                             WHERE q.workspace_id = $1 AND q.suspend = $3 AND j.parent_job = $2
                                  AND f.id = j.id AND q.id = j.id
-                                 AND suspend = $2 AND (f.flow_status->'step')::int = 0",
+                                 AND (f.flow_status->'step')::int = 0",
+                            w_id,
                             flow,
                             nindex
                         )
@@ -1289,7 +1292,7 @@ pub async fn update_flow_status_after_job_completion_internal(
             db,
             client,
             Some(nresult.clone()),
-            same_worker_tx.clone(),
+            same_worker_tx,
             worker_dir,
             job_completed_tx,
             worker_name,
@@ -1586,7 +1589,7 @@ pub async fn handle_flow(
     db: &sqlx::Pool<sqlx::Postgres>,
     client: &AuthedClient,
     last_result: Option<Arc<Box<RawValue>>>,
-    same_worker_tx: SameWorkerSender,
+    same_worker_tx: &SameWorkerSender,
     worker_dir: &str,
     job_completed_tx: JobCompletedSender,
     worker_name: &str,
@@ -1643,7 +1646,7 @@ pub async fn handle_flow(
             db,
             client,
             last_result.clone(),
-            same_worker_tx.clone(),
+            same_worker_tx,
             worker_dir,
             worker_name,
         )
@@ -1736,7 +1739,7 @@ async fn push_next_flow_job(
     db: &sqlx::Pool<sqlx::Postgres>,
     client: &AuthedClient,
     last_job_result: Option<Arc<Box<RawValue>>>,
-    same_worker_tx: SameWorkerSender,
+    same_worker_tx: &SameWorkerSender,
     worker_dir: &str,
     worker_name: &str,
 ) -> error::Result<PushNextFlowJob> {
diff --git a/backend/windmill-worker/src/worker_lockfiles.rs b/backend/windmill-worker/src/worker_lockfiles.rs
index 6710f718c4..33c0375f09 100644
--- a/backend/windmill-worker/src/worker_lockfiles.rs
+++ b/backend/windmill-worker/src/worker_lockfiles.rs
@@ -1965,12 +1965,11 @@ async fn ansible_dep(
     use windmill_parser_yaml::add_versions_to_requirements_yaml;
 
     use crate::ansible_executor::{
-            create_ansible_cfg, get_collection_locks, get_git_ssh_cmd, get_role_locks,
-            install_galaxy_collections,
-        };
+        create_ansible_cfg, get_collection_locks, get_git_ssh_cmd, get_role_locks,
+        install_galaxy_collections,
+    };
     use windmill_common::client::AuthedClient;
 
-
     let python_lockfile = python_dep(
         reqs.python_reqs.join("\n").to_string(),
         job_id,
@@ -1989,12 +1988,12 @@ async fn ansible_dep(
 
     let conn = &Connection::Sql(db.clone());
 
-    let authed_client = AuthedClient {
-        base_internal_url: base_internal_url.to_string(),
-        token: token.to_string(),
-        workspace: w_id.to_string(),
-        force_client: None,
-    };
+    let authed_client = AuthedClient::new(
+        base_internal_url.to_string(),
+        w_id.to_string(),
+        token.to_string(),
+        None,
+    );
 
     let git_ssh_cmd = get_git_ssh_cmd(&reqs, job_dir, &authed_client).await?;
 
@@ -2102,7 +2101,12 @@ async fn capture_dependency_job(
 
                     (
                         job_raw_code.to_owned(),
-                        crate::PyV::parse_from_requirements(&split_requirements(job_raw_code)),
+                        match crate::PyV::try_parse_from_requirements(&split_requirements(
+                            job_raw_code,
+                        )) {
+                            Some(pyv) => pyv,
+                            None => crate::PyV::gravitational_version(job_id, w_id, None).await,
+                        },
                     )
                 } else {
                     let mut version_specifiers = vec![];
diff --git a/backend/windmill-worker/src/worker_utils.rs b/backend/windmill-worker/src/worker_utils.rs
index e1ea849999..4da318d37b 100644
--- a/backend/windmill-worker/src/worker_utils.rs
+++ b/backend/windmill-worker/src/worker_utils.rs
@@ -125,6 +125,7 @@ async fn update_worker_ping_full_inner(
             client
                 .post::<_, ()>(
                     UPDATE_PING_URL,
+                    None,
                     &Ping {
                         last_job_executed: None,
                         last_job_workspace_id: None,
@@ -190,6 +191,7 @@ pub async fn insert_ping(
             client
                 .post::<_, ()>(
                     UPDATE_PING_URL,
+                    None,
                     &Ping {
                         last_job_executed: None,
                         last_job_workspace_id: None,
@@ -249,6 +251,7 @@ pub async fn update_worker_ping_from_job(
             client
                 .post::<Ping, ()>(
                     UPDATE_PING_URL,
+                    None,
                     &Ping {
                         last_job_executed: Some(job_id.clone()),
                         last_job_workspace_id: Some(w_id.to_string()),
@@ -287,6 +290,7 @@ pub async fn ping_job_status(
             client
                 .post(
                     &format!("/api/agent_workers/ping_job_status/{}", job_id),
+                    None,
                     &PingJobStatus { mem_peak, current_mem },
                 )
                 .await
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 3ff3ab48d5..27413cc466 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.493.2";
+export const VERSION = "v1.496.3";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/main.ts b/cli/main.ts
index f2d53e07ff..50da78522d 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -63,7 +63,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.493.2";
+export const VERSION = "1.496.3";
 
 const command = new Command()
   .name("wmill")
diff --git a/docker/DockerfileFull b/docker/DockerfileFull
index 78eec753d1..ddc1cdb3af 100644
--- a/docker/DockerfileFull
+++ b/docker/DockerfileFull
@@ -3,6 +3,7 @@ FROM ghcr.io/windmill-labs/windmill:dev
 # Rust
 COPY --from=rust:1.86.0 /usr/local/cargo /usr/local/cargo
 COPY --from=rust:1.86.0 /usr/local/rustup /usr/local/rustup
+RUN /usr/local/cargo/bin/cargo install cargo-sweep --version ^0.7
 
 # Ansible
 RUN uv tool install ansible && [ -d "$(uv tool dir)/ansible/bin/" ] && find "$(uv tool dir)/ansible/bin/" -mindepth 1 -maxdepth 1 -type f -executable -regextype posix-extended -regex '^((.+/)?)[^.]+' -print0 | xargs -0 ln -s -t "$UV_TOOL_BIN_DIR/" || true
diff --git a/docker/DockerfileFullEe b/docker/DockerfileFullEe
index 138038559c..7ed7108de2 100644
--- a/docker/DockerfileFullEe
+++ b/docker/DockerfileFullEe
@@ -22,6 +22,7 @@ FROM ghcr.io/windmill-labs/windmill-ee:dev
 # Rust
 COPY --from=rust:1.86.0 /usr/local/cargo /usr/local/cargo
 COPY --from=rust:1.86.0 /usr/local/rustup /usr/local/rustup
+RUN /usr/local/cargo/bin/cargo install cargo-sweep --version ^0.7
 
 # Ansible
 RUN uv tool install ansible && [ -d "$(uv tool dir)/ansible/bin/" ] && find "$(uv tool dir)/ansible/bin/" -mindepth 1 -maxdepth 1 -type f -executable -regextype posix-extended -regex '^((.+/)?)[^.]+' -print0 | xargs -0 ln -s -t "$UV_TOOL_BIN_DIR/" || true
diff --git a/docker/DockerfileNsjail b/docker/DockerfileNsjail
index e51e73a3ea..cd17557256 100644
--- a/docker/DockerfileNsjail
+++ b/docker/DockerfileNsjail
@@ -45,6 +45,7 @@ RUN apt-get update && apt-get install -y libprotobuf-dev libnl-route-3-dev
 # Rust
 COPY --from=rust:1.80.1 /usr/local/cargo /usr/local/cargo
 COPY --from=rust:1.80.1 /usr/local/rustup /usr/local/rustup
+RUN /usr/local/cargo/bin/cargo install cargo-sweep --version ^0.7
 
 # Ansible
 RUN uv tool install ansible && [ -d "$(uv tool dir)/ansible/bin/" ] && find "$(uv tool dir)/ansible/bin/" -mindepth 1 -maxdepth 1 -type f -executable -regextype posix-extended -regex '^((.+/)?)[^.]+' -print0 | xargs -0 ln -s -t "$UV_TOOL_BIN_DIR/" || true
diff --git a/flake.nix b/flake.nix
index f9df73f465..d11b967cc4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -81,17 +81,22 @@
           buildInputs = buildInputs ++ (with pkgs; [
             # Essentials
             rust
+            cargo-sweep
             git
             xcaddy
             sqlx-cli
             sccache
             nsjail
+            openapi-generator-cli
 
             # Python
             flock
             python3
             python3Packages.pip
             uv
+            poetry
+            pyright
+            openapi-python-client
 
             # Other languages
             deno
@@ -186,6 +191,7 @@
           # for related places search: ADD_NEW_LANG
           FLOCK_PATH = "${pkgs.flock}/bin/flock";
           CARGO_PATH = "${rust}/bin/cargo";
+          CARGO_SWEEP_PATH = "${pkgs.cargo-sweep}/bin/cargo-sweep";
           DOTNET_PATH = "${pkgs.dotnet-sdk_9}/bin/dotnet";
           DOTNET_ROOT = "${pkgs.dotnet-sdk_9}/share/dotnet";
           ORACLE_LIB_DIR = "${pkgs.oracle-instantclient.lib}/lib";
diff --git a/frontend/CLAUDE.md b/frontend/CLAUDE.md
deleted file mode 100644
index 63f35ab820..0000000000
--- a/frontend/CLAUDE.md
+++ /dev/null
@@ -1,241 +0,0 @@
-# Svelte 5 Best Practices
-
-This guide outlines best practices for developing with Svelte 5, incorporating the new Runes API and other modern Svelte features. These rules MUST NOT be applied on svelte 4 files unless explicitly asked to do so.
-
-## Reactivity with Runes
-
-Svelte 5 introduces Runes for more explicit and flexible reactivity.
-
-1.  **Embrace Runes for State Management**:
-
-    - Use `$state` for reactive local component state.
-
-      ```svelte
-      <script>
-        let count = $state(0);
-
-        function increment() {
-          count += 1;
-        }
-      </script>
-
-      <button onclick={increment}>
-        Clicked {count} {count === 1 ? 'time' : 'times'}
-      </button>
-      ```
-
-    - Use `$derived` for computed values based on other reactive state.
-
-      ```svelte
-      <script>
-        let count = $state(0);
-        const doubled = $derived(count * 2);
-      </script>
-
-      <p>{count} * 2 = {doubled}</p>
-      ```
-
-    - Use `$effect` for side effects that need to run when reactive values change (e.g., logging, manual DOM manipulation, data fetching). Remember `$effect` does not run on the server.
-
-      ```svelte
-      <script>
-        let count = $state(0);
-
-        $effect(() => {
-          console.log('The count is now', count);
-          if (count > 5) {
-            alert('Count is too high!');
-          }
-        });
-      </script>
-      ```
-
-2.  **Props with `$props`**:
-
-    - Declare component props using `$props()`. This offers better clarity and flexibility compared to `export let`.
-
-      ```svelte
-      <script>
-        // ChildComponent.svelte
-        let { name, age = $state(30) } = $props();
-      </script>
-
-      <p>Name: {name}</p>
-      <p>Age: {age}</p>
-      ```
-
-    - For bindable props, use `$bindable`.
-
-      ```svelte
-      <script>
-        // MyInput.svelte
-        let { value = $bindable() } = $props();
-      </script>
-
-      <input bind:value />
-      ```
-
-## Event Handling
-
-- **Use direct event attributes**: Svelte 5 moves away from `on:` directives for DOM events.
-  - **Do**: `<button onclick={handleClick}>...</button>`
-  - **Don't**: `<button on:click={handleClick}>...</button>`
-- **For component events, prefer callback props**: Instead of `createEventDispatcher`, pass functions as props.
-
-  ```svelte
-  <!-- Parent.svelte -->
-  <script>
-    import Child from './Child.svelte';
-    let message = $state('');
-    function handleChildEvent(detail) {
-      message = detail;
-    }
-  </script>
-  <Child onCustomEvent={handleChildEvent} />
-  <p>Message from child: {message}</p>
-
-  <!-- Child.svelte -->
-  <script>
-    let { onCustomEvent } = $props();
-    function emitEvent() {
-      onCustomEvent('Hello from child!');
-    }
-  </script>
-  <button onclick={emitEvent}>Send Event</button>
-  ```
-
-## Snippets for Content Projection
-
-- **Use `{#snippet ...}` and `{@render ...}` instead of slots**: Snippets are more powerful and flexible.
-
-  ```svelte
-  <!-- Parent.svelte -->
-  <script>
-    import Card from './Card.svelte';
-  </script>
-
-  <Card>
-    {#snippet title()}
-      My Awesome Title
-    {/snippet}
-    {#snippet content()}
-      <p>Some interesting content here.</p>
-    {/snippet}
-  </Card>
-
-  <!-- Card.svelte -->
-  <script>
-    let { title, content } = $props();
-  </script>
-
-  <article>
-    <header>{@render title()}</header>
-    <div>{@render content()}</div>
-  </article>
-  ```
-
-- Default content is passed via the `children` prop (which is a snippet).
-  ```svelte
-  <!-- Wrapper.svelte -->
-  <script>
-    let { children } = $props();
-  </script>
-  <div>
-    {@render children?.()}
-  </div>
-  ```
-
-## Component Design
-
-1.  **Create Small, Reusable Components**: Break down complex UIs into smaller, focused components. Each component should have a single responsibility. This also aids performance by limiting the scope of reactivity updates.
-2.  **Descriptive Naming**: Use clear and descriptive names for variables, functions, and components.
-3.  **Minimize Logic in Components**: Move complex business logic to utility functions or services. Keep components focused on presentation and interaction.
-
-## State Management (Stores)
-
-1.  **Segment Stores**: Avoid a single global store. Create multiple stores, each responsible for a specific piece of global state (e.g., `userStore.js`, `themeStore.js`). This can help limit reactivity updates to only the parts of the UI that depend on specific state segments.
-2.  **Use Custom Stores for Complex Logic**: For stores with related methods, create custom stores.
-
-    ```javascript
-    // counterStore.js
-    import { writable } from 'svelte/store'
-
-    function createCounter() {
-    	const { subscribe, set, update } = writable(0)
-
-    	return {
-    		subscribe,
-    		increment: () => update((n) => n + 1),
-    		decrement: () => update((n) => n - 1),
-    		reset: () => set(0)
-    	}
-    }
-    export const counter = createCounter()
-    ```
-
-3.  **Use Context API for Localized State**: For state shared within a component subtree, consider Svelte's context API (`setContext`, `getContext`) instead of global stores when the state doesn't need to be truly global.
-
-## Performance Optimizations (Svelte 5)
-
-When generating Svelte 5 code, prioritize frontend performance by applying the following principles:
-
-### General Svelte 5 Principles
-
-- **Leverage the Compiler:** Trust Svelte's compiler to generate optimized JavaScript. Avoid manual DOM manipulation (`document.querySelector`, etc.) unless absolutely necessary for integrating third-party libraries that lack Svelte adapters.
-- **Keep Components Small and Focused:** Reinforcing from Component Design, smaller components lead to less complex reactivity graphs and more targeted, efficient updates.
-
-### Reactivity & State Management
-
-- **Optimize Computations with `$derived`:** Always use `$derived` for computed values that depend on other state. This ensures the computation only runs when its specific dependencies change, avoiding unnecessary work compared to recomputing derived values in `$effect` or less efficient methods.
-- **Minimize `$effect` Usage:** Use `$effect` sparingly and only for true side effects that interact with the outside world or non-Svelte state. Avoid putting complex logic or state updates _within_ an `$effect` unless those updates are explicitly intended as a reaction to external changes or non-Svelte state. Excessive or complex effects can impact rendering performance.
-- **Structure State for Fine-Grained Updates:** Design your `$state` objects or variables such that updates affect only the necessary parts of the UI. Avoid putting too much unrelated state into a single large object that gets frequently updated, as this can potentially trigger broader updates than necessary. Consider normalizing complex, nested state.
-
-### List Rendering (`{#each}`)
-
-- **Mandate `key` Attribute:** Always use a `key` attribute (`{#each items as item (item.id)}`) that refers to a unique, stable identifier for each item in a list. This is critical for allowing Svelte to efficiently update, reorder, add, or remove list items without destroying and re-creating unnecessary DOM elements and component instances.
-
-### Component Loading & Bundling
-
-- **Implement Lazy Loading/Code Splitting:** For routes, components, or modules that are not immediately needed on page load, use dynamic imports (`import(...)`) to split the code bundle. SvelteKit handles this automatically for routes, but it can be applied manually to components using helper patterns if needed.
-- **Be Mindful of Third-Party Libraries:** When incorporating external libraries, import only the necessary functions or components to minimize the final bundle size. Prefer libraries designed to be tree-shakeable.
-
-### Rendering & DOM
-
-- **Use CSS for Animations/Transitions:** Prefer CSS animations or transitions where possible for performance. Svelte's built-in `transition:` directive is also highly optimized and should be used for complex state-driven transitions, but simple cases can often use plain CSS.
-- **Optimize Image Loading:** Implement best practices for images: use optimized formats (WebP, AVIF), lazy loading (`loading="lazy"`), and responsive images (`<picture>`, `srcset`) to avoid loading unnecessarily large images.
-
-### Server-Side Rendering (SSR) & Hydration
-
-- **Ensure SSR Compatibility:** Write components that can be rendered on the server for faster initial page loads. Avoid relying on browser-specific APIs (like `window` or `document`) in the main `<script>` context. If necessary, use `$effect` or check `if (browser)` inside effects to run browser-specific code only on the client.
-- **Minimize Work During Hydration:** Structure components and data fetching such that minimal complex setup or computation is required when the client-side Svelte code takes over from the server-rendered HTML. Heavy synchronous work during hydration can block the main thread.
-
-## General Clean Code Practices
-
-1.  **Organized File Structure**: Group related files together. A common structure:
-    ```
-    /src
-    |-- /routes      // Page components (if using a router like SvelteKit)
-    |-- /lib         // Utility functions, services, constants (SvelteKit often uses this)
-    |   |-- /stores
-    |   |-- /utils
-    |   |-- /services
-    |   |-- /components  // Reusable UI components
-    |-- App.svelte
-    |-- main.js (or main.ts)
-    ```
-2.  **Scoped Styles**: Keep CSS scoped to components to avoid unintended side effects and improve maintainability. Avoid `:global` where possible.
-3.  **Immutability**: With Svelte 5 and `$state`, direct assignments to properties of `$state` objects (`obj.prop = value;`) are generally fine as Svelte's reactivity system handles updates. However, for non-rune state or when interacting with other systems, understanding and sometimes preferring immutable updates (creating new objects/arrays) can still be relevant.
-4.  **Use `class:` and `style:` directives**: For dynamic classes and styles, use Svelte's built-in directives for cleaner templates and potentially optimized updates.
-
-    ```svelte
-    <script>
-      let isActive = $state(true);
-      let color = $state('blue');
-    </script>
-
-    <div class:active={isActive} style:color={color}>
-      Hello
-    </div>
-    ```
-
-5.  **Stay Updated**: Keep Svelte and its related packages up to date to benefit from the latest features, performance improvements, and security fixes.
diff --git a/frontend/npm b/frontend/npm
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 16d3f6a057..511069631d 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,13 @@
 {
 	"name": "windmill-components",
-	"version": "1.493.10",
+	"version": "1.496.3",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.493.10",
+			"version": "1.496.3",
+			"hasInstallScript": true,
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
@@ -21,8 +22,10 @@
 				"@leeoniya/ufuzzy": "^1.0.8",
 				"@popperjs/core": "^2.11.6",
 				"@redocly/json-to-json-schema": "^0.0.1",
+				"@scalar/openapi-parser": "^0.15.0",
 				"@tanstack/svelte-table": "npm:tanstack-table-8-svelte-5@^0.1",
 				"@windmill-labs/svelte-dnd-action": "^0.9.48",
+				"@xterm/addon-fit": "^0.10.0",
 				"@xyflow/svelte": "^0.1.15",
 				"ag-charts-community": "^9.0.1",
 				"ag-charts-enterprise": "^9.0.1",
@@ -51,6 +54,7 @@
 				"monaco-vim": "^0.4.1",
 				"ol": "^7.4.0",
 				"openai": "^4.87.1",
+				"openapi-types": "^12.1.3",
 				"p-limit": "^6.1.0",
 				"panzoom": "^9.4.3",
 				"pdfjs-dist": "4.8.69",
@@ -78,11 +82,14 @@
 				"windmill-parser-wasm-ts": "^1.486.1",
 				"windmill-parser-wasm-yaml": "^1.429.0",
 				"windmill-sql-datatype-parser-wasm": "^1.318.0",
+				"xterm": "^5.3.0",
+				"xterm-readline": "^1.1.2",
 				"y-monaco": "^0.1.4",
 				"y-websocket": "^1.5.4",
-				"yaml": "^2.3.4",
+				"yaml": "^2.8.0",
 				"yjs": "^13.6.7",
-				"zod": "^3.24.2"
+				"zod": "^3.24.2",
+				"zod-to-json-schema": "^3.24.5"
 			},
 			"devDependencies": {
 				"@floating-ui/core": "^1.3.1",
@@ -144,7 +151,7 @@
 				"fsevents": "^2.3.3"
 			},
 			"peerDependencies": {
-				"svelte": "^5.0.0"
+				"svelte": "^4.0.0"
 			}
 		},
 		"node_modules/@alloc/quick-lru": {
@@ -2999,6 +3006,59 @@
 				"win32"
 			]
 		},
+		"node_modules/@scalar/openapi-parser": {
+			"version": "0.15.0",
+			"resolved": "https://registry.npmjs.org/@scalar/openapi-parser/-/openapi-parser-0.15.0.tgz",
+			"integrity": "sha512-49u1sE+P+72nbt/9p7flBS/g7wbapTGAplcQ1FZxa4La56OMuShCl4qSSdw8lPNZjUZNTLcw7ExVOGI9p1kkOA==",
+			"license": "MIT",
+			"dependencies": {
+				"ajv": "^8.17.1",
+				"ajv-draft-04": "^1.0.0",
+				"ajv-formats": "^3.0.1",
+				"jsonpointer": "^5.0.1",
+				"leven": "^4.0.0",
+				"yaml": "^2.4.5"
+			},
+			"engines": {
+				"node": ">=20"
+			}
+		},
+		"node_modules/@scalar/openapi-parser/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/@scalar/openapi-parser/node_modules/ajv-draft-04": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz",
+			"integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==",
+			"license": "MIT",
+			"peerDependencies": {
+				"ajv": "^8.5.0"
+			},
+			"peerDependenciesMeta": {
+				"ajv": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@scalar/openapi-parser/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"license": "MIT"
+		},
 		"node_modules/@smithy/types": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.2.0.tgz",
@@ -3794,6 +3854,22 @@
 				"svelte": ">=3.23.0 || ^5.0.0-next.0"
 			}
 		},
+		"node_modules/@xterm/addon-fit": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.10.0.tgz",
+			"integrity": "sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ==",
+			"license": "MIT",
+			"peerDependencies": {
+				"@xterm/xterm": "^5.0.0"
+			}
+		},
+		"node_modules/@xterm/xterm": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz",
+			"integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==",
+			"license": "MIT",
+			"peer": true
+		},
 		"node_modules/@xyflow/svelte": {
 			"version": "0.1.39",
 			"resolved": "https://registry.npmjs.org/@xyflow/svelte/-/svelte-0.1.39.tgz",
@@ -3932,6 +4008,45 @@
 				"url": "https://github.com/sponsors/epoberezkin"
 			}
 		},
+		"node_modules/ajv-formats": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
+			"integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
+			"license": "MIT",
+			"dependencies": {
+				"ajv": "^8.0.0"
+			},
+			"peerDependencies": {
+				"ajv": "^8.0.0"
+			},
+			"peerDependenciesMeta": {
+				"ajv": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/ajv-formats/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/ajv-formats/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"license": "MIT"
+		},
 		"node_modules/amator": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/amator/-/amator-1.1.0.tgz",
@@ -3952,7 +4067,6 @@
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
 			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -5484,8 +5598,7 @@
 		"node_modules/emoji-regex": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
 		},
 		"node_modules/encoding-down": {
 			"version": "6.3.0",
@@ -6042,8 +6155,7 @@
 		"node_modules/fast-deep-equal": {
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-			"dev": true
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
 		},
 		"node_modules/fast-diff": {
 			"version": "1.1.2",
@@ -6102,7 +6214,6 @@
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
 			"integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
-			"dev": true,
 			"funding": [
 				{
 					"type": "github",
@@ -6112,8 +6223,7 @@
 					"type": "opencollective",
 					"url": "https://opencollective.com/fastify"
 				}
-			],
-			"peer": true
+			]
 		},
 		"node_modules/fastest-levenshtein": {
 			"version": "1.0.16",
@@ -7178,7 +7288,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
 			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -7360,6 +7469,15 @@
 			"resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz",
 			"integrity": "sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ=="
 		},
+		"node_modules/jsonpointer": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
+			"integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/keyv": {
 			"version": "4.5.4",
 			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -7539,6 +7657,18 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/leven": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-4.0.0.tgz",
+			"integrity": "sha512-puehA3YKku3osqPlNuzGDUHq8WpwXupUg1V6NXdV38G+gr+gkBwFC8g1b/+YcIvp8gnqVIus+eJCH/eGsRmJNw==",
+			"license": "MIT",
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/levn": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -9210,6 +9340,12 @@
 			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
 			"integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
 		},
+		"node_modules/openapi-types": {
+			"version": "12.1.3",
+			"resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-12.1.3.tgz",
+			"integrity": "sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==",
+			"license": "MIT"
+		},
 		"node_modules/optionator": {
 			"version": "0.9.4",
 			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -10713,8 +10849,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
 			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-			"dev": true,
-			"peer": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -11162,7 +11296,6 @@
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
 			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
 			"dependencies": {
 				"emoji-regex": "^8.0.0",
 				"is-fullwidth-code-point": "^3.0.0",
@@ -11191,7 +11324,6 @@
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
 			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"dev": true,
 			"dependencies": {
 				"ansi-regex": "^5.0.1"
 			},
@@ -13028,6 +13160,25 @@
 				"node": ">=0.4"
 			}
 		},
+		"node_modules/xterm": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/xterm/-/xterm-5.3.0.tgz",
+			"integrity": "sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg==",
+			"deprecated": "This package is now deprecated. Move to @xterm/xterm instead.",
+			"license": "MIT"
+		},
+		"node_modules/xterm-readline": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/xterm-readline/-/xterm-readline-1.1.2.tgz",
+			"integrity": "sha512-1+W2nVuQvCYz9OUYwFBiolrSQUui51aDDyacKXt4PuxeBHqzvabQEJ2kwdBDzsmOjz5BwlDTAjJmYpH2OGqLFA==",
+			"license": "MIT",
+			"dependencies": {
+				"string-width": "^4"
+			},
+			"peerDependencies": {
+				"@xterm/xterm": "^5.5.0"
+			}
+		},
 		"node_modules/y-leveldb": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/y-leveldb/-/y-leveldb-0.1.2.tgz",
@@ -13128,6 +13279,7 @@
 			"version": "2.8.0",
 			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
 			"integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
+			"license": "ISC",
 			"bin": {
 				"yaml": "bin.mjs"
 			},
@@ -13191,6 +13343,15 @@
 				"url": "https://github.com/sponsors/colinhacks"
 			}
 		},
+		"node_modules/zod-to-json-schema": {
+			"version": "3.24.5",
+			"resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.5.tgz",
+			"integrity": "sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==",
+			"license": "ISC",
+			"peerDependencies": {
+				"zod": "^3.24.1"
+			}
+		},
 		"node_modules/zstddec": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/zstddec/-/zstddec-0.1.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index e8a4179f75..b6ca38f2f5 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.493.10",
+	"version": "1.496.3",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
@@ -80,18 +80,20 @@
 	"dependencies": {
 		"@aws-crypto/sha256-js": "^4.0.0",
 		"@codingame/monaco-vscode-configuration-service-override": "~16.1.1",
+		"@codingame/monaco-vscode-editor-api": "~16.1.1",
 		"@codingame/monaco-vscode-standalone-css-language-features": "~16.1.1",
 		"@codingame/monaco-vscode-standalone-html-language-features": "^16.1.1",
 		"@codingame/monaco-vscode-standalone-json-language-features": "~16.1.1",
 		"@codingame/monaco-vscode-standalone-languages": "~16.1.1",
 		"@codingame/monaco-vscode-standalone-typescript-language-features": "~16.1.1",
-		"@codingame/monaco-vscode-editor-api": "~16.1.1",
 		"@json2csv/plainjs": "^7.0.6",
 		"@leeoniya/ufuzzy": "^1.0.8",
 		"@popperjs/core": "^2.11.6",
 		"@redocly/json-to-json-schema": "^0.0.1",
+		"@scalar/openapi-parser": "^0.15.0",
 		"@tanstack/svelte-table": "npm:tanstack-table-8-svelte-5@^0.1",
 		"@windmill-labs/svelte-dnd-action": "^0.9.48",
+		"@xterm/addon-fit": "^0.10.0",
 		"@xyflow/svelte": "^0.1.15",
 		"ag-charts-community": "^9.0.1",
 		"ag-charts-enterprise": "^9.0.1",
@@ -120,6 +122,7 @@
 		"monaco-vim": "^0.4.1",
 		"ol": "^7.4.0",
 		"openai": "^4.87.1",
+		"openapi-types": "^12.1.3",
 		"p-limit": "^6.1.0",
 		"panzoom": "^9.4.3",
 		"pdfjs-dist": "4.8.69",
@@ -147,11 +150,14 @@
 		"windmill-parser-wasm-ts": "^1.486.1",
 		"windmill-parser-wasm-yaml": "^1.429.0",
 		"windmill-sql-datatype-parser-wasm": "^1.318.0",
+		"xterm": "^5.3.0",
+		"xterm-readline": "^1.1.2",
 		"y-monaco": "^0.1.4",
 		"y-websocket": "^1.5.4",
-		"yaml": "^2.3.4",
+		"yaml": "^2.8.0",
 		"yjs": "^13.6.7",
-		"zod": "^3.24.2"
+		"zod": "^3.24.2",
+		"zod-to-json-schema": "^3.24.5"
 	},
 	"peerDependencies": {
 		"svelte": "^5.0.0"
diff --git a/frontend/src/lib/components/AppConnectInner.svelte b/frontend/src/lib/components/AppConnectInner.svelte
index 6f73fff916..217d5981f3 100644
--- a/frontend/src/lib/components/AppConnectInner.svelte
+++ b/frontend/src/lib/components/AppConnectInner.svelte
@@ -63,7 +63,7 @@
 					(x) =>
 						passwords.includes(x) ||
 						['token', 'secret', 'key', 'pass', 'private'].some((y) => x.toLowerCase().includes(y))
-			  )
+				)
 	}
 
 	let linkedSecret: string | undefined = undefined
@@ -487,6 +487,8 @@
 					{#if !nativeLanguagesCategory.includes(key)}
 						<!-- Exclude specific items -->
 						<Button
+							aiId={`app-connect-inner-${key}`}
+							aiDescription={`Connect to ${key}`}
 							size="sm"
 							variant="border"
 							color={key === resourceType ? 'blue' : 'light'}
@@ -552,7 +554,8 @@
 		{#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'}></textarea>
+				<textarea use:autosize bind:value={description} placeholder={'Resource description'}
+				></textarea>
 			</div>
 		{:else if description == undefined || description == ''}
 			<div class="text-sm text-tertiary">No description provided</div>
diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte
index 80b0388df1..2f4a9af993 100644
--- a/frontend/src/lib/components/ArgInput.svelte
+++ b/frontend/src/lib/components/ArgInput.svelte
@@ -573,6 +573,30 @@
 								}}
 							/>
 						</div>
+					{:else if itemsType?.type == 'object' && itemsType?.resourceType == 's3object'}
+						<div class="w-full">
+							<FileUpload
+								{appPath}
+								computeForceViewerPolicies={computeS3ForceViewerPolicies}
+								{workspace}
+								allowMultiple={true}
+								randomFileKey={true}
+								on:addition={(evt) => {
+									value = [
+										...value,
+										{
+											s3: evt.detail?.path ?? '',
+											filename: evt.detail?.filename ?? ''
+										}
+									]
+								}}
+								on:deletion={(evt) => {
+									value = value.filter((v) => v.s3 !== evt.detail?.path)
+								}}
+								defaultValue={defaultValue?.map((v) => v.s3)}
+								initialValue={value}
+							/>
+						</div>
 					{:else}
 						<div class="w-full">
 							{#key redraw}
diff --git a/frontend/src/lib/components/ArrayTypeNarrowing.svelte b/frontend/src/lib/components/ArrayTypeNarrowing.svelte
index 2d37233086..3694b021b7 100644
--- a/frontend/src/lib/components/ArrayTypeNarrowing.svelte
+++ b/frontend/src/lib/components/ArrayTypeNarrowing.svelte
@@ -21,12 +21,24 @@
 		  }
 		| undefined
 
-	let selected: 'string' | 'number' | 'object' | 'bytes' | 'enum' | 'resource' | undefined =
+	let selected:
+		| 'string'
+		| 'number'
+		| 'object'
+		| 'bytes'
+		| 'enum'
+		| 'resource'
+		| 's3object'
+		| undefined =
 		itemsType?.type != 'string'
-			? itemsType?.type
+			? itemsType?.type == 'object' && itemsType?.resourceType == 's3object'
+				? 's3object'
+				: itemsType?.type
 			: Array.isArray(itemsType?.enum)
 				? 'enum'
-				: 'string'
+				: itemsType?.contentEncoding == 'base64'
+					? 'bytes'
+					: 'string'
 
 	let schema = {
 		properties: itemsType?.properties || {},
@@ -60,6 +72,8 @@
 					itemsType = { type: 'string', contentEncoding: 'base64' }
 				} else if (selected == 'resource') {
 					itemsType = { type: 'resource', resourceType: itemsType?.resourceType }
+				} else if (selected == 's3object') {
+					itemsType = { type: 'object', resourceType: 's3object' }
 				} else {
 					itemsType = undefined
 				}
@@ -69,6 +83,7 @@
 			<option value="string"> Items are strings</option>
 			<option value="enum">Items are strings from an enum</option>
 			{#if originalType != 'string[]'}
+				<option value="s3object">Items are S3 objects</option>
 				<option value="object"> Items are objects (JSON)</option>
 				<option value="resource"> Items are resources</option>
 				<option value="number">Items are numbers</option>
diff --git a/frontend/src/lib/components/ChannelSelector.svelte b/frontend/src/lib/components/ChannelSelector.svelte
index f7db63ddc2..7d4a1a3d3d 100644
--- a/frontend/src/lib/components/ChannelSelector.svelte
+++ b/frontend/src/lib/components/ChannelSelector.svelte
@@ -1,86 +1,51 @@
 <script lang="ts">
-	import Select from '$lib/components/apps/svelte-select/lib/Select.svelte'
-	import { SELECT_INPUT_DEFAULT_STYLE } from '$lib/defaults'
-	import { createEventDispatcher, onMount } from 'svelte'
-	import DarkModeObserver from './DarkModeObserver.svelte'
+	import Select from './Select.svelte'
 
 	interface ChannelItem {
-		channel_id: string
-		channel_name: string
+		channel_id?: string
+		channel_name?: string
 	}
 
-	export let disabled = false
-	export let placeholder = 'Select channel'
-	export let selectedChannel: ChannelItem | undefined = undefined
-	export let containerClass = 'w-64'
-	export let minWidth = '160px'
-	export let channels: ChannelItem[] = []
-
-	let darkMode: boolean = false
-
-	const dispatch = createEventDispatcher<{
-		change: ChannelItem
-	}>()
-
-	function onThemeChange() {
-		darkMode = document.documentElement.classList.contains('dark')
+	interface Props {
+		disabled?: boolean
+		placeholder?: string
+		selectedChannel?: ChannelItem | undefined
+		containerClass?: string
+		minWidth?: string
+		channels?: ChannelItem[]
 	}
 
-	onMount(() => {
-		onThemeChange()
-	})
-
-	function handleChannelSelect(event) {
-		selectedChannel = event.detail
-		if (selectedChannel) {
-			dispatch('change', selectedChannel)
-		}
-	}
-
-	function filterChannels(filterText: string | unknown) {
-		if (!channels) return channels
-
-		const searchText = typeof filterText === 'string' ? filterText : ''
-
-		const filtered = searchText
-			? channels.filter((channel) =>
-					channel.channel_name.toLowerCase().includes(searchText.toLowerCase())
-				)
-			: channels
-
-		return filtered
-	}
+	let {
+		disabled = false,
+		placeholder = 'Select channel',
+		selectedChannel = $bindable(undefined),
+		containerClass = 'w-64',
+		minWidth = '160px',
+		channels = []
+	}: Props = $props()
 </script>
 
 <div class={containerClass}>
 	<div class="flex items-center gap-2">
 		<div class="flex-grow" style="min-width: {minWidth};">
 			<Select
-				inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-				containerStyles={'border-color: lightgray; min-width: ' +
-					minWidth +
-					';' +
-					(darkMode
-						? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-						: SELECT_INPUT_DEFAULT_STYLE.containerStyles)}
-				itemId="channel_id"
-				label="channel_name"
-				items={channels || []}
-				on:change={handleChannelSelect}
+				containerStyle={'min-width: ' + minWidth}
+				items={channels.map((channel) => ({
+					label: channel.channel_name ?? 'Unknown Channel',
+					value: channel.channel_id ?? ''
+				}))}
 				{placeholder}
-				searchable={true}
+				bind:value={
+					() => selectedChannel?.channel_id,
+					(value) => (selectedChannel = channels.find((channel) => channel.channel_id === value))
+				}
+				clearable
 				disabled={disabled || channels.length === 0}
-				on:input={async (e) => {
-					const filterText = e.detail
-					return filterChannels(filterText)
-				}}
 			/>
 		</div>
 	</div>
 
 	{#if channels.length === 0 && !disabled}
-		<div class="text-xs text-tertiary mt-1"> No channels available </div>
+		<div class="text-xs text-tertiary mt-1">No channels available</div>
 	{/if}
 </div>
-
-<DarkModeObserver on:change={onThemeChange} />
diff --git a/frontend/src/lib/components/ConnectionSection.svelte b/frontend/src/lib/components/ConnectionSection.svelte
index c0b1275625..b69580a13a 100644
--- a/frontend/src/lib/components/ConnectionSection.svelte
+++ b/frontend/src/lib/components/ConnectionSection.svelte
@@ -108,7 +108,7 @@
 						bind:selectedTeam
 						minWidth="180px"
 						disabled={!$enterpriseLicense}
-						on:error={(e) => sendUserToast('Failed to load teams: ' + e.detail.message, true)}
+						onError={(e) => sendUserToast('Failed to load teams: ' + e.message, true)}
 					/>
 				{/if}
 			{:else}
diff --git a/frontend/src/lib/components/CronInput.svelte b/frontend/src/lib/components/CronInput.svelte
index 986a26de2e..16174b5d9b 100644
--- a/frontend/src/lib/components/CronInput.svelte
+++ b/frontend/src/lib/components/CronInput.svelte
@@ -5,14 +5,11 @@
 	// @ts-ignore
 	import Multiselect from 'svelte-multiselect'
 	import { Button } from './common'
-	import Select from '../components/apps/svelte-select/lib/index'
 	import timezones from './timezones'
-	import { SELECT_INPUT_DEFAULT_STYLE } from '$lib/defaults'
-	import { onMount } from 'svelte'
 	import CronBuilder from './CronBuilder.svelte'
 	import Label from './Label.svelte'
 	import CronGen from './copilot/CronGen.svelte'
-	import DarkModeObserver from './DarkModeObserver.svelte'
+	import Select from './Select.svelte'
 
 	export let schedule: string
 	// export let offset: number = -60 * Math.floor(new Date().getTimezoneOffset() / 60)
@@ -171,19 +168,6 @@
 			}).format
 		}
 	}
-	let darkMode: boolean = false
-
-	function onThemeChange() {
-		if (document.documentElement.classList.contains('dark')) {
-			darkMode = true
-		} else {
-			darkMode = false
-		}
-	}
-
-	onMount(() => {
-		onThemeChange()
-	})
 
 	const items = Object.keys(timezones)
 		.map((key) => {
@@ -192,7 +176,7 @@
 					return {
 						value: subKey,
 						label: subKey,
-						group: timezones[key][subKey][1]
+						group: timezones[key][subKey][1] as string
 					}
 				})
 				.flat()
@@ -200,8 +184,6 @@
 		.flat()
 </script>
 
-<DarkModeObserver on:change={onThemeChange} />
-
 <div class="w-full flex space-x-8">
 	<div class="w-full flex flex-col gap-4">
 		<Label label="Cron" class="font-semibold" primary={true}>
@@ -234,17 +216,15 @@
 				</div>
 			{:else}
 				<Select
-					inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-					containerStyles={'border-color: lightgray;' +
-						(darkMode
-							? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-							: SELECT_INPUT_DEFAULT_STYLE.containerStyles)}
 					{items}
+					class="w-full"
+					bind:value={timezone}
 					groupBy={(item) => item.group}
-					on:change={(w) => {
-						timezone = w.detail.label
+					sortBy={(a, b) => {
+						if (a.group[0] === '+' && b.group[0] === '-') return -1
+						if (a.group[0] === '-' && b.group[0] === '+') return 1
+						return a.group.localeCompare(b.group)
 					}}
-					value={timezone}
 				/>
 			{/if}
 		</Label>
diff --git a/frontend/src/lib/components/DBManager.svelte b/frontend/src/lib/components/DBManager.svelte
index cfca62c71b..96381dafc2 100644
--- a/frontend/src/lib/components/DBManager.svelte
+++ b/frontend/src/lib/components/DBManager.svelte
@@ -203,4 +203,4 @@
 			/>
 		</DrawerContent>
 	</Drawer>
-{/if}
+{/if}
\ No newline at end of file
diff --git a/frontend/src/lib/components/DBManagerDrawerButton.svelte b/frontend/src/lib/components/DBManagerDrawerButton.svelte
index 1120f4211f..d0a1b68624 100644
--- a/frontend/src/lib/components/DBManagerDrawerButton.svelte
+++ b/frontend/src/lib/components/DBManagerDrawerButton.svelte
@@ -18,7 +18,7 @@
 	import { Alert } from './common'
 	import { dbDeleteTableActionWithPreviewScript, dbTableOpsWithPreviewScripts } from './dbOps'
 	import { makeCreateTableQuery } from './apps/components/display/dbtable/queries/createTable'
-	import { runPreviewJobAndPollResult } from './jobs/utils'
+	import { runScriptAndPollResult } from './jobs/utils'
 	import { Pane, Splitpanes } from 'svelte-splitpanes'
 	import SqlRepl from './SqlRepl.svelte'
 	import SimpleAgTable from './SimpleAgTable.svelte'
@@ -208,7 +208,7 @@
 								previewSql: (values) =>
 									makeCreateTableQuery(values, resourceType, selectedSchemaKey),
 								async onConfirm(values) {
-									await runPreviewJobAndPollResult({
+									await runScriptAndPollResult({
 										workspace: $workspaceStore,
 										requestBody: {
 											args: { database: '$res:' + resourcePath },
diff --git a/frontend/src/lib/components/DBTableEditor.svelte b/frontend/src/lib/components/DBTableEditor.svelte
index 8381b60c45..0cb4404843 100644
--- a/frontend/src/lib/components/DBTableEditor.svelte
+++ b/frontend/src/lib/components/DBTableEditor.svelte
@@ -59,7 +59,6 @@
 		type DbType
 	} from './apps/components/display/dbtable/utils'
 	import { DB_TYPES } from '$lib/consts'
-	import Select from './apps/svelte-select/lib/Select.svelte'
 	import Popover from './meltComponents/Popover.svelte'
 	import Tooltip from './meltComponents/Tooltip.svelte'
 	import {
@@ -71,8 +70,8 @@
 	import { copyToClipboard } from '$lib/utils'
 	import { getFlatTableNamesFromSchema, type DBSchema } from '$lib/stores'
 	import { twMerge } from 'tailwind-merge'
-	import { SELECT_INPUT_DEFAULT_STYLE } from '$lib/defaults'
 	import DarkModeObserver from './DarkModeObserver.svelte'
+	import Select from './Select.svelte'
 
 	const { onConfirm, resourceType, previewSql, dbSchema, currentSchema }: DBTableEditorProps =
 		$props()
@@ -155,22 +154,19 @@
 							</Cell>
 							<Cell>
 								<Select
-									inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-									containerStyles={darkMode
-										? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-										: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
-									class="!w-48"
-									value={column.datatype}
-									on:change={(e) => {
-										column.datatype = e.detail.value
-										if (datatypeHasLength(column.datatype)) {
-											column.datatype_length = datatypeDefaultLength(column.datatype)
-										} else {
-											column.datatype_length = undefined
+									bind:value={
+										() => column.datatype,
+										(v) => {
+											column.datatype = v
+											if (datatypeHasLength(column.datatype)) {
+												column.datatype_length = datatypeDefaultLength(column.datatype)
+											} else {
+												column.datatype_length = undefined
+											}
 										}
-									}}
-									items={columnTypes}
-									clearable={false}
+									}
+									items={columnTypes.map((type) => ({ value: type, label: type }))}
+									class="w-48"
 								/>
 							</Cell>
 							<Cell last class="flex items-center mt-1.5">
@@ -252,14 +248,12 @@
 						<tr>
 							<Cell first class="flex">
 								<Select
-									inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-									containerStyles={darkMode
-										? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-										: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
-									class={twMerge('!w-48', fkErrors?.emptyTarget ? 'border !border-red-600/60' : '')}
+									inputClass={twMerge(
+										'!w-48',
+										fkErrors?.emptyTarget ? 'border !border-red-600/60' : ''
+									)}
 									placeholder=""
-									value={foreignKey.targetTable}
-									on:change={(e) => (foreignKey.targetTable = e.detail.value)}
+									bind:value={foreignKey.targetTable}
 									items={getFlatTableNamesFromSchema(dbSchema).map((o) => ({
 										value: o,
 										label:
@@ -277,47 +271,39 @@
 										<div class="flex">
 											<div class="flex items-center gap-1 w-60">
 												<!-- Div wrappers with absolute select are to prevent the Select content
-												 		 from overflowing -->
+												 		 from x-overflowing -->
 												<div class="grow h-[2rem] relative">
 													<Select
-														inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-														containerStyles={darkMode
-															? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-															: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
-														class={twMerge(
-															'!absolute inset-0',
+														class="!absolute inset-0"
+														inputClass={twMerge(
 															fkErrors?.nonExistingSourceColumns.includes(column.sourceColumn)
 																? 'border !border-red-600/60'
 																: ''
 														)}
 														placeholder=""
-														value={column.sourceColumn}
-														on:change={(e) => (column.sourceColumn = e.detail.value)}
-														items={values.columns.map((c) => c.name)}
+														bind:value={column.sourceColumn}
+														items={values.columns
+															.filter((c) => c.name.length)
+															.map((c) => ({ value: c.name }))}
 														clearable={false}
 													/>
 												</div>
 												<ArrowRight size={16} class="h-fit shrink-0" />
 												<div class="grow h-[2rem] relative">
 													<Select
-														inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-														containerStyles={darkMode
-															? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-															: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
-														class={twMerge(
-															'!absolute inset-0',
+														class="!absolute inset-0"
+														inputClass={twMerge(
 															fkErrors?.nonExistingTargetColumns.includes(column.targetColumn)
 																? 'border !border-red-600/60'
 																: ''
 														)}
 														placeholder=""
-														value={column.targetColumn}
-														on:change={(e) => (column.targetColumn = e.detail.value)}
+														bind:value={column.targetColumn}
 														items={Object.keys(
 															dbSchema?.schema?.[foreignKey.targetTable?.split('.')?.[0] ?? '']?.[
 																foreignKey.targetTable?.split('.')[1]
 															] ?? {}
-														)}
+														).map((value) => ({ value }))}
 														clearable={false}
 													/>
 												</div>
diff --git a/frontend/src/lib/components/Dev.svelte b/frontend/src/lib/components/Dev.svelte
index 7a91c3b34e..101f576846 100644
--- a/frontend/src/lib/components/Dev.svelte
+++ b/frontend/src/lib/components/Dev.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import SchemaForm from '$lib/components/SchemaForm.svelte'
 	import TestJobLoader from '$lib/components/TestJobLoader.svelte'
-	import { Button, Drawer } from '$lib/components/common'
+	import { Button } from '$lib/components/common'
 	import { WindmillIcon } from '$lib/components/icons'
 	import LogPanel from '$lib/components/scriptEditor/LogPanel.svelte'
 	import {
@@ -14,8 +14,6 @@
 		type FlowModule,
 		WorkspaceService,
 		type InputTransform,
-		type RawScript,
-		type PathScript,
 		type TriggersCount
 	} from '$lib/gen'
 	import { inferArgs } from '$lib/infer'
@@ -39,8 +37,7 @@
 	import { CornerDownLeft, Play } from 'lucide-svelte'
 	import Toggle from './Toggle.svelte'
 	import { setLicense } from '$lib/enterpriseUtils'
-	import type { FlowCopilotContext, FlowCopilotModule } from './copilot/flow'
-	import { pickScript } from './flows/flowStateUtils'
+	import type { FlowCopilotContext } from './copilot/flow'
 	import {
 		approximateFindPythonRelativePath,
 		isTypescriptRelativePath,
@@ -64,10 +61,6 @@
 	}
 
 	let flowCopilotContext: FlowCopilotContext = {
-		drawerStore: writable<Drawer | undefined>(undefined),
-		modulesStore: writable<FlowCopilotModule[]>([]),
-		currentStepStore: writable<string | undefined>(undefined),
-		genFlow,
 		shouldUpdatePropertyType: writable<{
 			[key: string]: 'static' | 'javascript' | undefined
 		}>({}),
@@ -79,33 +72,6 @@
 		}>({}),
 		stepInputsLoading: writable<boolean>(false)
 	}
-	const { modulesStore } = flowCopilotContext
-
-	async function genFlow(idx: number, flowModules: FlowModule[], stepOnly = false) {
-		let module = stepOnly ? $modulesStore[0] : $modulesStore[idx]
-
-		if (module && module.selectedCompletion) {
-			const [hubScriptModule, hubScriptState] = await pickScript(
-				module.selectedCompletion.path,
-				`${module.selectedCompletion.summary} (${module.selectedCompletion.app})`,
-				module.id,
-				undefined
-			)
-			const flowModule: FlowModule & {
-				value: RawScript | PathScript
-			} = {
-				id: module.id,
-				value: hubScriptModule.value,
-				summary: hubScriptModule.summary
-			}
-
-			$flowStateStore[module.id] = hubScriptState
-
-			flowModules.splice(idx, 0, flowModule)
-			$flowStore = $flowStore
-			sendUserToast('Added module', false)
-		}
-	}
 
 	setContext('FlowCopilotContext', flowCopilotContext)
 
@@ -523,7 +489,8 @@
 			selectedTab: undefined,
 			editPanelSize: undefined,
 			payloadData: undefined
-		})
+		}),
+		currentEditor: writable(undefined)
 	})
 	setContext<PropPickerContext>('PropPickerContext', {
 		flowPropPickerConfig: writable<FlowPropPickerConfig | undefined>(undefined),
diff --git a/frontend/src/lib/components/DropdownV2.svelte b/frontend/src/lib/components/DropdownV2.svelte
index 6843c12927..a41ef9e50e 100644
--- a/frontend/src/lib/components/DropdownV2.svelte
+++ b/frontend/src/lib/components/DropdownV2.svelte
@@ -16,7 +16,10 @@
 	import ResolveOpen from '$lib/components/common/menu/ResolveOpen.svelte'
 	import Button from '$lib/components/common/button/Button.svelte'
 	import { twMerge } from 'tailwind-merge'
+	import TriggerableByAI from './TriggerableByAI.svelte'
 
+	export let aiId: string | undefined = undefined
+	export let aiDescription: string | undefined = undefined
 	export let items: Item[] | (() => Item[]) | (() => Promise<Item[]>) = []
 	export let disabled = false
 	export let placement: Placement = 'bottom-end'
@@ -28,6 +31,8 @@
 	export let customWidth: number | undefined = undefined
 	export let customMenu = false
 
+	let buttonEl: HTMLButtonElement | undefined = undefined
+
 	const {
 		elements: { menu, item, trigger },
 		states,
@@ -76,7 +81,9 @@
 
 <ResolveOpen {open} on:open on:close />
 
+<TriggerableByAI id={aiId} description={aiDescription} onTrigger={() => buttonEl?.click()} />
 <button
+	bind:this={buttonEl}
 	class={twMerge('w-full flex items-center justify-end', fixedHeight && 'h-8', $$props.class)}
 	use:melt={$trigger}
 	{disabled}
@@ -116,7 +123,7 @@
 				class="bg-surface border w-56 origin-top-right rounded-md shadow-md focus:outline-none overflow-y-auto py-1 max-h-[50vh]"
 				style={customWidth ? `width: ${customWidth}px` : ''}
 			>
-				<DropdownV2Inner items={computeItems} meltItem={item} />
+				<DropdownV2Inner {aiId} items={computeItems} meltItem={item} />
 			</div>
 		{/if}
 	</div>
diff --git a/frontend/src/lib/components/DropdownV2Inner.svelte b/frontend/src/lib/components/DropdownV2Inner.svelte
index 3c657d7678..9ca0be7234 100644
--- a/frontend/src/lib/components/DropdownV2Inner.svelte
+++ b/frontend/src/lib/components/DropdownV2Inner.svelte
@@ -4,13 +4,16 @@
 	import { twMerge } from 'tailwind-merge'
 	import type { MenubarMenuElements } from '@melt-ui/svelte'
 	import type { Item } from '$lib/utils'
+	import TriggerableByAI from './TriggerableByAI.svelte'
+	import { goto } from '$app/navigation'
 
 	interface Props {
+		aiId?: string
 		items?: Item[] | (() => Item[]) | (() => Promise<Item[]>)
 		meltItem: MenubarMenuElements['item']
 	}
 
-	let { items = [], meltItem }: Props = $props()
+	let { aiId, items = [], meltItem }: Props = $props()
 
 	let computedItems: Item[] | undefined = $state(undefined)
 	async function computeItems() {
@@ -27,29 +30,42 @@
 {#if computedItems}
 	<div class="flex flex-col">
 		{#each computedItems ?? [] as item}
-			<MenuItem
-				on:click={(e) => item?.action?.(e)}
-				href={item?.href}
-				disabled={item?.disabled}
-				class={twMerge(
-					'px-4 py-2 text-primary font-semibold hover:bg-surface-hover cursor-pointer text-xs transition-all',
-					'data-[highlighted]:bg-surface-hover',
-					'flex flex-row gap-2 items-center',
-					item?.disabled && 'text-gray-400 cursor-not-allowed',
-					item?.type === 'delete' &&
-						!item?.disabled &&
-						'text-red-500 hover:bg-red-100 hover:text-red-500 data-[highlighted]:text-red-500 data-[highlighted]:bg-red-100'
-				)}
-				item={meltItem}
+			<TriggerableByAI
+				id={`${aiId ? `${aiId}-${item.displayName}` : undefined}`}
+				description={item.displayName}
+				onTrigger={() => {
+					if (item.action) {
+						item.action({} as MouseEvent)
+					}
+					if (item.href) {
+						goto(item.href)
+					}
+				}}
 			>
-				{#if item.icon}
-					<item.icon size={14} color={item.iconColor} />
-				{/if}
-				<p title={item.displayName} class="truncate grow min-w-0 whitespace-nowrap text-left">
-					{item.displayName}
-				</p>
-				{@render item.extra?.()}
-			</MenuItem>
+				<MenuItem
+					on:click={(e) => item?.action?.(e)}
+					href={item?.href}
+					disabled={item?.disabled}
+					class={twMerge(
+						'px-4 py-2 text-primary font-semibold hover:bg-surface-hover cursor-pointer text-xs transition-all w-full',
+						'data-[highlighted]:bg-surface-hover',
+						'flex flex-row gap-2 items-center',
+						item?.disabled && 'text-gray-400 cursor-not-allowed',
+						item?.type === 'delete' &&
+							!item?.disabled &&
+							'text-red-500 hover:bg-red-100 hover:text-red-500 data-[highlighted]:text-red-500 data-[highlighted]:bg-red-100'
+					)}
+					item={meltItem}
+				>
+					{#if item.icon}
+						<item.icon size={14} color={item.iconColor} />
+					{/if}
+					<p title={item.displayName} class="truncate grow min-w-0 whitespace-nowrap text-left">
+						{item.displayName}
+					</p>
+					{@render item.extra?.()}
+				</MenuItem>
+			</TriggerableByAI>
 		{/each}
 	</div>
 {:else}
diff --git a/frontend/src/lib/components/DynSelect.svelte b/frontend/src/lib/components/DynSelect.svelte
index ad85299f69..1c4174ffc4 100644
--- a/frontend/src/lib/components/DynSelect.svelte
+++ b/frontend/src/lib/components/DynSelect.svelte
@@ -2,7 +2,7 @@
 	import { SELECT_INPUT_DEFAULT_STYLE } from '$lib/defaults'
 	import type { Script } from '$lib/gen'
 	import { deepEqual } from 'fast-equals'
-	import Select from './apps/svelte-select/lib/Select.svelte'
+	import SelectLegacy from './apps/svelte-select/lib/SelectLegacy.svelte'
 	import DarkModeObserver from './DarkModeObserver.svelte'
 	import ResultJobLoader from './ResultJobLoader.svelte'
 	import Tooltip from './Tooltip.svelte'
@@ -74,7 +74,7 @@
 						{ ...args, text, _ENTRYPOINT_OVERRIDE: entrypoint },
 						undefined,
 						cb
-				  )
+					)
 				: resultJobLoader?.runScriptByHash(
 						helperScript?.hash ?? 'NO_HASH',
 						{
@@ -83,7 +83,7 @@
 							_ENTRYPOINT_OVERRIDE: entrypoint
 						},
 						cb
-				  )
+					)
 		})
 	}
 
@@ -123,7 +123,7 @@
 	<div class="w-full flex-col flex">
 		<div class="w-full">
 			{#key renderCount}
-				<Select
+				<SelectLegacy
 					on:error={(e) => {
 						error = e.detail.details
 					}}
diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte
index 8e573c766d..16dedf01c6 100644
--- a/frontend/src/lib/components/Editor.svelte
+++ b/frontend/src/lib/components/Editor.svelte
@@ -153,7 +153,7 @@
 	import { AIChatEditorHandler } from './copilot/chat/monaco-adapter'
 	import GlobalReviewButtons from './copilot/chat/GlobalReviewButtons.svelte'
 	import { writable } from 'svelte/store'
-	import { formatResourceTypes } from './copilot/chat/core'
+	import { formatResourceTypes } from './copilot/chat/script/core'
 	import FakeMonacoPlaceHolder from './FakeMonacoPlaceHolder.svelte'
 	// import EditorTheme from './EditorTheme.svelte'
 
@@ -187,7 +187,6 @@
 	export let files: Record<string, { code: string; readonly?: boolean }> | undefined = {}
 	export let extraLib: string | undefined = undefined
 	export let changeTimeout: number = 500
-	export let isAiPanelOpen: boolean = false
 	export let loadAsync = false
 
 	let lang = scriptLangToEditorLang(scriptLang)
@@ -344,7 +343,10 @@
 	}
 
 	export function setCode(ncode: string, noHistory: boolean = false): void {
-		code = ncode
+		if (code != ncode) {
+			code = ncode
+		}
+
 		if (noHistory) {
 			editor?.setValue(ncode)
 		} else {
@@ -364,6 +366,15 @@
 		}
 	}
 
+	function updateCode() {
+		const ncode = getCode()
+		if (code == ncode) {
+			return
+		}
+		code = ncode
+		dispatch('change', ncode)
+	}
+
 	export function append(code: string): void {
 		if (editor) {
 			const lineCount = editor.getModel()?.getLineCount() || 0
@@ -387,7 +398,7 @@
 
 	export async function format() {
 		if (editor) {
-			code = getCode()
+			updateCode()
 			if (lang != 'shell' && lang != 'nu') {
 				if ($formatOnSave != false) {
 					if (scriptLang == 'deno' && languageClients.length > 0) {
@@ -424,7 +435,7 @@
 						await editor?.getAction('editor.action.formatDocument')?.run()
 					}
 				}
-				code = getCode()
+				updateCode()
 			}
 			if (formatAction) {
 				formatAction()
@@ -1275,9 +1286,7 @@
 		editor?.onDidChangeModelContent((event) => {
 			timeoutModel && clearTimeout(timeoutModel)
 			timeoutModel = setTimeout(() => {
-				let ncode = getCode()
-				code = ncode
-				dispatch('change', ncode)
+				updateCode()
 			}, changeTimeout)
 
 			ataModel && clearTimeout(ataModel)
@@ -1296,12 +1305,12 @@
 			dispatch('focus')
 
 			editor?.addCommand(KeyMod.CtrlCmd | KeyCode.KeyS, function () {
-				code = getCode()
+				updateCode()
 				shouldBindKey && format && format()
 			})
 
 			editor?.addCommand(KeyMod.CtrlCmd | KeyCode.Enter, function () {
-				code = getCode()
+				updateCode()
 				shouldBindKey && cmdEnterAction && cmdEnterAction()
 			})
 
@@ -1323,9 +1332,6 @@
 						startLine: selection.startLineNumber,
 						endLine: selection.endLineNumber
 					})
-					if (!isAiPanelOpen) {
-						dispatch('toggleAiPanel')
-					}
 				} else {
 					dispatch('toggleAiPanel')
 				}
diff --git a/frontend/src/lib/components/EditorBar.svelte b/frontend/src/lib/components/EditorBar.svelte
index 14fe08e45e..c2ae98599c 100644
--- a/frontend/src/lib/components/EditorBar.svelte
+++ b/frontend/src/lib/components/EditorBar.svelte
@@ -594,6 +594,8 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
 		<div class="flex items-center gap-0.5">
 			{#if showContextVarPicker && customUi?.contextVar != false}
 				<Button
+					aiId="editor-bar-add-context-variable"
+					aiDescription="Add context variable"
 					title="Add context variable"
 					color="light"
 					on:click={contextualVariablePicker.openDrawer}
@@ -607,6 +609,8 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
 			{/if}
 			{#if showVarPicker && customUi?.variable != false}
 				<Button
+					aiId="editor-bar-add-variable"
+					aiDescription="Add variable"
 					title="Add variable"
 					color="light"
 					btnClasses="!font-medium text-tertiary"
@@ -622,6 +626,8 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
 
 			{#if showResourcePicker && customUi?.resource != false}
 				<Button
+					aiId="editor-bar-add-resource"
+					aiDescription="Add resource"
 					title="Add resource"
 					btnClasses="!font-medium text-tertiary"
 					size="xs"
@@ -637,6 +643,8 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
 
 			{#if showResourceTypePicker && customUi?.type != false}
 				<Button
+					aiId="editor-bar-add-resource-type"
+					aiDescription="Add resource type"
 					title="Add resource type"
 					btnClasses="!font-medium text-tertiary"
 					size="xs"
@@ -652,6 +660,8 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
 
 			{#if customUi?.reset != false}
 				<Button
+					aiId="editor-bar-reset-content"
+					aiDescription="Reset content"
 					title="Reset Content"
 					btnClasses="!font-medium text-tertiary"
 					size="xs"
@@ -668,6 +678,8 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
 			{#if customUi?.assistants != false}
 				{#if lang == 'deno' || lang == 'python3' || lang == 'go' || lang == 'bash' || lang == 'nu'}
 					<Button
+						aiId="editor-bar-reload-assistants"
+						aiDescription="Reload assistants"
 						btnClasses="!font-medium text-tertiary"
 						size="xs"
 						spacingSize="md"
diff --git a/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte b/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte
index 472daa9d1e..53c4094158 100644
--- a/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte
+++ b/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte
@@ -453,11 +453,14 @@
 					containerClass="flex-grow"
 					minWidth="200px"
 					placeholder="Select Teams channel"
-					channels={teams_channels as any[]}
-					on:change={(e) => (handlerExtraArgs['channel'] = e.detail.channel_id)}
-					selectedChannel={handlerExtraArgs['channel']
-						? (teams_channels.find((ch) => ch.channel_id === handlerExtraArgs['channel']) as any)
-						: undefined}
+					channels={teams_channels}
+					bind:selectedChannel={
+						() =>
+							handlerExtraArgs['channel']
+								? teams_channels.find((ch) => ch.channel_id === handlerExtraArgs['channel'])
+								: undefined,
+						(channel) => (handlerExtraArgs['channel'] = channel?.channel_id)
+					}
 				/>
 				<div class="flex-shrink-0">
 					<button
diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index 93fc9f1645..fd3b563a41 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -5,16 +5,13 @@
 		type FlowModule,
 		DraftService,
 		type PathScript,
-		ScriptService,
 		type OpenFlow,
-		type RawScript,
 		type InputTransform,
 		type TriggersCount,
 		CaptureService
 	} from '$lib/gen'
-	import { initHistory, push, redo, undo } from '$lib/history'
+	import { initHistory, redo, undo } from '$lib/history'
 	import {
-		copilotInfo,
 		enterpriseLicense,
 		tutorialsToDo,
 		userStore,
@@ -27,14 +24,13 @@
 		generateRandomString,
 		orderedJsonStringify,
 		replaceFalseWithUndefined,
-		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 { onMount, setContext, tick, type ComponentType } from 'svelte'
+	import { onMount, setContext, type ComponentType } from 'svelte'
 	import { writable, type Writable } from 'svelte/store'
 	import CenteredPage from './CenteredPage.svelte'
 	import { Badge, Button, UndoRedo } from './common'
@@ -42,26 +38,16 @@
 	import ScriptEditorDrawer from './flows/content/ScriptEditorDrawer.svelte'
 	import type { FlowState } from './flows/flowState'
 	import { dfs as dfsApply } from './flows/dfs'
-	import { dfs, getPreviousIds } from './flows/previousResults'
 	import FlowImportExportMenu from './flows/header/FlowImportExportMenu.svelte'
 	import FlowPreviewButtons from './flows/header/FlowPreviewButtons.svelte'
 	import type { FlowEditorContext, FlowInput, FlowInputEditorState } from './flows/types'
-	import { cleanInputs, emptyFlowModuleState } from './flows/utils'
+	import { cleanInputs } from './flows/utils'
 	import { Calendar, Pen, Save, DiffIcon, HistoryIcon, FileJson, type Icon } from 'lucide-svelte'
 	import Awareness from './Awareness.svelte'
 	import { getAllModules } from './flows/flowExplorer'
-	import {
-		stepCopilot,
-		type FlowCopilotModule,
-		glueCopilot,
-		type FlowCopilotContext
-	} from './copilot/flow'
-	import type { Schema, SchemaProperty } from '$lib/common'
-	import FlowCopilotDrawer from './copilot/FlowCopilotDrawer.svelte'
-	import FlowCopilotStatus from './copilot/FlowCopilotStatus.svelte'
-	import { fade } from 'svelte/transition'
-	import { loadFlowModuleState, pickScript } from './flows/flowStateUtils'
-	import FlowCopilotInputsModal from './copilot/FlowCopilotInputsModal.svelte'
+	import { type FlowCopilotContext } from './copilot/flow'
+	import FlowAIButton from './copilot/chat/flow/FlowAIButton.svelte'
+	import { loadFlowModuleState } from './flows/flowStateUtils'
 	import FlowBuilderTutorials from './FlowBuilderTutorials.svelte'
 	import Dropdown from '$lib/components/DropdownV2.svelte'
 	import FlowTutorials from './FlowTutorials.svelte'
@@ -82,6 +68,7 @@
 	} from './triggers/utils'
 	import DraftTriggersConfirmationModal from './common/confirmationModal/DraftTriggersConfirmationModal.svelte'
 	import { Triggers } from './triggers/triggers.svelte'
+	import { aiChatManager } from './copilot/chat/AIChatManager.svelte'
 
 	export let initialPath: string = ''
 	export let pathStoreInit: string | undefined = undefined
@@ -545,6 +532,7 @@
 
 	setContext<FlowEditorContext>('FlowEditorContext', {
 		selectedId: selectedIdStore,
+		currentEditor: writable(undefined),
 		previewArgs: previewArgsStore,
 		scriptEditorDrawer,
 		moving,
@@ -582,6 +570,7 @@
 	})
 
 	export async function loadTriggers() {
+		if (initialPath == '') return
 		$triggersCount = await FlowService.getTriggersCountOfFlow({
 			workspace: $workspaceStore!,
 			path: initialPath
@@ -691,10 +680,6 @@
 	}
 
 	let flowCopilotContext: FlowCopilotContext = {
-		drawerStore: writable<Drawer | undefined>(undefined),
-		modulesStore: writable<FlowCopilotModule[]>([]),
-		currentStepStore: writable<string | undefined>(undefined),
-		genFlow: undefined,
 		shouldUpdatePropertyType: writable<{
 			[key: string]: 'static' | 'javascript' | undefined
 		}>({}),
@@ -709,475 +694,6 @@
 
 	setContext('FlowCopilotContext', flowCopilotContext)
 
-	const {
-		drawerStore: copilotDrawerStore,
-		modulesStore: copilotModulesStore,
-		currentStepStore: copilotCurrentStepStore,
-		shouldUpdatePropertyType
-	} = flowCopilotContext
-
-	let doneTs = 0
-	async function getHubCompletions(text: string, idx: number, type: 'trigger' | 'script') {
-		try {
-			// make sure we display the results of the last request last
-			const ts = Date.now()
-			const scripts = (
-				await ScriptService.queryHubScripts({
-					text: `${text}`,
-					limit: 3,
-					kind: type
-				})
-			).map((s) => ({
-				...s,
-				path: `hub/${s.version_id}/${s.app}/${s.summary.toLowerCase().replaceAll(/\s+/g, '_')}`
-			}))
-			if (ts < doneTs) return
-			doneTs = ts
-
-			$copilotModulesStore[idx].hubCompletions = scripts as {
-				path: string
-				summary: string
-				kind: string
-				app: string
-				ask_id: number
-				id: number
-				version_id: number
-			}[]
-		} catch (err) {
-			if (err.name !== 'CancelError') throw err
-		}
-	}
-
-	let abortController: AbortController | undefined = undefined
-	let copilotLoading = false
-	let flowCopilotMode: 'trigger' | 'sequence' = 'sequence'
-	let copilotStatus: string = ''
-	let copilotFlowInputs: Record<string, SchemaProperty> = {}
-	let copilotFlowRequiredInputs: string[] = []
-	let openCopilotInputsModal = false
-
-	function setInitCopilotModules(mode: typeof flowCopilotMode) {
-		$copilotModulesStore = [
-			{
-				id: 'a',
-				type: mode === 'trigger' ? 'trigger' : 'script',
-				description: '',
-				code: '',
-				hubCompletions: [],
-				selectedCompletion: undefined,
-				source: undefined,
-				lang: undefined
-			},
-			{
-				id: 'b',
-				type: 'script',
-				description: '',
-				code: '',
-				hubCompletions: [],
-				selectedCompletion: undefined,
-				source: undefined,
-				lang: undefined
-			}
-		]
-	}
-
-	$: setInitCopilotModules(flowCopilotMode)
-
-	function applyCopilotFlowInputs() {
-		const properties = {
-			...($flowStore.schema?.properties as Record<string, SchemaProperty> | undefined),
-			...copilotFlowInputs
-		}
-		const required = [
-			...(($flowStore.schema?.required as string[] | undefined) ?? []),
-			...copilotFlowRequiredInputs
-		]
-		$flowStore.schema = {
-			$schema: 'https://json-schema.org/draft/2020-12/schema',
-			properties,
-			required,
-			type: 'object'
-		}
-	}
-
-	function clearFlowInputsFromStep(id: string | undefined) {
-		const module: FlowModule | undefined = dfs(id, $flowStore)[0]
-		if (module?.value.type === 'rawscript' || module?.value.type === 'script') {
-			// clear step inputs that start with flow_input. but not flow_input.iter
-			for (const key in module.value.input_transforms) {
-				const input = module.value.input_transforms[key]
-				if (
-					input.type === 'javascript' &&
-					input.expr.includes('flow_input.') &&
-					!input.expr.includes('flow_input.iter')
-				) {
-					module.value.input_transforms[key] = {
-						type: 'static',
-						value: undefined
-					}
-					$shouldUpdatePropertyType[key] = 'static'
-				}
-			}
-		}
-		$flowStore = $flowStore
-	}
-
-	async function finishStepGen() {
-		copilotFlowInputs = {}
-		copilotFlowRequiredInputs = []
-		setInitCopilotModules(flowCopilotMode)
-		copilotStatus = "Done! Just check the step's inputs and you're good to go!"
-		await sleep(3000)
-		copilotStatus = ''
-	}
-
-	function snakeCase(e: string): string {
-		if (e.toLowerCase() === e) {
-			return e
-		}
-
-		return (
-			e
-				.match(/([A-Z])/g)
-				?.reduce((str, c) => str.replace(new RegExp(c), '_' + c.toLowerCase()), e)
-				?.substring(e.slice(0, 1).match(/([A-Z])/g) ? 1 : 0) ?? e
-		)
-	}
-	async function genFlow(idx: number, flowModules: FlowModule[], stepOnly = false) {
-		try {
-			push(history, $flowStore)
-			let module = stepOnly ? $copilotModulesStore[0] : $copilotModulesStore[idx]
-
-			copilotLoading = true
-			copilotStatus = "Generating code for step '" + module.id + "'..."
-			$copilotCurrentStepStore = module.id
-			focusCopilot()
-
-			if (!stepOnly && flowModules.length > idx) {
-				select('')
-				await tick()
-				flowModules.splice(idx, flowModules.length - idx)
-				$flowStore = $flowStore
-				focusCopilot()
-			}
-
-			if (idx === 0 && !stepOnly) {
-				$flowStore.schema = {
-					$schema: 'https://json-schema.org/draft/2020-12/schema',
-					properties: {},
-					required: [],
-					type: 'object'
-				}
-			}
-
-			const flowModule: FlowModule & {
-				value: RawScript | PathScript
-			} = {
-				id: module.id,
-				stop_after_if:
-					module.type === 'trigger'
-						? {
-								expr: 'result == undefined || Array.isArray(result) && result.length == 0',
-								skip_if_stopped: true
-							}
-						: undefined,
-				value: {
-					input_transforms: {},
-					content: '',
-					language: module.lang ?? 'bun',
-					type: 'rawscript'
-				},
-				summary: module.description
-			}
-
-			let isHubStep = false
-			if (module.source === 'hub' && module.selectedCompletion) {
-				isHubStep = true
-				const [hubScriptModule, hubScriptState] = await pickScript(
-					module.selectedCompletion.path,
-					`${module.selectedCompletion.summary} (${module.selectedCompletion.app})`,
-					module.id,
-					undefined
-				)
-				flowModule.value = hubScriptModule.value
-				flowModule.summary = hubScriptModule.summary
-				$flowStateStore[module.id] = hubScriptState
-			} else {
-				$flowStateStore[module.id] = emptyFlowModuleState()
-			}
-
-			if (stepOnly) {
-				flowModules.splice(idx, 0, flowModule)
-			} else if (idx === 1 && $copilotModulesStore[idx - 1].type === 'trigger') {
-				const loopModule: FlowModule = {
-					id: module.id + '_loop',
-					value: {
-						type: 'forloopflow',
-						iterator: {
-							type: 'javascript',
-							expr: 'results.a'
-						},
-						skip_failures: true,
-						modules: [flowModule]
-					}
-				}
-				const loopState = await loadFlowModuleState(loopModule)
-				$flowStateStore[loopModule.id] = loopState
-				flowModules.push(loopModule)
-			} else {
-				flowModules.push(flowModule)
-			}
-
-			$copilotDrawerStore?.closeDrawer()
-			await tick()
-			select(module.id)
-			await tick()
-			focusCopilot()
-
-			let isFirstInLoop = false
-			const parents = dfs(module.id, $flowStore).slice(1)
-			if (
-				parents[0]?.value.type === 'forloopflow' &&
-				parents[0].value.modules[0].id === module.id
-			) {
-				isFirstInLoop = true
-			}
-			const prevNodeId = getPreviousIds(module.id, $flowStore, false)[0] as string | undefined
-			const pastModule = dfs(prevNodeId, $flowStore, false)[0] as FlowModule | undefined
-
-			if (!module.source) {
-				throw new Error('Invalid copilot module source')
-			}
-
-			if (module.source === 'custom') {
-				const deltaStore = writable<string>('')
-				const unsubscribe = deltaStore.subscribe(async (delta) => {
-					module.editor?.append(delta)
-				})
-
-				abortController = new AbortController()
-				await stepCopilot(
-					module,
-					deltaStore,
-					$workspaceStore!,
-					pastModule?.value.type === 'rawscript' || pastModule?.value.type === 'script'
-						? (pastModule as FlowModule & {
-								value: RawScript | PathScript
-							})
-						: undefined,
-					isFirstInLoop,
-					abortController
-				)
-				unsubscribe()
-			}
-
-			copilotStatus = "Generating inputs for step '" + module.id + "'..."
-			await sleep(500) // make sure code was parsed
-
-			try {
-				if (
-					(flowModule.value.type === 'rawscript' || flowModule.value.type === 'script') &&
-					(pastModule === undefined ||
-						pastModule.value.type === 'rawscript' ||
-						pastModule.value.type === 'script')
-				) {
-					const stepSchema: Schema = JSON.parse(JSON.stringify($flowStateStore[module.id].schema)) // deep copy
-					if (isHubStep && pastModule !== undefined && $copilotInfo.enabled) {
-						// ask AI to set step inputs
-						abortController = new AbortController()
-						const { inputs, allExprs } = await glueCopilot(
-							flowModule.value.input_transforms,
-							$workspaceStore!,
-							pastModule as FlowModule & {
-								value: RawScript | PathScript
-							},
-							isFirstInLoop,
-							abortController
-						)
-
-						// create flow inputs used by AI for autocompletion
-						copilotFlowInputs = {}
-						copilotFlowRequiredInputs = []
-						Object.entries(allExprs).forEach(([key, expr]) => {
-							if (expr.includes('flow_input.') && !expr.includes('flow_input.iter.')) {
-								const flowInputKey = expr.match(/flow_input\.([A-Za-z0-9_]+)/)?.[1]
-								if (
-									flowInputKey !== undefined &&
-									(!$flowStore.schema ||
-										!(flowInputKey in (($flowStore.schema.properties as any) ?? {}))) // prevent overriding flow inputs
-								) {
-									if (key in stepSchema.properties) {
-										copilotFlowInputs[flowInputKey] = stepSchema.properties[key]
-										if (stepSchema.required.includes(key)) {
-											copilotFlowRequiredInputs.push(flowInputKey)
-										}
-									} else {
-										// when the key is nested (e.g. body.content)
-										const [firstKey, ...rest] = key.split('.')
-										const restKey = rest.join('.')
-										const firstKeyProperties = stepSchema.properties[firstKey]?.properties
-										if (firstKeyProperties !== undefined && restKey in firstKeyProperties) {
-											copilotFlowInputs[flowInputKey] = firstKeyProperties[restKey]
-											if (firstKeyProperties[restKey].required?.includes(flowInputKey)) {
-												copilotFlowRequiredInputs.push(flowInputKey)
-											}
-										}
-									}
-								}
-							}
-						})
-
-						if (!stepOnly) {
-							applyCopilotFlowInputs()
-						}
-
-						// set step inputs
-						Object.entries(inputs).forEach(([key, expr]) => {
-							flowModule.value.input_transforms[key] = {
-								type: 'javascript',
-								expr
-							}
-							$shouldUpdatePropertyType[key] = 'javascript'
-						})
-					} else {
-						if (isHubStep && pastModule !== undefined && !$copilotInfo.enabled) {
-							sendUserToast(
-								'For better input generation, enable Windmill AI in the workspace settings',
-								true
-							)
-						}
-
-						// create possible flow inputs for autocompletion
-						copilotFlowInputs = {}
-						copilotFlowRequiredInputs = []
-						Object.keys(flowModule.value.input_transforms).forEach((key) => {
-							if (key !== 'prev_output') {
-								const schema = $flowStateStore[module.id].schema
-								const schemaProperty = Object.entries(schema?.properties ?? {}).find(
-									(x) => x[0] === key
-								)?.[1]
-								const snakeKey = snakeCase(key)
-								if (
-									schemaProperty &&
-									(!$flowStore.schema ||
-										!(snakeKey in ($flowStore?.schema?.properties ?? ({} as any)))) // prevent overriding flow inputs
-								) {
-									copilotFlowInputs[snakeKey] = schemaProperty
-									if (schema?.required.includes(snakeKey)) {
-										copilotFlowRequiredInputs.push(snakeKey)
-									}
-								}
-							}
-						})
-						if (!stepOnly) {
-							applyCopilotFlowInputs()
-						}
-
-						// programatically set step inputs
-						for (const key of Object.keys(flowModule.value.input_transforms)) {
-							const snakeKey = snakeCase(key)
-							flowModule.value.input_transforms[key] = {
-								type: 'javascript',
-								expr:
-									key === 'prev_output'
-										? isFirstInLoop
-											? 'flow_input.iter.value'
-											: pastModule
-												? 'results.' + pastModule.id
-												: 'flow_input.' + snakeKey
-										: 'flow_input.' + snakeKey
-							}
-							$shouldUpdatePropertyType[key] = 'javascript'
-						}
-					}
-
-					$flowStore = $flowStore // force rerendering
-				} else {
-					if (
-						pastModule !== undefined &&
-						pastModule.value.type !== 'rawscript' &&
-						pastModule.value.type !== 'script'
-					) {
-						sendUserToast(
-							`Linking to previous step ${pastModule.id} of type ${pastModule.value.type} is not yet supported`,
-							true
-						)
-					} else {
-						sendUserToast('Something went wrong, could not generate step inputs', true)
-					}
-				}
-			} catch (err) {
-				console.error(err)
-			}
-
-			if (stepOnly) {
-				$copilotCurrentStepStore = undefined
-				copilotLoading = false
-				copilotStatus = ''
-				if (Object.keys(copilotFlowInputs).length > 0) {
-					openCopilotInputsModal = true
-				} else {
-					finishStepGen()
-				}
-			} else {
-				copilotStatus =
-					"Waiting for the user to validate code and inputs of step '" + module.id + "'"
-			}
-		} catch (err) {
-			if (stepOnly) {
-				copilotStatus = ''
-				$copilotCurrentStepStore = undefined
-				setInitCopilotModules(flowCopilotMode)
-			}
-			if (err?.message) {
-				sendUserToast('Failed to generate code: ' + err.message, true)
-			} else {
-				sendUserToast('Failed to generate code', true)
-				console.error(err)
-			}
-		} finally {
-			copilotLoading = false
-		}
-	}
-
-	flowCopilotContext.genFlow = genFlow
-
-	async function finishCopilotFlowBuilder() {
-		copilotLoading = true
-		select('Input')
-		$copilotCurrentStepStore = 'Input'
-
-		copilotStatus = "Done! Just check the flow's inputs and you're good to go!"
-		$copilotCurrentStepStore = undefined
-		copilotLoading = false
-		await sleep(3000)
-		copilotStatus = ''
-	}
-
-	function focusCopilot() {
-		document.querySelectorAll('.splitpanes__splitter').forEach((el) => {
-			el.classList.add('hidden')
-		})
-		document.querySelectorAll('#flow-graph *').forEach((el) => {
-			if (el instanceof HTMLElement) {
-				el.style.pointerEvents = 'none'
-			}
-		})
-	}
-
-	function blurCopilot() {
-		document.querySelectorAll('.splitpanes__splitter').forEach((el) => {
-			el.classList.remove('hidden')
-		})
-		document.querySelectorAll('#flow-graph *').forEach((el) => {
-			if (el instanceof HTMLElement) {
-				el.style.pointerEvents = ''
-			}
-		})
-	}
-
-	$: $copilotCurrentStepStore === undefined && blurCopilot()
-
 	let renderCount = 0
 	let flowTutorials: FlowTutorials | undefined = undefined
 
@@ -1276,7 +792,6 @@
 
 {#key renderCount}
 	{#if !$userStore?.operator}
-		<FlowCopilotDrawer {getHubCompletions} {genFlow} bind:flowCopilotMode />
 		{#if $pathStore}
 			<FlowHistory
 				bind:this={flowHistory}
@@ -1286,18 +801,6 @@
 		{/if}
 		<FlowYamlEditor bind:drawer={yamlEditorDrawer} />
 		<FlowImportExportMenu bind:drawer={jsonViewerDrawer} />
-		<FlowCopilotInputsModal
-			on:confirmed={async () => {
-				applyCopilotFlowInputs()
-				finishStepGen()
-			}}
-			on:canceled={async () => {
-				clearFlowInputsFromStep($copilotModulesStore[0]?.id)
-				finishStepGen()
-			}}
-			bind:open={openCopilotInputsModal}
-			inputs={Object.keys(copilotFlowInputs)}
-		/>
 		<ScriptEditorDrawer bind:this={$scriptEditorDrawer} />
 
 		<div class="flex flex-col flex-1 h-screen">
@@ -1305,10 +808,6 @@
 			<div
 				class="justify-between flex flex-row items-center pl-2.5 pr-6 space-x-4 scrollbar-hidden overflow-x-auto max-h-12 h-full relative"
 			>
-				{#if $copilotCurrentStepStore !== undefined}
-					<div transition:fade class="absolute inset-0 bg-gray-500 bg-opacity-75 z-[900] !m-0"
-					></div>
-				{/if}
 				<div class="flex w-full max-w-md gap-4 items-center">
 					<Summary
 						disabled={customUi?.topBar?.editableSummary == false}
@@ -1447,14 +946,8 @@
 							</div>
 						</Button>
 					{/if}
-					{#if !disableAi && customUi?.topBar?.aiBuilder != false}
-						<FlowCopilotStatus
-							{copilotLoading}
-							bind:copilotStatus
-							{genFlow}
-							{finishCopilotFlowBuilder}
-							{abortController}
-						/>
+					{#if !disableAi && customUi?.topBar?.aiBuilder != false && !aiChatManager.open}
+						<FlowAIButton openPanel={() => aiChatManager.openChat()} />
 					{/if}
 					<FlowPreviewButtons
 						on:openTriggers={(e) => {
diff --git a/frontend/src/lib/components/FolderPicker.svelte b/frontend/src/lib/components/FolderPicker.svelte
new file mode 100644
index 0000000000..dd7f623813
--- /dev/null
+++ b/frontend/src/lib/components/FolderPicker.svelte
@@ -0,0 +1,126 @@
+<script lang="ts">
+	import { FolderService } from '$lib/gen'
+	import { workspaceStore, userStore } from '$lib/stores'
+	import { Plus, Eye } from 'lucide-svelte'
+	import { Button, Drawer, DrawerContent } from './common'
+	import FolderEditor from './FolderEditor.svelte'
+
+	let folders: { name: string; write: boolean }[] = $state([])
+	let newFolder: Drawer | null = $state(null)
+	let viewFolder: Drawer | null = $state(null)
+	let newFolderName: string = $state('')
+	let folderCreated: string | undefined = $state(undefined)
+
+	type Props = {
+		folderName: string
+		initialPath?: string
+		disabled?: boolean
+		disableEditing?: boolean
+	}
+
+	let {
+		folderName = $bindable(''),
+		initialPath = $bindable(undefined),
+		disabled = $bindable(undefined),
+		disableEditing = $bindable(undefined)
+	}: Props = $props()
+
+	async function loadFolders(): Promise<void> {
+		let initialFolders: { name: string; write: boolean }[] = []
+		let initialFolder = ''
+		if (initialPath?.split('/')?.[0] == 'f') {
+			initialFolder = initialPath?.split('/')?.[1]
+			initialFolders.push({ name: initialFolder, write: true })
+		}
+
+		const excludedFolders = [initialFolder, 'app_groups', 'app_custom', 'app_themes']
+
+		folders = initialFolders.concat(
+			(
+				await FolderService.listFolderNames({
+					workspace: $workspaceStore!
+				})
+			)
+				.filter((x) => !excludedFolders.includes(x))
+				.map((x) => ({
+					name: x,
+					write:
+						$userStore?.folders?.includes(x) == true ||
+						($userStore?.is_admin ?? false) ||
+						($userStore?.is_super_admin ?? false)
+				}))
+		)
+	}
+
+	async function addFolder() {
+		await FolderService.createFolder({
+			workspace: $workspaceStore ?? '',
+			requestBody: { name: newFolderName }
+		})
+		folderCreated = newFolderName
+		$userStore?.folders?.push(newFolderName)
+		loadFolders()
+	}
+
+	loadFolders()
+</script>
+
+<Drawer bind:this={newFolder}>
+	<DrawerContent
+		title="New Folder"
+		on:close={() => {
+			newFolder?.closeDrawer()
+			folderCreated = undefined
+		}}
+	>
+		{#if !folderCreated}
+			<div class="flex flex-col gap-2">
+				<input placeholder="New folder name" bind:value={newFolderName} />
+				<Button size="md" startIcon={{ icon: Plus }} disabled={!newFolderName} on:click={addFolder}>
+					New&nbsp;folder
+				</Button>
+			</div>
+		{:else}
+			<FolderEditor name={folderCreated} />
+		{/if}
+	</DrawerContent>
+</Drawer>
+
+<Drawer bind:this={viewFolder}>
+	<DrawerContent title="Folder {folderName}" on:close={viewFolder.closeDrawer}>
+		<FolderEditor name={folderName ?? ''} />
+	</DrawerContent>
+</Drawer>
+
+<div class="flex flex-row items-center gap-1 w-full">
+	<select class="grow w-full" disabled={disabled || disableEditing} bind:value={folderName}>
+		{#if folders?.length == 0}
+			<option disabled>No folders</option>
+		{/if}
+		{#each folders as { name, write }}
+			<option disabled={!write}>{name}{write ? '' : ' (read-only)'}</option>
+		{/each}
+	</select>
+	<Button
+		title="View folder"
+		btnClasses="!p-1.5"
+		variant="border"
+		color="light"
+		size="xs"
+		disabled={!folderName || folderName == ''}
+		on:click={viewFolder.openDrawer}
+		iconOnly
+		startIcon={{ icon: Eye }}
+	/>
+	<Button
+		title="New folder"
+		btnClasses="!p-1.5"
+		variant="border"
+		color="light"
+		size="xs"
+		{disabled}
+		on:click={newFolder.openDrawer}
+		iconOnly
+		startIcon={{ icon: Plus }}
+	/>
+</div>
diff --git a/frontend/src/lib/components/HttpAgentWorkerDrawer.svelte b/frontend/src/lib/components/HttpAgentWorkerDrawer.svelte
index 7250a906c8..9a505bad55 100644
--- a/frontend/src/lib/components/HttpAgentWorkerDrawer.svelte
+++ b/frontend/src/lib/components/HttpAgentWorkerDrawer.svelte
@@ -8,16 +8,15 @@
 	import { enterpriseLicense, superadmin } from '$lib/stores'
 	import CollapseLink from './CollapseLink.svelte'
 
-	export let customTags: string[] | undefined
-	let selectedTags: string[] = !$enterpriseLicense ? ['agent_test'] : []
+	type Props = {
+		customTags: string[] | undefined
+	}
+	let { customTags = $bindable() }: Props = $props()
+	let selectedTags: string[] = $state(!$enterpriseLicense ? ['agent_test'] : [])
+	let workerGroup: string = $state('agent')
+	let token: string = $state('')
 
-	let workerGroup: string = 'agent'
-
-	let token: string = ''
-
-	$: selectedTags && selectedTags.length > 0 && $superadmin && workerGroup && refreshToken()
-
-	async function refreshToken() {
+	async function refreshToken(workerGroup: string, selectedTags: string[]) {
 		try {
 			const newToken = await AgentWorkersService.createAgentToken({
 				requestBody: {
@@ -32,6 +31,12 @@
 			sendUserToast('Error creating agent token: ' + error.toString(), true)
 		}
 	}
+
+	$effect(() => {
+		if (selectedTags.length > 0 && $superadmin) {
+			refreshToken(workerGroup, selectedTags)
+		}
+	})
 </script>
 
 <div class="flex flex-col gap-y-4">
@@ -55,64 +60,81 @@
 		{/if}
 		<TagsToListenTo disabled={!$enterpriseLicense} bind:worker_tags={selectedTags} {customTags} />
 	</Section>
+
 	<Section label="Generated JWT token" primary>
-		<div class="relative max-w-md">
+		{#if !$enterpriseLicense}
+			<div class="text-sm text-secondary mb-2 max-w-md">
+				Agent workers are only available in the enterprise edition. For evaluation purposes, you can
+				only use the tag `agent_test` tag and it is limited to 100 jobs.
+			</div>
+		{/if}
+		<div class="relative max-w-md group">
+			<!-- svelte-ignore event_directive_deprecated -->
 			<input
-				on:click|preventDefault|stopPropagation|capture={() => {
-					navigator.clipboard.writeText(token)
-					sendUserToast('Copied to clipboard')
+				on:click|preventDefault|stopPropagation={() => {
+					if (token) {
+						navigator.clipboard.writeText(token)
+						sendUserToast('Copied to clipboard')
+					}
 				}}
-				placeholder="Select tags to generate a jwt token"
+				placeholder="Select tags to generate a JWT token"
 				type="text"
 				disabled
 				value={token}
-				class="pr-8 text-sm text-secondary"
+				class="w-full pr-10 pl-3 py-2 text-sm text-gray-600 bg-gray-50 border border-gray-300 rounded-lg cursor-pointer hover:bg-gray-100 transition truncate"
 			/>
+
+			<!-- svelte-ignore event_directive_deprecated -->
 			<button
-				class="absolute right-2 top-1/2 -translate-y-1/2 text-primary"
+				class="absolute right-2 top-1/2 -translate-y-1/2 text-gray-500 group-hover:text-blue-600 hover:scale-105 transition"
+				aria-label="Copy token to clipboard"
 				on:click|preventDefault|stopPropagation={() => {
-					navigator.clipboard.writeText(token)
-					sendUserToast('Copied to clipboard')
+					if (token) {
+						navigator.clipboard.writeText(token)
+						sendUserToast('Copied to clipboard')
+					}
 				}}
 			>
-				<Copy size={16} />
+				<Copy size={18} />
 			</button>
 		</div>
 
-		<div class="text-sm text-secondary mt-2 mb-12 max-w-md">
-			Pass the env variables:
-			<ul class="my-1">
-				<li>MODE=agent</li>
-				<li>AGENT_TOKEN={'"<token above>"'}</li>
-				<li>BASE_INTERNAL_URL={'"<base internal url>"'}</li>
+		<div class="flex flex-col gap-2 text-sm mt-3 leading-relaxed">
+			Set the following environment variables:
+			<ul class="list-disc list-inside mt-1">
+				<li><code>MODE=agent</code></li>
+				<li><code>AGENT_TOKEN=&lt;token&gt;</code></li>
+				<li><code>BASE_INTERNAL_URL=&lt;base url&gt;</code></li>
 			</ul>
-			to a worker to have it act as an HTTP agent worker. INIT_SCRIPT, if needed, must be passed as an
-			env variable.
-
-			<p class="mt-4">
-				Remember to have at least one normal worker that listens to the tags `flow` and `dependency`
-				(or `flow-$workspace` and `dependency-$workspace` if using workspace specific default tags)
-				to have flow and dependency job being runnable as agent workers can't run dependency jobs
-				nor can run the flow state machine (but can run the subjobs within them).
+			<p class="text-sm leading-relaxed">
+				to a worker to have it act as an HTTP agent worker.
+				<code>INIT_SCRIPT</code>, if needed, must be passed as an env variable.
 			</p>
+			<Alert type="warning" size="sm" title="Agent Worker Limitations">
+				Ensure at least one normal worker is running and listening to the tags
+				<code>flow</code> and <code>dependency</code>
+				(or <code>flow-&lt;workspace&gt;</code> and <code>dependency-&lt;workspace&gt;</code> if
+				using workspace-specific default tags), because agent workers
+				<strong>cannot run dependency jobs</strong>
+				nor execute the
+				<strong>flow state machine</strong>. They can, however, run subjobs within flows.
+			</Alert>
+			<CollapseLink text="Automate JWT token generation" small>
+				<div class="text-xs mt-2">
+					Use the following API endpoint with a superadmin bearer token:
+					<code class="block mt-1 mb-2">POST /api/agent_workers/create_agent_token</code>
+					<pre class=" p-2 rounded-lg text-xs overflow-auto">
+	<code
+							>{`
+	  "worker_group": "agent",
+	  "tags": ["tag1", "tag2"],
+	  "exp": 1717334400
+	`}</code
+						>
+					</pre>
+					The JSON response will contain the generated JWT token.
+				</div>
+			</CollapseLink>
 		</div>
-
-		<CollapseLink text="Automate JWT token generation" small>
-			<div class="text-xs text-secondary">
-				Use the following api endpoint with a superadmin bearer token:
-				<code class="text-primary"> POST /api/agent_workers/create_agent_token </code>
-				with body:
-				<pre>
-			<code class="text-primary">
-{`{
-	"worker_group": "agent",
-	"tags": ["tag1", "tag2"],
-	"exp": 1717334400 // 3 years from now
-}`}
-					</code>
-				</pre>
-				JSON response will be the JWT token.
-			</div>
-		</CollapseLink>
 	</Section>
 </div>
diff --git a/frontend/src/lib/components/InstanceSetting.svelte b/frontend/src/lib/components/InstanceSetting.svelte
index 6e75df9270..76ee0863b8 100644
--- a/frontend/src/lib/components/InstanceSetting.svelte
+++ b/frontend/src/lib/components/InstanceSetting.svelte
@@ -165,8 +165,12 @@
 		}
 	}
 
-	function handleTeamChange(teamItem: { team_id: string; team_name: string }, i: number) {
-		const team = $values['teams'].find((team) => team.team_id === teamItem.team_id) || null
+	function handleTeamChange(
+		teamItem: { team_id: string; team_name: string } | undefined,
+		i: number
+	) {
+		const team =
+			(teamItem && $values['teams'].find((team) => team.team_id === teamItem.team_id)) || null
 		$values['critical_error_channels'][i] = {
 			teams_channel: {
 				team_id: team?.team_id,
@@ -177,7 +181,10 @@
 		}
 	}
 
-	function handleChannelChange(channel: { channel_id: string; channel_name: string }, i: number) {
+	function handleChannelChange(
+		channel: { channel_id: string; channel_name: string } | undefined,
+		i: number
+	) {
 		const team = $values['critical_error_channels'][i]?.teams_channel
 		if (team) {
 			$values['critical_error_channels'][i] = {
@@ -550,15 +557,19 @@
 													showRefreshButton={false}
 													placeholder="Select team"
 													teams={$values['teams']}
-													on:change={(e) => handleTeamChange(e.detail, i)}
-													selectedTeam={$values['critical_error_channels'][i]?.teams_channel
-														? {
-																team_id:
-																	$values['critical_error_channels'][i]?.teams_channel?.team_id,
-																team_name:
-																	$values['critical_error_channels'][i]?.teams_channel?.team_name
-															}
-														: undefined}
+													bind:selectedTeam={
+														() =>
+															$values['critical_error_channels'][i]?.teams_channel
+																? {
+																		team_id:
+																			$values['critical_error_channels'][i]?.teams_channel?.team_id,
+																		team_name:
+																			$values['critical_error_channels'][i]?.teams_channel
+																				?.team_name
+																	}
+																: undefined,
+														(team) => handleTeamChange(team, i)
+													}
 												/>
 
 												{#if $values['critical_error_channels'][i]?.teams_channel?.team_id}
@@ -570,18 +581,20 @@
 																team.team_id ===
 																$values['critical_error_channels'][i]?.teams_channel?.team_id
 														)?.channels ?? []}
-														on:change={(e) => handleChannelChange(e.detail, i)}
-														selectedChannel={$values['critical_error_channels'][i]?.teams_channel
-															?.channel_id
-															? {
-																	channel_id:
-																		$values['critical_error_channels'][i]?.teams_channel
-																			?.channel_id,
-																	channel_name:
-																		$values['critical_error_channels'][i]?.teams_channel
-																			?.channel_name
-																}
-															: undefined}
+														bind:selectedChannel={
+															() =>
+																$values['critical_error_channels'][i]?.teams_channel?.channel_id
+																	? {
+																			channel_id:
+																				$values['critical_error_channels'][i]?.teams_channel
+																					?.channel_id,
+																			channel_name:
+																				$values['critical_error_channels'][i]?.teams_channel
+																					?.channel_name
+																		}
+																	: undefined,
+															(channel) => handleChannelChange(channel, i)
+														}
 													/>
 												{/if}
 												<div>
diff --git a/frontend/src/lib/components/LightweightResourcePicker.svelte b/frontend/src/lib/components/LightweightResourcePicker.svelte
index 8f8e77c158..50da38607b 100644
--- a/frontend/src/lib/components/LightweightResourcePicker.svelte
+++ b/frontend/src/lib/components/LightweightResourcePicker.svelte
@@ -2,15 +2,13 @@
 	import { ResourceService } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
 	import { createEventDispatcher, getContext } from 'svelte'
-	import Select from './apps/svelte-select/lib/index'
-	import { SELECT_INPUT_DEFAULT_STYLE } from '../defaults'
-
 	import DarkModeObserver from './DarkModeObserver.svelte'
 	import { Button, Drawer, DrawerContent } from './common'
 	import { Plus, Loader2, Link2Off } from 'lucide-svelte'
 	import type { AppViewerContext } from './apps/types'
 	import { sendUserToast } from '$lib/toast'
 	import { createDispatcherIfMounted } from '$lib/createDispatcherIfMounted'
+	import Select from './Select.svelte'
 
 	const dispatch = createEventDispatcher()
 	const dispatchIfMounted = createDispatcherIfMounted(dispatch)
@@ -34,7 +32,7 @@
 				}
 			: undefined
 
-	let collection = [valueSelect]
+	let collection = valueSelect ? [valueSelect] : []
 
 	let loading = true
 	async function loadResources(resourceType: string | undefined) {
@@ -167,23 +165,22 @@
 		{:else}
 			<Select
 				{disabled}
-				portal={!disablePortal}
-				value={valueSelect}
-				on:change={(e) => {
-					value = e.detail.value
-					valueSelect = e.detail
-				}}
-				on:clear={() => {
+				{disablePortal}
+				bind:value={
+					() => valueSelect?.value,
+					(v) => {
+						value = v
+						valueSelect = collection.find((x) => x.value === v)
+					}
+				}
+				onClear={() => {
 					value = undefined
 					valueSelect = undefined
 				}}
+				clearable
 				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">
diff --git a/frontend/src/lib/components/ModulePreviewResultViewer.svelte b/frontend/src/lib/components/ModulePreviewResultViewer.svelte
index b70008fb0b..839adc7e98 100644
--- a/frontend/src/lib/components/ModulePreviewResultViewer.svelte
+++ b/frontend/src/lib/components/ModulePreviewResultViewer.svelte
@@ -9,6 +9,7 @@
 	import { Pane, Splitpanes } from 'svelte-splitpanes'
 	import type { FlowEditorContext } from './flows/types'
 	import { getContext } from 'svelte'
+	import { getStringError } from './copilot/chat/utils'
 
 	export let lang: Script['language']
 	export let editor: Editor | undefined
@@ -70,14 +71,8 @@
 			{disableHistory}
 		>
 			<svelte:fragment slot="copilot-fix">
-				{#if lang && editor && diffEditor && $testStepStore[mod.id] && selectedJob && 'result' in selectedJob && selectedJob.result && typeof selectedJob.result == 'object' && `error` in selectedJob.result && selectedJob.result.error}
-					<ScriptFix
-						error={JSON.stringify(selectedJob.result.error)}
-						{lang}
-						{editor}
-						{diffEditor}
-						args={$testStepStore[mod.id]}
-					/>
+				{#if lang && editor && diffEditor && $testStepStore[mod.id] && selectedJob?.type === 'CompletedJob' && !selectedJob.success && getStringError(selectedJob.result)}
+					<ScriptFix {lang} />
 				{/if}
 			</svelte:fragment>
 		</OutputPickerInner>
diff --git a/frontend/src/lib/components/Path.svelte b/frontend/src/lib/components/Path.svelte
index 994df893ff..c8d19e2233 100644
--- a/frontend/src/lib/components/Path.svelte
+++ b/frontend/src/lib/components/Path.svelte
@@ -22,20 +22,19 @@
 		MqttTriggerService,
 		SqsTriggerService,
 		GcpTriggerService
-
 	} from '$lib/gen'
 	import { superadmin, userStore, workspaceStore } from '$lib/stores'
 	import { createEventDispatcher, getContext } from 'svelte'
 	import { writable } from 'svelte/store'
-	import { Alert, Button, Drawer, DrawerContent } from './common'
+	import { Alert, Button } from './common'
 	import Badge from './common/badge/Badge.svelte'
 	import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte'
 	import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte'
-	import FolderEditor from './FolderEditor.svelte'
 	import { random_adj } from './random_positive_adjetive'
-	import { Eye, Folder, Loader2, Plus, SearchCode, User } from 'lucide-svelte'
+	import { Folder, Loader2, SearchCode, User } from 'lucide-svelte'
 	import Tooltip from './Tooltip.svelte'
 	import { tick } from 'svelte'
+	import FolderPicker from './FolderPicker.svelte'
 
 	type PathKind =
 		| 'resource'
@@ -162,20 +161,14 @@
 			initialFolder = initialPath?.split('/')?.[1]
 			initialFolders.push({ name: initialFolder, write: true })
 		}
+		const excludedFolders = [initialFolder, 'app_groups', 'app_custom', 'app_themes']
 		folders = initialFolders.concat(
 			(
 				await FolderService.listFolderNames({
 					workspace: $workspaceStore!
 				})
 			)
-				.filter(
-					(x) =>
-						x != initialFolder &&
-						x != 'app_groups' &&
-						x != 'app_custom' &&
-						x != 'app_themes' &&
-						x != 'app_custom'
-				)
+				.filter((x) => !excludedFolders.includes(x))
 				.map((x) => ({
 					name: x,
 					write:
@@ -318,24 +311,6 @@
 		}
 	}
 
-	let newFolder: Drawer
-	let viewFolder: Drawer
-	let newFolderName: string
-	let folderCreated: string | undefined = undefined
-
-	async function addFolder() {
-		await FolderService.createFolder({
-			workspace: $workspaceStore ?? '',
-			requestBody: { name: newFolderName }
-		})
-		folderCreated = newFolderName
-		$userStore?.folders?.push(newFolderName)
-		loadFolders()
-		if (meta) {
-			meta.owner = newFolderName
-		}
-	}
-
 	function setDirty() {
 		!dirty && (dirty = true)
 	}
@@ -379,33 +354,6 @@
 		})
 </script>
 
-<Drawer bind:this={newFolder}>
-	<DrawerContent
-		title="New Folder"
-		on:close={() => {
-			newFolder.closeDrawer()
-			folderCreated = undefined
-		}}
-	>
-		{#if !folderCreated}
-			<div class="flex flex-col gap-2">
-				<input placeholder="New folder name" bind:value={newFolderName} />
-				<Button size="md" startIcon={{ icon: Plus }} disabled={!newFolderName} on:click={addFolder}>
-					New&nbsp;folder
-				</Button>
-			</div>
-		{:else}
-			<FolderEditor name={folderCreated} />
-		{/if}
-	</DrawerContent>
-</Drawer>
-
-<Drawer bind:this={viewFolder}>
-	<DrawerContent title="Folder {meta?.owner}" on:close={viewFolder.closeDrawer}>
-		<FolderEditor name={meta?.owner ?? ''} />
-	</DrawerContent>
-</Drawer>
-
 <div>
 	<div class="flex flex-col sm:flex-row sm:items-center gap-2 sm:gap-4 pb-0 mb-1">
 		{#if meta != undefined}
@@ -474,44 +422,7 @@
 					</label>
 				{:else if meta.ownerKind === 'folder'}
 					<label class="block grow w-48">
-						<div class="flex flex-row items-center gap-1 w-full">
-							<select
-								class="grow w-full"
-								disabled={disabled || disableEditing}
-								bind:value={meta.owner}
-							>
-								{#if folders?.length == 0}
-									<option disabled>No folders</option>
-								{/if}
-								{#each folders as { name, write }}
-									<option disabled={!write}>{name}{write ? '' : ' (read-only)'}</option>
-								{/each}
-							</select>
-							<Button
-								title="View folder"
-								btnClasses="!p-1.5"
-								variant="border"
-								color="light"
-								size="xs"
-								disabled={!meta.owner || meta.owner == ''}
-								on:click={viewFolder.openDrawer}
-								iconOnly
-								startIcon={{ icon: Eye }}
-							/>
-							{#if !disableEditing}
-								<Button
-									title="New folder"
-									btnClasses="!p-1.5"
-									variant="border"
-									color="light"
-									size="xs"
-									{disabled}
-									on:click={newFolder.openDrawer}
-									iconOnly
-									startIcon={{ icon: Plus }}
-								/>
-							{/if}
-						</div>
+						<FolderPicker bind:folderName={meta.owner} {initialPath} {disabled} {disableEditing} />
 					</label>
 				{/if}
 			</div>
diff --git a/frontend/src/lib/components/ResourcePicker.svelte b/frontend/src/lib/components/ResourcePicker.svelte
index 4e50c13911..6169fc10e7 100644
--- a/frontend/src/lib/components/ResourcePicker.svelte
+++ b/frontend/src/lib/components/ResourcePicker.svelte
@@ -2,18 +2,16 @@
 	import { ResourceService } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
 	import { createEventDispatcher, onMount } from 'svelte'
-	import Select from './apps/svelte-select/lib/index'
-	import { SELECT_INPUT_DEFAULT_STYLE } from '../defaults'
 	import AppConnect from './AppConnectDrawer.svelte'
 	import ResourceEditorDrawer from './ResourceEditorDrawer.svelte'
 
 	import { Button } from './common'
 	import DBManagerDrawerButton from './DBManagerDrawerButton.svelte'
-	import DarkModeObserver from './DarkModeObserver.svelte'
 	import { Pen, Plus, RotateCw } from 'lucide-svelte'
 	import { sendUserToast } from '$lib/toast'
 	import { isDbType } from './apps/components/display/dbtable/utils'
 	import { createDispatcherIfMounted } from '$lib/createDispatcherIfMounted'
+	import Select from './Select.svelte'
 
 	const dispatch = createEventDispatcher()
 	const dispatchIfMounted = createDispatcherIfMounted(dispatch)
@@ -104,12 +102,8 @@
 
 	let appConnect: AppConnect
 	let resourceEditor: ResourceEditorDrawer
-
-	let darkMode: boolean = false
 </script>
 
-<DarkModeObserver bind:darkMode />
-
 <AppConnect
 	on:refresh={async (e) => {
 		await loadResources(resourceType)
@@ -141,14 +135,16 @@
 		{#if collection?.length > 0}
 			<Select
 				{disabled}
-				portal={!disablePortal}
-				value={valueSelect}
-				on:change={(e) => {
-					value = e.detail.value
-					valueType = e.detail.type
-					valueSelect = e.detail
-				}}
-				on:clear={() => {
+				{disablePortal}
+				bind:value={
+					() => valueSelect?.value,
+					(v) => {
+						valueSelect = collection.find((x) => x.value === v)
+						value = v
+						valueType = valueSelect?.type
+					}
+				}
+				onClear={() => {
 					initialValue = undefined
 					value = undefined
 					valueType = undefined
@@ -156,12 +152,9 @@
 					dispatch('clear')
 				}}
 				items={collection}
+				clearable
 				class="text-clip grow min-w-0"
 				placeholder={placeholder ?? `${resourceType ?? 'any'} resource`}
-				inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-				containerStyles={darkMode
-					? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-					: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
 			/>
 		{:else if !loading}
 			<div class="text-2xs text-tertiary mr-2">0 found</div>
diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte
index 31faf37068..953410291b 100644
--- a/frontend/src/lib/components/ScriptBuilder.svelte
+++ b/frontend/src/lib/components/ScriptBuilder.svelte
@@ -7,7 +7,8 @@
 		type Script,
 		type TriggersCount,
 		PostgresTriggerService,
-		CaptureService
+		CaptureService,
+		type ScriptLang
 	} from '$lib/gen'
 	import { inferArgs } from '$lib/infer'
 	import { initialCode } from '$lib/script_helpers'
@@ -883,6 +884,47 @@
 				newSavedDraftTrigers.length > 0 ? newSavedDraftTrigers : undefined
 		}
 	}
+
+	function onScriptLanguageTrigger(lang: 'docker' | 'bunnative' | ScriptLang) {
+		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
+			}
+			template = 'docker'
+		} else if (lang == 'bunnative') {
+			template = 'bunnative'
+		} else {
+			template = 'script'
+		}
+		let language = langToLanguage(lang)
+		//
+		initContent(language, script.kind, template)
+		script.language = language
+	}
+
+	function onSummaryChange(value: string) {
+		if (initialPath == '' && value?.length > 0 && !dirtyPath) {
+			path?.setName(
+				value
+					.toLowerCase()
+					.replace(/[^a-z0-9_]/g, '_')
+					.replace(/-+/g, '_')
+					.replace(/^-|-$/g, '')
+			)
+		}
+	}
 </script>
 
 <svelte:window on:keydown={onKeyDown} />
@@ -912,18 +954,28 @@
 		bind:open={metadataOpen}
 		size={selectedTab === 'ui' || selectedTab === 'triggers' ? '1200px' : '800px'}
 	>
-		<DrawerContent noPadding title="Settings" on:close={() => (metadataOpen = false)}>
+		<DrawerContent
+			noPadding
+			title="Settings"
+			on:close={() => (metadataOpen = false)}
+			aiId="script-builder-settings"
+			aiDescription="Script builder settings"
+		>
 			<!-- svelte-ignore a11y-autofocus -->
 			<div class="flex flex-col h-full">
 				<Tabs bind:selected={selectedTab} wrapperClass="flex-none w-full">
 					{#if customUi?.settingsPanel?.disableMetadata !== true}
-						<Tab value="metadata">Metadata</Tab>
+						<Tab value="metadata" aiId="script-builder-metadata" aiDescription="Metadata settings">
+							Metadata
+						</Tab>
 					{/if}
 					{#if customUi?.settingsPanel?.disableRuntime !== true}
-						<Tab value="runtime">Runtime</Tab>
+						<Tab value="runtime" aiId="script-builder-runtime" aiDescription="Runtime settings">
+							Runtime
+						</Tab>
 					{/if}
 					{#if customUi?.settingsPanel?.disableGeneratedUi !== true}
-						<Tab value="ui">
+						<Tab value="ui" aiId="script-builder-ui" aiDescription="Generated UI settings">
 							Generated UI
 							<Tooltip
 								documentationLink="https://www.windmill.dev/docs/core_concepts/json_schema_and_parsing"
@@ -934,7 +986,7 @@
 						</Tab>
 					{/if}
 					{#if customUi?.settingsPanel?.disableTriggers !== true}
-						<Tab value="triggers">
+						<Tab value="triggers" aiId="script-builder-triggers" aiDescription="Triggers settings">
 							Triggers
 							<Tooltip documentationLink="https://www.windmill.dev/docs/getting_started/triggers">
 								Configure how this script will be triggered.
@@ -962,23 +1014,15 @@
 										<div class="flex flex-col gap-4">
 											<Label label="Summary">
 												<MetadataGen
+													aiId="create-script-summary-input"
+													aiDescription="Summary / Title of the new script"
 													label="Summary"
 													bind:content={script.summary}
 													lang={script.language}
 													code={script.content}
 													promptConfigName="summary"
 													generateOnAppear
-													on:change={() => {
-														if (initialPath == '' && script.summary?.length > 0 && !dirtyPath) {
-															path?.setName(
-																script.summary
-																	.toLowerCase()
-																	.replace(/[^a-z0-9_]/g, '_')
-																	.replace(/-+/g, '_')
-																	.replace(/^-|-$/g, '')
-															)
-														}
-													}}
+													on:change={() => onSummaryChange(script.summary)}
 													elementProps={{
 														type: 'text',
 														placeholder: 'Short summary to be displayed when listed'
@@ -1037,43 +1081,15 @@
 													disablePopup={!enterpriseLangs.includes(lang) || !!$enterpriseLicense}
 												>
 													<Button
+														aiId={`create-script-language-button-${lang}`}
+														aiDescription={`Choose ${lang} as the language of the script`}
 														size="sm"
 														variant="border"
 														color={isPicked ? 'blue' : 'light'}
 														btnClasses={isPicked
 															? '!border-2 !bg-blue-50/75 dark:!bg-frost-900/75'
 															: 'm-[1px]'}
-														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
-																}
-																template = 'docker'
-															} else if (lang == 'bunnative') {
-																template = 'bunnative'
-															} else {
-																template = 'script'
-															}
-															let language = langToLanguage(lang)
-															//
-															initContent(language, script.kind, template)
-															script.language = language
-														}}
+														on:click={() => onScriptLanguageTrigger(lang)}
 														disabled={lockedLanguage ||
 															(enterpriseLangs.includes(lang) && !$enterpriseLicense)}
 													>
@@ -1642,6 +1658,8 @@
 				<div class="flex flex-row gap-x-1 lg:gap-x-2">
 					{#if customUi?.topBar?.settings != false}
 						<Button
+							aiId="script-builder-settings"
+							aiDescription="Script builder settings to configure metadata, runtime, triggers, and generated UI."
 							color="light"
 							variant="border"
 							size="xs"
diff --git a/frontend/src/lib/components/ScriptEditor.svelte b/frontend/src/lib/components/ScriptEditor.svelte
index af60ed265c..6e01ea1557 100644
--- a/frontend/src/lib/components/ScriptEditor.svelte
+++ b/frontend/src/lib/components/ScriptEditor.svelte
@@ -2,7 +2,7 @@
 	import { BROWSER } from 'esm-env'
 
 	import type { Schema, SupportedLanguage } from '$lib/common'
-	import { type CompletedJob, type Job, JobService, type Preview } from '$lib/gen'
+	import { type CompletedJob, type Job, JobService, type Preview, type ScriptLang } from '$lib/gen'
 	import { copilotInfo, enterpriseLicense, userStore, workspaceStore } from '$lib/stores'
 	import { copyToClipboard, emptySchema, sendUserToast } from '$lib/utils'
 	import Editor from './Editor.svelte'
@@ -38,11 +38,14 @@
 	import { slide } from 'svelte/transition'
 	import CaptureTable from '$lib/components/triggers/CaptureTable.svelte'
 	import CaptureButton from './triggers/CaptureButton.svelte'
-	import AIChat from './copilot/chat/AIChat.svelte'
 	import { setContext } from 'svelte'
 	import HideButton from './apps/editor/settingsPanel/HideButton.svelte'
 	import { base } from '$lib/base'
-	import { SUPPORTED_CHAT_SCRIPT_LANGUAGES } from './copilot/chat/core'
+	import { SUPPORTED_CHAT_SCRIPT_LANGUAGES } from './copilot/chat/script/core'
+	import { getStringError } from './copilot/chat/utils'
+	import type { ScriptOptions } from './copilot/chat/ContextManager.svelte'
+	import { aiChatManager, AIMode } from './copilot/chat/AIChatManager.svelte'
+	import TriggerableByAI from './TriggerableByAI.svelte'
 
 	// Exported
 	export let schema: Schema | any = emptySchema()
@@ -124,9 +127,6 @@
 		if ((event.ctrlKey || event.metaKey) && event.key == 'Enter') {
 			event.preventDefault()
 			runTest()
-		} else if ((event.ctrlKey || event.metaKey) && event.key == 'l') {
-			event.preventDefault()
-			toggleAiPanel()
 		} else if ((event.ctrlKey || event.metaKey) && event.key == 'u') {
 			event.preventDefault()
 			toggleTestPanel()
@@ -200,6 +200,7 @@
 	onMount(() => {
 		inferSchema(code)
 		loadPastTests()
+		aiChatManager.changeMode(AIMode.SCRIPT)
 	})
 
 	setLicense()
@@ -273,6 +274,10 @@
 
 	onDestroy(() => {
 		disableCollaboration()
+		aiChatManager.scriptEditorApplyCode = undefined
+		aiChatManager.scriptEditorShowDiffMode = undefined
+		aiChatManager.scriptEditorOptions = undefined
+		aiChatManager.changeMode(AIMode.NAVIGATOR)
 	})
 
 	function asKind(str: string | undefined) {
@@ -301,41 +306,13 @@
 
 	setContext('disableTooltips', customUi?.disableTooltips === true)
 
-	let aiPanelSize =
-		!$copilotInfo.enabled ||
-		!SUPPORTED_CHAT_SCRIPT_LANGUAGES.includes(lang ?? '') ||
-		localStorage.getItem('aiPanelOpen') === 'false'
-			? 0
-			: 30
-	let codePanelSize = 40 + (30 - aiPanelSize)
-	let storedAiPanelSize = aiPanelSize > 0 ? aiPanelSize : 30
+	let codePanelSize = 70
 	let testPanelSize = 30
 	let storedTestPanelSize = testPanelSize
 
-	function toggleAiPanel() {
-		if (!$copilotInfo.enabled) return
-		if (aiPanelSize > 0) {
-			storedAiPanelSize = aiPanelSize
-			codePanelSize += aiPanelSize
-			aiPanelSize = 0
-			localStorage.setItem('aiPanelOpen', 'false')
-		} else {
-			codePanelSize -= storedAiPanelSize
-			aiPanelSize = storedAiPanelSize
-			localStorage.setItem('aiPanelOpen', 'true')
-		}
-	}
-
-	function addSelectedLinesToAiChat(
-		e: CustomEvent<{ lines: string; startLine: number; endLine: number }>
-	) {
-		if (aiChat) {
-			aiChat.addSelectedLinesToContext(e.detail.lines, e.detail.startLine, e.detail.endLine)
-			aiChat.focusTextArea()
-		}
-	}
-
-	$: !SUPPORTED_CHAT_SCRIPT_LANGUAGES.includes(lang ?? '') && aiPanelSize > 0 && toggleAiPanel()
+	$: !SUPPORTED_CHAT_SCRIPT_LANGUAGES.includes(lang ?? '') &&
+		!aiChatManager.open &&
+		aiChatManager.toggleOpen()
 
 	function toggleTestPanel() {
 		if (testPanelSize > 0) {
@@ -348,18 +325,9 @@
 		}
 	}
 
-	let aiChat: AIChat | undefined = undefined
-
-	function getStringError(job: Job | undefined) {
-		if (
-			job != undefined &&
-			job.type === 'CompletedJob' &&
-			typeof job.result == 'object' &&
-			job.result != null &&
-			`error` in job.result &&
-			job.result.error
-		) {
-			return JSON.stringify(job.result.error, null, 2)
+	function getError(job: Job | undefined) {
+		if (job != undefined && job.type === 'CompletedJob' && !job.success) {
+			return getStringError(job.result)
 		}
 		return undefined
 	}
@@ -378,7 +346,26 @@
 		editor?.show()
 	}
 
-	$: error = getStringError(testJob)
+	$: error = getError(testJob)
+
+	$: {
+		const options: ScriptOptions = {
+			code,
+			lang: lang as ScriptLang,
+			error,
+			args,
+			path,
+			lastSavedCode,
+			lastDeployedCode,
+			diffMode
+		}
+		aiChatManager.scriptEditorOptions = options
+		aiChatManager.scriptEditorApplyCode = (code: string) => {
+			hideDiffMode()
+			editor?.reviewAndApplyCode(code)
+		}
+		aiChatManager.scriptEditorShowDiffMode = showDiffMode
+	}
 </script>
 
 <TestJobLoader
@@ -391,6 +378,8 @@
 
 <svelte:window on:keydown={onKeyDown} />
 
+<TriggerableByAI id="script-editor" description="Component to edit a script" />
+
 <Modal title="Invite others" bind:open={showCollabPopup}>
 	<div>Have others join by sharing the following url:</div>
 	<div class="flex gap-2 pr-4">
@@ -465,7 +454,24 @@
 		<Pane bind:size={codePanelSize} minSize={10} class="!overflow-visible">
 			<div class="h-full !overflow-visible bg-gray-50 dark:bg-[#272D38] relative">
 				<div class="absolute top-2 right-4 z-10 flex flex-row gap-2">
-					{#if aiPanelSize === 0}
+					{#if testPanelSize === 0}
+						<HideButton
+							hidden={true}
+							direction="right"
+							size="md"
+							panelName="Test"
+							shortcut="U"
+							customHiddenIcon={{
+								icon: PlayIcon
+							}}
+							on:click={() => {
+								toggleTestPanel()
+							}}
+							btnClasses="bg-marine-400 hover:bg-marine-200 !text-primary-inverse hover:!text-primary-inverse hover:dark:!text-primary-inverse dark:bg-marine-50 dark:hover:bg-marine-50/70"
+							color="marine"
+						/>
+					{/if}
+					{#if !aiChatManager.open}
 						{#if customUi?.editorBar?.aiGen != false && SUPPORTED_CHAT_SCRIPT_LANGUAGES.includes(lang ?? '')}
 							<HideButton
 								hidden={true}
@@ -474,10 +480,12 @@
 								shortcut="L"
 								size="md"
 								usePopoverOverride={!$copilotInfo.enabled}
-								customHiddenIcon={WandSparkles}
+								customHiddenIcon={{
+									icon: WandSparkles
+								}}
 								btnClasses="!text-violet-800 dark:!text-violet-400 border border-gray-200 dark:border-gray-600 bg-surface"
 								on:click={() => {
-									toggleAiPanel()
+									aiChatManager.toggleOpen()
 								}}
 							>
 								<svelte:fragment slot="popoverOverride">
@@ -493,21 +501,6 @@
 								</svelte:fragment>
 							</HideButton>
 						{/if}
-						{#if testPanelSize === 0}
-							<HideButton
-								hidden={true}
-								direction="right"
-								size="md"
-								panelName="Test"
-								shortcut="U"
-								customHiddenIcon={PlayIcon}
-								on:click={() => {
-									toggleTestPanel()
-								}}
-								btnClasses="bg-marine-400 hover:bg-marine-200 !text-primary-inverse hover:!text-primary-inverse hover:dark:!text-primary-inverse dark:bg-marine-50 dark:hover:bg-marine-50/70"
-								color="marine"
-							/>
-						{/if}
 					{/if}
 				</div>
 				{#key lang}
@@ -524,10 +517,12 @@
 							inferSchema(e.detail)
 						}}
 						on:saveDraft
-						on:toggleAiPanel={toggleAiPanel}
-						on:addSelectedLinesToAiChat={addSelectedLinesToAiChat}
+						on:toggleAiPanel={() => aiChatManager.toggleOpen()}
+						on:addSelectedLinesToAiChat={(e) => {
+							const { lines, startLine, endLine } = e.detail
+							aiChatManager.addSelectedLinesToContext(lines, startLine, endLine)
+						}}
 						on:toggleTestPanel={toggleTestPanel}
-						isAiPanelOpen={aiPanelSize > 0}
 						cmdEnterAction={async () => {
 							await inferSchema(code)
 							runTest()
@@ -562,57 +557,6 @@
 				{/key}
 			</div>
 		</Pane>
-		{#if lang && $copilotInfo.enabled}
-			<Pane bind:size={aiPanelSize} minSize={0}>
-				<AIChat
-					bind:this={aiChat}
-					{code}
-					{lang}
-					{error}
-					{args}
-					{path}
-					on:applyCode={(e) => {
-						hideDiffMode()
-						editor?.reviewAndApplyCode(e.detail.code)
-					}}
-					on:showDiffMode={showDiffMode}
-					{lastSavedCode}
-					{lastDeployedCode}
-					{diffMode}
-				>
-					<svelte:fragment slot="header-left">
-						<HideButton
-							hidden={false}
-							direction="right"
-							panelName="AI"
-							shortcut="L"
-							size="md"
-							on:click={() => {
-								toggleAiPanel()
-							}}
-						/>
-					</svelte:fragment>
-					<svelte:fragment slot="header-right">
-						{#if testPanelSize === 0}
-							<div class="bg-gray-200 h-6 w-[1px] rounded-full dark:bg-gray-600"></div>
-							<HideButton
-								hidden={true}
-								direction="right"
-								panelName="Test"
-								shortcut="U"
-								size="md"
-								customHiddenIcon={PlayIcon}
-								on:click={() => {
-									toggleTestPanel()
-								}}
-								btnClasses="bg-marine-400 hover:bg-marine-200 !text-primary-inverse hover:!text-primary-inverse hover:dark:!text-primary-inverse dark:bg-marine-50 dark:hover:bg-marine-50/70"
-								color="marine"
-							/>
-						{/if}
-					</svelte:fragment>
-				</AIChat>
-			</Pane>
-		{/if}
 		<Pane bind:size={testPanelSize} minSize={0}>
 			<div class="flex flex-col h-full">
 				{#if showTabs}
@@ -725,10 +669,6 @@
 					<Pane size={67} class="relative">
 						<LogPanel
 							bind:setFocusToLogs
-							on:fix={() => {
-								aiChat?.fix()
-							}}
-							fixChatMode
 							{lang}
 							previewJob={testJob}
 							{pastPreviews}
diff --git a/frontend/src/lib/components/ScriptPicker.svelte b/frontend/src/lib/components/ScriptPicker.svelte
index 6423fb9bdb..1c5584f810 100644
--- a/frontend/src/lib/components/ScriptPicker.svelte
+++ b/frontend/src/lib/components/ScriptPicker.svelte
@@ -5,13 +5,12 @@
 	import { base } from '$lib/base'
 	import { createEventDispatcher } from 'svelte'
 
-	import Select from './apps/svelte-select/lib/index'
+	import Select from './Select.svelte'
 
 	import { getScriptByPath } from '$lib/scripts'
 	import { Button, Drawer, DrawerContent } from './common'
 	import HighlightCode from './HighlightCode.svelte'
 	import FlowPathViewer from './flows/content/FlowPathViewer.svelte'
-	import { SELECT_INPUT_DEFAULT_STYLE } from '../defaults'
 	import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte'
 	import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import { Code, Code2, ExternalLink, Pen, RefreshCw } from 'lucide-svelte'
@@ -85,7 +84,13 @@
 <div class="flex flex-row items-center gap-4 w-full mt-2">
 	{#if options.length > 1}
 		<div>
-			<ToggleButtonGroup bind:selected={itemKind} let:item>
+			<ToggleButtonGroup
+				bind:selected={itemKind}
+				let:item
+				on:selected={() => {
+					scriptPath = ''
+				}}
+			>
 				{#each options as [label, value, icon, selectedColor]}
 					<ToggleButton {icon} {disabled} {value} {label} {selectedColor} {item} />
 				{/each}
@@ -97,24 +102,16 @@
 		<input type="text" value={scriptPath ?? initialPath ?? ''} disabled />
 	{:else}
 		<Select
-			value={items?.find((x) => x.value == initialPath)}
-			class="grow shrink max-w-full"
-			on:change={() => {
-				dispatch('select', { path: scriptPath, itemKind })
-			}}
-			on:input={(ev) => {
-				if (!ev.detail) {
-					dispatch('select', { path: undefined, itemKind })
+			bind:value={
+				() => scriptPath ?? initialPath,
+				(path) => {
+					scriptPath = path
+					dispatch('select', { path, itemKind })
 				}
-			}}
-			bind:justValue={scriptPath}
+			}
+			class="grow shrink max-w-full"
 			{items}
 			placeholder="Pick {itemKind === 'app' ? 'an' : 'a'} {itemKind}"
-			inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-			containerStyles={darkMode
-				? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-				: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
-			portal={false}
 		/>
 	{/if}
 
diff --git a/frontend/src/lib/components/Select.svelte b/frontend/src/lib/components/Select.svelte
new file mode 100644
index 0000000000..7171f5dc70
--- /dev/null
+++ b/frontend/src/lib/components/Select.svelte
@@ -0,0 +1,233 @@
+<script lang="ts" generics="Item extends { label?: string; value: any; }">
+	import { clickOutside } from '$lib/utils'
+	import { twMerge } from 'tailwind-merge'
+	import CloseButton from './common/CloseButton.svelte'
+	import ConditionalPortal from './common/drawer/ConditionalPortal.svelte'
+	import { deepEqual } from 'fast-equals'
+	import { Loader2 } from 'lucide-svelte'
+
+	type Value = Item['value']
+
+	let {
+		items,
+		placeholder = 'Please select',
+		value = $bindable(),
+		filterText: _filterTextBind = $bindable(undefined),
+		class: className = '',
+		clearable = true,
+		listAutoWidth = true,
+		disabled: _disabled = false,
+		containerStyle = '',
+		inputClass = '',
+		disablePortal = false,
+		loading = false,
+		groupBy,
+		sortBy,
+		onFocus,
+		onClear
+	}: {
+		items?: Item[]
+		value: Value | undefined
+		placeholder?: string
+		class?: string
+		clearable?: boolean
+		filterText?: string
+		disabled?: boolean
+		listAutoWidth?: boolean
+		containerStyle?: string
+		inputClass?: string
+		disablePortal?: boolean
+		loading?: boolean
+		groupBy?: (item: Item) => string
+		sortBy?: (a: Item, b: Item) => number
+		onFocus?: () => void
+		onClear?: () => void
+	} = $props()
+
+	let disabled = $derived(_disabled || loading)
+
+	let filterText = $state<string>('')
+	let open = $state<boolean>(false)
+	let keyArrowPos = $state<number | undefined>()
+	let inputEl: HTMLInputElement | undefined = $state()
+	let listEl: HTMLDivElement | undefined = $state()
+
+	$effect(() => {
+		if (_filterTextBind !== undefined) filterText = _filterTextBind
+	})
+	$effect(() => {
+		if (_filterTextBind !== undefined) _filterTextBind = filterText
+	})
+
+	$effect(() => {
+		;[filterText, open, processedItems]
+		keyArrowPos = open && filterText ? 0 : undefined
+	})
+
+	$effect(() => {
+		if (filterText) open = true
+	})
+	$effect(() => {
+		if (!open) filterText = ''
+	})
+
+	let processedItems: (Item & { __select_group?: string; label: string })[] = $derived.by(() => {
+		let items2 =
+			items?.map((item) => ({
+				...item,
+				label: getLabel(item)
+			})) ?? []
+		if (filterText) {
+			items2 = items2.filter((item) => item.label.toLowerCase().includes(filterText.toLowerCase()))
+		}
+		if (groupBy) {
+			items2 =
+				items2?.map((item) => ({
+					...item,
+					__select_group: groupBy(item)
+				})) ?? []
+		}
+		if (sortBy) {
+			items2 = items2?.sort(sortBy)
+		}
+		return items2
+	})
+	let valueEntry = $derived(value && processedItems?.find((item) => item.value === value))
+
+	function setValue(item: Item) {
+		value = item.value
+		filterText = ''
+		open = false
+	}
+
+	function clearValue() {
+		filterText = ''
+		if (onClear) onClear()
+		else value = undefined
+	}
+
+	function getLabel(item: Item | undefined): string {
+		if (!item) return ''
+		if (item.label) return item.label
+		if (typeof item.value === 'string') return item.value
+		if (typeof item.value == 'number' || typeof item.value == 'boolean')
+			return item.value.toString()
+
+		return JSON.stringify(item.value)
+	}
+
+	function computeDropdownPos(): { width: number; x: number; y: number } {
+		if (!inputEl || !listEl) return { width: 0, x: 0, y: 0 }
+		const r = inputEl.getBoundingClientRect()
+		const listR = listEl.getBoundingClientRect()
+		const openBelow = r.y + r.height + listR.height <= window.innerHeight
+		let [x, y] = disablePortal ? [0, 0] : [r.x, r.y]
+		if (openBelow) return { width: r.width, x: x, y: y + r.height }
+		else {
+			return { width: r.width, x: x, y: y - listR.height }
+		}
+	}
+	let dropdownPos = $state(computeDropdownPos())
+	$effect(() => {
+		function updateDropdownPos() {
+			let nPos = computeDropdownPos()
+			if (!deepEqual(nPos, dropdownPos)) dropdownPos = nPos
+			if (open) requestAnimationFrame(updateDropdownPos)
+		}
+		if (open) updateDropdownPos()
+	})
+</script>
+
+<svelte:window
+	on:keydown={(e) => {
+		if (!open || !processedItems?.length) return
+		if (e.key === 'ArrowUp' && keyArrowPos !== undefined && processedItems.length > 0) {
+			keyArrowPos = keyArrowPos <= 0 ? undefined : keyArrowPos - 1
+		} else if (e.key === 'ArrowDown') {
+			if (keyArrowPos === undefined) {
+				keyArrowPos = 0
+			} else {
+				keyArrowPos = Math.min(processedItems.length - 1, keyArrowPos + 1)
+			}
+		} else if (e.key === 'Enter' && keyArrowPos !== undefined && processedItems?.[keyArrowPos]) {
+			setValue(processedItems[keyArrowPos])
+		} else {
+			keyArrowPos = undefined
+			return
+		}
+		e.preventDefault()
+	}}
+/>
+
+<div
+	class={`relative ${className}`}
+	use:clickOutside={{ onClickOutside: () => (open = false) }}
+	onpointerdown={() => onFocus?.()}
+	onfocus={() => onFocus?.()}
+>
+	{#if clearable && !disabled && value}
+		<div class="absolute z-10 right-2 h-full flex items-center">
+			<CloseButton noBg small on:close={clearValue} />
+		</div>
+	{/if}
+	{#if loading}
+		<div class="absolute z-10 right-2 h-full flex items-center">
+			<Loader2 size={20} class="animate-spin" />
+		</div>
+	{/if}
+	<input
+		{disabled}
+		type="text"
+		bind:value={() => filterText, (v) => (filterText = v)}
+		placeholder={loading ? 'Loading...' : (valueEntry?.label ?? placeholder)}
+		style={containerStyle}
+		class={twMerge(
+			'!bg-surface text-ellipsis',
+			open ? '' : 'cursor-pointer',
+			valueEntry && !loading ? '!placeholder-primary' : '',
+			clearable && !disabled && value ? '!pr-8' : '',
+			inputClass ?? ''
+		)}
+		autocomplete="off"
+		onpointerdown={() => (open = true)}
+		bind:this={inputEl}
+	/>
+
+	<ConditionalPortal condition={!disablePortal}>
+		{#if open && !disabled}
+			<div
+				class="flex flex-col absolute z-[5001] max-h-64 overflow-y-auto bg-surface-secondary text-tertiary text-sm select-none border rounded-lg"
+				style="{`top: ${dropdownPos.y}px; left: ${dropdownPos.x}px;`} {listAutoWidth
+					? `min-width: ${dropdownPos.width}px;`
+					: ''}"
+				bind:this={listEl}
+			>
+				{#if processedItems?.length === 0}
+					<div class="py-8 px-4 text-center text-primary">No items</div>
+				{/if}
+				{#each processedItems ?? [] as item, itemIndex}
+					{#if (item.__select_group && itemIndex === 0) || processedItems?.[itemIndex - 1]?.__select_group !== item.__select_group}
+						<div
+							class={twMerge(
+								'mx-4 pb-1 mb-2 text-xs font-semibold text-primary border-b',
+								itemIndex === 0 ? 'mt-3' : 'mt-6'
+							)}
+						>
+							{item.__select_group}
+						</div>
+					{/if}
+					<button
+						class={twMerge(
+							'py-2 px-4 w-full font-normal text-left text-primary',
+							itemIndex === keyArrowPos ? 'bg-surface-hover' : '',
+							item.value === value ? 'bg-surface-selected' : 'hover:bg-surface-hover'
+						)}
+						onclick={() => setValue(item)}
+					>
+						{item.label}
+					</button>
+				{/each}
+			</div>
+		{/if}
+	</ConditionalPortal>
+</div>
diff --git a/frontend/src/lib/components/ServiceLogsInner.svelte b/frontend/src/lib/components/ServiceLogsInner.svelte
index 9b358adf80..6866c3e7a7 100644
--- a/frontend/src/lib/components/ServiceLogsInner.svelte
+++ b/frontend/src/lib/components/ServiceLogsInner.svelte
@@ -15,9 +15,6 @@
 	import AnsiUp from 'ansi_up'
 	import { scroll_into_view_if_needed_polyfill } from './multiselect/utils'
 	import SplitPanesOrColumnOnMobile from './splitPanes/SplitPanesOrColumnOnMobile.svelte'
-	import Select from './apps/svelte-select/lib/Select.svelte'
-	import { SELECT_INPUT_DEFAULT_STYLE } from '$lib/defaults'
-	import DarkModeObserver from './DarkModeObserver.svelte'
 
 	export let searchTerm: string
 	export let queryParseErrors: string[] = []
@@ -398,23 +395,8 @@
 
 		return ret
 	}
-
-	function getSelectItems(allLogs: ByMode, countsPerHost: any): { label: string; value: any }[] {
-		return Object.entries(allLogsOrQueryResults(allLogs, countsPerHost)).flatMap(([mode, o1]) =>
-			Object.entries(o1).flatMap(([wg, o2]) =>
-				Object.keys(o2).map((hn) => ({
-					label: hn,
-					value: [mode, wg, hn]
-				}))
-			)
-		)
-	}
-
-	let darkMode = false
 </script>
 
-<DarkModeObserver bind:darkMode />
-
 <Drawer bind:this={logDrawer} bind:open={logDrawerOpen} size="1400px">
 	<DrawerContent title="See context" on:close={logDrawer.closeDrawer}>
 		<svelte:fragment slot="actions">
@@ -569,24 +551,6 @@
 						>
 					</div>
 				{/if}
-				<div class="mr-0.5">
-					<Select
-						justValue={selected}
-						items={getSelectItems(allLogs, countsPerHost)}
-						on:change={({ detail }) => {
-							// console.log(detail)
-							selected = detail.value
-						}}
-						on:clear={() => {
-							selected = undefined
-						}}
-						placeholder="Select a service"
-						inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-						containerStyles={darkMode
-							? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-							: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
-					/>
-				</div>
 				{#each Object.entries(allLogsOrQueryResults(allLogs, countsPerHost)) as [mode, o1]}
 					<div class="w-full pb-8">
 						<h2 class="pb-2 text-2xl">{mode}s</h2>
diff --git a/frontend/src/lib/components/SimpleEditor.svelte b/frontend/src/lib/components/SimpleEditor.svelte
index 7cca3416ae..ab0cccf7b0 100644
--- a/frontend/src/lib/components/SimpleEditor.svelte
+++ b/frontend/src/lib/components/SimpleEditor.svelte
@@ -157,10 +157,21 @@
 	}
 
 	export function setCode(ncode: string): void {
-		code = ncode
+		if (ncode != code) {
+			code = ncode
+		}
 		editor?.setValue(ncode)
 	}
 
+	function updateCode() {
+		const ncode = getCode()
+		if (code == ncode) {
+			return
+		}
+		code = ncode
+		dispatch('change', { code: ncode })
+	}
+
 	function updatePlaceholderVisibility(value: string) {
 		if (!value) {
 			placeholderVisible = true
@@ -171,11 +182,11 @@
 
 	export function format() {
 		if (editor) {
-			code = getCode()
+			updateCode()
 			editor.getAction('editor.action.formatDocument')?.run()
 			if (formatAction) {
 				formatAction()
-				code = getCode()
+				updateCode()
 			}
 		}
 	}
@@ -368,8 +379,7 @@
 			suggestion = ''
 			timeoutModel && clearTimeout(timeoutModel)
 			timeoutModel = setTimeout(() => {
-				code = getCode()
-				dispatch('change', { code })
+				updateCode()
 			}, 200)
 		})
 
@@ -379,7 +389,7 @@
 			loadExtraLib()
 
 			editor.addCommand(KeyMod.CtrlCmd | KeyCode.KeyS, function () {
-				code = getCode()
+				updateCode()
 				shouldBindKey && format && format()
 			})
 
@@ -411,12 +421,12 @@
 		editor.onDidFocusEditorText(() => {
 			if (!editor) return
 			editor.addCommand(KeyMod.CtrlCmd | KeyCode.KeyS, function () {
-				code = getCode()
+				updateCode()
 				shouldBindKey && format && format()
 			})
 
 			editor.addCommand(KeyMod.CtrlCmd | KeyCode.Enter, function () {
-				code = getCode()
+				updateCode()
 				shouldBindKey && cmdEnterAction && cmdEnterAction()
 			})
 			dispatch('focus')
@@ -424,8 +434,7 @@
 
 		editor.onDidBlurEditorText(() => {
 			dispatch('blur')
-
-			code = getCode()
+			updateCode()
 		})
 
 		if (lang === 'css' && !cssClassesLoaded) {
diff --git a/frontend/src/lib/components/SqlRepl.svelte b/frontend/src/lib/components/SqlRepl.svelte
index 727334cf1d..e1b7ba8a85 100644
--- a/frontend/src/lib/components/SqlRepl.svelte
+++ b/frontend/src/lib/components/SqlRepl.svelte
@@ -41,7 +41,7 @@
 	import { CornerDownLeft } from 'lucide-svelte'
 	import Button from './common/button/Button.svelte'
 	import Editor from './Editor.svelte'
-	import { runPreviewJobAndPollResult } from './jobs/utils'
+	import { runScriptAndPollResult } from './jobs/utils'
 	import { workspaceStore } from '$lib/stores'
 	import { sendUserToast } from '$lib/toast'
 	import { untrack } from 'svelte'
@@ -91,7 +91,7 @@
 					.join(';')
 			}
 
-			let { job, result } = (await runPreviewJobAndPollResult(
+			let { job, result } = (await runScriptAndPollResult(
 				{
 					workspace: $workspaceStore,
 					requestBody: {
diff --git a/frontend/src/lib/components/SuperadminSettings.svelte b/frontend/src/lib/components/SuperadminSettings.svelte
index f4416e8897..5cffae7d7d 100644
--- a/frontend/src/lib/components/SuperadminSettings.svelte
+++ b/frontend/src/lib/components/SuperadminSettings.svelte
@@ -133,9 +133,17 @@
 			</div>
 			<div class="pt-4 h-full">
 				<Tabs bind:selected={tab}>
-					<Tab value="users">Users</Tab>
+					<Tab value="users" aiId="instance-settings-users" aiDescription="Instance users settings"
+						>Users</Tab
+					>
 					{#each settingsKeys as category}
-						<Tab value={category}>{category}</Tab>
+						<Tab
+							value={category}
+							aiId={`instance-settings-${category}`}
+							aiDescription={`Instance ${category} settings`}
+						>
+							{category}
+						</Tab>
 					{/each}
 					<svelte:fragment slot="content">
 						<div class="pt-4"></div>
diff --git a/frontend/src/lib/components/TagsToListenTo.svelte b/frontend/src/lib/components/TagsToListenTo.svelte
index ce56a575e8..c80d12b2bb 100644
--- a/frontend/src/lib/components/TagsToListenTo.svelte
+++ b/frontend/src/lib/components/TagsToListenTo.svelte
@@ -1,47 +1,55 @@
 <script lang="ts">
-	import { X } from 'lucide-svelte'
+	import { X, Plus, Trash } from 'lucide-svelte'
 	import { Button } from './common'
-	import { Plus } from 'lucide-svelte'
 	import { superadmin } from '$lib/stores'
 	import { createEventDispatcher } from 'svelte'
 	import AutoComplete from 'simple-svelte-autocomplete'
 	import { defaultTags, nativeTags } from './worker_group'
 
 	const dispatch = createEventDispatcher()
-
-	export let worker_tags: string[] = []
-	export let customTags: string[] = []
-	export let disabled = false
-
-	let newTag = ''
-	let createdTags: string[] = []
+	type Props = {
+		worker_tags: string[]
+		customTags: string[] | undefined
+		disabled?: boolean
+	}
+	let {
+		worker_tags = $bindable([]),
+		customTags = $bindable([]),
+		disabled = $bindable(false)
+	}: Props = $props()
+	let newTag = $state('')
+	let createdTags: string[] = $state([])
 </script>
 
-<div class="flex gap-3 gap-y-2 flex-wrap pb-2">
-	{#if worker_tags?.length == 0}
+<div class="flex gap-2 gap-y-2 flex-wrap pb-3">
+	{#if worker_tags?.length === 0}
 		<div class="text-xs text-secondary">No tags selected</div>
 	{/if}
+
 	{#each worker_tags as tag}
-		<div class="flex gap-0.5 items-center"
-			><div class="text-2xs p-1 rounded border text-primary">{tag}</div>
+		<div
+			class="flex items-center gap-1 px-2 py-1 rounded-full border border-primary text-2xs text-primary bg-surface-primary"
+		>
+			<span>{tag}</span>
 			{#if $superadmin && !disabled}
-				<button
-					class={'z-10 rounded-full p-1 duration-200 hover:bg-gray-200'}
-					aria-label="Remove item"
-					on:click|preventDefault|stopPropagation={() => {
-						worker_tags = worker_tags?.filter((t) => t != tag) ?? []
+				<Button
+					class="p-1 rounded-full hover:bg-surface-hover transition"
+					aria-label="Remove tag"
+					on:click={() => {
+						worker_tags = worker_tags?.filter((t) => t !== tag) ?? []
 						dispatch('dirty')
 						dispatch('deletePriorityTag', tag)
 					}}
 				>
 					<X size={12} />
-				</button>
-			{/if}</div
-		>
+				</Button>
+			{/if}
+		</div>
 	{/each}
 </div>
+
 {#if $superadmin}
-	<div class="max-w-md">
+	<div class="max-w-md space-y-2">
 		<AutoComplete
 			noInputStyles
 			items={[...(customTags ?? []), ...createdTags, ...defaultTags, ...nativeTags].filter(
@@ -50,26 +58,23 @@
 			{disabled}
 			bind:selectedItem={newTag}
 			hideArrow={true}
-			inputClassName={'flex !font-gray-600 !font-primary !bg-surface-primary"'}
-			dropdownClassName="!text-sm !py-2 !rounded-sm  !border-gray-200 !border !shadow-md"
-			className="w-full !font-gray-600 !font-primary !bg-surface-primary"
-			onFocus={() => {
-				dispatch('focus')
-			}}
+			inputClassName="w-full text-sm bg-surface-primary border border-gray-300 rounded-md px-3 py-2 text-primary placeholder-secondary focus:outline-none"
+			dropdownClassName="!text-sm !py-2 !rounded-md !border-gray-200 !border !shadow-md bg-white"
+			className="w-full font-primary text-primary"
+			onFocus={() => dispatch('focus')}
 			create
-			onCreate={(c) => {
+			onCreate={(c: string) => {
 				createdTags.push(c)
 				createdTags = [...createdTags]
 				return c
 			}}
-			createText="Press enter to use this tag"
+			createText="Press Enter to use this tag"
 		/>
 
-		<div class="mt-1"></div>
-		<div class="flex">
+		<div class="flex gap-2">
 			<Button
 				variant="contained"
-				color="blue"
+				color="light"
 				size="xs"
 				startIcon={{ icon: Plus }}
 				disabled={disabled || newTag == '' || worker_tags?.includes(newTag)}
@@ -81,6 +86,22 @@
 			>
 				Add tag
 			</Button>
+			<Button
+				variant="contained"
+				color="red"
+				size="xs"
+				startIcon={{ icon: Trash }}
+				disabled={disabled || worker_tags.length === 0}
+				on:click={() => {
+					worker_tags = worker_tags.filter((tag) => {
+						dispatch('deletePriorityTag', tag)
+						return false
+					})
+					dispatch('dirty')
+				}}
+			>
+				Remove all selected tags
+			</Button>
 		</div>
 	</div>
 {/if}
diff --git a/frontend/src/lib/components/TeamSelector.svelte b/frontend/src/lib/components/TeamSelector.svelte
index cbe1c719dc..638c30d22f 100644
--- a/frontend/src/lib/components/TeamSelector.svelte
+++ b/frontend/src/lib/components/TeamSelector.svelte
@@ -1,42 +1,40 @@
 <script lang="ts">
-	import Select from '$lib/components/apps/svelte-select/lib/Select.svelte'
 	import { workspaceStore } from '$lib/stores'
-	import { SELECT_INPUT_DEFAULT_STYLE } from '$lib/defaults'
-	import { createEventDispatcher, onMount } from 'svelte'
-	import DarkModeObserver from './DarkModeObserver.svelte'
 	import { RefreshCcw } from 'lucide-svelte'
 	import { WorkspaceService } from '$lib/gen'
+	import Select from './Select.svelte'
+	import { onMount } from 'svelte'
 
 	interface TeamItem {
 		team_id: string
 		team_name: string
 	}
 
-	export let disabled = false
-	export let placeholder = 'Select a team'
-	export let selectedTeam: TeamItem | undefined = undefined
-	export let containerClass = 'w-64'
-	export let showRefreshButton = true
-	export let teams: TeamItem[] | undefined = undefined
-	export let minWidth = '160px'
-
-	let isFetching = false
-	let darkMode: boolean = false
-
-	const dispatch = createEventDispatcher<{
-		change: TeamItem
-		error: Error
-	}>()
-
-	function onThemeChange() {
-		darkMode = document.documentElement.classList.contains('dark')
+	interface Props {
+		disabled?: boolean
+		placeholder?: string
+		selectedTeam?: TeamItem | undefined
+		containerClass?: string
+		showRefreshButton?: boolean
+		teams?: TeamItem[] | undefined
+		minWidth?: string
+		onError?: (error: Error) => void
 	}
 
+	let {
+		disabled = false,
+		placeholder = 'Select a team',
+		selectedTeam = $bindable(),
+		containerClass = 'w-64',
+		showRefreshButton = true,
+		teams = undefined,
+		minWidth = '160px',
+		onError
+	}: Props = $props()
+
+	let isFetching = $state(false)
 	onMount(() => {
-		onThemeChange()
-		if (!teams) {
-			loadTeams()
-		}
+		if (!teams) loadTeams()
 	})
 
 	async function loadTeams() {
@@ -52,58 +50,35 @@
 			return teams
 		} catch (error) {
 			isFetching = false
-			dispatch('error', error)
+			onError?.(error)
 			console.error('Error loading teams:', error)
 			return []
 		}
 	}
-
-	function handleTeamSelect(event) {
-		selectedTeam = event.detail
-		if (selectedTeam) {
-			dispatch('change', selectedTeam)
-		}
-	}
-
-	function filterTeams(filterText: string | unknown) {
-		if (!teams) return teams
-
-		const searchText = typeof filterText === 'string' ? filterText : ''
-
-		const filtered = searchText
-			? teams.filter((team) => team.team_name.toLowerCase().includes(searchText.toLowerCase()))
-			: teams
-
-		return filtered
-	}
 </script>
 
 <div class={containerClass}>
 	<div class="flex items-center gap-2">
 		<div class="flex-grow" style="min-width: {minWidth};">
 			<Select
-				inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-				containerStyles={'border-color: lightgray; min-width: ' +
-					minWidth +
-					';' +
-					(darkMode
-						? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-						: SELECT_INPUT_DEFAULT_STYLE.containerStyles)}
-				itemId="team_id"
-				label="team_name"
-				items={teams || []}
-				on:change={handleTeamSelect}
+				containerStyle={'min-width: ' + minWidth}
+				items={teams?.map((team) => ({
+					label: team.team_name,
+					value: team.team_id
+				})) ?? []}
 				{placeholder}
-				searchable={true}
-				loading={isFetching}
+				clearable
 				disabled={disabled || isFetching}
-				on:input={(e) => filterTeams(e.detail)}
+				bind:value={
+					() => selectedTeam?.team_id,
+					(value) => (selectedTeam = teams?.find((team) => team.team_id === value))
+				}
 			/>
 		</div>
 
 		{#if showRefreshButton}
 			<button
-				on:click={loadTeams}
+				onclick={loadTeams}
 				disabled={isFetching || disabled}
 				class="flex items-center justify-center p-1.5 rounded hover:bg-surface-hover focus:bg-surface-hover disabled:opacity-50"
 				title="Refresh teams from Microsoft"
@@ -123,5 +98,3 @@
 		</div>
 	{/if}
 </div>
-
-<DarkModeObserver on:change={onThemeChange} />
diff --git a/frontend/src/lib/components/TemplateEditor.svelte b/frontend/src/lib/components/TemplateEditor.svelte
index 22d3fc6776..84f9d20c22 100644
--- a/frontend/src/lib/components/TemplateEditor.svelte
+++ b/frontend/src/lib/components/TemplateEditor.svelte
@@ -380,7 +380,6 @@
 		$componentControl[$selectedComponent[0]] = {
 			...$componentControl[$selectedComponent[0]],
 			setCode: (value: string) => {
-				code = value
 				setCode(value)
 			}
 		}
@@ -411,10 +410,10 @@
 	}
 
 	export function setCode(ncode: string): void {
-		code = ncode
-		if (editor) {
-			editor.setValue(ncode)
+		if (code != ncode) {
+			code = ncode
 		}
+		editor?.setValue(ncode)
 	}
 
 	let valueAfterDispose: string | undefined = undefined
@@ -473,12 +472,20 @@
 			editor.addCommand(KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Digit7, function () {})
 		})
 
+		function updateCode() {
+			const ncode = getCode()
+			if (code == ncode) {
+				return
+			}
+			code = ncode
+			dispatch('change', { code: ncode })
+		}
+
 		let timeoutModel: NodeJS.Timeout | undefined = undefined
 		editor.onDidChangeModelContent((event) => {
 			timeoutModel && clearTimeout(timeoutModel)
 			timeoutModel = setTimeout(() => {
-				code = getCode()
-				dispatch('change', { code })
+				updateCode()
 			}, 200)
 		})
 
@@ -504,7 +511,7 @@
 
 		editor.onDidBlurEditorText(() => {
 			dispatch('blur')
-			code = getCode()
+			updateCode()
 		})
 
 		jsLoader = setTimeout(async () => {
diff --git a/frontend/src/lib/components/TriggerableByAI.svelte b/frontend/src/lib/components/TriggerableByAI.svelte
new file mode 100644
index 0000000000..f4569d844e
--- /dev/null
+++ b/frontend/src/lib/components/TriggerableByAI.svelte
@@ -0,0 +1,56 @@
+<script lang="ts">
+	import { aiChatManager } from '$lib/components/copilot/chat/AIChatManager.svelte'
+
+	let { id, description, onTrigger, children } = $props<{
+		id: string | undefined
+		description: string | undefined
+		onTrigger?: (value?: string) => void // Function to call when the trigger is activated, if not provided, the component is discoverable for information purposes only
+		children?: () => any
+	}>()
+
+	let isAnimating = $state(false)
+
+	// Component is not discoverable if id or description is not provided
+	const disabled = !id || !description
+
+	function handleTrigger(value?: string) {
+		if (disabled || !onTrigger) return
+		isAnimating = true
+		onTrigger(value)
+		setTimeout(() => {
+			isAnimating = false
+		}, 2000)
+	}
+
+	$effect(() => {
+		if (disabled) return
+
+		// register the triggerable
+		const currentId = id
+		const currentData = { description, onTrigger: handleTrigger }
+		const existingTriggerables = aiChatManager.triggerablesByAI
+		existingTriggerables[currentId] = currentData
+
+		return () => {
+			// unregister the triggerable
+			if (aiChatManager.triggerablesByAI[currentId]) {
+				delete aiChatManager.triggerablesByAI[currentId]
+			}
+		}
+	})
+</script>
+
+{#if disabled}
+	{@render children?.()}
+{:else}
+	<div class="relative">
+		{#if isAnimating}
+			<div
+				class="absolute -top-2.5 left-1/2 -translate-x-1/2 w-10 h-10 bg-blue-500/90 rounded-full z-[9999] pointer-events-none animate-ping"
+			></div>
+		{/if}
+		<div class="contents h-full">
+			{@render children?.()}
+		</div>
+	</div>
+{/if}
diff --git a/frontend/src/lib/components/WorkerRepl.svelte b/frontend/src/lib/components/WorkerRepl.svelte
new file mode 100644
index 0000000000..71dff962e4
--- /dev/null
+++ b/frontend/src/lib/components/WorkerRepl.svelte
@@ -0,0 +1,427 @@
+<script lang="ts">
+	import { onMount } from 'svelte'
+	import { Terminal } from 'xterm'
+	import 'xterm/css/xterm.css'
+	import { pollJobResult, runScript } from './jobs/utils'
+	import { workspaceStore } from '$lib/stores'
+	import { Badge, Button, Drawer, DrawerContent, Skeleton } from './common'
+	import DarkModeObserver from './DarkModeObserver.svelte'
+	import { Eye, Library, Play, RefreshCw, Square } from 'lucide-svelte'
+	import Editor from './Editor.svelte'
+	import WorkspaceScriptPicker from './flows/pickers/WorkspaceScriptPicker.svelte'
+	import ToggleHubWorkspace from './ToggleHubWorkspace.svelte'
+	import type { SupportedLanguage } from '$lib/common'
+	import HighlightCode from './HighlightCode.svelte'
+	import PickHubScript from './flows/pickers/PickHubScript.svelte'
+	import { getScriptByPath } from '$lib/scripts'
+	import { FitAddon } from '@xterm/addon-fit'
+	import { Readline } from 'xterm-readline'
+	import Tooltip from './Tooltip.svelte'
+	import { JobService, type QueuedJob } from '$lib/gen'
+	import { sendUserToast } from '$lib/toast'
+	import Select from './Select.svelte'
+	import { emptyString } from '$lib/utils'
+
+	let container: HTMLDivElement
+	let term: Terminal
+	let input = ''
+	type Props = {
+		tag: string
+		width?: number
+	}
+	let scriptPicker: Drawer | undefined = $state()
+	let editor = $state<Editor | null>(null)
+	let darkMode = $state(false)
+	let pick_existing: 'workspace' | 'hub' = $state('workspace')
+	let jobId = $state('')
+	let selectedJobId = $state('')
+	let codeViewer: Drawer | undefined = $state()
+	let filter = $state('')
+	let { tag }: Props = $props()
+	let code: string = $state('')
+	let working_directory = $state('~')
+	let homeDirectory: string = '~'
+	let pendingsJobs: Array<QueuedJob> = $state([])
+	let loadingPendingJobs = $state(false)
+	let isCancelingJob = $state(false)
+	let prompt = $derived(
+		`$-${working_directory === '/' ? '/' : working_directory.split('/').at(-1)} `
+	)
+	let codeObj: { language: SupportedLanguage; content: string } | undefined = $state(undefined)
+	function getNewWorkingDirectoryPath(currentDir: string, newPath: string): string {
+		if (newPath.startsWith('/') || newPath.startsWith('~')) {
+			return newPath
+		}
+
+		return currentDir.replace(/\/+$/, '') + '/' + newPath
+	}
+
+	function ensureTrailingLineBreak(input: any): boolean {
+		if (typeof input !== 'string') {
+			return false
+		}
+		return input.endsWith('\r\n') || input.endsWith('\n')
+	}
+
+	function isSimpleCdCommand(command: string): boolean {
+		const trimmed = command.trim()
+
+		// Matches:
+		// - Starts with "cd"
+		// - Followed by any number of valid args (quoted or not)
+		// - No use of &, |, ; outside quotes
+		// - No other commands
+		const cdRegex = /^cd(\s+("[^"]*"|'[^']*'|[^\s"'&|;]+))*\s*$/
+
+		return cdRegex.test(trimmed)
+	}
+
+	async function handleCommand(command: string) {
+		try {
+			const trimmedCommand = command.trim()
+
+			if (trimmedCommand.length === 0) return
+
+			const isOnlyCdCommand = isSimpleCdCommand(trimmedCommand)
+			let wDirectory = working_directory
+			if (isOnlyCdCommand) {
+				const parts = trimmedCommand.split(' ')
+				if (parts.length > 1) {
+					const path = parts.slice(1).join(' ')
+					const newPath = getNewWorkingDirectoryPath(working_directory, path)
+					wDirectory = newPath
+				} else {
+					wDirectory = homeDirectory
+				}
+			}
+
+			jobId = await runScript({
+				workspace: $workspaceStore!,
+				requestBody: {
+					language: 'bash',
+					content: `(cd ${wDirectory} && ${isOnlyCdCommand ? 'pwd' : `${trimmedCommand}`}) > result.out`,
+					tag,
+					args: {}
+				}
+			})
+
+			let result: any = await pollJobResult(jobId, $workspaceStore!)
+
+			if (isOnlyCdCommand) {
+				working_directory = (result as string).replace(/(\r\n|\n|\r)/g, '')
+				result = ''
+			} else if (!ensureTrailingLineBreak(result)) {
+				result += '\r\n'
+			}
+			rl.write(result)
+		} catch (e) {
+			term.writeln(`Error: ${e}`)
+		}
+	}
+
+	const rl = new Readline()
+
+	async function listPendingJobs() {
+		try {
+			loadingPendingJobs = true
+			pendingsJobs = await JobService.listQueue({
+				workspace: $workspaceStore!,
+				tag,
+				running: true
+			})
+		} catch (error) {
+			sendUserToast(error.body || error.message)
+		} finally {
+			loadingPendingJobs = false
+		}
+	}
+
+	async function listPendingJobsAndUpdateSelectedJobid() {
+		await listPendingJobs()
+		if (!pendingsJobs.find((pendingJob) => pendingJob.id === selectedJobId)) {
+			selectedJobId = ''
+		}
+	}
+
+	async function cancelJob(jobId: string) {
+		try {
+			await JobService.cancelQueuedJob({
+				workspace: $workspaceStore!,
+				id: jobId,
+				requestBody: {}
+			})
+		} catch (err) {
+			sendUserToast(err.body || err.message, true)
+		}
+	}
+
+	onMount(async () => {
+		term = new Terminal({
+			cursorBlink: true,
+			fontSize: 14,
+			theme: {
+				background: '#1e1e1e',
+				foreground: '#ffffff'
+			},
+			fontFamily: 'monospace',
+			convertEol: true,
+			rightClickSelectsWord: true
+		})
+
+		term.loadAddon(rl)
+
+		function readLine() {
+			rl.read(prompt).then(processLine)
+		}
+
+		async function processLine(text: string) {
+			await handleCommand(text)
+			setTimeout(readLine)
+		}
+
+		rl.setCtrlCHandler(async () => {
+			await cancelJob(jobId)
+			rl.read(prompt).then(processLine)
+		})
+
+		const fitAddon = new FitAddon()
+		term.loadAddon(fitAddon)
+		term.open(container)
+		term.focus()
+
+		fitAddon.fit()
+
+		const resizeObserver = new ResizeObserver(() => fitAddon.fit())
+		resizeObserver.observe(container)
+
+		//only used to silence unused variable warning from svelte compiler
+		editor?.show()
+		readLine()
+	})
+
+	function clearPrompt() {
+		const buffer = term.buffer.active
+		const lastLineIndex = buffer.baseY + buffer.cursorY
+		for (let i = lastLineIndex; i >= 0; i--) {
+			const line = buffer.getLine(i)
+
+			if (!line) break
+
+			const text = line.translateToString()
+			const position = text.indexOf(prompt)
+			if (position !== -1) {
+				const x = position + prompt.length + 1
+				term.write(`\x1b[${x}G`)
+
+				const numSpaces = text.length - x
+				term.write(' '.repeat(numSpaces))
+
+				term.write(`\x1b[${x}G`)
+				break
+			} else {
+				term.write('\x1b[2K\r')
+			}
+
+			term.write(`\x1b[1A`)
+		}
+	}
+
+	async function onScriptPick(e: { detail: { path: string } }) {
+		codeObj = await getScriptByPath(e.detail.path ?? '')
+		codeViewer?.openDrawer?.()
+	}
+
+	async function replacePromptWithCommand(command: string) {
+		clearPrompt()
+		if (!ensureTrailingLineBreak(command)) {
+			command += '\r\n'
+		}
+		input = command
+		rl.appendHistory(command)
+		term.write(command)
+		await handleCommand(input)
+		term.write(prompt)
+	}
+
+	listPendingJobs()
+</script>
+
+<DarkModeObserver bind:darkMode />
+
+<Drawer bind:this={codeViewer} size="600px">
+	<DrawerContent title="Code" on:close={codeViewer.closeDrawer}>
+		{#if codeObj}
+			<HighlightCode language={codeObj?.language} code={codeObj?.content} />
+		{:else}
+			<Skeleton layout={[[40]]} />
+		{/if}
+	</DrawerContent>
+</Drawer>
+
+<Drawer bind:this={scriptPicker} size="900px">
+	<DrawerContent title="Code" on:close={scriptPicker.closeDrawer}>
+		{#if pick_existing == 'hub'}
+			<PickHubScript bind:filter kind={'script'} on:pick={onScriptPick}>
+				<ToggleHubWorkspace bind:selected={pick_existing} />
+			</PickHubScript>
+		{:else}
+			<WorkspaceScriptPicker bind:filter kind={'script'} on:pick={onScriptPick}>
+				<ToggleHubWorkspace bind:selected={pick_existing} />
+			</WorkspaceScriptPicker>
+		{/if}
+	</DrawerContent>
+</Drawer>
+
+<div class="h-screen flex flex-col">
+	<div class="m-1 flex flex-col gap-2">
+		<div class="flex flex-col gap-1">
+			{#if pendingsJobs.length === 0}
+				<Button
+					loading={loadingPendingJobs}
+					variant="border"
+					color="light"
+					wrapperClasses="self-stretch"
+					on:click={async () => {
+						await listPendingJobs()
+						if (pendingsJobs.length === 0) {
+							sendUserToast('No pending ssh jobs found')
+						}
+					}}
+					startIcon={{ icon: RefreshCw }}
+				>
+					Load pending ssh jobs</Button
+				>
+			{:else}
+				<div class="flex gap-1">
+					<Select
+						loading={loadingPendingJobs}
+						class="grow shrink"
+						bind:value={selectedJobId}
+						items={pendingsJobs.map((pendingJob) => ({ value: pendingJob.id }))}
+						placeholder="Choose a pending job id"
+						clearable
+						disablePortal
+					/>
+					<Button
+						variant="border"
+						color="light"
+						disabled={emptyString(selectedJobId)}
+						wrapperClasses="self-stretch"
+						on:click={listPendingJobsAndUpdateSelectedJobid}
+						startIcon={{ icon: RefreshCw }}
+						iconOnly
+					/>
+					<Button
+						color="light"
+						size="xs"
+						variant="border"
+						disabled={emptyString(selectedJobId)}
+						startIcon={{ icon: Eye }}
+						on:click={async () => {
+							const jobId = pendingsJobs.find((pendingsJob) => pendingsJob.id === selectedJobId)?.id
+							if (jobId) {
+								const job = await JobService.getJob({ workspace: $workspaceStore!, id: jobId })
+								codeObj = {
+									content: job.raw_code ?? '',
+									language: job.language ?? 'bash'
+								}
+								codeViewer?.openDrawer()
+							} else {
+								pendingsJobs = pendingsJobs.filter((pendingJob) => pendingJob.id !== selectedJobId)
+								selectedJobId = ''
+							}
+						}}
+						iconOnly
+					/>
+					<Button
+						loading={isCancelingJob}
+						disabled={emptyString(selectedJobId)}
+						color="red"
+						size="xs"
+						variant="border"
+						startIcon={{ icon: Square }}
+						on:click={async () => {
+							try {
+								isCancelingJob = true
+								await cancelJob(selectedJobId)
+								sendUserToast('Job cancelled successfully')
+								pendingsJobs = pendingsJobs.filter((pendingJob) => pendingJob.id !== selectedJobId)
+								selectedJobId = ''
+							} catch (error) {
+								sendUserToast(error.body || error.message, true)
+								await listPendingJobsAndUpdateSelectedJobid()
+							} finally {
+								isCancelingJob = false
+							}
+						}}
+						iconOnly
+					/>
+				</div>
+			{/if}
+		</div>
+
+		<div>
+			<div class="flex justify-start w-full mb-2">
+				<div class="flex flex-row">
+					<Badge
+						color="gray"
+						class="relative center-center !bg-gray-300 !text-tertiary dark:!bg-gray-700 dark:!text-gray-300 !h-[40px] rounded-r-none rounded-l-none"
+					>
+						Full path
+
+						<Tooltip
+							markdownTooltip="Commands run in the default directory. Run a standalone `cd` to change it. Chained or invalid `cd` commands won’t apply."
+							class="absolute top-0.5"
+						/>
+					</Badge>
+				</div>
+				<input type="text" disabled bind:value={working_directory} />
+			</div>
+
+			<div bind:this={container}></div>
+		</div>
+	</div>
+	<div class="flex flex-col h-full gap-1 mt-2">
+		<div class="flex flex-row w-full justify-between">
+			<div class="flex flex-row">
+				<Button
+					btnClasses="!font-medium text-tertiary "
+					size="xs"
+					spacingSize="md"
+					color="light"
+					startIcon={{ icon: Play }}
+					title="Run bash script"
+					on:click={async () => {
+						await replacePromptWithCommand(code)
+					}}
+				>
+					Run
+				</Button>
+				<Button
+					btnClasses="!font-medium text-tertiary "
+					size="xs"
+					spacingSize="md"
+					color="light"
+					on:click={scriptPicker.openDrawer}
+					startIcon={{ icon: Library }}
+					title="Explore other scripts"
+				>
+					Library
+				</Button>
+			</div>
+		</div>
+		<Editor
+			bind:this={editor}
+			useWebsockets={false}
+			bind:code
+			scriptLang="bash"
+			class="w-full h-full"
+		/>
+	</div>
+</div>
+
+<style>
+	:global(.xterm-screen) {
+		padding-left: 10px;
+	}
+</style>
diff --git a/frontend/src/lib/components/WorkerTagSelect.svelte b/frontend/src/lib/components/WorkerTagSelect.svelte
index 8cac3f0a64..616cb6d809 100644
--- a/frontend/src/lib/components/WorkerTagSelect.svelte
+++ b/frontend/src/lib/components/WorkerTagSelect.svelte
@@ -2,10 +2,8 @@
 	import { workerTags, workspaceStore } from '$lib/stores'
 	import { WorkerService } from '$lib/gen'
 
-	import Select from './apps/svelte-select/lib/index'
 	import { createEventDispatcher } from 'svelte'
-	import DarkModeObserver from './DarkModeObserver.svelte'
-	import { SELECT_INPUT_DEFAULT_STYLE } from '$lib/defaults'
+	import Select from './Select.svelte'
 
 	let {
 		tag = $bindable(),
@@ -32,57 +30,18 @@
 		...(tag && tag != '' && !($workerTags ?? []).includes(tag) ? [tag] : []),
 		...($workerTags ?? [])
 	])
-	let darkMode: boolean = $state(false)
 </script>
 
-<DarkModeObserver bind:darkMode />
-
 <div class="flex gap-1 items-center">
 	{#if !noLabel}
 		<div class="text-tertiary text-2xs">tag</div>
 	{/if}
 	<Select
+		clearable
+		class="w-full"
 		{disabled}
 		placeholder={nullTag ? `default: ${nullTag}` : 'lang default'}
-		containerStyles={'--height: 30px !important; --input-padding: 0px !important; ' +
-			(darkMode
-				? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-				: SELECT_INPUT_DEFAULT_STYLE.containerStyles)}
-		{items}
-		value={tag ? { value: tag, label: tag } : undefined}
-		on:clear={() => {
-			tag = undefined
-			dispatch('change', undefined)
-		}}
-		on:change={(e) => {
-			console.log('change', e.detail)
-			dispatch('change', e.detail.value)
-		}}
-		bind:justValue={tag}
+		items={items.map((value) => ({ value }))}
+		bind:value={() => tag, (value) => ((tag = value), dispatch('change', value))}
 	/>
-
-	<!-- <select
-		class="min-w-32"
-		placeholder="Tag"
-		bind:value={tag}
-		onchange={(e) => {
-			if (tag == '') {
-				tag = undefined
-			}
-			dispatch('change', tag)
-		}}
-		{disabled}
-	>
-		{#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/apps/components/display/dbtable/utils.ts b/frontend/src/lib/components/apps/components/display/dbtable/utils.ts
index 0c3fce722f..05b30ec1f2 100644
--- a/frontend/src/lib/components/apps/components/display/dbtable/utils.ts
+++ b/frontend/src/lib/components/apps/components/display/dbtable/utils.ts
@@ -8,7 +8,7 @@ import {
 } from 'graphql'
 import { tryEvery } from '$lib/utils'
 import { stringifySchema } from '$lib/components/copilot/lib'
-import { runPreviewJobAndPollResult } from '$lib/components/jobs/utils'
+import { runScriptAndPollResult } from '$lib/components/jobs/utils'
 
 export enum ColumnIdentity {
 	ByDefault = 'By Default',
@@ -114,7 +114,7 @@ export async function loadAllTablesMetaData(
 	}
 
 	try {
-		let result = (await runPreviewJobAndPollResult({
+		let result = (await runScriptAndPollResult({
 			workspace: workspace,
 			requestBody: {
 				language: getLanguageByResourceType(resourceType),
diff --git a/frontend/src/lib/components/apps/components/inputs/AppDateSelect.svelte b/frontend/src/lib/components/apps/components/inputs/AppDateSelect.svelte
index 0d7dad526f..bd454eb780 100644
--- a/frontend/src/lib/components/apps/components/inputs/AppDateSelect.svelte
+++ b/frontend/src/lib/components/apps/components/inputs/AppDateSelect.svelte
@@ -9,11 +9,9 @@
 	import { components } from '../../editor/component'
 	import ResolveConfig from '../helpers/ResolveConfig.svelte'
 	import ResolveStyle from '../helpers/ResolveStyle.svelte'
-	import Select from '../../svelte-select/lib/Select.svelte'
-	import { SELECT_INPUT_DEFAULT_STYLE } from '$lib/defaults'
-	import DarkModeObserver from '$lib/components/DarkModeObserver.svelte'
 	import { twMerge } from 'tailwind-merge'
 	import { enUS, fr, de, pt, ja } from 'date-fns/locale'
+	import Select from '$lib/components/Select.svelte'
 
 	export let id: string
 	export let configuration: RichConfigurations
@@ -86,7 +84,6 @@
 
 	let css = initCss($app.css?.dateinputcomponent, customCss)
 
-	let darkMode: boolean = false
 	let selectedDay: string | undefined = undefined
 	let selectedMonth: string | undefined = undefined
 	let selectedYear: string | undefined = undefined
@@ -216,8 +213,6 @@
 	/>
 {/each}
 
-<DarkModeObserver bind:darkMode />
-
 <InitializeComponent {id} />
 
 <AlignWrapper {render} {verticalAlignment}>
@@ -236,25 +231,20 @@
 				class={twMerge('grow', resolvedConfig?.orientation === 'horizontal' ? 'w-1/4' : 'w-full')}
 			>
 				<Select
-					portal={false}
-					value={selectedDay}
-					on:change={(e) => {
-						selectedDay = e.detail.value
-						outputs.day.set(Number(selectedDay))
-					}}
-					on:clear={() => {
-						selectedDay = ''
-						outputs.day.set(undefined)
-					}}
+					bind:value={
+						() => selectedDay,
+						(v) => {
+							selectedDay = v ?? ''
+							outputs.day.set(v ? Number(v) : undefined)
+						}
+					}
 					items={Array.from({ length: computeDayPerMonth(selectedMonth, selectedYear) }, (_, i) => {
 						return { label: String(i + 1), value: String(i + 1) }
 					})}
 					class={twMerge('text-clip min-w-0', css?.input?.class, 'wm-date-select')}
-					containerStyles={(darkMode
-						? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-						: SELECT_INPUT_DEFAULT_STYLE.containerStyles) + css?.input?.style}
-					inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
+					containerStyle={css?.input?.style}
 					placeholder="Pick a day"
+					clearable
 				/>
 			</div>
 		{/if}
@@ -263,22 +253,17 @@
 				class={twMerge('grow', resolvedConfig?.orientation === 'horizontal' ? 'w-1/2' : 'w-full')}
 			>
 				<Select
-					portal={false}
-					value={selectedMonth}
-					on:change={(e) => {
-						selectedMonth = e.detail.value
-						outputs.month.set(monthItems.findIndex((item) => item.value === selectedMonth) + 1)
-					}}
-					on:clear={() => {
-						selectedMonth = ''
-						outputs.month.set(undefined)
-					}}
+					bind:value={
+						() => selectedMonth ?? '',
+						(v) => {
+							selectedMonth = v
+							outputs.month.set(monthItems.findIndex((item) => item.value === selectedMonth) + 1)
+						}
+					}
 					items={monthItems}
 					placeholder="Pick a month"
 					class={twMerge('text-clip min-w-0', css?.input?.class, 'wm-date-select')}
-					containerStyles={(darkMode
-						? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-						: SELECT_INPUT_DEFAULT_STYLE.containerStyles) + css?.input?.style}
+					containerStyle={css?.input?.style}
 					clearable
 				/>
 			</div>
@@ -288,23 +273,19 @@
 				class={twMerge('grow', resolvedConfig?.orientation === 'horizontal' ? 'w-1/4' : 'w-full')}
 			>
 				<Select
-					portal={false}
-					value={selectedYear}
-					on:change={(e) => {
-						selectedYear = e.detail.value
-						outputs.year.set(Number(selectedYear))
-					}}
-					on:clear={() => {
-						selectedYear = ''
-						outputs.year.set(undefined)
-					}}
-					items={Array.from({ length: 201 }, (_, i) => `${1900 + i}`)}
+					bind:value={
+						() => selectedYear,
+						(v) => {
+							selectedYear = v ?? ''
+							outputs.year.set(selectedYear ? Number(selectedYear) : undefined)
+						}
+					}
+					items={Array.from({ length: 201 }, (_, i) => `${1900 + i}`).map((value) => ({
+						value
+					}))}
 					placeholder="Pick a year"
-					inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
 					class={twMerge('text-clip min-w-0', css?.input?.class, 'wm-date-select')}
-					containerStyles={(darkMode
-						? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-						: SELECT_INPUT_DEFAULT_STYLE.containerStyles) + css?.input?.style}
+					containerStyle={css?.input?.style}
 					clearable
 				/>
 			</div>
diff --git a/frontend/src/lib/components/apps/components/inputs/AppSelect.svelte b/frontend/src/lib/components/apps/components/inputs/AppSelect.svelte
index 6d7abcaf55..2f35f531dd 100644
--- a/frontend/src/lib/components/apps/components/inputs/AppSelect.svelte
+++ b/frontend/src/lib/components/apps/components/inputs/AppSelect.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { getContext, onDestroy } from 'svelte'
-	import Select from '../../svelte-select/lib/index'
 
 	import type {
 		AppViewerContext,
@@ -11,7 +10,6 @@
 	} from '../../types'
 	import { initCss } from '../../utils'
 	import AlignWrapper from '../helpers/AlignWrapper.svelte'
-	import { SELECT_INPUT_DEFAULT_STYLE } from '../../../../defaults'
 	import { initConfig, initOutput } from '../../editor/appUtils'
 	import InitializeComponent from '../helpers/InitializeComponent.svelte'
 	import ResolveConfig from '../helpers/ResolveConfig.svelte'
@@ -21,6 +19,7 @@
 	import { Bug } from 'lucide-svelte'
 	import Popover from '$lib/components/Popover.svelte'
 	import ResolveStyle from '../helpers/ResolveStyle.svelte'
+	import Select from '$lib/components/Select.svelte'
 
 	export let id: string
 	export let configuration: RichConfigurations
@@ -42,8 +41,7 @@
 		connectingInput,
 		selectedComponent,
 		runnableComponents,
-		componentControl,
-		darkMode
+		componentControl
 	} = getContext<AppViewerContext>('AppViewerContext')
 
 	const iterContext = getContext<ListContext>('ListWrapperContext')
@@ -74,8 +72,8 @@
 	let value: string | undefined = noDefault
 		? undefined
 		: outputs?.result.peak()
-		? JSON.stringify(outputs?.result.peak())
-		: undefined
+			? JSON.stringify(outputs?.result.peak())
+			: undefined
 
 	$: resolvedConfig.items && handleItems()
 
@@ -108,7 +106,7 @@
 						label: item?.label ?? 'undefined',
 						value: item?.value != undefined ? JSON.stringify(item.value) : 'undefined'
 					}
-			  })
+				})
 			: []
 
 		if (value != undefined && listItems.some((x) => x.value === value)) {
@@ -137,9 +135,7 @@
 		rowInputs?.remove(id)
 	})
 
-	function onChange(e: CustomEvent) {
-		e?.stopPropagation()
-
+	function onChange(nvalue: any) {
 		if (resolvedConfig.create) {
 			listItems = listItems.map((i) => {
 				delete i.created
@@ -147,7 +143,7 @@
 			})
 		}
 		preclickAction?.()
-		setValue(e.detail?.['value'])
+		setValue(nvalue)
 		if (onSelect) {
 			onSelect.forEach((id) => $runnableComponents?.[id]?.cb?.forEach((f) => f()))
 		}
@@ -182,7 +178,8 @@
 
 	let previsousFilter = ''
 
-	function handleFilter(e) {
+	function onFilter(newFilterText: string) {
+		filterText = newFilterText
 		if (resolvedConfig.create && filterText !== previsousFilter) {
 			previsousFilter = filterText
 			if (filterText.length > 0) {
@@ -260,34 +257,22 @@
 				</select>
 			{:else}
 				<Select
-					inAppEditor={true}
-					--border-radius="0.250rem"
-					--clear-icon-color="#6b7280"
-					--border={$darkMode ? '1px solid #6b7280' : '1px solid #d1d5db'}
-					bind:filterText
-					on:filter={handleFilter}
-					on:clear={onClear}
-					on:change={onChange}
-					items={listItems}
+					bind:filterText={() => filterText, onFilter}
+					{onClear}
+					items={listItems.map((item) =>
+						item.created && item.label === filterText
+							? { ...item, label: 'Add new: ' + item.label }
+							: item
+					)}
 					listAutoWidth={resolvedConfig.fullWidth}
-					inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-					containerStyles={($darkMode
-						? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-						: SELECT_INPUT_DEFAULT_STYLE.containerStyles) + css?.input?.style}
-					{value}
+					containerStyle={css?.input?.style}
+					bind:value={() => value, onChange}
 					class={css?.input?.class}
 					placeholder={resolvedConfig.placeholder}
 					disabled={resolvedConfig.disabled}
-					on:focus={() => {
-						if (!$connectingInput.opened) {
-							$selectedComponent = [id]
-						}
-					}}
-				>
-					<svelte:fragment slot="item" let:item
-						>{#if resolvedConfig.create}{item.created ? 'Add new: ' : ''}{/if}{item.label}
-					</svelte:fragment>
-				</Select>
+					clearable
+					onFocus={() => !$connectingInput.opened && ($selectedComponent = [id])}
+				/>
 			{/if}
 		{:else}
 			<Popover notClickable placement="bottom" popupClass="!bg-surface border w-96">
diff --git a/frontend/src/lib/components/apps/components/layout/AppTabs.svelte b/frontend/src/lib/components/apps/components/layout/AppTabs.svelte
index c033165c69..977ccc69d9 100644
--- a/frontend/src/lib/components/apps/components/layout/AppTabs.svelte
+++ b/frontend/src/lib/components/apps/components/layout/AppTabs.svelte
@@ -151,10 +151,11 @@
 				)}
 				style={css?.tabRow?.style}
 			>
-				{#each tabs ?? [] as res}
+				{#each tabs ?? [] as res, index}
 					<button
 						on:pointerdown|stopPropagation
-						on:click={() => (selected = res)}
+						on:click={() => !resolvedDisabledTabs[index] && (selected = res)}
+						disabled={resolvedDisabledTabs[index]}
 						class={twMerge(
 							'rounded-sm !truncate text-sm  hover:text-primary px-1 py-2',
 							css?.allTabs?.class,
@@ -165,7 +166,8 @@
 										css?.selectedTab?.class,
 										'wm-tabs-selectedTab'
 									)
-								: ''
+								: '',
+							resolvedDisabledTabs[index] ? 'opacity-50 cursor-not-allowed hover:text-secondary' : ''
 						)}
 						style={selected == res
 							? [css?.allTabs?.style, css?.selectedTab?.style].filter(Boolean).join(';')
@@ -182,7 +184,8 @@
 					<div class="border-b">
 						<button
 							on:pointerdown|stopPropagation
-							on:click={() => (selected = res)}
+							on:click={() => !resolvedDisabledTabs[index] && (selected = res)}
+							disabled={resolvedDisabledTabs[index]}
 							class={twMerge(
 								'w-full text-left bg-surface !truncate text-sm hover:text-primary px-1 py-2',
 								css?.allTabs?.class,
@@ -193,7 +196,8 @@
 											css?.selectedTab?.class,
 											'wm-tabs-selectedTab'
 										)
-									: 'text-secondary'
+									: 'text-secondary',
+								resolvedDisabledTabs[index] ? 'opacity-50 cursor-not-allowed hover:text-secondary' : ''
 							)}
 						>
 							<span class="mr-2 w-8 font-mono">{selected == res ? '-' : '+'}</span>
diff --git a/frontend/src/lib/components/apps/editor/SettingsPanel.svelte b/frontend/src/lib/components/apps/editor/SettingsPanel.svelte
index b2e0a4b52e..108a2498c2 100644
--- a/frontend/src/lib/components/apps/editor/SettingsPanel.svelte
+++ b/frontend/src/lib/components/apps/editor/SettingsPanel.svelte
@@ -121,9 +121,15 @@
 						gridItemWithLocation?.location.type === 'subgrid' &&
 						Array.isArray($app.subgrids?.[gridItemWithLocation.location.subgridKey])
 					) {
-						$app.subgrids[gridItemWithLocation.location.subgridKey][
-							gridItemWithLocation.location.subgridItemIndex
-						] = cs.item
+						if (
+							$app.subgrids[gridItemWithLocation.location.subgridKey][
+								gridItemWithLocation.location.subgridItemIndex
+							]
+						) {
+							$app.subgrids[gridItemWithLocation.location.subgridKey][
+								gridItemWithLocation.location.subgridItemIndex
+							] = cs.item
+						}
 					}
 				}
 			}
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/HideButton.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/HideButton.svelte
index f473894312..341c93c04f 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/HideButton.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/HideButton.svelte
@@ -4,7 +4,6 @@
 	import Button from '$lib/components/common/button/Button.svelte'
 	import { getModifierKey } from '$lib/utils'
 	import {
-		type Icon,
 		PanelBottomClose,
 		PanelBottomOpen,
 		PanelLeftClose,
@@ -12,7 +11,6 @@
 		PanelRightClose,
 		PanelRightOpen
 	} from 'lucide-svelte'
-	import type { ComponentType } from 'svelte'
 	import { twMerge } from 'tailwind-merge'
 
 	export let btnClasses: string | undefined = undefined
@@ -24,7 +22,7 @@
 	export let hidden: boolean = false
 	export let shortcut: string | undefined = undefined
 	export let panelName: string | undefined = undefined
-	export let customHiddenIcon: ComponentType<Icon> | undefined = undefined
+	export let customHiddenIcon: ButtonType.Icon | undefined = undefined
 	export let usePopoverOverride: boolean = false
 
 	const OpenIconMap = {
@@ -62,9 +60,13 @@
 	</svelte:fragment>
 	<Button
 		iconOnly
-		startIcon={{
-			icon: hidden ? customHiddenIcon ?? OpenIconMap[direction] : CloseIconMap[direction]
-		}}
+		startIcon={hidden
+			? (customHiddenIcon ?? {
+					icon: OpenIconMap[direction]
+				})
+			: {
+					icon: CloseIconMap[direction]
+				}}
 		{size}
 		btnClasses={twMerge(
 			'p-1 text-gray-300 hover:!text-gray-600 dark:text-gray-500 dark:hover:!text-gray-200 bg-transparent',
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/DBTableSelect.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/DBTableSelect.svelte
index 110ab76784..25c4baea3f 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/DBTableSelect.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/DBTableSelect.svelte
@@ -1,45 +1,27 @@
 <script lang="ts">
-	import { SELECT_INPUT_DEFAULT_STYLE } from '$lib/defaults'
 	import type { StaticInput, StaticOptions } from '../../../inputType'
-	import Select from '$lib/components/apps/svelte-select/lib/index'
-	import DarkModeObserver from '$lib/components/DarkModeObserver.svelte'
+	import Select from '$lib/components/Select.svelte'
 
-	export let componentInput: StaticInput<any> | undefined
-	export let selectOptions: StaticOptions['selectOptions'] | undefined = undefined
-	export let id: string | undefined
-
-	let selectedValue: string | undefined = componentInput?.value ?? undefined
-	let darkMode: boolean = false
-
-	$: sortedOptions = Array.isArray(selectOptions)
-		? selectOptions?.sort((a, b) => a.localeCompare(b))
-		: []
+	interface Props {
+		componentInput: StaticInput<any> | undefined
+		selectOptions?: StaticOptions['selectOptions'] | undefined
+		id: string | undefined
+	}
+	let { componentInput = $bindable(), selectOptions: _options = undefined, id }: Props = $props()
+	let options = $derived.by(() => {
+		if (!Array.isArray(_options)) return []
+		return _options
+			.map((o) => (typeof o === 'string' ? { label: o, value: o } : o))
+			.sort((a, b) => a.label.localeCompare(b.label))
+	})
 </script>
 
-<DarkModeObserver bind:darkMode />
-
-{#if selectOptions && componentInput}
+{#if options && componentInput}
 	<Select
-		portal={false}
-		value={selectedValue}
-		on:change={(e) => {
-			selectedValue = e.detail.value
-			if (componentInput?.type === 'static') {
-				componentInput.value = e.detail.value
-			}
-		}}
-		on:clear={() => {
-			if (componentInput?.type === 'static') {
-				componentInput.value = undefined
-			}
-		}}
-		items={sortedOptions}
+		bind:value={componentInput.value}
+		items={options}
 		class="text-clip grow min-w-0"
 		placeholder="Select a table"
-		inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-		containerStyles={darkMode
-			? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-			: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
 		clearable
 	/>
 {:else}
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
index 3b59f74051..dd9c7aebb6 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
@@ -13,14 +13,27 @@
 	import { zIndexes } from '$lib/zIndexes'
 	import Popover from '$lib/components/Popover.svelte'
 
-	export let componentInput: EvalV2AppInput | undefined
-	export let id: string
-	export let field: string
-	export let fixedOverflowWidgets: boolean = true
-	export let acceptSelf: boolean = false
-	export let recomputeOnInputChanged = true
-	export let showOnDemandOnlyToggle = false
-	export let securedContext = false
+	interface Props {
+		componentInput: EvalV2AppInput | undefined
+		id: string
+		field: string
+		fixedOverflowWidgets?: boolean
+		acceptSelf?: boolean
+		recomputeOnInputChanged?: boolean
+		showOnDemandOnlyToggle?: boolean
+		securedContext?: boolean
+	}
+
+	let {
+		componentInput = $bindable(),
+		id,
+		field,
+		fixedOverflowWidgets = true,
+		acceptSelf = false,
+		recomputeOnInputChanged = true,
+		showOnDemandOnlyToggle = false,
+		securedContext = false
+	}: Props = $props()
 
 	const {
 		onchange,
@@ -30,15 +43,17 @@
 	} = getContext<AppViewerContext>('AppViewerContext')
 	const { evalPreview } = getContext<AppEditorContext>('AppEditorContext')
 
-	let editor: SimpleEditor
+	let editor: SimpleEditor | undefined = $state()
 	export function setCode(code: string) {
 		editor?.setCode(code)
 	}
 
-	$: extraLib =
-		componentInput?.expr && $worldStore
+	let exprDefined = $derived(componentInput?.expr != undefined)
+	let extraLib = $derived(
+		exprDefined && $worldStore
 			? buildExtraLib($worldStore?.outputsById ?? {}, acceptSelf ? '' : id, $stateStore, false)
 			: undefined
+	)
 
 	if (
 		componentInput &&
@@ -58,8 +73,8 @@
 		}
 	}
 
-	let fullscreen = false
-	let focus = false
+	let fullscreen = $state(false)
+	let focus = $state(false)
 </script>
 
 {#if componentInput?.type === 'evalv2'}
@@ -110,7 +125,14 @@
 				small
 				bind:this={editor}
 				lang="javascript"
-				bind:code={() => componentInput.expr ?? '', (e) => (componentInput.expr = e)}
+				bind:code={
+					() => componentInput.expr ?? '',
+					(e) => {
+						if (componentInput.expr != e) {
+							componentInput.expr = e
+						}
+					}
+				}
 				shouldBindKey={false}
 				{extraLib}
 				autoHeight
@@ -132,17 +154,17 @@
 				<div class="border bg-surface absolute top-0.5 right-8 p-0.5">
 					<Popover notClickable>
 						<Shield size={12} />
-						<svelte:fragment slot="text">
+						{#snippet text()}
 							This context variable is securely provided by the backend and cannot be altered by
 							users
-						</svelte:fragment>
+						{/snippet}
 					</Popover>
 				</div>
 			{/if}
 			<button
 				title="Open in drawer"
 				class="border bg-surface absolute hover:text-primary top-0 right-2 p-0.5 text-secondary"
-				on:click={() => (fullscreen = true)}><Maximize2 size={10} /></button
+				onclick={() => (fullscreen = true)}><Maximize2 size={10} /></button
 			>
 			{#if focus}
 				<div class="relative w-full">
diff --git a/frontend/src/lib/components/apps/svelte-select/lib/Select.svelte b/frontend/src/lib/components/apps/svelte-select/lib/SelectLegacy.svelte
similarity index 100%
rename from frontend/src/lib/components/apps/svelte-select/lib/Select.svelte
rename to frontend/src/lib/components/apps/svelte-select/lib/SelectLegacy.svelte
diff --git a/frontend/src/lib/components/apps/svelte-select/lib/index.js b/frontend/src/lib/components/apps/svelte-select/lib/index.js
index 7a0599e5b8..80d0787c5f 100644
--- a/frontend/src/lib/components/apps/svelte-select/lib/index.js
+++ b/frontend/src/lib/components/apps/svelte-select/lib/index.js
@@ -1 +1 @@
-export { default as default } from './Select.svelte'
+export { default as default } from './SelectLegacy.svelte'
diff --git a/frontend/src/lib/components/common/CloseButton.svelte b/frontend/src/lib/components/common/CloseButton.svelte
index fea765e3ef..8c79c12741 100644
--- a/frontend/src/lib/components/common/CloseButton.svelte
+++ b/frontend/src/lib/components/common/CloseButton.svelte
@@ -4,9 +4,15 @@
 	import { X } from 'lucide-svelte'
 	import { twMerge } from 'tailwind-merge'
 
-	export let noBg = false
-	export let small: boolean = false
-	export let Icon: any | undefined = undefined
+	interface Props {
+		noBg?: boolean
+		small?: boolean
+		Icon?: any | undefined
+		class?: string
+	}
+
+	let { noBg = false, small = false, Icon, class: className }: Props = $props()
+
 	const dispatch = createEventDispatcher()
 </script>
 
@@ -19,6 +25,7 @@
 	btnClasses={twMerge(
 		'hover:bg-surface-hover rounded-full p-0',
 		noBg ? '' : 'bg-surface-secondary',
-		small ? 'w-6 h-6' : 'w-8 h-8'
+		small ? 'w-6 h-6' : 'w-8 h-8',
+		className ?? ''
 	)}
 />
diff --git a/frontend/src/lib/components/common/button/Button.svelte b/frontend/src/lib/components/common/button/Button.svelte
index c013443598..e342420233 100644
--- a/frontend/src/lib/components/common/button/Button.svelte
+++ b/frontend/src/lib/components/common/button/Button.svelte
@@ -9,7 +9,11 @@
 	import type { Placement } from '@floating-ui/core'
 	import { conditionalMelt } from '$lib/utils'
 	import { createDispatcherIfMounted } from '$lib/createDispatcherIfMounted'
+	import TriggerableByAI from '$lib/components/TriggerableByAI.svelte'
 
+	export let id: string = ''
+	export let aiId: string | undefined = undefined
+	export let aiDescription: string | undefined = undefined
 	export let size: ButtonType.Size = 'md'
 	export let spacingSize: ButtonType.Size = size
 	export let color: ButtonType.Color | string = 'blue'
@@ -26,7 +30,6 @@
 	export let clickableWhileLoading = false
 
 	export let element: ButtonType.Element | undefined = undefined
-	export let id: string = ''
 	export let nonCaptureEvent: boolean = false
 	export let propagateEvent: boolean = false
 	export let loading = false
@@ -72,6 +75,10 @@
 		element?.focus({})
 	}
 
+	export function click() {
+		element?.click()
+	}
+
 	const dispatch = createEventDispatcher()
 	const dispatchIfMounted = createDispatcherIfMounted(dispatch)
 	// Order of classes: border, border modifier, bg, bg modifier, text, text modifier, everything else
@@ -155,150 +162,160 @@
 	$: $open !== undefined && dispatchIfMounted('tooltipOpen', $open)
 </script>
 
-<div
-	class={twMerge(
-		dropdownItems && dropdownItems.length > 0 && variant === 'contained'
-			? ButtonType.ColorVariants[color].divider
-			: '',
-		wrapperClasses,
-		'flex flex-row',
-		disabled ? 'divide-text-disabled' : ''
-	)}
-	style={wrapperStyle}
-	data-interactive
+<TriggerableByAI
+	id={aiId}
+	description={aiDescription}
+	onTrigger={() => {
+		element?.click()
+	}}
 >
-	{#if href && !disabled}
-		<a
-			bind:this={element}
-			on:pointerdown
-			on:focus
-			on:blur
-			on:mouseenter
-			on:mouseleave
-			on:click={() => {
-				loading = true
-				dispatch('click', event)
-				if (!loadUntilNav) {
-					loading = false
-				}
-			}}
-			{href}
-			{download}
-			class={buttonClass}
-			{id}
-			{target}
-			tabindex={disabled ? -1 : 0}
-			{...$$restProps}
-			{style}
-		>
-			{#if loading}
-				<Loader2 class={twMerge('animate-spin', iconOnlyPadding[size])} size={lucideIconSize} />
-			{:else if startIcon?.icon}
-				<svelte:component
-					this={startIcon.icon}
-					class={twMerge(startIcon?.classes, iconOnlyPadding[size])}
-					size={lucideIconSize}
-					{...startIcon.props}
-				/>
-			{/if}
+	<div
+		class={twMerge(
+			dropdownItems && dropdownItems.length > 0 && variant === 'contained'
+				? ButtonType.ColorVariants[color].divider
+				: '',
+			wrapperClasses,
+			'flex flex-row',
+			disabled ? 'divide-text-disabled' : ''
+		)}
+		style={wrapperStyle}
+		data-interactive
+	>
+		{#if href && !disabled}
+			<a
+				bind:this={element}
+				on:pointerdown
+				on:focus
+				on:blur
+				on:mouseenter
+				on:mouseleave
+				on:click={() => {
+					loading = true
+					dispatch('click', event)
+					if (!loadUntilNav) {
+						loading = false
+					}
+				}}
+				{href}
+				{download}
+				class={buttonClass}
+				{id}
+				{target}
+				tabindex={disabled ? -1 : 0}
+				{...$$restProps}
+				{style}
+			>
+				{#if loading}
+					<Loader2 class={twMerge('animate-spin', iconOnlyPadding[size])} size={lucideIconSize} />
+				{:else if startIcon?.icon}
+					<svelte:component
+						this={startIcon.icon}
+						class={twMerge(startIcon?.classes, iconOnlyPadding[size])}
+						size={lucideIconSize}
+						{...startIcon.props}
+					/>
+				{/if}
 
-			{#if !iconOnly}
-				<slot />
-			{/if}
-			{#if endIcon?.icon}
-				<svelte:component
-					this={endIcon.icon}
-					class={twMerge(endIcon?.classes, iconOnlyPadding[size])}
-					size={lucideIconSize}
-				/>
-			{/if}
-			{#if shortCut && !shortCut.hide}
-				<div class="flex flex-row items-center !text-md opacity-60 gap-0 font-normal">
-					{#if shortCut.withoutModifier !== true}{getModifierKey()}{/if}{#if shortCut.Icon}<shortCut.Icon
-							class="w-4 h-4"
-							size={lucideIconSize}
-						/>{:else}{shortCut.key}{/if}
+				{#if !iconOnly}
+					<slot />
+				{/if}
+				{#if endIcon?.icon}
+					<svelte:component
+						this={endIcon.icon}
+						class={twMerge(endIcon?.classes, iconOnlyPadding[size])}
+						size={lucideIconSize}
+					/>
+				{/if}
+				{#if shortCut && !shortCut.hide}
+					<div class="flex flex-row items-center !text-md opacity-60 gap-0 font-normal">
+						{#if shortCut.withoutModifier !== true}{getModifierKey()}{/if}{#if shortCut.Icon}<shortCut.Icon
+								class="w-4 h-4"
+								size={lucideIconSize}
+							/>{:else}{shortCut.key}{/if}
+					</div>
+				{/if}
+			</a>
+		{:else}
+			<button
+				bind:this={element}
+				on:pointerdown
+				on:click={onClick}
+				on:focus
+				on:blur
+				on:mouseenter
+				on:mouseleave
+				class={buttonClass}
+				{id}
+				tabindex={disabled ? -1 : 0}
+				{title}
+				{...$$restProps}
+				disabled={disabled || (loading && !clickableWhileLoading)}
+				{style}
+				use:conditionalMelt={trigger}
+				{...$trigger}
+			>
+				{#if loading}
+					<Loader2 class={twMerge('animate-spin', iconOnlyPadding[size])} size={lucideIconSize} />
+				{:else if startIcon?.icon}
+					<svelte:component
+						this={startIcon.icon}
+						class={twMerge(startIcon?.classes, iconOnlyPadding[size])}
+						size={lucideIconSize}
+						{...startIcon.props}
+					/>
+				{/if}
+
+				{#if !iconOnly}
+					<slot />
+				{/if}
+				{#if endIcon?.icon}
+					<svelte:component
+						this={endIcon.icon}
+						class={twMerge(endIcon?.classes, iconOnlyPadding[size])}
+						size={lucideIconSize}
+					/>
+				{/if}
+				{#if shortCut && !shortCut.hide}
+					{@const Icon = shortCut.Icon}
+					<div class="flex flex-row items-center !text-md opacity-60 gap-0 font-normal">
+						{#if shortCut.withoutModifier !== true}{getModifierKey()}{/if}{#if shortCut.Icon}<Icon
+								size={lucideIconSize}
+							/>{:else}{shortCut.key}{/if}
+					</div>
+				{/if}
+			</button>
+			{#if tooltipPopover && $open}
+				<div use:conditionalMelt={content} {...$content} class="z-[20000]">
+					<slot name="tooltip" />
 				</div>
 			{/if}
-		</a>
-	{:else}
-		<button
-			bind:this={element}
-			on:pointerdown
-			on:click={onClick}
-			on:focus
-			on:blur
-			on:mouseenter
-			on:mouseleave
-			class={buttonClass}
-			{id}
-			tabindex={disabled ? -1 : 0}
-			{title}
-			{...$$restProps}
-			disabled={disabled || (loading && !clickableWhileLoading)}
-			{style}
-			use:conditionalMelt={trigger}
-			{...$trigger}
-		>
-			{#if loading}
-				<Loader2 class={twMerge('animate-spin', iconOnlyPadding[size])} size={lucideIconSize} />
-			{:else if startIcon?.icon}
-				<svelte:component
-					this={startIcon.icon}
-					class={twMerge(startIcon?.classes, iconOnlyPadding[size])}
-					size={lucideIconSize}
-					{...startIcon.props}
-				/>
-			{/if}
-
-			{#if !iconOnly}
-				<slot />
-			{/if}
-			{#if endIcon?.icon}
-				<svelte:component
-					this={endIcon.icon}
-					class={twMerge(endIcon?.classes, iconOnlyPadding[size])}
-					size={lucideIconSize}
-				/>
-			{/if}
-			{#if shortCut && !shortCut.hide}
-				{@const Icon = shortCut.Icon}
-				<div class="flex flex-row items-center !text-md opacity-60 gap-0 font-normal">
-					{#if shortCut.withoutModifier !== true}{getModifierKey()}{/if}{#if shortCut.Icon}<Icon
-							size={lucideIconSize}
-						/>{:else}{shortCut.key}{/if}
-				</div>
-			{/if}
-		</button>
-		{#if tooltipPopover && $open}
-			<div use:conditionalMelt={content} {...$content} class="z-[20000]">
-				<slot name="tooltip" />
-			</div>
 		{/if}
-	{/if}
 
-	{#if dropdownItems && dropdownItems.length > 0}
-		<Dropdown
-			items={computeDropdowns(dropdownItems)}
-			class="h-auto w-fit"
-			hidePopup={hideDropdown}
-			usePointerDownOutside
-			on:open={() => dispatch('dropdownOpen', true)}
-			on:close={() => dispatch('dropdownOpen', false)}
-		>
-			<svelte:fragment slot="buttonReplacement">
-				<div
-					class={twMerge(
-						buttonClass,
-						'rounded-md m-0 p-0 center-center h-full',
-						variant === 'border' ? 'border-0 border-r border-y ' : 'border-0',
-						'rounded-r-md !rounded-l-none',
-						size === 'xs2' ? '!w-8' : '!w-10'
-					)}
-				>
-					<ChevronDown size={lucideIconSize} />
-				</div>
-			</svelte:fragment>
-		</Dropdown>
-	{/if}
-</div>
+		{#if dropdownItems && dropdownItems.length > 0}
+			<Dropdown
+				aiId={aiId ? `${aiId}-dropdown` : undefined}
+				aiDescription={aiDescription ? `${aiDescription} dropdown` : undefined}
+				items={computeDropdowns(dropdownItems)}
+				class="h-auto w-fit"
+				hidePopup={hideDropdown}
+				usePointerDownOutside
+				on:open={() => dispatch('dropdownOpen', true)}
+				on:close={() => dispatch('dropdownOpen', false)}
+			>
+				<svelte:fragment slot="buttonReplacement">
+					<div
+						class={twMerge(
+							buttonClass,
+							'rounded-md m-0 p-0 center-center h-full',
+							variant === 'border' ? 'border-0 border-r border-y ' : 'border-0',
+							'rounded-r-md !rounded-l-none',
+							size === 'xs2' ? '!w-8' : '!w-10'
+						)}
+					>
+						<ChevronDown size={lucideIconSize} />
+					</div>
+				</svelte:fragment>
+			</Dropdown>
+		{/if}
+	</div>
+</TriggerableByAI>
diff --git a/frontend/src/lib/components/common/confirmationModal/UnsavedConfirmationModal.svelte b/frontend/src/lib/components/common/confirmationModal/UnsavedConfirmationModal.svelte
index 971cd6735d..7fa5565f57 100644
--- a/frontend/src/lib/components/common/confirmationModal/UnsavedConfirmationModal.svelte
+++ b/frontend/src/lib/components/common/confirmationModal/UnsavedConfirmationModal.svelte
@@ -12,6 +12,7 @@
 	} from '$lib/utils'
 	import { page } from '$app/stores'
 	import type { GetInitialAndModifiedValues } from './unsavedTypes'
+	import TriggerableByAI from '$lib/components/TriggerableByAI.svelte'
 
 	export let getInitialAndModifiedValues: GetInitialAndModifiedValues = undefined
 	export let diffDrawer: DiffDrawer | undefined = undefined
@@ -67,6 +68,13 @@
 	})
 </script>
 
+{#if open}
+	<TriggerableByAI
+		id="unsaved-changes-confirmation-modal"
+		description="Unsaved changes confirmation modal. Needs user confirmation to leave the page."
+	/>
+{/if}
+
 <ConfirmationModal
 	{open}
 	title="Unsaved changes detected"
diff --git a/frontend/src/lib/components/common/drawer/Drawer.svelte b/frontend/src/lib/components/common/drawer/Drawer.svelte
index 08fd1a2e2b..6ecd037a9c 100644
--- a/frontend/src/lib/components/common/drawer/Drawer.svelte
+++ b/frontend/src/lib/components/common/drawer/Drawer.svelte
@@ -3,6 +3,7 @@
 	import { BROWSER } from 'esm-env'
 	import Disposable from './Disposable.svelte'
 	import ConditionalPortal from './ConditionalPortal.svelte'
+	import { aiChatManager } from '../../copilot/chat/AIChatManager.svelte'
 
 	export let open = false
 	export let duration = 0.3
@@ -76,10 +77,11 @@
 	>
 		<aside
 			class="drawer windmill-app windmill-drawer {$$props.class ?? ''} {$$props.positionClass ??
-				''}"
+				''} {aiChatManager.open ? 'respect-global-chat' : ''}"
 			class:open
 			class:close={!open && timeout}
-			style={`${style}; --zIndex: ${zIndex};`}
+			class:global-chat-open={aiChatManager.open}
+			style={`${style}; --zIndex: ${zIndex}; --adjusted-offset: calc(${aiChatManager.open && placement === 'right' ? aiChatManager.size : 0}% + 4px)`}
 		>
 			<!-- svelte-ignore a11y-click-events-have-key-events -->
 			<!-- svelte-ignore a11y-no-static-element-interactions -->
@@ -108,8 +110,9 @@
 
 	.drawer.open {
 		height: 100%;
-		width: 100%;
 		z-index: var(--zIndex);
+		right: 0;
+		width: calc(100% - var(--adjusted-offset));
 		transition: z-index var(--duration) step-start;
 		pointer-events: auto;
 	}
@@ -126,6 +129,12 @@
 		transition: opacity var(--duration) ease;
 	}
 
+	.drawer.respect-global-chat.global-chat-open > .overlay {
+		width: 100%;
+		right: var(--adjusted-offset);
+		left: auto;
+	}
+
 	.drawer.open > .overlay {
 		opacity: 1;
 	}
@@ -140,7 +149,9 @@
 		width: 100%;
 		@apply bg-surface;
 		z-index: 3;
-		transition: transform var(--duration) ease, max-width var(--duration) ease,
+		transition:
+			transform var(--duration) ease,
+			max-width var(--duration) ease,
 			max-height var(--duration) ease;
 		height: 100%;
 	}
@@ -155,6 +166,11 @@
 		transform: translate(100%, 0);
 	}
 
+	.drawer.respect-global-chat.global-chat-open > .panel.right {
+		right: var(--adjusted-offset);
+		width: calc(100vw - var(--adjusted-offset));
+	}
+
 	.panel.top {
 		top: 0;
 		transform: translate(0, -100%);
diff --git a/frontend/src/lib/components/common/drawer/DrawerContent.svelte b/frontend/src/lib/components/common/drawer/DrawerContent.svelte
index c47d910e0f..aea6d39930 100644
--- a/frontend/src/lib/components/common/drawer/DrawerContent.svelte
+++ b/frontend/src/lib/components/common/drawer/DrawerContent.svelte
@@ -2,7 +2,11 @@
 	import Tooltip from '$lib/components/Tooltip.svelte'
 	import { classNames } from '$lib/utils'
 	import CloseButton from '../CloseButton.svelte'
+	import TriggerableByAI from '$lib/components/TriggerableByAI.svelte'
+	import { createEventDispatcher } from 'svelte'
 
+	export let aiId: string | undefined = undefined
+	export let aiDescription: string | undefined = undefined
 	export let title: string | undefined = undefined
 	export let overflow_y = true
 	export let noPadding = false
@@ -12,13 +16,22 @@
 	export let CloseIcon: any | undefined = undefined
 
 	export let fullScreen: boolean = true
+
+	const dispatch = createEventDispatcher()
 </script>
 
 <div class={classNames('flex flex-col divide-y', fullScreen ? 'h-screen max-h-screen' : 'h-full')}>
 	<div class="flex justify-between w-full items-center px-4 py-2 gap-2">
 		<div class="flex items-center gap-2 w-full truncate">
-			<CloseButton on:close Icon={CloseIcon} />
-
+			<TriggerableByAI
+				id={`close-${aiId}`}
+				description={`Close ${aiDescription}`}
+				onTrigger={() => {
+					dispatch('close')
+				}}
+			>
+				<CloseButton on:close Icon={CloseIcon} />
+			</TriggerableByAI>
 			<span class="font-semibold truncate text-primary !text-lg max-w-sm"
 				>{title ?? ''}
 				{#if tooltip != '' || documentationLink}
diff --git a/frontend/src/lib/components/common/fileDownload/FileDownload.svelte b/frontend/src/lib/components/common/fileDownload/FileDownload.svelte
index ec94243179..a3ac04d207 100644
--- a/frontend/src/lib/components/common/fileDownload/FileDownload.svelte
+++ b/frontend/src/lib/components/common/fileDownload/FileDownload.svelte
@@ -21,5 +21,7 @@ duration-200 rounded-lg p-1 gap-2"
 	download={s3object?.s3.split('/').pop() ?? 'unnamed_download.file'}
 >
 	<Download />
-	<span>s3://{s3object.s3} {s3object.storage ? ` (${s3object.storage})` : ''}</span>
+	<span>
+		{s3object.storage ? `s3://${s3object.storage}/${s3object.s3}` : `s3:///${s3object.s3}`}
+	</span>
 </a>
diff --git a/frontend/src/lib/components/common/fileInput/FileInput.svelte b/frontend/src/lib/components/common/fileInput/FileInput.svelte
index 0212f5f534..fa3dbb9fb5 100644
--- a/frontend/src/lib/components/common/fileInput/FileInput.svelte
+++ b/frontend/src/lib/components/common/fileInput/FileInput.svelte
@@ -18,7 +18,7 @@
 	export let iconSize = 36
 	export let returnFileNames = false
 	export let submittedText: string | undefined = undefined
-	export let defaultFile: string | undefined = undefined
+	export let defaultFile: string | string[] | undefined = undefined
 	export let disabled: boolean | undefined = undefined
 	export let folderOnly = false
 
@@ -27,6 +27,14 @@
 	type FileWithPath = File & { path?: string }
 	export let files: FileWithPath[] | undefined = undefined
 
+	let pointerStartX = 0
+	let pointerStartY = 0
+
+	function handlePointerDown(e: PointerEvent) {
+		pointerStartX = e.clientX
+		pointerStartY = e.clientY
+	}
+
 	async function onChange(fileList: FileWithPath[] | null) {
 		if (!fileList || !fileList.length) {
 			files = undefined
@@ -160,9 +168,8 @@
 		files = files
 		if (convertTo && files) {
 			const promises = files.map(convertFile)
-			let converted: ConvertedFile[] | { name: string; data: ConvertedFile }[] = await Promise.all(
-				promises
-			)
+			let converted: ConvertedFile[] | { name: string; data: ConvertedFile }[] =
+				await Promise.all(promises)
 			if (returnFileNames) {
 				converted = converted.map((c, i) => ({ name: files![i].name, data: c }))
 			}
@@ -180,14 +187,24 @@
 
 <button
 	class={twMerge(
-		`relative center-center flex-col text-center font-medium text-tertiary 
-		border border-dashed border-gray-400 hover:border-blue-500 
-		focus-within:border-blue-300 hover:bg-blue-50 dark:hover:bg-frost-900  
+		`relative center-center flex-col text-center font-medium text-tertiary
+		border border-dashed border-gray-400 hover:border-blue-500
+		focus-within:border-blue-300 hover:bg-blue-50 dark:hover:bg-frost-900
 		duration-200 rounded-component p-1`,
 		c
 	)}
 	on:dragover={handleDragOver}
 	on:drop={handleDrop}
+	on:pointerdown={handlePointerDown}
+	on:click={(e) => {
+		const deltaX = Math.abs(e.clientX - pointerStartX)
+		const deltaY = Math.abs(e.clientY - pointerStartY)
+		if (deltaX > 5 || deltaY > 5) {
+			e.preventDefault()
+			e.stopPropagation()
+			return
+		}
+	}}
 	{style}
 	{disabled}
 >
@@ -239,7 +256,7 @@
 		{multiple}
 		{...$$restProps}
 	/>
-	{#if defaultFile}
+	{#if defaultFile && (!Array.isArray(defaultFile) || defaultFile.length > 0)}
 		<div class="w-full border-dashed border-t-2 text-2xs pt-1 text-tertiary mt-2">
 			Default file: <span class="text-blue-500">{defaultFile}</span>
 		</div>
diff --git a/frontend/src/lib/components/common/fileUpload/FileUpload.svelte b/frontend/src/lib/components/common/fileUpload/FileUpload.svelte
index 9e5180b76c..44f2a7d8d6 100644
--- a/frontend/src/lib/components/common/fileUpload/FileUpload.svelte
+++ b/frontend/src/lib/components/common/fileUpload/FileUpload.svelte
@@ -12,69 +12,111 @@
 	import { createEventDispatcher, onDestroy } from 'svelte'
 	import { emptyString } from '$lib/utils'
 
-	export let acceptedFileTypes: string[] | undefined = ['*']
-	export let allowMultiple: boolean = true
-	export let allowDelete = true
-	export let folderOnly = false
-	export let containerText: string = folderOnly
-		? 'Drag and drop a folder here or click to browse'
-		: allowMultiple
-			? 'Drag and drop files here or click to browse'
-			: 'Drag and drop a file here or click to browse'
-	export let customResourcePath: string | undefined = undefined
-	export let customResourceType: 's3' | 'azure_blob' | undefined = undefined // when customResourcePath is provided, this should be provided as well. Will default to S3 if not
-	export let customClass: string = ''
-	export let customStyle: string = ''
-	export let randomFileKey: boolean = false
-	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([])
-	export let appPath: string | undefined = undefined
-	export let disabled = false
-	export let iconSize: number | undefined = undefined
-	export let initialValue:
-		| {
-				s3: string
-				filename: string
-		  }
-		| undefined = undefined
-
-	init()
-
-	function init() {
-		if (initialValue?.s3) {
-			if (!$fileUploads.find((fileUpload) => fileUpload.path === initialValue?.s3)) {
-				$fileUploads = [
-					...$fileUploads,
-					{
-						name: initialValue.filename,
-						size: 0,
-						progress: 100,
-						path: initialValue?.s3
-					}
-				]
-			}
-		}
+	interface Props {
+		acceptedFileTypes?: string[] | undefined
+		allowMultiple?: boolean
+		allowDelete?: boolean
+		folderOnly?: boolean
+		containerText?: string
+		customResourcePath?: string | undefined
+		customResourceType?: 's3' | 'azure_blob' | undefined // when customResourcePath is provided, this should be provided as well. Will default to S3 if not
+		customClass?: string
+		customStyle?: string
+		randomFileKey?: boolean
+		pathTransformer?: any // function taking as input {file: File} and returning a string
+		forceDisplayUploads?: boolean
+		defaultValue?: string | string[] | undefined
+		workspace?: string | undefined
+		fileUploads?: Writable<FileUploadData[]>
+		appPath?: string | undefined
+		disabled?: boolean
+		iconSize?: number | undefined
+		initialValue?:
+			| {
+					s3: string
+					filename: string
+			  }
+			| {
+					s3: string
+					filename: string
+			  }[]
+			| undefined
+		computeForceViewerPolicies?:
+			| (() =>
+					| {
+							allowed_resources: string[]
+							allow_user_resources: boolean
+							allow_workspace_resource: boolean
+							file_key_regex: string
+					  }
+					| undefined)
+			| undefined
 	}
 
-	export let computeForceViewerPolicies:
-		| (() =>
-				| {
-						allowed_resources: string[]
-						allow_user_resources: boolean
-						allow_workspace_resource: boolean
-						file_key_regex: string
-				  }
-				| undefined)
-		| undefined = undefined
+	let {
+		acceptedFileTypes = ['*'],
+		allowMultiple = true,
+		allowDelete = true,
+		folderOnly = false,
+		containerText = folderOnly
+			? 'Drag and drop a folder here or click to browse'
+			: allowMultiple
+				? 'Drag and drop files here or click to browse'
+				: 'Drag and drop a file here or click to browse',
+		customResourcePath = undefined,
+		customResourceType = undefined,
+		customClass = '',
+		customStyle = '',
+		randomFileKey = false,
+		pathTransformer = undefined,
+		forceDisplayUploads = $bindable(false),
+		defaultValue = undefined,
+		workspace = undefined,
+		fileUploads = writable([]),
+		appPath = undefined,
+		disabled = false,
+		iconSize = undefined,
+		initialValue = undefined,
+		computeForceViewerPolicies = undefined
+	}: Props = $props()
 
 	const dispatch = createEventDispatcher<{
 		addition: { path?: string; filename?: string }
 		deletion: { path: string }
 	}>()
 
+	let initialS3 = $derived(
+		Array.isArray(initialValue)
+			? initialValue?.map((v) => v.s3)
+			: initialValue?.s3
+				? [initialValue?.s3]
+				: undefined
+	)
+	init()
+
+	function init() {
+		if (initialS3) {
+			function transform(initialValue: { s3: string; filename: string }) {
+				return {
+					name: initialValue.filename,
+					size: 0,
+					progress: 100,
+					path: initialValue?.s3
+				}
+			}
+			for (const s3 of initialS3) {
+				if (!$fileUploads.find((fileUpload) => fileUpload.path === s3)) {
+					let initialFileUploads = initialValue
+						? Array.isArray(initialValue)
+							? initialValue.map(transform)
+							: [transform(initialValue)]
+						: []
+					$fileUploads = [...$fileUploads, ...initialFileUploads]
+				}
+			}
+		}
+	}
+
 	type FileUploadData = {
 		name: string
 		size: number
@@ -554,10 +596,10 @@
 			{containerText}{#if disabled}<br />(Disabled){/if}
 		</FileInput>
 	{/if}
-	{#if initialValue?.s3 && $fileUploads.length == 0}
+	{#if initialS3 && initialS3.length > 0 && $fileUploads.length == 0}
 		<div class="flex flex-row gap-1 items-center p-1">
 			<span class="text-sm">
-				File currently selected: {initialValue?.s3}
+				File currently selected: {initialS3?.join(', ')}
 			</span>
 		</div>
 	{/if}
diff --git a/frontend/src/lib/components/common/table/AppRow.svelte b/frontend/src/lib/components/common/table/AppRow.svelte
index 12d13cbf38..e8b3980d47 100644
--- a/frontend/src/lib/components/common/table/AppRow.svelte
+++ b/frontend/src/lib/components/common/table/AppRow.svelte
@@ -99,6 +99,8 @@
 				{#if app.canWrite}
 					<div>
 						<Button
+							aiId={`edit-app-button-${app.summary?.length > 0 ? app.summary : app.path}`}
+							aiDescription={`Edits the app ${app.summary?.length > 0 ? app.summary : app.path}`}
 							color="light"
 							size="xs"
 							variant="border"
@@ -111,6 +113,8 @@
 				{:else}
 					<div>
 						<Button
+							aiId={`fork-app-button-${app.summary?.length > 0 ? app.summary : app.path}`}
+							aiDescription={`Fork the app ${app.summary?.length > 0 ? app.summary : app.path}`}
 							color="light"
 							size="xs"
 							variant="border"
@@ -124,6 +128,8 @@
 			{/if}
 		</span>
 		<Dropdown
+			aiId={`app-row-dropdown-${app.summary?.length > 0 ? app.summary : app.path}`}
+			aiDescription={`Open dropdown for app ${app.summary?.length > 0 ? app.summary : app.path} options`}
 			items={async () => {
 				let { draft_only, canWrite, summary, execution_mode, path, has_draft } = app
 
@@ -184,7 +190,7 @@
 									},
 									hide: $userStore?.operator
 								}
-						  ]
+							]
 						: []),
 					{
 						displayName: $userStore?.operator ? 'View JSON' : 'View/Edit JSON',
@@ -231,7 +237,7 @@
 										gotoUrl(url)
 									}
 								}
-						  ]
+							]
 						: []),
 					...(has_draft
 						? [
@@ -250,7 +256,7 @@
 									disabled: !canWrite,
 									hide: $userStore?.operator
 								}
-						  ]
+							]
 						: []),
 					{
 						displayName: 'Delete',
diff --git a/frontend/src/lib/components/common/table/FlowRow.svelte b/frontend/src/lib/components/common/table/FlowRow.svelte
index 78f2ca6959..51f8bc0dce 100644
--- a/frontend/src/lib/components/common/table/FlowRow.svelte
+++ b/frontend/src/lib/components/common/table/FlowRow.svelte
@@ -114,6 +114,8 @@
 							variant="border"
 							startIcon={{ icon: Pen }}
 							href="{base}/flows/edit/{flow.path}?nodraft=true"
+							aiId={`edit-flow-button-${flow.summary?.length > 0 ? flow.summary : flow.path}`}
+							aiDescription={`Edits the flow ${flow.summary?.length > 0 ? flow.summary : flow.path}`}
 						>
 							Edit
 						</Button>
@@ -126,6 +128,8 @@
 							variant="border"
 							startIcon={{ icon: GitFork }}
 							href="{base}/flows/add?template={flow.path}"
+							aiId={`fork-flow-button-${flow.summary?.length > 0 ? flow.summary : flow.path}`}
+							aiDescription={`Fork the flow ${flow.summary?.length > 0 ? flow.summary : flow.path}`}
 						>
 							Fork
 						</Button>
@@ -135,6 +139,8 @@
 		</span>
 
 		<Dropdown
+			aiId={`flow-row-dropdown-${flow.summary?.length > 0 ? flow.summary : flow.path}`}
+			aiDescription={`Open dropdown for flow ${flow.summary?.length > 0 ? flow.summary : flow.path} options`}
 			items={async () => {
 				let { draft_only, path, archived, has_draft } = flow
 				let owner = isOwner(path, $userStore, $workspaceStore)
diff --git a/frontend/src/lib/components/common/table/ScriptRow.svelte b/frontend/src/lib/components/common/table/ScriptRow.svelte
index 286e0778ab..24e4143dd7 100644
--- a/frontend/src/lib/components/common/table/ScriptRow.svelte
+++ b/frontend/src/lib/components/common/table/ScriptRow.svelte
@@ -140,6 +140,8 @@
 				{:else if script.canWrite && !script.archived}
 					<div>
 						<Button
+							aiId={`edit-script-button-${script.summary?.length > 0 ? script.summary : script.path}`}
+							aiDescription={`Edits the script ${script.summary?.length > 0 ? script.summary : script.path}`}
 							color="light"
 							size="xs"
 							variant="border"
@@ -152,6 +154,8 @@
 				{:else if !script.draft_only}
 					<div>
 						<Button
+							aiId={`fork-script-button-${script.summary ?? script.path}`}
+							aiDescription={`Fork the script ${script.summary ?? script.path}`}
 							color="light"
 							size="xs"
 							variant="border"
@@ -165,6 +169,8 @@
 			{/if}
 		</span>
 		<Dropdown
+			aiId={`script-row-dropdown-${script.summary?.length > 0 ? script.summary : script.path}`}
+			aiDescription={`Open dropdown for script ${script.summary?.length > 0 ? script.summary : script.path} options`}
 			items={async () => {
 				let owner = isOwner(script.path, $userStore, $workspaceStore)
 				if (script.draft_only) {
diff --git a/frontend/src/lib/components/common/tabs/Tab.svelte b/frontend/src/lib/components/common/tabs/Tab.svelte
index fb69c95248..3372f057ee 100644
--- a/frontend/src/lib/components/common/tabs/Tab.svelte
+++ b/frontend/src/lib/components/common/tabs/Tab.svelte
@@ -2,7 +2,10 @@
 	import { getContext } from 'svelte'
 	import { twMerge } from 'tailwind-merge'
 	import type { TabsContext } from './Tabs.svelte'
+	import TriggerableByAI from '$lib/components/TriggerableByAI.svelte'
 
+	export let aiId: string | undefined = undefined
+	export let aiDescription: string | undefined = undefined
 	export let value: string
 	export let size: 'xs' | 'sm' | 'md' | 'lg' | 'xl' = 'sm'
 	let c = ''
@@ -41,30 +44,42 @@
 	}
 </script>
 
-<button
-	class={twMerge(
-		'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 ',
-		fontSizeClasses[size],
-		c,
-		isSelected ? selectedClass : '',
-		disabled ? 'cursor-not-allowed text-tertiary' : ''
-	)}
-	style={`${style} ${isSelected ? selectedStyle : ''}`}
-	on:click={() => {
+<TriggerableByAI
+	id={aiId}
+	description={aiDescription}
+	onTrigger={() => {
 		if (hashNavigation) {
 			window.location.hash = value
 		} else {
 			update(value)
 		}
 	}}
-	on:pointerdown|stopPropagation
-	{disabled}
-	{id}
 >
-	<div class={twMerge(active ? 'bg-blue-50 text-blue-800 rounded-md ' : '', 'px-2 ')}>
-		<slot />
-	</div>
-</button>
+	<button
+		class={twMerge(
+			'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 ',
+			fontSizeClasses[size],
+			c,
+			isSelected ? selectedClass : '',
+			disabled ? 'cursor-not-allowed text-tertiary' : ''
+		)}
+		style={`${style} ${isSelected ? selectedStyle : ''}`}
+		on:click={() => {
+			if (hashNavigation) {
+				window.location.hash = value
+			} else {
+				update(value)
+			}
+		}}
+		on:pointerdown|stopPropagation
+		{disabled}
+		{id}
+	>
+		<div class={twMerge(active ? 'bg-blue-50 text-blue-800 rounded-md ' : '', 'px-2 ')}>
+			<slot />
+		</div>
+	</button>
+</TriggerableByAI>
diff --git a/frontend/src/lib/components/copilot/AskAiButton.svelte b/frontend/src/lib/components/copilot/AskAiButton.svelte
new file mode 100644
index 0000000000..fba62c3e59
--- /dev/null
+++ b/frontend/src/lib/components/copilot/AskAiButton.svelte
@@ -0,0 +1,35 @@
+<script lang="ts">
+	import { Button } from '$lib/components/common'
+	import { WandSparkles } from 'lucide-svelte'
+	import { aiChatManager } from './chat/AIChatManager.svelte'
+	interface Props {
+		label?: string
+		initialInput?: string
+		onClick?: () => void
+	}
+
+	const { label, initialInput, onClick: onClickProp }: Props = $props()
+
+	export function onClick() {
+		aiChatManager.openChat()
+		if (initialInput) {
+			aiChatManager.askAi(initialInput, {
+				withCode: false,
+				withDiff: false
+			})
+		}
+		onClickProp?.()
+	}
+</script>
+
+<Button
+	iconOnly={!label}
+	startIcon={{
+		icon: WandSparkles
+	}}
+	size="xs2"
+	btnClasses="!text-violet-800 dark:!text-violet-400 border border-gray-200 dark:border-gray-600 !bg-surface"
+	on:click={onClick}
+>
+	{label}
+</Button>
diff --git a/frontend/src/lib/components/copilot/CronGen.svelte b/frontend/src/lib/components/copilot/CronGen.svelte
index d002fbf490..3bc549a067 100644
--- a/frontend/src/lib/components/copilot/CronGen.svelte
+++ b/frontend/src/lib/components/copilot/CronGen.svelte
@@ -22,7 +22,7 @@
 		"You are a helpful assistant for creating CRON schedules using both standard and extended Croner patterns. The structure is 'second minute hour dayOfMonth month dayOfWeek'. Supported modifiers: ? (wildcard), L (last day/weekday), # (nth occurrence of a weekday), and W (closest weekday). Weekdays are Sunday (0 or 7), Monday (1), Tuesday (2), Wednesday (3), Thursday (4), Friday (5), Saturday (6). Ensure syntax is valid, including optional seconds and special modifiers. You only return either the CRON string without any leading/closing quotes or an error message prefixed with 'ERROR:'."
 
 	const SYSTEM_V1 =
-		"You are a helpful assitant for creating CRON schedules. The structure is 'second minute hour dayOfMonth month dayOfWeek'. Weekdays are Sunday (1), Monday (2), Tuesday (3), Wednesday (4), Thursday (5), Friday (6), Saturday (7). You only return the CRON string without any wrapping characters. If it is invalid, you will return an error message preceeded by 'ERROR:'."
+		"You are a helpful assistant for creating CRON schedules. The structure is 'second minute hour dayOfMonth month dayOfWeek'. Weekdays are Sunday (1), Monday (2), Tuesday (3), Wednesday (4), Thursday (5), Friday (6), Saturday (7). You only return the CRON string without any wrapping characters. If it is invalid, you will return an error message preceded by 'ERROR:'."
 
 	$: updateSystemPrompt(cronVersion)
 
diff --git a/frontend/src/lib/components/copilot/FlowCopilotDrawer.svelte b/frontend/src/lib/components/copilot/FlowCopilotDrawer.svelte
deleted file mode 100644
index 598129e906..0000000000
--- a/frontend/src/lib/components/copilot/FlowCopilotDrawer.svelte
+++ /dev/null
@@ -1,317 +0,0 @@
-<script lang="ts">
-	import { Button, Drawer, DrawerContent, Badge } 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 { getContext } from 'svelte'
-	import { capitalize, classNames } from '$lib/utils'
-	import { APP_TO_ICON_COMPONENT } from '../icons'
-	import { charsToNumber, numberToChars } from '../flows/idUtils'
-	import type { FlowCopilotContext } from './flow'
-	import Alert from '../common/alert/Alert.svelte'
-	import type { FlowEditorContext } from '../flows/types'
-	import type { FlowModule } from '$lib/gen'
-	import { Plus, Wand2, X } from 'lucide-svelte'
-
-	export let getHubCompletions: (text: string, idx: number, type: 'trigger' | 'script') => void
-	export let genFlow: (index: number, modules: FlowModule[], stepOnly?: boolean) => void
-	export let flowCopilotMode: 'trigger' | 'sequence'
-
-	const { flowStore } = getContext<FlowEditorContext>('FlowEditorContext')
-
-	const { drawerStore, modulesStore, currentStepStore } =
-		getContext<FlowCopilotContext>('FlowCopilotContext')
-</script>
-
-<Drawer bind:this={$drawerStore}>
-	<DrawerContent
-		on:close={$drawerStore.closeDrawer}
-		title="AI Flow Builder"
-		tooltip="Build flows from prompts"
-		documentationLink="https://www.windmill.dev/docs/core_concepts/ai_generation#windmill-ai-for-flows"
-	>
-		<div class="flex flex-col gap-6">
-			{#if $flowStore.value.modules.length > 0 && $currentStepStore === undefined}
-				<Alert type="error" title="Flow not empty">All flow steps will be overriden</Alert>
-			{/if}
-			<ToggleButtonGroup
-				bind:selected={flowCopilotMode}
-				on:selected={() => {
-					if ($currentStepStore !== undefined) {
-						$currentStepStore = numberToChars(0)
-					}
-				}}
-				let:item
-			>
-				<ToggleButton value="sequence" label="Sequence" {item} />
-				<ToggleButton value="trigger" label="Trigger" {item} />
-			</ToggleButtonGroup>
-			{#if flowCopilotMode === 'trigger'}
-				<Alert title="Trigger flow builder">
-					Build a flow with two scripts, one that regularly checks for changes in an external system
-					and a second that is executed for each change using a for-loop. For both steps, you can
-					either choose a script from the hub or generate one from scratch using Windmill AI. The
-					inputs of the for-loop action are automatically filled in with the ouputs of the trigger
-					step. At the end of the process, flow inputs are inferred and you just need to fill them
-					in. <br /><br />
-					The flow is automatically set to run every 15 minutes when deployed.
-				</Alert>{:else}
-				<Alert title="Sequence flow builder">
-					Build a flow with a sequence of scripts that are executed one after the other. For each
-					step, you can either choose a script from the hub or generate one from scratch using
-					Windmill AI. Each step inputs are automatically filled in with the previous step's
-					outputs. At the end of the process, flow inputs are inferred and you just need to fill
-					them in.
-				</Alert>
-			{/if}
-			{#each $modulesStore as copilotModule, i}
-				<div>
-					{#if i === 1 && $modulesStore[i - 1].type === 'trigger'}
-						<div class="flex flex-row items-center mb-4 gap-1">
-							<p class="text-sm font-semibold">For loop</p>
-							<Badge color="indigo">{copilotModule.id}_loop</Badge>
-						</div>
-					{/if}
-					<div class={i === 1 && $modulesStore[i - 1].type === 'trigger' ? 'pl-4' : ''}>
-						<div class="flex flex-row items-center justify-between">
-							<div class="flex flex-row justify-between items-center w-full mb-2">
-								<div class="flex flex-row items-center gap-1">
-									<p class="text-sm font-semibold"
-										>{copilotModule.type === 'trigger' ? 'Trigger' : 'Action'}</p
-									>
-									<Badge color="indigo">{copilotModule.id}</Badge>
-								</div>
-								{#if flowCopilotMode === 'sequence' && i >= 1}
-									<button
-										on:click={() => {
-											if ($currentStepStore !== undefined) {
-												$currentStepStore = numberToChars(i < $modulesStore.length - 1 ? i : i - 1)
-											}
-											modulesStore.update((prev) => {
-												prev.splice(i, 1)
-												prev.forEach((m, idx) => {
-													m.id = numberToChars(idx)
-												})
-												return prev
-											})
-										}}
-									>
-										<X />
-									</button>
-								{/if}
-							</div>
-						</div>
-						{#if copilotModule.source !== undefined}
-							<div
-								class={classNames(
-									'p-4 gap-4 flex flex-row grow  transition-all items-center rounded-md justify-between border',
-									$currentStepStore !== undefined && i < charsToNumber($currentStepStore)
-										? 'bg-gray-700/10'
-										: 'bg-surface'
-								)}
-							>
-								<div class="flex items-center gap-4">
-									<div
-										class="rounded-md p-1 flex justify-center items-center bg-surface border h-6 w-6"
-									>
-										{#if copilotModule.source === 'hub' && copilotModule.selectedCompletion}
-											<svelte:component
-												this={APP_TO_ICON_COMPONENT[copilotModule.selectedCompletion['app']]}
-											/>
-										{:else}
-											<Wand2 />
-										{/if}
-									</div>
-
-									<div class="w-full text-left font-normal">
-										<div class="text-primary flex-wrap text-sm font-medium">
-											{copilotModule.source === 'hub' && copilotModule.selectedCompletion
-												? copilotModule.selectedCompletion.summary +
-												  ' (' +
-												  copilotModule.selectedCompletion.app +
-												  ')'
-												: `Generate "${copilotModule.description}" in ${
-														copilotModule.lang === 'bun' ? 'TypeScript' : 'Python'
-												  }`}
-										</div>
-									</div>
-								</div>
-								{#if copilotModule.source === 'hub' && copilotModule.selectedCompletion && copilotModule.selectedCompletion?.kind !== 'script'}
-									<Badge color="gray" baseClass="border"
-										>{capitalize(copilotModule.selectedCompletion.kind.toString())}</Badge
-									>
-								{/if}
-
-								<button
-									on:click={() => {
-										copilotModule = {
-											...copilotModule,
-											selectedCompletion: undefined,
-											source: undefined,
-											lang: undefined
-										}
-										if ($currentStepStore !== undefined && i < charsToNumber($currentStepStore)) {
-											$currentStepStore = numberToChars(i)
-										}
-									}}
-								>
-									<X />
-								</button>
-							</div>
-							{#if $currentStepStore !== undefined && i < charsToNumber($currentStepStore)}
-								<p class="font-semibold text-sm text-green-600"
-									>Already generated, edit step to regenerate from this point</p
-								>
-							{/if}
-						{:else}
-							<input
-								name="description"
-								type="text"
-								placeholder={copilotModule.type === 'trigger'
-									? 'describe what should trigger your flow e.g. "new slack message"'
-									: 'describe what this step should do'}
-								bind:value={copilotModule.description}
-								on:input={() => {
-									if (copilotModule.description.length > 2) {
-										getHubCompletions(copilotModule.description, i, copilotModule.type)
-									} else {
-										copilotModule.hubCompletions = []
-									}
-								}}
-							/>
-						{/if}
-						{#if copilotModule.description.length > 2 && copilotModule.source === undefined}
-							<div class="divide-y border rounded-md transition-all mt-2">
-								<button
-									class="p-4 gap-4 flex flex-row hover:bg-surface-hover bg-surface transition-all items-center rounded-md justify-between w-full"
-									on:click={() => {
-										copilotModule = {
-											...copilotModule,
-											source: 'custom',
-											selectedCompletion: undefined,
-											lang: 'bun'
-										}
-									}}
-								>
-									<div class="flex items-center gap-4">
-										<div
-											class="rounded-md p-1 flex justify-center items-center bg-surface border w-6 h-6"
-										>
-											<Wand2 />
-										</div>
-
-										<div class="w-full text-left text-sm">
-											<div class="text-primary flex-wrap font-medium">
-												Generate "{copilotModule.description}" in TypeScript
-											</div>
-										</div>
-									</div>
-								</button>
-								<button
-									class="p-4 gap-4 flex flex-row hover:bg-surface-hover bg-surface transition-all items-center rounded-md justify-between w-full"
-									on:click={() => {
-										copilotModule = {
-											...copilotModule,
-											source: 'custom',
-											selectedCompletion: undefined,
-											lang: 'python3'
-										}
-									}}
-								>
-									<div class="flex items-center gap-4">
-										<div
-											class="rounded-md p-1 flex justify-center items-center bg-surface border w-6 h-6"
-										>
-											<Wand2 />
-										</div>
-
-										<div class="w-full text-left text-sm">
-											<div class="text-primary flex-wrap font-medium">
-												Generate "{copilotModule.description}" in Python
-											</div>
-										</div>
-									</div>
-								</button>
-							</div>
-							{#if copilotModule.hubCompletions.length > 0}
-								<p class="mt-2 font-semibold text-sm">Hub scripts</p>
-								<ul class="divide-y border rounded-md transition-all mt-1">
-									{#each copilotModule.hubCompletions as item (item.path)}
-										<li>
-											<button
-												class="p-4 gap-4 flex flex-row hover:bg-surface-hover bg-surface transition-all items-center rounded-md justify-between w-full"
-												on:click={() => {
-													copilotModule = {
-														...copilotModule,
-														source: 'hub',
-														selectedCompletion: item,
-														lang: undefined
-													}
-												}}
-											>
-												<div class="flex items-center gap-4">
-													<div
-														class="rounded-md p-1 flex justify-center items-center bg-surface border w-6 h-6"
-													>
-														<svelte:component this={APP_TO_ICON_COMPONENT[item['app']]} />
-													</div>
-
-													<div class="text-left font-normal text-sm">
-														<div class="text-primary font-medium">
-															{(item.summary ?? '') + ' (' + item['app'] + ')'}
-														</div>
-													</div>
-												</div>
-												{#if item.kind !== 'script'}
-													<Badge color="gray" baseClass="border"
-														>{capitalize(item.kind.toString())}</Badge
-													>
-												{/if}
-											</button>
-										</li>
-									{/each}
-								</ul>
-							{/if}
-						{/if}
-					</div>
-				</div>
-			{/each}
-			{#if flowCopilotMode !== 'trigger'}
-				<div class="flex justify-start">
-					<Button
-						startIcon={{ icon: Plus }}
-						size="xs"
-						variant="border"
-						on:click={() =>
-							modulesStore.update((prev) => [
-								...prev,
-								{
-									id: numberToChars(prev.length),
-									type: 'script',
-									description: '',
-									code: '',
-									source: undefined,
-									hubCompletions: [],
-									selectedCompletion: undefined,
-									lang: undefined
-								}
-							])}>Add step</Button
-					>
-				</div>
-			{/if}
-
-			<Button
-				on:click={() =>
-					$currentStepStore !== undefined
-						? genFlow(charsToNumber($currentStepStore), $flowStore.value.modules)
-						: genFlow(0, $flowStore.value.modules)}
-				spacingSize="md"
-				startIcon={{ icon: Wand2 }}
-				disabled={$modulesStore.find((m) => m.source === undefined) !== undefined}
-			>
-				{$currentStepStore !== undefined
-					? `Regenerate flow from step '${$currentStepStore}'`
-					: 'Build flow'}
-			</Button>
-		</div>
-	</DrawerContent>
-</Drawer>
diff --git a/frontend/src/lib/components/copilot/FlowCopilotStatus.svelte b/frontend/src/lib/components/copilot/FlowCopilotStatus.svelte
deleted file mode 100644
index d4d2a781fb..0000000000
--- a/frontend/src/lib/components/copilot/FlowCopilotStatus.svelte
+++ /dev/null
@@ -1,145 +0,0 @@
-<script lang="ts">
-	import { base } from '$lib/base'
-	import { getContext } from 'svelte'
-	import ManualPopover from '../ManualPopover.svelte'
-	import Button from '../common/button/Button.svelte'
-	import { WindmillIcon } from '../icons'
-	import type { FlowCopilotContext } from './flow'
-	import { charsToNumber } from '../flows/idUtils'
-	import { copilotInfo } from '$lib/stores'
-	import Popover from '$lib/components/meltComponents/Popover.svelte'
-	import type { FlowModule } from '$lib/gen'
-	import type { FlowEditorContext } from '../flows/types'
-	import { ExternalLink, Wand2 } from 'lucide-svelte'
-	import { twMerge } from 'tailwind-merge'
-
-	export let copilotLoading: boolean
-	export let copilotStatus: string
-	export let abortController: AbortController | undefined
-	export let genFlow: (index: number, modules: FlowModule[], stepOnly?: boolean) => void
-	export let finishCopilotFlowBuilder: () => void
-
-	let copilotPopover: ManualPopover | undefined = undefined
-
-	const { flowStore } = getContext<FlowEditorContext>('FlowEditorContext')
-
-	const { modulesStore, drawerStore, currentStepStore } =
-		getContext<FlowCopilotContext>('FlowCopilotContext')
-
-	$: copilotStatus.length > 0 ? copilotPopover?.open() : copilotPopover?.close()
-
-	$: copilotStatus && copilotPopover?.refresh()
-</script>
-
-{#if $copilotInfo.enabled}
-	<ManualPopover bind:this={copilotPopover}>
-		<Button
-			size="xs"
-			btnClasses={twMerge(
-				$currentStepStore !== undefined ? 'z-[901]' : '',
-				copilotLoading || ($currentStepStore !== undefined && $currentStepStore !== 'Input')
-					? ''
-					: 'text-violet-800 dark:text-violet-400'
-			)}
-			on:click={() => {
-				if (copilotLoading || ($currentStepStore !== undefined && $currentStepStore !== 'Input')) {
-					abortController?.abort()
-					copilotStatus = ''
-					if (!copilotLoading) {
-						$currentStepStore = undefined
-					}
-				} else {
-					$drawerStore?.openDrawer()
-				}
-			}}
-			startIcon={copilotLoading ||
-			($currentStepStore !== undefined && $currentStepStore !== 'Input')
-				? undefined
-				: {
-						icon: Wand2
-				  }}
-			color={copilotLoading || ($currentStepStore !== undefined && $currentStepStore !== 'Input')
-				? 'red'
-				: 'light'}
-			variant={copilotLoading || ($currentStepStore !== undefined && $currentStepStore !== 'Input')
-				? 'contained'
-				: 'border'}
-		>
-			{#if copilotLoading}
-				<WindmillIcon white class="mr-1 text-white" height="16px" width="20px" spin="veryfast" />
-			{/if}
-
-			{copilotLoading
-				? 'Stop'
-				: $currentStepStore !== undefined && $currentStepStore !== 'Input'
-				? 'Exit'
-				: 'AI Builder'}
-		</Button>
-		<div slot="content" class="text-sm flex flex-row items-center z-[901]">
-			<span class="font-semibold">
-				{copilotStatus}
-			</span>
-			{#if !copilotLoading && $currentStepStore !== undefined && $currentStepStore !== 'Input'}
-				<Button
-					size="xs"
-					btnClasses="ml-2"
-					color="red"
-					on:click={() => {
-						$drawerStore?.openDrawer()
-					}}
-				>
-					Edit prompts
-				</Button>
-				<Button
-					btnClasses="ml-2"
-					color="green"
-					size="xs"
-					on:click={() => {
-						if ($currentStepStore === undefined) {
-							return
-						}
-						const stepNb = charsToNumber($currentStepStore)
-						if (stepNb >= $modulesStore.length - 1) {
-							finishCopilotFlowBuilder()
-						} else {
-							genFlow(stepNb + 1, $flowStore.value.modules)
-						}
-					}}
-				>
-					{charsToNumber($currentStepStore) >= $modulesStore.length - 1
-						? 'Flow inputs'
-						: 'Next step'}
-				</Button>
-			{/if}
-		</div>
-	</ManualPopover>
-{:else}
-	<Popover placement="bottom">
-		<svelte:fragment slot="trigger">
-			<Button
-				size="xs"
-				startIcon={{
-					icon: Wand2
-				}}
-				btnClasses="text-violet-800 dark:text-violet-400"
-				color={'light'}
-				variant={'border'}
-				nonCaptureEvent
-			>
-				AI builder
-			</Button>
-		</svelte:fragment>
-		<svelte:fragment slot="content">
-			<div class="block text-primary p-4">
-				<p class="text-sm"
-					>Enable Windmill AI in the <a
-						href="{base}/workspace_settings?tab=ai"
-						target="_blank"
-						class="inline-flex flex-row items-center gap-1"
-						>workspace settings <ExternalLink size={16} /></a
-					></p
-				>
-			</div>
-		</svelte:fragment>
-	</Popover>
-{/if}
diff --git a/frontend/src/lib/components/copilot/MetadataGen.svelte b/frontend/src/lib/components/copilot/MetadataGen.svelte
index 3eaa1d20e3..9c42bafcdf 100644
--- a/frontend/src/lib/components/copilot/MetadataGen.svelte
+++ b/frontend/src/lib/components/copilot/MetadataGen.svelte
@@ -11,6 +11,7 @@
 	import { yamlStringifyExceptKeys } from './utils'
 	import type { ChatCompletionMessageParam } from 'openai/resources/index.mjs'
 	import { createDispatcherIfMounted } from '$lib/createDispatcherIfMounted'
+	import TriggerableByAI from '$lib/components/TriggerableByAI.svelte'
 
 	type PromptConfig = {
 		system: string
@@ -78,6 +79,8 @@ Generate a description for the flow below:
 		}
 	}
 
+	export let aiId: string | undefined = undefined
+	export let aiDescription: string | undefined = undefined
 	export let content: string | undefined
 	export let code: string | undefined = undefined
 	export let flow: FlowValue | undefined = undefined
@@ -187,104 +190,117 @@ Generate a description for the flow below:
 </script>
 
 <!-- svelte-ignore a11y-no-static-element-interactions -->
-<div
-	class={twMerge('relative', $$props.class)}
-	bind:clientWidth={width}
-	on:keydown={(event) => {
-		if (!$copilotInfo.enabled || !$metadataCompletionEnabled) {
-			return
-		}
-		if (event.key === 'Tab') {
-			if (manualDisabled) {
-				event.preventDefault()
-				manualDisabled = false
-			} else if (!loading && generatedContent) {
-				event.preventDefault()
-				content = generatedContent
-				generatedContent = ''
-			} else if (!loading && !content) {
-				event.preventDefault()
-				generateContent()
-			}
-		} else if (event.key === 'Escape' && !manualDisabled) {
-			event.preventDefault()
-			event.stopPropagation()
-			if (loading) {
-				abortController.abort()
-			} else {
-				manualDisabled = true
-				generatedContent = ''
-			}
-		} else if (event.key === 'Backspace' && !loading && !content) {
-			manualDisabled = true
-			generatedContent = ''
+<TriggerableByAI
+	id={aiId}
+	description={aiDescription}
+	onTrigger={(value) => {
+		if (value) {
+			content = value
+			dispatchIfMounted('change', { content })
 		}
 	}}
 >
 	<div
-		class="absolute left-[0.5rem] {elementType === 'textarea'
-			? 'top-[1.3rem]'
-			: 'top-[0.3rem]'}  flex flex-row gap-2 items-start pointer-events-none"
+		class={twMerge('relative', $$props.class)}
+		bind:clientWidth={width}
+		on:keydown={(event) => {
+			if (!$copilotInfo.enabled || !$metadataCompletionEnabled) {
+				return
+			}
+			if (event.key === 'Tab') {
+				if (manualDisabled) {
+					event.preventDefault()
+					manualDisabled = false
+				} else if (!loading && generatedContent) {
+					event.preventDefault()
+					content = generatedContent
+					generatedContent = ''
+				} else if (!loading && !content) {
+					event.preventDefault()
+					generateContent()
+				}
+			} else if (event.key === 'Escape' && !manualDisabled) {
+				event.preventDefault()
+				event.stopPropagation()
+				if (loading) {
+					abortController.abort()
+				} else {
+					manualDisabled = true
+					generatedContent = ''
+				}
+			} else if (event.key === 'Backspace' && !loading && !content) {
+				manualDisabled = true
+				generatedContent = ''
+			}
+		}}
 	>
-		{#if active}
-			<span
-				class={twMerge(
-					'absolute text-xs bg-violet-100 text-violet-800 dark:bg-gray-700 dark:text-violet-400 px-1 py-0.5 rounded-md flex flex-row items-center justify-center gap-2 transition-all shrink-0',
-					!loading && generatedContent.length > 0
-						? 'bg-green-100 text-green-800 dark:text-green-400 dark:bg-green-700'
-						: ''
-				)}
-			>
-				<span class="px-0.5 py-0.5 rounded-md text-2xs text-bold flex flex-row items-center gap-1">
-					{#if loading}
-						ESC
-					{:else}
-						TAB
-					{/if}
-					{#if loading}
-						<Loader2 class="animate-spin" size={12} />
-					{:else if generatedContent}
-						<Check size={12} />
-					{:else}
-						<Wand2 size={12} />
-					{/if}
+		<div
+			class="absolute left-[0.5rem] {elementType === 'textarea'
+				? 'top-[1.3rem]'
+				: 'top-[0.3rem]'}  flex flex-row gap-2 items-start pointer-events-none"
+		>
+			{#if active}
+				<span
+					class={twMerge(
+						'absolute text-xs bg-violet-100 text-violet-800 dark:bg-gray-700 dark:text-violet-400 px-1 py-0.5 rounded-md flex flex-row items-center justify-center gap-2 transition-all shrink-0',
+						!loading && generatedContent.length > 0
+							? 'bg-green-100 text-green-800 dark:text-green-400 dark:bg-green-700'
+							: ''
+					)}
+				>
+					<span
+						class="px-0.5 py-0.5 rounded-md text-2xs text-bold flex flex-row items-center gap-1"
+					>
+						{#if loading}
+							ESC
+						{:else}
+							TAB
+						{/if}
+						{#if loading}
+							<Loader2 class="animate-spin" size={12} />
+						{:else if generatedContent}
+							<Check size={12} />
+						{:else}
+							<Wand2 size={12} />
+						{/if}
+					</span>
 				</span>
-			</span>
-			<div
-				bind:clientHeight={genHeight}
-				class={twMerge(
-					'text-sm leading-6 indent-[3.5rem] text-gray-500 dark:text-gray-400 pr-1',
-					elementType === 'input' ? 'text-ellipsis overflow-hidden whitespace-nowrap' : ''
-				)}
-				style={elementType === 'input' ? `max-width: calc(${width}px - 0.5rem)` : ''}
-			>
-				{generatedContent}
+				<div
+					bind:clientHeight={genHeight}
+					class={twMerge(
+						'text-sm leading-6 indent-[3.5rem] text-gray-500 dark:text-gray-400 pr-1',
+						elementType === 'input' ? 'text-ellipsis overflow-hidden whitespace-nowrap' : ''
+					)}
+					style={elementType === 'input' ? `max-width: calc(${width}px - 0.5rem)` : ''}
+				>
+					{generatedContent}
+				</div>
+			{/if}
+		</div>
+		{#if elementType === 'textarea'}
+			<div>
+				<div class="flex flex-row-reverse !text-3xs text-tertiary -mt-4">GH Markdown</div>
+				<textarea
+					bind:this={el}
+					bind:value={content}
+					use:autosize
+					{...elementProps}
+					placeholder={!active ? elementProps.placeholder : ''}
+					class={active ? '!indent-[3.5rem]' : ''}
+					on:focus={() => (focused = true)}
+					on:blur={() => (focused = false)}
+				></textarea>
 			</div>
-		{/if}
-	</div>
-	{#if elementType === 'textarea'}
-		<div>
-			<div class="flex flex-row-reverse !text-3xs text-tertiary -mt-4">GH Markdown</div>
-			<textarea
+		{:else}
+			<input
 				bind:this={el}
 				bind:value={content}
-				use:autosize
-				{...elementProps}
 				placeholder={!active ? elementProps.placeholder : ''}
 				class={active ? '!indent-[3.5rem]' : ''}
 				on:focus={() => (focused = true)}
 				on:blur={() => (focused = false)}
-			></textarea>
-		</div>
-	{:else}
-		<input
-			bind:this={el}
-			bind:value={content}
-			placeholder={!active ? elementProps.placeholder : ''}
-			class={active ? '!indent-[3.5rem]' : ''}
-			on:focus={() => (focused = true)}
-			on:blur={() => (focused = false)}
-		/>
-	{/if}
-	<!-- <slot {updateFocus} {active} {generatedContent} classNames={active ? '!indent-[8.8rem]' : ''} /> -->
-</div>
+			/>
+		{/if}
+		<!-- <slot {updateFocus} {active} {generatedContent} classNames={active ? '!indent-[8.8rem]' : ''} /> -->
+	</div>
+</TriggerableByAI>
diff --git a/frontend/src/lib/components/copilot/ScriptFix.svelte b/frontend/src/lib/components/copilot/ScriptFix.svelte
index a6dd7e2cdb..568abeb507 100644
--- a/frontend/src/lib/components/copilot/ScriptFix.svelte
+++ b/frontend/src/lib/components/copilot/ScriptFix.svelte
@@ -2,172 +2,23 @@
 	import { base } from '$lib/base'
 	import { Button } from '../common'
 
-	import { SUPPORTED_LANGUAGES, copilot } from './lib'
+	import { SUPPORTED_LANGUAGES } from './lib'
 	import type { SupportedLanguage } from '$lib/common'
-	import { sendUserToast } from '$lib/toast'
-	import type Editor from '../Editor.svelte'
-	import { dbSchemas, copilotInfo, type DBSchema, workspaceStore } from '$lib/stores'
-	import type DiffEditor from '../DiffEditor.svelte'
-	import { scriptLangToEditorLang } from '$lib/scripts'
 	import Popover from '$lib/components/meltComponents/Popover.svelte'
-	import { writable } from 'svelte/store'
-	import { WindmillIcon } from '../icons'
-	import HighlightCode from '../HighlightCode.svelte'
-	import LoadingIcon from '../apps/svelte-select/lib/LoadingIcon.svelte'
 	import { autoPlacement } from '@floating-ui/core'
-	import { Check, Wand2, X, RotateCw } from 'lucide-svelte'
-	import { createEventDispatcher } from 'svelte'
+	import { WandSparkles } from 'lucide-svelte'
+	import { aiChatManager } from './chat/AIChatManager.svelte'
+	import { copilotInfo } from '$lib/stores'
 
-	// props
-	export let lang: SupportedLanguage
-	export let editor: Editor | undefined
-	export let diffEditor: DiffEditor | undefined
-	export let error: string
-	export let args: Record<string, any>
-	export let chatMode: boolean = false
-
-	// state
-	let genLoading: boolean = false
-	let generatedCode = writable<string>('')
-	let generatedExplanation = writable<string>('')
-	let dbSchema: DBSchema | undefined = undefined
-	let abortController: AbortController | undefined = undefined
-
-	const dispatch = createEventDispatcher<{
-		fix: null
-	}>()
-
-	async function onFix() {
-		if (!error) {
-			return
-		}
-		try {
-			genLoading = true
-			abortController = new AbortController()
-			await copilot(
-				{
-					language: lang,
-					code: editor?.getCode() || '',
-					error,
-					dbSchema: dbSchema,
-					type: 'fix',
-					workspace: $workspaceStore!
-				},
-				generatedCode,
-				abortController,
-				generatedExplanation
-			)
-			setupDiff()
-			diffEditor?.setModified($generatedCode)
-			showDiff()
-		} catch (err) {
-			if (!abortController?.signal.aborted) {
-				if (err?.message) {
-					sendUserToast('Failed to generate code: ' + err.message, true)
-				} else {
-					sendUserToast('Failed to generate code', true)
-					console.error(err)
-				}
-			}
-		} finally {
-			genLoading = false
-		}
-	}
-
-	function acceptDiff() {
-		editor?.setCode(diffEditor?.getModified() || '')
-		editor?.format()
-		clear()
-	}
-
-	function rejectDiff() {
-		clear()
-	}
-
-	function setupDiff() {
-		diffEditor?.setupModel(scriptLangToEditorLang(lang))
-		diffEditor?.setOriginal(editor?.getCode() || '')
-	}
-
-	function showDiff() {
-		diffEditor?.show()
-		editor?.hide()
-	}
-
-	function hideDiff() {
-		editor?.show()
-		diffEditor?.hide()
-	}
-
-	function clear() {
-		$generatedCode = ''
-		$generatedExplanation = ''
-	}
-
-	$: lang && clear()
-
-	$: !$generatedCode && hideDiff()
-
-	function updateSchema(lang, args) {
-		const schemaRes = lang === 'graphql' ? args.api : args.database
-		if (typeof schemaRes === 'string') {
-			dbSchema = $dbSchemas[schemaRes.replace('$res:', '')]
-		}
-	}
-	$: updateSchema(lang, args)
-
-	let popover: Popover | undefined = undefined
+	let {
+		lang
+	}: {
+		lang: SupportedLanguage
+	} = $props()
 </script>
 
 {#if SUPPORTED_LANGUAGES.has(lang)}
-	{#if !genLoading && $generatedCode.length > 0}
-		<div class="flex gap-1">
-			<Button
-				title="Discard generated code"
-				size="xs"
-				color="red"
-				spacingSize="xs2"
-				on:click={() => {
-					popover?.close()
-					rejectDiff()
-				}}
-				variant="contained"
-				startIcon={{ icon: X }}
-				propagateEvent={true}
-			>
-				Discard
-			</Button>
-			<Button
-				title="Accept generated code"
-				size="xs"
-				color="green"
-				spacingSize="xs2"
-				on:click={() => {
-					popover?.close()
-					acceptDiff()
-				}}
-				startIcon={{ icon: Check }}
-				propagateEvent={true}
-			>
-				Accept
-			</Button>
-			<Button
-				size="xs"
-				color="light"
-				spacingSize="xs2"
-				on:click={() => {
-					$generatedExplanation = ''
-					popover?.open()
-					onFix()
-				}}
-				startIcon={{ icon: RotateCw }}
-				title="Retry"
-				btnClasses="text-violet-800 dark:text-violet-400"
-			/>
-		</div>
-	{/if}
 	<Popover
-		bind:this={popover}
 		floatingConfig={{
 			middleware: [
 				autoPlacement({
@@ -175,75 +26,39 @@
 				})
 			]
 		}}
-		closeOnOutsideClick={!genLoading}
-		closeButton={!genLoading}
 		displayArrow={true}
 	>
-		<svelte:fragment slot="trigger" let:isOpen>
+		<svelte:fragment slot="trigger">
 			<div class="flex flex-row">
 				<Button
 					title="Fix code"
 					size="xs"
-					color={genLoading ? 'red' : 'light'}
+					color="light"
 					spacingSize="xs2"
-					startIcon={genLoading ? undefined : { icon: Wand2 }}
-					propagateEvent={!chatMode}
-					on:click={chatMode
-						? () => dispatch('fix')
-						: genLoading
-						? () => abortController?.abort()
-						: $generatedCode.length > 0
-							? () => {}
-							: () => onFix()}
-					btnClasses={genLoading
-						? ''
-						: 'text-violet-800 dark:text-violet-400 bg-violet-100 dark:bg-gray-700 min-w-[84px]'}
+					startIcon={{ icon: WandSparkles }}
+					on:click={() => {
+						if ($copilotInfo.enabled) {
+							aiChatManager.fix()
+						}
+					}}
+					btnClasses="text-violet-800 dark:text-violet-400 bg-violet-100 dark:bg-gray-700 min-w-[84px]"
+					propagateEvent={!$copilotInfo.enabled}
 				>
-					{#if genLoading}
-						<WindmillIcon
-							white
-							class="mr-1 text-white"
-							height="16px"
-							width="20px"
-							spin="veryfast"
-						/>
-						Stop
-					{:else if $generatedCode.length > 0}
-						<span class="text-xs">{isOpen ? 'Hide' : 'Show'}</span>
-					{:else}
-						AI Fix
-					{/if}
+					AI Fix
 				</Button>
 			</div>
 		</svelte:fragment>
 		<svelte:fragment slot="content">
 			<div class="p-4">
-				{#if $copilotInfo.enabled}
-					<div class="w-[42rem] min-h-[3rem] max-h-[34rem] overflow-y-auto">
-						{#if $generatedCode.length > 0 && genLoading}
-							<div class="overflow-x-scroll">
-								<HighlightCode language={lang} code={$generatedCode} />
-							</div>
-						{:else if genLoading}
-							<LoadingIcon />
-						{/if}
-						{#if $generatedExplanation.length > 0}
-							<p class="text-sm mt-2"
-								><span class="font-bold">Explanation: test</span> {$generatedExplanation}</p
-							>
-						{/if}
-					</div>
-				{:else}
-					<div class="w-80">
-						<p class="text-sm"
-							>Enable Windmill AI in the <a
-								class="inline-flex flex-row items-center gap-1"
-								href="{base}/workspace_settings?tab=ai"
-								target="_blank">workspace settings</a
-							></p
-						></div
-					>
-				{/if}
+				<div class="w-80">
+					<p class="text-sm"
+						>Enable Windmill AI in the <a
+							class="inline-flex flex-row items-center gap-1"
+							href="{base}/workspace_settings?tab=ai"
+							target="_blank">workspace settings</a
+						></p
+					></div
+				>
 			</div>
 		</svelte:fragment>
 	</Popover>
diff --git a/frontend/src/lib/components/copilot/StepGen.svelte b/frontend/src/lib/components/copilot/StepGen.svelte
deleted file mode 100644
index cc8fb5efde..0000000000
--- a/frontend/src/lib/components/copilot/StepGen.svelte
+++ /dev/null
@@ -1,246 +0,0 @@
-<script lang="ts">
-	import { copilotInfo, workspaceStore } from '$lib/stores'
-	import { createEventDispatcher, getContext } from 'svelte'
-	import type { FlowEditorContext } from '../flows/types'
-	import type { FlowCopilotContext, FlowCopilotModule } from './flow'
-	import { ScriptService, type FlowModule, type Script } from '$lib/gen'
-	import { APP_TO_ICON_COMPONENT } from '../icons'
-	import { sendUserToast } from '$lib/toast'
-	import { nextId } from '../flows/flowModuleNextId'
-	import { Wand2 } from 'lucide-svelte'
-	import SearchItems from '../SearchItems.svelte'
-	import { defaultIfEmptyString, emptyString } from '$lib/utils'
-
-	export let index: number
-	export let open: boolean | undefined
-	export let close: () => void
-	export let funcDesc: string
-	export let modules: FlowModule[]
-	export let trigger = false
-	export let disableAi = false
-
-	// state
-	let input: HTMLInputElement | undefined
-	let hubCompletions: FlowCopilotModule['hubCompletions'] = []
-	let selectedCompletion: FlowCopilotModule['selectedCompletion'] = undefined
-	let lang: FlowCopilotModule['lang'] = undefined
-
-	const { flowStore, flowStateStore } = getContext<FlowEditorContext>('FlowEditorContext')
-	const { modulesStore: copilotModulesStore, genFlow } =
-		getContext<FlowCopilotContext>('FlowCopilotContext')
-
-	let scripts: Script[] | undefined = undefined
-	let filteredItems: (Script & { marked?: string })[] = []
-	$: prefilteredItems = scripts ?? []
-
-	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 doneTs = 0
-	async function getHubCompletions(text: string) {
-		try {
-			// make sure we display the results of the last request last
-			const ts = Date.now()
-			const scripts = (
-				await ScriptService.queryHubScripts({
-					text: `${text}`,
-					limit: 3,
-					kind: trigger ? 'trigger' : 'script'
-				})
-			).map((s) => ({
-				...s,
-				path: `hub/${s.version_id}/${s.app}/${s.summary.toLowerCase().replaceAll(/\s+/g, '_')}`
-			}))
-			if (ts < doneTs) return
-			doneTs = ts
-
-			hubCompletions = scripts as FlowCopilotModule['hubCompletions']
-		} catch (err) {
-			if (err.name !== 'CancelError') throw err
-		}
-	}
-
-	async function onGenerate() {
-		if (!selectedCompletion && !$copilotInfo.enabled) {
-			sendUserToast(
-				'Windmill AI is not enabled, you can activate it in the workspace settings',
-				true
-			)
-			return
-		}
-		$copilotModulesStore = [
-			{
-				id: nextId($flowStateStore, $flowStore),
-				type: trigger ? 'trigger' : 'script',
-				description: funcDesc,
-				code: '',
-				source: selectedCompletion ? 'hub' : 'custom',
-				hubCompletions,
-				selectedCompletion,
-				editor: undefined,
-				lang
-			}
-		]
-		genFlow?.(index, modules, true)
-	}
-
-	const dispatch = createEventDispatcher()
-	$: {
-		if (open) {
-			setTimeout(() => {
-				input?.focus()
-			}, 0)
-		}
-	}
-</script>
-
-<SearchItems
-	filter={funcDesc}
-	items={prefilteredItems}
-	bind:filteredItems
-	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>
-		<div class="flex p-2 relative">
-			<input
-				type="text"
-				bind:this={input}
-				bind:value={funcDesc}
-				on:input={() => {
-					if (funcDesc?.length > 2) {
-						getHubCompletions(funcDesc)
-					} else {
-						hubCompletions = []
-					}
-				}}
-				placeholder="Search {trigger ? 'triggers' : 'scripts'} or AI gen"
-			/>
-			{#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}
-			<ul class="transition-all divide-y">
-				<li>
-					<button
-						class="py-2 gap-4 flex flex-row hover:bg-surface-hover transition-all items-center justify-between w-full"
-						on:click={() => {
-							lang = 'bun'
-							onGenerate()
-							close()
-						}}
-					>
-						<div class="flex items-center gap-2.5 px-2">
-							<div
-								class="rounded-md p-1 flex justify-center items-center bg-surface border w-6 h-6"
-							>
-								<Wand2 size={14} class="text-violet-800 dark:text-violet-400" />
-							</div>
-
-							<div class="text-left text-xs text-secondary">
-								Generate "{funcDesc}" in TypeScript
-							</div>
-						</div>
-					</button>
-				</li>
-				<li>
-					<button
-						class="py-2 gap-4 flex flex-row hover:bg-surface-hover transition-all items-center justify-between w-full"
-						on:click={() => {
-							lang = 'python3'
-							onGenerate()
-							close()
-						}}
-					>
-						<div class="flex items-center gap-2.5 px-2">
-							<div
-								class="rounded-md p-1 flex justify-center items-center bg-surface border w-6 h-6"
-							>
-								<Wand2 size={14} class="text-violet-800 dark:text-violet-400" />
-							</div>
-
-							<div class="text-left text-xs text-secondary">
-								Generate "{funcDesc}" in Python
-							</div>
-						</div>
-					</button>
-				</li>
-			</ul>
-		{/if}
-		{#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)}
-						<li>
-							<button
-								class="py-2 gap-4 flex flex-row hover:bg-surface-hover transition-all items-center justify-between w-full"
-								on:click={() => {
-									dispatch('insert', { path: item.path, summary: item.summary })
-									close()
-								}}
-							>
-								<div class="flex items-center gap-2.5 px-2">
-									<div
-										class="rounded-md p-1 flex justify-center items-center bg-surface border w-6 h-6"
-									>
-										<svelte:component this={APP_TO_ICON_COMPONENT[item['app']]} />
-									</div>
-
-									<div class="text-left text-xs text-secondary">
-										{defaultIfEmptyString(item.summary, item.path)}
-									</div>
-								</div>
-							</button>
-						</li>
-					{/each}
-				</ul>
-			</div>
-		{/if}
-		{#if hubCompletions.length > 0}
-			<div class="text-left mt-2">
-				<p class="text-xs text-secondary ml-2">Hub {trigger ? 'Triggers' : 'Scripts'}</p>
-				<ul class="transition-all divide-y">
-					{#each hubCompletions 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"
-								on:click={() => {
-									selectedCompletion = item
-									close()
-									onGenerate()
-								}}
-							>
-								<div class="flex items-center gap-2.5 px-2">
-									<div
-										class="rounded-md p-1 flex justify-center items-center bg-surface border w-6 h-6"
-									>
-										<svelte:component this={APP_TO_ICON_COMPONENT[item['app']]} />
-									</div>
-
-									<div class="text-left text-xs text-secondary">
-										{item.summary ?? ''} ({item.app})
-									</div>
-								</div>
-							</button>
-						</li>
-					{/each}
-				</ul>
-			</div>
-		{/if}
-	</div>
-</div>
diff --git a/frontend/src/lib/components/copilot/autocomplete/request.ts b/frontend/src/lib/components/copilot/autocomplete/request.ts
index 0d6700a2b4..9c96f7610b 100644
--- a/frontend/src/lib/components/copilot/autocomplete/request.ts
+++ b/frontend/src/lib/components/copilot/autocomplete/request.ts
@@ -2,7 +2,7 @@ import { codeCompletionLoading, copilotInfo } from '$lib/stores'
 import { get } from 'svelte/store'
 
 import { getNonStreamingCompletion } from '../lib'
-import { getLangContext } from '../chat/core'
+import { getLangContext } from '../chat/script/core'
 import { type ScriptLang } from '$lib/gen/types.gen'
 
 const AUTOCOMPLETE_SYSTEM_PROMPT = `You're a code assistant. Your task is to help the user write code by suggesting the next edit for the user.
diff --git a/frontend/src/lib/components/copilot/chat/AIChat.svelte b/frontend/src/lib/components/copilot/chat/AIChat.svelte
index fa83e72346..d664c6aa05 100644
--- a/frontend/src/lib/components/copilot/chat/AIChat.svelte
+++ b/frontend/src/lib/components/copilot/chat/AIChat.svelte
@@ -1,565 +1,149 @@
 <script lang="ts">
+	import AIChatDisplay from './AIChatDisplay.svelte'
+	import { onDestroy, untrack } from 'svelte'
+	import { type ScriptLang } from '$lib/gen'
 	import {
+		copilotInfo,
 		copilotSessionModel,
 		dbSchemas,
-		type DBSchema,
-		type DBSchemas,
-		SQLSchemaLanguages,
+		userStore,
 		workspaceStore
 	} from '$lib/stores'
-	import { writable, type Writable } from 'svelte/store'
-	import AIChatDisplay from './AIChatDisplay.svelte'
-	import {
-		chatRequest,
-		prepareSystemMessage,
-		prepareUserMessage,
-		type AIChatContext,
-		type ContextElement,
-		type DisplayMessage
-	} from './core'
-	import { createEventDispatcher, onDestroy, setContext } from 'svelte'
-	import {
-		type AIProviderModel,
-		type ListResourceResponse,
-		type ScriptLang,
-		ResourceService
-	} from '$lib/gen'
-	import { sendUserToast } from '$lib/toast'
-	import { openDB, type DBSchema as IDBSchema, type IDBPDatabase } from 'idb'
-	import { isInitialCode } from '$lib/script_helpers'
-	import { createLongHash, langToExt } from '$lib/editorUtils'
-	import { scriptLangToEditorLang } from '$lib/scripts'
-	import { diffLines } from 'diff'
+	import { aiChatManager, AIMode } from './AIChatManager.svelte'
+	import { base } from '$lib/base'
+	import HideButton from '$lib/components/apps/editor/settingsPanel/HideButton.svelte'
 
-	export let lang: ScriptLang | 'bunnative'
-	export let code: string
-	export let error: string | undefined
-	export let args: Record<string, any>
-	export let path: string | undefined
-	export let lastSavedCode: string | undefined = undefined
-	export let lastDeployedCode: string | undefined = undefined
-	export let diffMode: boolean = false
-
-	$: contextCodePath = path
-		? (path.split('/').pop() ?? 'script') + '.' + langToExt(scriptLangToEditorLang(lang))
-		: undefined
-
-	let initializedWithInitCode: boolean | null = null
-	$: lang && (initializedWithInitCode = null)
-
-	let db: { schema: DBSchema; resource: string } | undefined = undefined
-
-	function updateSchema(
-		lang: ScriptLang | 'bunnative',
-		args: Record<string, any>,
-		dbSchemas: DBSchemas
-	) {
-		try {
-			const schemaRes = lang === 'graphql' ? args.api : args.database
-			if (typeof schemaRes === 'string') {
-				const schemaPath = schemaRes.replace('$res:', '')
-				const schema = dbSchemas[schemaPath]
-				if (schema && schema.lang === lang) {
-					db = { schema, resource: schemaPath }
-				} else {
-					db = undefined
-				}
-			} else {
-				db = undefined
-			}
-		} catch (err) {
-			console.error('Could not update schema', err)
-		}
-	}
-	$: updateSchema(lang, args, $dbSchemas)
-
-	let selectedContext: ContextElement[] = []
-
-	let availableContext: ContextElement[] = []
-
-	let dbResources: ListResourceResponse = []
-
-	async function updateDBResources(workspace: string | undefined) {
-		if (workspace) {
-			dbResources = await ResourceService.listResource({
-				workspace: workspace,
-				resourceType: SQLSchemaLanguages.join(',')
-			})
-		}
-	}
-
-	async function updateAvailableContext(
-		contextCodePath: string | undefined,
-		code: string,
-		lang: ScriptLang | 'bunnative',
-		error: string | undefined,
-		db: { schema: DBSchema; resource: string } | undefined,
-		providerModel: AIProviderModel | undefined,
-		dbSchemas: DBSchemas,
-		dbResources: ListResourceResponse,
-		lastSavedCode: string | undefined,
-		lastDeployedCode: string | undefined
-	) {
-		if (!contextCodePath) {
-			return
-		}
-		try {
-			let newAvailableContext: ContextElement[] = [
-				{
-					type: 'code',
-					title: contextCodePath,
-					content: code,
-					lang
-				}
-			]
-			if (!providerModel?.model.endsWith('/thinking')) {
-				for (const d of dbResources) {
-					const loadedSchema = dbSchemas[d.path]
-					newAvailableContext.push({
-						type: 'db',
-						title: d.path,
-						// If the db is already fetched, add the schema to the context
-						...(loadedSchema ? { schema: loadedSchema } : {})
-					})
-				}
-			}
-
-			if (lastSavedCode && lastSavedCode !== code) {
-				newAvailableContext.push({
-					type: 'diff',
-					title: 'diff_with_last_saved_draft',
-					content: lastSavedCode ?? '',
-					diff: diffLines(lastSavedCode ?? '', code),
-					lang
-				})
-			}
-
-			if (lastDeployedCode && lastDeployedCode !== code) {
-				newAvailableContext.push({
-					type: 'diff',
-					title: 'diff_with_last_deployed_version',
-					content: lastDeployedCode ?? '',
-					diff: diffLines(lastDeployedCode ?? '', code),
-					lang
-				})
-			}
-
-			if (error) {
-				newAvailableContext = [
-					...newAvailableContext,
-					{
-						type: 'error',
-						title: 'error',
-						content: error
-					}
-				]
-			}
-
-			if (db) {
-				// If the db is already fetched, add it to the selected context
-				if (
-					!selectedContext.find((c) => c.type === 'db' && c.title === db.resource) &&
-					!providerModel?.model.endsWith('/thinking')
-				) {
-					selectedContext = [
-						...selectedContext,
-						{
-							type: 'db',
-							title: db.resource,
-							schema: db.schema
-						}
-					]
-				}
-			}
-
-			availableContext = newAvailableContext
-
-			if (
-				code &&
-				((initializedWithInitCode === null && !isInitialCode(code)) || initializedWithInitCode)
-			) {
-				selectedContext = [
-					{
-						type: 'code',
-						title: contextCodePath,
-						content: code,
-						lang
-					}
-				]
-			}
-
-			if (code && initializedWithInitCode === null) {
-				initializedWithInitCode = isInitialCode(code)
-			}
-
-			selectedContext = selectedContext
-				.map((c) =>
-					c.type === 'code_piece' && code.includes(c.content)
-						? c
-						: availableContext.find((ac) => ac.type === c.type && ac.title === c.title)
-				)
-				.filter((c) => c !== undefined) as ContextElement[]
-		} catch (err) {
-			console.error('Could not update available context', err)
-		}
-	}
-
-	function updateDisplayMessages(dbSchemas: DBSchemas) {
-		return displayMessages.map((m) => ({
-			...m,
-			contextElements: m.contextElements?.map((c) =>
-				c.type === 'db'
-					? {
-							type: 'db',
-							title: c.title,
-							schema: dbSchemas[c.title]
-						}
-					: c
-			) as ContextElement[]
-		}))
-	}
-
-	$: updateDBResources($workspaceStore)
-
-	$: updateAvailableContext(
-		contextCodePath,
-		code,
-		lang,
-		error,
-		db,
-		$copilotSessionModel,
-		$dbSchemas,
-		dbResources,
-		lastSavedCode,
-		lastDeployedCode
+	const isAdmin = $derived($userStore?.is_admin || $userStore?.is_super_admin)
+	const hasCopilot = $derived($copilotInfo.enabled)
+	const disabledMessage = $derived(
+		hasCopilot
+			? ''
+			: isAdmin
+				? `Enable Windmill AI in your [workspace settings](${base}/workspace_settings?tab=ai) to use this chat`
+				: 'Ask an admin to enable Windmill AI in this workspace to use this chat'
 	)
 
-	let instructions = ''
-	let loading = writable(false)
-	let currentReply: Writable<string> = writable('')
-
-	const dispatch = createEventDispatcher<{
-		applyCode: { code: string }
-		showDiffMode: null
-	}>()
-
-	setContext<AIChatContext>('AIChatContext', {
-		loading,
-		currentReply,
-		applyCode: (code: string) => {
-			dispatch('applyCode', { code })
-		}
-	})
-
-	let currentChatId: string = createLongHash()
-	let savedChats: Record<
-		string,
-		{
-			actualMessages: { role: 'user' | 'assistant' | 'system'; content: string }[]
-			displayMessages: DisplayMessage[]
-			title: string
-			id: string
-			lastModified: number
-		}
-	> = {}
-
-	$: pastChats = Object.values(savedChats)
-		.filter((c) => c.id !== currentChatId)
-		.sort((a, b) => b.lastModified - a.lastModified)
-
-	let messages: { role: 'user' | 'assistant' | 'system'; content: string }[] = [
-		prepareSystemMessage()
+	const suggestions = [
+		'Where can I see my latest runs?',
+		'How do I trigger a script with a webhook endpoint?',
+		'How can I connect to a database?',
+		'How do I schedule a recurring job?'
 	]
 
-	let displayMessages: DisplayMessage[] = []
-	let abortController: AbortController | undefined = undefined
+	export async function generateStep(moduleId: string, lang: ScriptLang, instructions: string) {
+		aiChatManager.generateStep(moduleId, lang, instructions)
+	}
 
-	$: displayMessages = updateDisplayMessages($dbSchemas)
-
-	async function sendRequest(options: { removeDiff?: boolean; addBackCode?: boolean } = {}) {
-		if (!instructions.trim()) {
-			return
-		}
-		try {
-			// Remove code pieces from the context to not include them on the next request
-			const oldSelectedContext = selectedContext
-			selectedContext = selectedContext.filter((c) => c.type !== 'code_piece')
-			if (options.removeDiff) {
-				selectedContext = selectedContext.filter((c) => c.type !== 'diff')
-			}
-			if (options.addBackCode) {
-				const codeContext = availableContext.find(
-					(c) => c.type === 'code' && c.title === contextCodePath
-				)
-				if (codeContext) {
-					selectedContext = [...selectedContext, codeContext]
-				}
-			}
-			loading.set(true)
-			aiChatDisplay?.enableAutomaticScroll()
-			abortController = new AbortController()
-
-			displayMessages = [
-				...displayMessages,
-				{
-					role: 'user',
-					content: instructions,
-					contextElements: oldSelectedContext
-				}
-			]
-			const oldInstructions = instructions
-			instructions = ''
-			const userMessage = await prepareUserMessage(oldInstructions, lang, oldSelectedContext)
-
-			messages.push({ role: 'user', content: userMessage })
-			await saveChat()
-
-			$currentReply = ''
-			await chatRequest(
-				messages,
-				abortController,
-				lang,
-				oldSelectedContext.filter((c) => c.type === 'db').length > 0,
-				(token) => currentReply.update((prev) => prev + token)
-			)
-
-			messages.push({ role: 'assistant', content: $currentReply })
-			displayMessages = [
-				...displayMessages,
-				{
-					role: 'assistant',
-					content: $currentReply,
-					contextElements: oldSelectedContext.filter((c) => c.type === 'code')
-				}
-			]
-			currentReply.set('')
-			await saveChat()
-		} catch (err) {
-			console.error(err)
-			if (err instanceof Error) {
-				sendUserToast('Failed to send request: ' + err.message, true)
-			} else {
-				sendUserToast('Failed to send request', true)
-			}
-		} finally {
-			loading.set(false)
-		}
+	export async function sendRequest(
+		options: {
+			removeDiff?: boolean
+			addBackCode?: boolean
+			instructions?: string
+			mode?: AIMode
+			lang?: ScriptLang | 'bunnative'
+			isPreprocessor?: boolean
+		} = {}
+	) {
+		aiChatManager.sendRequest(options)
 	}
 
 	function cancel() {
-		currentReply.set('')
-		abortController?.abort()
-	}
-
-	async function saveChat() {
-		if (displayMessages.length > 0) {
-			const updatedChat = {
-				actualMessages: messages,
-				displayMessages: displayMessages,
-				title: displayMessages[0].content.slice(0, 50),
-				id: currentChatId,
-				lastModified: Date.now()
-			}
-			savedChats = {
-				...savedChats,
-				[updatedChat.id]: updatedChat
-			}
-
-			if (indexDB) {
-				await indexDB.put('chats', updatedChat)
-			}
-		}
-	}
-
-	async function saveAndClear() {
-		await saveChat()
-		currentChatId = createLongHash()
-		displayMessages = []
-		messages = [prepareSystemMessage()]
-	}
-
-	function deletePastChat(id: string) {
-		savedChats = Object.fromEntries(Object.entries(savedChats).filter(([key]) => key !== id))
-		indexDB?.delete('chats', id)
-	}
-
-	function loadPastChat(id: string) {
-		const chat = savedChats[id]
-		if (chat) {
-			messages = chat.actualMessages
-			displayMessages = chat.displayMessages
-			currentChatId = id
-			aiChatDisplay?.enableAutomaticScroll()
-		}
+		aiChatManager.cancel()
 	}
 
 	export function addSelectedLinesToContext(lines: string, startLine: number, endLine: number) {
-		if (
-			selectedContext.find(
-				(c) => c.type === 'code_piece' && c.title === `L${startLine}-L${endLine}`
-			)
-		) {
-			return
-		}
-		selectedContext = [
-			...selectedContext,
-			{
-				type: 'code_piece',
-				title: `L${startLine}-L${endLine}`,
-				startLine,
-				endLine,
-				content: lines,
-				lang
-			}
-		]
-	}
-
-	export function fix() {
-		if (!contextCodePath) {
-			return
-		}
-		instructions = 'Fix the error'
-
-		const codeContext = availableContext.find(
-			(c) => c.type === 'code' && c.title === contextCodePath
-		)
-		const errorContext = availableContext.find((c) => c.type === 'error')
-
-		if (codeContext && errorContext) {
-			selectedContext = [codeContext, errorContext]
-		}
-
-		sendRequest()
-	}
-
-	export function askAi(
-		prompt: string,
-		options: { withCode?: boolean; withDiff?: boolean } = {
-			withCode: true,
-			withDiff: false
-		}
-	) {
-		instructions = prompt
-		const codeContext = availableContext.find(
-			(c) => c.type === 'code' && c.title === contextCodePath
-		)
-		if (!codeContext) {
-			return
-		}
-		selectedContext = [
-			...(options.withCode === false ? [] : [codeContext]),
-			...(options.withDiff
-				? [
-						{
-							type: 'diff' as const,
-							title: 'diff_with_last_deployed_version',
-							content: lastDeployedCode ?? '',
-							diff: diffLines(lastDeployedCode ?? '', code),
-							lang
-						}
-					]
-				: [])
-		]
-		sendRequest({
-			removeDiff: options.withDiff,
-			addBackCode: options.withCode === false
-		})
-		if (options.withDiff) {
-			dispatch('showDiffMode')
-		}
+		aiChatManager.contextManager.addSelectedLinesToContext(lines, startLine, endLine)
 	}
 
 	export function focusTextArea() {
 		aiChatDisplay?.focusInput()
 	}
 
-	interface ChatSchema extends IDBSchema {
-		chats: {
-			key: string
-			value: {
-				id: string
-				actualMessages: { role: 'user' | 'assistant' | 'system'; content: string }[]
-				displayMessages: DisplayMessage[]
-				title: string
-				lastModified: number
-			}
-		}
-	}
-
-	let indexDB: IDBPDatabase<ChatSchema> | undefined = undefined
-	async function initIndexDB() {
-		try {
-			console.log('Initializing chat history database')
-			indexDB = await openDB<ChatSchema>('copilot-chat-history', 1, {
-				upgrade(indexDB) {
-					if (!indexDB.objectStoreNames.contains('chats')) {
-						indexDB.createObjectStore('chats', { keyPath: 'id' })
-					}
-				}
-			})
-			console.log('Chat history database initialized')
-
-			const chats = await indexDB.getAll('chats')
-			console.log('Retrieved chats')
-			savedChats = chats.reduce(
-				(acc, chat) => {
-					acc[chat.id] = chat
-					return acc
-				},
-				{} as typeof savedChats
-			)
-		} catch (err) {
-			console.error('Could not open chat history database', err)
-		}
-	}
-
-	initIndexDB()
+	const historyManager = aiChatManager.historyManager
+	historyManager.init()
 
 	onDestroy(() => {
 		cancel()
-		indexDB?.close()
+		historyManager.close()
 	})
 
-	let aiChatDisplay: AIChatDisplay | undefined = undefined
+	let aiChatDisplay: AIChatDisplay | undefined = $state(undefined)
+
+	$effect(() => {
+		aiChatManager.listenForDbSchemasChanges($dbSchemas)
+	})
+
+	$effect(() => {
+		aiChatManager.listenForScriptEditorContextChange(
+			$dbSchemas,
+			$workspaceStore,
+			$copilotSessionModel
+		)
+	})
+
+	$effect(() => {
+		aiChatManager.updateMode(untrack(() => aiChatManager.mode))
+	})
 </script>
 
+<svelte:window
+	on:keydown={(e) => {
+		if ((e.ctrlKey || e.metaKey) && e.key === 'l') {
+			e.preventDefault()
+			aiChatManager.toggleOpen()
+			aiChatDisplay?.focusInput()
+		}
+	}}
+/>
+
+{#snippet headerLeft()}
+	<HideButton
+		hidden={false}
+		direction="right"
+		panelName="AI"
+		shortcut="L"
+		size="md"
+		on:click={() => aiChatManager.toggleOpen()}
+	/>
+{/snippet}
+
 <AIChatDisplay
 	bind:this={aiChatDisplay}
-	{pastChats}
-	bind:selectedContext
-	{availableContext}
-	messages={$currentReply
+	pastChats={historyManager.getPastChats()}
+	bind:selectedContext={
+		() => aiChatManager.contextManager.getSelectedContext(),
+		(sc) => {
+			aiChatManager.scriptEditorOptions && aiChatManager.contextManager.setSelectedContext(sc)
+		}
+	}
+	availableContext={aiChatManager.contextManager.getAvailableContext()}
+	messages={aiChatManager.currentReply
 		? [
-				...displayMessages,
+				...aiChatManager.displayMessages,
 				{
 					role: 'assistant',
-					content: $currentReply,
-					contextElements: selectedContext.filter((c) => c.type === 'code')
+					content: aiChatManager.currentReply,
+					contextElements: aiChatManager.contextManager
+						.getSelectedContext()
+						.filter((c) => c.type === 'code')
 				}
 			]
-		: displayMessages}
-	bind:instructions
-	on:sendRequest={() => sendRequest()}
-	on:cancel={cancel}
-	on:saveAndClear={saveAndClear}
-	on:deletePastChat={(e) => deletePastChat(e.detail.id)}
-	on:loadPastChat={(e) => loadPastChat(e.detail.id)}
-	on:analyzeChanges={() => {
-		askAi(
-			'Based on the changes I made to the code, look for potential issues and recommend better solutions',
-			{ withDiff: true }
-		)
+		: aiChatManager.displayMessages}
+	saveAndClear={aiChatManager.saveAndClear}
+	deletePastChat={(id) => {
+		historyManager.deletePastChat(id)
 	}}
-	on:explainChanges={() =>
-		askAi('Explain the changes I made to the code from the last diff', {
-			withCode: false,
-			withDiff: true
-		})}
-	on:suggestImprovements={() =>
-		askAi('Look for potential issues and recommend better solutions in the actual code')}
-	hasDiff={!!lastDeployedCode && lastDeployedCode !== code}
-	{diffMode}
->
-	<slot name="header-left" slot="header-left" />
-	<slot name="header-right" slot="header-right" />
-</AIChatDisplay>
+	loadPastChat={(id) => {
+		aiChatManager.loadPastChat(id)
+	}}
+	{cancel}
+	askAi={aiChatManager.askAi}
+	{headerLeft}
+	hasDiff={aiChatManager.scriptEditorOptions &&
+		!!aiChatManager.scriptEditorOptions.lastDeployedCode &&
+		aiChatManager.scriptEditorOptions.lastDeployedCode !== aiChatManager.scriptEditorOptions.code}
+	diffMode={aiChatManager.scriptEditorOptions?.diffMode ?? false}
+	disabled={!hasCopilot}
+	{disabledMessage}
+	{suggestions}
+></AIChatDisplay>
diff --git a/frontend/src/lib/components/copilot/chat/AIChatDisplay.svelte b/frontend/src/lib/components/copilot/chat/AIChatDisplay.svelte
index f0d9a6c287..d3a2cf7e40 100644
--- a/frontend/src/lib/components/copilot/chat/AIChatDisplay.svelte
+++ b/frontend/src/lib/components/copilot/chat/AIChatDisplay.svelte
@@ -1,48 +1,70 @@
 <script lang="ts">
 	import { twMerge } from 'tailwind-merge'
 	import AssistantMessage from './AssistantMessage.svelte'
-	import { createEventDispatcher, getContext } from 'svelte'
-	import { HistoryIcon, Loader2, Plus, X } from 'lucide-svelte'
+	import { type Snippet } from 'svelte'
+	import { HistoryIcon, Loader2, Plus, StopCircleIcon, X } from 'lucide-svelte'
+	import autosize from '$lib/autosize'
 	import Button from '$lib/components/common/button/Button.svelte'
 	import Popover from '$lib/components/meltComponents/Popover.svelte'
-	import { type AIChatContext, type DisplayMessage, type ContextElement } from './core'
+	import { type DisplayMessage } from './shared'
+	import type { ContextElement } from './context'
 	import ContextElementBadge from './ContextElementBadge.svelte'
 	import ContextTextarea from './ContextTextarea.svelte'
 	import AvailableContextList from './AvailableContextList.svelte'
 	import ChatQuickActions from './ChatQuickActions.svelte'
 	import ProviderModelSelector from './ProviderModelSelector.svelte'
+	import ChatMode from './ChatMode.svelte'
+	import Markdown from 'svelte-exmarkdown'
+	import { aiChatManager, AIMode } from './AIChatManager.svelte'
 
-	export let pastChats: { id: string; title: string }[]
-	export let messages: DisplayMessage[]
-	export let instructions: string
-	export let selectedContext: ContextElement[]
-	export let availableContext: ContextElement[]
-	export let hasDiff: boolean
-	export let diffMode: boolean = false
-	const dispatch = createEventDispatcher<{
-		sendRequest: null
-		saveAndClear: null
-		deletePastChat: { id: string }
-		loadPastChat: { id: string }
-		analyzeChanges: null
-		explainChanges: null
-		suggestImprovements: null
-	}>()
+	let {
+		messages,
+		pastChats,
+		hasDiff,
+		diffMode = false, // todo: remove default
+		selectedContext = $bindable([]), // todo: remove default
+		availableContext = [], // todo: remove default
+		loadPastChat,
+		deletePastChat,
+		saveAndClear,
+		cancel,
+		askAi = () => {}, // todo: remove default,
+		headerLeft,
+		headerRight,
+		disabled = false,
+		disabledMessage = '',
+		suggestions = []
+	}: {
+		messages: DisplayMessage[]
+		pastChats: { id: string; title: string }[]
+		hasDiff?: boolean
+		diffMode: boolean
+		selectedContext: ContextElement[]
+		availableContext: ContextElement[]
+		loadPastChat: (id: string) => void
+		deletePastChat: (id: string) => void
+		saveAndClear: () => void
+		cancel: () => void
+		askAi?: (instructions: string, options?: { withCode?: boolean; withDiff?: boolean }) => void
+		headerLeft?: Snippet
+		headerRight?: Snippet
+		disabled?: boolean
+		disabledMessage?: string
+		suggestions?: string[]
+	} = $props()
 
-	const { loading, currentReply } = getContext<AIChatContext>('AIChatContext')
-
-	export function enableAutomaticScroll() {
-		automaticScroll = true
-	}
-
-	let contextTextareaComponent: ContextTextarea
+	let contextTextareaComponent: ContextTextarea | undefined = $state()
+	let instructionsTextarea: HTMLTextAreaElement | undefined = $state()
 
 	export function focusInput() {
-		contextTextareaComponent?.focus()
+		if (aiChatManager.mode === 'script') {
+			contextTextareaComponent?.focus()
+		} else {
+			instructionsTextarea?.focus()
+		}
 	}
 
-	let automaticScroll = true
-	let scrollEl: HTMLDivElement
+	let scrollEl: HTMLDivElement | undefined = $state()
 	async function scrollDown() {
 		scrollEl?.scrollTo({
 			top: scrollEl.scrollHeight,
@@ -50,11 +72,15 @@
 		})
 	}
 
-	let height = 0
-	$: automaticScroll && height && scrollDown()
+	let height = $state(0)
+	$effect(() => {
+		aiChatManager.automaticScroll && height && scrollDown()
+	})
 
 	function addContextToSelection(contextElement: ContextElement) {
 		if (
+			selectedContext &&
+			availableContext &&
 			!selectedContext.find(
 				(c) => c.type === contextElement.type && c.title === contextElement.title
 			) &&
@@ -65,6 +91,22 @@
 			selectedContext = [...selectedContext, contextElement]
 		}
 	}
+
+	function findLastIndex<T>(array: T[], predicate: (item: T) => boolean): number {
+		for (let i = array.length - 1; i >= 0; i--) {
+			if (predicate(array[i])) {
+				return i
+			}
+		}
+		return -1
+	}
+
+	function submitSuggestion(suggestion: string) {
+		aiChatManager.instructions = suggestion
+		aiChatManager.sendRequest()
+	}
+
+	const lastUserMessageIndex = $derived(findLastIndex(messages, (m) => m.role === 'user'))
 </script>
 
 <div class="flex flex-col h-full">
@@ -72,7 +114,7 @@
 		class="flex flex-row items-center justify-between gap-2 p-2 border-b border-gray-200 dark:border-gray-600"
 	>
 		<div class="flex flex-row items-center gap-2">
-			<slot name="header-left" />
+			{@render headerLeft?.()}
 			<p class="text-sm font-semibold">Chat</p>
 		</div>
 		<div class="flex flex-row items-center gap-2">
@@ -99,8 +141,8 @@
 								{#each pastChats as chat}
 									<button
 										class="text-left flex flex-row items-center gap-2 justify-between hover:bg-gray-100 dark:hover:bg-gray-700 rounded-md p-1"
-										on:click={() => {
-											dispatch('loadPastChat', { id: chat.id })
+										onclick={() => {
+											loadPastChat(chat.id)
 											close()
 										}}
 									>
@@ -118,7 +160,7 @@
 											variant="border"
 											startIcon={{ icon: X }}
 											on:click={() => {
-												dispatch('deletePastChat', { id: chat.id })
+												deletePastChat(chat.id)
 											}}
 										/>
 									</button>
@@ -131,7 +173,7 @@
 			<Button
 				title="New chat"
 				on:click={() => {
-					dispatch('saveAndClear')
+					saveAndClear()
 				}}
 				size="md"
 				btnClasses="!p-1"
@@ -140,19 +182,19 @@
 				variant="border"
 				color="light"
 			/>
-			<slot name="header-right" />
+			{@render headerRight?.()}
 		</div>
 	</div>
 	{#if messages.length > 0}
 		<div
 			class="h-full overflow-y-scroll pt-2"
 			bind:this={scrollEl}
-			on:wheel={(e) => {
-				automaticScroll = false
+			onwheel={(e) => {
+				aiChatManager.automaticScroll = false
 			}}
 		>
 			<div class="flex flex-col" bind:clientHeight={height}>
-				{#each messages as message}
+				{#each messages as message, messageIndex}
 					{#if message.role === 'user' && message.contextElements}
 						<div class="flex flex-row gap-1 mb-1 overflow-scroll no-scrollbar px-2">
 							{#each message.contextElements as element}
@@ -164,8 +206,14 @@
 						class={twMerge(
 							'text-sm py-1 mx-2',
 							message.role === 'user' &&
-								'px-2 border border-gray-300 dark:border-gray-600 bg-gray-50 dark:bg-gray-900 rounded-lg mb-2',
-							message.role === 'assistant' && 'px-[1px] mb-6'
+								'px-2 border border-gray-300 dark:border-gray-600 bg-gray-50 dark:bg-gray-900 rounded-lg',
+							message.role === 'user'
+								? aiChatManager.loading && lastUserMessageIndex === messageIndex
+									? 'mb-1'
+									: 'mb-2'
+								: '',
+							(message.role === 'assistant' || message.role === 'tool') && 'px-[1px]',
+							message.role === 'tool' && 'text-tertiary'
 						)}
 					>
 						{#if message.role === 'assistant'}
@@ -174,8 +222,24 @@
 							{message.content}
 						{/if}
 					</div>
+					{#if message.role === 'user' && aiChatManager.loading && lastUserMessageIndex === messageIndex}
+						<div class="flex flex-row px-2 mb-2">
+							<Button
+								startIcon={{ icon: StopCircleIcon }}
+								size="xs3"
+								variant="border"
+								btnClasses="px-1.5"
+								color="light"
+								on:click={() => {
+									cancel()
+								}}
+							>
+								Stop
+							</Button>
+						</div>
+					{/if}
 				{/each}
-				{#if $loading && !$currentReply}
+				{#if aiChatManager.loading && !aiChatManager.currentReply}
 					<div class="mb-6 py-1 px-2">
 						<Loader2 class="animate-spin" />
 					</div>
@@ -185,56 +249,106 @@
 	{/if}
 
 	<div class:border-t={messages.length > 0}>
-		<div class="flex flex-row gap-1 mb-1 overflow-scroll pt-2 px-2 no-scrollbar">
-			<Popover>
-				<svelte:fragment slot="trigger">
-					<div
-						class="border rounded-md px-1 py-0.5 font-normal text-tertiary text-xs hover:bg-surface-hover"
-						>@</div
-					>
-				</svelte:fragment>
-				<svelte:fragment slot="content" let:close>
-					<AvailableContextList
-						{availableContext}
-						{selectedContext}
-						onSelect={(element) => {
-							addContextToSelection(element)
-							close()
+		{#if aiChatManager.mode === 'script'}
+			<div class="flex flex-row gap-1 mb-1 overflow-scroll pt-2 px-2 no-scrollbar">
+				<Popover>
+					<svelte:fragment slot="trigger">
+						<div
+							class="border rounded-md px-1 py-0.5 font-normal text-tertiary text-xs hover:bg-surface-hover"
+							>@</div
+						>
+					</svelte:fragment>
+					<svelte:fragment slot="content" let:close>
+						<AvailableContextList
+							{availableContext}
+							{selectedContext}
+							onSelect={(element) => {
+								addContextToSelection(element)
+								close()
+							}}
+						/>
+					</svelte:fragment>
+				</Popover>
+				{#each selectedContext as element}
+					<ContextElementBadge
+						contextElement={element}
+						deletable
+						on:delete={() => {
+							selectedContext = selectedContext?.filter(
+								(c) => c.type !== element.type || c.title !== element.title
+							)
 						}}
 					/>
-				</svelte:fragment>
-			</Popover>
-			{#each selectedContext as element}
-				<ContextElementBadge
-					contextElement={element}
-					deletable
-					on:delete={() => {
-						selectedContext = selectedContext.filter(
-							(c) => c.type !== element.type || c.title !== element.title
-						)
+				{/each}
+			</div>
+			<ContextTextarea
+				bind:this={contextTextareaComponent}
+				instructions={aiChatManager.instructions}
+				{availableContext}
+				{selectedContext}
+				isFirstMessage={messages.length === 0}
+				on:addContext={(e) => addContextToSelection(e.detail.contextElement)}
+				on:sendRequest={() => {
+					if (!aiChatManager.loading) {
+						aiChatManager.sendRequest()
+					}
+				}}
+				on:updateInstructions={(e) => (aiChatManager.instructions = e.detail.value)}
+				{disabled}
+			/>
+		{:else}
+			<div class="relative w-full px-2 scroll-pb-2 pt-2">
+				<textarea
+					bind:this={instructionsTextarea}
+					bind:value={aiChatManager.instructions}
+					use:autosize
+					onkeydown={(e) => {
+						if (e.key === 'Enter' && !e.shiftKey && !aiChatManager.loading) {
+							e.preventDefault()
+							aiChatManager.sendRequest()
+						}
 					}}
-				/>
-			{/each}
-		</div>
-		<ContextTextarea
-			bind:this={contextTextareaComponent}
-			{instructions}
-			{availableContext}
-			{selectedContext}
-			isFirstMessage={messages.length === 0}
-			on:addContext={(e) => addContextToSelection(e.detail.contextElement)}
-			on:sendRequest={() => dispatch('sendRequest')}
-			on:updateInstructions={(e) => (instructions = e.detail.value)}
-		/>
+					rows={3}
+					placeholder={messages.length === 0 ? 'Ask anything' : 'Ask followup'}
+					class="resize-none"
+					{disabled}
+				></textarea>
+			</div>
+		{/if}
 		<div
 			class={`flex flex-row ${
-				hasDiff ? 'justify-between' : 'justify-end'
-			} items-center gap-2 px-0.5`}
+				aiChatManager.mode === 'script' && hasDiff ? 'justify-between' : 'justify-end'
+			} items-center px-0.5`}
 		>
-			{#if hasDiff}
-				<ChatQuickActions on:analyzeChanges on:explainChanges on:suggestImprovements {diffMode} />
+			{#if aiChatManager.mode === 'script' && hasDiff}
+				<ChatQuickActions {askAi} {diffMode} />
+			{/if}
+			{#if disabled}
+				<div class="text-tertiary text-xs my-2 px-2">
+					<Markdown md={disabledMessage} />
+				</div>
+			{:else}
+				<div class="flex flex-row gap-2 min-w-0">
+					<ChatMode />
+					<ProviderModelSelector />
+				</div>
 			{/if}
-			<ProviderModelSelector />
 		</div>
+		{#if (aiChatManager.mode === AIMode.NAVIGATOR || aiChatManager.mode === AIMode.ASK) && suggestions.length > 0 && messages.filter((m) => m.role === 'user').length === 0 && !disabled}
+			<div class="px-2 mt-4">
+				<div class="flex flex-col gap-2">
+					{#each suggestions as suggestion}
+						<Button
+							on:click={() => submitSuggestion(suggestion)}
+							size="xs2"
+							color="light"
+							btnClasses="whitespace-normal text-center font-normal"
+						>
+							{suggestion}
+						</Button>
+					{/each}
+				</div>
+			</div>
+		{/if}
 	</div>
 </div>
diff --git a/frontend/src/lib/components/copilot/chat/AIChatManager.svelte.ts b/frontend/src/lib/components/copilot/chat/AIChatManager.svelte.ts
new file mode 100644
index 0000000000..edb407093f
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/AIChatManager.svelte.ts
@@ -0,0 +1,655 @@
+import type { AIProviderModel, ScriptLang } from '$lib/gen/types.gen'
+import type { ScriptOptions } from './ContextManager.svelte'
+import {
+	flowTools,
+	prepareFlowSystemMessage,
+	prepareFlowUserMessage,
+	type FlowAIChatHelpers
+} from './flow/core'
+import ContextManager from './ContextManager.svelte'
+import HistoryManager from './HistoryManager.svelte'
+import { processToolCall, type DisplayMessage, type Tool, type ToolCallbacks } from './shared'
+import type {
+	ChatCompletionChunk,
+	ChatCompletionMessageParam,
+	ChatCompletionMessageToolCall,
+	ChatCompletionSystemMessageParam,
+	ChatCompletionUserMessageParam
+} from 'openai/resources/chat/completions.mjs'
+import { prepareScriptSystemMessage, prepareScriptTools } from './script/core'
+import { navigatorTools, prepareNavigatorSystemMessage } from './navigator/core'
+import { prepareScriptUserMessage } from './script/core'
+import { prepareNavigatorUserMessage } from './navigator/core'
+import { sendUserToast } from '$lib/toast'
+import { getCompletion } from '../lib'
+import { dfs } from '$lib/components/flows/previousResults'
+import { getStringError } from './utils'
+import type { FlowModuleState, FlowState } from '$lib/components/flows/flowState'
+import type { CurrentEditor, ExtendedOpenFlow } from '$lib/components/flows/types'
+import { untrack } from 'svelte'
+import type { DBSchemas } from '$lib/stores'
+import { askTools, prepareAskSystemMessage } from './ask/core'
+
+type TriggerablesMap = Record<
+	string,
+	{ description: string; onTrigger: ((value?: string) => void) | undefined }
+>
+
+export enum AIMode {
+	SCRIPT = 'script',
+	FLOW = 'flow',
+	NAVIGATOR = 'navigator',
+	ASK = 'ask'
+}
+
+class AIChatManager {
+	DEFAULT_SIZE = 22
+	NAVIGATION_SYSTEM_PROMPT = `
+	CONSIDERATIONS:
+	 - You are provided with a tool to switch to navigation mode, only use it when you are sure that the user is asking you to navigate the application or help them find something. Do not use it otherwise.
+	`
+	contextManager = new ContextManager()
+	historyManager = new HistoryManager()
+	abortController: AbortController | undefined = undefined
+
+	mode = $state<AIMode>(AIMode.NAVIGATOR)
+	size = $state<number>(localStorage.getItem('ai-chat-open') === 'true' ? this.DEFAULT_SIZE : 0)
+	savedSize = $state<number>(0)
+	instructions = $state<string>('')
+	pendingPrompt = $state<string>('')
+	loading = $state<boolean>(false)
+	currentReply = $state<string>('')
+	displayMessages = $state<DisplayMessage[]>([])
+	messages = $state<ChatCompletionMessageParam[]>([])
+	automaticScroll = $state<boolean>(true)
+	systemMessage = $state<ChatCompletionSystemMessageParam>({
+		role: 'system',
+		content: ''
+	})
+	tools = $state<Tool<any>[]>([])
+	helpers = $state<any | undefined>(undefined)
+
+	triggerablesByAI = $state<TriggerablesMap>({})
+	scriptEditorOptions = $state<ScriptOptions | undefined>(undefined)
+	scriptEditorApplyCode = $state<((code: string) => void) | undefined>(undefined)
+	scriptEditorShowDiffMode = $state<(() => void) | undefined>(undefined)
+	flowAiChatHelpers = $state<FlowAIChatHelpers | undefined>(undefined)
+	pendingNewCode = $state<string | undefined>(undefined)
+
+	allowedModes: Record<AIMode, boolean> = $derived({
+		script: this.scriptEditorOptions !== undefined,
+		flow: this.flowAiChatHelpers !== undefined,
+		navigator: true,
+		ask: true
+	})
+
+	open = $derived(this.size > 0)
+
+	updateMode(currentMode: AIMode) {
+		if (
+			!this.allowedModes[currentMode] &&
+			Object.keys(this.allowedModes).filter((k) => this.allowedModes[k]).length === 1
+		) {
+			const firstKey = Object.keys(this.allowedModes).filter((k) => this.allowedModes[k])[0]
+			this.changeMode(firstKey as AIMode)
+		}
+	}
+
+	changeMode(
+		mode: AIMode,
+		pendingPrompt?: string,
+		options?: {
+			closeScriptSettings?: boolean
+		}
+	) {
+		this.mode = mode
+		this.pendingPrompt = pendingPrompt ?? ''
+		if (mode === AIMode.SCRIPT) {
+			this.systemMessage = prepareScriptSystemMessage()
+			this.systemMessage.content = this.NAVIGATION_SYSTEM_PROMPT + this.systemMessage.content
+			const context = this.contextManager.getSelectedContext()
+			const lang = this.scriptEditorOptions?.lang ?? 'bun'
+			this.tools = [this.changeModeTool, ...prepareScriptTools(lang, context)]
+			this.helpers = {
+				getLang: () => lang
+			}
+			if (options?.closeScriptSettings) {
+				const closeComponent = this.triggerablesByAI['close-script-builder-settings']
+				if (closeComponent) {
+					closeComponent.onTrigger?.()
+				}
+			}
+		} else if (mode === AIMode.FLOW) {
+			this.systemMessage = prepareFlowSystemMessage()
+			this.systemMessage.content = this.NAVIGATION_SYSTEM_PROMPT + this.systemMessage.content
+			this.tools = [this.changeModeTool, ...flowTools]
+			this.helpers = this.flowAiChatHelpers
+		} else if (mode === AIMode.NAVIGATOR) {
+			this.systemMessage = prepareNavigatorSystemMessage()
+			this.tools = [this.changeModeTool, ...navigatorTools]
+			this.helpers = {}
+		} else if (mode === AIMode.ASK) {
+			this.systemMessage = prepareAskSystemMessage()
+			this.tools = [...askTools]
+			this.helpers = {}
+		}
+	}
+
+	canApplyCode = $derived(this.allowedModes.script && this.mode === AIMode.SCRIPT)
+
+	private changeModeTool = {
+		def: {
+			type: 'function' as const,
+			function: {
+				name: 'change_mode',
+				description:
+					'Change the AI mode to the one specified. Script mode is used to create scripts, and flow mode is used to create flows. Navigator mode is used to navigate the application and help the user find what they are looking for.',
+				parameters: {
+					type: 'object',
+					properties: {
+						mode: {
+							type: 'string',
+							description: 'The mode to change to',
+							enum: ['script', 'flow', 'navigator']
+						},
+						pendingPrompt: {
+							type: 'string',
+							description: 'The prompt to send to the new mode to fulfill the user request',
+							default: ''
+						}
+					},
+					required: ['mode']
+				}
+			}
+		},
+		fn: async ({ args, toolId, toolCallbacks }) => {
+			toolCallbacks.onToolCall(toolId, 'Switching to ' + args.mode + ' mode...')
+			this.changeMode(args.mode as AIMode, args.pendingPrompt, {
+				closeScriptSettings: true
+			})
+			toolCallbacks.onFinishToolCall(toolId, 'Switched to ' + args.mode + ' mode')
+			return 'Mode changed to ' + args.mode
+		}
+	}
+
+	openChat = () => {
+		this.size = this.savedSize > 0 ? this.savedSize : this.DEFAULT_SIZE
+		localStorage.setItem('ai-chat-open', 'true')
+	}
+
+	closeChat = () => {
+		this.savedSize = this.size
+		this.size = 0
+		localStorage.setItem('ai-chat-open', 'false')
+	}
+
+	toggleOpen = () => {
+		if (this.size > 0) {
+			this.savedSize = this.size
+		}
+		this.size = this.size === 0 ? (this.savedSize > 0 ? this.savedSize : this.DEFAULT_SIZE) : 0
+		localStorage.setItem('ai-chat-open', this.size === 0 ? 'false' : 'true')
+	}
+
+	askAi = (
+		prompt: string,
+		options: { withCode?: boolean; withDiff?: boolean } = {
+			withCode: true,
+			withDiff: false
+		}
+	) => {
+		if (this.scriptEditorOptions) {
+			this.contextManager.setAskAiContext(options)
+		}
+		this.instructions = prompt
+		this.sendRequest({
+			removeDiff: options.withDiff,
+			addBackCode: options.withCode === false
+		})
+		if (options.withDiff) {
+			this.scriptEditorShowDiffMode?.()
+		}
+	}
+
+	private chatRequest = async ({
+		messages,
+		abortController,
+		callbacks
+	}: {
+		messages: ChatCompletionMessageParam[]
+		abortController: AbortController
+		callbacks: ToolCallbacks & {
+			onNewToken: (token: string) => void
+			onMessageEnd: () => void
+		}
+	}) => {
+		try {
+			let completion: any = null
+
+			while (true) {
+				const systemMessage = this.systemMessage
+				const tools = this.tools
+				const helpers = this.helpers
+
+				let pendingPrompt = this.pendingPrompt
+				let pendingUserMessage: ChatCompletionUserMessageParam | undefined = undefined
+				if (pendingPrompt) {
+					if (this.mode === AIMode.SCRIPT) {
+						pendingUserMessage = await prepareScriptUserMessage(
+							pendingPrompt,
+							this.scriptEditorOptions?.lang as ScriptLang | 'bunnative',
+							this.contextManager.getSelectedContext()
+						)
+					} else if (this.mode === AIMode.FLOW) {
+						pendingUserMessage = prepareFlowUserMessage(
+							pendingPrompt,
+							this.flowAiChatHelpers!.getFlowAndSelectedId()
+						)
+					} else if (this.mode === AIMode.NAVIGATOR) {
+						pendingUserMessage = prepareNavigatorUserMessage(pendingPrompt)
+					}
+					this.pendingPrompt = ''
+				}
+				completion = await getCompletion(
+					[systemMessage, ...messages, ...(pendingUserMessage ? [pendingUserMessage] : [])],
+					abortController,
+					tools.map((t) => t.def)
+				)
+
+				if (completion) {
+					const finalToolCalls: Record<number, ChatCompletionChunk.Choice.Delta.ToolCall> = {}
+
+					let answer = ''
+					for await (const chunk of completion) {
+						if (!('choices' in chunk && chunk.choices.length > 0 && 'delta' in chunk.choices[0])) {
+							continue
+						}
+						const c = chunk as ChatCompletionChunk
+						const delta = c.choices[0].delta.content
+						if (delta) {
+							answer += delta
+							callbacks.onNewToken(delta)
+						}
+						const toolCalls = c.choices[0].delta.tool_calls || []
+						for (const toolCall of toolCalls) {
+							const { index } = toolCall
+							const finalToolCall = finalToolCalls[index]
+							if (!finalToolCall) {
+								finalToolCalls[index] = toolCall
+							} else {
+								if (toolCall.function?.arguments) {
+									if (!finalToolCall.function) {
+										finalToolCall.function = toolCall.function
+									} else {
+										finalToolCall.function.arguments =
+											(finalToolCall.function.arguments ?? '') + toolCall.function.arguments
+									}
+								}
+							}
+						}
+					}
+
+					if (answer) {
+						messages.push({ role: 'assistant', content: answer })
+					}
+
+					callbacks.onMessageEnd()
+
+					const toolCalls = Object.values(finalToolCalls).filter(
+						(toolCall) => toolCall.id !== undefined && toolCall.function?.arguments !== undefined
+					) as ChatCompletionMessageToolCall[]
+
+					if (toolCalls.length > 0) {
+						messages.push({
+							role: 'assistant',
+							tool_calls: toolCalls.map((t) => ({
+								...t,
+								function: {
+									...t.function,
+									arguments: t.function.arguments || '{}'
+								}
+							}))
+						})
+						for (const toolCall of toolCalls) {
+							await processToolCall({
+								tools,
+								toolCall,
+								messages,
+								helpers,
+								toolCallbacks: callbacks
+							})
+						}
+					} else {
+						break
+					}
+				}
+			}
+			return messages
+		} catch (err) {
+			if (!abortController.signal.aborted) {
+				throw err
+			} else {
+				return messages
+			}
+		}
+	}
+
+	sendRequest = async (
+		options: {
+			removeDiff?: boolean
+			addBackCode?: boolean
+			instructions?: string
+			mode?: AIMode
+			lang?: ScriptLang | 'bunnative'
+			isPreprocessor?: boolean
+		} = {}
+	) => {
+		if (options.mode) {
+			this.changeMode(options.mode)
+		} else {
+			this.changeMode(this.mode)
+		}
+		if (options.instructions) {
+			this.instructions = options.instructions
+		}
+		if (!this.instructions.trim()) {
+			return
+		}
+		try {
+			const oldSelectedContext = this.contextManager?.getSelectedContext() ?? []
+			if (this.mode === AIMode.SCRIPT) {
+				this.contextManager?.updateContextOnRequest(options)
+			}
+			this.loading = true
+			this.automaticScroll = true
+			this.abortController = new AbortController()
+
+			this.displayMessages = [
+				...this.displayMessages,
+				{
+					role: 'user',
+					content: this.instructions,
+					contextElements: this.mode === AIMode.SCRIPT ? oldSelectedContext : undefined
+				}
+			]
+			const oldInstructions = this.instructions
+			this.instructions = ''
+
+			if (this.mode === AIMode.SCRIPT && !this.scriptEditorOptions && !options.lang) {
+				throw new Error('No script options passed')
+			}
+
+			const lang = this.scriptEditorOptions?.lang ?? options.lang ?? 'bun'
+			const isPreprocessor =
+				this.scriptEditorOptions?.path === 'preprocessor' || options.isPreprocessor
+
+			const userMessage =
+				this.mode === AIMode.FLOW
+					? prepareFlowUserMessage(oldInstructions, this.flowAiChatHelpers!.getFlowAndSelectedId())
+					: this.mode === AIMode.NAVIGATOR
+						? prepareNavigatorUserMessage(oldInstructions)
+						: await prepareScriptUserMessage(oldInstructions, lang, oldSelectedContext, {
+								isPreprocessor
+							})
+
+			this.messages.push(userMessage)
+			await this.historyManager.saveChat(this.displayMessages, this.messages)
+
+			this.currentReply = ''
+
+			const params: {
+				messages: ChatCompletionMessageParam[]
+				abortController: AbortController
+				callbacks: ToolCallbacks & {
+					onNewToken: (token: string) => void
+					onMessageEnd: () => void
+				}
+			} = {
+				messages: this.messages,
+				abortController: this.abortController,
+				callbacks: {
+					onNewToken: (token) => (this.currentReply += token),
+					onMessageEnd: () => {
+						if (this.currentReply) {
+							this.displayMessages = [
+								...this.displayMessages,
+								{
+									role: 'assistant',
+									content: this.currentReply,
+									contextElements:
+										this.mode === AIMode.SCRIPT
+											? oldSelectedContext.filter((c) => c.type === 'code')
+											: undefined
+								}
+							]
+						}
+						this.currentReply = ''
+					},
+					onToolCall: (id, content) => {
+						this.displayMessages = [
+							...this.displayMessages,
+							{ role: 'tool', tool_call_id: id, content }
+						]
+					},
+					onFinishToolCall: (id, content) => {
+						console.log('onFinishToolCall', id, content)
+						const existingIdx = this.displayMessages.findIndex(
+							(m) => m.role === 'tool' && m.tool_call_id === id
+						)
+						if (existingIdx !== -1) {
+							this.displayMessages[existingIdx].content = content
+						} else {
+							this.displayMessages.push({ role: 'tool', tool_call_id: id, content })
+						}
+					}
+				}
+			}
+
+			if (this.mode === AIMode.FLOW && !this.flowAiChatHelpers) {
+				throw new Error('No flow helpers found')
+			}
+			await this.chatRequest({
+				...params
+			})
+			if (this.currentReply) {
+				// just in case the onMessageEnd is not called (due to an error for instance)
+				this.displayMessages = [
+					...this.displayMessages,
+					{
+						role: 'assistant',
+						content: this.currentReply,
+						contextElements:
+							this.mode === AIMode.SCRIPT
+								? oldSelectedContext.filter((c) => c.type === 'code')
+								: undefined
+					}
+				]
+				this.currentReply = ''
+			}
+
+			await this.historyManager.saveChat(this.displayMessages, this.messages)
+		} catch (err) {
+			console.error(err)
+			if (err instanceof Error) {
+				sendUserToast('Failed to send request: ' + err.message, true)
+			} else {
+				sendUserToast('Failed to send request', true)
+			}
+		} finally {
+			this.loading = false
+		}
+	}
+
+	cancel = () => {
+		this.currentReply = ''
+		this.abortController?.abort()
+	}
+
+	fix = () => {
+		if (!this.open) {
+			this.toggleOpen()
+		}
+		this.changeMode(AIMode.SCRIPT)
+		this.instructions = 'Fix the error'
+		this.contextManager?.setFixContext()
+		this.sendRequest()
+	}
+
+	addSelectedLinesToContext = (lines: string, startLine: number, endLine: number) => {
+		if (!this.open) {
+			this.toggleOpen()
+		}
+		this.changeMode(AIMode.SCRIPT)
+		this.contextManager?.addSelectedLinesToContext(lines, startLine, endLine)
+	}
+
+	saveAndClear = async () => {
+		await this.historyManager.save(this.displayMessages, this.messages)
+		this.displayMessages = []
+		this.messages = []
+	}
+
+	loadPastChat = async (id: string) => {
+		const chat = this.historyManager.loadPastChat(id)
+		if (chat) {
+			this.displayMessages = chat.displayMessages
+			this.messages = chat.actualMessages
+			this.automaticScroll = true
+		}
+	}
+
+	generateStep = async (moduleId: string, lang: ScriptLang, instructions: string) => {
+		if (!this.flowAiChatHelpers) {
+			throw new Error('No flow helpers found')
+		}
+		this.flowAiChatHelpers.selectStep(moduleId)
+		await this.sendRequest({
+			instructions: instructions,
+			mode: AIMode.SCRIPT,
+			lang: lang,
+			isPreprocessor: moduleId === 'preprocessor'
+		})
+	}
+
+	listenForScriptEditorContextChange = (
+		dbSchemas: DBSchemas,
+		workspaceStore: string | undefined,
+		copilotSessionModel: AIProviderModel | undefined
+	) => {
+		if (this.scriptEditorOptions) {
+			this.contextManager.updateAvailableContext(
+				this.scriptEditorOptions,
+				dbSchemas,
+				workspaceStore ?? '',
+				!copilotSessionModel?.model.endsWith('/thinking'),
+				untrack(() => this.contextManager.getSelectedContext())
+			)
+		}
+	}
+
+	listenForDbSchemasChanges = (dbSchemas: DBSchemas) => {
+		this.displayMessages = ContextManager.updateDisplayMessages(
+			untrack(() => this.displayMessages),
+			dbSchemas
+		)
+	}
+
+	listenForCurrentEditorChanges = (currentEditor: CurrentEditor) => {
+		if (currentEditor && currentEditor.type === 'script') {
+			this.scriptEditorApplyCode = (code) => {
+				if (currentEditor && currentEditor.type === 'script') {
+					currentEditor.hideDiffMode()
+					currentEditor.editor.reviewAndApplyCode(code)
+				}
+			}
+			this.scriptEditorShowDiffMode = () => {
+				if (currentEditor && currentEditor.type === 'script') {
+					currentEditor.showDiffMode()
+				}
+			}
+		} else {
+			this.scriptEditorApplyCode = undefined
+			this.scriptEditorShowDiffMode = undefined
+		}
+
+		return () => {
+			this.scriptEditorApplyCode = undefined
+			this.scriptEditorShowDiffMode = undefined
+		}
+	}
+
+	listenForSelectedIdChanges = (
+		selectedId: string,
+		flowStore: ExtendedOpenFlow,
+		flowStateStore: FlowState,
+		currentEditor: CurrentEditor
+	) => {
+		function getModule(id: string) {
+			if (id === 'preprocessor') {
+				return flowStore.value.preprocessor_module
+			} else if (id === 'failure') {
+				return flowStore.value.failure_module
+			} else {
+				return dfs(id, flowStore, false)[0]
+			}
+		}
+
+		function getScriptOptions(id: string): ScriptOptions | undefined {
+			const module = getModule(id)
+
+			if (module && module.value.type === 'rawscript') {
+				const moduleState: FlowModuleState | undefined = flowStateStore[module.id]
+
+				const editorRelated =
+					currentEditor && currentEditor.type === 'script' && currentEditor.stepId === module.id
+						? {
+								diffMode: currentEditor.diffMode,
+								lastDeployedCode: currentEditor.lastDeployedCode,
+								lastSavedCode: undefined
+							}
+						: {
+								diffMode: false,
+								lastDeployedCode: undefined,
+								lastSavedCode: undefined
+							}
+
+				return {
+					args: moduleState?.previewArgs ?? {},
+					error:
+						moduleState && !moduleState.previewSuccess
+							? getStringError(moduleState.previewResult)
+							: undefined,
+					code: module.value.content,
+					lang: module.value.language,
+					path: module.id,
+					...editorRelated
+				}
+			}
+
+			return undefined
+		}
+
+		if (selectedId) {
+			const options = getScriptOptions(selectedId)
+			if (options) {
+				this.scriptEditorOptions = options
+			}
+		} else {
+			this.scriptEditorOptions = undefined
+		}
+
+		return () => {
+			this.scriptEditorOptions = undefined
+		}
+	}
+
+	setFlowHelpers = (flowHelpers: FlowAIChatHelpers) => {
+		this.flowAiChatHelpers = flowHelpers
+
+		return () => {
+			this.flowAiChatHelpers = undefined
+		}
+	}
+}
+
+export const aiChatManager = new AIChatManager()
diff --git a/frontend/src/lib/components/copilot/chat/AssistantMessage.svelte b/frontend/src/lib/components/copilot/chat/AssistantMessage.svelte
index de5fa391af..75b2a4ecb1 100644
--- a/frontend/src/lib/components/copilot/chat/AssistantMessage.svelte
+++ b/frontend/src/lib/components/copilot/chat/AssistantMessage.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
 	import Markdown from 'svelte-exmarkdown'
 	import { gfmPlugin } from 'svelte-exmarkdown/gfm'
-	import type { DisplayMessage } from './core'
-	import CodeDisplay from './CodeDisplay.svelte'
+	import type { DisplayMessage } from './shared'
+	import CodeDisplay from './script/CodeDisplay.svelte'
+	import LinkRenderer from './LinkRenderer.svelte'
 	import { setContext } from 'svelte'
 
 	export let message: DisplayMessage
@@ -21,7 +22,8 @@
 			gfmPlugin(),
 			{
 				renderer: {
-					pre: CodeDisplay
+					pre: CodeDisplay,
+					a: LinkRenderer
 				}
 			}
 		]}
diff --git a/frontend/src/lib/components/copilot/chat/AvailableContextList.svelte b/frontend/src/lib/components/copilot/chat/AvailableContextList.svelte
index 558af49113..468e5ceafc 100644
--- a/frontend/src/lib/components/copilot/chat/AvailableContextList.svelte
+++ b/frontend/src/lib/components/copilot/chat/AvailableContextList.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
-	import { ContextIconMap } from './core'
-	import type { ContextElement } from './core'
+	import { ContextIconMap, type ContextElement } from './context'
 
 	export let availableContext: ContextElement[]
 	export let selectedContext: ContextElement[]
@@ -9,15 +8,28 @@
 	export let stringSearch = ''
 	export let selectedIndex = 0
 
+	// Define priority map for context types
+	const typePriority = {
+		code: 1,
+		diff: 2,
+		default: 3
+	}
+
+	$: sortedAvailableContext = availableContext.sort((a, b) => {
+		const priorityA = typePriority[a.type] || typePriority.default
+		const priorityB = typePriority[b.type] || typePriority.default
+		return priorityA - priorityB
+	})
+
 	$: actualAvailableContext = showAllAvailable
-		? availableContext.filter(
+		? sortedAvailableContext.filter(
 				(c) => !stringSearch || c.title.toLowerCase().includes(stringSearch.toLowerCase())
-		  )
-		: availableContext.filter(
+			)
+		: sortedAvailableContext.filter(
 				(c) =>
 					!selectedContext.find((sc) => sc.type === c.type && sc.title === c.title) &&
 					(!stringSearch || c.title.toLowerCase().includes(stringSearch.toLowerCase()))
-		  )
+			)
 </script>
 
 <div class="flex flex-col gap-1 text-tertiary text-xs p-1 min-w-24 max-h-48 overflow-y-scroll">
@@ -33,7 +45,7 @@
 				on:click={() => onSelect(element)}
 			>
 				<svelte:component this={ContextIconMap[element.type]} size={16} />
-				{element.title}
+				{element.type === 'diff' ? element.title.replace(/_/g, ' ') : element.title}
 			</button>
 		{/each}
 	{/if}
diff --git a/frontend/src/lib/components/copilot/chat/ChatMode.svelte b/frontend/src/lib/components/copilot/chat/ChatMode.svelte
new file mode 100644
index 0000000000..3a08f5d97b
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/ChatMode.svelte
@@ -0,0 +1,50 @@
+<script lang="ts">
+	import { ChevronDown } from 'lucide-svelte'
+	import Popover from '$lib/components/meltComponents/Popover.svelte'
+	import { twMerge } from 'tailwind-merge'
+	import { aiChatManager, AIMode } from './AIChatManager.svelte'
+</script>
+
+<div class="min-w-0">
+	<Popover
+		disablePopup={Object.keys(aiChatManager.allowedModes).filter(
+			(k) => aiChatManager.allowedModes[k]
+		).length < 2}
+		class="max-w-full"
+	>
+		<svelte:fragment slot="trigger">
+			<div
+				class="text-tertiary text-xs flex flex-row items-center font-normal gap-0.5 border px-1 rounded-lg"
+			>
+				<span class={`truncate`}>
+					{aiChatManager.mode.charAt(0).toUpperCase() + aiChatManager.mode.slice(1)} mode
+				</span>
+				{#if Object.keys(aiChatManager.allowedModes).filter((k) => aiChatManager.allowedModes[k]).length > 1}
+					<div class="shrink-0">
+						<ChevronDown size={16} />
+					</div>
+				{/if}
+			</div>
+		</svelte:fragment>
+		<svelte:fragment slot="content" let:close>
+			<div class="flex flex-col gap-1 p-1 min-w-24">
+				{#each Object.values(AIMode) as possibleMode}
+					{#if aiChatManager.allowedModes[possibleMode]}
+						<button
+							class={twMerge(
+								'text-left text-xs hover:bg-surface-hover rounded-md p-1 font-normal',
+								aiChatManager.mode === possibleMode && 'bg-surface-hover'
+							)}
+							onclick={() => {
+								aiChatManager.changeMode(possibleMode)
+								close()
+							}}
+						>
+							{possibleMode.charAt(0).toUpperCase() + possibleMode.slice(1)} mode
+						</button>
+					{/if}
+				{/each}
+			</div>
+		</svelte:fragment>
+	</Popover>
+</div>
diff --git a/frontend/src/lib/components/copilot/chat/ChatQuickActions.svelte b/frontend/src/lib/components/copilot/chat/ChatQuickActions.svelte
index a05795489e..ac98c6fe76 100644
--- a/frontend/src/lib/components/copilot/chat/ChatQuickActions.svelte
+++ b/frontend/src/lib/components/copilot/chat/ChatQuickActions.svelte
@@ -1,23 +1,24 @@
 <script lang="ts">
-	import { createEventDispatcher } from 'svelte'
 	import { SparklesIcon, LightbulbIcon, DiffIcon } from 'lucide-svelte'
 	import Button from '$lib/components/common/button/Button.svelte'
 
-	export let diffMode: boolean = false
-
 	let iconClasses = '!w-3 !h-3 !px-0 !m-0'
 
-	const dispatch = createEventDispatcher<{
-		analyzeChanges: null
-		explainChanges: null
-		suggestImprovements: null
-	}>()
+	let {
+		diffMode,
+		askAi
+	}: {
+		diffMode: boolean
+		askAi: (instructions: string, options?: { withCode?: boolean; withDiff?: boolean }) => void
+	} = $props()
 
-	$: btnClasses = `!px-1 !py-0.5 !gap-1 ${
-		diffMode
-			? '!bg-surface dark:!bg-surface border-frost-500 dark:border-frost-500'
-			: '!font-normal'
-	}`
+	let btnClasses = $derived(
+		`!px-1 !py-0.5 !gap-1 ${
+			diffMode
+				? '!bg-surface dark:!bg-surface border-frost-500 dark:border-frost-500'
+				: '!font-normal'
+		}`
+	)
 </script>
 
 <div class="flex flex-row items-center gap-2 px-2 py-1">
@@ -25,7 +26,10 @@
 		{#if diffMode}
 			<Button
 				on:click={() => {
-					dispatch('analyzeChanges')
+					askAi(
+						'Based on the changes I made to the code, look for potential issues and recommend better solutions',
+						{ withDiff: true }
+					)
 				}}
 				title="Analyze changes"
 				size="xs"
@@ -40,7 +44,10 @@
 		{:else}
 			<Button
 				on:click={() => {
-					dispatch('explainChanges')
+					askAi('Explain the changes I made to the code from the last diff', {
+						withCode: false,
+						withDiff: true
+					})
 				}}
 				title="Explain changes"
 				size="xs3"
@@ -54,7 +61,7 @@
 			</Button>
 			<Button
 				on:click={() => {
-					dispatch('suggestImprovements')
+					askAi('Look for potential issues and recommend better solutions in the actual code')
 				}}
 				title="Suggest improvements"
 				size="xs"
diff --git a/frontend/src/lib/components/copilot/chat/ContextElementBadge.svelte b/frontend/src/lib/components/copilot/chat/ContextElementBadge.svelte
index b1d1a6dbdb..bfb0b10f03 100644
--- a/frontend/src/lib/components/copilot/chat/ContextElementBadge.svelte
+++ b/frontend/src/lib/components/copilot/chat/ContextElementBadge.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Popover } from '$lib/components/meltComponents'
 	import { Loader2, X } from 'lucide-svelte'
-	import { ContextIconMap, type ContextElement } from './core'
+	import { ContextIconMap, type ContextElement } from './context'
 	import { Highlight } from 'svelte-highlight'
 	import { json } from 'svelte-highlight/languages'
 	import { twMerge } from 'tailwind-merge'
@@ -42,7 +42,9 @@
 					<svelte:component this={icon} size={16} />
 				{/if}
 			</button>
-			{contextElement.title}
+			{contextElement.type === 'diff'
+				? contextElement.title.replace(/_/g, ' ')
+				: contextElement.title}
 		</div>
 	</svelte:fragment>
 	<svelte:fragment slot="content">
diff --git a/frontend/src/lib/components/copilot/chat/ContextManager.svelte.ts b/frontend/src/lib/components/copilot/chat/ContextManager.svelte.ts
new file mode 100644
index 0000000000..ad89b9b672
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/ContextManager.svelte.ts
@@ -0,0 +1,282 @@
+import { langToExt } from '$lib/editorUtils'
+import { ResourceService, type ListResourceResponse, type ScriptLang } from '$lib/gen'
+import { scriptLangToEditorLang } from '$lib/scripts'
+import { SQLSchemaLanguages, type DBSchemas } from '$lib/stores'
+import { diffLines } from 'diff'
+import type { ContextElement } from './context'
+
+import type { DisplayMessage } from './shared'
+
+export interface ScriptOptions {
+	lang: ScriptLang | 'bunnative'
+	code: string
+	error: string | undefined
+	args: Record<string, any>
+	path: string | undefined
+	lastSavedCode?: string
+	lastDeployedCode?: string
+	diffMode: boolean
+}
+
+export default class ContextManager {
+	private selectedContext: ContextElement[] = $state([])
+	private availableContext: ContextElement[] = $state([])
+
+	private workspace: string | undefined = undefined
+	private dbResources: ListResourceResponse = []
+	private scriptOptions: ScriptOptions | undefined = undefined
+
+	private async refreshDbResources(workspace: string) {
+		this.dbResources = await ResourceService.listResource({
+			workspace: workspace,
+			resourceType: SQLSchemaLanguages.join(',')
+		})
+	}
+
+	private getSelectedDBSchema(scriptOptions: ScriptOptions, dbSchemas: DBSchemas) {
+		const schemaRes =
+			scriptOptions.lang === 'graphql' ? scriptOptions.args.api : scriptOptions.args.database
+		if (typeof schemaRes === 'string') {
+			const schemaPath = schemaRes.replace('$res:', '')
+			const schema = dbSchemas[schemaPath]
+			if (schema && schema.lang === scriptOptions.lang) {
+				return { schema, resource: schemaPath }
+			} else {
+				return { schema: undefined, resource: schemaPath }
+			}
+		}
+	}
+
+	private getContextCodePath(scriptOptions: ScriptOptions) {
+		return (
+			(scriptOptions.path?.split('/').pop() ?? 'script') +
+			'.' +
+			langToExt(scriptLangToEditorLang(scriptOptions.lang))
+		)
+	}
+
+	async updateAvailableContext(
+		scriptOptions: ScriptOptions,
+		dbSchemas: DBSchemas,
+		workspace: string,
+		toolSupport: boolean,
+		currentlySelectedContext: ContextElement[]
+	) {
+		try {
+			let firstTime = !this.workspace
+			if (this.workspace !== workspace) {
+				await this.refreshDbResources(workspace)
+				this.workspace = workspace
+			}
+			this.scriptOptions = scriptOptions
+			let newAvailableContext: ContextElement[] = [
+				{
+					type: 'code',
+					title: this.getContextCodePath(scriptOptions) ?? '',
+					content: scriptOptions.code,
+					lang: scriptOptions.lang
+				}
+			]
+
+			if (toolSupport) {
+				for (const d of this.dbResources) {
+					const loadedSchema = dbSchemas[d.path]
+					newAvailableContext.push({
+						type: 'db',
+						title: d.path,
+						// If the db is already fetched, add the schema to the context
+						...(loadedSchema ? { schema: loadedSchema } : {})
+					})
+				}
+			}
+
+			if (scriptOptions.lastSavedCode && scriptOptions.lastSavedCode !== scriptOptions.code) {
+				newAvailableContext.push({
+					type: 'diff',
+					title: 'diff_with_last_saved_draft', // can't use spaces in the title, because it will break the word match in the context text area hightlighting logic
+					content: scriptOptions.lastSavedCode ?? '',
+					diff: diffLines(scriptOptions.lastSavedCode ?? '', scriptOptions.code),
+					lang: scriptOptions.lang
+				})
+			}
+
+			if (scriptOptions.lastDeployedCode && scriptOptions.lastDeployedCode !== scriptOptions.code) {
+				newAvailableContext.push({
+					type: 'diff',
+					title: 'diff_with_last_deployed_version',
+					content: scriptOptions.lastDeployedCode ?? '',
+					diff: diffLines(scriptOptions.lastDeployedCode ?? '', scriptOptions.code),
+					lang: scriptOptions.lang
+				})
+			}
+
+			if (scriptOptions.error) {
+				newAvailableContext = [
+					...newAvailableContext,
+					{
+						type: 'error',
+						title: 'error',
+						content: scriptOptions.error
+					}
+				]
+			}
+
+			let newSelectedContext: ContextElement[] = [...currentlySelectedContext]
+
+			if (firstTime) {
+				newSelectedContext = [
+					{
+						type: 'code',
+						title: this.getContextCodePath(scriptOptions) ?? '',
+						content: scriptOptions.code,
+						lang: scriptOptions.lang
+					}
+				]
+			}
+
+			const db = this.getSelectedDBSchema(scriptOptions, dbSchemas)
+			if (
+				db &&
+				!newSelectedContext.find((c) => c.type === 'db' && db && c.title === db.resource) &&
+				toolSupport
+			) {
+				newSelectedContext = [
+					...newSelectedContext,
+					{
+						type: 'db',
+						title: db.resource,
+						schema: db.schema
+					}
+				]
+			}
+
+			newSelectedContext = newSelectedContext
+				.filter(
+					(c) =>
+						(c.type === 'code_piece' && scriptOptions.code.includes(c.content)) ||
+						c.type === 'code' ||
+						newAvailableContext.some((ac) => ac.type === c.type && ac.title === c.title)
+				)
+				.map((c) =>
+					c.type === 'code'
+						? {
+								...c,
+								content: scriptOptions.code,
+								title: this.getContextCodePath(scriptOptions)
+							}
+						: c.type === 'db' && dbSchemas[c.title]
+							? {
+									...c,
+									schema: dbSchemas[c.title]
+								}
+							: c
+				)
+
+			this.availableContext = newAvailableContext
+			this.selectedContext = newSelectedContext
+		} catch (err) {
+			console.error('Could not update available context', err)
+		}
+	}
+
+	getSelectedContext() {
+		return this.selectedContext
+	}
+
+	setSelectedContext(newSelectedContext: ContextElement[]) {
+		this.selectedContext = newSelectedContext
+	}
+
+	getAvailableContext() {
+		return this.availableContext
+	}
+
+	addSelectedLinesToContext(lines: string, startLine: number, endLine: number) {
+		if (
+			!this.scriptOptions ||
+			this.selectedContext.find(
+				(c) => c.type === 'code_piece' && c.title === `L${startLine}-L${endLine}`
+			)
+		) {
+			return
+		}
+		this.selectedContext = [
+			...this.selectedContext,
+			{
+				type: 'code_piece',
+				title: `L${startLine}-L${endLine}`,
+				startLine,
+				endLine,
+				content: lines,
+				lang: this.scriptOptions.lang
+			}
+		]
+	}
+
+	setFixContext() {
+		const codeContext = this.availableContext.find((c) => c.type === 'code')
+		const errorContext = this.availableContext.find((c) => c.type === 'error')
+
+		if (codeContext && errorContext) {
+			this.selectedContext = [codeContext, errorContext]
+		}
+	}
+
+	setAskAiContext(options: { withCode?: boolean; withDiff?: boolean }) {
+		if (!this.scriptOptions) {
+			return
+		}
+		const codeContext = this.availableContext.find((c) => c.type === 'code')
+		if (!codeContext) {
+			return
+		}
+		this.selectedContext = [
+			...(options.withCode === false ? [] : [codeContext]),
+			...(options.withDiff
+				? [
+						{
+							type: 'diff' as const,
+							title: 'diff_with_last_deployed_version',
+							content: this.scriptOptions.lastDeployedCode ?? '',
+							diff: diffLines(this.scriptOptions.lastDeployedCode ?? '', this.scriptOptions.code),
+							lang: this.scriptOptions.lang
+						}
+					]
+				: [])
+		]
+	}
+
+	updateContextOnRequest(options: { removeDiff?: boolean; addBackCode?: boolean }) {
+		this.selectedContext = this.selectedContext.filter((c) => c.type !== 'code_piece')
+		if (options.removeDiff) {
+			this.selectedContext = this.selectedContext.filter((c) => c.type !== 'diff')
+		}
+		if (options.addBackCode) {
+			const codeContext = this.availableContext.find((c) => c.type === 'code')
+			if (codeContext) {
+				this.selectedContext = [...this.selectedContext, codeContext]
+			}
+		}
+	}
+
+	static updateDisplayMessages(
+		displayMessages: DisplayMessage[],
+		dbSchemas: DBSchemas
+	): DisplayMessage[] {
+		return displayMessages.map((m) => ({
+			...m,
+			contextElements:
+				m.role !== 'tool' && m.contextElements
+					? m.contextElements.map((c) =>
+							c.type === 'db'
+								? {
+										type: 'db',
+										title: c.title,
+										schema: dbSchemas[c.title]
+									}
+								: c
+						)
+					: undefined
+		}))
+	}
+}
diff --git a/frontend/src/lib/components/copilot/chat/ContextTextarea.svelte b/frontend/src/lib/components/copilot/chat/ContextTextarea.svelte
index 2916ad3efc..b4d2f04af9 100644
--- a/frontend/src/lib/components/copilot/chat/ContextTextarea.svelte
+++ b/frontend/src/lib/components/copilot/chat/ContextTextarea.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
 	import autosize from '$lib/autosize'
 	import { createEventDispatcher } from 'svelte'
-	import type { ContextElement } from './core'
+	import type { ContextElement } from './context'
 	import AvailableContextList from './AvailableContextList.svelte'
 
 	export let instructions: string
 	export let availableContext: ContextElement[]
 	export let selectedContext: ContextElement[]
 	export let isFirstMessage: boolean
+	export let disabled: boolean = false
 
 	const dispatch = createEventDispatcher<{
 		updateInstructions: { value: string }
@@ -319,6 +320,7 @@
 		style={instructions.length > 0
 			? 'color: transparent; -webkit-text-fill-color: transparent;'
 			: ''}
+		{disabled}
 	></textarea>
 </div>
 
diff --git a/frontend/src/lib/components/copilot/chat/HistoryManager.svelte.ts b/frontend/src/lib/components/copilot/chat/HistoryManager.svelte.ts
new file mode 100644
index 0000000000..7e1a7b80df
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/HistoryManager.svelte.ts
@@ -0,0 +1,111 @@
+import { openDB, type DBSchema as IDBSchema, type IDBPDatabase } from 'idb'
+import type { DisplayMessage } from './shared'
+import { createLongHash } from '$lib/editorUtils'
+import type { ChatCompletionMessageParam } from 'openai/resources/index.mjs'
+interface ChatSchema extends IDBSchema {
+	chats: {
+		key: string
+		value: {
+			id: string
+			actualMessages: ChatCompletionMessageParam[]
+			displayMessages: DisplayMessage[]
+			title: string
+			lastModified: number
+		}
+	}
+}
+
+export default class HistoryManager {
+	private indexDB: IDBPDatabase<ChatSchema> | undefined = undefined
+
+	private savedChats: Record<
+		string,
+		{
+			actualMessages: ChatCompletionMessageParam[]
+			displayMessages: DisplayMessage[]
+			title: string
+			id: string
+			lastModified: number
+		}
+	> = $state({})
+
+	private currentChatId: string = $state(createLongHash())
+
+	private pastChats = $derived(
+		Object.values(this.savedChats)
+			.filter((c) => c.id !== this.currentChatId)
+			.sort((a, b) => b.lastModified - a.lastModified)
+	)
+
+	async init() {
+		try {
+			this.indexDB = await openDB<ChatSchema>('copilot-chat-history', 1, {
+				upgrade(indexDB) {
+					if (!indexDB.objectStoreNames.contains('chats')) {
+						indexDB.createObjectStore('chats', { keyPath: 'id' })
+					}
+				}
+			})
+
+			const chats = await this.indexDB.getAll('chats')
+			this.savedChats = chats.reduce(
+				(acc, chat) => {
+					acc[chat.id] = chat
+					return acc
+				},
+				{} as typeof this.savedChats
+			)
+		} catch (err) {
+			console.error('Could not open chat history database', err)
+			return {}
+		}
+	}
+
+	close() {
+		this.indexDB?.close()
+	}
+
+	getPastChats() {
+		return this.pastChats
+	}
+
+	async saveChat(displayMessages: DisplayMessage[], messages: ChatCompletionMessageParam[]) {
+		if (displayMessages.length > 0) {
+			const updatedChat = {
+				actualMessages: $state.snapshot(messages),
+				displayMessages: $state.snapshot(displayMessages),
+				title: displayMessages[0].content.slice(0, 50),
+				id: this.currentChatId,
+				lastModified: Date.now()
+			}
+			this.savedChats = {
+				...this.savedChats,
+				[updatedChat.id]: updatedChat
+			}
+
+			if (this.indexDB) {
+				await this.indexDB.put('chats', updatedChat)
+			}
+		}
+	}
+
+	async save(displayMessages: DisplayMessage[], messages: ChatCompletionMessageParam[]) {
+		await this.saveChat(displayMessages, messages)
+		this.currentChatId = createLongHash()
+	}
+
+	deletePastChat(id: string) {
+		this.savedChats = Object.fromEntries(
+			Object.entries(this.savedChats).filter(([key]) => key !== id)
+		)
+		this.indexDB?.delete('chats', id)
+	}
+
+	loadPastChat(id: string) {
+		const chat = this.savedChats[id]
+		if (chat) {
+			this.currentChatId = id
+			return chat
+		}
+	}
+}
diff --git a/frontend/src/lib/components/copilot/chat/LinkRenderer.svelte b/frontend/src/lib/components/copilot/chat/LinkRenderer.svelte
new file mode 100644
index 0000000000..87d131e03e
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/LinkRenderer.svelte
@@ -0,0 +1,15 @@
+<script lang="ts">
+	import type { Snippet } from 'svelte'
+
+	type Props = {
+		href?: string
+		children?: Snippet
+	}
+	let { href, children }: Props = $props()
+</script>
+
+{#if href}
+	<a {href} target="_blank" rel="noopener noreferrer">
+		{@render children?.()}
+	</a>
+{/if}
diff --git a/frontend/src/lib/components/copilot/chat/ProviderModelSelector.svelte b/frontend/src/lib/components/copilot/chat/ProviderModelSelector.svelte
index a74dc353e0..6c7068a80c 100644
--- a/frontend/src/lib/components/copilot/chat/ProviderModelSelector.svelte
+++ b/frontend/src/lib/components/copilot/chat/ProviderModelSelector.svelte
@@ -8,6 +8,7 @@
 		copilotSessionModel
 	} from '$lib/stores'
 	import { storeLocalSetting } from '$lib/utils'
+	import { twMerge } from 'tailwind-merge'
 
 	$: providerModel = $copilotSessionModel ??
 		$copilotInfo.defaultModel ??
@@ -33,9 +34,12 @@
 		</svelte:fragment>
 		<svelte:fragment slot="content" let:close>
 			<div class="flex flex-col gap-1 p-1 min-w-24">
-				{#each $copilotInfo.aiModels.filter((m) => m.model !== providerModel.model) as providerModel}
+				{#each $copilotInfo.aiModels as providerModel}
 					<button
-						class="text-left text-xs hover:bg-surface-hover rounded-md p-1 font-normal"
+						class={twMerge(
+							'text-left text-xs hover:bg-surface-hover rounded-md p-1 font-normal',
+							providerModel.model === $copilotSessionModel?.model && 'bg-surface-hover'
+						)}
 						on:click={() => {
 							$copilotSessionModel = providerModel
 							storeLocalSetting(COPILOT_SESSION_MODEL_SETTING_NAME, providerModel.model)
diff --git a/frontend/src/lib/components/copilot/chat/ask/core.ts b/frontend/src/lib/components/copilot/chat/ask/core.ts
new file mode 100644
index 0000000000..997594cc88
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/ask/core.ts
@@ -0,0 +1,40 @@
+import type {
+	ChatCompletionSystemMessageParam,
+	ChatCompletionUserMessageParam
+} from 'openai/resources/index.mjs'
+import type { Tool } from '../shared'
+import { getDocumentationTool } from '../navigator/core'
+
+export const CHAT_SYSTEM_PROMPT = `
+You are Windmill's intelligent assistant, designed to answer questions about its functionality. It is your only purpose to help the user in the context of the windmill application.
+Windmill is an open-source developer platform for building internal tools, API integrations, background jobs, workflows, and user interfaces. It offers a unified system where scripts are automatically turned into sharable UIs and can be composed into flows or embedded in custom applications.
+
+You have access to these tools:
+1. Get documentation for user requests (get_documentation)
+
+INSTRUCTIONS:
+- When user asks about something, use the get_documentation tool to retrieve accurate information about how to fulfill the user's request.
+- Complete your response with precisions about how it works based on the documentation. Also drop a link to the relevant documentation if possible.
+- If the user asks about something that you are unsure about, say that you are not sure about the answer and suggest to ask the question to the windmill team.
+
+GENERAL PRINCIPLES:
+- Be concise but thorough
+- Maintain a friendly, professional tone
+- If you encounter an error or can't complete a request, explain why and suggest alternatives
+`
+
+export const askTools: Tool<{}>[] = [getDocumentationTool]
+
+export function prepareAskSystemMessage(): ChatCompletionSystemMessageParam {
+	return {
+		role: 'system',
+		content: CHAT_SYSTEM_PROMPT
+	}
+}
+
+export function prepareAskUserMessage(instructions: string): ChatCompletionUserMessageParam {
+	return {
+		role: 'user',
+		content: instructions
+	}
+}
diff --git a/frontend/src/lib/components/copilot/chat/context.ts b/frontend/src/lib/components/copilot/chat/context.ts
new file mode 100644
index 0000000000..e1dcf9d115
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/context.ts
@@ -0,0 +1,50 @@
+import { Code, Database, TriangleAlert, Diff } from 'lucide-svelte'
+import type { ScriptLang } from '$lib/gen/types.gen'
+import { type DBSchema } from '$lib/stores'
+import { type Change } from 'diff'
+
+export const ContextIconMap = {
+	code: Code,
+	error: TriangleAlert,
+	db: Database,
+	diff: Diff,
+	code_piece: Code
+}
+
+export interface CodeElement {
+	type: 'code'
+	content: string
+	title: string
+	lang: ScriptLang | 'bunnative'
+}
+
+interface ErrorElement {
+	type: 'error'
+	content: string
+	title: 'error'
+}
+
+interface DBElement {
+	type: 'db'
+	schema?: DBSchema
+	title: string
+}
+
+interface DiffElement {
+	type: 'diff'
+	content: string
+	title: string
+	diff: Change[]
+	lang: ScriptLang | 'bunnative'
+}
+
+export interface CodePieceElement {
+	type: 'code_piece'
+	content: string
+	startLine: number
+	endLine: number
+	title: string
+	lang: ScriptLang | 'bunnative'
+}
+
+export type ContextElement = CodeElement | ErrorElement | DBElement | DiffElement | CodePieceElement
diff --git a/frontend/src/lib/components/copilot/chat/flow/FlowAIButton.svelte b/frontend/src/lib/components/copilot/chat/flow/FlowAIButton.svelte
new file mode 100644
index 0000000000..aae992e771
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/flow/FlowAIButton.svelte
@@ -0,0 +1,59 @@
+<script lang="ts">
+	import { base } from '$lib/base'
+	import { copilotInfo } from '$lib/stores'
+	import Popover from '$lib/components/meltComponents/Popover.svelte'
+	import DarkPopover from '$lib/components/Popover.svelte'
+	import { ExternalLink } from 'lucide-svelte'
+	import { Button } from '$lib/components/common'
+	import { getModifierKey } from '$lib/utils'
+	import { WandSparkles } from 'lucide-svelte'
+
+	let { openPanel }: { openPanel: () => void } = $props()
+</script>
+
+{#snippet button(onClick: () => void)}
+	<Button
+		color="light"
+		variant="border"
+		size="xs"
+		on:click={onClick}
+		startIcon={{ icon: WandSparkles }}
+		iconOnly
+		btnClasses="!text-violet-800 dark:!text-violet-400 border border-gray-200 dark:border-gray-600 bg-surface"
+	>
+		AI Panel
+	</Button>
+{/snippet}
+
+{#if $copilotInfo.enabled}
+	<DarkPopover>
+		<svelte:fragment slot="text">
+			<div class="flex flex-row gap-1">
+				Show the AI Panel.
+
+				<div class="flex flex-row items-center !text-md opacity-60 gap-0 font-normal">
+					{getModifierKey()}L
+				</div>
+			</div>
+		</svelte:fragment>
+		{@render button(openPanel)}
+	</DarkPopover>
+{:else}
+	<Popover placement="bottom">
+		<svelte:fragment slot="trigger">
+			{@render button(() => {})}
+		</svelte:fragment>
+		<svelte:fragment slot="content">
+			<div class="block text-primary p-4">
+				<p class="text-sm"
+					>Enable Windmill AI in the <a
+						href="{base}/workspace_settings?tab=ai"
+						target="_blank"
+						class="inline-flex flex-row items-center gap-1"
+						>workspace settings <ExternalLink size={16} /></a
+					></p
+				>
+			</div>
+		</svelte:fragment>
+	</Popover>
+{/if}
diff --git a/frontend/src/lib/components/copilot/chat/flow/FlowAIChat.svelte b/frontend/src/lib/components/copilot/chat/flow/FlowAIChat.svelte
new file mode 100644
index 0000000000..26307809d4
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/flow/FlowAIChat.svelte
@@ -0,0 +1,356 @@
+<script lang="ts">
+	import FlowModuleSchemaMap from '$lib/components/flows/map/FlowModuleSchemaMap.svelte'
+	import { getContext } from 'svelte'
+	import type { FlowCopilotContext } from '../../flow'
+	import type { FlowEditorContext } from '$lib/components/flows/types'
+	import { dfs } from '$lib/components/flows/previousResults'
+	import { getSubModules } from '$lib/components/flows/flowExplorer'
+	import type { FlowModule } from '$lib/gen'
+	import { getIndexInNestedModules, getNestedModules } from './utils'
+	import type { FlowAIChatHelpers } from './core'
+	import {
+		insertNewFailureModule,
+		insertNewPreprocessorModule
+	} from '$lib/components/flows/flowStateUtils'
+	import { loadSchemaFromModule } from '$lib/components/flows/flowInfers'
+	import { aiChatManager } from '../AIChatManager.svelte'
+
+	let {
+		flowModuleSchemaMap
+	}: {
+		flowModuleSchemaMap: FlowModuleSchemaMap | undefined
+	} = $props()
+
+	const { flowStore, flowStateStore, selectedId, currentEditor, flowInputsStore } =
+		getContext<FlowEditorContext>('FlowEditorContext')
+
+	const { exprsToSet } = getContext<FlowCopilotContext | undefined>('FlowCopilotContext') ?? {}
+
+	function getModule(id: string) {
+		if (id === 'preprocessor') {
+			return $flowStore.value.preprocessor_module
+		} else if (id === 'failure') {
+			return $flowStore.value.failure_module
+		} else {
+			return dfs(id, $flowStore, false)[0]
+		}
+	}
+
+	const flowHelpers: FlowAIChatHelpers = {
+		getFlowAndSelectedId: () => ({ flow: $flowStore, selectedId: $selectedId }),
+		setCode: async (id, code) => {
+			const module = getModule(id)
+			if (!module) {
+				throw new Error('Module not found')
+			}
+			if (module.value.type === 'rawscript') {
+				module.value.content = code
+				const { input_transforms, schema } = await loadSchemaFromModule(module)
+				module.value.input_transforms = input_transforms
+				$flowStore = $flowStore
+				if ($flowStateStore[id]) {
+					$flowStateStore[id].schema = schema
+				} else {
+					$flowStateStore[id] = {
+						schema
+					}
+				}
+			} else {
+				throw new Error('Module is not a rawscript or script')
+			}
+			if ($currentEditor && $currentEditor.type === 'script' && $currentEditor.stepId === id) {
+				$currentEditor.editor.setCode(code)
+			}
+		},
+		insertStep: async (location, step) => {
+			const { index, modules } =
+				location.type === 'start'
+					? {
+							index: -1,
+							modules: $flowStore.value.modules
+						}
+					: location.type === 'start_inside_forloop'
+						? {
+								index: -1,
+								modules: getNestedModules($flowStore, location.inside)
+							}
+						: location.type === 'start_inside_branch'
+							? {
+									index: -1,
+									modules: getNestedModules($flowStore, location.inside, location.branchIndex)
+								}
+							: location.type === 'after'
+								? getIndexInNestedModules($flowStore, location.afterId)
+								: {
+										index: -1,
+										modules: $flowStore.value.modules
+									}
+
+			const indexToInsertAt = index + 1
+
+			let newModules: FlowModule[] | undefined = undefined
+			switch (step.type) {
+				case 'rawscript': {
+					const inlineScript = {
+						language: step.language,
+						kind: 'script' as const,
+						subkind: 'flow' as const
+					}
+					if (location.type === 'preprocessor') {
+						await insertNewPreprocessorModule(flowStore, flowStateStore, inlineScript)
+					} else if (location.type === 'failure') {
+						await insertNewFailureModule(flowStore, flowStateStore, inlineScript)
+					} else {
+						newModules = await flowModuleSchemaMap?.insertNewModuleAtIndex(
+							modules,
+							indexToInsertAt,
+							'script',
+							undefined,
+							undefined,
+							inlineScript
+						)
+					}
+					break
+				}
+				case 'script': {
+					const wsScript = {
+						path: step.path,
+						summary: '',
+						hash: undefined
+					}
+					if (location.type === 'preprocessor') {
+						await insertNewPreprocessorModule(flowStore, flowStateStore, undefined, wsScript)
+					} else if (location.type === 'failure') {
+						await insertNewFailureModule(flowStore, flowStateStore, undefined, wsScript)
+					} else {
+						newModules = await flowModuleSchemaMap?.insertNewModuleAtIndex(
+							modules,
+							indexToInsertAt,
+							'script',
+							wsScript
+						)
+					}
+					break
+				}
+				case 'forloop':
+				case 'branchall':
+				case 'branchone': {
+					if (location.type === 'preprocessor' || location.type === 'failure') {
+						throw new Error('Cannot insert a non-script module for preprocessing or error handling')
+					}
+					newModules = await flowModuleSchemaMap?.insertNewModuleAtIndex(
+						modules,
+						indexToInsertAt,
+						step.type
+					)
+					break
+				}
+				default: {
+					throw new Error('Unknown step type')
+				}
+			}
+
+			if (location.type === 'preprocessor' || location.type === 'failure') {
+				$flowStateStore = $flowStateStore
+				$flowStore = $flowStore
+				return location.type
+			} else {
+				const newModule = newModules?.[indexToInsertAt]
+
+				if (!newModule) {
+					throw new Error('Failed to insert module')
+				}
+
+				if (['branchone', 'branchall'].includes(step.type)) {
+					await flowModuleSchemaMap?.addBranch(newModule)
+				}
+
+				$flowStateStore = $flowStateStore
+				$flowStore = $flowStore
+
+				return newModule.id
+			}
+		},
+		removeStep: async (id) => {
+			flowModuleSchemaMap?.selectNextId(id)
+			if (id === 'preprocessor') {
+				$flowStore.value.preprocessor_module = undefined
+			} else if (id === 'failure') {
+				$flowStore.value.failure_module = undefined
+			} else {
+				const { modules } = getIndexInNestedModules($flowStore, id)
+				flowModuleSchemaMap?.removeAtId(modules, id)
+			}
+
+			if ($flowInputsStore) {
+				delete $flowInputsStore[id]
+			}
+
+			$flowStore = $flowStore
+
+			flowModuleSchemaMap?.updateFlowInputsStore()
+		},
+		getStepInputs: async (id) => {
+			const module = getModule(id)
+			if (!module) {
+				throw new Error('Module not found')
+			}
+			const inputs =
+				module.value.type === 'script' || module.value.type === 'rawscript'
+					? module.value.input_transforms
+					: {}
+
+			return inputs
+		},
+		setStepInputs: async (id, inputs) => {
+			if (id === 'preprocessor') {
+				throw new Error('Cannot set inputs for preprocessor')
+			}
+
+			const regex = /\[\[(.+?)\]\]\s*\n([\s\S]*?)(?=\n\[\[|$)/g
+
+			const parsedInputs = Array.from(inputs.matchAll(regex)).map((match) => ({
+				input: match[1],
+				value: match[2].trim()
+			}))
+
+			if (id === $selectedId) {
+				exprsToSet?.set({})
+				const argsToUpdate = {}
+				for (const { input, value } of parsedInputs) {
+					argsToUpdate[input] = {
+						type: 'javascript',
+						expr: value
+					}
+				}
+				exprsToSet?.set(argsToUpdate)
+			} else {
+				const module = getModule(id)
+				if (!module) {
+					throw new Error('Module not found')
+				}
+
+				if (module.value.type !== 'script' && module.value.type !== 'rawscript') {
+					throw new Error('Module is not a script or rawscript')
+				}
+
+				for (const { input, value } of parsedInputs) {
+					module.value.input_transforms[input] = {
+						type: 'javascript',
+						expr: value
+					}
+				}
+				$flowStore = $flowStore
+			}
+		},
+		getFlowInputsSchema: async () => {
+			return $flowStore.schema ?? {}
+		},
+		setFlowInputsSchema: async (newInputs) => {
+			$flowStore.schema = newInputs
+		},
+		selectStep: (id) => {
+			$selectedId = id
+		},
+		getStepCode: (id) => {
+			const module = getModule(id)
+			if (!module) {
+				throw new Error('Module not found')
+			}
+			if (module.value.type === 'rawscript') {
+				return module.value.content
+			} else {
+				throw new Error('Module is not a rawscript')
+			}
+		},
+		getModules: (id?: string) => {
+			if (id) {
+				const module = getModule(id)
+
+				if (!module) {
+					throw new Error('Module not found')
+				}
+
+				return getSubModules(module).flat()
+			}
+			return $flowStore.value.modules
+		},
+		setBranchPredicate: async (id, branchIndex, expression) => {
+			const module = getModule(id)
+			if (!module) {
+				throw new Error('Module not found')
+			}
+			if (module.value.type !== 'branchone') {
+				throw new Error('Module is not a branchall or branchone')
+			}
+			const branch = module.value.branches[branchIndex]
+			if (!branch) {
+				throw new Error('Branch not found')
+			}
+			branch.expr = expression
+			$flowStore = $flowStore
+		},
+		addBranch: async (id) => {
+			const module = getModule(id)
+			if (!module) {
+				throw new Error('Module not found')
+			}
+			if (module.value.type !== 'branchall' && module.value.type !== 'branchone') {
+				throw new Error('Module is not a branchall or branchone')
+			}
+			flowModuleSchemaMap?.addBranch(module)
+			$flowStore = $flowStore
+		},
+		removeBranch: async (id, branchIndex) => {
+			const module = getModule(id)
+			if (!module) {
+				throw new Error('Module not found')
+			}
+			if (module.value.type !== 'branchall' && module.value.type !== 'branchone') {
+				throw new Error('Module is not a branchall or branchone')
+			}
+
+			// for branch one, we set index + 1 because the removeBranch function assumes the index is shifted by 1 because of the default branch
+			flowModuleSchemaMap?.removeBranch(
+				module,
+				module.value.type === 'branchone' ? branchIndex + 1 : branchIndex
+			)
+			$flowStore = $flowStore
+		},
+		setForLoopIteratorExpression: async (id, expression) => {
+			if ($currentEditor && $currentEditor.type === 'iterator' && $currentEditor.stepId === id) {
+				$currentEditor.editor.setCode(expression)
+			} else {
+				const module = getModule(id)
+				if (!module) {
+					throw new Error('Module not found')
+				}
+				if (module.value.type !== 'forloopflow') {
+					throw new Error('Module is not a forloopflow')
+				}
+				module.value.iterator = { type: 'javascript', expr: expression }
+				$flowStore = $flowStore
+			}
+		}
+	}
+
+	$effect(() => {
+		const cleanup = aiChatManager.setFlowHelpers(flowHelpers)
+		return cleanup
+	})
+
+	$effect(() => {
+		const cleanup = aiChatManager.listenForSelectedIdChanges(
+			$selectedId,
+			$flowStore,
+			$flowStateStore,
+			$currentEditor
+		)
+		return cleanup
+	})
+
+	$effect(() => {
+		const cleanup = aiChatManager.listenForCurrentEditorChanges($currentEditor)
+		return cleanup
+	})
+</script>
diff --git a/frontend/src/lib/components/copilot/chat/flow/core.ts b/frontend/src/lib/components/copilot/chat/flow/core.ts
new file mode 100644
index 0000000000..0b7d96b845
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/flow/core.ts
@@ -0,0 +1,674 @@
+import {
+	ScriptService,
+	type FlowModule,
+	type OpenFlow,
+	type RawScript,
+	type Script
+} from '$lib/gen'
+import type {
+	ChatCompletionSystemMessageParam,
+	ChatCompletionTool,
+	ChatCompletionUserMessageParam
+} from 'openai/resources/chat/completions.mjs'
+import YAML from 'yaml'
+import { z } from 'zod'
+import { zodToJsonSchema } from 'zod-to-json-schema'
+import type { FunctionParameters } from 'openai/resources/shared.mjs'
+import uFuzzy from '@leeoniya/ufuzzy'
+import { emptySchema, emptyString } from '$lib/utils'
+import {
+	getFormattedResourceTypes,
+	getLangContext,
+	SUPPORTED_CHAT_SCRIPT_LANGUAGES
+} from '../script/core'
+import type { Tool } from '../shared'
+import type { ExtendedOpenFlow } from '$lib/components/flows/types'
+
+export interface FlowAIChatHelpers {
+	getFlowAndSelectedId: () => { flow: OpenFlow; selectedId: string }
+	insertStep: (location: InsertLocation, step: NewStep) => Promise<string>
+	removeStep: (id: string) => Promise<void>
+	getStepInputs: (id: string) => Promise<Record<string, any>>
+	setStepInputs: (id: string, inputs: string) => Promise<void>
+	getFlowInputsSchema: () => Promise<Record<string, any>>
+	setFlowInputsSchema: (inputs: Record<string, any>) => Promise<void>
+	selectStep: (id: string) => void
+	getStepCode: (id: string) => string
+	getModules: (id?: string) => FlowModule[]
+	setBranchPredicate: (id: string, branchIndex: number, expression: string) => Promise<void>
+	addBranch: (id: string) => Promise<void>
+	removeBranch: (id: string, branchIndex: number) => Promise<void>
+	setForLoopIteratorExpression: (id: string, expression: string) => Promise<void>
+	setCode: (id: string, code: string) => Promise<void>
+}
+
+const searchScriptsSchema = z.object({
+	query: z
+		.string()
+		.describe('The query to search for, e.g. send email, list stripe invoices, etc..')
+})
+
+const searchScriptsToolDef = createToolDef(
+	searchScriptsSchema,
+	'search_scripts',
+	'Search for scripts in the workspace'
+)
+
+const searchHubScriptsToolDef = createToolDef(
+	searchScriptsSchema,
+	'search_hub_scripts',
+	'Search for scripts in the hub'
+)
+
+const langSchema = z.enum(
+	SUPPORTED_CHAT_SCRIPT_LANGUAGES as [RawScript['language'], ...RawScript['language'][]]
+)
+
+const newStepSchema = z.union([
+	z
+		.object({
+			type: z.literal('rawscript'),
+			language: langSchema.describe(
+				'The language to use for the code, default to bun if none specified'
+			)
+		})
+		.describe('Add a raw script step at the specified location'),
+	z
+		.object({
+			type: z.literal('script'),
+			path: z.string().describe('The path of the script to use for the step.')
+		})
+		.describe('Add a script step at the specified location'),
+	z
+		.object({
+			type: z.literal('forloop')
+		})
+		.describe('Add a for loop at the specified location'),
+	z
+		.object({
+			type: z.literal('branchall')
+		})
+		.describe('Add a branch all at the specified location: all branches will be executed'),
+	z
+		.object({
+			type: z.literal('branchone')
+		})
+		.describe(
+			'Add a branch one at the specified location: only the first branch that evaluates to true will be executed'
+		)
+])
+
+type NewStep = z.infer<typeof newStepSchema>
+
+const insertLocationSchema = z.union([
+	z
+		.object({
+			type: z.literal('after'),
+			afterId: z.string().describe('The id of the step after which the new step will be added.')
+		})
+		.describe('Add a step after the given step id'),
+	z
+		.object({
+			type: z.literal('start')
+		})
+		.describe('Add a step at the start of the flow'),
+	z
+		.object({
+			type: z.literal('start_inside_forloop'),
+			inside: z
+				.string()
+				.describe('The id of the step inside which the new step will be added (forloop step only)')
+		})
+		.describe('Add a step at the start of the given step (forloop step only)'),
+	z
+		.object({
+			type: z.literal('start_inside_branch'),
+			inside: z
+				.string()
+				.describe(
+					'The id of the step inside which the new step will be added (branchone or branchall only).'
+				),
+			branchIndex: z
+				.number()
+				.describe(
+					'The index of the branch inside the forloop step, starting at 0. For the default branch (branchone only), the branch index is -1.'
+				)
+		})
+		.describe(
+			'Add a step at the start of a given branch of the given step (branchone or branchall only)'
+		),
+	z
+		.object({
+			type: z.literal('preprocessor')
+		})
+		.describe('Insert a preprocessor step (runs before the first step when triggered externally)'),
+	z
+		.object({
+			type: z.literal('failure')
+		})
+		.describe('Insert a failure step (only executed when the flow fails)')
+])
+
+type InsertLocation = z.infer<typeof insertLocationSchema>
+
+const addStepSchema = z.object({
+	location: insertLocationSchema,
+	step: newStepSchema
+})
+
+const addStepToolDef = createToolDef(
+	addStepSchema,
+	'add_step',
+	'Add a step at the specified location'
+)
+
+const removeStepSchema = z.object({
+	id: z.string().describe('The id of the step to remove')
+})
+
+const removeStepToolDef = createToolDef(
+	removeStepSchema,
+	'remove_step',
+	'Remove the step with the given id'
+)
+
+const setForLoopIteratorExpressionSchema = z.object({
+	id: z.string().describe('The id of the forloop step to set the iterator expression for'),
+	expression: z.string().describe('The JavaScript expression to set for the iterator')
+})
+
+const setForLoopIteratorExpressionToolDef = createToolDef(
+	setForLoopIteratorExpressionSchema,
+	'set_forloop_iterator_expression',
+	'Set the iterator JavaScript expression for the given forloop step'
+)
+
+const setBranchPredicateSchema = z.object({
+	id: z.string().describe('The id of the branchone step to set the predicates for'),
+	branchIndex: z
+		.number()
+		.describe('The index of the branch to set the predicate for, starting at 0.'),
+	expression: z.string().describe('The JavaScript expression to set for the predicate')
+})
+const setBranchPredicateToolDef = createToolDef(
+	setBranchPredicateSchema,
+	'set_branch_predicate',
+	'Set the predicates using a JavaScript expression for the given branch, only applicable for branchone branches.'
+)
+
+const addBranchSchema = z.object({
+	id: z.string().describe('The id of the step to add the branch to')
+})
+const addBranchToolDef = createToolDef(
+	addBranchSchema,
+	'add_branch',
+	'Add a branch to the given step, applicable to branchall and branchone steps'
+)
+
+const removeBranchSchema = z.object({
+	id: z.string().describe('The id of the step to remove the branch from'),
+	branchIndex: z.number().describe('The index of the branch to remove, starting at 0')
+})
+const removeBranchToolDef = createToolDef(
+	removeBranchSchema,
+	'remove_branch',
+	'Remove the branch with the given index from the given step, applicable to branchall and branchone steps.'
+)
+
+const getStepInputsSchema = z.object({
+	id: z.string().describe('The id of the step to get the inputs for')
+})
+
+const getStepInputsToolDef = createToolDef(
+	getStepInputsSchema,
+	'get_step_inputs',
+	'Get the inputs for the given step id'
+)
+
+const setStepInputsSchema = z.object({
+	id: z.string().describe('The id of the step to set the inputs for'),
+	inputs: z.string().describe('The inputs to set for the step')
+})
+
+const setStepInputsToolDef = createToolDef(
+	setStepInputsSchema,
+	'set_step_inputs',
+	`Set all inputs for the given step id. 
+
+Return a list of input. Each input should be defined by its input name enclosed in double square brackets ([[inputName]]), followed by a JavaScript expression that sets its value.
+The value expression can span multiple lines. Separate each input block with a blank line.
+
+Example:
+
+[[input1]]
+\`Hello, \${results.a}\`
+
+[[input2]]
+flow_input.iter.value
+
+[[input3]]
+flow_input.x`
+)
+
+const setFlowInputsSchemaSchema = z.object({
+	schema: z.string().describe('JSON string of the flow inputs schema (draft 2020-12)')
+})
+
+const setFlowInputsSchemaToolDef = createToolDef(
+	setFlowInputsSchemaSchema,
+	'set_flow_inputs_schema',
+	'Set the flow inputs schema. **Overrides the current schema.**'
+)
+
+const setCodeSchema = z.object({
+	id: z.string().describe('The id of the step to set the code for'),
+	code: z.string().describe('The code to apply')
+})
+
+const setCodeToolDef = createToolDef(
+	setCodeSchema,
+	'set_code',
+	'Set the code for the current step.'
+)
+
+class WorkspaceScriptsSearch {
+	private uf: uFuzzy
+	private workspace: string | undefined = undefined
+	private scripts: Script[] | undefined = undefined
+
+	constructor() {
+		this.uf = new uFuzzy()
+	}
+
+	private async init(workspace: string) {
+		this.scripts = await ScriptService.listScripts({
+			workspace
+		})
+		this.workspace = workspace
+	}
+
+	async search(query: string, workspace: string) {
+		if (this.scripts === undefined || this.workspace !== workspace) {
+			await this.init(workspace)
+		}
+
+		const scripts = this.scripts
+
+		if (!scripts) {
+			throw new Error('Failed to load scripts')
+		}
+
+		const results = this.uf.search(
+			scripts.map((s) => (emptyString(s.summary) ? s.path : s.summary + ' (' + s.path + ')')),
+			query.trim()
+		)
+		const scriptResults =
+			results[2]?.map((id) => ({
+				path: scripts[id].path,
+				summary: scripts[id].summary
+			})) ?? []
+
+		return scriptResults
+	}
+}
+
+const resourceTypeToolSchema = z.object({
+	query: z.string().describe('The query to search for, e.g. stripe, google, etc..'),
+	language: langSchema.describe(
+		'The programming language the code using the resource type will be written in'
+	)
+})
+
+const resourceTypeToolDef = createToolDef(
+	resourceTypeToolSchema,
+	'resource_type',
+	'Search for resource types'
+)
+
+const getInstructionsForCodeGenerationToolSchema = z.object({
+	id: z.string().describe('The id of the step to generate code for'),
+	language: langSchema.describe('The programming language the code will be written in')
+})
+
+const getInstructionsForCodeGenerationToolDef = createToolDef(
+	getInstructionsForCodeGenerationToolSchema,
+	'get_instructions_for_code_generation',
+	'Get instructions for code generation for a raw script step'
+)
+
+const workspaceScriptsSearch = new WorkspaceScriptsSearch()
+
+export const flowTools: Tool<FlowAIChatHelpers>[] = [
+	{
+		def: searchScriptsToolDef,
+		fn: async ({ args, workspace, toolId, toolCallbacks }) => {
+			toolCallbacks.onToolCall(
+				toolId,
+				'Searching for workspace scripts related to "' + args.query + '"...'
+			)
+			const parsedArgs = searchScriptsSchema.parse(args)
+			const scriptResults = await workspaceScriptsSearch.search(parsedArgs.query, workspace)
+			toolCallbacks.onFinishToolCall(
+				toolId,
+				'Found ' +
+					scriptResults.length +
+					' scripts in the workspace related to "' +
+					args.query +
+					'"'
+			)
+			return JSON.stringify(scriptResults)
+		}
+	},
+	{
+		def: searchHubScriptsToolDef,
+		fn: async ({ args, toolId, toolCallbacks }) => {
+			toolCallbacks.onToolCall(
+				toolId,
+				'Searching for hub scripts related to "' + args.query + '"...'
+			)
+			const parsedArgs = searchScriptsSchema.parse(args)
+			const scripts = await ScriptService.queryHubScripts({
+				text: parsedArgs.query,
+				kind: 'script'
+			})
+			toolCallbacks.onFinishToolCall(
+				toolId,
+				'Found ' + scripts.length + ' scripts in the hub related to "' + args.query + '"'
+			)
+			return JSON.stringify(
+				scripts.map((s) => ({
+					path: `hub/${s.version_id}/${s.app}/${s.summary.toLowerCase().replaceAll(/\s+/g, '_')}`,
+					summary: s.summary
+				}))
+			)
+		}
+	},
+	{
+		def: addStepToolDef,
+		fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+			const parsedArgs = addStepSchema.parse(args)
+			toolCallbacks.onToolCall(
+				toolId,
+				parsedArgs.location.type === 'after'
+					? `Adding a step after, ${parsedArgs.location.afterId}`
+					: parsedArgs.location.type === 'start'
+						? 'Adding a step at the start'
+						: parsedArgs.location.type === 'start_inside_forloop'
+							? `Adding a step at the start of the forloop ${parsedArgs.location.inside}`
+							: parsedArgs.location.type === 'start_inside_branch'
+								? `Adding a step at the start of the branch ${parsedArgs.location.inside} ${parsedArgs.location.branchIndex}`
+								: parsedArgs.location.type === 'preprocessor'
+									? 'Adding a preprocessor step'
+									: parsedArgs.location.type === 'failure'
+										? 'Adding a failure step'
+										: 'Adding a step'
+			)
+			const id = await helpers.insertStep(parsedArgs.location, parsedArgs.step)
+			helpers.selectStep(id)
+
+			toolCallbacks.onFinishToolCall(toolId, `Added step '${id}'`)
+
+			return `Step ${id} added. Here is the updated flow, make sure to take it into account when adding another step:\n${YAML.stringify(helpers.getModules())}`
+		}
+	},
+	{
+		def: removeStepToolDef,
+		fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+			toolCallbacks.onToolCall(toolId, `Removing step ${args.id}...`)
+			const parsedArgs = removeStepSchema.parse(args)
+			await helpers.removeStep(parsedArgs.id)
+			toolCallbacks.onFinishToolCall(toolId, `Removed step '${parsedArgs.id}'`)
+			return `Step '${parsedArgs.id}' removed. Here is the updated flow:\n${YAML.stringify(helpers.getModules())}`
+		}
+	},
+	{
+		def: getStepInputsToolDef,
+		fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+			toolCallbacks.onToolCall(toolId, `Getting step ${args.id} inputs...`)
+			const parsedArgs = getStepInputsSchema.parse(args)
+			const inputs = await helpers.getStepInputs(parsedArgs.id)
+			toolCallbacks.onFinishToolCall(toolId, `Retrieved step '${parsedArgs.id}' inputs`)
+			return YAML.stringify(inputs)
+		}
+	},
+	{
+		def: setStepInputsToolDef,
+		fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+			toolCallbacks.onToolCall(toolId, `Setting step ${args.id} inputs...`)
+			const parsedArgs = setStepInputsSchema.parse(args)
+			await helpers.setStepInputs(parsedArgs.id, parsedArgs.inputs)
+			helpers.selectStep(parsedArgs.id)
+			const inputs = await helpers.getStepInputs(parsedArgs.id)
+			toolCallbacks.onFinishToolCall(toolId, `Set step '${parsedArgs.id}' inputs`)
+			return `Step '${parsedArgs.id}' inputs set. New inputs:\n${YAML.stringify(inputs)}`
+		}
+	},
+	{
+		def: setFlowInputsSchemaToolDef,
+		fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+			toolCallbacks.onToolCall(toolId, 'Setting flow inputs schema...')
+			const parsedArgs = setFlowInputsSchemaSchema.parse(args)
+			const schema = JSON.parse(parsedArgs.schema)
+			await helpers.setFlowInputsSchema(schema)
+			helpers.selectStep('Input')
+			const updatedSchema = await helpers.getFlowInputsSchema()
+			toolCallbacks.onFinishToolCall(toolId, 'Set flow inputs schema')
+			return `Flow inputs schema set. New schema:\n${JSON.stringify(updatedSchema)}`
+		}
+	},
+	{
+		def: getInstructionsForCodeGenerationToolDef,
+		fn: async ({ args, toolId, toolCallbacks }) => {
+			const parsedArgs = getInstructionsForCodeGenerationToolSchema.parse(args)
+			const langContext = getLangContext(parsedArgs.language, {
+				allowResourcesFetch: true,
+				isPreprocessor: parsedArgs.id === 'preprocessor'
+			})
+			toolCallbacks.onFinishToolCall(
+				toolId,
+				'Retrieved instructions for code generation in ' + parsedArgs.language
+			)
+			return langContext
+		}
+	},
+	{
+		def: setCodeToolDef,
+		fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+			const parsedArgs = setCodeSchema.parse(args)
+			toolCallbacks.onToolCall(toolId, `Setting code for step '${parsedArgs.id}'...`)
+			await helpers.setCode(parsedArgs.id, parsedArgs.code)
+			helpers.selectStep(parsedArgs.id)
+			toolCallbacks.onFinishToolCall(toolId, `Set code for step '${parsedArgs.id}'`)
+			return `Step code set`
+		}
+	},
+	{
+		def: setBranchPredicateToolDef,
+		fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+			const parsedArgs = setBranchPredicateSchema.parse(args)
+			await helpers.setBranchPredicate(parsedArgs.id, parsedArgs.branchIndex, parsedArgs.expression)
+			helpers.selectStep(parsedArgs.id)
+			toolCallbacks.onFinishToolCall(
+				toolId,
+				`Set predicate of branch ${parsedArgs.branchIndex + 1} of '${parsedArgs.id}'`
+			)
+			return `Branch ${parsedArgs.branchIndex} of '${parsedArgs.id}' predicate set`
+		}
+	},
+	{
+		def: addBranchToolDef,
+		fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+			const parsedArgs = addBranchSchema.parse(args)
+			await helpers.addBranch(parsedArgs.id)
+			helpers.selectStep(parsedArgs.id)
+			toolCallbacks.onFinishToolCall(toolId, `Added branch to '${parsedArgs.id}'`)
+			return `Branch added to '${parsedArgs.id}'`
+		}
+	},
+	{
+		def: removeBranchToolDef,
+		fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+			const parsedArgs = removeBranchSchema.parse(args)
+			await helpers.removeBranch(parsedArgs.id, parsedArgs.branchIndex)
+			helpers.selectStep(parsedArgs.id)
+			toolCallbacks.onFinishToolCall(
+				toolId,
+				`Removed branch ${parsedArgs.branchIndex + 1} of '${parsedArgs.id}'`
+			)
+			return `Branch ${parsedArgs.branchIndex} of '${parsedArgs.id}' removed`
+		}
+	},
+	{
+		def: setForLoopIteratorExpressionToolDef,
+		fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+			const parsedArgs = setForLoopIteratorExpressionSchema.parse(args)
+			await helpers.setForLoopIteratorExpression(parsedArgs.id, parsedArgs.expression)
+			helpers.selectStep(parsedArgs.id)
+			toolCallbacks.onFinishToolCall(toolId, `Set forloop '${parsedArgs.id}' iterator expression`)
+			return `Forloop '${parsedArgs.id}' iterator expression set`
+		}
+	},
+	{
+		def: resourceTypeToolDef,
+		fn: async ({ args, toolId, workspace, toolCallbacks }) => {
+			const parsedArgs = resourceTypeToolSchema.parse(args)
+			toolCallbacks.onToolCall(toolId, 'Searching resource types for "' + parsedArgs.query + '"...')
+			const formattedResourceTypes = await getFormattedResourceTypes(
+				parsedArgs.language,
+				parsedArgs.query,
+				workspace
+			)
+			toolCallbacks.onFinishToolCall(
+				toolId,
+				'Retrieved resource types for "' + parsedArgs.query + '"'
+			)
+			return formattedResourceTypes
+		}
+	}
+]
+
+function createToolDef(
+	zodSchema: z.ZodSchema,
+	name: string,
+	description: string
+): ChatCompletionTool {
+	const schema = zodToJsonSchema(zodSchema, {
+		name,
+		target: 'openAi'
+	})
+	let parameters = schema.definitions![name] as FunctionParameters
+	parameters = {
+		...parameters,
+		required: parameters.required ?? []
+	}
+
+	return {
+		type: 'function',
+		function: {
+			strict: true,
+			name,
+			description,
+			parameters
+		}
+	}
+}
+
+export function prepareFlowSystemMessage(): ChatCompletionSystemMessageParam {
+	const content = `You are a helpful assistant that creates and edits workflows on the Windmill platform. You're provided with a bunch of tools to help you edit the flow.
+Follow the user instructions carefully.
+Go step by step, and explain what you're doing as you're doing it.
+DO NOT wait for user confirmation before performing an action. Only do it if the user explicitly asks you to wait in their initial instructions.
+Take note of the following:
+
+## Flow editor
+
+### Script steps and inputs
+You can add a script step in different ways:
+- from a script in the workspace
+- from a script in the hub
+- a raw script: create an empty step and write the code directly
+
+When generating code for a raw script step, you should make sure it's in the correct format for Windmill. Format varies depending on the language and on the type of step (preprocessor or not). Use the get_instructions_for_code_generation tool to get instructions to help you write the code. Make sure to follow them carefully. DO NOT tell the user you're using this specific tool, just use it.
+Also, make sure to display the code to the user before setting it.
+
+Unless the user explicitly specifies how the script should be created (e.g., from the workspace, from the hub, or as a new one), whenever they ask you to add a script step, you must first check for matching scripts in the workspace and the hub. If no suitable script is found, create a raw script step and write the necessary code directly.
+
+Once you've added a new step and set the path or written the code, you should use the get_step_inputs tool to get the current/possible inputs for the step and set the step input values using the set_step_inputs tool.
+Step input keys and types are automatically inferred from the code.
+If you use flow_input in the step inputs, make sure to add the missing properties to the schema using the set_flow_inputs_schema tool.
+
+### Branchone/branchall and forloop
+You can add branchone/branchall and forloops to the flow. Make sure to set the predicates for the branches (of branchone only) and the iterator expression for the forloops.
+You can also add or remove branches. Steps can be added inside branches and forloops.
+
+### Special instructions when adding steps
+When adding a step, always consider the current sequence of steps to ensure the new step is inserted in the correct position.
+Important: Steps are executed in the order they appear in the flow definition — not in the order they were added or by the alphanumeric order of their IDs.
+
+### Flow inputs schema
+You can use the set_flow_inputs_schema tool to set the flow inputs schema.
+
+### JavaScript expressions
+For step inputs, forloop iterator expressions and branch predicates, you should use JavaScript expressions.
+Here are the variables you can use:
+- Step results are accessible as results.stepid or results.stepid.property_name. 
+- Inside loops, the iterator value is accessible as flow_input.iter.value.
+- Flow inputs are accessible as flow_input.property_name. The flow input doesn't have to exist already but make sure to add it to the schema if it doesn't.
+- If you want to use static values, set them like in javascript (e.g. "hello", true, 3, etc...).
+Note: these variables are only accessible in step inputs, forloop iterator expressions and branch predicates. They are not directly accessible in the code and should be passed as script arguments using the set_step_inputs tool.
+
+### Special modules
+- Preprocessor: Runs before the first step when triggered externally. You cannot link its inputs. It's id is 'preprocessor'
+- Error handler: Runs when the flow fails. When linking it's input, you can only refer to flow_input and error (error: { message, name, stack, step_id }). It's id is 'failure'. 
+
+Both modules only support a script or rawscript step. You cannot nest modules using foorloop/branchone/branchall.
+
+
+## Resource types
+On Windmill, credentials and configuration are stored in resources. Resource types define the format of the resource.
+If the user needs a resource as flow input, you should the property type in the schema to "object" as well as add a key called "format" and set it to "resource-nameofresourcetype" (e.g. "resource-stripe").
+If the user wants a specific resource as step input, you should set the step value to a static string in the following format: "$res:path/to/resource".
+`
+
+	return {
+		role: 'system',
+		content
+	}
+}
+
+export function prepareFlowUserMessage(
+	instructions: string,
+	flowAndSelectedId?: { flow: ExtendedOpenFlow; selectedId: string }
+): ChatCompletionUserMessageParam {
+	const flow = flowAndSelectedId?.flow
+	const selectedId = flowAndSelectedId?.selectedId
+
+	if (!flow || !selectedId) {
+		return {
+			role: 'user',
+			content: `## INSTRUCTIONS:
+${instructions}`
+		}
+	}
+	return {
+		role: 'user',
+		content: `## FLOW:
+flow_input schema:
+${JSON.stringify(flow.schema ?? emptySchema())}
+
+flow modules:
+${YAML.stringify(flow.value.modules)}
+
+preprocessor module:
+${YAML.stringify(flow.value.preprocessor_module)}
+
+failure module:
+${YAML.stringify(flow.value.failure_module)}
+
+currently selected step:
+${selectedId}
+
+## INSTRUCTIONS:
+${instructions}`
+	}
+}
diff --git a/frontend/src/lib/components/copilot/chat/flow/utils.ts b/frontend/src/lib/components/copilot/chat/flow/utils.ts
new file mode 100644
index 0000000000..762575edb9
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/flow/utils.ts
@@ -0,0 +1,82 @@
+import { dfs } from '$lib/components/flows/previousResults'
+import type { OpenFlow } from '$lib/gen'
+
+export function getIndexInNestedModules(flow: OpenFlow, id: string) {
+	const accessingModules = dfs(id, flow, true).reverse()
+
+	let parent = flow.value.modules
+	let lastIndex = -1
+	for (const [ai, am] of accessingModules.entries()) {
+		const index = parent.findIndex((m) => m.id === am.id)
+
+		if (index === -1) {
+			throw new Error(`Module not found: ${am.id} in ${parent.map((m) => m.id).join(', ')}`)
+		}
+
+		lastIndex = index
+
+		if (ai === accessingModules.length - 1) {
+			break
+		}
+
+		if (
+			parent[index].value.type === 'forloopflow' ||
+			parent[index].value.type === 'whileloopflow'
+		) {
+			parent = parent[index].value.modules
+		} else if (
+			parent[index].value.type === 'branchall' ||
+			parent[index].value.type === 'branchone'
+		) {
+			const branchIdx = parent[index].value.branches.findIndex((b) =>
+				b.modules.some((m) => m.id === accessingModules[ai + 1].id)
+			)
+			if (branchIdx === -1) {
+				throw new Error(
+					`Branch not found: ${am.id} in ${parent[index].value.branches.map((b) => b.modules.map((m) => m.id).join(', ')).join(';')}`
+				)
+			}
+			parent = parent[index].value.branches[branchIdx].modules
+		} else {
+			throw new Error('Module is not a for loop or branch')
+		}
+	}
+
+	if (lastIndex === -1) {
+		throw new Error('Module not found, should have been caught earlier')
+	}
+
+	return {
+		index: lastIndex,
+		modules: parent
+	}
+}
+export function getNestedModules(flow: OpenFlow, id: string, branchIndex?: number) {
+	const { index, modules } = getIndexInNestedModules(flow, id)
+
+	// we know index is correct because we've already checked it in getIndexInNestedModules
+	const module = modules[index]
+
+	if (module.value.type === 'forloopflow' || module.value.type === 'whileloopflow') {
+		return module.value.modules
+	} else if (
+		branchIndex !== undefined &&
+		(module.value.type === 'branchall' || module.value.type === 'branchone')
+	) {
+		if (module.value.type === 'branchone' && branchIndex === -1) {
+			return module.value.default
+		}
+
+		const branch = module.value.branches[branchIndex]
+
+		if (!branch) {
+			throw new Error(
+				`Branch not found: ${id} in ${module.value.branches.map((b) => b.modules.map((m) => m.id).join(', ')).join(';')}`
+			)
+		}
+
+		return branch.modules
+	} else {
+		throw new Error('Module is not a loop or branch')
+	}
+}
diff --git a/frontend/src/lib/components/copilot/chat/monaco-adapter.ts b/frontend/src/lib/components/copilot/chat/monaco-adapter.ts
index a8168fdba2..300fe88696 100644
--- a/frontend/src/lib/components/copilot/chat/monaco-adapter.ts
+++ b/frontend/src/lib/components/copilot/chat/monaco-adapter.ts
@@ -8,6 +8,7 @@ import {
 	type VisualChange
 } from '../shared'
 import { writable, type Writable } from 'svelte/store'
+import { aiChatManager } from './AIChatManager.svelte'
 
 type ExcludeVariant<T, K extends keyof T, V> = T extends Record<K, V> ? never : T
 type VisualChangeWithDiffIndex = ExcludeVariant<VisualChange, 'type', 'added_inline'> & {
@@ -22,7 +23,6 @@ export class AIChatEditorHandler {
 
 	reviewingChanges: Writable<boolean> = writable(false)
 	groupChanges: { changes: VisualChangeWithDiffIndex[]; groupIndex: number }[] = []
-	pendingNewCode: string | undefined = undefined
 
 	constructor(editor: meditor.IStandaloneCodeEditor) {
 		this.editor = editor
@@ -30,7 +30,7 @@ export class AIChatEditorHandler {
 
 	clear() {
 		this.groupChanges = []
-		this.pendingNewCode = undefined
+		aiChatManager.pendingNewCode = undefined
 		for (const collection of this.decorationsCollections) {
 			collection.clear()
 		}
@@ -168,12 +168,13 @@ export class AIChatEditorHandler {
 	}
 
 	async reviewAndApply(newCode: string) {
-		if (this.pendingNewCode === newCode) {
+		if (aiChatManager.pendingNewCode === newCode) {
+			this.acceptAll()
 			return
-		} else if (this.pendingNewCode) {
+		} else if (aiChatManager.pendingNewCode) {
 			this.clear()
 		}
-		this.pendingNewCode = newCode
+		aiChatManager.pendingNewCode = newCode
 		const changedLines = await this.calculateVisualChanges(newCode)
 		if (changedLines.length === 0) return
 
diff --git a/frontend/src/lib/components/copilot/chat/navigator/core.ts b/frontend/src/lib/components/copilot/chat/navigator/core.ts
new file mode 100644
index 0000000000..e438d13501
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/navigator/core.ts
@@ -0,0 +1,298 @@
+import { page } from '$app/state'
+import type {
+	ChatCompletionSystemMessageParam,
+	ChatCompletionTool,
+	ChatCompletionUserMessageParam
+} from 'openai/resources/index.mjs'
+import type { Tool } from '../shared'
+import { aiChatManager } from '../AIChatManager.svelte'
+
+export const CHAT_SYSTEM_PROMPT = `
+You are Windmill's intelligent assistant, designed to help users navigate the application and answer questions about its functionality. It is your only purpose to help the user in the context of the windmill application.
+Windmill is an open-source developer platform for building internal tools, API integrations, background jobs, workflows, and user interfaces. It offers a unified system where scripts are automatically turned into sharable UIs and can be composed into flows or embedded in custom applications.
+
+You have access to these tools:
+1. View current buttons and inputs on the page (get_triggerable_components)
+2. Execute buttons and inputs (trigger_component) 
+3. Get documentation for user requests (get_documentation)
+
+INSTRUCTIONS:
+- When users ask about application features or concepts, first use get_documentation internally to retrieve accurate information about how to fulfill the user's request.
+- Then immediately use the available tools to guide the user through the application. Do not wait for the user's confirmation before taking action.
+- If you detect a confirmation modal that needs user confirmation, stop the navigation and let the user know that the action is pending confirmation.
+- Use get_triggerable_components to understand available options, and then trigger the components using trigger_component. Then wait a moment before rescanning the current page, and then continue with the next step. Do this 5 times max.
+- Make sure you navigated as far as possible before responding to the user. Always use get_triggerable_components one last time to make sure you didn't miss anything.
+- If you are not able to fulfill the user's request after 5 attempts, redirect the user to the documentation.
+
+GENERAL PRINCIPLES:
+- Be concise but thorough
+- Focus on taking action and completing the user's goals
+- Maintain a friendly, professional tone
+- If you encounter an error or can't complete a request, explain why and suggest alternatives
+- When asked about a specific script, flow or app, first check components directly related to the mentioned entity, before checking the other components.
+- When you do not find what you are looking for on the current page, go to the home page by looking for the "Home" component, then scan the components again.
+
+IMPORTANT CONSIDERATIONS:
+- If you navigate to a script creation page, consider this:
+  - The page opens with the settings drawer open. After doing the changes mentioned by the user, close the settings drawer.
+  - Then if the user has described what he wanted the script to do, switch to script mode with the change_mode tool, and use the new tools you'll have access to to edit the script.
+- If you navigate to a flow creation page, consider this:
+  - If the user has described what he wanted the flow to do, switch to flow mode with the change_mode tool before using the new tools you'll have access to to edit the flow.
+
+Always use the provided tools purposefully and appropriately to achieve the user's goals.
+Your actions only allow you to navigate the application through the provided tools.
+When you complete the user's request, do not say "I created..." or "I updated..." or "I deleted...", but rather complete your response with precisions about how it works based on the documentation. Also drop a link to the relevant documentation if possible.
+
+Example of good behavior:
+- User: "How can I set my AI providers?"
+- You: <call get_documentation and fetch relevant documentation>
+- You: <call get_triggerable_components to find relevant components>
+- You: <trigger the components>
+- You: "<precisions about the request based on the documentation>"
+`
+
+const GET_DOCUMENTATION_TOOL: ChatCompletionTool = {
+	type: 'function',
+	function: {
+		name: 'get_documentation',
+		description: 'Get the documentation for the user request',
+		parameters: {
+			type: 'object',
+			properties: {
+				request: {
+					type: 'string',
+					description: 'The user request'
+				}
+			},
+			required: ['request']
+		}
+	}
+}
+
+// Tool definitions
+const GET_TRIGGERABLE_COMPONENTS_TOOL: ChatCompletionTool = {
+	type: 'function',
+	function: {
+		name: 'get_triggerable_components',
+		description: 'Get the current triggerable components on the page',
+		parameters: {
+			type: 'object',
+			properties: {},
+			required: []
+		}
+	}
+}
+
+const EXECUTE_COMMAND_TOOL: ChatCompletionTool = {
+	type: 'function',
+	function: {
+		name: 'trigger_component',
+		description: 'Trigger a triggerable component',
+		parameters: {
+			type: 'object',
+			properties: {
+				id: {
+					type: 'string',
+					description: 'ID of the AI-triggerable component'
+				},
+				value: {
+					type: 'string',
+					description: 'Value to pass to the AI-triggerable component trigger function'
+				},
+				description: {
+					type: 'string',
+					description: 'Description of the component'
+				}
+			},
+			required: ['id', 'description']
+		}
+	}
+}
+
+const GET_CURRENT_PAGE_NAME_TOOL: ChatCompletionTool = {
+	type: 'function',
+	function: {
+		name: 'get_current_page_name',
+		description: 'Get the name of the current page the user is on.',
+		parameters: {
+			type: 'object',
+			properties: {},
+			required: []
+		}
+	}
+}
+
+function getTriggerableComponents(): string {
+	try {
+		// Get components registered in the triggerablesByAI store
+		const registeredComponents = aiChatManager.triggerablesByAI
+		let result = 'TRIGGERABLE_COMPONENTS:\n'
+
+		// If there are no components registered, return a message
+		if (Object.keys(registeredComponents).length === 0) {
+			return 'No AI-triggerable components are currently available on this page.\n'
+		}
+
+		// List each registered component with its ID and description
+		Object.entries(registeredComponents).forEach(([id, component], index) => {
+			result += `[${index}] ID: "${id}" - Description: ${component.description} - Triggerable: ${component.onTrigger ? 'Yes' : 'No'}\n`
+		})
+
+		return result
+	} catch (error) {
+		console.error('Error getting triggerable components:', error)
+		return 'Error getting triggerable components: ' + error.message
+	}
+}
+
+// Function to get the current page name
+function getCurrentPageName(): string {
+	try {
+		const currentPage = page.url.pathname
+		switch (currentPage) {
+			case '/':
+				return 'Home Page'
+			case '/flows/add':
+				return 'Flow creation page'
+			case '/scripts/add':
+				return 'Script creation page'
+			case '/apps/add':
+				return 'App creation page'
+			default:
+				return 'Non-specific page'
+		}
+	} catch (error) {
+		console.error('Error getting current page name:', error)
+		return 'Error getting current page name: ' + error.message
+	}
+}
+
+// Function to execute commands on the page
+function triggerComponent(args: { id: string; value: string }): string {
+	const { id, value } = args
+
+	try {
+		// Handle triggering AI components
+		if (!id) {
+			return 'Trigger command requires an id parameter'
+		}
+
+		const component = aiChatManager.triggerablesByAI[id]
+
+		if (!component) {
+			return `No triggerable component found with id: ${id}`
+		}
+
+		if (component.onTrigger) {
+			component.onTrigger(value)
+			return `Successfully triggered component: ${id} (${component.description})`
+		} else {
+			return `Component ${id} has no trigger handler defined`
+		}
+	} catch (error) {
+		console.error('Error executing command:', error)
+		return `Error executing command: ${error.message}`
+	}
+}
+
+async function getDocumentation(args: { request: string }): Promise<string> {
+	const retrieval = await fetch('/api/inkeep', {
+		method: 'POST',
+		headers: {
+			'Content-Type': 'application/json'
+		},
+		body: JSON.stringify({
+			model: 'inkeep-rag',
+			messages: [{ role: 'user', content: args.request }],
+			response_format: {
+				type: 'json_object'
+			}
+		})
+	})
+	const data = await retrieval.json()
+	if (!data.choices?.[0]?.message?.content) {
+		return 'No documentation found for this request'
+	}
+
+	// Parse the raw response
+	const raw = data.choices[0].message.content
+	const parsed = JSON.parse(raw)
+
+	// Clean up the response to include only essential information
+	if (parsed.content && Array.isArray(parsed.content)) {
+		const cleanedContent = parsed.content.map((item: any) => ({
+			title: item.title,
+			url: item.url,
+			content: item.source?.content.map((c: any) => c.text).join('\n') || []
+		}))
+		// Limit the response to 30000 characters max
+		const stringified = JSON.stringify({ content: cleanedContent }).slice(0, 30000)
+
+		return stringified
+	}
+
+	return data.choices[0].message.content
+}
+
+const triggerComponentTool: Tool<{}> = {
+	def: EXECUTE_COMMAND_TOOL,
+	fn: async ({ args, toolId, toolCallbacks }) => {
+		toolCallbacks.onToolCall(toolId, 'Clicking on component...')
+		const result = triggerComponent(args)
+		toolCallbacks.onFinishToolCall(
+			toolId,
+			'Clicked ' + args.description.charAt(0).toLowerCase() + args.description.slice(1)
+		)
+		return result
+	}
+}
+
+const getTriggerableComponentsTool: Tool<{}> = {
+	def: GET_TRIGGERABLE_COMPONENTS_TOOL,
+	fn: async ({ toolId, toolCallbacks }) => {
+		toolCallbacks.onToolCall(toolId, 'Looking for screen components...')
+		const components = getTriggerableComponents()
+		toolCallbacks.onFinishToolCall(toolId, 'Retrieved screen components')
+		return components
+	}
+}
+
+const getCurrentPageNameTool: Tool<{}> = {
+	def: GET_CURRENT_PAGE_NAME_TOOL,
+	fn: async ({ toolId, toolCallbacks }) => {
+		const pageName = getCurrentPageName()
+		toolCallbacks.onFinishToolCall(toolId, 'Retrieved current page name')
+		return pageName
+	}
+}
+
+export const getDocumentationTool: Tool<{}> = {
+	def: GET_DOCUMENTATION_TOOL,
+	fn: async ({ args, toolId, toolCallbacks }) => {
+		toolCallbacks.onToolCall(toolId, 'Getting documentation...')
+		const docResult = await getDocumentation(args)
+		toolCallbacks.onFinishToolCall(toolId, 'Retrieved documentation')
+		return docResult
+	}
+}
+
+export const navigatorTools: Tool<{}>[] = [
+	getTriggerableComponentsTool,
+	triggerComponentTool,
+	getDocumentationTool,
+	getCurrentPageNameTool
+]
+
+export function prepareNavigatorSystemMessage(): ChatCompletionSystemMessageParam {
+	return {
+		role: 'system',
+		content: CHAT_SYSTEM_PROMPT
+	}
+}
+
+export function prepareNavigatorUserMessage(instructions: string): ChatCompletionUserMessageParam {
+	return {
+		role: 'user',
+		content: instructions
+	}
+}
diff --git a/frontend/src/lib/components/copilot/chat/CodeDisplay.svelte b/frontend/src/lib/components/copilot/chat/script/CodeDisplay.svelte
similarity index 84%
rename from frontend/src/lib/components/copilot/chat/CodeDisplay.svelte
rename to frontend/src/lib/components/copilot/chat/script/CodeDisplay.svelte
index d56e6d6ba8..5b11fcaef5 100644
--- a/frontend/src/lib/components/copilot/chat/CodeDisplay.svelte
+++ b/frontend/src/lib/components/copilot/chat/script/CodeDisplay.svelte
@@ -5,7 +5,8 @@
 	import { getContext, untrack } from 'svelte'
 	import { Loader2 } from 'lucide-svelte'
 	import { initializeVscode } from '$lib/components/vscode'
-	import type { AIChatContext, ContextElement, DisplayMessage } from './core'
+	import type { DisplayMessage } from '../shared'
+	import type { ContextElement } from '../context'
 	import HighlightCode from '$lib/components/HighlightCode.svelte'
 	import {
 		csharp,
@@ -21,21 +22,17 @@
 		yaml
 	} from 'svelte-highlight/languages'
 	import { scriptLangToEditorLang } from '$lib/scripts'
+	import { aiChatManager } from '../AIChatManager.svelte'
 
 	const astNode = getAstNode()
 
-	const {
-		loading: loadingContext,
-		currentReply,
-		applyCode
-	} = getContext<AIChatContext>('AIChatContext')
-
 	const { message } = getContext<{ message: DisplayMessage }>('AssistantMessageContext')
 
 	let codeContext = $derived(
-		message.contextElements?.find((e) => e.type === 'code') as
-			| Extract<ContextElement, { type: 'code' }>
-			| undefined
+		message.role === 'assistant' &&
+			(message.contextElements?.find((e) => e.type === 'code') as
+				| Extract<ContextElement, { type: 'code' }>
+				| undefined)
 	)
 
 	function getSmartLang(lang: string) {
@@ -104,8 +101,11 @@
 	let loading = $state(true)
 	$effect(() => {
 		// we only want to trigger when astNode offset is updated not currentReply, otherwise as there is some delay on the offset update, loading would be set to false too early
-		const completeReply = untrack(() => $currentReply)
-		if (!$loadingContext || completeReply.length > (astNode.current.position?.end.offset ?? 0)) {
+		const completeReply = untrack(() => aiChatManager.currentReply)
+		if (
+			!aiChatManager.loading ||
+			completeReply.length > (astNode.current.position?.end.offset ?? 0)
+		) {
 			loading = false
 		}
 	})
@@ -180,16 +180,16 @@
 </script>
 
 <div class="flex flex-col gap-0.5 rounded-lg relative not-prose">
-	{#if codeContext}
+	{#if aiChatManager.canApplyCode && code !== aiChatManager.scriptEditorOptions?.code}
 		<div class="flex justify-end items-end">
 			<Button
 				color="dark"
 				size="xs2"
 				on:click={() => {
-					applyCode(code ?? '')
+					aiChatManager.scriptEditorApplyCode?.(code ?? '')
 				}}
 			>
-				Apply
+				{aiChatManager.pendingNewCode ? 'Accept all' : 'Apply'}
 			</Button>
 		</div>
 	{/if}
@@ -197,17 +197,17 @@
 	<div
 		class="relative w-full border border-gray-300 dark:border-gray-600 rounded-lg overflow-hidden"
 	>
-		{#if (loading && !code) || !language}
+		{#if aiChatManager.mode !== 'navigator' && ((loading && !code) || !language)}
 			<div class="flex flex-row gap-1 p-2 items-center justify-center">
 				<Loader2 class="w-4 h-4 animate-spin" /> Generating code...
 			</div>
-		{:else if !loading && codeContext && getSmartLang(codeContext.lang) === getSmartLang(language)}
+		{:else if !loading && codeContext && getSmartLang(codeContext.lang) === getSmartLang(language as string)}
 			<div bind:this={diffEl} class="w-full h-full"></div>
 		{:else}
 			<HighlightCode
 				class="p-1"
 				code={code ?? ''}
-				highlightLanguage={SMART_LANG_TO_HIGHLIGHT_LANG[getSmartLang(language)]}
+				highlightLanguage={SMART_LANG_TO_HIGHLIGHT_LANG[getSmartLang(language as string)]}
 				language={undefined}
 			/>
 		{/if}
diff --git a/frontend/src/lib/components/copilot/chat/core.ts b/frontend/src/lib/components/copilot/chat/script/core.ts
similarity index 66%
rename from frontend/src/lib/components/copilot/chat/core.ts
rename to frontend/src/lib/components/copilot/chat/script/core.ts
index c1a1023904..d26210f7c7 100644
--- a/frontend/src/lib/components/copilot/chat/core.ts
+++ b/frontend/src/lib/components/copilot/chat/script/core.ts
@@ -1,20 +1,19 @@
 import { ResourceService } from '$lib/gen/services.gen'
 import type { ResourceType, ScriptLang } from '$lib/gen/types.gen'
 import { capitalize, isObject, toCamel } from '$lib/utils'
-import { get, type Writable } from 'svelte/store'
-import { getCompletion } from '../lib'
-import { compile, phpCompile, pythonCompile } from '../utils'
-import { Code, Database, TriangleAlert, Diff } from 'lucide-svelte'
+import { get } from 'svelte/store'
+import { compile, phpCompile, pythonCompile } from '../../utils'
 import type {
-	ChatCompletionChunk,
-	ChatCompletionMessageParam,
-	ChatCompletionMessageToolCall,
-	ChatCompletionTool
+	ChatCompletionSystemMessageParam,
+	ChatCompletionTool,
+	ChatCompletionUserMessageParam
 } from 'openai/resources/index.mjs'
-import { workspaceStore, type DBSchema, dbSchemas } from '$lib/stores'
+import { type DBSchema, dbSchemas } from '$lib/stores'
 import { scriptLangToEditorLang } from '$lib/scripts'
 import { getDbSchemas } from '$lib/components/apps/components/display/dbtable/utils'
-import { type Change } from 'diff'
+import type { CodePieceElement, ContextElement } from '../context'
+import type { Tool } from '../shared'
+import { PYTHON_PREPROCESSOR_MODULE_CODE, TS_PREPROCESSOR_MODULE_CODE } from '$lib/script_helpers'
 
 export function formatResourceTypes(
 	allResourceTypes: ResourceType[],
@@ -58,9 +57,9 @@ async function getResourceTypes(prompt: string, workspace: string) {
 
 const TS_RESOURCE_TYPE_SYSTEM = `On Windmill, credentials and configuration are stored in resources and passed as parameters to main.
 If you need credentials, you should add a parameter to \`main\` with the corresponding resource type inside the \`RT\` namespace: for instance \`RT.Stripe\`.
-You should only use them if you need them to satisfy the user's instructions. Always use the RT namespace.`
+You should only use them if you need them to satisfy the user's instructions. Always use the RT namespace.\n`
 
-const TS_INLINE_TYPE_INSTRUCTION = `You must always inline the objects types instead of defining them separately. If INSTRUCTIONS ask you to use an already defined type, you MUST inline it instead of using the type name. Explain to the user that you are inlining the type for better arguments inference.`
+const TS_INLINE_TYPE_INSTRUCTION = `When using resource types, you should use RT.ResourceType as parameter type. For other parameters, you should inline the objects types instead of defining them separately. This is because Windmill requires the types (other than resource types) to be inlined to generate a user friendly UI from the parameters.`
 
 const PYTHON_RESOURCE_TYPE_SYSTEM = `On Windmill, credentials and configuration are stored in resources and passed as parameters to main.
 If you need credentials, you should add a parameter to \`main\` with the corresponding resource type.
@@ -75,6 +74,24 @@ You need to **redefine** the type of the resources that are needed before the ma
 Before defining each type, check if the class already exists using class_exists.
 The resource type name has to be exactly as specified.`
 
+const PREPROCESSOR_INSTRUCTION_BASE = `The current script is a preprocessor. It processes raw trigger data from various sources (webhook, custom HTTP route, SQS, WebSocket, Kafka, NATS, MQTT, Postgres, or email) before passing it to the flow. This separates the trigger logic from the flow logic and keeps the auto-generated UI clean.
+The returned object determines the parameter values passed to the flow.
+e.g., \`{ b: 1, a: 2 }\` → Calls the flow with \`a = 2\` and \`b = 1\`, assuming the flow has two inputs called \`a\` and \`b\`.
+The preprocessor receives a single parameter called event.
+Here's a sample script which includes the event object definition:\n`
+
+const TS_PREPROCESSOR_INSTRUCTION =
+	PREPROCESSOR_INSTRUCTION_BASE +
+	`\`\`\`typescript
+${TS_PREPROCESSOR_MODULE_CODE}
+\`\`\`\n`
+
+const PYTHON_PREPROCESSOR_INSTRUCTION =
+	PREPROCESSOR_INSTRUCTION_BASE +
+	`\`\`\`python
+${PYTHON_PREPROCESSOR_MODULE_CODE}
+\`\`\``
+
 export const SUPPORTED_CHAT_SCRIPT_LANGUAGES = [
 	'bunnative',
 	'nativets',
@@ -96,43 +113,52 @@ export const SUPPORTED_CHAT_SCRIPT_LANGUAGES = [
 
 export function getLangContext(
 	lang: ScriptLang | 'bunnative' | 'jsx' | 'tsx' | 'json',
-	{ allowResourcesFetch = false }: { allowResourcesFetch?: boolean } = {}
+	{
+		allowResourcesFetch = false,
+		isPreprocessor = false
+	}: { allowResourcesFetch?: boolean; isPreprocessor?: boolean; isFailure?: boolean } = {}
 ) {
 	const tsContext =
-		TS_RESOURCE_TYPE_SYSTEM +
-		(allowResourcesFetch
-			? `\nTo query the RT namespace, you can use the \`search_resource_types\` function.\n`
-			: '') +
-		TS_INLINE_TYPE_INSTRUCTION
+		(isPreprocessor
+			? TS_PREPROCESSOR_INSTRUCTION
+			: TS_RESOURCE_TYPE_SYSTEM +
+				(allowResourcesFetch
+					? `To query the RT namespace, you can use the \`search_resource_types\` tool.\n`
+					: '')) + TS_INLINE_TYPE_INSTRUCTION
+
+	const mainFunctionName = isPreprocessor ? 'preprocessor' : 'main'
+
 	switch (lang) {
 		case 'bunnative':
 		case 'nativets':
 			return (
-				'The user is coding in TypeScript. On Windmill, it is expected that the script exports a single **async** function called `main`. You should use fetch (available globally, no need to import) and are not allowed to import any libraries.\n' +
+				`The user is coding in TypeScript. On Windmill, it is expected that the script exports a single **async** function called \`${mainFunctionName}\`. You should use fetch (available globally, no need to import) and are not allowed to import any libraries.\n` +
 				tsContext
 			)
 		case 'bun':
 			return (
-				'The user is coding in TypeScript (bun runtime). On Windmill, it is expected that the script exports a single **async** function called `main`. Do not call the main function. Libraries are installed automatically, do not show how to install them.\n' +
+				`The user is coding in TypeScript (bun runtime). On Windmill, it is expected that the script exports a single **async** function called \`${mainFunctionName}\`. Do not call the ${mainFunctionName} function. Libraries are installed automatically, do not show how to install them.\n` +
 				tsContext
 			)
 		case 'deno':
 			return (
-				'The user is coding in TypeScript (deno runtime). On Windmill, it is expected that the script exports a single **async** function called `main`. Do not call the main function. Libraries are installed automatically, do not show how to install them.\n' +
+				`The user is coding in TypeScript (deno runtime). On Windmill, it is expected that the script exports a single **async** function called \`${mainFunctionName}\`. Do not call the ${mainFunctionName} function. Libraries are installed automatically, do not show how to install them.\n` +
 				tsContext +
 				'\nYou can import deno libraries or you can import npm libraries like that: `import ... from "npm:{package}";`.'
 			)
 		case 'python3':
 			return (
-				'The user is coding in Python. On Windmill, it is expected the script contains at least one function called `main`. Do not call the main function. Libraries are installed automatically, do not show how to install them.' +
-				PYTHON_RESOURCE_TYPE_SYSTEM +
-				`${allowResourcesFetch ? `\nTo query the available resource types, you can use the \`search_resource_types\` function.` : ''}`
+				`The user is coding in Python. On Windmill, it is expected the script contains at least one function called \`${mainFunctionName}\`. Do not call the ${mainFunctionName} function. Libraries are installed automatically, do not show how to install them.` +
+				(isPreprocessor
+					? PYTHON_PREPROCESSOR_INSTRUCTION
+					: PYTHON_RESOURCE_TYPE_SYSTEM +
+						`${allowResourcesFetch ? `\nTo query the available resource types, you can use the \`search_resource_types\` tool.` : ''}`)
 			)
 		case 'php':
 			return (
 				'The user is coding in PHP. On Windmill, it is expected the script contains at least one function called `main`. The script must start with <?php.' +
 				PHP_RESOURCE_TYPE_SYSTEM +
-				`${allowResourcesFetch ? `\nTo query the available resource types, you can use the \`search_resource_types\` function.` : ''}` +
+				`${allowResourcesFetch ? `\nTo query the available resource types, you can use the \`search_resource_types\` tool.` : ''}` +
 				`\nIf you need to import libraries, you need to specify them as comments in the following manner before the main function:
 \`\`\`
 // require:
@@ -257,68 +283,13 @@ WINDMILL LANGUAGE CONTEXT:
 
 export const CHAT_USER_DB_CONTEXT = `- {title}: SCHEMA: \n{schema}\n`
 
-export function prepareSystemMessage(): {
-	role: 'system'
-	content: string
-} {
+export function prepareScriptSystemMessage(): ChatCompletionSystemMessageParam {
 	return {
 		role: 'system',
 		content: CHAT_SYSTEM_PROMPT
 	}
 }
 
-export interface DisplayMessage {
-	role: 'user' | 'assistant'
-	content: string
-	contextElements?: ContextElement[]
-}
-
-export const ContextIconMap = {
-	code: Code,
-	error: TriangleAlert,
-	db: Database,
-	diff: Diff,
-	code_piece: Code
-}
-
-type CodeElement = {
-	type: 'code'
-	content: string
-	title: string
-	lang: ScriptLang | 'bunnative'
-}
-
-type ErrorElement = {
-	type: 'error'
-	content: string
-	title: 'error'
-}
-
-type DBElement = {
-	type: 'db'
-	schema?: DBSchema
-	title: string
-}
-
-type DiffElement = {
-	type: 'diff'
-	content: string
-	title: string
-	diff: Change[]
-	lang: ScriptLang | 'bunnative'
-}
-
-type CodePieceElement = {
-	type: 'code_piece'
-	content: string
-	startLine: number
-	endLine: number
-	title: string
-	lang: ScriptLang | 'bunnative'
-}
-
-export type ContextElement = CodeElement | ErrorElement | DBElement | DiffElement | CodePieceElement
-
 const applyCodePieceToCodeContext = (codePieces: CodePieceElement[], codeContext: string) => {
 	let code = codeContext.split('\n')
 	let shiftOffset = 0
@@ -331,11 +302,28 @@ const applyCodePieceToCodeContext = (codePieces: CodePieceElement[], codeContext
 	return code.join('\n')
 }
 
-export async function prepareUserMessage(
+export function prepareScriptTools(
+	language: ScriptLang | 'bunnative',
+	context: ContextElement[]
+): Tool<ScriptChatHelpers>[] {
+	const tools: Tool<ScriptChatHelpers>[] = []
+	if (['python3', 'php', 'bun', 'deno', 'nativets', 'bunnative'].includes(language)) {
+		tools.push(resourceTypeTool)
+	}
+	if (context.some((c) => c.type === 'db')) {
+		tools.push(dbSchemaTool)
+	}
+	return tools
+}
+
+export async function prepareScriptUserMessage(
 	instructions: string,
 	language: ScriptLang | 'bunnative',
-	selectedContext: ContextElement[]
-) {
+	selectedContext: ContextElement[],
+	options: {
+		isPreprocessor?: boolean
+	} = {}
+): Promise<ChatCompletionUserMessageParam> {
 	let codeContext = 'CODE:\n'
 	let errorContext = 'ERROR:\n'
 	let dbContext = 'DATABASES:\n'
@@ -377,7 +365,7 @@ export async function prepareUserMessage(
 
 	let userMessage = CHAT_USER_PROMPT.replace('{instructions}', instructions).replace(
 		'{lang_context}',
-		getLangContext(language, { allowResourcesFetch: true })
+		getLangContext(language, { allowResourcesFetch: true, ...options })
 	)
 	if (hasCode) {
 		userMessage += codeContext
@@ -391,7 +379,10 @@ export async function prepareUserMessage(
 	if (hasDiff) {
 		userMessage += diffContext
 	}
-	return userMessage
+	return {
+		role: 'user',
+		content: userMessage
+	}
 }
 
 const RESOURCE_TYPE_FUNCTION_DEF: ChatCompletionTool = {
@@ -450,156 +441,53 @@ async function formatDBSchema(dbSchema: DBSchema) {
 	}
 }
 
-async function callTool(
-	functionName: string,
-	args: any,
-	lang: ScriptLang | 'bunnative',
-	workspace: string
-) {
-	switch (functionName) {
-		case 'search_resource_types':
-			const formattedResourceTypes = await getFormattedResourceTypes(lang, args.query, workspace)
-			return formattedResourceTypes
-		case 'get_db_schema':
-			if (!args.resourcePath) {
-				throw new Error('Database path not provided')
-			}
-			const resource = await ResourceService.getResource({
-				workspace: workspace,
-				path: args.resourcePath
-			})
-			const newDbSchemas = {}
-			await getDbSchemas(
-				resource.resource_type,
-				args.resourcePath,
-				workspace,
-				newDbSchemas,
-				(error) => {
-					console.error(error)
-				}
-			)
-			dbSchemas.update((schemas) => ({ ...schemas, ...newDbSchemas }))
-			const dbs = get(dbSchemas)
-			const db = dbs[args.resourcePath]
-			if (!db) {
-				throw new Error('Database not found')
-			}
-			const stringSchema = await formatDBSchema(db)
-			return stringSchema
-		default:
-			throw new Error(`Unknown tool call: ${functionName}`)
+export interface ScriptChatHelpers {
+	getLang: () => ScriptLang | 'bunnative'
+}
+
+export const resourceTypeTool: Tool<ScriptChatHelpers> = {
+	def: RESOURCE_TYPE_FUNCTION_DEF,
+	fn: async ({ args, workspace, helpers, toolCallbacks, toolId }) => {
+		toolCallbacks.onToolCall(toolId, 'Searching resource types for "' + args.query + '"...')
+		const formattedResourceTypes = await getFormattedResourceTypes(
+			helpers.getLang(),
+			args.query,
+			workspace
+		)
+		toolCallbacks.onFinishToolCall(toolId, 'Retrieved resource types for "' + args.query + '"')
+		return formattedResourceTypes
 	}
 }
 
-async function processToolCall(
-	toolCall: ChatCompletionMessageToolCall,
-	messages: ChatCompletionMessageParam[],
-	lang: ScriptLang | 'bunnative'
-) {
-	try {
-		const args = JSON.parse(toolCall.function.arguments)
-		let result = ''
-		try {
-			result = await callTool(toolCall.function.name, args, lang, get(workspaceStore) ?? '')
-		} catch (err) {
-			console.error(err)
-			result =
-				'Error while calling tool, MUST tell the user to check the browser console for more details, and then respond as much as possible to the original request'
+export const dbSchemaTool: Tool<ScriptChatHelpers> = {
+	def: DB_SCHEMA_FUNCTION_DEF,
+	fn: async ({ args, workspace, toolCallbacks, toolId }) => {
+		if (!args.resourcePath) {
+			throw new Error('Database path not provided')
 		}
-		messages.push({
-			role: 'tool',
-			tool_call_id: toolCall.id,
-			content: result
+		toolCallbacks.onToolCall(toolId, 'Getting database schema for ' + args.resourcePath + '...')
+		const resource = await ResourceService.getResource({
+			workspace: workspace,
+			path: args.resourcePath
 		})
-	} catch (err) {
-		console.error(err)
-	}
-}
-
-export async function chatRequest(
-	messages: ChatCompletionMessageParam[],
-	abortController: AbortController,
-	lang: ScriptLang | 'bunnative',
-	useDbTools: boolean,
-	onNewToken: (token: string) => void
-) {
-	const toolDefs: ChatCompletionTool[] = []
-	if (
-		lang === 'python3' ||
-		lang === 'php' ||
-		lang === 'bun' ||
-		lang === 'deno' ||
-		lang === 'nativets' ||
-		lang === 'bunnative'
-	) {
-		toolDefs.push(RESOURCE_TYPE_FUNCTION_DEF)
-	}
-	if (useDbTools) {
-		toolDefs.push(DB_SCHEMA_FUNCTION_DEF)
-	}
-	try {
-		let completion: any = null
-		while (true) {
-			completion = await getCompletion(messages, abortController, toolDefs)
-
-			if (completion) {
-				const finalToolCalls: Record<number, ChatCompletionChunk.Choice.Delta.ToolCall> = {}
-
-				for await (const chunk of completion) {
-					if (!('choices' in chunk && chunk.choices.length > 0 && 'delta' in chunk.choices[0])) {
-						continue
-					}
-					const c = chunk as ChatCompletionChunk
-					const delta = c.choices[0].delta.content
-					if (delta) {
-						onNewToken(delta)
-					}
-					const toolCalls = c.choices[0].delta.tool_calls || []
-					for (const toolCall of toolCalls) {
-						const { index } = toolCall
-						const finalToolCall = finalToolCalls[index]
-						if (!finalToolCall) {
-							finalToolCalls[index] = toolCall
-						} else {
-							if (toolCall.function?.arguments) {
-								if (!finalToolCall.function) {
-									finalToolCall.function = toolCall.function
-								} else {
-									finalToolCall.function.arguments =
-										(finalToolCall.function.arguments ?? '') + toolCall.function.arguments
-								}
-							}
-						}
-					}
-				}
-
-				const toolCalls = Object.values(finalToolCalls).filter(
-					(toolCall) => toolCall.id !== undefined && toolCall.function?.arguments !== undefined
-				) as ChatCompletionMessageToolCall[]
-
-				if (toolCalls.length > 0) {
-					messages.push({
-						role: 'assistant',
-						tool_calls: toolCalls
-					})
-					for (const toolCall of toolCalls) {
-						await processToolCall(toolCall, messages, lang)
-					}
-				} else {
-					break
-				}
+		const newDbSchemas = {}
+		await getDbSchemas(
+			resource.resource_type,
+			args.resourcePath,
+			workspace,
+			newDbSchemas,
+			(error) => {
+				console.error(error)
 			}
+		)
+		dbSchemas.update((schemas) => ({ ...schemas, ...newDbSchemas }))
+		const dbs = get(dbSchemas)
+		const db = dbs[args.resourcePath]
+		if (!db) {
+			throw new Error('Database not found')
 		}
-		return completion
-	} catch (err) {
-		if (!abortController.signal.aborted) {
-			throw err
-		}
+		const stringSchema = await formatDBSchema(db)
+		toolCallbacks.onFinishToolCall(toolId, 'Retrieved database schema for ' + args.resourcePath)
+		return stringSchema
 	}
 }
-
-export interface AIChatContext {
-	loading: Writable<boolean>
-	currentReply: Writable<string>
-	applyCode: (code: string) => void
-}
diff --git a/frontend/src/lib/components/copilot/chat/shared.ts b/frontend/src/lib/components/copilot/chat/shared.ts
new file mode 100644
index 0000000000..b869e7be8d
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/shared.ts
@@ -0,0 +1,101 @@
+import type {
+	ChatCompletionMessageParam,
+	ChatCompletionMessageToolCall,
+	ChatCompletionTool
+} from 'openai/resources/chat/completions.mjs'
+import { get } from 'svelte/store'
+import type { ContextElement } from './context'
+import { workspaceStore } from '$lib/stores'
+
+export type DisplayMessage =
+	| {
+			role: 'user' | 'assistant'
+			content: string
+			contextElements?: ContextElement[]
+	  }
+	| {
+			role: 'tool'
+			tool_call_id: string
+			content: string
+	  }
+
+async function callTool<T>({
+	tools,
+	functionName,
+	args,
+	workspace,
+	helpers,
+	toolCallbacks,
+	toolId
+}: {
+	tools: Tool<T>[]
+	functionName: string
+	args: any
+	workspace: string
+	helpers: T
+	toolCallbacks: ToolCallbacks
+	toolId: string
+}): Promise<string> {
+	const tool = tools.find((t) => t.def.function.name === functionName)
+	if (!tool) {
+		throw new Error(`Unknown tool call: ${functionName}`)
+	}
+	return tool.fn({ args, workspace, helpers, toolCallbacks, toolId })
+}
+
+export async function processToolCall<T>({
+	tools,
+	toolCall,
+	messages,
+	helpers,
+	toolCallbacks
+}: {
+	tools: Tool<T>[]
+	toolCall: ChatCompletionMessageToolCall
+	messages: ChatCompletionMessageParam[]
+	helpers: T
+	toolCallbacks: ToolCallbacks
+}) {
+	try {
+		const args = JSON.parse(toolCall.function.arguments || '{}')
+		let result = ''
+		try {
+			result = await callTool({
+				tools,
+				functionName: toolCall.function.name,
+				args,
+				workspace: get(workspaceStore) ?? '',
+				helpers,
+				toolCallbacks,
+				toolId: toolCall.id
+			})
+		} catch (err) {
+			console.error(err)
+			result =
+				'Error while calling tool, MUST tell the user to check the browser console for more details, and then respond as much as possible to the original request'
+		}
+		messages.push({
+			role: 'tool',
+			tool_call_id: toolCall.id,
+			content: result
+		})
+	} catch (err) {
+		console.error(err)
+	}
+}
+
+export interface Tool<T> {
+	def: ChatCompletionTool
+	fn: (p: {
+		args: any
+		workspace: string
+		helpers: T
+		toolCallbacks: ToolCallbacks
+		toolId: string
+	}) => Promise<string>
+}
+
+export interface ToolCallbacks {
+	onToolCall: (id: string, content: string) => void
+	onFinishToolCall: (id: string, content: string) => void
+}
diff --git a/frontend/src/lib/components/copilot/chat/utils.ts b/frontend/src/lib/components/copilot/chat/utils.ts
new file mode 100644
index 0000000000..f34e5e6e77
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/utils.ts
@@ -0,0 +1,17 @@
+import { z } from 'zod'
+
+const errorSchema = z.object({
+	error: z.any()
+})
+export function getStringError(result: unknown): string | undefined {
+	try {
+		const parsed = errorSchema.parse(result)
+		if (parsed.error) {
+			return JSON.stringify(parsed.error, null, 2)
+		} else {
+			return undefined
+		}
+	} catch (_) {
+		return undefined
+	}
+}
diff --git a/frontend/src/lib/components/copilot/flow.ts b/frontend/src/lib/components/copilot/flow.ts
index e34cc94718..c81d9dcd0f 100644
--- a/frontend/src/lib/components/copilot/flow.ts
+++ b/frontend/src/lib/components/copilot/flow.ts
@@ -1,50 +1,7 @@
-import {
-	ScriptService,
-	type FlowModule,
-	type InputTransform,
-	type PathScript,
-	type RawScript,
-	type Script
-} from '$lib/gen'
-import { scriptLangToEditorLang } from '$lib/scripts'
+import { type InputTransform } from '$lib/gen'
 import type { Writable } from 'svelte/store'
-import type Editor from '../Editor.svelte'
-import type { Drawer } from '../common'
-import { addResourceTypes, deltaCodeCompletion, getNonStreamingCompletion } from './lib'
-
-export type FlowCopilotModule = {
-	id: string
-	type: 'trigger' | 'script'
-	description: string
-	code: string
-	source: 'hub' | 'custom' | undefined
-	lang: 'bun' | 'python3' | undefined
-	hubCompletions: {
-		path: string
-		summary: string
-		kind: string
-		app: string
-		ask_id: number
-		id: number
-		version_id: number
-	}[]
-	selectedCompletion:
-		| {
-				path: string
-				summary: string
-				kind: string
-				app: string
-				ask_id: number
-		  }
-		| undefined
-	editor?: Editor
-}
 
 export type FlowCopilotContext = {
-	drawerStore: Writable<Drawer | undefined>
-	modulesStore: Writable<FlowCopilotModule[]>
-	currentStepStore: Writable<string | undefined>
-	genFlow: ((i: number, modules: FlowModule[], stepOnly?: boolean) => Promise<void>) | undefined
 	shouldUpdatePropertyType: Writable<{
 		[key: string]: 'static' | 'javascript' | undefined
 	}>
@@ -56,333 +13,3 @@ export type FlowCopilotContext = {
 		[key: string]: InputTransform | undefined
 	}>
 }
-
-const systemPrompt = `You are a helpful coding assistant for Windmill, a developer platform for running scripts. You write code as instructed by the user. Each user message includes some contextual information which should guide your answer.
-Only output code. Wrap the code in a code block.
-Put explanations directly in the code as comments.
-
-Here's how interactions have to look like:
-user: {sample_question}
-assistant: \`\`\`{codeLang}
-{code}
-\`\`\``
-
-const additionalInfos: {
-	bun: string
-	python3: string
-} = {
-	bun: `<contextual_information>
-You have to write TypeScript code and export a "main" function like this: "export async function main(...)" and specify the parameter types but do not call it. You should generally return the result.
-The fetch standard method is available globally.
-You can take as parameters resources which are dictionaries containing credentials or configuration information. For Windmill to correctly detect the resources to be passed, the resource type name has to be exactly as specified in the following list:
-<resourceTypes>
-{resourceTypes}
-</resourceTypes>
-You need to define the type of the resources that are needed before the main function, but only include them if they are actually needed to achieve the function purpose.
-The resource type name has to be exactly as specified (no resource suffix). If the type name conflicts with any imported methods, you have to rename the imported method with the conflicting name.
-</contextual_information>`,
-	python3: `<contextual_information>
-You have to write a function in Python called "main". Specify the parameter types. Do not call the main function. You should generally return the result.
-You can take as parameters resources which are dictionaries containing credentials or configuration information. For Windmill to correctly detect the resources to be passed, the resource type name has to be exactly as specified in the following list:
-<resourceTypes>
-{resourceTypes}
-</resourceTypes>
-You need to define the type of the resources that are needed before the main function, but only include them if they are actually needed to achieve the function purpose.
-The resource type name has to be exactly as specified (has to be IN LOWERCASE). If the type name conflicts with any imported methods, you have to rename the imported method with the conflicting name.
-<contextual_information>`
-}
-
-const triggerPrompts: {
-	bun: string
-	python3: string
-} = {
-	bun: `I'm building a workflow which is a sequence of script steps. Write the first script in {codeLang} which should check for {description} and return an array.
-To maintain state across runs, you can use "const {state_name}: {state_type} = await getState()" and "await setState(value: any)" which you have to import like this: import { getState, setState } from "windmill-client@1"
-
-{additionalInformation}`,
-	python3: `I'm building a workflow which is a sequence of script steps. Write the first script in {codeLang} which should check for {description} and return an array.
-To maintain state across runs, you can use get_state() and set_state(value) which you have to import like this: from wmill import get_state, set_state
-
-{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.
-
-{additionalInformation}`
-
-const inferTypePrompt =
-	'Infer the type of "prev_output" from the previous\'s step code: ```{codeLang}\n{prevCode}\n```'
-
-const actionPrompt = `I'm building a workflow which is a sequence of script steps. Write a script in {codeLang} which should {description}. It should take a parameter called "prev_output" which contains the output of the previous script.
-{inferTypePrompt}
-Return the script's output.
-
-{additionalInformation}`
-
-const inferTypeLoopPrompt =
-	'Infer the type of "prev_output" from the previous\'s step code: ```{codeLang}\n{prevCode}\n```, keeping in mind that it is ONE ELEMENT of the output of the previous step.'
-
-const loopActionPrompt = `I'm building a workflow which is a sequence of script steps. Write a script in {codeLang} which should {description}. It should take a parameter called "prev_output" which contains ONE ELEMEMT of the output of the previous script.
-{inferTypePrompt}
-Return the script's output.
-
-{additionalInformation}`
-
-const inferTypeGluePrompt =
-	"Infer its properties from the previous's step code: ```{codeLang}\n{prevCode}\n```"
-
-const loopGluePrompt = `I'm building a workflow which is a sequence of script steps. 
-My current step code has the following inputs: {inputs}. 
-Determine for each input, what to pass from the following:
-- \`flow_input\` (javascript object): general inputs that are passed to the workflow, you can assume any object properties (snake case).
-- \`flow_input.iter.value\` (javascript object): it is ONE ELEMENT of the output of the previous step. {inferTypeGluePrompt}
-
-Reply with the most probable answer, do not explain or discuss.
-Your answer has to be in the following format (one line per input):
-input_name: expr`
-
-const gluePrompt = `I'm building a workflow which is a sequence of script steps. 
-My current step code has the following inputs: {inputs}. 
-Determine for each input, what to pass from the following:
-- \`flow_input\` (javascript object): general inputs that are passed to the workflow, you can assume any object properties (snake case).
-- \`results.{prevId}\` (javascript object): output of the previous step. {inferTypeGluePrompt}
-
-Reply with the most probable answer, do not explain or discuss.
-Your answer has to be in the following format (one line per input):
-input_name: expr`
-
-async function getPreviousStepContent(
-	pastModule: FlowModule & {
-		value: RawScript | PathScript
-	},
-	workspace: string
-) {
-	if (pastModule.value.type === 'rawscript') {
-		return { prevCode: pastModule.value.content, prevLang: pastModule.value.language }
-	} else {
-		if (pastModule.value.path.startsWith('hub/')) {
-			const script = await ScriptService.getHubScriptByPath({
-				path: pastModule.value.path
-			})
-			return { prevCode: script.content, prevLang: script.language as Script['language'] }
-		} else if (pastModule.value.hash) {
-			const script = await ScriptService.getScriptByHash({
-				workspace,
-				hash: pastModule.value.hash
-			})
-			return { prevCode: script.content, prevLang: script.language }
-		} else {
-			const script = await ScriptService.getScriptByPath({
-				workspace,
-				path: pastModule.value.path
-			})
-			return { prevCode: script.content, prevLang: script.language }
-		}
-	}
-}
-
-export async function stepCopilot(
-	module: FlowCopilotModule,
-	deltaCodeStore: Writable<string>,
-	workspace: string,
-	pastModule:
-		| (FlowModule & {
-				value: RawScript | PathScript
-		  })
-		| undefined,
-	isFirstInLoop: boolean,
-	abortController: AbortController
-) {
-	if (module.source !== 'custom') {
-		throw new Error('Not a custom module')
-	}
-	const lang = module.lang ?? 'bun'
-	const codeLang = lang === 'python3' ? 'python' : 'typescript (Node.js)'
-	let prompt =
-		module.type === 'trigger'
-			? triggerPrompts[lang]
-			: // : module.type === 'preprocessor'
-			// 	? preprocessorPrompts[lang]
-			pastModule === undefined
-			? firstActionPrompt
-			: isFirstInLoop
-			? loopActionPrompt
-			: actionPrompt
-
-	const { prevCode, prevLang } = pastModule
-		? await getPreviousStepContent(pastModule, workspace)
-		: { prevCode: undefined, prevLang: undefined }
-	prompt = prompt
-		.replace('{codeLang}', codeLang)
-		.replace(
-			'{inferTypePrompt}',
-			prevCode && prevLang
-				? (isFirstInLoop ? inferTypeLoopPrompt : inferTypePrompt)
-						.replace('{prevCode}', prevCode)
-						.replace('{codeLang}', scriptLangToEditorLang(prevLang))
-				: ''
-		)
-		.replace('{additionalInformation}', additionalInfos[lang])
-		.replace('{description}', module.description)
-	prompt = await addResourceTypes(
-		{
-			type: 'gen',
-			language: lang as Script['language'],
-			description: module.description,
-			dbSchema: undefined,
-			workspace
-		},
-		prompt
-	)
-	const code = await deltaCodeCompletion(
-		[
-			{
-				role: 'system',
-				content: systemPrompt
-			},
-			{
-				role: 'user',
-				content: prompt
-			}
-		],
-		deltaCodeStore,
-		abortController
-	)
-	return code
-}
-
-export async function glueCopilot(
-	inputs: Record<string, InputTransform>,
-	workspace: string,
-	pastModule: FlowModule & {
-		value: RawScript | PathScript
-	},
-	isFirstInLoop: boolean,
-	abortController: AbortController
-) {
-	const { prevCode, prevLang } = await getPreviousStepContent(pastModule, workspace)
-
-	const stringInputs: string[] = []
-	for (const inputName in inputs) {
-		const input = inputs[inputName]
-		if (
-			input.type === 'static' &&
-			input.value &&
-			typeof input.value === 'object' &&
-			!Array.isArray(input.value)
-		) {
-			// nested object
-			stringInputs.push(`${inputName} (${Object.keys(input.value).join(', ')})`)
-		} else {
-			stringInputs.push(inputName)
-		}
-	}
-
-	let response = await getNonStreamingCompletion(
-		[
-			{
-				role: 'user',
-				content: (isFirstInLoop ? loopGluePrompt : gluePrompt)
-					.replace('{inputs}', stringInputs.join(', '))
-					.replace('{prevId}', pastModule.id)
-					.replace(
-						'{inferTypeGluePrompt}',
-						inferTypeGluePrompt
-							.replace('{prevCode}', prevCode)
-							.replace('{codeLang}', scriptLangToEditorLang(prevLang))
-					)
-			}
-		],
-		abortController
-	)
-
-	const matches = response.matchAll(/([a-zA-Z_0-9.]+): (.+)/g)
-
-	const result: Record<string, string> = {}
-	const allExprs: Record<string, string> = {}
-	for (const match of matches) {
-		const inputName = match[1]
-		const inputExpr = match[2].replace(',', '')
-
-		allExprs[inputName] = inputExpr
-		if (inputName.includes('.')) {
-			// nested key returned by copilot (e.g. body.content: ...)
-			const [firstKey, ...rest] = inputName.split('.')
-			const restStr = rest.join('.')
-			if (!result[firstKey]) {
-				result[firstKey] = `{\n  "${restStr}": ${inputExpr}\n}`
-			} else {
-				result[firstKey] = result[firstKey].replace('\n}', `,\n  "${restStr}": ${inputExpr}\n}`)
-			}
-		} else {
-			result[inputName] = inputExpr
-		}
-	}
-
-	return {
-		inputs: result,
-		allExprs
-	}
-}
diff --git a/frontend/src/lib/components/copilot/lib.ts b/frontend/src/lib/components/copilot/lib.ts
index d11e160fcf..c91554b021 100644
--- a/frontend/src/lib/components/copilot/lib.ts
+++ b/frontend/src/lib/components/copilot/lib.ts
@@ -23,14 +23,9 @@ export const SUPPORTED_LANGUAGES = new Set(Object.keys(GEN_CONFIG.prompts))
 
 // need at least one model for each provider except customai
 export const AI_DEFAULT_MODELS: Record<AIProvider, string[]> = {
-	openai: ['gpt-4o', 'gpt-4o-mini'],
+	openai: ['gpt-4o', 'gpt-4.1', 'gpt-4o-mini', 'o4-mini', 'o3', 'o3-mini'],
 	azure_openai: ['gpt-4o', 'gpt-4o-mini'],
-	anthropic: [
-		'claude-3-7-sonnet-latest',
-		'claude-3-7-sonnet-latest/thinking',
-		'claude-3-5-haiku-latest',
-		'claude-3-5-sonnet-latest'
-	],
+	anthropic: ['claude-sonnet-4-0', 'claude-sonnet-4-0/thinking', 'claude-3-5-haiku-latest'],
 	mistral: ['codestral-latest'],
 	deepseek: ['deepseek-chat', 'deepseek-reasoner'],
 	googleai: ['gemini-1.5-pro', 'gemini-2.0-flash', 'gemini-1.5-flash'],
@@ -41,7 +36,9 @@ export const AI_DEFAULT_MODELS: Record<AIProvider, string[]> = {
 }
 
 function getModelMaxTokens(model: string) {
-	if (model.startsWith('gpt-4o') || model.startsWith('codestral')) {
+	if (model.startsWith('gpt-4.1')) {
+		return 32768
+	} else if (model.startsWith('gpt-4o') || model.startsWith('codestral')) {
 		return 16384
 	} else if (model.startsWith('gpt-4-turbo') || model.startsWith('gpt-3.5')) {
 		return 4096
@@ -49,6 +46,36 @@ function getModelMaxTokens(model: string) {
 	return 8192
 }
 
+function getModelSpecificConfig(
+	modelProvider: AIProviderModel,
+	tools?: OpenAI.Chat.Completions.ChatCompletionTool[]
+) {
+	if (modelProvider.provider === 'openai' && modelProvider.model.startsWith('o')) {
+		return {
+			model: modelProvider.model,
+			...(tools && tools.length > 0 ? { tools } : {}),
+			max_completion_tokens: 100000
+		}
+	} else {
+		return {
+			...(modelProvider.model.endsWith('/thinking')
+				? {
+						thinking: {
+							type: 'enabled',
+							budget_tokens: 1024
+						},
+						model: modelProvider.model.slice(0, -9)
+					}
+				: {
+						model: modelProvider.model,
+						temperature: 0,
+						...(tools && tools.length > 0 ? { tools } : {})
+					}),
+			max_completion_tokens: getModelMaxTokens(modelProvider.model)
+		}
+	}
+}
+
 function prepareMessages(aiProvider: AIProvider, messages: ChatCompletionMessageParam[]) {
 	switch (aiProvider) {
 		case 'googleai':
@@ -374,20 +401,7 @@ function getProviderAndCompletionConfig<K extends boolean>({
 		provider: modelProvider.provider,
 		config: {
 			...providerConfig,
-			...(modelProvider.model.endsWith('/thinking')
-				? {
-						thinking: {
-							type: 'enabled',
-							budget_tokens: 1024
-						},
-						model: modelProvider.model.slice(0, -9)
-					}
-				: {
-						model: modelProvider.model,
-						temperature: 0,
-						...(tools && tools.length > 0 ? { tools } : {})
-					}),
-			max_tokens: getModelMaxTokens(modelProvider.model),
+			...getModelSpecificConfig(modelProvider, tools),
 			messages: processedMessages,
 			stream
 		} as any
diff --git a/frontend/src/lib/components/dbOps.ts b/frontend/src/lib/components/dbOps.ts
index ff37853a7a..7f68c67bfd 100644
--- a/frontend/src/lib/components/dbOps.ts
+++ b/frontend/src/lib/components/dbOps.ts
@@ -4,7 +4,7 @@ import {
 	type DbType
 } from './apps/components/display/dbtable/utils'
 import { makeSelectQuery } from './apps/components/display/dbtable/queries/select'
-import { runPreviewJobAndPollResult } from './jobs/utils'
+import { runScriptAndPollResult } from './jobs/utils'
 import { makeCountQuery } from './apps/components/display/dbtable/queries/count'
 import { makeUpdateQuery } from './apps/components/display/dbtable/queries/update'
 import { makeDeleteQuery } from './apps/components/display/dbtable/queries/delete'
@@ -55,7 +55,7 @@ export function dbTableOpsWithPreviewScripts({
 		colDefs,
 		getCount: async ({ quicksearch }) => {
 			const countQuery = makeCountQuery(resourceType, tableKey, undefined, colDefs)
-			const result = await runPreviewJobAndPollResult({
+			const result = await runScriptAndPollResult({
 				workspace,
 				requestBody: {
 					args: { database: '$res:' + resourcePath, quicksearch },
@@ -68,7 +68,7 @@ export function dbTableOpsWithPreviewScripts({
 		},
 		getRows: async (params) => {
 			const query = makeSelectQuery(tableKey, colDefs, undefined, resourceType as DbType)
-			let items = (await runPreviewJobAndPollResult({
+			let items = (await runScriptAndPollResult({
 				workspace,
 				requestBody: {
 					args: { database: '$res:' + resourcePath, ...params },
@@ -85,7 +85,7 @@ export function dbTableOpsWithPreviewScripts({
 		onUpdate: async ({ values }, colDef, newValue) => {
 			const updateQuery = makeUpdateQuery(tableKey, colDef, colDefs, resourceType)
 
-			await runPreviewJobAndPollResult({
+			await runScriptAndPollResult({
 				workspace,
 				requestBody: {
 					args: {
@@ -101,7 +101,7 @@ export function dbTableOpsWithPreviewScripts({
 		onDelete: async ({ values }) => {
 			const deleteQuery = makeDeleteQuery(tableKey, colDefs, resourceType)
 
-			await runPreviewJobAndPollResult({
+			await runScriptAndPollResult({
 				workspace,
 				requestBody: {
 					args: { database: '$res:' + resourcePath, ...values },
@@ -112,7 +112,7 @@ export function dbTableOpsWithPreviewScripts({
 		},
 		onInsert: async ({ values }) => {
 			const insertQuery = makeInsertQuery(tableKey, colDefs, resourceType)
-			runPreviewJobAndPollResult({
+			runScriptAndPollResult({
 				workspace,
 				requestBody: {
 					args: { database: '$res:' + resourcePath, ...values },
@@ -155,7 +155,7 @@ export function dbDeleteTableActionWithPreviewScript({
 		successText: `Table '${tableKey}' deleted successfully`,
 		action: async () => {
 			const deleteQuery = makeDeleteTableQuery(tableKey, resourceType)
-			await runPreviewJobAndPollResult({
+			await runScriptAndPollResult({
 				workspace,
 				requestBody: {
 					args: { database: '$res:' + resourcePath },
diff --git a/frontend/src/lib/components/flows/CreateActionsApp.svelte b/frontend/src/lib/components/flows/CreateActionsApp.svelte
index d68356e786..13f48f13c4 100644
--- a/frontend/src/lib/components/flows/CreateActionsApp.svelte
+++ b/frontend/src/lib/components/flows/CreateActionsApp.svelte
@@ -25,6 +25,8 @@
 <!-- Buttons -->
 <div class="flex flex-row gap-2">
 	<Button
+		aiId="apps-create-actions-app"
+		aiDescription="Create a new low-code app"
 		size="sm"
 		spacingSize="xl"
 		startIcon={{ icon: Plus }}
diff --git a/frontend/src/lib/components/flows/CreateActionsFlow.svelte b/frontend/src/lib/components/flows/CreateActionsFlow.svelte
index 2ce77b047f..0d420c6c04 100644
--- a/frontend/src/lib/components/flows/CreateActionsFlow.svelte
+++ b/frontend/src/lib/components/flows/CreateActionsFlow.svelte
@@ -24,6 +24,8 @@
 <!-- Buttons -->
 <div class="flex flex-row gap-2">
 	<Button
+		aiId="flows-create-actions-flow"
+		aiDescription="Create a new flow"
 		size="sm"
 		spacingSize="xl"
 		startIcon={{ icon: Plus }}
diff --git a/frontend/src/lib/components/flows/FlowEditor.svelte b/frontend/src/lib/components/flows/FlowEditor.svelte
index a7c22a2e16..a34ef3caa9 100644
--- a/frontend/src/lib/components/flows/FlowEditor.svelte
+++ b/frontend/src/lib/components/flows/FlowEditor.svelte
@@ -4,16 +4,17 @@
 	import FlowModuleSchemaMap from './map/FlowModuleSchemaMap.svelte'
 	import WindmillIcon from '../icons/WindmillIcon.svelte'
 	import { Skeleton } from '../common'
-	import { getContext, setContext } from 'svelte'
+	import { getContext, onDestroy, onMount, setContext } from 'svelte'
 	import type { FlowEditorContext } from './types'
-	import type { FlowCopilotContext } from '../copilot/flow'
-	import { classNames } from '$lib/utils'
 
 	import { writable } from 'svelte/store'
 	import type { PropPickerContext, FlowPropPickerConfig } from '$lib/components/prop_picker'
 	import type { PickableProperties } from '$lib/components/flows/previousResults'
 	import type { Flow } from '$lib/gen'
 	import type { Trigger } from '$lib/components/triggers/utils'
+	import FlowAIChat from '../copilot/chat/flow/FlowAIChat.svelte'
+	import { aiChatManager, AIMode } from '../copilot/chat/AIChatManager.svelte'
+	import TriggerableByAI from '../TriggerableByAI.svelte'
 	const { flowStore } = getContext<FlowEditorContext>('FlowEditorContext')
 
 	export let loading: boolean
@@ -31,26 +32,29 @@
 		| undefined = undefined
 	export let onDeployTrigger: (trigger: Trigger) => void = () => {}
 
-	let size = 50
-
-	const { currentStepStore: copilotCurrentStepStore } =
-		getContext<FlowCopilotContext>('FlowCopilotContext')
+	let flowModuleSchemaMap: FlowModuleSchemaMap | undefined
 
 	setContext<PropPickerContext>('PropPickerContext', {
 		flowPropPickerConfig: writable<FlowPropPickerConfig | undefined>(undefined),
 		pickablePropertiesFiltered: writable<PickableProperties | undefined>(undefined)
 	})
+
+	onMount(() => {
+		aiChatManager.changeMode(AIMode.FLOW)
+	})
+
+	onDestroy(() => {
+		aiChatManager.changeMode(AIMode.NAVIGATOR)
+	})
 </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' : ''
-	)}
+	class={'h-full overflow-hidden transition-colors duration-[400ms] ease-linear border-t'}
 >
+	<TriggerableByAI id="flow-editor" description="Component to edit a flow" />
 	<Splitpanes>
-		<Pane {size} minSize={15} class="h-full relative z-0">
+		<Pane size={50} minSize={15} class="h-full relative z-0">
 			<div class="grow overflow-hidden bg-gray h-full bg-surface-secondary relative">
 				{#if loading}
 					<div class="p-2 pt-10">
@@ -60,6 +64,7 @@
 					</div>
 				{:else if $flowStore.value.modules}
 					<FlowModuleSchemaMap
+						bind:this={flowModuleSchemaMap}
 						{disableStaticInputs}
 						{disableTutorials}
 						{disableAi}
@@ -68,11 +73,17 @@
 						{newFlow}
 						bind:modules={$flowStore.value.modules}
 						on:reload
+						on:generateStep={({ detail }) => {
+							if (!aiChatManager.open) {
+								aiChatManager.openChat()
+							}
+							aiChatManager.generateStep(detail.moduleId, detail.lang, detail.instructions)
+						}}
 					/>
 				{/if}
 			</div>
 		</Pane>
-		<Pane class="relative z-10" size={100 - size} minSize={40}>
+		<Pane class="relative z-10" size={50} minSize={20}>
 			{#if loading}
 				<div class="w-full h-full">
 					<div class="block m-auto pt-40 w-10">
@@ -91,5 +102,8 @@
 				/>
 			{/if}
 		</Pane>
+		{#if !disableAi}
+			<FlowAIChat {flowModuleSchemaMap} />
+		{/if}
 	</Splitpanes>
 </div>
diff --git a/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte b/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte
index 48678601ca..147f66ac4b 100644
--- a/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte
+++ b/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte
@@ -9,13 +9,11 @@
 	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 { type Script, type ScriptLang, type HubScriptKind } 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'
@@ -33,8 +31,6 @@
 	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
@@ -43,17 +39,23 @@
 		kind
 	export let displayPath = false
 
-	let lang: FlowCopilotModule['lang'] = undefined
-	let selectedCompletion: FlowCopilotModule['selectedCompletion'] = undefined
+	type HubCompletion = {
+		path: string
+		summary: string
+		id: number
+		version_id: number
+		ask_id: number
+		app: string
+		kind: HubScriptKind
+	}
+
+	let lang: ScriptLang | undefined = undefined
 
 	let filteredWorkspaceItems: (Script & { marked?: string })[] = []
 
-	let hubCompletions: FlowCopilotModule['hubCompletions'] = []
+	let hubCompletions: HubCompletion[] = []
 
-	const { flowStore, flowStateStore, insertButtonOpen } =
-		getContext<FlowEditorContext>('FlowEditorContext')
-	const { modulesStore: copilotModulesStore, genFlow } =
-		getContext<FlowCopilotContext>('FlowCopilotContext')
+	const { insertButtonOpen } = getContext<FlowEditorContext>('FlowEditorContext')
 
 	let selected: { kind: 'owner' | 'integrations'; name: string | undefined } | undefined = undefined
 
@@ -87,28 +89,24 @@
 	}
 
 	async function onGenerate() {
-		if (!selectedCompletion && !$copilotInfo.enabled) {
+		if (!$copilotInfo.enabled) {
 			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
+		console.log('ongenerate', selectedKind, lang, funcDesc)
+		dispatch('new', {
+			kind: selectedKind,
+			inlineScript: {
+				language: lang,
+				kind: selectedKind,
+				subkind: 'flow',
+				summary,
+				instructions: funcDesc
 			}
-		]
-		genFlow?.(index, modules, true)
-		dispatch('close')
+		})
 	}
 
 	let openScriptSettings = false
@@ -375,8 +373,8 @@
 									lang == 'docker'
 										? 'docker'
 										: selectedKind == 'preprocessor'
-										? 'preprocessor'
-										: 'flow',
+											? 'preprocessor'
+											: 'flow',
 								summary
 							}
 						})
diff --git a/frontend/src/lib/components/flows/content/FlowLoop.svelte b/frontend/src/lib/components/flows/content/FlowLoop.svelte
index 39c1623275..4903945969 100644
--- a/frontend/src/lib/components/flows/content/FlowLoop.svelte
+++ b/frontend/src/lib/components/flows/content/FlowLoop.svelte
@@ -27,7 +27,7 @@
 	import PropPickerWrapper, { CONNECT } from '../propPicker/PropPickerWrapper.svelte'
 	import type { PropPickerContext } from '$lib/components/prop_picker'
 
-	const { previewArgs, flowStateStore, flowStore } =
+	const { previewArgs, flowStateStore, flowStore, currentEditor } =
 		getContext<FlowEditorContext>('FlowEditorContext')
 
 	export let mod: FlowModule
@@ -71,6 +71,8 @@
 		editor?.setCode('')
 		editor?.insertAtCursor(code)
 	}
+
+	$: editor && currentEditor.set({ type: 'iterator', editor, stepId: mod.id })
 </script>
 
 <Drawer bind:open={previewOpen} alwaysOpen size="75%">
diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
index 2cd9f2d5e0..0cbf4ebb2d 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
@@ -13,7 +13,7 @@
 	import FlowModuleHeader from './FlowModuleHeader.svelte'
 	import { getLatestHashForScript, scriptLangToEditorLang } from '$lib/scripts'
 	import PropPickerWrapper from '../propPicker/PropPickerWrapper.svelte'
-	import { getContext, tick } from 'svelte'
+	import { getContext, onDestroy, tick } from 'svelte'
 	import type { FlowEditorContext } from '../types'
 	import FlowModuleScript from './FlowModuleScript.svelte'
 	import FlowModuleEarlyStop from './FlowModuleEarlyStop.svelte'
@@ -39,7 +39,6 @@
 	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
 	import s3Scripts from './s3Scripts/lib'
-	import type { FlowCopilotContext } from '$lib/components/copilot/flow'
 	import Label from '$lib/components/Label.svelte'
 	import { enterpriseLicense } from '$lib/stores'
 	import { isCloudHosted } from '$lib/cloud'
@@ -52,9 +51,11 @@
 	import { workspaceStore } from '$lib/stores'
 	import { checkIfParentLoop } from '../utils'
 	import ModulePreviewResultViewer from '$lib/components/ModulePreviewResultViewer.svelte'
+	import { aiChatManager } from '$lib/components/copilot/chat/AIChatManager.svelte'
 
 	const {
 		selectedId,
+		currentEditor,
 		previewArgs,
 		flowStateStore,
 		flowStore,
@@ -110,21 +111,6 @@
 			: undefined
 	}
 
-	const { modulesStore: copilotModulesStore } =
-		getContext<FlowCopilotContext | undefined>('FlowCopilotContext') || {}
-
-	function setCopilotModuleEditor() {
-		copilotModulesStore?.update((modules) => {
-			const module = modules.find((m) => m.id === flowModule.id)
-			if (module) {
-				module.editor = editor
-			}
-			return modules
-		})
-	}
-
-	$: editor !== undefined && setCopilotModuleEditor()
-
 	$: stepPropPicker =
 		$executionCount != undefined && failureModule
 			? getFailureStepPropPicker($flowStateStore, $flowStore, $previewArgs)
@@ -280,6 +266,21 @@
 		diffEditor?.hide()
 		editor?.show()
 	}
+
+	$: editor &&
+		($currentEditor = {
+			type: 'script',
+			editor,
+			stepId: flowModule.id,
+			showDiffMode,
+			hideDiffMode,
+			diffMode,
+			lastDeployedCode
+		})
+
+	onDestroy(() => {
+		$currentEditor = undefined
+	})
 </script>
 
 <svelte:window on:keydown={onKeyDown} />
@@ -386,6 +387,13 @@
 								{#if !noEditor}
 									{#key flowModule.id}
 										<Editor
+											on:addSelectedLinesToAiChat={(e) => {
+												const { lines, startLine, endLine } = e.detail
+												aiChatManager.addSelectedLinesToContext(lines, startLine, endLine)
+											}}
+											on:toggleAiPanel={() => {
+												aiChatManager.toggleOpen()
+											}}
 											loadAsync
 											folding
 											path={$pathStore + '/' + flowModule.id}
diff --git a/frontend/src/lib/components/flows/flowStateUtils.ts b/frontend/src/lib/components/flows/flowStateUtils.ts
index 9c319553d4..6959ff1dd1 100644
--- a/frontend/src/lib/components/flows/flowStateUtils.ts
+++ b/frontend/src/lib/components/flows/flowStateUtils.ts
@@ -19,6 +19,7 @@ import { loadSchemaFromModule } from './flowInfers'
 import { nextId } from './flowModuleNextId'
 import { findNextAvailablePath } from '$lib/path'
 import type { ExtendedOpenFlow } from './types'
+import { emptySchema } from '$lib/utils'
 
 export async function loadFlowModuleState(flowModule: FlowModule): Promise<FlowModuleState> {
 	try {
@@ -303,11 +304,11 @@ export async function insertNewPreprocessorModule(
 	},
 	wsScript?: { path: string; summary: string; hash: string | undefined }
 ) {
-	var module: FlowModule = {
+	let module: FlowModule = {
 		id: 'preprocessor',
 		value: { type: 'identity' }
 	}
-	var state = emptyFlowModuleState()
+	let state = emptyFlowModuleState()
 
 	if (inlineScript) {
 		;[module, state] = await createInlineScriptModule(
@@ -330,3 +331,44 @@ export async function insertNewPreprocessorModule(
 		return fss
 	})
 }
+
+export async function insertNewFailureModule(
+	flowStore: Writable<ExtendedOpenFlow>,
+	flowStateStore: Writable<FlowState>,
+	inlineScript?: {
+		language: RawScript['language']
+		subkind: 'pgsql' | 'flow'
+		instructions?: string
+	},
+	wsScript?: { path: string; summary: string; hash: string | undefined }
+) {
+	let module: FlowModule = {
+		id: 'failure',
+		value: { type: 'identity' }
+	}
+	let 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.update((fs) => {
+		fs.value.failure_module = module
+		return fs
+	})
+
+	flowStateStore.update((fss) => {
+		fss[module.id] = state
+		return fss
+	})
+}
diff --git a/frontend/src/lib/components/flows/map/FlowErrorHandlerItem.svelte b/frontend/src/lib/components/flows/map/FlowErrorHandlerItem.svelte
index f2f755ddb3..8b76fed4e3 100644
--- a/frontend/src/lib/components/flows/map/FlowErrorHandlerItem.svelte
+++ b/frontend/src/lib/components/flows/map/FlowErrorHandlerItem.svelte
@@ -1,58 +1,43 @@
 <script lang="ts">
 	import type { FlowEditorContext } from '../types'
-	import { getContext } from 'svelte'
-	import { classNames, emptySchema } from '$lib/utils'
-	import type { FlowModuleState } from '../flowState'
-	import { NEVER_TESTED_THIS_FAR } from '../models'
-	import type { FlowCopilotContext } from '$lib/components/copilot/flow'
-	import { fade } from 'svelte/transition'
+	import { createEventDispatcher, getContext } from 'svelte'
+	import { classNames } from '$lib/utils'
 	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 { insertNewFailureModule } from '$lib/components/flows/flowStateUtils'
+	import type { RawScript, ScriptLang } from '$lib/gen'
 	import { twMerge } from 'tailwind-merge'
 
 	export let small: boolean
 
+	const dispatch = createEventDispatcher<{
+		generateStep: { moduleId: string; instructions: string; lang: ScriptLang }
+	}>()
+
 	const { selectedId, flowStateStore, flowStore } =
 		getContext<FlowEditorContext>('FlowEditorContext')
 
-	async function insertNewFailureModule(
+	async function insertFailureModule(
 		inlineScript?: {
 			language: RawScript['language']
 			subkind: 'pgsql' | 'flow'
+			instructions?: string
 		},
 		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
-		}
+		await insertNewFailureModule(flowStore, flowStateStore, inlineScript, wsScript)
 
-		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)
+		if (inlineScript?.instructions) {
+			dispatch('generateStep', {
+				moduleId: 'failure',
+				instructions: inlineScript.instructions,
+				lang: inlineScript.language
+			})
 		}
 
-		$flowStore.value.failure_module = module
-		$flowStateStore[module.id] = state
-
 		$selectedId = 'failure'
 		$flowStore = $flowStore
 	}
-
-	const { currentStepStore: copilotCurrentStepStore } =
-		getContext<FlowCopilotContext | undefined>('FlowCopilotContext') || {}
 </script>
 
 <!-- svelte-ignore a11y-click-events-have-key-events -->
@@ -62,23 +47,18 @@
 	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',
+		'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'
 		}
 	}}
 >
-	{#if $copilotCurrentStepStore !== undefined}
-		<div transition:fade class="absolute inset-0 bg-gray-500 bg-opacity-75 z-[900]"></div>
-	{/if}
 	<div class="flex items-center grow-0 min-w-0 gap-2">
 		<Bug size={16} color={$flowStore?.value?.failure_module ? '#3b82f6' : '#9CA3AF'} />
 	</div>
@@ -100,10 +80,10 @@
 			index={0}
 			placement={'top-center'}
 			on:new={(e) => {
-				insertNewFailureModule(e.detail.inlineScript)
+				insertFailureModule(e.detail.inlineScript)
 			}}
 			on:pickScript={(e) => {
-				insertNewFailureModule(undefined, e.detail)
+				insertFailureModule(undefined, e.detail)
 			}}
 			kind="failure"
 		/>
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
index 64358cc7a6..1e036c00b9 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import type { FlowCopilotContext } from '$lib/components/copilot/flow'
 	import Popover from '$lib/components/Popover.svelte'
 	import { classNames } from '$lib/utils'
 	import {
@@ -74,9 +73,6 @@
 
 	const dispatch = createEventDispatcher()
 
-	const { currentStepStore: copilotCurrentStepStore } =
-		getContext<FlowCopilotContext | undefined>('FlowCopilotContext') || {}
-
 	const propPickerContext = getContext<PropPickerContext>('PropPickerContext')
 	const flowPropPickerConfig = propPickerContext?.flowPropPickerConfig
 	const pickablePropertiesFiltered = propPickerContext?.pickablePropertiesFiltered
@@ -198,8 +194,7 @@
 	class={classNames(
 		'w-full module flex rounded-sm cursor-pointer max-w-full outline-offset-0 outline-slate-500 dark:outline-gray-400',
 		selected ? 'outline outline-2' : 'active:outline active:outline-2',
-		'flex relative',
-		$copilotCurrentStepStore === id ? 'z-[901]' : ''
+		'flex relative'
 	)}
 	style="width: 275px; height: 38px; background-color: {hover && bgHoverColor
 		? bgHoverColor
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
index 6bf5b11e85..cb3ce90fb1 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
@@ -13,7 +13,7 @@
 		pickFlow,
 		insertNewPreprocessorModule
 	} from '$lib/components/flows/flowStateUtils'
-	import type { FlowModule, RawScript, Script } from '$lib/gen'
+	import type { FlowModule, RawScript, Script, ScriptLang } from '$lib/gen'
 	import { emptyFlowModuleState, initFlowStepWarnings } from '../utils'
 	import FlowSettingsItem from './FlowSettingsItem.svelte'
 	import FlowConstantsItem from './FlowConstantsItem.svelte'
@@ -25,8 +25,6 @@
 	import Portal from '$lib/components/Portal.svelte'
 
 	import { getDependentComponents } from '../flowExplorer'
-	import type { FlowCopilotContext } from '$lib/components/copilot/flow'
-	import { fade } from 'svelte/transition'
 	import { copilotInfo, tutorialsToDo, workspaceStore } from '$lib/stores'
 
 	import FlowTutorials from '$lib/components/FlowTutorials.svelte'
@@ -63,7 +61,7 @@
 	const { triggersCount, triggersState } = getContext<TriggerContext>('TriggerContext')
 
 	const { flowPropPickerConfig } = getContext<PropPickerContext>('PropPickerContext')
-	async function insertNewModuleAtIndex(
+	export async function insertNewModuleAtIndex(
 		modules: FlowModule[],
 		index: number,
 		kind:
@@ -82,7 +80,6 @@
 			language: RawScript['language']
 			kind: Script['kind']
 			subkind: 'pgsql' | 'flow'
-			id: string
 			summary?: string
 		}
 	): Promise<FlowModule[]> {
@@ -143,7 +140,7 @@
 		return modules
 	}
 
-	function removeAtId(modules: FlowModule[], id: string): FlowModule[] {
+	export function removeAtId(modules: FlowModule[], id: string): FlowModule[] {
 		const index = modules.findIndex((mod) => mod.id == id)
 		if (index != -1) {
 			const [removed] = modules.splice(index, 1)
@@ -176,7 +173,7 @@
 
 	let minHeight = 0
 
-	function selectNextId(id: any) {
+	export function selectNextId(id: any) {
 		if (modules) {
 			let allIds = dfs(modules, (mod) => mod.id)
 			if (allIds.length > 1) {
@@ -187,7 +184,7 @@
 			}
 		}
 	}
-	async function addBranch(module: FlowModule) {
+	export async function addBranch(module: FlowModule) {
 		push(history, $flowStore)
 
 		if (module.value.type === 'branchone' || module.value.type === 'branchall') {
@@ -199,7 +196,7 @@
 		}
 	}
 
-	function removeBranch(module: FlowModule, index: number) {
+	export function removeBranch(module: FlowModule, index: number) {
 		push(history, $flowStore)
 
 		if (module.value.type === 'branchone' || module.value.type === 'branchall') {
@@ -217,9 +214,6 @@
 	let deleteCallback: (() => void) | undefined = undefined
 	let dependents: Record<string, string[]> = {}
 
-	const { currentStepStore: copilotCurrentStepStore } =
-		getContext<FlowCopilotContext | undefined>('FlowCopilotContext') || {}
-
 	function shouldRunTutorial(tutorialName: string, name: string, index: number) {
 		return (
 			$tutorialsToDo.includes(index) &&
@@ -229,9 +223,12 @@
 		)
 	}
 
-	const dispatch = createEventDispatcher()
+	const dispatch = createEventDispatcher<{
+		generateStep: { moduleId: string; instructions: string; lang: ScriptLang }
+		change: void
+	}>()
 
-	async function updateFlowInputsStore() {
+	export async function updateFlowInputsStore() {
 		const keys = Object.keys(dependents ?? {})
 
 		for (const key of keys) {
@@ -255,7 +252,7 @@
 		}
 	}
 
-	function setExpr(module: FlowModule, expr: string) {
+	export function setExpr(module: FlowModule, expr: string) {
 		if (module.value.type == 'forloopflow') {
 			module.value.iterator = { type: 'javascript', expr }
 			module.value.parallel = true
@@ -324,13 +321,8 @@
 </Portal>
 <div class="flex flex-col h-full relative -pt-1">
 	<div
-		class={`z-10 sticky inline-flex flex-col gap-2 top-0 bg-surface-secondary flex-initial p-2 items-center transition-colors duration-[400ms] ease-linear border-b ${
-			$copilotCurrentStepStore !== undefined ? 'border-gray-500/75' : ''
-		}`}
+		class={`z-10 sticky inline-flex flex-col gap-2 top-0 bg-surface-secondary flex-initial p-2 items-center transition-colors duration-[400ms] ease-linear border-b`}
 	>
-		{#if $copilotCurrentStepStore !== undefined}
-			<div transition:fade class="absolute inset-0 bg-gray-500 bg-opacity-75 z-[900] !m-0"></div>
-		{/if}
 		{#if !disableSettings}
 			<FlowSettingsItem />
 		{/if}
@@ -385,6 +377,7 @@
 				}
 			}}
 			on:insert={async ({ detail }) => {
+				console.log(detail)
 				if (shouldRunTutorial('forloop', detail.detail, 1)) {
 					flowTutorials?.runTutorialById('forloop', detail.index)
 				} else if (shouldRunTutorial('branchone', detail.detail, 2)) {
@@ -403,13 +396,21 @@
 							$moving = undefined
 						} else {
 							if (detail.detail === 'preprocessor') {
-								insertNewPreprocessorModule(
+								await insertNewPreprocessorModule(
 									flowStore,
 									flowStateStore,
 									detail.inlineScript,
 									detail.script
 								)
 								$selectedId = 'preprocessor'
+
+								if (detail.inlineScript?.instructions) {
+									dispatch('generateStep', {
+										moduleId: 'preprocessor',
+										lang: detail.inlineScript?.language,
+										instructions: detail.inlineScript?.instructions
+									})
+								}
 							} else {
 								const index = detail.index ?? 0
 								await insertNewModuleAtIndex(
@@ -420,9 +421,16 @@
 									detail.flow,
 									detail.inlineScript
 								)
-								const id = detail.modules[detail.index ?? 0].id
+								const id = detail.modules[index].id
 								$selectedId = id
 
+								if (detail.inlineScript?.instructions) {
+									dispatch('generateStep', {
+										moduleId: id,
+										lang: detail.inlineScript?.language,
+										instructions: detail.inlineScript?.instructions
+									})
+								}
 								if (detail.kind == 'trigger') {
 									await insertNewModuleAtIndex(
 										detail.modules,
@@ -525,7 +533,7 @@
 			? 'flex-row-reverse'
 			: 'justify-center'} border-b"
 	>
-		<FlowErrorHandlerItem small={smallErrorHandler} />
+		<FlowErrorHandlerItem small={smallErrorHandler} on:generateStep />
 	</div>
 </div>
 
diff --git a/frontend/src/lib/components/flows/map/InsertModuleInner.svelte b/frontend/src/lib/components/flows/map/InsertModuleInner.svelte
index cbc3870338..196c38afe7 100644
--- a/frontend/src/lib/components/flows/map/InsertModuleInner.svelte
+++ b/frontend/src/lib/components/flows/map/InsertModuleInner.svelte
@@ -2,7 +2,6 @@
 	import { createEventDispatcher, getContext } from 'svelte'
 	import StepGenQuick from '$lib/components/copilot/StepGenQuick.svelte'
 	import FlowInputsQuick from '../content/FlowInputsQuick.svelte'
-	import type { FlowModule } from '$lib/gen'
 	import type { FlowBuilderWhitelabelCustomUi } from '$lib/components/custom_ui'
 	import ToggleHubWorkspaceQuick from '$lib/components/ToggleHubWorkspaceQuick.svelte'
 	import TopLevelNode from '../pickers/TopLevelNode.svelte'
@@ -11,9 +10,7 @@
 
 	const dispatch = createEventDispatcher()
 	export let stop = false
-	export let index: number = 0
 	export let funcDesc = ''
-	export let modules: FlowModule[] = []
 	export let disableAi = false
 	export let kind: 'script' | 'trigger' | 'preprocessor' | 'failure' = 'script'
 	export let allowTrigger = true
@@ -148,8 +145,6 @@ shouldUsePortal={true} -->
 			{selectedKind}
 			bind:loading
 			filter={funcDesc}
-			{modules}
-			{index}
 			{disableAi}
 			{funcDesc}
 			{kind}
diff --git a/frontend/src/lib/components/flows/map/VirtualItem.svelte b/frontend/src/lib/components/flows/map/VirtualItem.svelte
index 76e50ccd26..0886e66123 100644
--- a/frontend/src/lib/components/flows/map/VirtualItem.svelte
+++ b/frontend/src/lib/components/flows/map/VirtualItem.svelte
@@ -1,8 +1,6 @@
 <script lang="ts">
 	import { Badge } from '$lib/components/common'
 
-	import { getContext } from 'svelte'
-	import type { FlowCopilotContext } from '$lib/components/copilot/flow'
 	import VirtualItemWrapper from './VirtualItemWrapper.svelte'
 	import OutputPicker from '$lib/components/flows/propPicker/OutputPicker.svelte'
 	import OutputPickerInner from '$lib/components/flows/propPicker/OutputPickerInner.svelte'
@@ -28,9 +26,6 @@
 	export let earlyStop: boolean = false
 	export let editMode: boolean = false
 
-	const { currentStepStore: copilotCurrentStepStore } =
-		getContext<FlowCopilotContext | undefined>('FlowCopilotContext') || {}
-
 	const { viewport } = useSvelteFlow()
 </script>
 
@@ -41,7 +36,6 @@
 	{selected}
 	{selectable}
 	{id}
-	onTop={label === 'Input' && $copilotCurrentStepStore === 'Input'}
 	on:select
 	let:hover
 >
diff --git a/frontend/src/lib/components/flows/types.ts b/frontend/src/lib/components/flows/types.ts
index b72c321615..461b288f39 100644
--- a/frontend/src/lib/components/flows/types.ts
+++ b/frontend/src/lib/components/flows/types.ts
@@ -4,6 +4,8 @@ import type { Writable } from 'svelte/store'
 import type ScriptEditorDrawer from './content/ScriptEditorDrawer.svelte'
 import type { FlowState } from './flowState'
 import type { FlowBuilderWhitelabelCustomUi } from '../custom_ui'
+import type Editor from '../Editor.svelte'
+import type SimpleEditor from '../SimpleEditor.svelte'
 
 export type FlowInput = Record<
 	string,
@@ -39,8 +41,25 @@ export type FlowInputEditorState = {
 	payloadData: Record<string, any> | undefined
 }
 
+export type CurrentEditor =
+	| ((
+			| {
+					type: 'script'
+					editor: Editor
+					showDiffMode: () => void
+					hideDiffMode: () => void
+					diffMode: boolean
+					lastDeployedCode: string | undefined
+			  }
+			| { type: 'iterator'; editor: SimpleEditor }
+	  ) & {
+			stepId: string
+	  })
+	| undefined
+
 export type FlowEditorContext = {
 	selectedId: Writable<string>
+	currentEditor: Writable<CurrentEditor>
 	moving: Writable<{ module: FlowModule; modules: FlowModule[] } | undefined>
 	previewArgs: Writable<Record<string, any>>
 	scriptEditorDrawer: Writable<ScriptEditorDrawer | undefined>
diff --git a/frontend/src/lib/components/graph/FlowGraphV2.svelte b/frontend/src/lib/components/graph/FlowGraphV2.svelte
index 6fa84591f2..f0c1b0bc9e 100644
--- a/frontend/src/lib/components/graph/FlowGraphV2.svelte
+++ b/frontend/src/lib/components/graph/FlowGraphV2.svelte
@@ -25,7 +25,7 @@
 	import ResultNode from './renderers/nodes/ResultNode.svelte'
 	import BaseEdge from './renderers/edges/BaseEdge.svelte'
 	import EmptyEdge from './renderers/edges/EmptyEdge.svelte'
-	import { sugiyama, dagStratify, decrossOpt, coordCenter } from 'd3-dag'
+	import { sugiyama, dagStratify, coordCenter, decrossTwoLayer, decrossOpt } from 'd3-dag'
 	import { Expand } from 'lucide-svelte'
 	import Toggle from '../Toggle.svelte'
 	import DataflowEdge from './renderers/edges/DataflowEdge.svelte'
@@ -117,7 +117,7 @@
 	function onModulesChange(modules: FlowModule[]) {
 		computeSimplifiableFlow(
 			modules,
-			triggerContext?.simplifiedPoll ? get(triggerContext.simplifiedPoll) ?? false : false
+			triggerContext?.simplifiedPoll ? (get(triggerContext.simplifiedPoll) ?? false) : false
 		)
 	}
 
@@ -143,12 +143,13 @@
 		let boxSize: any
 		try {
 			const layout = sugiyama()
-				.decross(decrossOpt())
+				.decross(nodes.length > 20 ? decrossTwoLayer() : decrossOpt())
 				.coord(coordCenter())
 				.nodeSize(() => [NODE.width + NODE.gap.horizontal, NODE.height + NODE.gap.vertical])
 			boxSize = layout(dag)
 		} catch {
 			const layout = sugiyama()
+				.decross(decrossTwoLayer())
 				.coord(coordCenter())
 				.nodeSize(() => [NODE.width + NODE.gap.horizontal, NODE.height + NODE.gap.vertical])
 			boxSize = layout(dag)
@@ -160,13 +161,13 @@
 			position: {
 				x: des.x
 					? // @ts-ignore
-					  (des.data.data.offset ?? 0) +
-					  // @ts-ignore
-					  des.x +
-					  (fullSize ? fullWidth : width) / 2 -
-					  boxSize.width / 2 -
-					  NODE.width / 2 -
-					  (width - fullWidth) / 2
+						(des.data.data.offset ?? 0) +
+						// @ts-ignore
+						des.x +
+						(fullSize ? fullWidth : width) / 2 -
+						boxSize.width / 2 -
+						NODE.width / 2 -
+						(width - fullWidth) / 2
 					: 0,
 				y: des.y || 0
 			}
diff --git a/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte
index 667c0e0904..958d07f971 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte
@@ -93,7 +93,6 @@
 			}}
 			selected={$selectedId == 'triggers'}
 			newItem={data.newFlow}
-			modules={data.modules}
 		/>
 	{:else}
 		<VirtualItemWrapper
diff --git a/frontend/src/lib/components/graph/renderers/triggers/TriggersBadge.svelte b/frontend/src/lib/components/graph/renderers/triggers/TriggersBadge.svelte
index 4f9d2b4467..58980bfd8e 100644
--- a/frontend/src/lib/components/graph/renderers/triggers/TriggersBadge.svelte
+++ b/frontend/src/lib/components/graph/renderers/triggers/TriggersBadge.svelte
@@ -237,6 +237,8 @@
 	{@const { icon: SvelteComponent, countKey } = triggerTypeConfig[type]}
 
 	<MeltButton
+		aiId={`trigger-button-${type}`}
+		aiDescription={`Trigger button for ${type}`}
 		class={twMerge(
 			'hover:bg-surface-hover rounded-md shadow-sm text-xs relative center-center cursor-pointer bg-slate-100 dark:bg-slate-700',
 			'dark:outline dark:outline-1 outline-tertiary/20 group',
diff --git a/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte b/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte
index 36fbcbb39b..b07ab41833 100644
--- a/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte
+++ b/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte
@@ -3,7 +3,6 @@
 	import { createEventDispatcher } from 'svelte'
 	import type { TriggerType } from '$lib/components/triggers/utils'
 	import TriggersBadge from './TriggersBadge.svelte'
-	import type { FlowModule } from '$lib/gen'
 	import { Plus } from 'lucide-svelte'
 	import InsertModuleInner from '$lib/components/flows/map/InsertModuleInner.svelte'
 	import AddTriggersButton from '$lib/components/triggers/AddTriggersButton.svelte'
@@ -15,7 +14,6 @@
 		selected: boolean
 		isEditor?: boolean
 		disableAi?: boolean
-		modules?: FlowModule[]
 		bgColor: string
 		bgHoverColor?: string
 		showDraft?: boolean
@@ -29,7 +27,6 @@
 		selected,
 		isEditor = false,
 		disableAi = false,
-		modules = [],
 		bgColor,
 		bgHoverColor = '',
 		showDraft,
@@ -117,8 +114,6 @@
 				addTriggersButton?.close()
 			}}
 			kind="trigger"
-			index={0}
-			{modules}
 		/>
 	</div>
 {/snippet}
diff --git a/frontend/src/lib/components/home/ItemsList.svelte b/frontend/src/lib/components/home/ItemsList.svelte
index ae3211b903..a037ae4227 100644
--- a/frontend/src/lib/components/home/ItemsList.svelte
+++ b/frontend/src/lib/components/home/ItemsList.svelte
@@ -44,6 +44,7 @@
 	import TreeViewRoot from './TreeViewRoot.svelte'
 	import Popover from '$lib/components/meltComponents/Popover.svelte'
 	import { getContext } from 'svelte'
+	import TriggerableByAI from '../TriggerableByAI.svelte'
 
 	type TableItem<T, U extends 'script' | 'flow' | 'app' | 'raw_app'> = T & {
 		canWrite: boolean
@@ -334,217 +335,219 @@
 	</DrawerContent>
 </Drawer>
 
-<CenteredPage>
-	<div class="flex flex-wrap gap-2 items-center justify-between w-full mt-2">
-		<div class="flex justify-start">
-			<ToggleButtonGroup
-				bind:selected={itemKind}
-				on:selected={() => {
-					if (itemKind != 'all') {
-						subtab = itemKind
-					}
-					setQuery($page.url, 'kind', itemKind)
-				}}
-				class="h-10"
-				let:item
-			>
-				<ToggleButton value="all" label="All" class="text-sm px-4 py-2" {item} />
-				<ToggleButton
-					value="script"
-					icon={Code2}
-					label="Scripts"
-					class="text-sm px-4 py-2"
-					{item}
-				/>
-				{#if HOME_SEARCH_SHOW_FLOW}
+<TriggerableByAI id="home-items-list" description="Lists of scripts, flows, and apps">
+	<CenteredPage>
+		<div class="flex flex-wrap gap-2 items-center justify-between w-full mt-2">
+			<div class="flex justify-start">
+				<ToggleButtonGroup
+					bind:selected={itemKind}
+					on:selected={() => {
+						if (itemKind != 'all') {
+							subtab = itemKind
+						}
+						setQuery($page.url, 'kind', itemKind)
+					}}
+					class="h-10"
+					let:item
+				>
+					<ToggleButton value="all" label="All" class="text-sm px-4 py-2" {item} />
 					<ToggleButton
-						value="flow"
-						label="Flows"
-						icon={FlowIcon}
+						value="script"
+						icon={Code2}
+						label="Scripts"
 						class="text-sm px-4 py-2"
-						selectedColor="#14b8a6"
 						{item}
 					/>
-				{/if}
-				<ToggleButton
-					value="app"
-					label="Apps"
-					icon={LayoutDashboard}
-					class="text-sm px-4 py-2"
-					selectedColor="#fb923c"
-					{item}
-				/>
-			</ToggleButtonGroup>
-		</div>
-
-		<div class="relative text-tertiary grow min-w-[100px]">
-			<!-- svelte-ignore a11y-autofocus -->
-			<input
-				autofocus
-				placeholder={HOME_SEARCH_PLACEHOLDER}
-				bind:value={filter}
-				class="bg-surface !h-10 !px-4 !pr-10 !rounded-lg text-sm focus:outline-none"
-			/>
-			<button aria-label="Search" type="submit" class="absolute right-0 top-0 mt-3 mr-4">
-				<svg
-					class="h-4 w-4 fill-current"
-					xmlns="http://www.w3.org/2000/svg"
-					xmlns:xlink="http://www.w3.org/1999/xlink"
-					version="1.1"
-					id="Capa_1"
-					x="0px"
-					y="0px"
-					viewBox="0 0 56.966 56.966"
-					style="enable-background:new 0 0 56.966 56.966;"
-					xml:space="preserve"
-					width="512px"
-					height="512px"
-				>
-					<path
-						d="M55.146,51.887L41.588,37.786c3.486-4.144,5.396-9.358,5.396-14.786c0-12.682-10.318-23-23-23s-23,10.318-23,23  s10.318,23,23,23c4.761,0,9.298-1.436,13.177-4.162l13.661,14.208c0.571,0.593,1.339,0.92,2.162,0.92  c0.779,0,1.518-0.297,2.079-0.837C56.255,54.982,56.293,53.08,55.146,51.887z M23.984,6c9.374,0,17,7.626,17,17s-7.626,17-17,17  s-17-7.626-17-17S14.61,6,23.984,6z"
-					/>
-				</svg>
-			</button>
-		</div>
-		<Button
-			on:click={() => openSearchWithPrefilledText('#')}
-			variant="border"
-			size="sm"
-			spacingSize="lg"
-			wrapperClasses="h-10"
-			color="light"
-			endIcon={{
-				icon: SearchCode
-			}}
-		>
-			Content
-		</Button>
-	</div>
-	<div class="relative">
-		<ListFilters
-			syncQuery
-			bind:selectedFilter={ownerFilter}
-			filters={owners}
-			bottomMargin={false}
-		/>
-		{#if filteredItems?.length == 0}
-			<div class="mt-10"></div>
-		{/if}
-		{#if !loading}
-			<div class="flex w-full flex-row-reverse gap-2 mt-4 mb-1 items-center h-6">
-				<Popover floatingConfig={{ placement: 'bottom-end' }}>
-					<svelte:fragment slot="trigger">
-						<Button
-							startIcon={{
-								icon: SlidersHorizontal
-							}}
-							nonCaptureEvent
-							iconOnly
-							size="xs"
-							color="light"
-							variant="border"
-							spacingSize="xs2"
+					{#if HOME_SEARCH_SHOW_FLOW}
+						<ToggleButton
+							value="flow"
+							label="Flows"
+							icon={FlowIcon}
+							class="text-sm px-4 py-2"
+							selectedColor="#14b8a6"
+							{item}
 						/>
-					</svelte:fragment>
-					<svelte:fragment slot="content">
-						<div class="p-4">
-							<span class="text-sm font-semibold">Filters</span>
-							<div class="flex flex-col gap-2 mt-2">
-								<Toggle size="xs" bind:checked={archived} options={{ right: 'Only archived' }} />
-								{#if $userStore && !$userStore.operator}
-									<Toggle
-										size="xs"
-										bind:checked={includeWithoutMain}
-										options={{ right: 'Include without main function' }}
-									/>
-								{/if}
-							</div>
-						</div>
-					</svelte:fragment>
-				</Popover>
-				{#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}
-				<Toggle size="xs" bind:checked={treeView} options={{ right: 'Tree view' }} />
-				{#if treeView}
-					<Button
-						btnClasses="py-0 h-6"
-						size="xs"
-						variant="border"
-						color="light"
-						on:click={() => (collapseAll = !collapseAll)}
-						startIcon={{
-							icon: collapseAll ? UnfoldVertical : FoldVertical
-						}}
-					>
-						{#if collapseAll}
-							Expand all
-						{:else}
-							Collapse all
-						{/if}
-					</Button>
-				{/if}
-			</div>
-		{/if}
-	</div>
-	<div>
-		{#if filteredItems == undefined}
-			<div class="mt-4"></div>
-			<Skeleton layout={[[2], 1]} />
-			{#each new Array(6) as _}
-				<Skeleton layout={[[4], 0.5]} />
-			{/each}
-		{:else if filteredItems.length === 0}
-			<NoItemFound />
-		{:else if treeView}
-			<TreeViewRoot
-				{items}
-				{nbDisplayed}
-				{collapseAll}
-				isSearching={filter !== ''}
-				on:scriptChanged={() => loadScripts(includeWithoutMain)}
-				on:flowChanged={loadFlows}
-				on:appChanged={loadApps}
-				on:rawAppChanged={loadRawApps}
-				on:reload={() => {
-					loadScripts(includeWithoutMain)
-					loadFlows()
-					loadApps()
-					loadRawApps()
-				}}
-				{showCode}
-			/>
-		{:else}
-			<div class="border rounded-md">
-				{#each (items ?? []).slice(0, nbDisplayed) as item (item.type + '/' + item.path)}
-					<Item
+					{/if}
+					<ToggleButton
+						value="app"
+						label="Apps"
+						icon={LayoutDashboard}
+						class="text-sm px-4 py-2"
+						selectedColor="#fb923c"
 						{item}
-						on:scriptChanged={() => loadScripts(includeWithoutMain)}
-						on:flowChanged={loadFlows}
-						on:appChanged={loadApps}
-						on:rawAppChanged={loadRawApps}
-						on:reload={() => {
-							loadScripts(includeWithoutMain)
-							loadFlows()
-							loadApps()
-							loadRawApps()
-						}}
-						{showCode}
 					/>
-				{/each}
+				</ToggleButtonGroup>
 			</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
-				>
+
+			<div class="relative text-tertiary grow min-w-[100px]">
+				<!-- svelte-ignore a11y-autofocus -->
+				<input
+					autofocus
+					placeholder={HOME_SEARCH_PLACEHOLDER}
+					bind:value={filter}
+					class="bg-surface !h-10 !px-4 !pr-10 !rounded-lg text-sm focus:outline-none"
+				/>
+				<button aria-label="Search" type="submit" class="absolute right-0 top-0 mt-3 mr-4">
+					<svg
+						class="h-4 w-4 fill-current"
+						xmlns="http://www.w3.org/2000/svg"
+						xmlns:xlink="http://www.w3.org/1999/xlink"
+						version="1.1"
+						id="Capa_1"
+						x="0px"
+						y="0px"
+						viewBox="0 0 56.966 56.966"
+						style="enable-background:new 0 0 56.966 56.966;"
+						xml:space="preserve"
+						width="512px"
+						height="512px"
+					>
+						<path
+							d="M55.146,51.887L41.588,37.786c3.486-4.144,5.396-9.358,5.396-14.786c0-12.682-10.318-23-23-23s-23,10.318-23,23  s10.318,23,23,23c4.761,0,9.298-1.436,13.177-4.162l13.661,14.208c0.571,0.593,1.339,0.92,2.162,0.92  c0.779,0,1.518-0.297,2.079-0.837C56.255,54.982,56.293,53.08,55.146,51.887z M23.984,6c9.374,0,17,7.626,17,17s-7.626,17-17,17  s-17-7.626-17-17S14.61,6,23.984,6z"
+						/>
+					</svg>
+				</button>
+			</div>
+			<Button
+				on:click={() => openSearchWithPrefilledText('#')}
+				variant="border"
+				size="sm"
+				spacingSize="lg"
+				wrapperClasses="h-10"
+				color="light"
+				endIcon={{
+					icon: SearchCode
+				}}
+			>
+				Content
+			</Button>
+		</div>
+		<div class="relative">
+			<ListFilters
+				syncQuery
+				bind:selectedFilter={ownerFilter}
+				filters={owners}
+				bottomMargin={false}
+			/>
+			{#if filteredItems?.length == 0}
+				<div class="mt-10"></div>
 			{/if}
-		{/if}
-	</div>
-</CenteredPage>
+			{#if !loading}
+				<div class="flex w-full flex-row-reverse gap-2 mt-4 mb-1 items-center h-6">
+					<Popover floatingConfig={{ placement: 'bottom-end' }}>
+						<svelte:fragment slot="trigger">
+							<Button
+								startIcon={{
+									icon: SlidersHorizontal
+								}}
+								nonCaptureEvent
+								iconOnly
+								size="xs"
+								color="light"
+								variant="border"
+								spacingSize="xs2"
+							/>
+						</svelte:fragment>
+						<svelte:fragment slot="content">
+							<div class="p-4">
+								<span class="text-sm font-semibold">Filters</span>
+								<div class="flex flex-col gap-2 mt-2">
+									<Toggle size="xs" bind:checked={archived} options={{ right: 'Only archived' }} />
+									{#if $userStore && !$userStore.operator}
+										<Toggle
+											size="xs"
+											bind:checked={includeWithoutMain}
+											options={{ right: 'Include without main function' }}
+										/>
+									{/if}
+								</div>
+							</div>
+						</svelte:fragment>
+					</Popover>
+					{#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}
+					<Toggle size="xs" bind:checked={treeView} options={{ right: 'Tree view' }} />
+					{#if treeView}
+						<Button
+							btnClasses="py-0 h-6"
+							size="xs"
+							variant="border"
+							color="light"
+							on:click={() => (collapseAll = !collapseAll)}
+							startIcon={{
+								icon: collapseAll ? UnfoldVertical : FoldVertical
+							}}
+						>
+							{#if collapseAll}
+								Expand all
+							{:else}
+								Collapse all
+							{/if}
+						</Button>
+					{/if}
+				</div>
+			{/if}
+		</div>
+		<div>
+			{#if filteredItems == undefined}
+				<div class="mt-4"></div>
+				<Skeleton layout={[[2], 1]} />
+				{#each new Array(6) as _}
+					<Skeleton layout={[[4], 0.5]} />
+				{/each}
+			{:else if filteredItems.length === 0}
+				<NoItemFound />
+			{:else if treeView}
+				<TreeViewRoot
+					{items}
+					{nbDisplayed}
+					{collapseAll}
+					isSearching={filter !== ''}
+					on:scriptChanged={() => loadScripts(includeWithoutMain)}
+					on:flowChanged={loadFlows}
+					on:appChanged={loadApps}
+					on:rawAppChanged={loadRawApps}
+					on:reload={() => {
+						loadScripts(includeWithoutMain)
+						loadFlows()
+						loadApps()
+						loadRawApps()
+					}}
+					{showCode}
+				/>
+			{:else}
+				<div class="border rounded-md">
+					{#each (items ?? []).slice(0, nbDisplayed) as item (item.type + '/' + item.path)}
+						<Item
+							{item}
+							on:scriptChanged={() => loadScripts(includeWithoutMain)}
+							on:flowChanged={loadFlows}
+							on:appChanged={loadApps}
+							on:rawAppChanged={loadRawApps}
+							on:reload={() => {
+								loadScripts(includeWithoutMain)
+								loadFlows()
+								loadApps()
+								loadRawApps()
+							}}
+							{showCode}
+						/>
+					{/each}
+				</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}
+			{/if}
+		</div>
+	</CenteredPage>
+</TriggerableByAI>
diff --git a/frontend/src/lib/components/icons/WindmillAiIcon.svelte b/frontend/src/lib/components/icons/WindmillAiIcon.svelte
new file mode 100644
index 0000000000..e0a8da724c
--- /dev/null
+++ b/frontend/src/lib/components/icons/WindmillAiIcon.svelte
@@ -0,0 +1,38 @@
+<script>
+	import DarkModeObserver from '../DarkModeObserver.svelte'
+
+	let { size = 24, forceDarkMode = false, className } = $props()
+	let darkMode = $state(false)
+</script>
+
+<DarkModeObserver bind:darkMode />
+<svg
+	width={size}
+	height={size}
+	viewBox="0 0 65 65"
+	fill="none"
+	xmlns="http://www.w3.org/2000/svg"
+	class={className}
+>
+	<g transform="translate(0, 4.5)">
+		<path
+			d="M40.625 14L56.875 14L65 28L48.75 28L56.875 42L48.75 56L40.625 42L32.5 56L16.25 56L24.375 42L8.12502 41.9999L0 28L16.25 28L8.12499 14L16.25 1.54244e-05L24.375 14L32.5 7.2001e-05L48.75 0L40.625 14Z"
+			fill={darkMode || forceDarkMode ? '#8556D0' : '#E2DBFF'}
+		/>
+		<path
+			d="M28.6964 33.2749C28.5536 32.7039 28.265 32.1828 27.8606 31.7658C27.4563 31.3488 26.951 31.0512 26.3973 30.9039L16.5815 28.2936C16.4141 28.2446 16.2667 28.1406 16.1617 27.9974C16.0568 27.8541 16 27.6795 16 27.5C16 27.3205 16.0568 27.1459 16.1617 27.0026C16.2667 26.8594 16.4141 26.7554 16.5815 26.7064L26.3973 24.0945C26.9508 23.9473 27.456 23.6499 27.8603 23.2333C28.2646 22.8166 28.5533 22.2958 28.6964 21.7251L31.2276 11.6026C31.2746 11.4293 31.3754 11.2765 31.5145 11.1677C31.6536 11.0589 31.8234 11 31.9979 11C32.1725 11 32.3423 11.0589 32.4814 11.1677C32.6205 11.2765 32.7213 11.4293 32.7683 11.6026L35.2979 21.7251C35.4407 22.2961 35.7293 22.8172 36.1336 23.2342C36.538 23.6512 37.0433 23.9488 37.597 24.0961L47.4127 26.7047C47.5815 26.7527 47.7304 26.8565 47.8365 27.0002C47.9426 27.1438 48 27.3194 48 27.5C48 27.6806 47.9426 27.8562 47.8365 27.9998C47.7304 28.1435 47.5815 28.2473 47.4127 28.2953L37.597 30.9039C37.0433 31.0512 36.538 31.3488 36.1336 31.7658C35.7293 32.1828 35.4407 32.7039 35.2979 33.2749L32.7667 43.3974C32.7197 43.5707 32.6189 43.7235 32.4798 43.8323C32.3407 43.9411 32.1709 44 31.9963 44C31.8218 44 31.652 43.9411 31.5129 43.8323C31.3738 43.7235 31.273 43.5707 31.226 43.3974L28.6964 33.2749Z"
+			fill="white"
+			stroke={darkMode || forceDarkMode ? '#E2DBFF' : '#A76FFF'}
+			stroke-width="2"
+			stroke-linecap="round"
+			stroke-linejoin="round"
+		/>
+		<path
+			d="M19.9676 42.75C19.923 42.5769 19.8328 42.419 19.7064 42.2927C19.5801 42.1663 19.4222 42.0761 19.2492 42.0315L16.1817 41.2405C16.1294 41.2256 16.0833 41.1941 16.0505 41.1507C16.0177 41.1073 16 41.0544 16 41C16 40.9456 16.0177 40.8927 16.0505 40.8493C16.0833 40.8059 16.1294 40.7744 16.1817 40.7595L19.2492 39.968C19.4221 39.9234 19.58 39.8333 19.7063 39.7071C19.8327 39.5808 19.9229 39.423 19.9676 39.25L20.7586 36.1826C20.7733 36.1301 20.8048 36.0838 20.8483 36.0508C20.8917 36.0178 20.9448 36 20.9994 36C21.0539 36 21.107 36.0178 21.1504 36.0508C21.1939 36.0838 21.2254 36.1301 21.2401 36.1826L22.0306 39.25C22.0752 39.4231 22.1654 39.581 22.2918 39.7073C22.4181 39.8337 22.576 39.9239 22.7491 39.9685L25.8165 40.759C25.8692 40.7736 25.9157 40.805 25.9489 40.8485C25.982 40.8921 26 40.9453 26 41C26 41.0547 25.982 41.1079 25.9489 41.1515C25.9157 41.195 25.8692 41.2264 25.8165 41.241L22.7491 42.0315C22.576 42.0761 22.4181 42.1663 22.2918 42.2927C22.1654 42.419 22.0752 42.5769 22.0306 42.75L21.2396 45.8174C21.2249 45.8699 21.1934 45.9162 21.1499 45.9492C21.1065 45.9822 21.0534 46 20.9989 46C20.9443 46 20.8912 45.9822 20.8478 45.9492C20.8043 45.9162 20.7728 45.8699 20.7581 45.8174L19.9676 42.75Z"
+			fill="white"
+			stroke={darkMode || forceDarkMode ? '#E2DBFF' : '#A76FFF'}
+			stroke-linecap="round"
+			stroke-linejoin="round"
+		/>
+	</g>
+</svg>
diff --git a/frontend/src/lib/components/jobs/utils.ts b/frontend/src/lib/components/jobs/utils.ts
index 018726bdef..294df7c3ff 100644
--- a/frontend/src/lib/components/jobs/utils.ts
+++ b/frontend/src/lib/components/jobs/utils.ts
@@ -1,18 +1,57 @@
-import { JobService, type RunScriptPreviewData } from '$lib/gen'
+import { JobService, type RunScriptByPathData, type RunScriptPreviewData } from '$lib/gen'
 
-export async function runPreviewJobAndPollResult(
-	data: RunScriptPreviewData,
-	{ maxRetries = 7, withJobData }: { maxRetries?: number; withJobData?: boolean } = {}
+function isRunScriptByPathData(
+	arg: RunScriptPreviewData | RunScriptByPathData
+): arg is RunScriptByPathData {
+	return (arg as RunScriptByPathData).path !== undefined
+}
+
+type RunScriptOptions = {
+	maxRetries?: number
+	withJobData?: boolean
+}
+
+/**
+ * @function runScript
+ * @param {RunScriptPreviewData | RunScriptByPathData} data - Data for running the script.
+ * @returns {Promise<string>} A UUID representing the running script.
+ * 
+ * @example
+ * const uuid = await runScript(data)
+ */
+export async function runScript(data: RunScriptPreviewData | RunScriptByPathData) {
+	const uuid = (
+		isRunScriptByPathData(data)
+			? await JobService.runScriptByPath(data)
+			: await JobService.runScriptPreview(data)
+	) as string
+
+	return uuid
+}
+
+/**
+ * @function pollJobResult
+ * @description Polls a job result by UUID until success, failure, or max retries reached.
+ * @param {string} uuid - Job UUID.
+ * @param {string} workspace - Workspace identifier.
+ * @param {RunScriptOptions} [options] - Optional settings like retries and job data inclusion.
+ * @returns {Promise<unknown>} Final job result or throws error if it fails.
+ * 
+ * @example
+ * const result = await pollJobResult(uuid, 'my-workspace', { maxRetries: 5, withJobData: true });
+ */
+export async function pollJobResult(
+	uuid: string,
+	workspace: string,
+	{ maxRetries = 7, withJobData }: RunScriptOptions = {}
 ): Promise<unknown> {
-	const uuid = await JobService.runScriptPreview(data)
-
 	let attempts = 0
 	while (attempts < maxRetries) {
 		try {
 			await new Promise((resolve) => setTimeout(resolve, 500 * (attempts || 0.75)))
 			const job = await JobService.getCompletedJobResultMaybe({
 				id: uuid,
-				workspace: data.workspace
+				workspace
 			})
 			if (job.success) {
 				if (withJobData) {
@@ -37,3 +76,12 @@ export async function runPreviewJobAndPollResult(
 
 	throw 'Could not get job result, should not get here'
 }
+
+export async function runScriptAndPollResult(
+	data: RunScriptPreviewData | RunScriptByPathData,
+	runScriptOptions?: RunScriptOptions
+): Promise<unknown> {
+	const uuid = await runScript(data)
+
+	return await pollJobResult(uuid, data.workspace, runScriptOptions)
+}
diff --git a/frontend/src/lib/components/meltComponents/MeltButton.svelte b/frontend/src/lib/components/meltComponents/MeltButton.svelte
index 5d4eeecccc..631482a856 100644
--- a/frontend/src/lib/components/meltComponents/MeltButton.svelte
+++ b/frontend/src/lib/components/meltComponents/MeltButton.svelte
@@ -1,21 +1,35 @@
 <script lang="ts">
 	import { type AnyMeltElement } from '@melt-ui/svelte'
 	import { conditionalMelt } from '$lib/utils'
+	import TriggerableByAI from '$lib/components/TriggerableByAI.svelte'
 
+	export let aiId: string | undefined = undefined
+	export let aiDescription: string | undefined = undefined
 	export let meltElement: AnyMeltElement | undefined = undefined
 	export let type: 'button' | 'submit' | 'reset' | null | undefined = undefined
 	export let title: string = ''
 	export let id: string | undefined = undefined
+
+	let buttonRef: HTMLButtonElement | undefined = undefined
 </script>
 
-<button
-	use:conditionalMelt={meltElement}
-	class={$$props.class}
-	{type}
-	{title}
-	{id}
-	{...$meltElement}
-	on:click
+<TriggerableByAI
+	id={aiId}
+	description={aiDescription}
+	onTrigger={() => {
+		buttonRef?.click()
+	}}
 >
-	<slot />
-</button>
+	<button
+		bind:this={buttonRef}
+		use:conditionalMelt={meltElement}
+		class={$$props.class}
+		{type}
+		{title}
+		{id}
+		{...$meltElement}
+		on:click
+	>
+		<slot />
+	</button>
+</TriggerableByAI>
diff --git a/frontend/src/lib/components/meltComponents/MenuItem.svelte b/frontend/src/lib/components/meltComponents/MenuItem.svelte
index 2edcd755ae..a383181828 100644
--- a/frontend/src/lib/components/meltComponents/MenuItem.svelte
+++ b/frontend/src/lib/components/meltComponents/MenuItem.svelte
@@ -1,37 +1,57 @@
 <script lang="ts">
 	import { melt } from '@melt-ui/svelte'
 	import type { MenubarMenuElements } from '@melt-ui/svelte'
+	import TriggerableByAI from '$lib/components/TriggerableByAI.svelte'
 
+	export let aiId: string | undefined = undefined
+	export let aiDescription: string | undefined = undefined
 	export let href: string | undefined = undefined
 	export let disabled: boolean = false
 	export let target: string | undefined = undefined
 	export let item: MenubarMenuElements['item']
+
+	let aRef: HTMLAnchorElement | undefined = undefined
+	let buttonRef: HTMLButtonElement | undefined = undefined
 </script>
 
-{#if href}
-	<a
-		use:melt={$item}
-		{href}
-		class={$$props.class}
-		role="menuitem"
-		aria-disabled={disabled}
-		tabindex={disabled ? -1 : undefined}
-		{target}
-		on:m-focusin
-		on:m-focusout
-	>
-		<slot />
-	</a>
-{:else}
-	<button
-		on:click
-		use:melt={$item}
-		{disabled}
-		class={$$props.class}
-		role="menuitem"
-		on:m-focusin
-		on:m-focusout
-	>
-		<slot />
-	</button>
-{/if}
+<TriggerableByAI
+	id={aiId}
+	description={aiDescription}
+	onTrigger={() => {
+		if (href) {
+			aRef?.click()
+		} else {
+			buttonRef?.click()
+		}
+	}}
+>
+	{#if href}
+		<a
+			bind:this={aRef}
+			use:melt={$item}
+			{href}
+			class={$$props.class}
+			role="menuitem"
+			aria-disabled={disabled}
+			tabindex={disabled ? -1 : undefined}
+			{target}
+			on:m-focusin
+			on:m-focusout
+		>
+			<slot />
+		</a>
+	{:else}
+		<button
+			bind:this={buttonRef}
+			on:click
+			use:melt={$item}
+			{disabled}
+			class={$$props.class}
+			role="menuitem"
+			on:m-focusin
+			on:m-focusout
+		>
+			<slot />
+		</button>
+	{/if}
+</TriggerableByAI>
diff --git a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
index 74225bdf4a..97d541a673 100644
--- a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
+++ b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+	import ObjectViewer from './ObjectViewer.svelte'
+
 	import { copyToClipboard, truncate } from '$lib/utils'
 
 	import { createEventDispatcher } from 'svelte'
@@ -12,32 +14,45 @@
 	import AnimatedButton from '$lib/components/common/button/AnimatedButton.svelte'
 	import Popover from '../Popover.svelte'
 
-	export let json: any
-	export let level = 0
-	export let currentPath: string = ''
-	export let pureViewer = false
-	export let collapsed = (level != 0 && level % 3 == 0) || Array.isArray(json)
-	export let rawKey = false
-	export let topBrackets = false
-	export let allowCopy = true
-	export let collapseLevel: number | undefined = undefined
-	export let prefix = ''
-	export let expandedEvenOnLevel0: string | undefined = undefined
-	export let connecting = false
+	interface Props {
+		json: any
+		level?: number
+		currentPath?: string
+		pureViewer?: boolean
+		collapsed?: any
+		rawKey?: boolean
+		topBrackets?: boolean
+		allowCopy?: boolean
+		collapseLevel?: number | undefined
+		prefix?: string
+		expandedEvenOnLevel0?: string | undefined
+		connecting?: boolean
+	}
 
-	let jsonFiltered = json
+	let {
+		json,
+		level = 0,
+		currentPath = '',
+		pureViewer = false,
+		collapsed = $bindable((level != 0 && level % 3 == 0) || (Array.isArray(json) && level != 0)),
+		rawKey = false,
+		topBrackets = false,
+		allowCopy = true,
+		collapseLevel = undefined,
+		prefix = '',
+		expandedEvenOnLevel0 = undefined,
+		connecting = false
+	}: Props = $props()
 
-	$: jsonFiltered = onJsonChange(json)
+	let jsonFiltered = $state(json)
 
-	let search = ''
-	let searchOpen = false
+	let search = $state('')
+	let searchOpen = $state(false)
 
 	function onJsonChange(json: any) {
 		return searchOpen && search ? keepByKeyOrValue(json, search) : json
 	}
 
-	$: search != undefined && searchOpen && onSearch()
-
 	let searchTimeout: NodeJS.Timeout | undefined = undefined
 	function onSearch() {
 		if (searchTimeout) {
@@ -48,16 +63,10 @@
 		}, 100)
 	}
 
-	let s3FileViewer: S3FilePicker
-	let hoveredKey: string | null = null
+	let s3FileViewer: S3FilePicker | undefined = $state()
+	let hoveredKey: string | null = $state(null)
 
 	const collapsedSymbol = '...'
-	$: keys = ['object', 's3object'].includes(getTypeAsString(jsonFiltered))
-		? Object.keys(jsonFiltered)
-		: []
-	$: isArray = Array.isArray(jsonFiltered)
-	$: openBracket = isArray ? '[' : '{'
-	$: closeBracket = isArray ? ']' : '}'
 
 	export function getTypeAsString(arg: any): string {
 		if (arg === null) {
@@ -99,17 +108,65 @@
 		dispatch('select', fullKey)
 	}
 
-	$: keyLimit = isArray ? 5 : 100
-
-	$: fullyCollapsed = keys.length > 1 && collapsed
-
 	function clearSearch() {
 		searchOpen = false
 		jsonFiltered = json
 		search = ''
 	}
+	$effect(() => {
+		jsonFiltered = onJsonChange(json)
+	})
+	$effect(() => {
+		search != undefined && searchOpen && onSearch()
+	})
+	let keys = $derived(
+		['object', 's3object'].includes(getTypeAsString(jsonFiltered)) ? Object.keys(jsonFiltered) : []
+	)
+	let isArray = $derived(Array.isArray(jsonFiltered))
+	let openBracket = $derived(isArray ? '[' : '{')
+	let closeBracket = $derived(isArray ? ']' : '}')
+	let keyLimit = $derived(isArray ? 5 : 100)
+	let fullyCollapsed = $derived(keys.length > 1 && collapsed)
 </script>
 
+{#snippet renderScalar(k: string, v: any)}
+	<!-- svelte-ignore a11y_click_events_have_key_events -->
+	<!-- svelte-ignore a11y_no_static_element_interactions -->
+	<span
+		class="val inline text-left {pureViewer ? 'cursor-auto' : ''} rounded pl-0.5 {getTypeAsString(
+			v
+		)}"
+		onclick={() => {
+			selectProp(k, v, true)
+		}}
+		title={JSON.stringify(v)}
+	>
+		{#if v === NEVER_TESTED_THIS_FAR}
+			<span class="text-2xs text-tertiary font-normal"> Test the flow to see a value </span>
+		{:else if v == undefined}
+			<span class="text-2xs">undefined</span>
+		{:else if v == null}
+			<span class="text-2xs">null</span>
+		{:else if typeof v == 'string'}
+			<span class="text-2xs">"{truncate(v, 200)}"</span>
+		{:else if typeof v == 'number' && Number.isInteger(v) && !Number.isSafeInteger(v)}
+			<span class="inline-flex flex-row gap-1 items-center text-2xs">
+				{truncate(JSON.stringify(v), 200)}
+				<Popover>
+					<TriangleAlertIcon size={14} class="text-yellow-500 mb-0.5" />
+					{#snippet text()}
+						This number is too large for the frontend to handle correctly and may be rounded.
+					{/snippet}
+				</Popover>
+			</span>
+		{:else}
+			<span class="text-2xs">
+				{truncate(JSON.stringify(v), 200)}
+			</span>
+		{/if}
+	</span>
+{/snippet}
+
 <Portal name="object-viewer">
 	<S3FilePicker bind:this={s3FileViewer} readOnlyMode={true} />
 </Portal>
@@ -118,10 +175,11 @@
 		{#if searchOpen}
 			<div class="px-1 relative">
 				<input
-					on:keydown|stopPropagation={(event) => {
-						if (event?.key === 'Escape') {
+					onkeydown={(event) => {
+						if ((event as KeyboardEvent)?.key === 'Escape') {
 							clearSearch()
 						}
+						event.stopPropagation()
 					}}
 					type="text"
 					class="!h-6 !text-2xs mt-0.5"
@@ -130,7 +188,7 @@
 				/>
 				<button
 					class="absolute right-2 top-1 rounded-full hover:bg-surface-hover focus:bg-surface-hover text-secondary p-0.5"
-					on:click={() => {
+					onclick={() => {
 						clearSearch()
 					}}><X size={12} /></button
 				>
@@ -147,12 +205,13 @@
 		{/if}
 	</div>
 {/if}
+
 {#if keys.length > 0}
 	{#if !fullyCollapsed}
 		<span>
 			{#if level != 0 && keys.length > 1}
-				<!-- svelte-ignore a11y-click-events-have-key-events -->
-				<!-- svelte-ignore a11y-no-static-element-interactions -->
+				<!-- svelte-ignore a11y_click_events_have_key_events -->
+				<!-- svelte-ignore a11y_no_static_element_interactions -->
 
 				<Button
 					color="light"
@@ -198,7 +257,7 @@
 						<span class="text-2xs -ml-0.5 text-tertiary">:</span>
 
 						{#if getTypeAsString(jsonFiltered[key]) === 'object'}
-							<svelte:self
+							<ObjectViewer
 								{connecting}
 								json={jsonFiltered[key]}
 								level={level + 1}
@@ -212,50 +271,13 @@
 									: undefined}
 							/>
 						{:else}
-							<!-- svelte-ignore a11y-click-events-have-key-events -->
-							<!-- svelte-ignore a11y-no-static-element-interactions -->
-							<span
-								class="val inline text-left {pureViewer
-									? 'cursor-auto'
-									: ''} rounded pl-0.5 {getTypeAsString(jsonFiltered[key])}"
-								on:click={() => {
-									selectProp(key, jsonFiltered[key], true)
-								}}
-								title={JSON.stringify(jsonFiltered[key])}
-							>
-								{#if jsonFiltered[key] === NEVER_TESTED_THIS_FAR}
-									<span class="text-2xs text-tertiary font-normal">
-										Test the flow to see a value
-									</span>
-								{:else if jsonFiltered[key] == undefined}
-									<span class="text-2xs">undefined</span>
-								{:else if jsonFiltered[key] == null}
-									<span class="text-2xs">null</span>
-								{:else if typeof jsonFiltered[key] == 'string'}
-									<span class="text-2xs">"{truncate(jsonFiltered[key], 200)}"</span>
-								{:else if typeof jsonFiltered[key] == 'number' && Number.isInteger(jsonFiltered[key]) && !Number.isSafeInteger(jsonFiltered[key])}
-									<span class="inline-flex flex-row gap-1 items-center text-2xs">
-										{truncate(JSON.stringify(jsonFiltered[key]), 200)}
-										<Popover>
-											<TriangleAlertIcon size={14} class="text-yellow-500 mb-0.5" />
-											<svelte:fragment slot="text">
-												This number is too large for the frontend to handle correctly and may be
-												rounded.
-											</svelte:fragment>
-										</Popover>
-									</span>
-								{:else}
-									<span class="text-2xs">
-										{truncate(JSON.stringify(jsonFiltered[key]), 200)}
-									</span>
-								{/if}
-							</span>
+							{@render renderScalar(key, jsonFiltered[key])}
 						{/if}
 					</li>
 				{/each}
 				{#if keys.length > keyLimit}
 					{@const increment = Math.min(100, keys.length - keyLimit)}
-					<button on:click={() => (keyLimit += increment)} class="text-2xs px-2 text-secondary">
+					<button onclick={() => (keyLimit += increment)} class="text-2xs px-2 text-secondary">
 						{keyLimit}/{keys.length}: Load {increment} more...
 					</button>
 				{/if}
@@ -275,7 +297,7 @@
 						</a>
 						<button
 							class="text-secondary underline text-2xs whitespace-nowrap ml-1"
-							on:click={() => {
+							onclick={() => {
 								s3FileViewer?.open?.(jsonFiltered)
 							}}
 							><span class="flex items-center gap-1"><PanelRightOpen size={12} />open preview</span>
@@ -286,8 +308,8 @@
 		</span>
 	{/if}
 
-	<!-- svelte-ignore a11y-click-events-have-key-events -->
-	<!-- svelte-ignore a11y-no-static-element-interactions -->
+	<!-- svelte-ignore a11y_click_events_have_key_events -->
+	<!-- svelte-ignore a11y_no_static_element_interactions -->
 
 	{#if fullyCollapsed}
 		<span>
@@ -307,6 +329,8 @@
 	<span class="text-primary">{openBracket}{closeBracket}</span>
 {:else if jsonFiltered == undefined}
 	<span class="text-tertiary text-2xs ml-2">undefined</span>
+{:else if typeof jsonFiltered != 'object'}
+	{@render renderScalar('', jsonFiltered)}
 {:else}
 	<span class="text-tertiary text-2xs ml-2">No items</span>
 {/if}
diff --git a/frontend/src/lib/components/raw_apps/RawAppEditor.svelte b/frontend/src/lib/components/raw_apps/RawAppEditor.svelte
index 019d442fee..406edd931d 100644
--- a/frontend/src/lib/components/raw_apps/RawAppEditor.svelte
+++ b/frontend/src/lib/components/raw_apps/RawAppEditor.svelte
@@ -35,7 +35,7 @@
 		| undefined = undefined
 
 	export let diffDrawer: DiffDrawer | undefined = undefined
-	export let version: number | undefined = undefined
+	export const version: number | undefined = undefined
 
 	let runnables = writable(initRunnables)
 
diff --git a/frontend/src/lib/components/scriptEditor/LogPanel.svelte b/frontend/src/lib/components/scriptEditor/LogPanel.svelte
index 47f0e96c0f..75f5055953 100644
--- a/frontend/src/lib/components/scriptEditor/LogPanel.svelte
+++ b/frontend/src/lib/components/scriptEditor/LogPanel.svelte
@@ -29,6 +29,7 @@
 	import WorkflowTimeline from '../WorkflowTimeline.svelte'
 	import Tooltip from '$lib/components/Tooltip.svelte'
 	import type { PreviewPanelUi } from '../custom_ui'
+	import { getStringError } from '../copilot/chat/utils'
 
 	export let lang: Preview['language'] | undefined
 	export let previewIsLoading = false
@@ -40,7 +41,6 @@
 	export let workspace: string | undefined = undefined
 	export let showCaptures: boolean = false
 	export let customUi: PreviewPanelUi | undefined = undefined
-	export let fixChatMode: boolean = false
 
 	type DrawerContent = {
 		mode: 'json' | Preview['language'] | 'plain'
@@ -141,16 +141,8 @@
 												language={lang}
 											>
 												<svelte:fragment slot="copilot-fix">
-													{#if lang && editor && diffEditor && args && previewJob?.result && typeof previewJob?.result == 'object' && `error` in previewJob?.result && previewJob?.result.error}
-														<ScriptFix
-															on:fix
-															chatMode={fixChatMode}
-															error={JSON.stringify(previewJob.result.error)}
-															{lang}
-															{editor}
-															{diffEditor}
-															{args}
-														/>
+													{#if lang && editor && diffEditor && args && previewJob && !previewJob.success && getStringError(previewJob.result)}
+														<ScriptFix {lang} />
 													{/if}
 												</svelte:fragment>
 											</DisplayResult>
diff --git a/frontend/src/lib/components/scripts/CreateActionsScript.svelte b/frontend/src/lib/components/scripts/CreateActionsScript.svelte
index e4dbf7c2b0..f0b864447b 100644
--- a/frontend/src/lib/components/scripts/CreateActionsScript.svelte
+++ b/frontend/src/lib/components/scripts/CreateActionsScript.svelte
@@ -2,11 +2,15 @@
 	import { Code2, Plus } from 'lucide-svelte'
 	import Button from '../common/button/Button.svelte'
 	import { base } from '$lib/base'
+
+	let { aiId, aiDescription } = $props<{ aiId: string; aiDescription: string }>()
 </script>
 
 <!-- Buttons -->
 <div class="flex flex-row gap-2">
 	<Button
+		{aiId}
+		{aiDescription}
 		size="sm"
 		spacingSize="xl"
 		color="marine"
diff --git a/frontend/src/lib/components/search/GlobalSearchModal.svelte b/frontend/src/lib/components/search/GlobalSearchModal.svelte
index 8edf4e8dae..93f18d60a3 100644
--- a/frontend/src/lib/components/search/GlobalSearchModal.svelte
+++ b/frontend/src/lib/components/search/GlobalSearchModal.svelte
@@ -9,9 +9,7 @@
 		type ListableApp,
 		type ListableRawApp,
 		type Script,
-
 		type SearchJobsIndexResponse
-
 	} from '$lib/gen'
 	import { clickOutside, isMac } from '$lib/utils'
 	import {
@@ -44,6 +42,7 @@
 	import Logs from 'lucide-svelte/icons/logs'
 	import { AwsIcon, GoogleCloudIcon, KafkaIcon, MqttIcon, NatsIcon } from '../icons'
 	import RunsSearch from './RunsSearch.svelte'
+	import AskAiButton from '../copilot/AskAiButton.svelte'
 
 	let open: boolean = false
 
@@ -240,6 +239,7 @@
 	let defaultMenuItemLabels = defaultMenuItems.map((item) => item.label)
 	let defaultMenuItemAndHiddenLabels = defaultMenuItemsWithHidden.map((item) => item.label)
 	let switchModeItemLabels = switchModeItems.map((item) => item.label)
+	let askAiButton: AskAiButton | undefined
 
 	function fuzzyFilter(filter: string, items: any[], itemsPlainText: string[]) {
 		if (filter === '') {
@@ -264,7 +264,6 @@
 		return r
 	}
 
-
 	let queryParseErrors: string[] = []
 
 	async function handleSearch() {
@@ -320,8 +319,8 @@
 			)
 		}
 		if (tab === 'runs') {
-				await tick()
-				runsSearch?.handleRunSearch(removePrefix(searchTerm, RUNS_PREFIX))
+			await tick()
+			runsSearch?.handleRunSearch(removePrefix(searchTerm, RUNS_PREFIX))
 		}
 		selectedItem = selectItem(0)
 	}
@@ -372,6 +371,9 @@
 					}
 				}
 			}
+			if ((itemMap[tab] ?? []).length === 0 && searchTerm.length > 0 && event.key === 'Enter') {
+				askAiButton?.onClick()
+			}
 		}
 	}
 
@@ -413,7 +415,7 @@
 			open = false
 			goto(path)
 		} else {
-			window.open(path, "_blank")
+			window.open(path, '_blank')
 		}
 	}
 
@@ -581,8 +583,7 @@
 	let runsSearch: RunsSearch
 	let runSearchRemainingCount: number | undefined = undefined
 	let runSearchTotalCount: number | undefined = undefined
-	let indexMetadata: SearchJobsIndexResponse["index_metadata"] = undefined
-
+	let indexMetadata: SearchJobsIndexResponse['index_metadata'] = undefined
 </script>
 
 {#if open}
@@ -618,6 +619,16 @@
 							>{placeholderFromPrefix(searchTerm)}</label
 						>
 					</div>
+					{#if (itemMap[tab] ?? []).length === 0 && searchTerm.length > 0}
+						<AskAiButton
+							bind:this={askAiButton}
+							label="Ask AI"
+							initialInput={searchTerm}
+							onClick={() => {
+								closeModal()
+							}}
+						/>
+					{/if}
 					{#if queryParseErrors.length > 0}
 						<Popover notClickable placement="bottom-start">
 							<AlertTriangle size={16} class="text-yellow-500" />
@@ -682,7 +693,9 @@
 							{#if (itemMap[tab] ?? []).length === 0}
 								<div class="flex w-full justify-center items-center">
 									<div class="text-tertiary text-center">
-										<div class="text-2xl font-bold">Nothing found</div>
+										<div class="text-2xl font-bold"
+											>Nothing found, ask the AI to find what you need!</div
+										>
 										<div class="text-sm">Tip: press `esc` to quickly clear the search bar</div>
 									</div>
 								</div>
@@ -718,20 +731,20 @@
 							{/if}
 						</div>
 					{:else if tab === 'runs'}
-								<RunsSearch
-												bind:queryParseErrors
-												bind:this={runsSearch}
-												bind:selectedItem
-												bind:selectedWorkspace
-												bind:mouseMoved
-												bind:loadedRuns={itemMap['runs']}
-												bind:open
-												{selectItem}
-												searchTerm={removePrefix(searchTerm, RUNS_PREFIX)}
-												bind:runSearchRemainingCount
-												bind:runSearchTotalCount
-												bind:indexMetadata
-								/>
+						<RunsSearch
+							bind:queryParseErrors
+							bind:this={runsSearch}
+							bind:selectedItem
+							bind:selectedWorkspace
+							bind:mouseMoved
+							bind:loadedRuns={itemMap['runs']}
+							bind:open
+							{selectItem}
+							searchTerm={removePrefix(searchTerm, RUNS_PREFIX)}
+							bind:runSearchRemainingCount
+							bind:runSearchTotalCount
+							bind:indexMetadata
+						/>
 					{/if}
 				</div>
 			</div>
diff --git a/frontend/src/lib/components/settings/TokensTable.svelte b/frontend/src/lib/components/settings/TokensTable.svelte
index 9cc4f30ecb..3d4371c625 100644
--- a/frontend/src/lib/components/settings/TokensTable.svelte
+++ b/frontend/src/lib/components/settings/TokensTable.svelte
@@ -13,6 +13,7 @@
 	import ClipboardPanel from '../details/ClipboardPanel.svelte'
 	import { sendUserToast } from '$lib/toast'
 	import MultiSelectWrapper from '../multiselect/MultiSelectWrapper.svelte'
+	import TriggerableByAI from '../TriggerableByAI.svelte'
 
 	// --- Props ---
 	interface Props {
@@ -101,7 +102,7 @@
 					label: newTokenLabel,
 					expiration: date?.toISOString(),
 					scopes: tokenScopes,
-					workspace_id: mcpMode ? (newTokenWorkspace || $workspaceStore) : newTokenWorkspace
+					workspace_id: mcpMode ? newTokenWorkspace || $workspaceStore : newTokenWorkspace
 				} as NewToken
 			})
 
@@ -187,6 +188,8 @@
 	<h2 class="py-0 my-0 border-b pt-3">Tokens</h2>
 	<div class="flex justify-end border-b pb-1 gap-2">
 		<Button
+			aiId="account-settings-create-token"
+			aiDescription="Create a new token to authenticate to the Windmill API"
 			size="sm"
 			startIcon={{ icon: Plus }}
 			btnClasses={displayCreateToken ? 'hidden' : ''}
@@ -235,28 +238,33 @@
 
 			{#if showMcpMode}
 				<div class="mb-4 flex flex-row flex-shrink-0">
-					<Toggle
-						on:change={(e) => {
-							mcpCreationMode = e.detail
-							if (e.detail) {
-								newTokenLabel = 'MCP token'
-								newTokenExpiration = undefined
-								newTokenWorkspace = $workspaceStore
-							} else {
-								newTokenLabel = undefined
-								newTokenExpiration = undefined
-								newTokenWorkspace = defaultNewTokenWorkspace
-							}
-						}}
-						checked={mcpCreationMode}
-						options={{
-							right: 'Generate MCP URL',
-							rightTooltip:
-								'Generate a new MCP URL to make your scripts and flows available as tools through your LLM clients.',
-							rightDocumentationLink: 'https://www.windmill.dev/docs/core_concepts/mcp'
-						}}
-						size="xs"
-					/>
+					<TriggerableByAI
+						id="account-settings-create-mcp-token"
+						description="Create a new MCP token to authenticate to the Windmill API"
+					>
+						<Toggle
+							on:change={(e) => {
+								mcpCreationMode = e.detail
+								if (e.detail) {
+									newTokenLabel = 'MCP token'
+									newTokenExpiration = undefined
+									newTokenWorkspace = $workspaceStore
+								} else {
+									newTokenLabel = undefined
+									newTokenExpiration = undefined
+									newTokenWorkspace = defaultNewTokenWorkspace
+								}
+							}}
+							checked={mcpCreationMode}
+							options={{
+								right: 'Generate MCP URL',
+								rightTooltip:
+									'Generate a new MCP URL to make your scripts and flows available as tools through your LLM clients.',
+								rightDocumentationLink: 'https://www.windmill.dev/docs/core_concepts/mcp'
+							}}
+							size="xs"
+						/>
+					</TriggerableByAI>
 				</div>
 			{/if}
 
diff --git a/frontend/src/lib/components/sidebar/MenuButton.svelte b/frontend/src/lib/components/sidebar/MenuButton.svelte
index 456416aa49..2aaa4a1ae0 100644
--- a/frontend/src/lib/components/sidebar/MenuButton.svelte
+++ b/frontend/src/lib/components/sidebar/MenuButton.svelte
@@ -6,9 +6,14 @@
 	import { goto } from '$app/navigation'
 	import { conditionalMelt } from '$lib/utils'
 	import type { MenubarMenuElements } from '@melt-ui/svelte'
+	import TriggerableByAI from '$lib/components/TriggerableByAI.svelte'
 
+	export let aiId: string | undefined = undefined
+	export let aiDescription: string | undefined = undefined
 	export let label: string | undefined = undefined
 	export let icon: any | undefined = undefined
+	export let iconClasses: string | null = null
+	export let iconProps: any | null = null
 	export let isCollapsed: boolean
 	export let disabled: boolean = false
 	export let lightMode: boolean = false
@@ -19,6 +24,8 @@
 	export let trigger: MenubarMenuElements['trigger'] | undefined = undefined
 	export let href: string | undefined = undefined
 
+	let buttonRef: HTMLButtonElement | undefined = undefined
+
 	let dispatch = createEventDispatcher()
 </script>
 
@@ -30,68 +37,84 @@
 		disablePopup={!isCollapsed}
 		placement="right"
 	>
-		<button
-			on:click={(e) => {
-				if (stopPropagationOnClick) e.preventDefault()
-				if (href) {
-					goto(href)
+		<TriggerableByAI
+			id={aiId}
+			description={aiDescription}
+			onTrigger={() => {
+				if (buttonRef) {
+					buttonRef.click()
 				}
-				dispatch('click')
 			}}
-			class={twMerge(
-				'group flex items-center px-2 py-2 font-light rounded-md h-8 gap-3 w-full',
-				lightMode
-					? 'text-primary data-[highlighted]:bg-surface-hover hover:bg-surface-hover'
-					: 'data-[highlighted]:bg-[#2A3648] hover:bg-[#2A3648] text-primary-inverse dark:text-primary',
-				color ? 'border-4' : '',
-				'transition-all relative',
-				$$props.class
-			)}
-			style={color ? `border-color: ${color}; padding: 0 calc(0.5rem - 4px);` : ''}
-			use:conditionalMelt={trigger}
-			title={isCollapsed ? undefined : label}
-			{...$trigger}
 		>
-			{#if icon}
-				<svelte:component
-					this={icon}
-					size={16}
-					class={twMerge(
-						'flex-shrink-0',
-						lightMode
-							? 'text-primary group-hover:text-secondary'
-							: 'text-primary-inverse group-hover:text-secondary-inverse dark:group-hover:text-secondary dark:text-primary',
-						'transition-all'
-					)}
-				/>
-			{/if}
+			<button
+				bind:this={buttonRef}
+				on:click={(e) => {
+					if (stopPropagationOnClick) e.preventDefault()
+					if (href) {
+						goto(href)
+					}
+					dispatch('click')
+				}}
+				class={twMerge(
+					'group flex items-center px-2 py-2 font-light rounded-md h-8 gap-3 w-full',
+					lightMode
+						? 'text-primary data-[highlighted]:bg-surface-hover hover:bg-surface-hover'
+						: 'data-[highlighted]:bg-[#2A3648] hover:bg-[#2A3648] text-primary-inverse dark:text-primary',
+					color ? 'border-4' : '',
+					'transition-all relative',
+					$$props.class
+				)}
+				style={color ? `border-color: ${color}; padding: 0 calc(0.5rem - 4px);` : ''}
+				use:conditionalMelt={trigger}
+				title={isCollapsed ? undefined : label}
+				{...$trigger}
+			>
+				{#if icon}
+					<svelte:component
+						this={icon}
+						size={16}
+						class={twMerge(
+							'flex-shrink-0',
+							lightMode
+								? 'text-primary group-hover:text-secondary'
+								: 'text-primary-inverse group-hover:text-secondary-inverse dark:group-hover:text-secondary dark:text-primary',
+							'transition-all',
+							iconClasses
+						)}
+						{...iconProps}
+					/>
+				{/if}
 
-			{#if !isCollapsed && label}
-				<span
-					class={twMerge(
-						'whitespace-pre truncate',
-						lightMode ? 'text-primary' : 'text-primary-inverse dark:text-primary',
-						'transition-all',
-						$$props.class
-					)}
-				>
-					{label}
-					<span class="pl-2 text-xs dark:text-secondary light:text-secondary-inverse font-semibold">
-						{shortcut}
+				{#if !isCollapsed && label}
+					<span
+						class={twMerge(
+							'whitespace-pre truncate',
+							lightMode ? 'text-primary' : 'text-primary-inverse dark:text-primary',
+							'transition-all',
+							$$props.class
+						)}
+					>
+						{label}
+						<span
+							class="pl-2 text-xs dark:text-secondary light:text-secondary-inverse font-semibold"
+						>
+							{shortcut}
+						</span>
 					</span>
-				</span>
-			{/if}
+				{/if}
+
+				{#if isCollapsed && notificationsCount > 0}
+					<div class="absolute translate-x-1/2 translate-y-1/2 -top-2 right-1 flex h-fit w-fit">
+						<SideBarNotification notificationCount={notificationsCount} small={true} />
+					</div>
+				{:else if notificationsCount > 0}
+					<div class="ml-auto">
+						<SideBarNotification notificationCount={notificationsCount} small={false} />
+					</div>
+				{/if}
+			</button>
+		</TriggerableByAI>
 
-			{#if isCollapsed && notificationsCount > 0}
-				<div class="absolute translate-x-1/2 translate-y-1/2 -top-2 right-1 flex h-fit w-fit">
-					<SideBarNotification notificationCount={notificationsCount} small={true} />
-				</div>
-			{:else if notificationsCount > 0}
-				<div class="ml-auto">
-					<SideBarNotification notificationCount={notificationsCount} small={false} />
-				</div>
-			{/if}
-		</button>
 		<svelte:fragment slot="text">
 			{#if label}
 				{label}
diff --git a/frontend/src/lib/components/sidebar/MenuLink.svelte b/frontend/src/lib/components/sidebar/MenuLink.svelte
index 23cbe38093..88c8bb3070 100644
--- a/frontend/src/lib/components/sidebar/MenuLink.svelte
+++ b/frontend/src/lib/components/sidebar/MenuLink.svelte
@@ -4,7 +4,11 @@
 	import { navigating, page } from '$app/stores'
 	import Popover from '../Popover.svelte'
 	import { base } from '$app/paths'
+	import TriggerableByAI from '$lib/components/TriggerableByAI.svelte'
+	import { goto } from '$app/navigation'
 
+	export let aiId: string | undefined = undefined
+	export let aiDescription: string | undefined = undefined
 	export let label: string
 	export let href: string
 	export let icon: any | undefined = undefined
@@ -25,65 +29,73 @@
 </script>
 
 {#if !disabled}
-	<Popover appearTimeout={0} disappearTimeout={0} class="w-full" disablePopup={!isCollapsed}>
-		<a
-			{href}
-			class={classNames(
-				'group flex items-center px-2 py-2 text-sm font-light rounded-md h-8 gap-3',
-				isSelected
-					? lightMode
-						? 'bg-surface-selected hover:bg-surface-hover rounded-none data-[highlighted]:bg-surface-hover'
-						: 'bg-frost-700 hover:bg-[#30404e] data-[highlighted]:bg-[#30404e]'
-					: lightMode
-					? 'hover:bg-surface-hover rounded-none data-[highlighted]:bg-surface-hover'
-					: 'hover:bg-[#2A3648] data-[highlighted]:bg-[#2A3648]',
+	<TriggerableByAI
+		id={aiId}
+		description={aiDescription}
+		onTrigger={() => {
+			goto(href)
+		}}
+	>
+		<Popover appearTimeout={0} disappearTimeout={0} class="w-full" disablePopup={!isCollapsed}>
+			<a
+				{href}
+				class={classNames(
+					'group flex items-center px-2 py-2 text-sm font-light rounded-md h-8 gap-3',
+					isSelected
+						? lightMode
+							? 'bg-surface-selected hover:bg-surface-hover rounded-none data-[highlighted]:bg-surface-hover'
+							: 'bg-frost-700 hover:bg-[#30404e] data-[highlighted]:bg-[#30404e]'
+						: lightMode
+							? 'hover:bg-surface-hover rounded-none data-[highlighted]:bg-surface-hover'
+							: 'hover:bg-[#2A3648] data-[highlighted]:bg-[#2A3648]',
 
-				'hover:transition-all',
-				$$props.class
-			)}
-			target={href.includes('http') ? '_blank' : null}
-			title={isCollapsed ? undefined : label}
-			use:conditionalMelt={item}
-			{...$item}
-		>
-			{#if icon}
-				<svelte:component
-					this={icon}
-					size={16}
-					class={classNames(
-						'flex-shrink-0',
-						isSelected
-							? lightMode
-								? 'text-primary group-hover:text-secondary'
-								: 'text-frost-200 group-hover:text-white'
-							: lightMode
-							? 'text-primary group-hover:text-secondary'
-							: 'text-gray-100 group-hover:text-white',
-						'transition-all'
-					)}
-				/>
-			{/if}
+					'hover:transition-all',
+					$$props.class
+				)}
+				target={href.includes('http') ? '_blank' : null}
+				title={isCollapsed ? undefined : label}
+				use:conditionalMelt={item}
+				{...$item}
+			>
+				{#if icon}
+					<svelte:component
+						this={icon}
+						size={16}
+						class={classNames(
+							'flex-shrink-0',
+							isSelected
+								? lightMode
+									? 'text-primary group-hover:text-secondary'
+									: 'text-frost-200 group-hover:text-white'
+								: lightMode
+									? 'text-primary group-hover:text-secondary'
+									: 'text-gray-100 group-hover:text-white',
+							'transition-all'
+						)}
+					/>
+				{/if}
 
-			{#if !isCollapsed}
-				<span
-					class={classNames(
-						'whitespace-pre truncate',
-						isSelected
-							? lightMode
-								? 'text-primary group-hover:text-secondary'
-								: 'text-frost-200 group-hover:text-white'
-							: lightMode
-							? 'text-primary group-hover:text-secondary'
-							: 'text-gray-100 group-hover:text-white',
-						'transition-all duration-75'
-					)}
-				>
-					{label}
-				</span>
-			{/if}
-		</a>
-		<svelte:fragment slot="text">
-			{label}
-		</svelte:fragment>
-	</Popover>
+				{#if !isCollapsed}
+					<span
+						class={classNames(
+							'whitespace-pre truncate',
+							isSelected
+								? lightMode
+									? 'text-primary group-hover:text-secondary'
+									: 'text-frost-200 group-hover:text-white'
+								: lightMode
+									? 'text-primary group-hover:text-secondary'
+									: 'text-gray-100 group-hover:text-white',
+							'transition-all duration-75'
+						)}
+					>
+						{label}
+					</span>
+				{/if}
+			</a>
+			<svelte:fragment slot="text">
+				{label}
+			</svelte:fragment>
+		</Popover>
+	</TriggerableByAI>
 {/if}
diff --git a/frontend/src/lib/components/sidebar/SidebarContent.svelte b/frontend/src/lib/components/sidebar/SidebarContent.svelte
index 2c4d32139e..db93b0c836 100644
--- a/frontend/src/lib/components/sidebar/SidebarContent.svelte
+++ b/frontend/src/lib/components/sidebar/SidebarContent.svelte
@@ -65,15 +65,37 @@
 	export let numUnacknowledgedCriticalAlerts = 0
 
 	$: mainMenuLinks = [
-		{ label: 'Home', href: `${base}/`, icon: Home },
-		{ label: 'Runs', href: `${base}/runs`, icon: Play },
+		{
+			label: 'Home',
+			href: `${base}/`,
+			icon: Home,
+			aiId: 'sidebar-menu-link-home',
+			aiDescription:
+				"Button to navigate to home which contains all the user's scripts, flows and apps"
+		},
+		{
+			label: 'Runs',
+			href: `${base}/runs`,
+			icon: Play,
+			aiId: 'sidebar-menu-link-runs',
+			aiDescription: 'Button to navigate to runs'
+		},
 		{
 			label: 'Variables',
 			href: `${base}/variables`,
 			icon: DollarSign,
-			disabled: $userStore?.operator
+			disabled: $userStore?.operator,
+			aiId: 'sidebar-menu-link-variables',
+			aiDescription: 'Button to navigate to variables'
 		},
-		{ label: 'Resources', href: `${base}/resources`, icon: Boxes, disabled: $userStore?.operator }
+		{
+			label: 'Resources',
+			href: `${base}/resources`,
+			icon: Boxes,
+			disabled: $userStore?.operator,
+			aiId: 'sidebar-menu-link-resources',
+			aiDescription: 'Button to navigate to resources'
+		}
 	]
 
 	$: triggerMenuLinks = [
@@ -81,7 +103,9 @@
 			label: 'Schedules',
 			href: `${base}/schedules`,
 			icon: Calendar,
-			disabled: !SIDEBAR_SHOW_SCHEDULES || $userStore?.operator
+			disabled: !SIDEBAR_SHOW_SCHEDULES || $userStore?.operator,
+			aiId: 'sidebar-menu-link-schedules',
+			aiDescription: 'Button to navigate to schedules'
 		},
 		...defaultExtraTriggerLinks.filter(
 			(link) => $usedTriggerKinds.includes(link.kind) || $page.url.pathname.includes(link.href)
@@ -100,56 +124,72 @@
 			href: '/routes',
 			icon: Route,
 			disabled: $userStore?.operator,
-			kind: 'http'
+			kind: 'http',
+			aiId: 'sidebar-menu-link-http',
+			aiDescription: 'Button to navigate to HTTP routes'
 		},
 		{
 			label: 'WebSockets',
 			href: '/websocket_triggers',
 			icon: Unplug,
 			disabled: $userStore?.operator,
-			kind: 'ws'
+			kind: 'ws',
+			aiId: 'sidebar-menu-link-ws',
+			aiDescription: 'Button to navigate to websocket triggers'
 		},
 		{
 			label: 'Postgres',
 			href: '/postgres_triggers',
 			icon: Database,
 			disabled: $userStore?.operator,
-			kind: 'postgres'
+			kind: 'postgres',
+			aiId: 'sidebar-menu-link-postgres',
+			aiDescription: 'Button to navigate to Postgres triggers'
 		},
 		{
 			label: 'Kafka' + ($enterpriseLicense ? '' : ' (EE)'),
 			href: '/kafka_triggers',
 			icon: KafkaIcon,
 			disabled: $userStore?.operator || !$enterpriseLicense,
-			kind: 'kafka'
+			kind: 'kafka',
+			aiId: 'sidebar-menu-link-kafka',
+			aiDescription: 'Button to navigate to Kafka triggers'
 		},
 		{
 			label: 'NATS' + ($enterpriseLicense ? '' : ' (EE)'),
 			href: '/nats_triggers',
 			icon: NatsIcon,
 			disabled: $userStore?.operator || !$enterpriseLicense,
-			kind: 'nats'
+			kind: 'nats',
+			aiId: 'sidebar-menu-link-nats',
+			aiDescription: 'Button to navigate to NATS triggers'
 		},
 		{
 			label: 'SQS' + ($enterpriseLicense ? '' : ' (EE)'),
 			href: '/sqs_triggers',
 			icon: AwsIcon,
 			disabled: $userStore?.operator || !$enterpriseLicense,
-			kind: 'sqs'
+			kind: 'sqs',
+			aiId: 'sidebar-menu-link-sqs',
+			aiDescription: 'Button to navigate to SQS triggers'
 		},
 		{
 			label: 'GCP Pub/Sub' + ($enterpriseLicense ? '' : ' (EE)'),
 			href: '/gcp_triggers',
 			icon: GoogleCloudIcon,
 			disabled: $userStore?.operator || !$enterpriseLicense,
-			kind: 'gcp'
+			kind: 'gcp',
+			aiId: 'sidebar-menu-link-gcp',
+			aiDescription: 'Button to navigate to GCP Pub/Sub triggers'
 		},
 		{
 			label: 'MQTT',
 			href: '/mqtt_triggers',
 			icon: MqttIcon,
 			disabled: $userStore?.operator,
-			kind: 'mqtt'
+			kind: 'mqtt',
+			aiId: 'sidebar-menu-link-mqtt',
+			aiDescription: 'Button to navigate to MQTT triggers'
 		}
 	]
 
@@ -166,11 +206,16 @@
 		{
 			label: 'Settings',
 			icon: Settings,
+			aiId: 'sidebar-menu-link-settings',
+			aiDescription:
+				'Button to navigate to settings, including account, workspace, and instance settings',
 			subItems: [
 				{
 					label: 'Account',
 					href: '#user-settings',
 					icon: UserCog,
+					aiId: 'sidebar-menu-link-account',
+					aiDescription: 'Button to navigate to account settings',
 					faIcon: undefined
 				},
 				...($userStore?.is_admin || $superadmin
@@ -179,6 +224,8 @@
 								label: 'Workspace',
 								href: `${base}/workspace_settings`,
 								icon: FolderCog,
+								aiId: 'sidebar-menu-link-workspace',
+								aiDescription: 'Button to navigate to workspace settings',
 								faIcon: undefined
 							}
 						]
@@ -189,6 +236,8 @@
 								label: 'Instance',
 								href: '#superadmin-settings',
 								icon: ServerCog,
+								aiId: 'sidebar-menu-link-instance',
+								aiDescription: 'Button to navigate to instance settings',
 								faIcon: undefined
 							}
 						]
@@ -209,16 +258,27 @@
 			],
 			disabled: $userStore?.operator
 		},
-		{ label: 'Workers', href: `${base}/workers`, icon: Bot, disabled: $userStore?.operator },
+		{
+			label: 'Workers',
+			href: `${base}/workers`,
+			icon: Bot,
+			disabled: $userStore?.operator,
+			aiId: 'sidebar-menu-link-workers',
+			aiDescription: 'Button to navigate to workers'
+		},
 		{
 			label: 'Folders & Groups',
 			icon: FolderOpen,
+			aiId: 'sidebar-menu-link-folders-groups',
+			aiDescription: 'Button to navigate to folders and groups',
 			subItems: [
 				{
 					label: 'Folders',
 					href: `${base}/folders`,
 					icon: FolderOpen,
 					disabled: $userStore?.operator,
+					aiId: 'sidebar-menu-link-folders',
+					aiDescription: 'Button to navigate to folders',
 					faIcon: undefined
 				},
 				{
@@ -226,6 +286,8 @@
 					href: `${base}/groups`,
 					icon: UserCog,
 					disabled: $userStore?.operator,
+					aiId: 'sidebar-menu-link-groups',
+					aiDescription: 'Button to navigate to groups',
 					faIcon: undefined
 				}
 			],
@@ -235,18 +297,24 @@
 			? {
 					label: 'Logs',
 					icon: Logs,
+					aiId: 'sidebar-menu-link-logs',
+					aiDescription: 'Button to navigate to logs',
 					subItems: [
 						{
 							label: 'Audit logs',
 							href: `${base}/audit_logs`,
-							icon: Eye
+							icon: Eye,
+							aiId: 'sidebar-menu-link-audit-logs',
+							aiDescription: 'Button to navigate to audit logs'
 						},
 						...($devopsRole
 							? [
 									{
 										label: 'Service logs',
 										href: `${base}/service_logs`,
-										icon: Logs
+										icon: Logs,
+										aiId: 'sidebar-menu-link-service-logs',
+										aiDescription: 'Button to navigate to service logs'
 									}
 								]
 							: []),
@@ -258,7 +326,9 @@
 											isCriticalAlertsUIOpen.set(true)
 										},
 										icon: AlertCircle,
-										notificationCount: numUnacknowledgedCriticalAlerts
+										notificationCount: numUnacknowledgedCriticalAlerts,
+										aiId: 'sidebar-menu-link-critical-alerts',
+										aiDescription: 'Button to navigate to critical alerts'
 									}
 								]
 							: [])
@@ -268,7 +338,9 @@
 					label: 'Audit logs',
 					href: `${base}/audit_logs`,
 					icon: Eye,
-					disabled: $userStore?.operator
+					disabled: $userStore?.operator,
+					aiId: 'sidebar-menu-link-audit-logs',
+					aiDescription: 'Button to navigate to audit logs'
 				}
 	]
 
@@ -298,21 +370,33 @@
 			label: 'Help',
 			icon: HelpCircle,
 			subItems: [
-				{ label: 'Docs', href: 'https://www.windmill.dev/docs/intro/', icon: BookOpen },
+				{
+					label: 'Docs',
+					href: 'https://www.windmill.dev/docs/intro/',
+					icon: BookOpen,
+					aiId: 'sidebar-menu-link-docs',
+					aiDescription: 'Button to navigate to docs'
+				},
 				{
 					label: 'Feedbacks',
 					href: 'https://discord.gg/V7PM2YHsPB',
-					icon: DiscordIcon
+					icon: DiscordIcon,
+					aiId: 'sidebar-menu-link-feedbacks',
+					aiDescription: 'Button to navigate to feedbacks'
 				},
 				{
 					label: 'Issues',
 					href: 'https://github.com/windmill-labs/windmill/issues/new',
-					icon: Github
+					icon: Github,
+					aiId: 'sidebar-menu-link-issues',
+					aiDescription: 'Button to navigate to issues'
 				},
 				{
 					label: 'Changelog',
 					href: 'https://www.windmill.dev/changelog/',
-					icon: Newspaper
+					icon: Newspaper,
+					aiId: 'sidebar-menu-link-changelog',
+					aiDescription: 'Button to navigate to changelog'
 				}
 			]
 		}
@@ -370,6 +454,8 @@
 						</svelte:fragment>
 						{#each extraTriggerLinks as subItem (subItem.href ?? subItem.label)}
 							<MenuItem
+								aiId={subItem.aiId}
+								aiDescription={subItem.aiDescription}
 								href={subItem.disabled ? '' : subItem.href}
 								class={twMerge(itemClass, subItem.disabled ? 'pointer-events-none opacity-50' : '')}
 								{item}
@@ -414,6 +500,8 @@
 								on:click={() => {
 									subItem?.['action']?.()
 								}}
+								aiId={subItem.aiId}
+								aiDescription={subItem.aiDescription}
 							>
 								<div class="flex flex-row items-center gap-2">
 									{#if subItem.icon}
diff --git a/frontend/src/lib/components/triggers/CaptureWrapper.svelte b/frontend/src/lib/components/triggers/CaptureWrapper.svelte
index 05a59f755b..e46ab2bb46 100644
--- a/frontend/src/lib/components/triggers/CaptureWrapper.svelte
+++ b/frontend/src/lib/components/triggers/CaptureWrapper.svelte
@@ -6,7 +6,6 @@
 	import RouteCapture from './http/RouteCapture.svelte'
 	import type { ConnectionInfo } from '../common/alert/ConnectionIndicator.svelte'
 	import type { CaptureInfo } from './CaptureSection.svelte'
-	import { invalidRelations } from './postgres/utils'
 	import WebhooksCapture from './webhook/WebhooksCapture.svelte'
 	import EmailTriggerCaptures from '../details/EmailTriggerCaptures.svelte'
 	import WebsocketCapture from './websocket/WebsocketCapture.svelte'
@@ -53,21 +52,6 @@
 	const config: CaptureConfig | undefined = $derived(captureConfigs[captureType])
 
 	export async function setConfig(): Promise<boolean> {
-		if (captureType === 'postgres') {
-			if (!args?.publication?.table_to_track) {
-				sendUserToast('Table to track must be set', true)
-				return false
-			}
-
-			if (
-				invalidRelations(args.publication.table_to_track, {
-					showError: true,
-					trackSchemaTableError: true
-				}) !== ''
-			) {
-				return false
-			}
-		}
 		try {
 			await CaptureService.setCaptureConfig({
 				requestBody: {
@@ -224,7 +208,7 @@
 			<PostgresCapture
 				{captureInfo}
 				{captureLoading}
-				postgres_resource_path={args.postgres_resource_path}
+				{isValid}
 				{hasPreprocessor}
 				{isFlow}
 				{triggerDeployed}
diff --git a/frontend/src/lib/components/triggers/TriggersTable.svelte b/frontend/src/lib/components/triggers/TriggersTable.svelte
index 2d225a09ac..4309e5f105 100644
--- a/frontend/src/lib/components/triggers/TriggersTable.svelte
+++ b/frontend/src/lib/components/triggers/TriggersTable.svelte
@@ -7,6 +7,7 @@
 	import AddTriggersButton from './AddTriggersButton.svelte'
 	import TriggerLabel from './TriggerLabel.svelte'
 	import DeleteTriggerButton from './DeleteTriggerButton.svelte'
+	import TriggerableByAI from '../TriggerableByAI.svelte'
 
 	interface Props {
 		// Props
@@ -41,6 +42,8 @@
 	<div class="w-full">
 		<AddTriggersButton {onAddDraftTrigger} setDropdownWidthToButtonWidth class="w-full" {isEditor}>
 			<Button
+				aiId="add-trigger"
+				aiDescription="Add a new trigger"
 				size="xs"
 				color="blue"
 				startIcon={{ icon: Plus }}
@@ -62,54 +65,60 @@
 					)}
 					onclick={() => onSelect?.(index)}
 				>
-					<td class="w-12 text-center py-2 px-2">
-						<div class="relative flex justify-center items-center">
-							<SvelteComponent
-								size={16}
-								class={trigger.isDraft ? 'text-frost-400' : 'text-tertiary'}
-							/>
+					<TriggerableByAI
+						id={`trigger-${trigger.id}`}
+						description={`See ${trigger.type} triggers`}
+						onTrigger={() => onSelect?.(index)}
+					>
+						<td class="w-12 text-center py-2 px-2">
+							<div class="relative flex justify-center items-center">
+								<SvelteComponent
+									size={16}
+									class={trigger.isDraft ? 'text-frost-400' : 'text-tertiary'}
+								/>
 
-							{#if trigger.isPrimary}
-								<Star size={10} class="absolute -mt-3 ml-3 text-blue-400" />
-							{/if}
-						</div>
-					</td>
-					<td class="py-2 px-2 text-xs">
-						<div class="flex items-center justify-between gap-1">
-							<div class="flex items-center grow min-w-0">
-								<TriggerLabel {trigger} />
-								{#if trigger.type === 'webhook' && webhookToken}
-									<span
-										class="ml-2 px-1.5 text-xs rounded-md bg-tertiary/50 group-hover:bg-primary text-primary-inverse py-0.5"
-									>
-										{`${webhookToken} token${webhookToken > 1 ? 's' : ''}`}
-									</span>
-								{:else if trigger.type === 'email' && emailToken}
-									<span
-										class="ml-2 text-xs rounded-md bg-tertiary/50 group-hover:bg-primary text-primary-inverse px-1.5 py-0.5"
-									>
-										{`${emailToken} token${emailToken > 1 ? 's' : ''}`}
-									</span>
+								{#if trigger.isPrimary}
+									<Star size={10} class="absolute -mt-3 ml-3 text-blue-400" />
 								{/if}
 							</div>
+						</td>
+						<td class="py-2 px-2 text-xs">
+							<div class="flex items-center justify-between gap-1">
+								<div class="flex items-center grow min-w-0">
+									<TriggerLabel {trigger} />
+									{#if trigger.type === 'webhook' && webhookToken}
+										<span
+											class="ml-2 px-1.5 text-xs rounded-md bg-tertiary/50 group-hover:bg-primary text-primary-inverse py-0.5"
+										>
+											{`${webhookToken} token${webhookToken > 1 ? 's' : ''}`}
+										</span>
+									{:else if trigger.type === 'email' && emailToken}
+										<span
+											class="ml-2 text-xs rounded-md bg-tertiary/50 group-hover:bg-primary text-primary-inverse px-1.5 py-0.5"
+										>
+											{`${emailToken} token${emailToken > 1 ? 's' : ''}`}
+										</span>
+									{/if}
+								</div>
 
-							{#if !['email', 'webhook', 'cli'].includes(trigger.type)}
-								{#if trigger.isDraft}
-									<DeleteTriggerButton {trigger} onDelete={() => onDeleteDraft?.(index)} small />
-								{:else if !!trigger.draftConfig && !trigger.isDraft}
-									<Button
-										size="xs"
-										color="light"
-										btnClasses="transition-all duration-200 text-transparent hover:bg-surface group-hover:text-primary bg-transparent px-1 py-1"
-										startIcon={{ icon: RotateCcw }}
-										iconOnly
-										title="Reset to deployed version"
-										on:click={() => onReset?.(index)}
-									/>
+								{#if !['email', 'webhook', 'cli'].includes(trigger.type)}
+									{#if trigger.isDraft}
+										<DeleteTriggerButton {trigger} onDelete={() => onDeleteDraft?.(index)} small />
+									{:else if !!trigger.draftConfig && !trigger.isDraft}
+										<Button
+											size="xs"
+											color="light"
+											btnClasses="transition-all duration-200 text-transparent hover:bg-surface group-hover:text-primary bg-transparent px-1 py-1"
+											startIcon={{ icon: RotateCcw }}
+											iconOnly
+											title="Reset to deployed version"
+											on:click={() => onReset?.(index)}
+										/>
+									{/if}
 								{/if}
-							{/if}
-						</div>
-					</td>
+							</div>
+						</td>
+					</TriggerableByAI>
 				</tr>
 			{/each}
 
diff --git a/frontend/src/lib/components/triggers/gcp/GcpTriggerEditorConfigSection.svelte b/frontend/src/lib/components/triggers/gcp/GcpTriggerEditorConfigSection.svelte
index 0fff25fab4..51e0e5b254 100644
--- a/frontend/src/lib/components/triggers/gcp/GcpTriggerEditorConfigSection.svelte
+++ b/frontend/src/lib/components/triggers/gcp/GcpTriggerEditorConfigSection.svelte
@@ -2,7 +2,7 @@
 	import Section from '$lib/components/Section.svelte'
 	import Required from '$lib/components/Required.svelte'
 	import ResourcePicker from '$lib/components/ResourcePicker.svelte'
-	import { emptyStringTrimmed } from '$lib/utils'
+	import { emptyStringTrimmed, sendUserToast } from '$lib/utils'
 	import TestTriggerConnection from '../TestTriggerConnection.svelte'
 	import Subsection from '$lib/components/Subsection.svelte'
 	import {
@@ -15,15 +15,13 @@
 	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
 	import { base } from '$lib/base'
 	import Toggle from '$lib/components/Toggle.svelte'
-	import { SELECT_INPUT_DEFAULT_STYLE } from '$lib/defaults'
-	import DarkModeObserver from '$lib/components/DarkModeObserver.svelte'
-	import Select from '$lib/components/apps/svelte-select/lib/Select.svelte'
 	import { workspaceStore } from '$lib/stores'
 
 	import { Button, Url } from '$lib/components/common'
 	import { RefreshCw } from 'lucide-svelte'
 	import Alert from '$lib/components/common/alert/Alert.svelte'
 	import TestingBadge from '../testingBadge.svelte'
+	import Select from '$lib/components/Select.svelte'
 
 	export let can_write: boolean = false
 	export let headless: boolean = false
@@ -40,7 +38,8 @@
 
 	let topic_items: string[] = []
 	let subscription_items: string[] = []
-	let darkMode = false
+	let loadingTopic = false
+	let loadingSubscription = false
 
 	const DEFAULT_PUSH_CONFIG: PushConfig = {
 		audience: getBaseUrl(),
@@ -49,22 +48,34 @@
 
 	async function loadAllPubSubTopicsFromProject() {
 		if (!emptyStringTrimmed(gcp_resource_path)) {
-			topic_items = await GcpTriggerService.listGoogleTopics({
-				workspace: $workspaceStore!,
-				path: gcp_resource_path
-			})
+			try {
+				loadingTopic = true
+				topic_items = await GcpTriggerService.listGoogleTopics({
+					workspace: $workspaceStore!,
+					path: gcp_resource_path
+				})
+			} catch (error) {
+				sendUserToast(error.body, true)
+			}
+			loadingTopic = false
 		}
 	}
 
 	async function loadAllSubscriptionFromGooglePubSubTopic() {
 		if (!emptyStringTrimmed(gcp_resource_path) && !emptyStringTrimmed(topic_id)) {
-			subscription_items = await GcpTriggerService.listAllTgoogleTopicSubscriptions({
-				workspace: $workspaceStore!,
-				path: gcp_resource_path,
-				requestBody: {
-					topic_id
-				}
-			})
+			try {
+				loadingSubscription = true
+				subscription_items = await GcpTriggerService.listAllTgoogleTopicSubscriptions({
+					workspace: $workspaceStore!,
+					path: gcp_resource_path,
+					requestBody: {
+						topic_id
+					}
+				})
+			} catch (error) {
+				sendUserToast(error.body, true)
+			}
+			loadingSubscription = false
 		}
 	}
 
@@ -95,8 +106,6 @@
 	}
 </script>
 
-<DarkModeObserver bind:darkMode />
-
 <div>
 	<Section label="GCP Pub/Sub" {headless}>
 		<svelte:fragment slot="header">
@@ -120,42 +129,41 @@
 				</div>
 			</Subsection>
 
-			<div class="flex flex-col gap-1">
-				<Subsection
-					label="Topic"
-					tooltip="Select the Pub/Sub topic that this subscription will be attached to. Messages published to this topic will be delivered to your subscription."
-				>
-					<div class="flex gap-1 mt-2">
-						<Select
-							class="grow shrink max-w-full"
-							on:change={(e) => {
-								topic_id = e.detail.value
-								loadAllSubscriptionFromGooglePubSubTopic()
-							}}
-							on:clear={() => {
-								topic_id = ''
-							}}
-							value={topic_id}
-							items={topic_items}
-							placeholder="Choose a topic"
-							inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-							containerStyles={darkMode
-								? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-								: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
-							portal={false}
-						/>
-						<Button
-							disabled={!can_write}
-							variant="border"
-							color="light"
-							wrapperClasses="self-stretch"
-							on:click={loadAllPubSubTopicsFromProject}
-							startIcon={{ icon: RefreshCw }}
-							iconOnly
-						/>
-					</div>
-				</Subsection>
-			</div>
+			{#if gcp_resource_path}
+				<div class="flex flex-col gap-1">
+					<Subsection
+						label="Topic"
+						tooltip="Select the Pub/Sub topic that this subscription will be attached to. Messages published to this topic will be delivered to your subscription."
+					>
+						<div class="flex flex-row gap-1 mt-2">
+							<Select
+								loading={loadingTopic}
+								disablePortal
+								clearable
+								class="grow shrink"
+								bind:value={
+									() => topic_id,
+									(t) => {
+										topic_id = t
+										loadAllSubscriptionFromGooglePubSubTopic()
+									}
+								}
+								items={topic_items.map((value) => ({ value }))}
+								placeholder="Choose a topic"
+							/>
+							<Button
+								disabled={!can_write}
+								variant="border"
+								color="light"
+								wrapperClasses="self-stretch"
+								on:click={loadAllPubSubTopicsFromProject}
+								startIcon={{ icon: RefreshCw }}
+								iconOnly
+							/>
+						</div>
+					</Subsection>
+				</div>
+			{/if}
 			{#if !emptyStringTrimmed(gcp_resource_path) && !emptyStringTrimmed(topic_id)}
 				<Section
 					label="Subscription"
@@ -264,22 +272,17 @@
 							<div class="flex flex-col gap-3">
 								<div class="flex gap-1">
 									<Select
-										class="grow shrink max-w-full"
-										on:change={(e) => {
-											subscription_id = e.detail.value
-											cloud_subscription_id = e.detail.value
-										}}
-										on:clear={() => {
-											subscription_id = ''
-										}}
-										value={cloud_subscription_id}
-										items={subscription_items}
+										loading={loadingSubscription}
+										disablePortal
+										clearable
+										class="grow shrink"
+										bind:value={
+											() => cloud_subscription_id,
+											(t) => ((subscription_id = t), (cloud_subscription_id = t))
+										}
+										onClear={() => (subscription_id = '')}
+										items={subscription_items.map((value) => ({ value }))}
 										placeholder="Choose a subscription"
-										inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-										containerStyles={darkMode
-											? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-											: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
-										portal={false}
 									/>
 									<Button
 										disabled={!can_write}
diff --git a/frontend/src/lib/components/triggers/http/RouteEditor.svelte b/frontend/src/lib/components/triggers/http/RouteEditor.svelte
index 00914e8172..79f1fa40ab 100644
--- a/frontend/src/lib/components/triggers/http/RouteEditor.svelte
+++ b/frontend/src/lib/components/triggers/http/RouteEditor.svelte
@@ -1,12 +1,14 @@
 <script lang="ts">
 	import { tick } from 'svelte'
 	import RouteEditorInner from './RouteEditorInner.svelte'
+	import type { EditHttpTrigger, HttpTrigger } from '$lib/gen'
 
 	interface Props {
 		onUpdate?: (cfg?: Record<string, any>) => void
+		customSaveBehavior?: (cfg: HttpTrigger | EditHttpTrigger) => void
 	}
 
-	let { onUpdate = undefined }: Props = $props()
+	let { onUpdate = undefined, customSaveBehavior }: Props = $props()
 
 	let open = $state(false)
 	export async function openEdit(ePath: string, isFlow: boolean) {
@@ -29,5 +31,5 @@
 </script>
 
 {#if open}
-	<RouteEditorInner {onUpdate} bind:this={drawer} />
+	<RouteEditorInner {customSaveBehavior} {onUpdate} bind:this={drawer} />
 {/if}
diff --git a/frontend/src/lib/components/triggers/http/RouteEditorInner.svelte b/frontend/src/lib/components/triggers/http/RouteEditorInner.svelte
index 6d2be0b264..a0b9291f21 100644
--- a/frontend/src/lib/components/triggers/http/RouteEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/http/RouteEditorInner.svelte
@@ -46,7 +46,8 @@
 		onUpdate = undefined,
 		onDelete = undefined,
 		onReset = undefined,
-		trigger = undefined
+		trigger = undefined,
+		customSaveBehavior = undefined
 	} = $props()
 
 	// Form data state
@@ -198,27 +199,27 @@
 		}, 100) // if loading takes less than 100ms, we don't show the loader
 		try {
 			drawer?.openDrawer()
-			is_flow = nis_flow
+			is_flow = defaultValues?.is_flow ?? nis_flow
 			edit = false
 			itemKind = nis_flow ? 'flow' : 'script'
-			is_async = false
-			authentication_method = 'none'
+			is_async = defaultValues?.is_async ?? false
+			authentication_method = defaultValues?.authentication_method ?? 'none'
 			route_path = defaultValues?.route_path ?? ''
 			dirtyRoutePath = false
 			http_method = defaultValues?.http_method ?? 'post'
 			initialScriptPath = ''
 			fixedScriptPath = fixedScriptPath_ ?? ''
 			script_path = fixedScriptPath
-			static_asset_config = undefined
-			s3FileUploadRawMode = false
+			static_asset_config = defaultValues?.static_asset_config ?? undefined
+			s3FileUploadRawMode = defaultValues?.s3FileUploadRawMode ?? false
 			path = defaultValues?.path ?? ''
 			initialPath = ''
 			dirtyPath = false
-			is_static_website = false
-			workspaced_route = false
-			authentication_resource_path = ''
+			is_static_website = defaultValues?.is_static_website ?? false
+			workspaced_route = defaultValues?.workspaced_route ?? false
+			authentication_resource_path = defaultValues?.authentication_resource_path ?? ''
 			variable_path = ''
-			signature_options_type = 'custom_signature'
+			signature_options_type = defaultValues?.signature_options_type ?? 'custom_signature'
 			raw_string = defaultValues?.raw_string ?? false
 			wrap_body = defaultValues?.wrap_body ?? false
 		} finally {
@@ -271,21 +272,26 @@
 	}
 
 	async function triggerScript(): Promise<void> {
-		deploymentLoading = true
-		const saveCfg = routeConfig
-		const isSaved = await saveHttpRouteFromCfg(
-			initialPath,
-			saveCfg,
-			edit,
-			$workspaceStore!,
-			!!$userStore?.is_admin || !!$userStore?.is_super_admin,
-			usedTriggerKinds
-		)
-		if (isSaved) {
-			onUpdate(saveCfg.path)
+		if (customSaveBehavior) {
+			customSaveBehavior(routeConfig)
 			drawer?.closeDrawer()
+		} else {
+			deploymentLoading = true
+			const saveCfg = routeConfig
+			const isSaved = await saveHttpRouteFromCfg(
+				initialPath,
+				saveCfg,
+				edit,
+				$workspaceStore!,
+				!!$userStore?.is_admin || !!$userStore?.is_super_admin,
+				usedTriggerKinds
+			)
+			if (isSaved) {
+				onUpdate(saveCfg.path)
+				drawer?.closeDrawer()
+			}
+			deploymentLoading = false
 		}
-		deploymentLoading = false
 	}
 
 	function getRouteConfig(): Record<string, any> {
@@ -296,6 +302,7 @@
 			authentication_method === 'signature' && signature_options_type === 'custom_script'
 				? 'custom_script'
 				: authentication_method
+
 		const nCfg = {
 			script_path,
 			is_flow,
@@ -312,6 +319,7 @@
 			is_static_website,
 			extra_perms: extraPerms
 		}
+
 		return nCfg
 	}
 
@@ -498,7 +506,7 @@
 									allowEdit={!$userStore?.operator}
 								/>
 
-								{#if script_path === undefined}
+								{#if emptyString(script_path)}
 									<Button
 										btnClasses="ml-4 mt-2"
 										color="dark"
diff --git a/frontend/src/lib/components/triggers/http/RoutesGenerator.svelte b/frontend/src/lib/components/triggers/http/RoutesGenerator.svelte
new file mode 100644
index 0000000000..4011ccf215
--- /dev/null
+++ b/frontend/src/lib/components/triggers/http/RoutesGenerator.svelte
@@ -0,0 +1,321 @@
+<script lang="ts">
+	import { HttpTriggerService, type EditHttpTrigger, type NewHttpTrigger } from '$lib/gen'
+	import { Pen, Save } from 'lucide-svelte'
+	import Button from '../../common/button/Button.svelte'
+	import ToggleButton from '../../common/toggleButton-v2/ToggleButton.svelte'
+	import ToggleButtonGroup from '../../common/toggleButton-v2/ToggleButtonGroup.svelte'
+	import Section from '../../Section.svelte'
+	import SimpleEditor from '../../SimpleEditor.svelte'
+	import Subsection from '../../Subsection.svelte'
+	import RouteEditor from './RouteEditor.svelte'
+	import { generateHttpTriggerFromOpenApi, type Source } from './utils'
+	import { isCloudHosted } from '$lib/cloud'
+	import { usedTriggerKinds, workspaceStore } from '$lib/stores'
+	import FileInput from '../../common/fileInput/FileInput.svelte'
+	import { emptyStringTrimmed, sendUserToast } from '$lib/utils'
+	import FolderPicker from '../../FolderPicker.svelte'
+	import Required from '$lib/components/Required.svelte'
+	import { Drawer, DrawerContent } from '$lib/components/common'
+	import { get } from 'svelte/store'
+
+	type Props = {
+		closeFn: () => Promise<void>
+	}
+
+	let { closeFn }: Props = $props()
+
+	let routeEditor: RouteEditor
+	let routesGenerator: Drawer
+
+	let selected: Source = $state('OpenAPI')
+	let openApiUrl = $state('')
+	let openApiFile = $state('')
+	let openApiRawEditorValue = $state('')
+	let openApiFileEditorValue = $state('')
+	let openApiUrlEditorValue = $state('')
+	let isGeneratingHttpRoutes = $state(false)
+	let httpTriggers: NewHttpTrigger[] = $state([])
+	let isFetchingOpenApiSpec = $state(false)
+	let folderName: string = $state('')
+	let forceRerender = $state(false)
+	let code: string = $state('')
+	let isCreating = $state(false)
+	let acceptedFileTypes: string[] = ['.json', '.yaml']
+
+	let callback: ((cfg: NewHttpTrigger | EditHttpTrigger) => void) | undefined = $state(undefined)
+
+	let lang: 'yaml' | 'json' = $derived.by(() => {
+		if (code.trimStart().startsWith('{')) {
+			return 'json'
+		}
+
+		return 'yaml'
+	})
+
+	function openRouteEditor(_path: string, newHttpTrigger: NewHttpTrigger) {
+		routeEditor.openNew(false, '', newHttpTrigger)
+	}
+
+	let isValidUrl = $derived.by(() => {
+		try {
+			const parsed = new URL(openApiUrl)
+			return /^https?:/.test(parsed.protocol)
+		} catch (err) {
+			return false
+		}
+	})
+
+	export function openDrawer() {
+		routesGenerator.openDrawer()
+	}
+
+	async function fetchOpenApiConfig() {
+		try {
+			isFetchingOpenApiSpec = true
+			const response = await fetch(openApiUrl)
+
+			const data = await response.text()
+			openApiUrlEditorValue = data
+			code = data
+			forceRerender = !forceRerender
+		} catch (error) {
+			sendUserToast(error.message || error, true)
+		} finally {
+			isFetchingOpenApiSpec = false
+		}
+	}
+
+	async function saveHttpTrigger() {
+		try {
+			isCreating = true
+			const message = await HttpTriggerService.createHttpTriggers({
+				workspace: $workspaceStore!,
+				requestBody: httpTriggers
+			})
+			sendUserToast(message)
+			await closeFn()
+			routesGenerator.closeDrawer()
+			if (!get(usedTriggerKinds).includes('http')) {
+				usedTriggerKinds.update((t) => [...t, 'http'])
+			}
+			//reset
+			selected = 'OpenAPI'
+			openApiUrl = ''
+			openApiFile = ''
+			openApiRawEditorValue = ''
+			openApiFileEditorValue = ''
+			openApiUrlEditorValue = ''
+			httpTriggers = []
+			folderName = ''
+			code = ''
+		} catch (error) {
+			sendUserToast(error.body, true)
+		} finally {
+			isCreating = false
+		}
+	}
+
+	async function generateHttpTrigger() {
+		try {
+			isGeneratingHttpRoutes = true
+			httpTriggers = await generateHttpTriggerFromOpenApi(code, folderName)
+			if (httpTriggers.length === 0) {
+				sendUserToast('No paths defined in the OpenAPI spec. Cannot generate HTTP routes.', true)
+			}
+		} catch (error) {
+			sendUserToast(error.message || 'An unexpected error occurred', true)
+		} finally {
+			isGeneratingHttpRoutes = false
+		}
+	}
+</script>
+
+<RouteEditor customSaveBehavior={callback} bind:this={routeEditor} />
+
+<Drawer size="700px" bind:this={routesGenerator}>
+	<DrawerContent
+		title={'Generate HTTP routes from OpenAPI spec'}
+		on:close={() => routesGenerator.closeDrawer()}
+	>
+		<svelte:fragment slot="actions">
+			<Button
+				size="sm"
+				loading={isCreating}
+				disabled={httpTriggers.length === 0}
+				startIcon={{ icon: Save }}
+				on:click={saveHttpTrigger}
+			>
+				Save routes
+			</Button>
+		</svelte:fragment>
+		{@render config()}
+	</DrawerContent>
+</Drawer>
+
+{#snippet config()}
+	<div class="h-full">
+		<Section label="HTTP routes generator" headless wrapperClass="h-full">
+			<div class="flex flex-col gap-1 h-full">
+				<Subsection>
+					<div class="flex flex-col gap-1">
+						<p class="text-xs text-tertiary">
+							Pick a folder to bind the generated HTTP routes to.<Required required={true} />
+						</p>
+						<FolderPicker bind:folderName />
+					</div>
+				</Subsection>
+
+				{#if !emptyStringTrimmed(folderName)}
+					<Subsection>
+						<ToggleButtonGroup
+							on:selected={({ detail }) => {
+								if (selected === 'OpenAPI') {
+									openApiRawEditorValue = code
+								} else if (selected === 'OpenAPI_File') {
+									openApiFileEditorValue = code
+								} else {
+									openApiUrlEditorValue = code
+								}
+
+								const type = detail as Source
+
+								if (type === 'OpenAPI') {
+									code = openApiRawEditorValue
+								} else if (type === 'OpenAPI_File') {
+									code = openApiFileEditorValue
+								} else {
+									code = openApiUrlEditorValue
+								}
+								forceRerender = !forceRerender
+							}}
+							bind:selected
+							let:item
+						>
+							<ToggleButton
+								tooltip="Paste an OpenAPI JSON/YAML specification directly to generate HTTP routes."
+								showTooltipIcon
+								label="Paste OpenAPI spec"
+								value="OpenAPI"
+								{item}
+							/>
+							<ToggleButton
+								tooltip="Upload an OpenAPI file in JSON/YAML format to generate HTTP routes."
+								showTooltipIcon
+								label="From OpenAPI file"
+								value="OpenAPI_File"
+								{item}
+							/>
+							<ToggleButton
+								tooltip="Provide a publicly accessible URL to an OpenAPI specification in JSON/YAML format to generate HTTP routes."
+								showTooltipIcon
+								label="From OpenAPI URL"
+								value="OpenAPI_URL"
+								{item}
+							/>
+						</ToggleButtonGroup>
+
+						<div class="flex flex-col gap-2 mt-2">
+							{#if selected === 'OpenAPI'}
+								<ToggleButtonGroup bind:selected={lang} let:item>
+									<ToggleButton value="yaml" label="YAML" {item} />
+									<ToggleButton value="json" label="JSON" {item} />
+								</ToggleButtonGroup>
+							{:else if selected === 'OpenAPI_File'}
+								<FileInput
+									accept={acceptedFileTypes.join(',')}
+									multiple={false}
+									convertTo={'text'}
+									iconSize={24}
+									returnFileNames={true}
+									class="text-sm py-4"
+									on:change={async ({ detail }) => {
+										if (detail && detail.length > 0) {
+											if (openApiFile.endsWith('.json')) {
+												lang = 'json'
+											} else {
+												lang = 'yaml'
+											}
+											code = detail[0].data
+											openApiFileEditorValue = code
+											openApiFile = detail[0].name as string
+											forceRerender = !forceRerender
+											return
+										}
+										openApiFile = ''
+									}}
+								/>
+							{:else if selected === 'OpenAPI_URL'}
+								<div class="flex flex-row gap-1">
+									<input type="text" placeholder="OpenAPI URL" bind:value={openApiUrl} />
+									<Button
+										color="light"
+										spacingSize="sm"
+										size="xs"
+										loading={isFetchingOpenApiSpec}
+										disabled={!isValidUrl}
+										on:click={fetchOpenApiConfig}
+									>
+										Fetch
+									</Button>
+								</div>
+							{/if}
+							{#if selected === 'OpenAPI' || (selected === 'OpenAPI_File' && !emptyStringTrimmed(openApiFile)) || (selected === 'OpenAPI_URL' && !emptyStringTrimmed(openApiUrl))}
+								{#key forceRerender}
+									<SimpleEditor class="h-96" {lang} bind:code />
+								{/key}
+							{/if}
+							<Button
+								spacingSize="sm"
+								size="xs"
+								btnClasses="h-8"
+								loading={isGeneratingHttpRoutes}
+								on:click={generateHttpTrigger}
+								disabled={code.length === 0}
+								color="light"
+								variant="border">Generate HTTP routes</Button
+							>
+						</div>
+					</Subsection>
+
+					<div class="flex flex-col gap-1 mb-2">
+						{#each httpTriggers as httpTrigger, index}
+							<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 justify-between mt-2"
+							>
+								<div>
+									<div class="text-primary">
+										{httpTrigger.http_method.toUpperCase()}
+										{isCloudHosted() || httpTrigger.workspaced_route
+											? $workspaceStore! + '/' + httpTrigger.route_path
+											: httpTrigger.route_path}
+									</div>
+									<div class="text-secondary text-xs truncate text-left font-light">
+										{httpTrigger.path}
+									</div>
+								</div>
+
+								<div class="flex gap-2 items-center justify-end">
+									<Button
+										on:click={() => {
+											callback = (newHttpTrigger) => {
+												httpTriggers[index] = newHttpTrigger as NewHttpTrigger
+												httpTriggers = httpTriggers
+											}
+											openRouteEditor(httpTriggers[index].path, httpTriggers[index])
+										}}
+										size="xs"
+										startIcon={{ icon: Pen }}
+										color="gray"
+									>
+										Edit
+									</Button>
+								</div>
+							</div>
+						{/each}
+					</div>
+				{/if}
+			</div>
+		</Section>
+	</div>
+{/snippet}
diff --git a/frontend/src/lib/components/triggers/http/utils.ts b/frontend/src/lib/components/triggers/http/utils.ts
index 04734b2c81..45bde0db02 100644
--- a/frontend/src/lib/components/triggers/http/utils.ts
+++ b/frontend/src/lib/components/triggers/http/utils.ts
@@ -1,7 +1,11 @@
 import { base } from '$lib/base'
 import { isCloudHosted } from '$lib/cloud'
+import { random_adj } from '$lib/components/random_positive_adjetive'
+import type { HttpMethod, NewHttpTrigger } from '$lib/gen'
 import { HttpTriggerService } from '$lib/gen/services.gen'
 import { sendUserToast } from '$lib/toast'
+import { generateRandomString, OpenApi as WindmillOpenApi } from '$lib/utils'
+import { type OpenAPI } from 'openapi-types'
 import type { Writable } from 'svelte/store'
 import { get } from 'svelte/store'
 
@@ -76,3 +80,75 @@ export async function saveHttpRouteFromCfg(
 		return false
 	}
 }
+
+export type Source = 'OpenAPI' | 'OpenAPI_File' | 'OpenAPI_URL'
+
+function convertOpenApiPathToRoutePath(openApiPath: string) {
+	return openApiPath.replace(/{([^}]+)}/g, ':$1').slice(1)
+}
+
+const MAX_PATH_LEN = 255
+
+function generateFolderPath(folderName: string, summary?: string) {
+	let suffix: string
+	const prefix = `f/${folderName}/`
+	if (!summary) {
+		suffix = `${random_adj()}_${generateRandomString(6)}`
+	} else {
+		const remainingLen = MAX_PATH_LEN - prefix.length
+		if (summary.length > remainingLen) {
+			suffix = summary.substring(0, remainingLen).replaceAll(' ', '_')
+		} else {
+			suffix = summary.replaceAll(' ', '_')
+		}
+	}
+
+	return prefix.concat(suffix).toLocaleLowerCase()
+}
+
+function processOpenApiDocument(
+	document: OpenAPI.Document,
+	folderName: string,
+	_version?: WindmillOpenApi.OpenApiVersion
+) {
+	const paths = document.paths
+
+	const httpTrigger: NewHttpTrigger[] = []
+
+	for (const path in paths) {
+		const pathItem = paths[path]
+		if (!pathItem) continue
+
+		const methods: HttpMethod[] = ['get', 'post', 'put', 'patch', 'delete']
+
+		for (const method of methods) {
+			const routeDetail = pathItem[method]
+			if (!routeDetail) continue
+
+			httpTrigger.push({
+				route_path: convertOpenApiPathToRoutePath(path),
+				http_method: method,
+				authentication_method: 'none',
+				workspaced_route: false,
+				is_async: true,
+				script_path: '',
+				raw_string: false,
+				is_flow: false,
+				is_static_website: false,
+				wrap_body: false,
+				path: generateFolderPath(folderName, routeDetail.summary)
+			})
+		}
+	}
+
+	return httpTrigger
+}
+
+export async function generateHttpTriggerFromOpenApi(
+	api: string,
+	folderName: string
+): Promise<NewHttpTrigger[]> {
+	const [document] = await WindmillOpenApi.parse(api)
+
+	return processOpenApiDocument(document, folderName)
+}
diff --git a/frontend/src/lib/components/triggers/postgres/PostgresCapture.svelte b/frontend/src/lib/components/triggers/postgres/PostgresCapture.svelte
index 6e1238d7df..410b7cef50 100644
--- a/frontend/src/lib/components/triggers/postgres/PostgresCapture.svelte
+++ b/frontend/src/lib/components/triggers/postgres/PostgresCapture.svelte
@@ -5,7 +5,7 @@
 
 	interface Props {
 		captureInfo?: CaptureInfo | undefined
-		postgres_resource_path?: string
+		isValid: boolean
 		hasPreprocessor?: boolean
 		isFlow?: boolean
 		captureLoading?: boolean
@@ -14,8 +14,8 @@
 
 	let {
 		captureInfo = undefined,
-		postgres_resource_path = '',
 		hasPreprocessor = false,
+		isValid = false,
 		isFlow = false,
 		captureLoading = false,
 		triggerDeployed = false
@@ -25,7 +25,7 @@
 {#if captureInfo}
 	<CaptureSection
 		captureType="postgres"
-		disabled={!postgres_resource_path}
+		disabled={!isValid}
 		{captureInfo}
 		on:captureToggle
 		on:applyArgs
diff --git a/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte
index 7e54029571..a0c45e33ba 100644
--- a/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte
@@ -70,33 +70,39 @@
 	let drawer: Drawer | undefined = $state(undefined)
 	let is_flow: boolean = $state(false)
 	let initialPath = $state('')
-	let edit = $state(true)
+	let edit: boolean = $state(true)
 	let itemKind: 'flow' | 'script' = $state('script')
-	let script_path = $state('')
-	let initialScriptPath = $state('')
-	let fixedScriptPath = $state('')
+	let script_path: string = $state('')
+	let initialScriptPath: string = $state('')
+	let fixedScriptPath: string = $state('')
 	let path: string = $state('')
 	let pathError = $state('')
-	let enabled = $state(false)
-	let dirtyPath = $state(false)
-	let can_write = $state(true)
-	let drawerLoading = $state(true)
-	let showLoading = $state(false)
-	let postgres_resource_path = $state('')
+	let enabled: boolean = $state(false)
+	let dirtyPath: boolean = $state(false)
+	let can_write: boolean = $state(true)
+	let drawerLoading: boolean = $state(true)
+	let showLoading: boolean = $state(false)
+	let postgres_resource_path: string = $state('')
 	let publication_name: string = $state('')
 	let replication_slot_name: string = $state('')
 	let relations: Relations[] | undefined = $state([])
 	let transaction_to_track: string[] = $state([])
 	let language: Language = 'Typescript'
 	let loading = $state(false)
+	let postgresVersion: string = $state('')
+	let loadingPostgres: boolean = $state(false)
 	type actions = 'create' | 'get'
 	let selectedPublicationAction: actions | undefined = $state(undefined)
 	let selectedSlotAction: actions | undefined = $state(undefined)
 	let publicationItems: string[] = $state([])
 	let transactionType: string[] = ['Insert', 'Update', 'Delete']
 	let tab: 'advanced' | 'basic' = $state('basic')
+	let basic_mode = $derived(tab === 'basic')
 	let initialConfig: Record<string, any> | undefined = undefined
 	let deploymentLoading = $state(false)
+	let creatingSlot: boolean = $state(false)
+	let creatingPublication: boolean = $state(false)
+	let pg14: boolean = $derived(postgresVersion.startsWith('14'))
 
 	const errorMessage = $derived.by(() => {
 		if (relations && relations.length > 0) {
@@ -108,16 +114,6 @@
 		return ''
 	})
 
-	const isValid = $derived(
-		!emptyString(postgres_resource_path) &&
-			!emptyString(script_path) &&
-			!emptyString(publication_name) &&
-			!emptyString(replication_slot_name) &&
-			!errorMessage
-	)
-	const postgresConfig = $derived.by(getSaveCfg)
-	const captureConfig = $derived.by(isEditor ? getCaptureConfig : () => ({}))
-
 	function isAdvancedTab(t: 'advanced' | 'basic'): boolean {
 		return t === 'advanced'
 	}
@@ -126,20 +122,26 @@
 		return t === 'basic'
 	}
 
-	let saveDisabled = $derived(
-		pathError !== '' ||
-			emptyString(postgres_resource_path) ||
-			emptyString(script_path) ||
-			(isAdvancedTab(tab) && emptyString(replication_slot_name)) ||
-			emptyString(publication_name) ||
-			(relations && isBasicTab(tab) && relations.length === 0) ||
-			transaction_to_track.length === 0 ||
-			drawerLoading ||
-			!can_write
+	const isValid = $derived(
+		!emptyString(postgres_resource_path) &&
+			transaction_to_track.length > 0 &&
+			((isAdvancedTab(tab) &&
+				!emptyString(replication_slot_name) &&
+				!emptyString(publication_name)) ||
+				(isBasicTab(tab) && (!relations || relations.length > 0))) &&
+			!errorMessage
+	)
+
+	const postgresConfig = $derived.by(getSaveCfg)
+	const captureConfig = $derived.by(isEditor ? getCaptureConfig : () => ({}))
+
+	const saveDisabled = $derived(
+		pathError !== '' || emptyString(script_path) || drawerLoading || !can_write || !isValid
 	)
 
 	async function createPublication() {
 		try {
+			creatingPublication = true
 			const message = await PostgresTriggerService.createPostgresPublication({
 				path: postgres_resource_path,
 				publication: publication_name as string,
@@ -153,11 +155,14 @@
 			sendUserToast(message)
 		} catch (error) {
 			sendUserToast(error.body, true)
+		} finally {
+			creatingPublication = false
 		}
 	}
 
 	async function createSlot() {
 		try {
+			creatingSlot = true
 			const message = await PostgresTriggerService.createPostgresReplicationSlot({
 				path: postgres_resource_path,
 				workspace: $workspaceStore!,
@@ -168,6 +173,8 @@
 			sendUserToast(message)
 		} catch (error) {
 			sendUserToast(error.body, true)
+		} finally {
+			creatingSlot = false
 		}
 	}
 
@@ -318,6 +325,7 @@
 	function getCaptureConfig() {
 		return {
 			postgres_resource_path,
+			basic_mode,
 			publication:
 				!edit || tab === 'basic'
 					? {
@@ -395,6 +403,25 @@
 			handleConfigChange(postgresConfig, initialConfig, saveDisabled, edit, onConfigChange)
 		}
 	})
+
+	$effect(() => {
+		if (postgres_resource_path) {
+			loadingPostgres = true
+			PostgresTriggerService.getPostgresVersion({
+				workspace: $workspaceStore!,
+				path: postgres_resource_path
+			})
+				.then((version: string) => {
+					postgresVersion = version
+				})
+				.catch((error: any) => {
+					sendUserToast(error.body, true)
+				})
+				.finally(() => {
+					loadingPostgres = false
+				})
+		}
+	})
 </script>
 
 {#if useDrawer}
@@ -448,8 +475,10 @@
 {#snippet content()}
 	{#if drawerLoading}
 		{#if showLoading}
-			<Loader2 size="50" class="animate-spin" />
-			<p>Loading...</p>
+			<div class="flex flex-col items-center justify-center h-full w-full">
+				<Loader2 size="50" class="animate-spin" />
+				<p>Loading...</p>
+			</div>
 		{/if}
 	{:else}
 		<div class="flex flex-col gap-4">
@@ -497,7 +526,7 @@
 							allowEdit={!$userStore?.operator}
 						/>
 
-						{#if emptyStringTrimmed(script_path) && is_flow === false}
+						{#if emptyString(script_path) && is_flow === false}
 							<div class="flex">
 								<Button
 									disabled={!can_write}
@@ -538,8 +567,12 @@
 						/>
 						<CheckPostgresRequirement bind:postgres_resource_path bind:can_write />
 					</div>
-
-					{#if postgres_resource_path}
+					{#if loadingPostgres}
+						<div class="flex flex-col items-center justify-center h-full w-full">
+							<Loader2 size="50" class="animate-spin" />
+							<p>Loading...</p>
+						</div>
+					{:else if postgres_resource_path}
 						<Label label="Transactions">
 							{#snippet header()}
 								<Tooltip>
@@ -633,7 +666,7 @@
 								<svelte:fragment slot="content">
 									<div class="mt-5 overflow-hidden bg-surface">
 										<TabContent value="basic">
-											<RelationPicker {can_write} bind:relations disabled={!can_write} />
+											<RelationPicker {can_write} bind:pg14 bind:relations disabled={!can_write} />
 										</TabContent>
 										<TabContent value="advanced">
 											<div class="flex flex-col gap-6"
@@ -665,6 +698,7 @@
 																	disabled={!can_write}
 																/>
 																<Button
+																	loading={creatingSlot}
 																	color="light"
 																	size="xs"
 																	variant="border"
@@ -720,6 +754,7 @@
 																	placeholder={'Publication Name'}
 																/>
 																<Button
+																	loading={creatingPublication}
 																	color="light"
 																	size="xs"
 																	variant="border"
@@ -740,7 +775,12 @@
 																disabled={!can_write}
 															/>
 														{/if}
-														<RelationPicker {can_write} bind:relations disabled={!can_write} />
+														<RelationPicker
+															bind:pg14
+															{can_write}
+															bind:relations
+															disabled={!can_write}
+														/>
 													</div>
 												</Section></div
 											>
diff --git a/frontend/src/lib/components/triggers/postgres/PublicationPicker.svelte b/frontend/src/lib/components/triggers/postgres/PublicationPicker.svelte
index 840d9a6856..428bfd68f0 100644
--- a/frontend/src/lib/components/triggers/postgres/PublicationPicker.svelte
+++ b/frontend/src/lib/components/triggers/postgres/PublicationPicker.svelte
@@ -1,8 +1,6 @@
 <script lang="ts">
-	import Select from '$lib/components/apps/svelte-select/lib/Select.svelte'
 	import { Button } from '$lib/components/common'
-	import DarkModeObserver from '$lib/components/DarkModeObserver.svelte'
-	import { SELECT_INPUT_DEFAULT_STYLE } from '$lib/defaults'
+	import Select from '$lib/components/Select.svelte'
 	import type { Relations } from '$lib/gen'
 	import { PostgresTriggerService } from '$lib/gen/services.gen'
 	import { workspaceStore } from '$lib/stores'
@@ -18,8 +16,12 @@
 	export let transaction_to_track: string[] = []
 	export let disabled: boolean = false
 
+	let loadingPublication: boolean = false
+	let deletingPublication: boolean = false
+	let updatingPublication: boolean = false
 	async function listDatabasePublication() {
 		try {
+			loadingPublication = true
 			const publications = await PostgresTriggerService.listPostgresPublication({
 				path: postgres_resource_path,
 				workspace: $workspaceStore!
@@ -28,11 +30,14 @@
 			items = publications
 		} catch (error) {
 			sendUserToast(error.body, true)
+		} finally {
+			loadingPublication = false
 		}
 	}
 
 	async function updatePublication() {
 		try {
+			updatingPublication = true
 			const message = await PostgresTriggerService.updatePostgresPublication({
 				path: postgres_resource_path,
 				workspace: $workspaceStore!,
@@ -45,11 +50,14 @@
 			sendUserToast(message)
 		} catch (error) {
 			sendUserToast(error.body, true)
+		} finally {
+			updatingPublication = false
 		}
 	}
 
 	async function deletePublication() {
 		try {
+			deletingPublication = true
 			const message = await PostgresTriggerService.deletePostgresPublication({
 				path: postgres_resource_path,
 				workspace: $workspaceStore!,
@@ -62,6 +70,8 @@
 			sendUserToast(message)
 		} catch (error) {
 			sendUserToast(error.body, true)
+		} finally {
+			deletingPublication = false
 		}
 	}
 
@@ -83,31 +93,19 @@
 	}
 
 	listDatabasePublication()
-
-	let darkMode = false
+	$: publication_name && getAllRelations()
 </script>
 
-<DarkModeObserver bind:darkMode />
-
 <div class="flex gap-1">
 	<Select
+		loading={loadingPublication}
 		disabled={!can_write || disabled}
-		class="grow shrink max-w-full"
-		on:select={async (e) => {
-			publication_name = e.detail.value
-			await getAllRelations()
-		}}
-		on:clear={() => {
-			publication_name = ''
-		}}
-		value={publication_name}
-		{items}
+		class="grow shrink"
+		bind:value={publication_name}
+		items={items.map((value) => ({ value }))}
 		placeholder="Choose a publication"
-		inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-		containerStyles={darkMode
-			? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-			: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
-		portal={false}
+		clearable
+		disablePortal
 	/>
 	<Button
 		disabled={!can_write || disabled}
@@ -119,6 +117,7 @@
 		iconOnly
 	/>
 	<Button
+		loading={updatingPublication}
 		color="light"
 		size="xs"
 		variant="border"
@@ -126,6 +125,7 @@
 		on:click={updatePublication}>Update</Button
 	>
 	<Button
+		loading={deletingPublication}
 		color="light"
 		size="xs"
 		variant="border"
diff --git a/frontend/src/lib/components/triggers/postgres/RelationPicker.svelte b/frontend/src/lib/components/triggers/postgres/RelationPicker.svelte
index b720cea4ae..86468bbf1e 100644
--- a/frontend/src/lib/components/triggers/postgres/RelationPicker.svelte
+++ b/frontend/src/lib/components/triggers/postgres/RelationPicker.svelte
@@ -5,32 +5,57 @@
 	import Tooltip from '$lib/components/Tooltip.svelte'
 	import type { Relations } from '$lib/gen'
 	import { Plus, Trash, X } from 'lucide-svelte'
-	import MultiSelect from 'svelte-multiselect'
-	import { invalidRelations } from './utils'
+	import { getDefaultTableToTrack, invalidRelations } from './utils'
 	import AddPropertyFormV2 from '$lib/components/schema/AddPropertyFormV2.svelte'
 	import Label from '$lib/components/Label.svelte'
 	import { emptyStringTrimmed, sendUserToast } from '$lib/utils'
+	import MultiSelect from 'svelte-multiselect'
 
 	export let relations: Relations[] | undefined = undefined
 	export let can_write: boolean = true
 	export let disabled: boolean = false
-	let selected: 'all' | 'specific' = relations && relations.length > 0 ? 'specific' : 'all'
+	export let pg14: boolean = false
+
+	$: selected = relations && relations.length > 0 ? 'specific' : 'all'
+
 	let cached: Relations[] | undefined = relations
 
-	function addTable(name: string, index: number) {
-		if (!relations || !Array.isArray(relations)) {
-			relations = [
-				{
-					schema_name: 'public',
-					table_to_track: []
-				}
-			]
-		}
-		relations[index].table_to_track = relations[index].table_to_track.concat({
-			table_name: name,
-			columns_name: []
+	$: if (pg14 && relations) {
+		relations.forEach((relation) => {
+			if (relation.table_to_track.length === 0) {
+				relation.table_to_track.push({ table_name: '' })
+			} else {
+				relation.table_to_track.forEach((table_to_track) => {
+					if (table_to_track.columns_name) {
+						table_to_track.columns_name = undefined
+					}
+					if (!emptyStringTrimmed(table_to_track.where_clause)) {
+						table_to_track.where_clause = undefined
+					}
+				})
+			}
 		})
 	}
+
+	function addTable(name: string, index: number) {
+		if (relations) {
+			relations[index].table_to_track = relations[index].table_to_track.concat({
+				table_name: name,
+				columns_name: []
+			})
+		}
+	}
+
+	function updateRelationsFor(i: number, updateFn: (r: Relations) => Relations) {
+		if (relations) {
+			relations = relations.map((r, index) => {
+				if (i === index) {
+					r = updateFn(r)
+				}
+				return r
+			})
+		}
+	}
 </script>
 
 <div class="flex flex-col gap-4 h-full">
@@ -42,12 +67,16 @@
 						cached = relations
 						relations = undefined
 					} else {
-						relations = cached ?? [
-							{
-								schema_name: 'public',
-								table_to_track: []
+						if (!cached || cached.length === 0) {
+							if (!relations || relations.length == 0) {
+								relations = getDefaultTableToTrack(pg14)
+								cached = relations
+							} else {
+								cached = relations
 							}
-						]
+						} else {
+							relations = cached
+						}
 					}
 				}}
 				bind:selected
@@ -95,7 +124,6 @@
 											{disabled}
 										/>
 									</Label>
-									<!-- svelte-ignore a11y-label-has-associated-control -->
 									<Label label="Columns">
 										<svelte:fragment slot="header">
 											<Tooltip
@@ -109,12 +137,22 @@
 												</p>
 												<p class="text-xs text-gray-500 mt-1">
 													<strong class="font-semibold">Note:</strong>
-													<br />- If your trigger contains <strong>UPDATE</strong> or
+													<br />
+													-
+													<strong
+														>Column-specific tracking is only supported in PostgreSQL 15 and above.</strong
+													>
+													<br />
+													- In PostgreSQL 14, all columns will be tracked automatically and selective
+													tracking will be disabled.
+													<br />
+													- If your trigger contains <strong>UPDATE</strong> or
 													<strong>DELETE</strong>
 													transactions, the row filter WHERE clause must contain only columns covered
 													by the <strong>replica identity</strong> (see REPLICA IDENTITY).
-													<br />- If your trigger contains only <strong>INSERT</strong> transactions,
-													the row filter WHERE clause can use any column.
+													<br />
+													- If your trigger contains only <strong>INSERT</strong> transactions, the row
+													filter WHERE clause can use any column.
 												</p>
 											</Tooltip>
 										</svelte:fragment>
@@ -127,26 +165,42 @@
 												outerDivClass="!bg-surface !min-h-[38px] !border-[#d1d5db]"
 												noMatchingOptionsMsg=""
 												createOptionMsg={null}
+												disabled={pg14}
 												duplicates={false}
 												selected={table_to_track.columns_name ?? []}
 												placeholder="Select columns"
 												--sms-options-margin="4px"
-												{disabled}
 												onchange={(e) => {
 													const option = e.option?.toString()
-													if (e.type === 'add') {
-														option && table_to_track.columns_name?.push(option)
-													} else if (e.type === 'remove') {
-														table_to_track.columns_name = table_to_track.columns_name?.filter(
-															(column) => column !== option
-														)
-													} else if (e.type === 'removeAll') {
-														table_to_track.columns_name = []
-													} else {
-														console.error(
-															`Priority tags multiselect - unknown event type: '${e.type}'`
-														)
-													}
+													updateRelationsFor(i, (rel) => {
+														const updatedTables = rel.table_to_track.map((t, idx) => {
+															if (idx !== j) return t
+
+															let updatedColumns = t.columns_name ?? []
+
+															if (e.type === 'add' && option) {
+																updatedColumns = [...updatedColumns, option]
+															} else if (e.type === 'remove') {
+																updatedColumns = updatedColumns.filter((col) => col !== option)
+															} else if (e.type === 'removeAll') {
+																updatedColumns = []
+															} else {
+																console.error(
+																	`Priority tags multiselect - unknown event type: '${e.type}'`
+																)
+															}
+
+															return {
+																...t,
+																columns_name: updatedColumns
+															}
+														})
+
+														return {
+															...rel,
+															table_to_track: updatedTables
+														}
+													})
 												}}
 											>
 												<svelte:fragment slot="remove-icon">
@@ -172,20 +226,30 @@
 												</p>
 												<p class="text-xs text-gray-500 mt-1">
 													<strong class="font-semibold">Note:</strong>
-													<br />- If your trigger contains <strong>UPDATE</strong> or
+													<br />
+													-
+													<strong
+														>Row filtering with WHERE clauses is only supported in PostgreSQL 15 and
+														above.</strong
+													>
+													<br />
+													- In PostgreSQL 14, row filtering is not available and this field is disabled.
+													<br />
+													- If your trigger contains <strong>UPDATE</strong> or
 													<strong>DELETE</strong>
 													transactions, the row filter WHERE clause must contain only columns covered
 													by the <strong>replica identity</strong> (see REPLICA IDENTITY).
-													<br />- If your trigger contains only <strong>INSERT</strong> transactions,
-													the row filter WHERE clause can use any column.
+													<br />
+													- If your trigger contains only <strong>INSERT</strong> transactions, the row
+													filter WHERE clause can use any column.
 												</p>
 											</Tooltip>
 										</svelte:fragment>
 										<input
+											disabled={pg14}
 											type="text"
 											bind:value={table_to_track.where_clause}
 											class="!bg-surface mt-1"
-											{disabled}
 										/>
 									</Label>
 									<Button
@@ -195,7 +259,17 @@
 										color="light"
 										size="xs"
 										on:click={() => {
-											v.table_to_track = v.table_to_track.filter((_, index) => index !== j)
+											if (pg14 && v.table_to_track.length > 1) {
+												updateRelationsFor(i, (r) => ({
+													...r,
+													table_to_track: r.table_to_track.filter((_, idx) => idx !== j)
+												}))
+											} else if (!pg14) {
+												updateRelationsFor(i, (r) => ({
+													...r,
+													table_to_track: r.table_to_track.filter((_, idx) => idx !== j)
+												}))
+											}
 										}}
 										iconOnly
 										startIcon={{ icon: Trash }}
@@ -250,25 +324,20 @@
 				customName="Schema"
 				on:add={({ detail }) => {
 					if (relations == undefined || !Array.isArray(relations)) {
-						relations = []
-						relations = relations.concat({
-							schema_name: 'public',
-							table_to_track: []
-						})
+						relations = getDefaultTableToTrack(pg14)
 					} else if (emptyStringTrimmed(detail.name)) {
 						sendUserToast('Schema name must not be empty', true)
 					} else {
-						const appendedRelations = relations.concat({
-							schema_name: detail.name,
-							table_to_track: []
-						})
 						if (
-							invalidRelations(appendedRelations, {
+							invalidRelations(relations, {
 								showError: true,
 								trackSchemaTableError: false
 							}) === ''
 						) {
-							relations = appendedRelations
+							relations = relations.concat({
+								schema_name: detail.name,
+								table_to_track: pg14 ? [{ table_name: '' }] : []
+							})
 						}
 					}
 				}}
diff --git a/frontend/src/lib/components/triggers/postgres/SlotPicker.svelte b/frontend/src/lib/components/triggers/postgres/SlotPicker.svelte
index 5265f18350..6d3c2557de 100644
--- a/frontend/src/lib/components/triggers/postgres/SlotPicker.svelte
+++ b/frontend/src/lib/components/triggers/postgres/SlotPicker.svelte
@@ -1,8 +1,6 @@
 <script lang="ts">
-	import Select from '$lib/components/apps/svelte-select/lib/Select.svelte'
 	import { Button } from '$lib/components/common'
-	import DarkModeObserver from '$lib/components/DarkModeObserver.svelte'
-	import { SELECT_INPUT_DEFAULT_STYLE } from '$lib/defaults'
+	import Select from '$lib/components/Select.svelte'
 	import { PostgresTriggerService } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
 	import { sendUserToast } from '$lib/toast'
@@ -13,9 +11,13 @@
 	export let replication_slot_name: string = ''
 	export let postgres_resource_path: string = ''
 	export let disabled: boolean = false
+
+	let deletingSlot: boolean = false
+	let loadingSlot: boolean = false
 	let items: (string | undefined)[] = []
 	async function listDatabaseSlot() {
 		try {
+			loadingSlot = true
 			const result = await PostgresTriggerService.listPostgresReplicationSlot({
 				path: postgres_resource_path,
 				workspace: $workspaceStore!
@@ -41,11 +43,14 @@
 			}
 		} catch (error) {
 			sendUserToast(error.body, true)
+		} finally {
+			loadingSlot = false
 		}
 	}
 
 	async function deleteSlot() {
 		try {
+			deletingSlot = true
 			const message = await PostgresTriggerService.deletePostgresReplicationSlot({
 				path: postgres_resource_path,
 				workspace: $workspaceStore!,
@@ -58,33 +63,24 @@
 			sendUserToast(message)
 		} catch (error) {
 			sendUserToast(error.body, true)
+		} finally {
+			deletingSlot = false
 		}
 	}
 
 	listDatabaseSlot()
-
-	let darkMode = false
 </script>
 
-<DarkModeObserver bind:darkMode />
-
 <div class="flex gap-1">
 	<Select
+		loading={loadingSlot}
 		class="grow shrink max-w-full"
-		on:select={(e) => {
-			replication_slot_name = e.detail.value
-		}}
-		on:clear={() => {
-			replication_slot_name = ''
-		}}
-		value={replication_slot_name}
-		{items}
+		bind:value={replication_slot_name}
+		onClear={() => (replication_slot_name = '')}
+		items={items.map((value) => ({ value }))}
 		placeholder="Choose a slot name"
-		inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
-		containerStyles={darkMode
-			? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
-			: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
-		portal={false}
+		disablePortal
+		clearable
 		{disabled}
 	/>
 	<Button
@@ -97,6 +93,7 @@
 		{disabled}
 	/>
 	<Button
+		loading={deletingSlot}
 		color="light"
 		size="xs"
 		variant="border"
diff --git a/frontend/src/lib/components/triggers/postgres/utils.ts b/frontend/src/lib/components/triggers/postgres/utils.ts
index 8122da726d..15045e00e0 100644
--- a/frontend/src/lib/components/triggers/postgres/utils.ts
+++ b/frontend/src/lib/components/triggers/postgres/utils.ts
@@ -147,3 +147,12 @@ export async function savePostgresTriggerFromCfg(
 		return false
 	}
 }
+
+export function getDefaultTableToTrack(pg14: boolean): Relations[] {
+	return [
+		{
+			schema_name: 'public',
+			table_to_track: pg14 ? [{ table_name: '' }] : []
+		}
+	]
+}
diff --git a/frontend/src/lib/components/triggers/triggers.svelte.ts b/frontend/src/lib/components/triggers/triggers.svelte.ts
index 5f40fb6126..916d4202fe 100644
--- a/frontend/src/lib/components/triggers/triggers.svelte.ts
+++ b/frontend/src/lib/components/triggers/triggers.svelte.ts
@@ -20,7 +20,7 @@ import type { Writable } from 'svelte/store'
 import type { TriggerType } from './utils'
 import type { UserExt } from '$lib/stores'
 import type { ScheduleTrigger } from '../triggers'
-import { canWrite, formatCron } from '$lib/utils'
+import { canWrite, formatCron, generateRandomString } from '$lib/utils'
 
 export class Triggers {
 	#triggers = $state<Trigger[]>([])
@@ -94,7 +94,7 @@ export class Triggers {
 		const primaryScheduleExists = this.#triggers.some((t) => t.type === 'schedule' && t.isPrimary)
 
 		// Create the new draft trigger
-		const draftId = crypto.randomUUID()
+		const draftId = generateRandomString()
 		const isPrimary = type === 'schedule' && !primaryScheduleExists
 		const newTrigger = {
 			id: draftId,
diff --git a/frontend/src/lib/components/wizards/AppPicker.svelte b/frontend/src/lib/components/wizards/AppPicker.svelte
index 2d08435b81..6dd15edf18 100644
--- a/frontend/src/lib/components/wizards/AppPicker.svelte
+++ b/frontend/src/lib/components/wizards/AppPicker.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { getContext, onMount } from 'svelte'
-	import Select from '../apps/svelte-select/lib/Select.svelte'
+	import SelectLegacy from '../apps/svelte-select/lib/SelectLegacy.svelte'
 	import { SELECT_INPUT_DEFAULT_STYLE } from '$lib/defaults'
 	import DarkModeObserver from '../DarkModeObserver.svelte'
 	import { userStore, workspaceStore } from '$lib/stores'
@@ -44,7 +44,7 @@
 <DarkModeObserver bind:darkMode />
 
 <div class="flex flex-col gap-2 w-full">
-	<Select
+	<SelectLegacy
 		class="grow shrink max-w-full"
 		on:change={(e) => {
 			value = e.detail.value
diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts
index 6c2bde6431..a2519a9d41 100644
--- a/frontend/src/lib/utils.ts
+++ b/frontend/src/lib/utils.ts
@@ -11,21 +11,90 @@ import { deepEqual } from 'fast-equals'
 import YAML from 'yaml'
 import { type UserExt } from './stores'
 import { sendUserToast } from './toast'
-import type { Job, Script } from './gen'
+import type { Job, Script, ScriptLang } from './gen'
 import type { EnumType, SchemaProperty } from './common'
 import type { Schema } from './common'
 export { sendUserToast }
 import type { AnyMeltElement } from '@melt-ui/svelte'
 import type { RunsSelectionMode } from './components/runs/RunsBatchActionsDropdown.svelte'
 import type { TriggerKind } from './components/triggers'
+import { validate, dereference } from '@scalar/openapi-parser'
+
+export namespace OpenApi {
+	export enum OpenApiVersion {
+		V2,
+		V3,
+		V3_1
+	}
+
+	export function isV2(doc: OpenAPI.Document): doc is OpenAPIV2.Document {
+		return 'swagger' in doc && doc.swagger === '2.0'
+	}
+
+	export function isV3(doc: OpenAPI.Document): doc is OpenAPIV3.Document {
+		return 'openapi' in doc && typeof doc.openapi === 'string' && doc.openapi.startsWith('3.0')
+	}
+
+	export function isV3_1(doc: OpenAPI.Document): doc is OpenAPIV3_1.Document {
+		return 'openapi' in doc && typeof doc.openapi === 'string' && doc.openapi.startsWith('3.1')
+	}
+
+	export function getOpenApiVersion(version: string): OpenApiVersion {
+		if (version.startsWith('2.0')) {
+			return OpenApiVersion.V2
+		} else if (version.startsWith('3.0')) {
+			return OpenApiVersion.V3
+		} else {
+			return OpenApiVersion.V3_1
+		}
+	}
+
+	/**
+	 * Parses and validates an OpenAPI specification provided as a string in either JSON or YAML format.
+	 *
+	 * @param api - A string containing a valid OpenAPI specification in JSON or YAML format.
+	 * @returns A promise that resolves to a tuple:
+	 *   - The first element is the validated OpenAPI document.
+	 *   - The second element is the detected OpenAPI version (2, 3.0, or 3.1).
+	 *
+	 * @throws Will throw an error if the specification is invalid or cannot be parsed.
+	 */
+	export async function parse(api: string): Promise<[OpenAPI.Document, OpenApiVersion]> {
+		const { valid, errors } = await validate(api)
+
+		if (!valid) {
+			const errorMessage = errors
+				? errors.map((error) => error.message).join('\n')
+				: 'Invalid OpenAPI document'
+			throw new Error(errorMessage)
+		}
+
+		const document = await dereference(api)
+
+		const version = getOpenApiVersion(document.version!)
+
+		return [document.schema, version]
+	}
+}
 
 export function isJobCancelable(j: Job): boolean {
 	return j.type === 'QueuedJob' && !j.schedule_path && !j.canceled
 }
+
 export function isJobReRunnable(j: Job): boolean {
 	return (j.job_kind === 'script' || j.job_kind === 'flow') && j.parent_job === undefined
 }
 
+export const WORKER_NAME_PREFIX = 'wk'
+export const AGENT_WORKER_NAME_PREFIX = 'ag'
+const SSH_AGENT_WORKER_SUFFIX = '/ssh'
+
+export function isAgentWorkerShell(workerName: string) {
+	return (
+		workerName.startsWith(AGENT_WORKER_NAME_PREFIX) && workerName.endsWith(SSH_AGENT_WORKER_SUFFIX)
+	)
+}
+
 export function isJobSelectable(selectionType: RunsSelectionMode) {
 	const f: (j: Job) => boolean = {
 		cancel: isJobCancelable,
@@ -211,6 +280,8 @@ interface ClickOutsideOptions {
 	exclude?: (() => Promise<HTMLElement[]>) | HTMLElement[] | undefined
 	stopPropagation?: boolean
 	customEventName?: string
+	// on:click_outside cannot be used with svelte 5
+	onClickOutside?: (event: MouseEvent) => void
 }
 
 export function clickOutside(
@@ -245,6 +316,7 @@ export function clickOutside(
 					event.stopPropagation()
 				}
 				node.dispatchEvent(new CustomEvent<MouseEvent>('click_outside', { detail: event }))
+				if (typeof options === 'object') options.onClickOutside?.(event)
 			}
 		}
 
@@ -566,6 +638,10 @@ export function formatCron(inp: string): string {
 	}
 }
 
+export function scriptLangArrayToCommaList(languages: ScriptLang[]): string {
+	return languages.join(',')
+}
+
 export function cronV1toV2(inp: string): string {
 	let splitted = inp.split(' ')
 	splitted = splitted.filter(String)
@@ -1279,6 +1355,7 @@ export function getOS() {
 import { type ClassValue, clsx } from 'clsx'
 import { twMerge } from 'tailwind-merge'
 import type { Snippet } from 'svelte'
+import type { OpenAPI, OpenAPIV2, OpenAPIV3, OpenAPIV3_1 } from 'openapi-types'
 
 export function cn(...inputs: ClassValue[]) {
 	return twMerge(clsx(inputs))
diff --git a/frontend/src/lib/zIndexes.ts b/frontend/src/lib/zIndexes.ts
index c578681651..5dcc315202 100644
--- a/frontend/src/lib/zIndexes.ts
+++ b/frontend/src/lib/zIndexes.ts
@@ -4,6 +4,7 @@ export const zIndexes = {
 	splitPanelHandle: 1001,
 	colorInput: 1002,
 	disposables: 1100, // Modals and Drawers
+	aiChat: 1200,
 	svelteSelectOptions: 5000,
 	popover: 5001,
 	contextMenu: 6000,
diff --git a/frontend/src/routes/(root)/(logged)/+layout.svelte b/frontend/src/routes/(root)/(logged)/+layout.svelte
index dc3876ffc5..bc26efb9e4 100644
--- a/frontend/src/routes/(root)/(logged)/+layout.svelte
+++ b/frontend/src/routes/(root)/(logged)/+layout.svelte
@@ -43,7 +43,7 @@
 	import { SUPERADMIN_SETTINGS_HASH, USER_SETTINGS_HASH } from '$lib/components/sidebar/settings'
 	import { isCloudHosted } from '$lib/cloud'
 	import { syncTutorialsTodos } from '$lib/tutorialUtils'
-	import { ArrowLeft, Search } from 'lucide-svelte'
+	import { ArrowLeft, Search, WandSparkles } from 'lucide-svelte'
 	import { getUserExt } from '$lib/user'
 	import { workspaceAIClients } from '$lib/components/copilot/lib'
 	import { twMerge } from 'tailwind-merge'
@@ -53,7 +53,10 @@
 	import { setContext } from 'svelte'
 	import { base } from '$app/paths'
 	import { Menubar } from '$lib/components/meltComponents'
-
+	import { aiChatManager } from '$lib/components/copilot/chat/AIChatManager.svelte'
+	import { Pane, Splitpanes } from 'svelte-splitpanes'
+	import AiChat from '$lib/components/copilot/chat/AIChat.svelte'
+	import { zIndexes } from '$lib/zIndexes'
 	OpenAPI.WITH_CREDENTIALS = true
 	let menuOpen = false
 	let globalSearchModal: GlobalSearchModal | undefined = undefined
@@ -367,7 +370,7 @@
 	{#if mountModal}
 		<CriticalAlertModal bind:muteSettings bind:numUnacknowledgedCriticalAlerts />
 	{/if}
-	<div>
+	<div class="h-screen flex flex-col">
 		{#if !menuHidden}
 			{#if !$userStore?.operator}
 				{#if innerWidth < 768}
@@ -449,6 +452,18 @@
 											class="!text-xs"
 											shortcut={`${getModifierKey()}k`}
 										/>
+										<MenuButton
+											stopPropagationOnClick={true}
+											on:click={() => aiChatManager.toggleOpen()}
+											isCollapsed={false}
+											icon={WandSparkles}
+											iconProps={{
+												forceDarkMode: true
+											}}
+											label="Ask AI"
+											class="!text-xs"
+											iconClasses="!text-violet-400 dark:!text-violet-400"
+										/>
 									</div>
 
 									<SidebarContent
@@ -508,6 +523,18 @@
 									class="!text-xs"
 									shortcut={`${getModifierKey()}k`}
 								/>
+								<MenuButton
+									stopPropagationOnClick={true}
+									on:click={() => aiChatManager.toggleOpen()}
+									{isCollapsed}
+									icon={WandSparkles}
+									iconProps={{
+										forceDarkMode: true
+									}}
+									label="Ask AI"
+									class="!text-xs"
+									iconClasses="!text-violet-400 dark:!text-violet-400"
+								/>
 							</div>
 
 							<SidebarContent
@@ -545,7 +572,7 @@
 			<div
 				class={classNames(
 					'fixed inset-0 dark:bg-[#1e232e] bg-[#202125] dark:bg-opacity-75 bg-opacity-75 transition-opacity ease-linear duration-300  !dark',
-					'opacity-0'
+					'opacity-0 pointer-events-none'
 				)}
 			>
 				<div class={twMerge('fixed inset-0 flex ', '-z-0')}>
@@ -607,6 +634,18 @@
 									class="!text-xs"
 									shortcut={`${getModifierKey()}k`}
 								/>
+								<MenuButton
+									stopPropagationOnClick={true}
+									on:click={() => aiChatManager.toggleOpen()}
+									{isCollapsed}
+									icon={WandSparkles}
+									iconProps={{
+										forceDarkMode: true
+									}}
+									label="Ask AI"
+									class="!text-xs"
+									iconClasses="!text-violet-400 dark:!text-violet-400"
+								/>
 							</div>
 
 							<SidebarContent
@@ -620,47 +659,64 @@
 				</div>
 			</div>
 		{/if}
-		<div
-			id="content"
-			class={classNames(
-				'w-full flex flex-col flex-1 h-full',
-				devOnly || $userStore?.operator ? '!pl-0' : isCollapsed ? 'md:pl-12' : 'md:pl-40',
-				'transition-all ease-in-out duration-200'
-			)}
-		>
-			<main class="min-h-screen">
-				<div class="relative w-full h-full">
-					<div
-						class={classNames(
-							'py-2 px-2 sm:px-4 md:px-8 flex justify-between items-center shadow-sm max-w-7xl mx-auto md:hidden',
-							devOnly || $userStore?.operator ? 'hidden' : ''
-						)}
-					>
-						<button
-							aria-label="Menu"
-							type="button"
-							on:click={() => {
-								menuOpen = true
-							}}
-							class="h-8 w-8 inline-flex items-center justify-center rounded-md text-tertiary hover:text-primary focus:outline-none focus:ring-2 focus:ring-inset focus:ring-indigo-500"
-						>
-							<svg
-								class="h-6 w-6"
-								xmlns="http://www.w3.org/2000/svg"
-								fill="none"
-								viewBox="0 0 24 24"
-								stroke-width="2"
-								stroke="currentColor"
-								aria-hidden="true"
+		<Splitpanes horizontal={false} class="flex-1 min-h-0">
+			<Pane size={99.8 - aiChatManager.size} minSize={50} class="flex flex-col min-h-0">
+				<div
+					id="content"
+					class={classNames(
+						'w-full flex-1 flex flex-col overflow-y-auto',
+						devOnly || $userStore?.operator ? '!pl-0' : isCollapsed ? 'md:pl-12' : 'md:pl-40',
+						'transition-all ease-in-out duration-200'
+					)}
+				>
+					<main class="flex-1 flex flex-col">
+						<div class="relative w-full flex-1 flex flex-col">
+							<div
+								class={classNames(
+									'pt-2 px-4 sm:px-4 flex flex-row justify-between items-center shadow-sm max-w-7xl md:hidden',
+									devOnly || $userStore?.operator ? 'hidden' : ''
+								)}
 							>
-								<path stroke-linecap="round" stroke-linejoin="round" d="M4 6h16M4 12h16M4 18h16" />
-							</svg>
-						</button>
-					</div>
-					<slot />
+								<button
+									aria-label="Menu"
+									type="button"
+									on:click={() => {
+										menuOpen = true
+									}}
+									class="h-8 w-8 inline-flex items-center justify-center rounded-md text-tertiary hover:text-primary focus:outline-none focus:ring-2 focus:ring-inset focus:ring-indigo-500"
+								>
+									<svg
+										class="h-6 w-6"
+										xmlns="http://www.w3.org/2000/svg"
+										fill="none"
+										viewBox="0 0 24 24"
+										stroke-width="2"
+										stroke="currentColor"
+										aria-hidden="true"
+									>
+										<path
+											stroke-linecap="round"
+											stroke-linejoin="round"
+											d="M4 6h16M4 12h16M4 18h16"
+										/>
+									</svg>
+								</button>
+							</div>
+							<div class="flex-1">
+								<slot />
+							</div>
+						</div>
+					</main>
 				</div>
-			</main>
-		</div>
+			</Pane>
+			<Pane
+				bind:size={aiChatManager.size}
+				minSize={15}
+				class={`flex flex-col min-h-0 z-[${zIndexes.aiChat}]`}
+			>
+				<AiChat />
+			</Pane>
+		</Splitpanes>
 	</div>
 {:else}
 	<CenteredModal title="Loading user...">
diff --git a/frontend/src/routes/(root)/(logged)/+page.svelte b/frontend/src/routes/(root)/(logged)/+page.svelte
index 784716770d..bfba2b4744 100644
--- a/frontend/src/routes/(root)/(logged)/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/+page.svelte
@@ -214,7 +214,7 @@
 </Drawer>
 
 <div>
-	<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 h-fit-content">
+	<div class="max-w-7xl mx-auto px-4 sm:px-8 md:px-8 h-fit-content">
 		{#if $workspaceStore == 'admins'}
 			<div class="my-4"></div>
 
@@ -227,7 +227,7 @@
 			<div class="flex flex-row gap-4 flex-wrap justify-end items-center">
 				{#if !$userStore?.operator}
 					<span class="text-sm text-secondary">Create a</span>
-					<CreateActionsScript />
+					<CreateActionsScript aiId="create-script-button" aiDescription="Creates a new script" />
 					{#if HOME_SHOW_CREATE_FLOW}<CreateActionsFlow />{/if}
 					{#if HOME_SHOW_CREATE_APP}<CreateActionsApp />{/if}
 				{/if}
diff --git a/frontend/src/routes/(root)/(logged)/resources/+page.svelte b/frontend/src/routes/(root)/(logged)/resources/+page.svelte
index 5816ba85f9..05fa69eba7 100644
--- a/frontend/src/routes/(root)/(logged)/resources/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/resources/+page.svelte
@@ -616,10 +616,23 @@
 			documentationLink="https://www.windmill.dev/docs/core_concepts/resources_and_types"
 		>
 			<div class="flex flex-row justify-end gap-4">
-				<Button variant="border" size="md" startIcon={{ icon: Plus }} on:click={startNewType}>
+				<Button
+					variant="border"
+					size="md"
+					startIcon={{ icon: Plus }}
+					on:click={startNewType}
+					aiId="resources-add-resource-type"
+					aiDescription="Add resource type"
+				>
 					Add resource type
 				</Button>
-				<Button size="md" startIcon={{ icon: Link }} on:click={() => appConnect.open?.()}>
+				<Button
+					size="md"
+					startIcon={{ icon: Link }}
+					on:click={() => appConnect.open?.()}
+					aiId="resources-add-resource"
+					aiDescription="Add resource"
+				>
 					Add resource
 				</Button>
 			</div>
diff --git a/frontend/src/routes/(root)/(logged)/routes/+page.svelte b/frontend/src/routes/(root)/(logged)/routes/+page.svelte
index f4ec5e51c1..2fc06e8425 100644
--- a/frontend/src/routes/(root)/(logged)/routes/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/routes/+page.svelte
@@ -11,7 +11,8 @@
 		displayDate,
 		getLocalSetting,
 		storeLocalSetting,
-		removeTriggerKindIfUnused
+		removeTriggerKindIfUnused,
+		sendUserToast
 	} from '$lib/utils'
 	import { base } from '$app/paths'
 	import CenteredPage from '$lib/components/CenteredPage.svelte'
@@ -43,12 +44,14 @@
 	import { ALL_DEPLOYABLE, isDeployable } from '$lib/utils_deployable'
 	import { isCloudHosted } from '$lib/cloud'
 	import { getHttpRoute } from '$lib/components/triggers/http/utils'
+	import RoutesGenerator from '$lib/components/triggers/http/RoutesGenerator.svelte'
 
 	type TriggerW = HttpTrigger & { canWrite: boolean }
 
 	let triggers: TriggerW[] = []
 	let shareModal: ShareModal
 	let loading = true
+	let routesGenerator: RoutesGenerator | undefined
 	let deploymentDrawer: DeployWorkspaceDrawer
 	let deployUiSettings: WorkspaceDeployUISettings | undefined = undefined
 
@@ -77,7 +80,6 @@
 		}
 	}
 	let routeEditor: RouteEditor
-
 	let filteredItems: (TriggerW & { marked?: any })[] | undefined = []
 	let items: typeof filteredItems | undefined = []
 	let preFilteredItems: typeof filteredItems | undefined = []
@@ -188,6 +190,8 @@
 <DeployWorkspaceDrawer bind:this={deploymentDrawer} />
 <RouteEditor onUpdate={loadTriggers} bind:this={routeEditor} />
 
+<RoutesGenerator closeFn={loadTriggers} bind:this={routesGenerator} />
+
 <SearchItems
 	{filter}
 	items={preFilteredItems}
@@ -208,9 +212,20 @@
 			documentationLink="https://www.windmill.dev/docs/core_concepts/http_routing"
 		>
 			{#if $userStore?.is_admin || $userStore?.is_super_admin}
-				<Button size="md" startIcon={{ icon: Plus }} on:click={() => routeEditor.openNew(false)}>
-					New&nbsp;route
-				</Button>
+				<div class="flex flex-row gap-2">
+					<Button
+						size="md"
+						startIcon={{ icon: Plus }}
+						on:click={() => {
+							routesGenerator?.openDrawer()
+						}}
+					>
+						From OpenAPI spec
+					</Button>
+					<Button size="md" startIcon={{ icon: Plus }} on:click={() => routeEditor.openNew(false)}>
+						New&nbsp;route
+					</Button>
+				</div>
 			{/if}
 		</PageHeader>
 		<div class="w-full h-full flex flex-col">
@@ -328,11 +343,16 @@
 												disabled:
 													!canWrite || !($userStore?.is_admin || $userStore?.is_super_admin),
 												action: async () => {
-													await HttpTriggerService.deleteHttpTrigger({
-														workspace: $workspaceStore ?? '',
-														path
-													})
-													loadTriggers()
+													try {
+														await HttpTriggerService.deleteHttpTrigger({
+															workspace: $workspaceStore ?? '',
+															path
+														})
+														sendUserToast(`Successfully deleted HTTP route: ${path}`)
+														loadTriggers()
+													} catch (error) {
+														sendUserToast(error.body || error.message, true)
+													}
 												}
 											},
 											{
diff --git a/frontend/src/routes/(root)/(logged)/schedules/+page.svelte b/frontend/src/routes/(root)/(logged)/schedules/+page.svelte
index ec1feb8aff..4b59add981 100644
--- a/frontend/src/routes/(root)/(logged)/schedules/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/schedules/+page.svelte
@@ -256,8 +256,14 @@
 			tooltip="Trigger Scripts and Flows according to a cron schedule"
 			documentationLink="https://www.windmill.dev/docs/core_concepts/scheduling"
 		>
-			<Button size="md" startIcon={{ icon: Plus }} on:click={() => scheduleEditor.openNew(false)}>
-				New&nbsp;schedule
+			<Button
+				size="md"
+				startIcon={{ icon: Plus }}
+				on:click={() => scheduleEditor.openNew(false)}
+				aiId="schedules-add-schedule"
+				aiDescription="Add schedule"
+			>
+				New schedule
 			</Button>
 		</PageHeader>
 		<div class="w-full h-full flex flex-col">
diff --git a/frontend/src/routes/(root)/(logged)/workers/+page.svelte b/frontend/src/routes/(root)/(logged)/workers/+page.svelte
index 7844029664..7d2393dfbf 100644
--- a/frontend/src/routes/(root)/(logged)/workers/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/workers/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import AssignableTags from '$lib/components/AssignableTags.svelte'
 	import CenteredPage from '$lib/components/CenteredPage.svelte'
-	import { Button, Skeleton, Tab, Tabs } from '$lib/components/common'
+	import { Alert, Button, Skeleton, Tab, Tabs } from '$lib/components/common'
 	import Popover from '$lib/components/meltComponents/Popover.svelte'
 	import Badge from '$lib/components/common/badge/Badge.svelte'
 	import Drawer from '$lib/components/common/drawer/Drawer.svelte'
@@ -24,8 +24,15 @@
 		userWorkspaces
 	} from '$lib/stores'
 	import { sendUserToast } from '$lib/toast'
-	import { displayDate, groupBy, pluralize, truncate } from '$lib/utils'
-	import { AlertTriangle, LineChart, List, Plus, Search } from 'lucide-svelte'
+	import {
+		AGENT_WORKER_NAME_PREFIX,
+		displayDate,
+		groupBy,
+		isAgentWorkerShell,
+		pluralize,
+		truncate
+	} from '$lib/utils'
+	import { AlertTriangle, LineChart, List, Plus, Search, Terminal } from 'lucide-svelte'
 	import { getContext, onDestroy, onMount } from 'svelte'
 	import AutoComplete from 'simple-svelte-autocomplete'
 
@@ -33,15 +40,14 @@
 	import { DEFAULT_TAGS_WORKSPACES_SETTING } from '$lib/consts'
 	import AutoscalingEvents from '$lib/components/AutoscalingEvents.svelte'
 	import HttpAgentWorkerDrawer from '$lib/components/HttpAgentWorkerDrawer.svelte'
+	import WorkerRepl from '$lib/components/WorkerRepl.svelte'
 
 	let workers: WorkerPing[] | undefined = undefined
 	let workerGroups: Record<string, any> | undefined = undefined
 	let groupedWorkers: [string, [string, WorkerPing[]][]][] = []
 	let intervalId: NodeJS.Timeout | undefined
-
 	const splitter = '_%%%_'
 	let customTags: string[] | undefined = undefined
-
 	$: groupedWorkers = groupWorkers(workers, workerGroups)
 
 	function groupWorkers(
@@ -145,7 +151,7 @@
 
 	let importConfigDrawer: Drawer | undefined = undefined
 	let importConfigCode = ''
-
+	let tag: string = ''
 	async function importSingleWorkerConfig(c: any) {
 		if (typeof c === 'object' && c !== null) {
 			if (!c.name || typeof c.name !== 'string') {
@@ -257,8 +263,12 @@
 
 		return Math.ceil(occupancy_rate * 100) + '%'
 	}
-
 	let newHttpAgentWorkerDrawer: Drawer | undefined = undefined
+	let replForWorkerDrawer: Drawer | undefined = undefined
+
+	function isWorkerMaybeAlive(last_ping: number | undefined): boolean | undefined {
+		return last_ping != undefined ? last_ping < 60 : undefined
+	}
 </script>
 
 {#if $superadmin}
@@ -291,6 +301,24 @@
 	</DrawerContent>
 </Drawer>
 
+<Drawer bind:this={replForWorkerDrawer} size="1000px">
+	<DrawerContent
+		title="Repl"
+		on:close={() => {
+			tag = ''
+			replForWorkerDrawer?.closeDrawer?.()
+		}}
+	>
+		<div class="flex flex-col gap-2">
+			<Alert title="Info" type="info" size="xs">
+				If no command has been run in the past 2 minutes, the next one may take up to 15 seconds to
+				start.
+			</Alert>
+			<WorkerRepl {tag} />
+		</div>
+	</DrawerContent>
+</Drawer>
+
 {#if $userStore?.operator && $workspaceStore && !$userWorkspaces.find((_) => _.id === $workspaceStore)?.operator_settings?.workers}
 	<div class="bg-red-100 border-l-4 border-red-600 text-orange-700 p-4 m-4 mt-12" role="alert">
 		<p class="font-bold">Unauthorized</p>
@@ -561,11 +589,20 @@
 									<Cell head>Memory usage<br />(Windmill)</Cell>
 									<Cell head>Limits</Cell>
 									<Cell head>Version</Cell>
-									<Cell head last>Liveness</Cell>
+									<Cell head>Liveness</Cell>
+									<Cell head last
+										>Live Shell <Tooltip>
+											<p class="text-sm">
+												Open a live shell to execute bash commands on the machine where the worker
+												runs — useful for quick access, inspection, and real-time debugging
+											</p>
+										</Tooltip></Cell
+									>
 								</tr>
 							</Head>
 							<tbody class="divide-y">
 								{#each worker_group[1] as [section, workers]}
+									{@const hostname = section?.split(splitter)?.[0]}
 									<tr class="border-t">
 										<Cell
 											first
@@ -578,7 +615,7 @@
 											<div class="flex flex-row w-full">
 												<div class="min-w-64">
 													Host:
-													<span class="font-semibold">{section?.split(splitter)?.[0]}</span>
+													<span class="font-semibold">{hostname}</span>
 												</div>
 												<span class="ml-4">IP: </span>
 												<span class="font-semibold">{workers[0].ip}</span>
@@ -589,11 +626,22 @@
 											</div>
 										</Cell>
 									</tr>
-
 									{#if workers}
+										{@const sshWorker = workers.find((worker) => {
+											return isAgentWorkerShell(worker.worker) && isWorkerMaybeAlive(worker.last_ping)
+										})?.worker}
 										{#each workers as { worker, custom_tags, last_ping, started_at, jobs_executed, last_job_id, last_job_workspace_id, occupancy_rate_15s, occupancy_rate_5m, occupancy_rate_30m, occupancy_rate, wm_version, vcpus, memory, memory_usage, wm_memory_usage }}
+											{@const isWorkerAlive = isWorkerMaybeAlive(last_ping)}
 											<tr>
-												<Cell first>{worker}</Cell>
+												<Cell first>
+													{@const underscorePos = worker.search('_')}
+													{#if underscorePos === -1}
+														{worker}
+													{:else}
+														{truncate(worker, underscorePos)}
+														<Tooltip>{worker}</Tooltip>
+													{/if}
+												</Cell>
 												<Cell>
 													{#if custom_tags && custom_tags?.length > 2}
 														{truncate(custom_tags?.join(', ') ?? '', 10)}
@@ -652,21 +700,49 @@
 														{wm_version.split('-')[0]}<Tooltip>{wm_version}</Tooltip>
 													</div>
 												</Cell>
-												<Cell last>
+												<Cell>
 													<Badge
-														color={last_ping != undefined
-															? last_ping < 60
+														color={isWorkerAlive != undefined
+															? isWorkerAlive
 																? 'green'
 																: 'red'
 															: 'gray'}
 													>
-														{last_ping != undefined
-															? last_ping < 60
+														{isWorkerAlive != undefined
+															? isWorkerAlive
 																? 'Alive'
 																: 'Dead'
 															: 'Unknown'}
 													</Badge>
 												</Cell>
+												<Cell last>
+													<Button
+														size="xs"
+														color="light"
+														on:click={() => {
+															if (isWorkerAlive === false) {
+																sendUserToast('Worker must be alive', true)
+																return
+															}
+															if (worker.startsWith(AGENT_WORKER_NAME_PREFIX)) {
+																if (!sshWorker) {
+																	sendUserToast(
+																		'Unexpected error could not find agent worker handling repl feature',
+																		true
+																	)
+																	return
+																}
+																tag = sshWorker
+															} else {
+																tag = hostname
+															}
+															replForWorkerDrawer?.openDrawer()
+														}}
+														startIcon={{ icon: Terminal }}
+													>
+														Command
+													</Button>
+												</Cell>
 											</tr>
 										{/each}
 									{/if}
diff --git a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
index 77593756cc..539018a5ab 100644
--- a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
@@ -644,46 +644,106 @@
 					goto(`?${$page.url.searchParams.toString()}`)
 				}}
 			>
-				<Tab size="xs" value="users">
+				<Tab
+					size="xs"
+					value="users"
+					aiId="workspace-settings-users"
+					aiDescription="Users workspace settings"
+				>
 					<div class="flex gap-2 items-center my-1"> Users</div>
 				</Tab>
-				<Tab size="xs" value="git_sync">
+				<Tab
+					size="xs"
+					value="git_sync"
+					aiId="workspace-settings-git-sync"
+					aiDescription="Git sync workspace settings"
+				>
 					<div class="flex gap-2 items-center my-1">Git Sync</div>
 				</Tab>
-				<Tab size="xs" value="deploy_to">
+				<Tab
+					size="xs"
+					value="deploy_to"
+					aiId="workspace-settings-deploy-to"
+					aiDescription="Deployment UI workspace settings"
+				>
 					<div class="flex gap-2 items-center my-1">Deployment UI</div>
 				</Tab>
 				{#if WORKSPACE_SHOW_SLACK_CMD}
-					<Tab size="xs" value="slack">
+					<Tab
+						size="xs"
+						value="slack"
+						aiId="workspace-settings-slack"
+						aiDescription="Slack / Teams workspace settings"
+					>
 						<div class="flex gap-2 items-center my-1"> Slack / Teams</div>
 					</Tab>
 				{/if}
 				{#if isCloudHosted()}
-					<Tab size="xs" value="premium">
+					<Tab
+						size="xs"
+						value="premium"
+						aiId="workspace-settings-premium"
+						aiDescription="Premium plans workspace settings"
+					>
 						<div class="flex gap-2 items-center my-1"> Premium Plans </div>
 					</Tab>
 				{/if}
 				{#if WORKSPACE_SHOW_WEBHOOK_CLI_SYNC}
-					<Tab size="xs" value="webhook">
+					<Tab
+						size="xs"
+						value="webhook"
+						aiId="workspace-settings-webhook"
+						aiDescription="Webhook workspace settings"
+					>
 						<div class="flex gap-2 items-center my-1">Webhook</div>
 					</Tab>
 				{/if}
-				<Tab size="xs" value="error_handler">
+				<Tab
+					size="xs"
+					value="error_handler"
+					aiId="workspace-settings-error-handler"
+					aiDescription="Error handler workspace settings"
+				>
 					<div class="flex gap-2 items-center my-1">Error Handler</div>
 				</Tab>
-				<Tab size="xs" value="ai">
+				<Tab
+					size="xs"
+					value="ai"
+					aiId="workspace-settings-ai"
+					aiDescription="Windmill AI workspace settings"
+				>
 					<div class="flex gap-2 items-center my-1">Windmill AI</div>
 				</Tab>
-				<Tab size="xs" value="windmill_lfs">
+				<Tab
+					size="xs"
+					value="windmill_lfs"
+					aiId="workspace-settings-windmill-lfs"
+					aiDescription="Object Storage (S3) workspace settings"
+				>
 					<div class="flex gap-2 items-center my-1"> Object Storage (S3)</div>
 				</Tab>
-				<Tab size="xs" value="default_app">
+				<Tab
+					size="xs"
+					value="default_app"
+					aiId="workspace-settings-default-app"
+					aiDescription="Default app workspace settings"
+				>
 					<div class="flex gap-2 items-center my-1"> Default App </div>
 				</Tab>
-				<Tab size="xs" value="encryption">
+				<Tab
+					size="xs"
+					value="encryption"
+					aiId="workspace-settings-encryption"
+					aiDescription="Encryption workspace settings"
+				>
 					<div class="flex gap-2 items-center my-1"> Encryption </div>
 				</Tab>
-				<Tab size="xs" value="general">
+				<Tab
+					size="xs"
+					value="general"
+					aiId="workspace-settings-general"
+					aiDescription="General workspace settings"
+				>
 					<div class="flex gap-2 items-center my-1"> General </div>
 				</Tab>
 			</Tabs>
diff --git a/frontend/src/routes/flows/dev/+page.svelte b/frontend/src/routes/flows/dev/+page.svelte
index 52ed7818ab..9c19209398 100644
--- a/frontend/src/routes/flows/dev/+page.svelte
+++ b/frontend/src/routes/flows/dev/+page.svelte
@@ -107,7 +107,8 @@
 			selectedTab: undefined,
 			editPanelSize: undefined,
 			payloadData: undefined
-		})
+		}),
+		currentEditor: writable(undefined)
 	})
 	setContext<PropPickerContext>('PropPickerContext', {
 		flowPropPickerConfig: writable<FlowPropPickerConfig | undefined>(undefined),
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index c9a7d7d5c9..de346e5a5c 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -43,7 +43,10 @@ const config = {
 	preview: {
 		port: 3000
 	},
-	plugins: [sveltekit(), ...(process.env.HTTPS === 'true' ? [mkcert()] : [])],
+	plugins: [
+		sveltekit(),
+		...(process.env.HTTPS === 'true' ? [mkcert()] : [])
+	],
 	define: {
 		__pkg__: version
 	},
diff --git a/lsp/Pipfile b/lsp/Pipfile
index ee923c3f00..9ca9575e78 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.493.2"
-wmill_pg = ">=1.493.2"
+wmill = ">=1.496.3"
+wmill_pg = ">=1.496.3"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index c5adfe40d4..9cab3a9551 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.493.2
+  version: 1.496.3
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 3063cfdbf5..32b446369b 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.493.2'
+    ModuleVersion     = '1.496.3'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
diff --git a/python-client/build.sh b/python-client/build.sh
index 76bfa4e736..780806388e 100755
--- a/python-client/build.sh
+++ b/python-client/build.sh
@@ -1,8 +1,22 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 mkdir openapi || true
-cp  ../backend/windmill-api/openapi.yaml openapi/openapi.yaml
+# cp  ../backend/windmill-api/openapi.yaml openapi/openapi.yaml
+
+LEGACY_WILDCARD="\$ref: \"..\/..\/openflow.openapi.yaml#\/components\/schemas\""
+# We will need to use old syntax of openapi to maintain compatability with previous windmill-api versions.
+# If we use new format, many models use another namespace, thus make it not fully compatible with old versions
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    # macOS version using perl
+    perl -0777 -pe "s/# -- INLINE START --\n.*?# -- INLINE END --\n/$LEGACY_WILDCARD\n/s" \
+        ../backend/windmill-api/openapi.yaml > openapi/openapi.yaml
+else
+    # Replace everything between markers with legacy wildcard
+    sed -z "
+        s/# -- INLINE START --\n.*# -- INLINE END --\n/$LEGACY_WILDCARD\n/g;
+    " ../backend/windmill-api/openapi.yaml > openapi/openapi.yaml
+fi
 
 npx @redocly/openapi-cli@latest bundle openapi/openapi.yaml > openapi-bundled.yaml
 
@@ -10,7 +24,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
     # sed -z is not supported on macOS, use perl instead
     perl -0777 -pe 's/FlowModuleValue:/FlowModuleValue2:/g' openapi-bundled.yaml > openapi-decycled.yaml
 else
-    sed -z 's/FlowModuleValue:/FlowModuleValue2:/' openapi-bundled.yaml > openapi-decycled.yaml
+  sed -z 's/FlowModuleValue:/FlowModuleValue2:/' openapi-bundled.yaml > openapi-decycled.yaml
 fi
 
 echo "    FlowModuleValue: {}" >> openapi-decycled.yaml
diff --git a/python-client/publish.sh b/python-client/publish.sh
index 54a18d9b0f..b6610ebf7f 100755
--- a/python-client/publish.sh
+++ b/python-client/publish.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 ./build.sh
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index d9e6a43f4b..ab09033ecf 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.493.2"
+version = "1.496.3"
 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_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index 8a15766a48..c16e6e3d78 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.493.2"
+version = "1.496.3"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index 8bc58c45c2..0e46d4699c 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.493.2",
+  "version": "1.496.3",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index b6fc492db9..a67cfc0279 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.493.2",
+  "version": "1.496.3",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index b99c89f1ea..3efb286dd1 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.493.2
+1.496.3