experiment: Add full flow executor with branch/loop support

Add flow_executor.rs that supports executing complex flows in local mode:
- ForloopFlow: iterate over arrays/ranges with sequential execution
- WhileloopFlow: execute modules while condition is true
- BranchOne: if/else branching based on conditions
- BranchAll: parallel branch execution (sequential for now)
- RawScript: inline script execution (bash, python, deno, bun)
- Identity: pass-through module

Key features:
- Uses windmill-common FlowValue types for compatibility
- Expression evaluation for input transforms with comparisons
- Proper flow status tracking with module results
- Recursive async execution with async_recursion crate

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

.claude/hooks/resolve-symlinks.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Resolve _ee.rs symlinks to actual files so Claude can read them
 # This script runs before each user prompt is processed
 

.claude/hooks/restore-symlinks.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Restore _ee.rs symlinks after Claude finishes processing
 # This script runs when Claude stops
 # IMPORTANT: Copies any modifications back to the target before restoring symlinks

.github/DockerfileBackendTests

@@ -28,7 +28,7 @@ ENV PATH="${PATH}:/usr/local/go/bin"
 ENV GO_PATH=/usr/local/go/bin/go
 
 # UV
-RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.4.18/uv-installer.sh | sh && mv /usr/local/cargo/bin/uv /usr/local/bin/uv
+RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.9.24/uv-installer.sh | sh && mv /usr/local/cargo/bin/uv /usr/local/bin/uv
 
 ENV TZ=Etc/UTC
 

.github/workflows/backend-test.yml

@@ -47,7 +47,7 @@ jobs:
           bun-version: 1.1.43
       - uses: astral-sh/setup-uv@v6.2.1
         with:
-          version: "0.6.2"
+          version: "0.9.24"
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           cache-workspaces: backend

.github/workflows/build-extra-image.yml

@@ -16,6 +16,13 @@ on:
 permissions: write-all
 
 jobs:
+  sleep:
+    runs-on: ubicloud
+    steps:
+      - name: Sleep for 900 seconds waiting for pypi to update index
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: sleep 900
+        shell: bash
   build_extra:
     runs-on: ubicloud
     steps:

.github/workflows/claude-fast.yml

@@ -65,7 +65,6 @@ jobs:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           allowed_bots: "windmill-internal-app[bot]"
           trigger_phrase: "/ai-fast"
-          plugins: "rust-analyzer-lsp@claude-plugins-official,typescript-lsp@claude-plugins-official"
           settings: |
             {
               "env": {

.github/workflows/claude.yml

@@ -97,7 +97,6 @@ jobs:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           allowed_bots: "windmill-internal-app[bot]"
           trigger_phrase: "/ai"
-          plugins: "rust-analyzer-lsp@claude-plugins-official,typescript-lsp@claude-plugins-official"
           settings: |
             {
               "env": {

.github/workflows/docker-image.yml

@@ -167,39 +167,6 @@ jobs:
             ${{ steps.meta-ee-public.outputs.labels }}
             org.opencontainers.image.licenses=Windmill-Enterprise-License
 
-  # disabled until we make it 100% reliable and add more meaningful tests
-  # playwright:
-  #   runs-on: [self-hosted, new]
-  #   needs: [build]
-  #   services:
-  #     postgres:
-  #       image: postgres
-  #       env:
-  #         POSTGRES_DB: windmill
-  #         POSTGRES_USER: admin
-  #         POSTGRES_PASSWORD: changeme
-  #       ports:
-  #         - 5432:5432
-  #       options: >-
-  #         --health-cmd pg_isready
-  #         --health-interval 10s
-  #         --health-timeout 5s
-  #         --health-retries 5
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - name: "Docker"
-  #       run: echo "::set-output name=id::$(docker run --network=host --rm -d -p 8000:8000 --privileged -it -e DATABASE_URL=postgres://admin:changeme@localhost:5432/windmill -e BASE_INTERNAL_URL=http://localhost:8000 ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest)"
-  #       id: docker-container
-  #     - uses: actions/setup-node@v3
-  #       with:
-  #         node-version: 16
-  #     - name: "Playwright run"
-  #       timeout-minutes: 2
-  #       run: cd frontend && npm ci @playwright/test && npx playwright install && export BASE_URL=http://localhost:8000 && npm run test
-  #     - name: "Clean up"
-  #       run: docker kill ${{ steps.docker-container.outputs.id }}
-  #       if: always()
-
   attach_amd64_binary_to_release:
     needs: [build, build_ee]
     runs-on: ubicloud

.github/workflows/publish_extra.yml

@@ -23,6 +23,7 @@ jobs:
 
   # Build and test the image before publishing
   test_extra:
+    needs: [sleep]
     runs-on: ubicloud-standard-8
     steps:
       - uses: actions/checkout@v4
@@ -50,10 +51,11 @@ jobs:
       - name: Start container
         run: |
           docker run -d --name windmill-extra-test \
-            -p 3001:3001 -p 3002:3002 -p 5679:5679 \
+            -p 3001:3001 -p 3002:3002 -p 3003:3003 \
             -e ENABLE_LSP=true \
             -e ENABLE_MULTIPLAYER=true \
             -e ENABLE_DEBUGGER=true \
+            -e DEBUGGER_PORT=3003 \
             -e REQUIRE_SIGNED_DEBUG_REQUESTS=false \
             windmill-extra:test
 

CHANGELOG.md

@@ -1,5 +1,211 @@
 # Changelog
 
+## [1.613.4](https://github.com/windmill-labs/windmill/compare/v1.613.3...v1.613.4) (2026-01-21)
+
+
+### Bug Fixes
+
+* update git sync CLI to 1.613.2 ([7848d36](https://github.com/windmill-labs/windmill/commit/7848d361a546ef8a2ef9fa20a0399f2e8473f685))
+
+## [1.613.3](https://github.com/windmill-labs/windmill/compare/v1.613.2...v1.613.3) (2026-01-21)
+
+
+### Bug Fixes
+
+* **cli:** normalize paths in wmill-lock for cross-platform compatibility ([#7645](https://github.com/windmill-labs/windmill/issues/7645)) ([8cf456d](https://github.com/windmill-labs/windmill/commit/8cf456d74c79921806edbcd0c9fde462f7202188))
+* update git sync CLI to 1.613.2 ([1e4fe01](https://github.com/windmill-labs/windmill/commit/1e4fe01293e65ac130b368fbef45a1571ee2b6d7))
+
+## [1.613.2](https://github.com/windmill-labs/windmill/compare/v1.613.1...v1.613.2) (2026-01-21)
+
+
+### Bug Fixes
+
+* azure read s3 proxy ([#7641](https://github.com/windmill-labs/windmill/issues/7641)) ([9e617a3](https://github.com/windmill-labs/windmill/commit/9e617a3979622a58ae022f9a74e2dde87a43c60e))
+* **cli:** skip branch-specific files when type is not configured ([#7643](https://github.com/windmill-labs/windmill/issues/7643)) ([287b7e7](https://github.com/windmill-labs/windmill/commit/287b7e7d971469db979e6951ee14764f6b91ed67))
+
+## [1.613.1](https://github.com/windmill-labs/windmill/compare/v1.613.0...v1.613.1) (2026-01-21)
+
+
+### Bug Fixes
+
+* fix microsoft SSO setting ([3f3df41](https://github.com/windmill-labs/windmill/commit/3f3df4163f9b6d99bc2c0f0284134b8b78f1ef6d))
+* isolate SvelteKit-specific imports for library usage ([203f678](https://github.com/windmill-labs/windmill/commit/203f6785c4ba9f7ace643259bf4e4a8f164288f3))
+
+## [1.613.0](https://github.com/windmill-labs/windmill/compare/v1.612.2...v1.613.0) (2026-01-20)
+
+
+### Features
+
+* **api:** add include_args query parameter to job list endpoints ([96dabee](https://github.com/windmill-labs/windmill/commit/96dabee22591adff5d6221e8628f7a1571b8d5a8))
+* **cli:** add workspace list command to show remote workspaces ([a08c52e](https://github.com/windmill-labs/windmill/commit/a08c52ec8f5323c645457b1dd7b32ef703fd86c4))
+* DuckDB support write to Azure ([#7618](https://github.com/windmill-labs/windmill/issues/7618)) ([73e86d9](https://github.com/windmill-labs/windmill/commit/73e86d9fc867aedb7221cf3da9df8ab573734d0f))
+* **mcp:** handle server oauth ([#7585](https://github.com/windmill-labs/windmill/issues/7585)) ([09adc58](https://github.com/windmill-labs/windmill/commit/09adc58a678da2d59d20e27a6b528b79843f122f))
+* otel REST tracing ([#7571](https://github.com/windmill-labs/windmill/issues/7571)) ([95df7b9](https://github.com/windmill-labs/windmill/commit/95df7b9a6a8ffcbca92b3249a61d97c32c9dbc4f))
+* **raw-apps:** add ctx input type for secure backend-resolved user context ([#7621](https://github.com/windmill-labs/windmill/issues/7621)) ([c143e78](https://github.com/windmill-labs/windmill/commit/c143e78d7fdd866b2e30c036ef48e907dda6ad6c))
+* **raw-apps:** add public URL and custom path support for raw apps ([#7630](https://github.com/windmill-labs/windmill/issues/7630)) ([baf060d](https://github.com/windmill-labs/windmill/commit/baf060df7474620b144e4a438274866bdfc41881))
+* **raw-apps:** enable hash-based routing with URL sync for shareable URLs ([#7624](https://github.com/windmill-labs/windmill/issues/7624)) ([3205949](https://github.com/windmill-labs/windmill/commit/32059499d5fa9aed1f8149f427732d1f0500dce5))
+
+
+### Bug Fixes
+
+* **cli:** recognize branch-specific folder files in getTypeStrFromPath ([6f35279](https://github.com/windmill-labs/windmill/commit/6f35279126b875d09af23d4618e86f87be064679))
+* **cli:** recognize branch-specific settings and encryption_key files ([5c1c682](https://github.com/windmill-labs/windmill/commit/5c1c682dcaa1a4ce80ee4de78b80c9ace395092a))
+* **frontend:** improve raw app history  ([#7625](https://github.com/windmill-labs/windmill/issues/7625)) ([687175c](https://github.com/windmill-labs/windmill/commit/687175c6a85f47c707bb429008c93ec0981c50e2))
+* **frontend:** set editor font size to the same default as text ([#7631](https://github.com/windmill-labs/windmill/issues/7631)) ([d884ddb](https://github.com/windmill-labs/windmill/commit/d884ddb7eb611f17a8e0ed41998953fb47b6cc21))
+* S3 advanced custom permissions ([#7632](https://github.com/windmill-labs/windmill/issues/7632)) ([1526d3a](https://github.com/windmill-labs/windmill/commit/1526d3ae2b3139bbfa23aef012bbe7f9b2132732))
+
+## [1.612.2](https://github.com/windmill-labs/windmill/compare/v1.612.1...v1.612.2) (2026-01-19)
+
+
+### Bug Fixes
+
+* add HIDE_WORKERS_FOR_NON_ADMINS env var and workspace-scoped custom_tags endpoint ([#7613](https://github.com/windmill-labs/windmill/issues/7613)) ([f33b799](https://github.com/windmill-labs/windmill/commit/f33b79936b8666242f2235d4fa6d4e7488123194))
+* **mcp:** fix empty args format + sanitize tool name ([#7615](https://github.com/windmill-labs/windmill/issues/7615)) ([f55dac6](https://github.com/windmill-labs/windmill/commit/f55dac69582000f0bfdae6dbed2d33f2e48087b2))
+
+## [1.612.1](https://github.com/windmill-labs/windmill/compare/v1.612.0...v1.612.1) (2026-01-19)
+
+
+### Bug Fixes
+
+* fix runs page initialization ([1438b26](https://github.com/windmill-labs/windmill/commit/1438b263102ccf22612f98e59596c7e51083df71))
+* update git sync CLI to 1.612.0 ([8daeccc](https://github.com/windmill-labs/windmill/commit/8daeccc89fc0405143a2b553520f9a42272e3c26))
+
+## [1.612.0](https://github.com/windmill-labs/windmill/compare/v1.611.0...v1.612.0) (2026-01-19)
+
+
+### Features
+
+* **cli:** add branch-specific items for folders and settings ([#7611](https://github.com/windmill-labs/windmill/issues/7611)) ([3ec9439](https://github.com/windmill-labs/windmill/commit/3ec94395dcc6a179a4d5dde3a5b88aeb1053ada3))
+* move job metrics from ee to ce ([#7608](https://github.com/windmill-labs/windmill/issues/7608)) ([c04eb37](https://github.com/windmill-labs/windmill/commit/c04eb371ccd805e8d0d0a03b4ef654c7a8131ccd))
+
+
+### Bug Fixes
+
+* **frontend:** fix centered page shift when scroll ([#7610](https://github.com/windmill-labs/windmill/issues/7610)) ([c1ec159](https://github.com/windmill-labs/windmill/commit/c1ec159471d3fabb9cb7b9023d662726a9cf1f93))
+* **frontend:** improve ai settings page ([#7606](https://github.com/windmill-labs/windmill/issues/7606)) ([9359ad8](https://github.com/windmill-labs/windmill/commit/9359ad820ded8a4a94195ee76bbe6210f6e8eb9f))
+* **frontend:** improve loading centered modal ui ([#7605](https://github.com/windmill-labs/windmill/issues/7605)) ([30da9e6](https://github.com/windmill-labs/windmill/commit/30da9e69f88ba4621bb3ee35287f914389930bb6))
+
+## [1.611.0](https://github.com/windmill-labs/windmill/compare/v1.610.1...v1.611.0) (2026-01-19)
+
+
+### Features
+
+* add HashiCorp Vault secret storage integration ([#7599](https://github.com/windmill-labs/windmill/issues/7599)) ([1b9d1c5](https://github.com/windmill-labs/windmill/commit/1b9d1c56c7e49042677326eb397e10d34a3ddcdf))
+
+
+### Bug Fixes
+
+* **flow-chat:** handle SSE timeout and fix temp message race condition ([4f8110e](https://github.com/windmill-labs/windmill/commit/4f8110eb9852b78b48aabbed114c75cbf0d1a2ef))
+
+## [1.610.1](https://github.com/windmill-labs/windmill/compare/v1.610.0...v1.610.1) (2026-01-17)
+
+
+### Bug Fixes
+
+* resolve BlobPart type incompatibility between Deno and Node.js ([2eac74c](https://github.com/windmill-labs/windmill/commit/2eac74cef4aa5a987fb16110388f99e912951db8))
+* use type cast instead of slice() for BlobPart compatibility ([ff77154](https://github.com/windmill-labs/windmill/commit/ff771546380ef26dfa443f9d459853048bc8029c))
+
+## [1.610.0](https://github.com/windmill-labs/windmill/compare/v1.609.0...v1.610.0) (2026-01-17)
+
+
+### Features
+
+* add private npm registry proxy support for ATA in webide ([#7597](https://github.com/windmill-labs/windmill/issues/7597)) ([b3cb41e](https://github.com/windmill-labs/windmill/commit/b3cb41efa4520fd3243a6dbab7c985923dd538e3))
+* add workspace success handler with 60s TTL caching ([#7598](https://github.com/windmill-labs/windmill/issues/7598)) ([73c4ce3](https://github.com/windmill-labs/windmill/commit/73c4ce30127af587510b16fbc7fa223436f6845c))
+
+
+### Bug Fixes
+
+* handle missing storage key in S3Object for write_s3_file ([03daa34](https://github.com/windmill-labs/windmill/commit/03daa341eb91118c27e92b1b51731400a0dce30c))
+* improve job deletion performance and batching ([8dd5e81](https://github.com/windmill-labs/windmill/commit/8dd5e81a32b97814eab3b72964807bdfe0ea8b49))
+
+## [1.609.0](https://github.com/windmill-labs/windmill/compare/v1.608.0...v1.609.0) (2026-01-16)
+
+
+### Features
+
+* cli branch override ([#7592](https://github.com/windmill-labs/windmill/issues/7592)) ([dcee9fe](https://github.com/windmill-labs/windmill/commit/dcee9fe7b163993836691988a552a5bc6042b9a2))
+
+
+### Bug Fixes
+
+* Fix MS SQL S3 Mode ([#7595](https://github.com/windmill-labs/windmill/issues/7595)) ([c7a6a05](https://github.com/windmill-labs/windmill/commit/c7a6a05925681bb1b2cec8d2c11037bc3d339798))
+* transparency issue of instance setting save button ([#7594](https://github.com/windmill-labs/windmill/issues/7594)) ([86ebf9e](https://github.com/windmill-labs/windmill/commit/86ebf9e25a03db99453269832bce030438c677c3))
+
+## [1.608.0](https://github.com/windmill-labs/windmill/compare/v1.607.1...v1.608.0) (2026-01-16)
+
+
+### Features
+
+* add streamJob to raw apps ([1819713](https://github.com/windmill-labs/windmill/commit/1819713450acacc7f4342593869b12ffa3519fe1))
+
+
+### Bug Fixes
+
+* S3 secondary storage client and UI fixes ([#7587](https://github.com/windmill-labs/windmill/issues/7587)) ([b6ef536](https://github.com/windmill-labs/windmill/commit/b6ef536098775c24dd1aa40f3a186d5b04ea53a2))
+
+## [1.607.1](https://github.com/windmill-labs/windmill/compare/v1.607.0...v1.607.1) (2026-01-16)
+
+
+### Bug Fixes
+
+* fix wmill app dev with workspace scripts ([d5fa3d8](https://github.com/windmill-labs/windmill/commit/d5fa3d8dec78148becdc826ab83defe39a06af7e))
+* improve raw app builder malformed files ([483b7d6](https://github.com/windmill-labs/windmill/commit/483b7d699f01f2bf91c23f9e37534f648a0a4e7e))
+
+## [1.607.0](https://github.com/windmill-labs/windmill/compare/v1.606.1...v1.607.0) (2026-01-15)
+
+
+### Features
+
+* allow resume urls at flow level for pre-generation ([#7582](https://github.com/windmill-labs/windmill/issues/7582)) ([86714f2](https://github.com/windmill-labs/windmill/commit/86714f2d03302a876e07d5ea3390be9fd2513387))
+* **flow:** add diff viewer in deployment history ([#7575](https://github.com/windmill-labs/windmill/issues/7575)) ([62c1fd4](https://github.com/windmill-labs/windmill/commit/62c1fd4ee749cc1677f1a050c2aa61773a727fef))
+
+
+### Bug Fixes
+
+* **frontend:** detect [windmill] log marker anywhere in content, not just at start ([#7583](https://github.com/windmill-labs/windmill/issues/7583)) ([303b673](https://github.com/windmill-labs/windmill/commit/303b673a7556d38c5aab84795e93105c90f5247b))
+* **frontend:** remove workspace invites ([#7579](https://github.com/windmill-labs/windmill/issues/7579)) ([1d5d28a](https://github.com/windmill-labs/windmill/commit/1d5d28ae7a19c03a2c5d3b2bfbc99323c2afd170))
+* remove audit logs page overflow scrollbars ([#7572](https://github.com/windmill-labs/windmill/issues/7572)) ([0c78aeb](https://github.com/windmill-labs/windmill/commit/0c78aebe6ac2bf44cf931ad833961b3911fce908))
+
+## [1.606.1](https://github.com/windmill-labs/windmill/compare/v1.606.0...v1.606.1) (2026-01-14)
+
+
+### Bug Fixes
+
+* bump uv 0.6.2 -> 0.9.24 ([#7559](https://github.com/windmill-labs/windmill/issues/7559)) ([e74dc02](https://github.com/windmill-labs/windmill/commit/e74dc02804d0bd720963d571f58fd3aa97eb2396))
+* Fix number ordering in postgres' db manager ([#7570](https://github.com/windmill-labs/windmill/issues/7570)) ([a7335d6](https://github.com/windmill-labs/windmill/commit/a7335d6914ce0e331f2309368d7c947986159e77))
+* **frontend:** improve context for ai chat in raw app builder ([#7566](https://github.com/windmill-labs/windmill/issues/7566)) ([da54a67](https://github.com/windmill-labs/windmill/commit/da54a678221b7851625eb4ba52504099eb69b100))
+* improve debugger behavior ([40d0073](https://github.com/windmill-labs/windmill/commit/40d00734f33b3aa7cef31f6abc29c40e975f48f8))
+
+## [1.606.0](https://github.com/windmill-labs/windmill/compare/v1.605.0...v1.606.0) (2026-01-14)
+
+
+### Features
+
+* **aiagent:** handle oauth for mcp tools ([#7564](https://github.com/windmill-labs/windmill/issues/7564)) ([5c08abe](https://github.com/windmill-labs/windmill/commit/5c08abe14163dbbab2e18f2479b74c30e2a70c2f))
+* **aiagent:** handle oauth for mcp tools [merge-ee-first] ([#7544](https://github.com/windmill-labs/windmill/issues/7544)) ([e823c95](https://github.com/windmill-labs/windmill/commit/e823c953d112ab90692b17c6ed7c33645860707e))
+
+
+### Bug Fixes
+
+* **debugger:** add nsjail config for proper sandbox mounts ([31c07d9](https://github.com/windmill-labs/windmill/commit/31c07d93529f0fdb66912b42bb2d60f92ca0c333))
+* **debugger:** fix nsjail sandbox for debugger execution ([14cfce3](https://github.com/windmill-labs/windmill/commit/14cfce3fd68224d46048bbbe2f89619637c4bed2))
+* **debugger:** properly decode base64url public key from JWKS ([8d005b0](https://github.com/windmill-labs/windmill/commit/8d005b030fd73015e860ef04beb0709a04d07c65))
+* Fix wrong base_internal_url for ducklake inline ([#7563](https://github.com/windmill-labs/windmill/issues/7563)) ([b3f68ad](https://github.com/windmill-labs/windmill/commit/b3f68ad376646d7f702ba07662e320f0eb6c7717))
+* **frontend:** fix first draft save ([#7552](https://github.com/windmill-labs/windmill/issues/7552)) ([28e25ec](https://github.com/windmill-labs/windmill/commit/28e25ec60dcd73158fa2fff61c439e67478f35a0))
+
+## [1.605.0](https://github.com/windmill-labs/windmill/compare/v1.604.0...v1.605.0) (2026-01-13)
+
+
+### Features
+
+* enable debouncing for sync jobs ([#7551](https://github.com/windmill-labs/windmill/issues/7551)) ([3135a8b](https://github.com/windmill-labs/windmill/commit/3135a8b0957889f484bf16499e24c9168c8caba8))
+
+
+### Bug Fixes
+
+* **frontend:** update raw app editor to brand guidelines ([#7545](https://github.com/windmill-labs/windmill/issues/7545)) ([c210853](https://github.com/windmill-labs/windmill/commit/c2108530335e74c47f1acb071ae7abac93d4dac6))
+
 ## [1.604.0](https://github.com/windmill-labs/windmill/compare/v1.603.4...v1.604.0) (2026-01-13)
 
 

Caddyfile

@@ -18,10 +18,10 @@
         # Uncomment and set ENABLE_MULTIPLAYER=true in docker-compose.yml
         # reverse_proxy /ws_mp/* http://windmill_extra:3002
 
-        # Debugger - Interactive debugging via DAP WebSocket (windmill_extra:5679)
+        # Debugger - Interactive debugging via DAP WebSocket (windmill_extra:3003)
         # Set ENABLE_DEBUGGER=true in docker-compose.yml to enable
         handle_path /ws_debug/* {
-                reverse_proxy http://windmill_extra:5679
+                reverse_proxy http://windmill_extra:3003
         }
 
         # Search indexer, Enterprise Edition (windmill_indexer:8002)

Dockerfile

@@ -190,7 +190,7 @@ ENV PATH="${PATH}:/usr/local/go/bin"
 ENV GO_PATH=/usr/local/go/bin/go
 
 # Install UV
-RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.6.2/uv-installer.sh | sh && mv /root/.local/bin/uv /usr/local/bin/uv
+RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.9.24/uv-installer.sh | sh && mv /root/.local/bin/uv /usr/local/bin/uv
 
 # Preinstall python runtimes to temp build location (will copy with world-writable perms later)
 RUN UV_CACHE_DIR=/tmp/build_cache/uv UV_PYTHON_INSTALL_DIR=/tmp/build_cache/py_runtime uv python install 3.11

backend/.sqlx/query-002d68d7c4437522a6dae95af007a356217bbae06b8453f0c32046f0cbf20dcb.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT created_by FROM v2_job WHERE id = $1 AND workspace_id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "created_by",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "002d68d7c4437522a6dae95af007a356217bbae06b8453f0c32046f0cbf20dcb"
+}

backend/.sqlx/query-020c031c3de6c85577e30421ada9d39a5a47ca1b6cf3dbfd6988aa0694d7364c.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT value FROM variable WHERE path = $1 AND workspace_id = $2 AND is_secret = true",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "value",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "020c031c3de6c85577e30421ada9d39a5a47ca1b6cf3dbfd6988aa0694d7364c"
+}

backend/.sqlx/query-052d42b46d5faba6b41f1fdcbf6a012db51b9e5a255ec0da9a8a0999d668d336.json

@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) as count FROM variable WHERE is_secret = true AND value != 'CLEARED'",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "052d42b46d5faba6b41f1fdcbf6a012db51b9e5a255ec0da9a8a0999d668d336"
+}

backend/.sqlx/query-0600f2a9179f83502c6b13e8e4284f85ca82636f274f5dce47da5a8320a60088.json

@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT workspace_id, path FROM variable WHERE is_secret = true",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "workspace_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "path",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "0600f2a9179f83502c6b13e8e4284f85ca82636f274f5dce47da5a8320a60088"
+}

backend/.sqlx/query-085bbcfcebc9e56984295046c48722f3510548eaf525c499ad0e24cdf8332b22.json

@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT success_handler_extra_args FROM workspace_settings WHERE workspace_id = 'test-workspace'",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "success_handler_extra_args",
+        "type_info": "Json"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "085bbcfcebc9e56984295046c48722f3510548eaf525c499ad0e24cdf8332b22"
+}

backend/.sqlx/query-08f288d2781d823e109a9e5b8848234ca7d1efeee9661f3901f298da375e73f7.json

@@ -177,6 +177,16 @@
         "ordinal": 34,
         "name": "teams_team_guid",
         "type_info": "Text"
+      },
+      {
+        "ordinal": 35,
+        "name": "success_handler",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 36,
+        "name": "success_handler_extra_args",
+        "type_info": "Json"
       }
     ],
     "parameters": {
@@ -219,6 +229,8 @@
       true,
       true,
       true,
+      true,
+      true,
       true
     ]
   },

backend/.sqlx/query-0a1c10bd2232b0770a7816e1bd8d758dc393f797890d597e5996146247f512ac.json

@@ -1,38 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\nWITH lockable_counters AS (\n    SELECT concurrency_id, job_uuids\n    FROM concurrency_counter\n    WHERE job_uuids != '{}'::jsonb\n    FOR UPDATE SKIP LOCKED\n),\nall_job_uuids AS (\n    SELECT DISTINCT jsonb_object_keys(job_uuids) AS job_uuid\n    FROM lockable_counters\n),\norphaned_job_uuids AS (\n    SELECT job_uuid\n    FROM all_job_uuids\n    WHERE job_uuid NOT IN (\n        SELECT id::text \n        FROM v2_job_queue \n        FOR SHARE SKIP LOCKED\n    )\n),\norphaned_array AS (\n    SELECT ARRAY(SELECT job_uuid FROM orphaned_job_uuids) AS orphaned_keys\n),\nbefore_update AS (\n    SELECT lc.concurrency_id, lc.job_uuids, oa.orphaned_keys\n    FROM lockable_counters lc, orphaned_array oa\n    WHERE lc.job_uuids ?| oa.orphaned_keys\n),\naffected_rows AS (\n    UPDATE concurrency_counter \n    SET job_uuids = job_uuids - orphaned_array.orphaned_keys\n    FROM orphaned_array\n    WHERE concurrency_counter.concurrency_id IN (\n        SELECT concurrency_id FROM before_update\n    )\n    RETURNING concurrency_id, job_uuids AS updated_job_uuids\n),\nexpanded_orphaned AS (\n    SELECT bu.concurrency_id, \n           bu.job_uuids AS original_job_uuids,\n           unnest(bu.orphaned_keys) AS orphaned_key\n    FROM before_update bu\n)\nSELECT \n    eo.concurrency_id,\n    eo.orphaned_key,\n    eo.original_job_uuids,\n    ar.updated_job_uuids\nFROM expanded_orphaned eo\nJOIN affected_rows ar ON eo.concurrency_id = ar.concurrency_id\nWHERE eo.original_job_uuids ? eo.orphaned_key\nORDER BY eo.concurrency_id, eo.orphaned_key\n",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "concurrency_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "orphaned_key",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 2,
-        "name": "original_job_uuids",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 3,
-        "name": "updated_job_uuids",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      null,
-      false,
-      false
-    ]
-  },
-  "hash": "0a1c10bd2232b0770a7816e1bd8d758dc393f797890d597e5996146247f512ac"
-}

backend/.sqlx/query-0c8a3eb810c96230ba3a5466c55bf24a94eb8a52ceb82cc29dade173ad87569d.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT path FROM variable WHERE path = ANY($1) AND workspace_id = $2 AND is_secret = true",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "TextArray",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "0c8a3eb810c96230ba3a5466c55bf24a94eb8a52ceb82cc29dade173ad87569d"
+}

backend/.sqlx/query-10a40902f5aba38aea23f2b0776b54752362c9cc7deb179f75c7f1795866d13a.json

@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT success_handler FROM workspace_settings WHERE workspace_id = 'test-workspace'",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "success_handler",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "10a40902f5aba38aea23f2b0776b54752362c9cc7deb179f75c7f1795866d13a"
+}

backend/.sqlx/query-146f0e42ada3068a5cdae0ffdbb54b63f8c06c9143b16ce399170c1b5a6b911e.json

@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT value, is_secret FROM variable WHERE path = $1 AND workspace_id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "value",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "is_secret",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "146f0e42ada3068a5cdae0ffdbb54b63f8c06c9143b16ce399170c1b5a6b911e"
+}

backend/.sqlx/query-1730f39fd1793d45fbb41b21389c61296a3ff7489ae12f52a19f9543173ac597.json

@@ -177,6 +177,16 @@
         "ordinal": 34,
         "name": "teams_team_guid",
         "type_info": "Text"
+      },
+      {
+        "ordinal": 35,
+        "name": "success_handler",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 36,
+        "name": "success_handler_extra_args",
+        "type_info": "Json"
       }
     ],
     "parameters": {
@@ -219,6 +229,8 @@
       true,
       true,
       true,
+      true,
+      true,
       true
     ]
   },

backend/.sqlx/query-18aad20ed9cb2dde46f9d899dc4aa6f80ecf1628bd2c073d7a237dea9b8e0c65.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT is_secret FROM variable WHERE path = $1 AND workspace_id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "is_secret",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "18aad20ed9cb2dde46f9d899dc4aa6f80ecf1628bd2c073d7a237dea9b8e0c65"
+}

backend/.sqlx/query-19cca1d42f37e860dc54470fea8dd9a35c412d82d27ce369ccb0ba38b9791669.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT app_id, value FROM app_version WHERE id = $1",
+  "query": "SELECT app_id, value, raw_app FROM app_version WHERE id = $1",
   "describe": {
     "columns": [
       {
@@ -12,6 +12,11 @@
         "ordinal": 1,
         "name": "value",
         "type_info": "Json"
+      },
+      {
+        "ordinal": 2,
+        "name": "raw_app",
+        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -20,9 +25,10 @@
       ]
     },
     "nullable": [
+      false,
       false,
       false
     ]
   },
-  "hash": "ea9bbb972217bab4d7e8f4c08e331899161e80c239d56eb657d73bbf4272939b"
+  "hash": "19cca1d42f37e860dc54470fea8dd9a35c412d82d27ce369ccb0ba38b9791669"
 }

backend/.sqlx/query-1b4f7485c015338536d781838448c96ce686fce217be21ec15a8900b772f02a3.json

@@ -0,0 +1,21 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO mcp_oauth_server_code\n         (code, client_id, user_email, workspace_id, scopes, redirect_uri, code_challenge, code_challenge_method)\n         VALUES ($1, $2, $3, $4, $5, $6, $7, $8)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "TextArray",
+        "Text",
+        "Varchar",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1b4f7485c015338536d781838448c96ce686fce217be21ec15a8900b772f02a3"
+}

backend/.sqlx/query-1ccc9db6c6cb51bebeb90d003e12c8f7922450515d1eaee8b3abee5b31f72527.json

@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM concurrency_key WHERE ended_at <= now() - ($1::bigint::text || ' s')::interval",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1ccc9db6c6cb51bebeb90d003e12c8f7922450515d1eaee8b3abee5b31f72527"
+}

backend/.sqlx/query-1d8c2f54118b352dc13058dbb9b6e3f6ca4961b68d7e409386e655a61c54e0d0.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT EXISTS(SELECT 1 FROM usr WHERE workspace_id = $1 AND email = $2 AND NOT disabled)",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "exists",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "1d8c2f54118b352dc13058dbb9b6e3f6ca4961b68d7e409386e655a61c54e0d0"
+}

backend/.sqlx/query-2922c242228b2188b8abcda02b37d6fd220659dcd9e16d4bb110202321bc06cf.json

@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT client_id, client_name, redirect_uris FROM mcp_oauth_server_client WHERE client_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "client_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "client_name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "redirect_uris",
+        "type_info": "TextArray"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "2922c242228b2188b8abcda02b37d6fd220659dcd9e16d4bb110202321bc06cf"
+}

backend/.sqlx/query-2c231a2cd267d8d6d28a22d166a50cc6b4df813a15c613eb1960eff202c517f8.json

@@ -0,0 +1,21 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO mcp_oauth_refresh_token\n         (refresh_token, access_token, client_id, user_email, workspace_id, scopes, token_family, expires_at)\n         VALUES ($1, $2, $3, $4, $5, $6, $7, now() + ($8 || ' seconds')::interval)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "TextArray",
+        "Uuid",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "2c231a2cd267d8d6d28a22d166a50cc6b4df813a15c613eb1960eff202c517f8"
+}

backend/.sqlx/query-2c2ed5c91a4893966e94305df8b9f8ac904c8d0781a83fdea66c918320fb5601.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        UPDATE workspace_settings\n        SET success_handler = NULL\n        WHERE workspace_id = 'test-workspace'\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "2c2ed5c91a4893966e94305df8b9f8ac904c8d0781a83fdea66c918320fb5601"
+}

backend/.sqlx/query-2d43c1889b492df6f77380e739e41e20fe6bea0553cc39e30b7aa8ae59963f95.json

@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        INSERT INTO script (workspace_id, hash, path, content, language, kind, created_by, schema, summary, description, lock)\n        VALUES ('test-workspace', 1234567890, 'f/test/success_handler', $1, 'deno', 'script', 'test-user', '{}', 'Success handler script', 'Handles successful job completions', '')\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "2d43c1889b492df6f77380e739e41e20fe6bea0553cc39e30b7aa8ae59963f95"
+}

backend/.sqlx/query-2fcddda99dd0aacf5007ed459cb27caa754424e062427edf5ddcb95f9d96888e.json

@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT path, value FROM variable\n           WHERE path LIKE ('u/' || $1 || '/%')\n           AND workspace_id = $2\n           AND is_secret = true\n           AND value LIKE '$vault:%'",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "value",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "2fcddda99dd0aacf5007ed459cb27caa754424e062427edf5ddcb95f9d96888e"
+}

backend/.sqlx/query-306e0156ee1541710c1c6512ecb4f61baeb3ae6f31ba3fd57a3ec485108a7f49.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM v2_job_completed\n         WHERE id IN (\n             SELECT id FROM v2_job_completed\n             WHERE completed_at <= now() - ($1::bigint::text || ' s')::interval\n             ORDER BY completed_at ASC\n             LIMIT $2\n             FOR UPDATE SKIP LOCKED\n         )\n         RETURNING id",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Uuid"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "306e0156ee1541710c1c6512ecb4f61baeb3ae6f31ba3fd57a3ec485108a7f49"
+}

backend/.sqlx/query-369f8ecde50af034f06d339ecef8fc55a0113b4156274d03d5af643c3da73fa4.json

@@ -0,0 +1,64 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM mcp_oauth_server_code\n         WHERE code = $1 AND expires_at > now()\n         RETURNING code, client_id, user_email, workspace_id, scopes, redirect_uri,\n                   code_challenge, code_challenge_method",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "code",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "client_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "user_email",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "workspace_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 4,
+        "name": "scopes",
+        "type_info": "TextArray"
+      },
+      {
+        "ordinal": 5,
+        "name": "redirect_uri",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 6,
+        "name": "code_challenge",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "code_challenge_method",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "369f8ecde50af034f06d339ecef8fc55a0113b4156274d03d5af643c3da73fa4"
+}

backend/.sqlx/query-37e0c601a463819748078b92d1c87f63348a92908e2ca52f5a092149191e6200.json

@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE variable SET value = $1 WHERE path = $2 AND workspace_id = $3 AND is_secret = true",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "37e0c601a463819748078b92d1c87f63348a92908e2ca52f5a092149191e6200"
+}

backend/.sqlx/query-3a71ab02239d8dd4e2f440a35155459a7d5091c125a0998e79d89f8c560a3fd3.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        INSERT INTO group_ (workspace_id, name, summary, extra_perms)\n        VALUES ('test-workspace', 'success_handler', 'The group the success handler acts on behalf of', '{\"u/test-user\": true}')\n        ON CONFLICT DO NOTHING\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "3a71ab02239d8dd4e2f440a35155459a7d5091c125a0998e79d89f8c560a3fd3"
+}

backend/.sqlx/query-45d0552a169b63241a0ecc0e7ec6a533d7eec520376b99b2fd8000f0f0acba7b.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\nWITH rows_to_delete AS (\n    SELECT concurrency_id\n    FROM concurrency_counter\n    \n    WHERE job_uuids = '{}'::jsonb\n    FOR UPDATE SKIP LOCKED\n)\nDELETE FROM concurrency_counter\nWHERE concurrency_id IN (SELECT concurrency_id FROM rows_to_delete)  RETURNING concurrency_id",
+  "query": "\nWITH rows_to_delete AS (\n    SELECT concurrency_id\n    FROM concurrency_counter\n\n    WHERE job_uuids = '{}'::jsonb\n    FOR UPDATE SKIP LOCKED\n)\nDELETE FROM concurrency_counter\nWHERE concurrency_id IN (SELECT concurrency_id FROM rows_to_delete)  RETURNING concurrency_id",
   "describe": {
     "columns": [
       {
@@ -16,5 +16,5 @@
       false
     ]
   },
-  "hash": "c6ef0acdf20bd71dd26de981fb49f178ba8a1b8c1e01e0fec1dfd6a54ea7a894"
+  "hash": "45d0552a169b63241a0ecc0e7ec6a533d7eec520376b99b2fd8000f0f0acba7b"
 }

backend/.sqlx/query-4977b4027861ca234e95559a8b550bc8849f7ed60a471d46f3be3d39664a48ca.json

@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE\n                workspace_settings\n            SET\n                success_handler = NULL,\n                success_handler_extra_args = NULL\n            WHERE\n                workspace_id = $1\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "4977b4027861ca234e95559a8b550bc8849f7ed60a471d46f3be3d39664a48ca"
+}

backend/.sqlx/query-4d80985dd0794a01a2af18ae7abf4a3ab8ba3d162ed5d04735caea7295da0b20.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n            j.id AS \"id!\", j.workspace_id AS \"workspace_id!\", j.parent_job, j.flow_step_id IS NOT NULL AS \"is_flow_step?\",\n            COALESCE(s.flow_status, s.workflow_as_code_status) AS \"flow_status: Box<str>\", r.ping AS last_ping, j.same_worker AS \"same_worker?\"\n        FROM v2_job_queue q JOIN v2_job j USING (id) LEFT JOIN v2_job_runtime r USING (id) LEFT JOIN v2_job_status s USING (id)\n        WHERE q.running = true AND q.suspend = 0 AND q.suspend_until IS null AND q.scheduled_for <= now()\n            AND (j.kind = 'flow' OR j.kind = 'flowpreview' OR j.kind = 'flownode')\n            AND r.ping IS NOT NULL AND r.ping < NOW() - ($1 || ' seconds')::interval\n            AND q.canceled_by IS NULL\n            \n        ",
+  "query": "\n        SELECT\n            j.id AS \"id!\", j.workspace_id AS \"workspace_id!\", j.parent_job, j.flow_step_id IS NOT NULL AS \"is_flow_step?\",\n            COALESCE(s.flow_status, s.workflow_as_code_status) AS \"flow_status: Box<str>\", r.ping AS last_ping, j.same_worker AS \"same_worker?\"\n        FROM v2_job_queue q JOIN v2_job j USING (id) LEFT JOIN v2_job_runtime r USING (id) LEFT JOIN v2_job_status s USING (id)\n        WHERE q.running = true AND q.suspend = 0 AND q.suspend_until IS null AND q.scheduled_for <= now()\n            AND (j.kind = 'flow' OR j.kind = 'flowpreview' OR j.kind = 'flownode')\n            AND r.ping IS NOT NULL AND r.ping < NOW() - ($1 || ' seconds')::interval\n            AND q.canceled_by IS NULL\n\n        ",
   "describe": {
     "columns": [
       {
@@ -54,5 +54,5 @@
       false
     ]
   },
-  "hash": "70a6880960d17218bc5bf05287e2a6d9a6393c6bb1783ab8903d87dd099e236b"
+  "hash": "4d80985dd0794a01a2af18ae7abf4a3ab8ba3d162ed5d04735caea7295da0b20"
 }

backend/.sqlx/query-5769af6cfc749881b3f21d42d2c79b4c3e6788ba521ef5736f46d6ec8447ad8f.json

@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM mcp_oauth_server_code WHERE expires_at <= now() RETURNING code",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "code",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "5769af6cfc749881b3f21d42d2c79b4c3e6788ba521ef5736f46d6ec8447ad8f"
+}

backend/.sqlx/query-5820d34be1a7f7b72e656c692f53146f45ad4a6e584e917a0a86280d8f473c10.json

@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM v2_job_completed c\n                    WHERE completed_at <= now() - ($1::bigint::text || ' s')::interval \n                    RETURNING c.id",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Uuid"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "5820d34be1a7f7b72e656c692f53146f45ad4a6e584e917a0a86280d8f473c10"
-}

backend/.sqlx/query-5840477599957b528e10b638e0616b6fb9d04b78271b827c21a399a1474627d7.json

@@ -0,0 +1,35 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT\n            variable.path,\n            variable.account as account_id,\n            (now() > account.expires_at) as \"is_expired: bool\"\n        FROM variable\n        LEFT JOIN account ON variable.account = account.id AND account.workspace_id = $2\n        WHERE variable.path = $1 AND variable.workspace_id = $2\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "account_id",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 2,
+        "name": "is_expired: bool",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      true,
+      null
+    ]
+  },
+  "hash": "5840477599957b528e10b638e0616b6fb9d04b78271b827c21a399a1474627d7"
+}

backend/.sqlx/query-598805056a3b102c9c2fd69d8330fa78b06106236522e48ab5fe009cac059468.json

@@ -0,0 +1,38 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\nWITH lockable_counters AS (\n    SELECT concurrency_id, job_uuids\n    FROM concurrency_counter\n    WHERE job_uuids != '{}'::jsonb\n    FOR UPDATE SKIP LOCKED\n),\nall_job_uuids AS (\n    SELECT DISTINCT jsonb_object_keys(job_uuids) AS job_uuid\n    FROM lockable_counters\n),\norphaned_job_uuids AS (\n    SELECT job_uuid\n    FROM all_job_uuids\n    WHERE job_uuid NOT IN (\n        SELECT id::text\n        FROM v2_job_queue\n        FOR SHARE SKIP LOCKED\n    )\n),\norphaned_array AS (\n    SELECT ARRAY(SELECT job_uuid FROM orphaned_job_uuids) AS orphaned_keys\n),\nbefore_update AS (\n    SELECT lc.concurrency_id, lc.job_uuids, oa.orphaned_keys\n    FROM lockable_counters lc, orphaned_array oa\n    WHERE lc.job_uuids ?| oa.orphaned_keys\n),\naffected_rows AS (\n    UPDATE concurrency_counter\n    SET job_uuids = job_uuids - orphaned_array.orphaned_keys\n    FROM orphaned_array\n    WHERE concurrency_counter.concurrency_id IN (\n        SELECT concurrency_id FROM before_update\n    )\n    RETURNING concurrency_id, job_uuids AS updated_job_uuids\n),\nexpanded_orphaned AS (\n    SELECT bu.concurrency_id,\n           bu.job_uuids AS original_job_uuids,\n           unnest(bu.orphaned_keys) AS orphaned_key\n    FROM before_update bu\n)\nSELECT\n    eo.concurrency_id,\n    eo.orphaned_key,\n    eo.original_job_uuids,\n    ar.updated_job_uuids\nFROM expanded_orphaned eo\nJOIN affected_rows ar ON eo.concurrency_id = ar.concurrency_id\nWHERE eo.original_job_uuids ? eo.orphaned_key\nORDER BY eo.concurrency_id, eo.orphaned_key\n",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "concurrency_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "orphaned_key",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "original_job_uuids",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 3,
+        "name": "updated_job_uuids",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      null,
+      false,
+      false
+    ]
+  },
+  "hash": "598805056a3b102c9c2fd69d8330fa78b06106236522e48ab5fe009cac059468"
+}

backend/.sqlx/query-5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55.json

@@ -15,7 +15,7 @@
       ]
     },
     "nullable": [
-      true
+      null
     ]
   },
   "hash": "5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55"

backend/.sqlx/query-5b5cb5339208847bd542f8d903d028803a286e69443a151cd1e3d16da7e8e4f7.json

@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO otel_traces (\n                trace_id, span_id, trace_state, parent_span_id, flags,\n                name, kind, start_time_unix_nano, end_time_unix_nano,\n                attributes, dropped_attributes_count,\n                events, dropped_events_count,\n                links, dropped_links_count,\n                status\n            ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Bytea",
+        "Text",
+        "Bytea",
+        "Int4",
+        "Text",
+        "Int4",
+        "Int8",
+        "Int8",
+        "Jsonb",
+        "Int4",
+        "Jsonb",
+        "Int4",
+        "Jsonb",
+        "Int4",
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "5b5cb5339208847bd542f8d903d028803a286e69443a151cd1e3d16da7e8e4f7"
+}

backend/.sqlx/query-5c9ed4d8d16c77c0c6b42e9ee211168573162745060788fbca188ed405c423cd.json

@@ -0,0 +1,89 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE mcp_oauth_refresh_token\n         SET used_at = now()\n         WHERE refresh_token = $1\n           AND client_id = $2\n           AND used_at IS NULL\n           AND NOT revoked\n           AND expires_at > now()\n         RETURNING id, refresh_token, access_token, client_id, user_email, workspace_id,\n                   scopes, token_family, created_at, expires_at, used_at, revoked",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "refresh_token",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "access_token",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "client_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 4,
+        "name": "user_email",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 5,
+        "name": "workspace_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 6,
+        "name": "scopes",
+        "type_info": "TextArray"
+      },
+      {
+        "ordinal": 7,
+        "name": "token_family",
+        "type_info": "Uuid"
+      },
+      {
+        "ordinal": 8,
+        "name": "created_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 9,
+        "name": "expires_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 10,
+        "name": "used_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 11,
+        "name": "revoked",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false
+    ]
+  },
+  "hash": "5c9ed4d8d16c77c0c6b42e9ee211168573162745060788fbca188ed405c423cd"
+}

backend/.sqlx/query-5ffb1c49d8d001253a71c6b9bd90e58416d59a9a855afd1ec0a814937583461f.json

@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE mcp_oauth_refresh_token SET revoked = TRUE WHERE token_family = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Uuid"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "5ffb1c49d8d001253a71c6b9bd90e58416d59a9a855afd1ec0a814937583461f"
+}

backend/.sqlx/query-6376f88654dbbd85a68c507480fc4918958244abd7a1f81f32a0e60f7e5f9464.json

@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO mcp_oauth_server_client (client_id, client_name, redirect_uris)\n         VALUES ($1, $2, $3)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "TextArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "6376f88654dbbd85a68c507480fc4918958244abd7a1f81f32a0e60f7e5f9464"
+}

backend/.sqlx/query-66e0968fe9f757755945a7010153821cf73ace9d6692750ccc4cca37701ed77a.json

@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM token WHERE token = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "66e0968fe9f757755945a7010153821cf73ace9d6692750ccc4cca37701ed77a"
+}

backend/.sqlx/query-66e66da2ed6eace5d7ec2a41a7b11ae255f5dc212d1ff41c2905b303c8c13b18.json

@@ -0,0 +1,46 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        WITH job_info AS (\n            SELECT id, kind::text AS kind, parent_job\n            FROM v2_job\n            WHERE id = $1\n        )\n        SELECT\n            q.id AS \"id!\",\n            s.flow_status,\n            q.suspend AS \"suspend!\",\n            j.runnable_path AS script_path,\n            (ji.kind IN ('flow', 'flowpreview')) AS \"is_flow_level!\"\n        FROM job_info ji\n        JOIN v2_job_queue q ON q.id = CASE\n            WHEN ji.kind IN ('flow', 'flowpreview') THEN ji.id\n            ELSE ji.parent_job\n        END\n        JOIN v2_job j ON j.id = q.id\n        JOIN v2_job_status s ON s.id = q.id\n        FOR UPDATE OF q\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id!",
+        "type_info": "Uuid"
+      },
+      {
+        "ordinal": 1,
+        "name": "flow_status",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 2,
+        "name": "suspend!",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 3,
+        "name": "script_path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 4,
+        "name": "is_flow_level!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid"
+      ]
+    },
+    "nullable": [
+      false,
+      true,
+      false,
+      true,
+      null
+    ]
+  },
+  "hash": "66e66da2ed6eace5d7ec2a41a7b11ae255f5dc212d1ff41c2905b303c8c13b18"
+}

backend/.sqlx/query-6dd7e38c902f6b8d397aa3e9e698fe1541bd3f22634af341849303de84c0034d.json

@@ -0,0 +1,32 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT workspace_id, path, value FROM variable WHERE is_secret = true",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "workspace_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "value",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "6dd7e38c902f6b8d397aa3e9e698fe1541bd3f22634af341849303de84c0034d"
+}

backend/.sqlx/query-6eaa0af9c5e0a8d64c3202753c9c3cef39361b0987a22b7d2b2346652f81177e.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        UPDATE workspace_settings\n        SET success_handler = 'script/f/test/success_handler',\n            success_handler_extra_args = '{\"key\": \"value\"}'::json\n        WHERE workspace_id = 'test-workspace'\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "6eaa0af9c5e0a8d64c3202753c9c3cef39361b0987a22b7d2b2346652f81177e"
+}

backend/.sqlx/query-71de038f332593e2177f33284854b6c0bfe9bb4999f2c4e9082a4c5f3b341496.json

@@ -0,0 +1,38 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT\n            id,\n            runnable_path,\n            permissioned_as_email,\n            parent_job\n        FROM v2_job\n        WHERE workspace_id = 'test-workspace'\n            AND permissioned_as_email = 'success_handler@windmill.dev'\n        ORDER BY created_at DESC\n        LIMIT 1\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Uuid"
+      },
+      {
+        "ordinal": 1,
+        "name": "runnable_path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "permissioned_as_email",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "parent_job",
+        "type_info": "Uuid"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      true,
+      false,
+      true
+    ]
+  },
+  "hash": "71de038f332593e2177f33284854b6c0bfe9bb4999f2c4e9082a4c5f3b341496"
+}

backend/.sqlx/query-7e4aa6b19b110bca423b3a3f428826d92b9808c64ef989fef2142bc8e02d6630.json

@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO token (token, email, label, expiration, scopes, workspace_id)\n         VALUES ($1, $2, $3, now() + ($4 || ' seconds')::interval, $5, $6)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Text",
+        "TextArray",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "7e4aa6b19b110bca423b3a3f428826d92b9808c64ef989fef2142bc8e02d6630"
+}

backend/.sqlx/query-83785ee2f7dcc7f2252b0e8bcc8322dfd7689d615a34b63e29c9c6699b7e5514.json

@@ -1,40 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT q.id, f.flow_status, q.suspend, j.runnable_path AS script_path\n            FROM v2_job_queue q\n                JOIN v2_job j USING (id)\n                JOIN v2_job_status f USING (id)\n            WHERE id = ( SELECT parent_job FROM v2_job WHERE id = $1 )\n            FOR UPDATE\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Uuid"
-      },
-      {
-        "ordinal": 1,
-        "name": "flow_status",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 2,
-        "name": "suspend",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 3,
-        "name": "script_path",
-        "type_info": "Varchar"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Uuid"
-      ]
-    },
-    "nullable": [
-      false,
-      true,
-      false,
-      true
-    ]
-  },
-  "hash": "83785ee2f7dcc7f2252b0e8bcc8322dfd7689d615a34b63e29c9c6699b7e5514"
-}

backend/.sqlx/query-8f5722afde37d22c56851da23895daa1653e14b6d12013f6e3bb8bf042447a6a.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE variable SET value = 'ROUND_TRIP_CLEARED' WHERE is_secret = true",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "8f5722afde37d22c56851da23895daa1653e14b6d12013f6e3bb8bf042447a6a"
+}

backend/.sqlx/query-9044c71dc8aab7f5d17bf27c4702e67f3eee46d7dbccb09cadeaafa0534952d6.json

@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE\n                workspace_settings\n            SET\n                success_handler = $1,\n                success_handler_extra_args = $2\n            WHERE\n                workspace_id = $3\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Json",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "9044c71dc8aab7f5d17bf27c4702e67f3eee46d7dbccb09cadeaafa0534952d6"
+}

backend/.sqlx/query-90d93fd3bd91e468c1e796e41e31e4f15a825b442346c7386836127bc5723c93.json

@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT json_build_object(\n            'trace_id', encode(trace_id, 'hex'),           -- BYTEA to hex string\n            'span_id', encode(span_id, 'hex'),             -- BYTEA to hex string\n            'parent_span_id', encode(parent_span_id, 'hex'), -- BYTEA to hex string\n            'trace_state', trace_state,\n            'flags', flags,\n            'name', name,\n            'kind', kind,\n            'start_time_unix_nano', start_time_unix_nano,\n            'end_time_unix_nano', end_time_unix_nano,\n            'attributes', attributes,\n            'dropped_attributes_count', dropped_attributes_count,\n            'events', events,\n            'dropped_events_count', dropped_events_count,\n            'links', links,\n            'dropped_links_count', dropped_links_count,\n            'status', status\n        ) as \"span!\"\n        FROM otel_traces\n        WHERE trace_id = $1\n        ORDER BY start_time_unix_nano",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "span!",
+        "type_info": "Json"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Bytea"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "90d93fd3bd91e468c1e796e41e31e4f15a825b442346c7386836127bc5723c93"
+}

backend/.sqlx/query-93ef241a4f624cb76d680418d313cd956e4c807c3a0031913dbfded80f0e5881.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE variable SET value = 'CLEARED' WHERE is_secret = true",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "93ef241a4f624cb76d680418d313cd956e4c807c3a0031913dbfded80f0e5881"
+}

backend/.sqlx/query-99398d6d6aa04235226f1a5d0f100aea034d7ee2c86aa8fa5ccec0e3560965fd.json

@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT token_family FROM mcp_oauth_refresh_token\n                 WHERE refresh_token = $1 AND used_at IS NOT NULL",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token_family",
+        "type_info": "Uuid"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "99398d6d6aa04235226f1a5d0f100aea034d7ee2c86aa8fa5ccec0e3560965fd"
+}

backend/.sqlx/query-9da0cea2a5d0464ca78cfeccf6cedf2b1c0e6e6cb3c9183a937a68465debdb06.json

@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM concurrency_key WHERE  ended_at <= now() - ($1::bigint::text || ' s')::interval ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "9da0cea2a5d0464ca78cfeccf6cedf2b1c0e6e6cb3c9183a937a68465debdb06"
-}

backend/.sqlx/query-a2bc410e1066ddc89ca4557ca0e29339e41cbc7a7ef6ad97b3f0eb93de04c359.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        UPDATE workspace_settings\n        SET success_handler = 'flow/f/test/success_flow'\n        WHERE workspace_id = 'test-workspace'\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "a2bc410e1066ddc89ca4557ca0e29339e41cbc7a7ef6ad97b3f0eb93de04c359"
+}

backend/.sqlx/query-a87e7b098b523176916daf5b1685b218dfbfe752aa730b421e9229dadd6ae587.json

@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT kind::text as \"kind!\", parent_job\n        FROM v2_job\n        WHERE id = $1\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "kind!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 1,
+        "name": "parent_job",
+        "type_info": "Uuid"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid"
+      ]
+    },
+    "nullable": [
+      null,
+      true
+    ]
+  },
+  "hash": "a87e7b098b523176916daf5b1685b218dfbfe752aa730b421e9229dadd6ae587"
+}

backend/.sqlx/query-ade0696ec69bec2258d2e3ff86bfba6ed3b1d573c298f9d7fe8056ba7e32ed81.json

@@ -0,0 +1,32 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT workspace_id, path, value FROM variable WHERE is_secret = true AND value IS NOT NULL AND value != ''",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "workspace_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "value",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "ade0696ec69bec2258d2e3ff86bfba6ed3b1d573c298f9d7fe8056ba7e32ed81"
+}

backend/.sqlx/query-b030efec7c7f770bf2ed5331a469aae723925270d9d5124cc4cb2c03db61dea8.json

@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) as count FROM variable WHERE is_secret = true AND value = 'CLEARED'",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "b030efec7c7f770bf2ed5331a469aae723925270d9d5124cc4cb2c03db61dea8"
+}

backend/.sqlx/query-b107d602c60c08f0edcaa99695f8546bf30074bad903959f7df030e0ac70a86f.json

@@ -0,0 +1,32 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT workspace_id, path, value FROM variable WHERE is_secret = true AND value != 'CLEARED' ORDER BY workspace_id, path",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "workspace_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "value",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "b107d602c60c08f0edcaa99695f8546bf30074bad903959f7df030e0ac70a86f"
+}

backend/.sqlx/query-b10d2ab53bd8d24b0bbcede8211de229d507784fbcdf46c309907df123e35018.json

@@ -0,0 +1,32 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT workspace_id, path, value FROM variable WHERE is_secret = true ORDER BY workspace_id, path",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "workspace_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "value",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "b10d2ab53bd8d24b0bbcede8211de229d507784fbcdf46c309907df123e35018"
+}

backend/.sqlx/query-b1bd088c2e1aca3104bede7d0953369b6b17ad3ad62692ae6f2303be890e6391.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO account (workspace_id, client, expires_at, refresh_token, grant_type, cc_client_id, cc_client_secret, cc_token_url) VALUES ($1, $2, now() + ($3 || ' seconds')::interval, $4, $5, $6, $7, $8) RETURNING id",
+  "query": "INSERT INTO account (workspace_id, client, expires_at, refresh_token, grant_type, cc_client_id, cc_client_secret, cc_token_url, mcp_server_url) VALUES ($1, $2, now() + ($3 || ' seconds')::interval, $4, $5, $6, $7, $8, $9) RETURNING id",
   "describe": {
     "columns": [
       {
@@ -18,12 +18,13 @@
         "Varchar",
         "Varchar",
         "Varchar",
-        "Varchar"
+        "Varchar",
+        "Text"
       ]
     },
     "nullable": [
       false
     ]
   },
-  "hash": "bbc28b92ae8ec3d120a8976be7d3966282fe6543e0eb957fc10864dbf58de58f"
+  "hash": "b1bd088c2e1aca3104bede7d0953369b6b17ad3ad62692ae6f2303be890e6391"
 }

backend/.sqlx/query-b4fc94adfe55bb87d2c4b6b45ed2eb5ac25e84f3619a0b403a2d619a0eb51432.json

@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                variable.account as account_id,\n                (now() > account.expires_at) as \"is_expired: bool\"\n            FROM variable\n            LEFT JOIN account ON variable.account = account.id AND account.workspace_id = $2\n            WHERE variable.path = $1 AND variable.workspace_id = $2\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "account_id",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "is_expired: bool",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      true,
+      null
+    ]
+  },
+  "hash": "b4fc94adfe55bb87d2c4b6b45ed2eb5ac25e84f3619a0b403a2d619a0eb51432"
+}

backend/.sqlx/query-bb289fd24f443f0f8917ec55bc9fc3113e37dd8009425e558b5f5d1e1543b513.json

@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE variable SET value = $1 WHERE path = $2 AND workspace_id = $3",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "bb289fd24f443f0f8917ec55bc9fc3113e37dd8009425e558b5f5d1e1543b513"
+}

backend/.sqlx/query-d0dfd217a4f53aaee7b83d5b5267f74e5ad617830dd835a45e17fd378bcbeada.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n            workspace_id,\n            slack_team_id,\n            teams_team_id,\n            teams_team_name,\n            teams_team_guid,\n            slack_name,\n            slack_command_script,\n            teams_command_script,\n            slack_email,\n            slack_oauth_client_id,\n            slack_oauth_client_secret,\n            auto_invite_domain,\n            auto_invite_operator,\n            auto_add,\n            customer_id,\n            plan,\n            webhook,\n            deploy_to,\n            ai_config,\n            error_handler,\n            error_handler_extra_args,\n            error_handler_muted_on_cancel,\n            large_file_storage,\n            datatable,\n            ducklake,\n            git_sync,\n            deploy_ui,\n            default_app,\n            default_scripts,\n            mute_critical_alerts,\n            color,\n            operator_settings,\n            git_app_installations,\n            auto_add_instance_groups,\n            auto_add_instance_groups_roles\n        FROM\n            workspace_settings\n        WHERE\n            workspace_id = $1\n        ",
+  "query": "\n        SELECT\n            workspace_id,\n            slack_team_id,\n            teams_team_id,\n            teams_team_name,\n            teams_team_guid,\n            slack_name,\n            slack_command_script,\n            teams_command_script,\n            slack_email,\n            slack_oauth_client_id,\n            slack_oauth_client_secret,\n            auto_invite_domain,\n            auto_invite_operator,\n            auto_add,\n            customer_id,\n            plan,\n            webhook,\n            deploy_to,\n            ai_config,\n            error_handler,\n            error_handler_extra_args,\n            error_handler_muted_on_cancel,\n            success_handler,\n            success_handler_extra_args,\n            large_file_storage,\n            datatable,\n            ducklake,\n            git_sync,\n            deploy_ui,\n            default_app,\n            default_scripts,\n            mute_critical_alerts,\n            color,\n            operator_settings,\n            git_app_installations,\n            auto_add_instance_groups,\n            auto_add_instance_groups_roles\n        FROM\n            workspace_settings\n        WHERE\n            workspace_id = $1\n        ",
   "describe": {
     "columns": [
       {
@@ -115,66 +115,76 @@
       },
       {
         "ordinal": 22,
+        "name": "success_handler",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 23,
+        "name": "success_handler_extra_args",
+        "type_info": "Json"
+      },
+      {
+        "ordinal": 24,
         "name": "large_file_storage",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 23,
+        "ordinal": 25,
         "name": "datatable",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 24,
+        "ordinal": 26,
         "name": "ducklake",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 25,
+        "ordinal": 27,
         "name": "git_sync",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 26,
+        "ordinal": 28,
         "name": "deploy_ui",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 27,
+        "ordinal": 29,
         "name": "default_app",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 28,
+        "ordinal": 30,
         "name": "default_scripts",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 29,
+        "ordinal": 31,
         "name": "mute_critical_alerts",
         "type_info": "Bool"
       },
       {
-        "ordinal": 30,
+        "ordinal": 32,
         "name": "color",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 31,
+        "ordinal": 33,
         "name": "operator_settings",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 32,
+        "ordinal": 34,
         "name": "git_app_installations",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 33,
+        "ordinal": 35,
         "name": "auto_add_instance_groups",
         "type_info": "TextArray"
       },
       {
-        "ordinal": 34,
+        "ordinal": 36,
         "name": "auto_add_instance_groups_roles",
         "type_info": "Jsonb"
       }
@@ -217,10 +227,12 @@
       true,
       true,
       true,
+      true,
+      true,
       false,
       true,
       true
     ]
   },
-  "hash": "3c53de373b9f1034b5f43002bf4715e12ddc641f4ca52efe0335719fa9461bb0"
+  "hash": "d0dfd217a4f53aaee7b83d5b5267f74e5ad617830dd835a45e17fd378bcbeada"
 }

backend/.sqlx/query-dbc05cbf6720cc85e01118bcdcbb478724ac0ea8f3e043da2de9d932216cc730.json

@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        INSERT INTO script (workspace_id, hash, path, content, language, kind, created_by, schema, summary, description, lock)\n        VALUES ('test-workspace', $1, 'f/test/simple_script', $2, 'deno', 'script', 'test-user', '{}', 'Simple test script', 'A simple test script', '')\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "dbc05cbf6720cc85e01118bcdcbb478724ac0ea8f3e043da2de9d932216cc730"
+}

backend/.sqlx/query-e26ccc6607a9c78c1a8c1fd7b3bec931cf0ed27f79f852ae7f63a0ed6e12042f.json

@@ -0,0 +1,59 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT client, refresh_token, grant_type, cc_client_id, cc_client_secret, cc_token_url, mcp_server_url FROM account WHERE workspace_id = $1 AND id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "client",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "refresh_token",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "grant_type",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "cc_client_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 4,
+        "name": "cc_client_secret",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 5,
+        "name": "cc_token_url",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 6,
+        "name": "mcp_server_url",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Int4"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "e26ccc6607a9c78c1a8c1fd7b3bec931cf0ed27f79f852ae7f63a0ed6e12042f"
+}

backend/.sqlx/query-e3f2459d9ac3534531d5724bb2d67be6f33f8ca02ef4768bccd32a33a70a4300.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        UPDATE workspace_settings\n        SET success_handler = 'script/f/test/success_handler'\n        WHERE workspace_id = 'test-workspace'\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "e3f2459d9ac3534531d5724bb2d67be6f33f8ca02ef4768bccd32a33a70a4300"
+}

backend/.sqlx/query-fb321fba5f4508d6cff5bae5a7c5a120d12b43a2f6056c3fff1c7c099b5f248a.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT app_version.raw_app FROM app\n         JOIN app_version ON app_version.id = app.versions[array_upper(app.versions, 1)]\n         WHERE app.path = $1 AND app.workspace_id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "raw_app",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "fb321fba5f4508d6cff5bae5a7c5a120d12b43a2f6056c3fff1c7c099b5f248a"
+}

backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.604.0"
+version = "1.613.4"
 authors.workspace = true
 edition.workspace = true
 
@@ -18,6 +18,7 @@ members = [
     "./windmill-indexer",
     "./windmill-macros",
     "./windmill-oauth",
+    "./windmill-local",
     "./parsers/windmill-parser",
     "./parsers/windmill-parser-ts",
     "./parsers/windmill-parser-go",
@@ -35,7 +36,7 @@ members = [
 exclude = ["./windmill-duckdb-ffi-internal"]
 
 [workspace.package]
-version = "1.604.0"
+version = "1.613.4"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
@@ -161,6 +162,7 @@ k8s-openapi.workspace = true
 libloading.workspace = true
 bitflags.workspace = true
 globset.workspace = true
+opentelemetry-proto.workspace = true
 
 
 [target.'cfg(windows)'.dependencies]
@@ -219,6 +221,8 @@ memchr = "2.7.4"
 axum = { version = "^0.7", features = ["multipart", "macros"] }
 headers = "^0"
 hyper = { version = "^1", features = ["full"] }
+hyper-tls = "^0.6"
+hyper-util = { version = "^0.1", features = ["client-legacy", "http1", "tokio"] }
 tokio = { version = "=1.46.1", features = ["full", "tracing", "time"] }
 tokio-stream = { version = "0.1.17" }
 tower = "^0"
@@ -233,6 +237,7 @@ thiserror = "^2"
 anyhow = "^1"
 chrono = { version = "^0.4", features = ["serde"] }
 chrono-tz = "^0.10.1"
+derive_more = { version = "1", features = ["deref", "deref_mut"], default-features = false }
 tracing = "^0"
 tracing-subscriber = { version = "^0", features = ["env-filter", "json"] }
 tracing-appender = "^0"
@@ -333,6 +338,7 @@ futures-core = "^0"
 lazy_static = "1.4.0"
 serde_derive = "1.0.147"
 const_format = { version = "0.2.35", features = ["rust_1_64", "rust_1_51"] }
+const-str = "0.5"
 constant_time_eq = "0.3.1"
 dyn-iter = "0.2.0"
 rsa = "^0"
@@ -405,6 +411,7 @@ async-once-cell = "0.5.4"
 aws-smithy-types-convert = { version = "^0", features = ["convert-chrono"] }
 crc = "^3"
 tar = "^0"
+flate2 = "^1"
 http = "^1"
 async-stream = "^0"
 
@@ -414,6 +421,7 @@ opentelemetry_sdk = { version = "0.27.1", features = ["rt-tokio"] }
 opentelemetry-otlp = { version = "0.27.0", features = ["grpc-tonic", "tls"] }
 opentelemetry-appender-tracing = "0.27.0"
 opentelemetry-semantic-conventions = { version = "0.27.0", features = ["semconv_experimental"] }
+opentelemetry-proto = { version = "0.29.0", features = ["with-serde", "gen-tonic"] }
 
 bollard = "0.18.1"
 
@@ -455,3 +463,6 @@ oracle = { version = "0.6.3", features = ["chrono"] }
 rumqttc = { version = "0.24.0", features = ["use-native-tls"]}
 strum = { version = "0.27", features = ["derive"] }
 strum_macros = "^0"
+hudsucker = { version = "0.22", features = ["rcgen-ca", "native-tls-client"] }
+hyper-http-proxy = { version = "1", default-features = false, features = ["native-tls"] }
+rcgen = "0.13"

backend/ee-repo-ref.txt

@@ -1 +1 @@
-27dc729e842c200c6b097dc69d99b6a0927465f2
+0bfcfe263622f48c086331b628c1239d5cea0b37

backend/generate_mcp_endpoints_tools/generate_mcp_tools.py

@@ -13,21 +13,7 @@ from typing import Dict, List, Any, Optional
 
 IMPORTS = """
 use std::borrow::Cow;
-use serde::{Deserialize, Serialize};
-"""
-
-ENDPOINT_STRUCT = """
-#[derive(Debug, Clone, Deserialize, Serialize)]
-pub struct EndpointTool {
-    pub name: Cow<'static, str>,
-    pub description: Cow<'static, str>,
-    pub instructions: Cow<'static, str>,
-    pub path: Cow<'static, str>,
-    pub method: Cow<'static, str>,
-    pub path_params_schema: Option<serde_json::Value>,
-    pub query_params_schema: Option<serde_json::Value>,
-    pub body_schema: Option<serde_json::Value>,
-}
+use windmill_mcp::server::EndpointTool;
 """
 
 def load_openapi_spec(file_path: str) -> Dict[str, Any]:
@@ -341,13 +327,11 @@ export const mcpEndpointTools: EndpointTool[] = [
 def generate_rust_code(tools: List[Dict[str, Any]], spec: Dict[str, Any], base_path: str = "") -> str:
     """Generate the complete Rust code with MCP tools."""
     if not tools:
-        return """// No MCP tools found in the OpenAPI specification
-
+        return f"""// No MCP tools found in the OpenAPI specification
 {IMPORTS}
-{ENDPOINT_STRUCT}
-pub fn all_tools() -> Vec<EndpointTool> {
+pub fn all_tools() -> Vec<EndpointTool> {{
     vec![]
-}
+}}
 """
 
     tool_definitions = []
@@ -386,9 +370,7 @@ pub fn all_tools() -> Vec<EndpointTool> {
 
     rust_code = f"""// Auto-generated MCP tools from OpenAPI specification
 // This file is generated by generate_mcp_tools.py - DO NOT EDIT MANUALLY
-
 {IMPORTS}
-{ENDPOINT_STRUCT}
 pub fn all_tools() -> Vec<EndpointTool> {{
     vec![
 {tool_definitions_str}
@@ -405,7 +387,7 @@ def main():
     project_dir = backend_dir.parent
 
     openapi_file = backend_dir / "windmill-api" / "openapi.yaml"
-    rust_output_file = backend_dir / "windmill-api" / "src" / "mcp" / "tools" / "auto_generated_endpoints.rs"
+    rust_output_file = backend_dir / "windmill-api" / "src" / "mcp" / "auto_generated_endpoints.rs"
     ts_output_file = project_dir / "frontend" / "src" / "lib" / "mcpEndpointTools.ts"
 
     if not openapi_file.exists():

backend/migrations/20260112000000_otel_traces.down.sql

@@ -0,0 +1,3 @@
+DROP INDEX IF EXISTS otel_traces_time_idx;
+DROP INDEX IF EXISTS otel_traces_trace_time_idx;
+DROP TABLE IF EXISTS otel_traces;

backend/migrations/20260112000000_otel_traces.up.sql

@@ -0,0 +1,36 @@
+-- OpenTelemetry Span storage (all fields from proto::Span).
+-- See: https://github.com/open-telemetry/opentelemetry-proto/blob/main/opentelemetry/proto/trace/v1/trace.proto
+
+CREATE TABLE IF NOT EXISTS otel_traces (
+    -- Identity fields (BYTEA for efficient storage and querying)
+    trace_id             BYTEA NOT NULL,              -- 16 bytes (proto: bytes)
+    span_id              BYTEA NOT NULL,              -- 8 bytes (proto: bytes)
+    trace_state          TEXT NOT NULL DEFAULT '',    -- W3C trace-context (proto: string)
+    parent_span_id       BYTEA NOT NULL DEFAULT '', -- 8 bytes, empty if root span (proto: bytes)
+    flags                INTEGER NOT NULL DEFAULT 0, -- W3C trace flags (proto: fixed32)
+    -- Core fields
+    name                 TEXT NOT NULL,              -- operation name (proto: string)
+    kind                 INTEGER NOT NULL,           -- SpanKind enum (proto: int32)
+    start_time_unix_nano BIGINT NOT NULL,            -- (proto: fixed64, postgres has no u64)
+    end_time_unix_nano   BIGINT NOT NULL,            -- (proto: fixed64, postgres has no u64)
+    -- Attributes
+    attributes                 JSONB NOT NULL DEFAULT '[]', -- (proto: repeated KeyValue)
+    dropped_attributes_count   INTEGER NOT NULL DEFAULT 0,  -- (proto: uint32)
+    -- Events
+    events                     JSONB NOT NULL DEFAULT '[]', -- (proto: repeated Event)
+    dropped_events_count       INTEGER NOT NULL DEFAULT 0,  -- (proto: uint32)
+    -- Links
+    links                      JSONB NOT NULL DEFAULT '[]', -- (proto: repeated Link)
+    dropped_links_count        INTEGER NOT NULL DEFAULT 0,  -- (proto: uint32)
+    -- Status
+    status               JSONB,                      -- (proto: optional Status message)
+    PRIMARY KEY (trace_id, span_id)
+);
+
+-- Query spans by trace_id, ordered by time
+CREATE INDEX IF NOT EXISTS otel_traces_trace_time_idx ON otel_traces (trace_id, start_time_unix_nano);
+
+-- Time-based cleanup (retention policy)
+CREATE INDEX IF NOT EXISTS otel_traces_time_idx ON otel_traces (start_time_unix_nano);
+
+-- trace_id = job_id.as_bytes()

backend/migrations/20260112102339_mcp_oauth_client.down.sql

@@ -0,0 +1,3 @@
+DROP INDEX IF EXISTS idx_account_mcp_server_url;
+ALTER TABLE account DROP COLUMN IF EXISTS mcp_server_url;
+DROP TABLE IF EXISTS mcp_oauth_client;

backend/migrations/20260112102339_mcp_oauth_client.up.sql

@@ -0,0 +1,13 @@
+CREATE TABLE mcp_oauth_client (
+    mcp_server_url TEXT PRIMARY KEY,
+    client_id TEXT NOT NULL,
+    client_secret TEXT,
+    client_secret_expires_at TIMESTAMP,
+    token_endpoint TEXT NOT NULL,
+    created_at TIMESTAMP NOT NULL DEFAULT now()
+);
+
+CREATE INDEX idx_mcp_oauth_client_expires ON mcp_oauth_client(client_secret_expires_at);
+
+ALTER TABLE account ADD COLUMN mcp_server_url TEXT;
+CREATE INDEX idx_account_mcp_server_url ON account(mcp_server_url) WHERE mcp_server_url IS NOT NULL;

backend/migrations/20260117105517_add_workspace_success_handler.down.sql

@@ -0,0 +1,4 @@
+-- Remove success_handler columns from workspace_settings
+ALTER TABLE workspace_settings
+    DROP COLUMN IF EXISTS success_handler,
+    DROP COLUMN IF EXISTS success_handler_extra_args;

backend/migrations/20260117105517_add_workspace_success_handler.up.sql

@@ -0,0 +1,4 @@
+-- Add success_handler columns to workspace_settings
+ALTER TABLE workspace_settings
+    ADD COLUMN IF NOT EXISTS success_handler TEXT,
+    ADD COLUMN IF NOT EXISTS success_handler_extra_args JSON;

backend/migrations/20260120100000_mcp_oauth_server.down.sql

@@ -0,0 +1,3 @@
+DROP TABLE IF EXISTS mcp_oauth_refresh_token;
+DROP TABLE IF EXISTS mcp_oauth_server_code;
+DROP TABLE IF EXISTS mcp_oauth_server_client;

backend/migrations/20260120100000_mcp_oauth_server.up.sql

@@ -0,0 +1,44 @@
+-- OAuth server: clients that have registered with Windmill to access MCP
+-- Only public clients are supported (PKCE required, no client secrets)
+CREATE TABLE mcp_oauth_server_client (
+    client_id VARCHAR(255) PRIMARY KEY,
+    client_name VARCHAR(255) NOT NULL,
+    redirect_uris TEXT[] NOT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT now()
+);
+
+-- OAuth server: authorization codes (short-lived, single-use)
+CREATE TABLE mcp_oauth_server_code (
+    code VARCHAR(64) PRIMARY KEY,
+    client_id VARCHAR(255) NOT NULL REFERENCES mcp_oauth_server_client(client_id) ON DELETE CASCADE,
+    user_email VARCHAR(255) NOT NULL,
+    workspace_id VARCHAR(50) NOT NULL,
+    scopes TEXT[] NOT NULL,
+    redirect_uri TEXT NOT NULL,
+    code_challenge VARCHAR(128),  -- PKCE
+    code_challenge_method VARCHAR(10),  -- 'S256' or 'plain'
+    created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    expires_at TIMESTAMPTZ NOT NULL DEFAULT now() + INTERVAL '10 minutes'
+);
+
+CREATE INDEX idx_mcp_oauth_server_code_expires ON mcp_oauth_server_code(expires_at);
+
+-- MCP OAuth refresh tokens for token rotation
+CREATE TABLE mcp_oauth_refresh_token (
+    id BIGSERIAL PRIMARY KEY,
+    refresh_token VARCHAR(64) NOT NULL UNIQUE,
+    access_token VARCHAR(64) NOT NULL,
+    client_id VARCHAR(255) NOT NULL REFERENCES mcp_oauth_server_client(client_id) ON DELETE CASCADE,
+    user_email VARCHAR(255) NOT NULL,
+    workspace_id VARCHAR(50) NOT NULL,
+    scopes TEXT[] NOT NULL,
+    token_family UUID NOT NULL,  -- Groups tokens from same auth flow for theft detection
+    created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    expires_at TIMESTAMPTZ NOT NULL,
+    used_at TIMESTAMPTZ DEFAULT NULL,  -- For rotation tracking (single-use)
+    revoked BOOLEAN NOT NULL DEFAULT FALSE  -- For theft detection
+);
+
+CREATE INDEX idx_mcp_oauth_refresh_token_token ON mcp_oauth_refresh_token(refresh_token);
+CREATE INDEX idx_mcp_oauth_refresh_token_expires ON mcp_oauth_refresh_token(expires_at);
+CREATE INDEX idx_mcp_oauth_refresh_token_family ON mcp_oauth_refresh_token(token_family);

backend/migrations/20260120204751_custom_user_instance_createrole.down.sql

@@ -0,0 +1 @@
+-- Add down migration script here

backend/migrations/20260120204751_custom_user_instance_createrole.up.sql

@@ -0,0 +1,10 @@
+
+DO $$
+BEGIN
+  ALTER ROLE custom_instance_user CREATEROLE;
+EXCEPTION
+    WHEN others THEN
+        RAISE NOTICE 'Error in custom_instance_user migration: %', SQLERRM;
+        -- Continue without failing the migration
+END
+$$;

backend/parsers/windmill-parser-py-imports/src/mapping.rs

@@ -380,5 +380,6 @@ pub static SHORT_IMPORTS_MAP: PyMap = phf_map! {
     "taiga" => "python-taiga",
     "docx" => "python-docx",
     "vt" => "vt-py",
+    "grpc" => "grpcio",
     // Add new entry here ^
 };

backend/src/main.rs

@@ -44,7 +44,7 @@ use windmill_common::{
         EXPOSE_DEBUG_METRICS_SETTING, EXPOSE_METRICS_SETTING, EXTRA_PIP_INDEX_URL_SETTING,
         HUB_API_SECRET_SETTING, HUB_BASE_URL_SETTING, INDEXER_SETTING,
         INSTANCE_PYTHON_VERSION_SETTING, JOB_DEFAULT_TIMEOUT_SECS_SETTING, JWT_SECRET_SETTING,
-        KEEP_JOB_DIR_SETTING, LICENSE_KEY_SETTING, MAVEN_REPOS_SETTING,
+        KEEP_JOB_DIR_SETTING, LICENSE_KEY_SETTING, MAVEN_REPOS_SETTING, OTEL_TRACING_PROXY_SETTING,
         MONITOR_LOGS_ON_OBJECT_STORE_SETTING, NO_DEFAULT_MAVEN_SETTING,
         NPM_CONFIG_REGISTRY_SETTING, NUGET_CONFIG_SETTING, OAUTH_SETTING, OTEL_SETTING,
         PIP_INDEX_URL_SETTING, POWERSHELL_REPO_PAT_SETTING, POWERSHELL_REPO_URL_SETTING,
@@ -99,9 +99,9 @@ use crate::monitor::{
     reload_bunfig_install_scopes_setting, reload_critical_alert_mute_ui_setting,
     reload_critical_error_channels_setting, reload_extra_pip_index_url_setting,
     reload_hub_api_secret_setting, reload_hub_base_url_setting, reload_job_default_timeout_setting,
-    reload_jwt_secret_setting, reload_license_key, reload_npm_config_registry_setting,
-    reload_pip_index_url_setting, reload_retention_period_setting, reload_scim_token_setting,
-    reload_smtp_config, reload_worker_config, MonitorIteration,
+    reload_jwt_secret_setting, reload_license_key, reload_otel_tracing_proxy_setting,
+    reload_npm_config_registry_setting, reload_pip_index_url_setting, reload_retention_period_setting,
+    reload_scim_token_setting, reload_smtp_config, reload_worker_config, MonitorIteration,
 };
 
 #[cfg(feature = "parquet")]
@@ -452,6 +452,7 @@ async fn windmill_main() -> anyhow::Result<()> {
             .unwrap_or(DEFAULT_NUM_WORKERS as i32)
     };
 
+    // TODO: maybe gate behind debug_assertions?
     if num_workers > 1 && !std::env::var("WORKER_GROUP").is_ok_and(|x| x == "native") {
         println!(
             "We STRONGLY recommend using at most 1 worker per container, use at your own risks"
@@ -802,16 +803,13 @@ Windmill Community Edition {GIT_VERSION}
         #[cfg(not(all(feature = "tantivy", feature = "parquet")))]
         let log_indexer_f = async { Ok(()) as anyhow::Result<()> };
 
-        let worker_internal_server_killpill_rx = killpill_rx.resubscribe();
+        // Resubscribe for OTEL tracing proxy before workers_f captures killpill_rx
+        #[cfg(all(feature = "private", feature = "enterprise"))]
+        let otel_killpill_rx = killpill_rx.resubscribe();
+
         let server_f = async {
             if !is_agent {
                 if let Some(db) = conn.as_sql() {
-                    if worker_mode {
-                        init_worker_internal_server_inline_utils(
-                            worker_internal_server_killpill_rx,
-                            base_internal_url.clone(),
-                        )?;
-                    }
                     windmill_api::run_server(
                         db.clone(),
                         index_reader,
@@ -842,6 +840,11 @@ Windmill Community Edition {GIT_VERSION}
             if !killpill_rx.try_recv().is_ok() {
                 let base_internal_url = base_internal_rx.await?;
                 if worker_mode {
+                    let worker_internal_server_killpill_rx = killpill_rx.resubscribe();
+                    init_worker_internal_server_inline_utils(
+                        worker_internal_server_killpill_rx,
+                        base_internal_url.clone(),
+                    )?;
                     let mut workers = vec![];
 
                     for i in 0..num_workers {
@@ -1158,6 +1161,13 @@ Windmill Community Edition {GIT_VERSION}
                                                         KEEP_JOB_DIR_SETTING => {
                                                             load_keep_job_dir(&conn).await;
                                                         },
+                                                        OTEL_TRACING_PROXY_SETTING => {
+                                                            reload_otel_tracing_proxy_setting(&conn).await;
+                                                            if worker_mode {
+                                                                tracing::info!("OTEL tracing proxy setting changed, restarting worker");
+                                                                send_delayed_killpill(&tx, 4, "OTEL tracing proxy setting change").await;
+                                                            }
+                                                        },
                                                         REQUIRE_PREEXISTING_USER_FOR_OAUTH_SETTING => {
                                                             load_require_preexisting_user(&db).await;
                                                         },
@@ -1331,7 +1341,8 @@ Windmill Community Edition {GIT_VERSION}
 
                                 // update min version explicitly.
                                 // for sql connection it is the part of monitor_db.
-                                windmill_common::worker::update_min_version(conn).await;
+                                // TODO: pass worker names for min keep-alive alerts (for HTTP connection)
+                                windmill_common::min_version::update_min_version(conn, false, vec![], false).await;
                             }
                         };
                     }
@@ -1366,6 +1377,42 @@ Windmill Community Edition {GIT_VERSION}
             Ok(()) as anyhow::Result<()>
         };
 
+        let otel_tracing_proxy_f = async {
+            #[cfg(all(feature = "private", feature = "enterprise"))]
+            {
+                // Start OTEL tracing proxy for HTTP request interception
+                // Only enabled when: setting is on, worker mode (not server), and single worker (to avoid race conditions)
+                if worker_mode
+                    && num_workers == 1
+                    && windmill_worker::OTEL_TRACING_PROXY_SETTINGS
+                        .read()
+                        .await
+                        .enabled
+                {
+                    if let Some(db) = conn.as_sql() {
+                        tracing::info!(
+                            "Starting OTEL tracing proxy (port will be dynamically assigned)"
+                        );
+                        if let Err(e) =
+                            windmill_worker::start_otel_tracing_proxy(db.clone(), otel_killpill_rx)
+                                .await
+                        {
+                            tracing::error!("OTEL tracing proxy error: {}", e);
+                        }
+                    }
+                } else if windmill_worker::OTEL_TRACING_PROXY_SETTINGS
+                    .read()
+                    .await
+                    .enabled
+                    && num_workers > 1
+                {
+                    tracing::warn!("OTEL tracing proxy is enabled but num_workers > 1. Disabling to avoid race conditions. Set NUM_WORKERS=1 to enable.");
+                }
+            }
+
+            Ok(()) as anyhow::Result<()>
+        };
+
         if server_mode {
             if let Some(db) = conn.as_sql() {
                 schedule_stats(&db, &HTTP_CLIENT).await;
@@ -1380,6 +1427,7 @@ Windmill Community Edition {GIT_VERSION}
                 monitor_f,
                 server_f,
                 metrics_f,
+                otel_tracing_proxy_f,
                 indexer_f,
                 log_indexer_f
             )?;

backend/src/monitor.rs

@@ -53,7 +53,7 @@ use windmill_common::{
         HUB_API_SECRET_SETTING, HUB_BASE_URL_SETTING, INSTANCE_PYTHON_VERSION_SETTING,
         JOB_DEFAULT_TIMEOUT_SECS_SETTING, JWT_SECRET_SETTING, KEEP_JOB_DIR_SETTING,
         LICENSE_KEY_SETTING, MONITOR_LOGS_ON_OBJECT_STORE_SETTING, NPM_CONFIG_REGISTRY_SETTING,
-        NUGET_CONFIG_SETTING, OTEL_SETTING, PIP_INDEX_URL_SETTING, POWERSHELL_REPO_PAT_SETTING,
+        OTEL_TRACING_PROXY_SETTING, NUGET_CONFIG_SETTING, OTEL_SETTING, PIP_INDEX_URL_SETTING, POWERSHELL_REPO_PAT_SETTING,
         POWERSHELL_REPO_URL_SETTING, REQUEST_SIZE_LIMIT_SETTING,
         REQUIRE_PREEXISTING_USER_FOR_OAUTH_SETTING, RETENTION_PERIOD_SECS_SETTING,
         SAML_METADATA_SETTING, SCIM_TOKEN_SETTING, TIMEOUT_WAIT_RESULT_SETTING,
@@ -81,10 +81,10 @@ use windmill_common::{
 use windmill_common::{client::AuthedClient, global_settings::APP_WORKSPACED_ROUTE_SETTING};
 use windmill_queue::{cancel_job, get_queued_job_v2, SameWorkerPayload};
 use windmill_worker::{
-    handle_job_error, JobCompletedSender, SameWorkerSender, BUNFIG_INSTALL_SCOPES,
-    INSTANCE_PYTHON_VERSION, JOB_DEFAULT_TIMEOUT, KEEP_JOB_DIR, MAVEN_REPOS, NO_DEFAULT_MAVEN,
-    NPM_CONFIG_REGISTRY, NUGET_CONFIG, PIP_EXTRA_INDEX_URL, PIP_INDEX_URL, POWERSHELL_REPO_PAT,
-    POWERSHELL_REPO_URL,
+    handle_job_error, JobCompletedSender, OtelTracingProxySettings, SameWorkerSender, BUNFIG_INSTALL_SCOPES,
+    INSTANCE_PYTHON_VERSION, JOB_DEFAULT_TIMEOUT, KEEP_JOB_DIR, MAVEN_REPOS,
+    OTEL_TRACING_PROXY_SETTINGS, NO_DEFAULT_MAVEN, NPM_CONFIG_REGISTRY, NUGET_CONFIG, PIP_EXTRA_INDEX_URL,
+    PIP_INDEX_URL, POWERSHELL_REPO_PAT, POWERSHELL_REPO_URL,
 };
 
 #[cfg(feature = "parquet")]
@@ -155,6 +155,20 @@ lazy_static::lazy_static! {
 
     .ok()
     .and_then(|x| x.parse::<u64>().ok());
+
+    /// Batch size for job cleanup deletion queries. Default: 10000.
+    /// Larger values delete more jobs per batch but hold locks longer.
+    static ref JOB_CLEANUP_BATCH_SIZE: i64 = std::env::var("JOB_CLEANUP_BATCH_SIZE")
+        .ok()
+        .and_then(|x| x.parse::<i64>().ok())
+        .unwrap_or(20000);
+
+    /// Maximum number of batches to process per cleanup iteration. Default: 10.
+    /// Set to 0 for unlimited (process until no expired jobs remain).
+    static ref JOB_CLEANUP_MAX_BATCHES: i32 = std::env::var("JOB_CLEANUP_MAX_BATCHES")
+        .ok()
+        .and_then(|x| x.parse::<i32>().ok())
+        .unwrap_or(20);
 }
 
 pub async fn initial_load(
@@ -306,6 +320,7 @@ pub async fn initial_load(
         reload_maven_repos_setting(&conn).await;
         reload_no_default_maven_setting(&conn).await;
         reload_ruby_repos_setting(&conn).await;
+        reload_otel_tracing_proxy_setting(&conn).await;
     }
 }
 
@@ -764,6 +779,35 @@ pub async fn load_keep_job_dir(conn: &Connection) {
     };
 }
 
+pub async fn reload_otel_tracing_proxy_setting(conn: &Connection) {
+    match load_value_from_global_settings_with_conn(conn, OTEL_TRACING_PROXY_SETTING, true).await {
+        Ok(Some(settings)) => {
+            match serde_json::from_value::<OtelTracingProxySettings>(settings) {
+                Ok(new_settings) => {
+                    let mut current = OTEL_TRACING_PROXY_SETTINGS.write().await;
+                    if current.enabled != new_settings.enabled
+                        || current.enabled_languages != new_settings.enabled_languages
+                    {
+                        tracing::info!(
+                            "OTEL tracing proxy settings changed: enabled={}, languages={:?}",
+                            new_settings.enabled,
+                            new_settings.enabled_languages
+                        );
+                        *current = new_settings;
+                    }
+                }
+                Err(e) => {
+                    tracing::error!("Error parsing OTEL tracing proxy settings: {e:#}");
+                }
+            }
+        }
+        Err(e) => {
+            tracing::error!("Error loading OTEL tracing proxy setting: {e:#}");
+        }
+        _ => (),
+    };
+}
+
 pub async fn load_require_preexisting_user(db: &DB) {
     let value =
         load_value_from_global_settings(db, REQUIRE_PREEXISTING_USER_FOR_OAUTH_SETTING).await;
@@ -815,6 +859,22 @@ pub async fn delete_expired_items(db: &DB) -> () {
         Err(e) => tracing::error!("Error deleting pip_resolution: {}", e.to_string()),
     }
 
+    // Clean up expired MCP OAuth refresh tokens
+    let mcp_refresh_tokens_r: std::result::Result<Vec<i64>, _> = sqlx::query_scalar(
+        "DELETE FROM mcp_oauth_refresh_token WHERE expires_at <= now() RETURNING id",
+    )
+    .fetch_all(db)
+    .await;
+
+    match mcp_refresh_tokens_r {
+        Ok(ids) => {
+            if ids.len() > 0 {
+                tracing::info!("deleted {} expired MCP OAuth refresh tokens", ids.len())
+            }
+        }
+        Err(e) => tracing::error!("Error deleting MCP OAuth refresh tokens: {}", e.to_string()),
+    }
+
     let deleted_cache = sqlx::query_scalar!(
             "DELETE FROM resource WHERE resource_type = 'cache' AND to_timestamp((value->>'expire')::int) < now() RETURNING path",
         )
@@ -908,99 +968,170 @@ pub async fn delete_expired_items(db: &DB) -> () {
         Err(e) => tracing::error!("Error deleting expired blacklisted agent tokens: {:?}", e),
     }
 
-    let job_retention_secs = *JOB_RETENTION_SECS.read().await;
-    if job_retention_secs > 0 {
-        match db.begin().await {
-            Ok(mut tx) => {
-                let deleted_jobs = sqlx::query_scalar!(
-                    "DELETE FROM v2_job_completed c
-                    WHERE completed_at <= now() - ($1::bigint::text || ' s')::interval 
-                    RETURNING c.id",
-                    job_retention_secs
-                )
-                .fetch_all(&mut *tx)
-                .await;
-
-                match deleted_jobs {
-                    Ok(deleted_jobs) => {
-                        if deleted_jobs.len() > 0 {
-                            tracing::info!(
-                                "deleted {} jobs completed JOB_RETENTION_SECS {} ago: {:?}",
-                                deleted_jobs.len(),
-                                job_retention_secs,
-                                deleted_jobs,
-                            );
-                            if let Err(e) = sqlx::query!(
-                                "DELETE FROM job_stats WHERE job_id = ANY($1)",
-                                &deleted_jobs
-                            )
-                            .execute(&mut *tx)
-                            .await
-                            {
-                                tracing::error!("Error deleting job stats: {:?}", e);
-                            }
-                            match sqlx::query_scalar!(
-                                "DELETE FROM job_logs WHERE job_id = ANY($1) RETURNING log_file_index",
-                                &deleted_jobs
-                            )
-                            .fetch_all(&mut *tx)
-                            .await
-                            {
-                                Ok(log_file_index) => {
-                                    let paths = log_file_index
-                                        .into_iter()
-                                        .filter_map(|opt| opt)
-                                        .flat_map(|inner_vec| inner_vec.into_iter())
-                                        .collect();
-                                    delete_log_files_from_disk_and_store(paths, TMP_DIR, "").await;
-                                }
-                                Err(e) => tracing::error!("Error deleting job stats: {:?}", e),
-                            }
-                            if let Err(e) = sqlx::query!(
-                                "DELETE FROM concurrency_key WHERE  ended_at <= now() - ($1::bigint::text || ' s')::interval ",
-                                job_retention_secs
-                            )
-                            .execute(&mut *tx)
-                            .await
-                            {
-                                tracing::error!("Error deleting  custom concurrency key: {:?}", e);
-                            }
-
-                            if let Err(e) =
-                                sqlx::query!("DELETE FROM v2_job WHERE id = ANY($1)", &deleted_jobs)
-                                    .execute(&mut *tx)
-                                    .await
-                            {
-                                tracing::error!("Error deleting job: {:?}", e);
-                            }
-
-                            // should already be deleted but just in case
-                            if let Err(e) = sqlx::query!(
-                                "DELETE FROM job_result_stream_v2 WHERE job_id = ANY($1)",
-                                &deleted_jobs
-                            )
-                            .execute(&mut *tx)
-                            .await
-                            {
-                                tracing::error!("Error deleting job result stream: {:?}", e);
-                            }
-                        }
-                    }
-                    Err(e) => {
-                        tracing::error!("Error deleting expired jobs: {:?}", e)
-                    }
-                }
-
-                match tx.commit().await {
-                    Ok(_) => (),
-                    Err(err) => tracing::error!("Error deleting expired jobs: {:?}", err),
-                }
-            }
-            Err(err) => {
-                tracing::error!("Error deleting expired jobs: {:?}", err)
+    match sqlx::query_scalar!(
+        "DELETE FROM mcp_oauth_server_code WHERE expires_at <= now() RETURNING code",
+    )
+    .fetch_all(db)
+    .await
+    {
+        Ok(deleted_codes) => {
+            if deleted_codes.len() > 0 {
+                tracing::info!(
+                    "deleted {} expired MCP OAuth authorization codes",
+                    deleted_codes.len()
+                );
             }
         }
+        Err(e) => tracing::error!("Error deleting expired MCP OAuth authorization codes: {:?}", e),
     }
+
+    let job_retention_secs = *JOB_RETENTION_SECS.read().await;
+    if job_retention_secs > 0 {
+        let batch_size = *JOB_CLEANUP_BATCH_SIZE;
+        let max_batches = *JOB_CLEANUP_MAX_BATCHES;
+        let cleanup_start = Instant::now();
+        let mut total_deleted = 0u64;
+        let mut batch_num = 0i32;
+
+        // Process batches until no more expired jobs or max batches reached
+        loop {
+            if max_batches > 0 && batch_num >= max_batches {
+                tracing::debug!(
+                    "Job cleanup: reached max batches limit ({}), will continue next iteration",
+                    max_batches
+                );
+                break;
+            }
+
+            // Each batch runs in its own transaction to avoid long-running locks
+            let batch_result = delete_expired_jobs_batch(db, job_retention_secs, batch_size).await;
+
+            match batch_result {
+                Ok(deleted_count) => {
+                    if deleted_count == 0 {
+                        // No more expired jobs to delete
+                        break;
+                    }
+                    total_deleted += deleted_count as u64;
+                    batch_num += 1;
+                }
+                Err(e) => {
+                    tracing::error!("Error in job cleanup batch {}: {:?}", batch_num, e);
+                    break;
+                }
+            }
+        }
+
+        if total_deleted > 0 {
+            tracing::info!(
+                "Job cleanup completed: deleted {} jobs in {} batches, took {:?}",
+                total_deleted,
+                batch_num,
+                cleanup_start.elapsed()
+            );
+        }
+
+        // Clean up concurrency keys separately (not tied to specific job IDs)
+        if let Err(e) = sqlx::query!(
+            "DELETE FROM concurrency_key WHERE ended_at <= now() - ($1::bigint::text || ' s')::interval",
+            job_retention_secs
+        )
+        .execute(db)
+        .await
+        {
+            tracing::error!("Error deleting custom concurrency key: {:?}", e);
+        }
+    }
+}
+
+/// Delete a batch of expired jobs with LIMIT and SKIP LOCKED for high-scale environments.
+/// Uses a single transaction per batch to minimize lock duration.
+/// Returns the number of jobs deleted in this batch.
+async fn delete_expired_jobs_batch(
+    db: &DB,
+    job_retention_secs: i64,
+    batch_size: i64,
+) -> error::Result<usize> {
+    let mut tx = db.begin().await?;
+
+    // Use FOR UPDATE SKIP LOCKED to avoid contention between replicas
+    // ORDER BY completed_at ensures we delete oldest jobs first
+    let deleted_jobs: Vec<Uuid> = sqlx::query_scalar!(
+        "DELETE FROM v2_job_completed
+         WHERE id IN (
+             SELECT id FROM v2_job_completed
+             WHERE completed_at <= now() - ($1::bigint::text || ' s')::interval
+             ORDER BY completed_at ASC
+             LIMIT $2
+             FOR UPDATE SKIP LOCKED
+         )
+         RETURNING id",
+        job_retention_secs,
+        batch_size
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+
+    let deleted_count = deleted_jobs.len();
+
+    if deleted_count > 0 {
+        tracing::debug!(
+            "Deleting batch of {} expired jobs (retention: {}s)",
+            deleted_count,
+            job_retention_secs
+        );
+
+        // Delete related records for this batch
+        if let Err(e) = sqlx::query!(
+            "DELETE FROM job_stats WHERE job_id = ANY($1)",
+            &deleted_jobs
+        )
+        .execute(&mut *tx)
+        .await
+        {
+            tracing::error!("Error deleting job stats: {:?}", e);
+        }
+
+        match sqlx::query_scalar!(
+            "DELETE FROM job_logs WHERE job_id = ANY($1) RETURNING log_file_index",
+            &deleted_jobs
+        )
+        .fetch_all(&mut *tx)
+        .await
+        {
+            Ok(log_file_index) => {
+                let paths = log_file_index
+                    .into_iter()
+                    .filter_map(|opt| opt)
+                    .flat_map(|inner_vec| inner_vec.into_iter())
+                    .collect();
+                delete_log_files_from_disk_and_store(paths, TMP_DIR, "").await;
+            }
+            Err(e) => tracing::error!("Error deleting job logs: {:?}", e),
+        }
+
+        if let Err(e) = sqlx::query!("DELETE FROM v2_job WHERE id = ANY($1)", &deleted_jobs)
+            .execute(&mut *tx)
+            .await
+        {
+            tracing::error!("Error deleting job: {:?}", e);
+        }
+
+        // Should already be deleted but just in case
+        if let Err(e) = sqlx::query!(
+            "DELETE FROM job_result_stream_v2 WHERE job_id = ANY($1)",
+            &deleted_jobs
+        )
+        .execute(&mut *tx)
+        .await
+        {
+            tracing::error!("Error deleting job result stream: {:?}", e);
+        }
+    }
+
+    tx.commit().await?;
+
+    Ok(deleted_count)
 }
 
 async fn delete_log_files_from_disk_and_store(
@@ -1732,7 +1863,7 @@ pub async fn monitor_db(
 
     let update_min_worker_version_f = async {
         #[cfg(not(feature = "test_job_debouncing"))]
-        windmill_common::worker::update_min_version(conn).await;
+        windmill_common::min_version::update_min_version(conn, _worker_mode, WORKERS_NAMES.read().await.clone(), initial_load).await;
     };
 
     join!(
@@ -2262,7 +2393,7 @@ async fn handle_zombie_jobs(db: &Pool<Postgres>, base_internal_url: &str, node_n
         sqlx::query_scalar!("SELECT j.id
              FROM v2_job_queue q JOIN v2_job j USING (id) LEFT JOIN v2_job_runtime r USING (id) LEFT JOIN v2_job_status s USING (id)
              WHERE r.ping < now() - ($1 || ' seconds')::interval
-             AND q.running = true AND j.kind NOT IN ('flow', 'flowpreview', 'flownode', 'singlestepflow') AND j.same_worker = false", 
+             AND q.running = true AND j.kind NOT IN ('flow', 'flowpreview', 'flownode', 'singlestepflow') AND j.same_worker = false",
              ZOMBIE_JOB_TIMEOUT.as_str())
         .fetch_all(db)
         .await
@@ -2396,8 +2527,8 @@ orphaned_job_uuids AS (
     SELECT job_uuid
     FROM all_job_uuids
     WHERE job_uuid NOT IN (
-        SELECT id::text 
-        FROM v2_job_queue 
+        SELECT id::text
+        FROM v2_job_queue
         FOR SHARE SKIP LOCKED
     )
 ),
@@ -2410,7 +2541,7 @@ before_update AS (
     WHERE lc.job_uuids ?| oa.orphaned_keys
 ),
 affected_rows AS (
-    UPDATE concurrency_counter 
+    UPDATE concurrency_counter
     SET job_uuids = job_uuids - orphaned_array.orphaned_keys
     FROM orphaned_array
     WHERE concurrency_counter.concurrency_id IN (
@@ -2419,12 +2550,12 @@ affected_rows AS (
     RETURNING concurrency_id, job_uuids AS updated_job_uuids
 ),
 expanded_orphaned AS (
-    SELECT bu.concurrency_id, 
+    SELECT bu.concurrency_id,
            bu.job_uuids AS original_job_uuids,
            unnest(bu.orphaned_keys) AS orphaned_key
     FROM before_update bu
 )
-SELECT 
+SELECT
     eo.concurrency_id,
     eo.orphaned_key,
     eo.original_job_uuids,
@@ -2453,7 +2584,7 @@ async fn cleanup_concurrency_counters_empty_keys(db: &DB) -> error::Result<()> {
 WITH rows_to_delete AS (
     SELECT concurrency_id
     FROM concurrency_counter
-    
+
     WHERE job_uuids = '{}'::jsonb
     FOR UPDATE SKIP LOCKED
 )
@@ -2489,7 +2620,7 @@ async fn handle_zombie_flows(db: &DB) -> error::Result<()> {
             AND (j.kind = 'flow' OR j.kind = 'flowpreview' OR j.kind = 'flownode')
             AND r.ping IS NOT NULL AND r.ping < NOW() - ($1 || ' seconds')::interval
             AND q.canceled_by IS NULL
-            
+
         "#,
         FLOW_ZOMBIE_TRANSITION_TIMEOUT.as_str()
     )
@@ -2820,8 +2951,8 @@ RETURNING key,job_id
 
 async fn cleanup_debounce_keys_for_completed_jobs(db: &DB) -> error::Result<()> {
     // If min version doesn't support runnable settings, clean up debounce keys for completed jobs
-    if !*windmill_common::worker::MIN_VERSION_SUPPORTS_RUNNABLE_SETTINGS_V0
-        .read()
+    if !windmill_common::min_version::MIN_VERSION_SUPPORTS_RUNNABLE_SETTINGS_V0
+        .met()
         .await
     {
         let result = sqlx::query!(

backend/summarized_schema.txt

@@ -1065,6 +1065,8 @@ TABLE: workspace_settings
   - ai_config (jsonb)
   - error_handler_extra_args (json)
   - error_handler_muted_on_cancel (boolean)
+  - success_handler (text)
+  - success_handler_extra_args (json)
   - large_file_storage (jsonb)
   - git_sync (jsonb)
   - default_app (character)

backend/tests/common/mod.rs

@@ -1,12 +1,11 @@
 #![allow(dead_code)]
 
-use std::{future::Future, str::FromStr, sync::Arc};
+use std::{future::Future, str::FromStr};
 
 use futures::Stream;
 use serde::Serialize;
 use serde_json::json;
 use sqlx::{postgres::PgListener, Pool, Postgres};
-use tokio::sync::RwLock;
 use uuid::Uuid;
 use windmill_api_client::types::NewScript;
 #[cfg(feature = "python")]
@@ -498,11 +497,11 @@ pub async fn initialize_tracing() {
 }
 
 pub async fn test_for_versions<F: Future<Output = ()>>(
-    version_flags: impl Iterator<Item = Arc<RwLock<bool>>>,
+    constraints: impl Iterator<Item = &'static windmill_common::min_version::VersionConstraint>,
     test: impl Fn() -> F,
 ) {
-    for version_flag in version_flags {
-        *version_flag.write().await = true;
+    for constraint in constraints {
+        *windmill_common::min_version::MIN_VERSION.write().await = constraint.version().clone();
         test().await;
     }
 }

backend/tests/fixtures/secret_backend.sql

@@ -0,0 +1,31 @@
+-- Fixture for secret backend migration tests
+-- Sets up test secrets in the variable table
+
+-- Create a second workspace for testing workspace isolation
+INSERT INTO workspace (id, name, owner)
+VALUES ('test-workspace-2', 'test-workspace-2', 'test-user')
+ON CONFLICT DO NOTHING;
+
+INSERT INTO workspace_settings (workspace_id)
+VALUES ('test-workspace-2')
+ON CONFLICT DO NOTHING;
+
+INSERT INTO workspace_key(workspace_id, kind, key)
+VALUES ('test-workspace-2', 'cloud', 'test-key-2')
+ON CONFLICT DO NOTHING;
+
+-- Insert test secrets for workspace 1
+-- Note: The 'value' column stores encrypted values in production,
+-- but for tests we'll use plain text that the migration will handle
+INSERT INTO variable (workspace_id, path, value, is_secret, description, extra_perms)
+VALUES
+    ('test-workspace', 'u/test-user/db_password', 'encrypted-db-pass-123', true, 'Database password', '{}'),
+    ('test-workspace', 'u/test-user/api_key', 'encrypted-api-key-abc', true, 'API key for external service', '{}'),
+    ('test-workspace', 'u/test-user/public_var', 'not-a-secret', false, 'A non-secret variable', '{}')
+ON CONFLICT DO NOTHING;
+
+-- Insert test secrets for workspace 2 (to test isolation)
+INSERT INTO variable (workspace_id, path, value, is_secret, description, extra_perms)
+VALUES
+    ('test-workspace-2', 'u/test-user/other_secret', 'encrypted-other-secret', true, 'Secret in workspace 2', '{}')
+ON CONFLICT DO NOTHING;

backend/tests/job_payload.rs

@@ -3,16 +3,15 @@ mod common;
 mod job_payload {
     use serde_json::json;
     use sqlx::{Pool, Postgres};
-    use std::sync::Arc;
-    use tokio::sync::RwLock;
-    use windmill_common::flow_status::RestartedFrom;
     use windmill_common::flows::{FlowModule, FlowModuleValue, FlowValue};
     use windmill_common::jobs::JobPayload;
     use windmill_common::scripts::{ScriptHash, ScriptLang};
+    use windmill_common::flow_status::RestartedFrom;
 
     use crate::common::*;
-    use windmill_common::worker::{
-        MIN_VERSION_IS_AT_LEAST_1_427, MIN_VERSION_IS_AT_LEAST_1_432, MIN_VERSION_IS_AT_LEAST_1_440,
+    use windmill_common::min_version::{
+        MIN_VERSION, MIN_VERSION_IS_AT_LEAST_1_427, MIN_VERSION_IS_AT_LEAST_1_432,
+        MIN_VERSION_IS_AT_LEAST_1_440,
     };
 
     pub async fn initialize_tracing() {
@@ -28,18 +27,15 @@ mod job_payload {
         });
     }
 
-    use lazy_static::lazy_static;
-
     use windmill_common::cache;
     use windmill_common::flows::FlowNodeId;
+    use windmill_common::min_version::VersionConstraint;
 
-    lazy_static! {
-        static ref VERSION_FLAGS: [Arc<RwLock<bool>>; 3] = [
-            MIN_VERSION_IS_AT_LEAST_1_427.clone(),
-            MIN_VERSION_IS_AT_LEAST_1_432.clone(),
-            MIN_VERSION_IS_AT_LEAST_1_440.clone(),
-        ];
-    }
+    const VERSION_FLAGS: [&VersionConstraint; 3] = [
+        &MIN_VERSION_IS_AT_LEAST_1_427,
+        &MIN_VERSION_IS_AT_LEAST_1_432,
+        &MIN_VERSION_IS_AT_LEAST_1_440,
+    ];
 
     #[cfg(feature = "deno_core")]
     #[sqlx::test(fixtures("base", "hello"))]
@@ -71,7 +67,7 @@ mod job_payload {
 
             assert_eq!(result, json!("Hello foo!"));
         };
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         Ok(())
     }
 
@@ -116,7 +112,7 @@ mod job_payload {
                 .unwrap();
             assert_eq!(job.preprocessed, Some(true));
         };
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         Ok(())
     }
 
@@ -183,7 +179,7 @@ mod job_payload {
 
             assert_eq!(result, json!("Hello foo!"));
         };
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         let test = || async {
             let result = RunJob::from(JobPayload::FlowScript {
                 id: flow_scripts[1],
@@ -206,7 +202,7 @@ mod job_payload {
                 json!("Did you just say \"You know nothing Jean Neige\"??!")
             );
         };
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         Ok(())
     }
 
@@ -252,7 +248,7 @@ mod job_payload {
 
             assert_eq!(result, json!("Did you just say \"Hello tests!\"??!"));
         };
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         Ok(())
     }
 
@@ -282,19 +278,19 @@ mod job_payload {
 
     #[sqlx::test(fixtures("base", "hello"))]
     async fn test_dependencies_payload_min_1_427(db: Pool<Postgres>) -> anyhow::Result<()> {
-        *MIN_VERSION_IS_AT_LEAST_1_427.write().await = true;
+        *MIN_VERSION.write().await = MIN_VERSION_IS_AT_LEAST_1_427.version().clone();
         test_dependencies_payload(db).await?;
         Ok(())
     }
     #[sqlx::test(fixtures("base", "hello"))]
     async fn test_dependencies_payload_min_1_432(db: Pool<Postgres>) -> anyhow::Result<()> {
-        *MIN_VERSION_IS_AT_LEAST_1_432.write().await = true;
+        *MIN_VERSION.write().await = MIN_VERSION_IS_AT_LEAST_1_432.version().clone();
         test_dependencies_payload(db).await?;
         Ok(())
     }
     #[sqlx::test(fixtures("base", "hello"))]
     async fn test_dependencies_payload_min_1_440(db: Pool<Postgres>) -> anyhow::Result<()> {
-        *MIN_VERSION_IS_AT_LEAST_1_440.write().await = true;
+        *MIN_VERSION.write().await = MIN_VERSION_IS_AT_LEAST_1_440.version().clone();
         test_dependencies_payload(db).await?;
         Ok(())
     }
@@ -323,7 +319,7 @@ mod job_payload {
                 &json!("Successful lock file generation")
             );
         };
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         Ok(())
     }
 
@@ -383,7 +379,7 @@ mod job_payload {
 
             assert_eq!(result, json!("Hello Jean Neige!"));
         };
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         Ok(())
     }
 
@@ -414,7 +410,7 @@ mod job_payload {
                 json!({ "lock": "", "status": "Successful lock file generation" })
             );
         };
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         Ok(())
     }
 
@@ -447,7 +443,7 @@ mod job_payload {
             );
         };
         // Test the not "lite" flow.
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         // Deploy the flow to produce the "lite" version.
         let _ = RunJob::from(JobPayload::FlowDependencies {
             path: "f/system/hello_with_nodes_flow".to_string(),
@@ -460,7 +456,7 @@ mod job_payload {
         .json_result()
         .unwrap();
         // Test the "lite" flow.
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         Ok(())
     }
 
@@ -520,7 +516,7 @@ mod job_payload {
             );
         };
         // Test the not "lite" flow.
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         // Deploy the flow to produce the "lite" version.
         let _ = RunJob::from(JobPayload::FlowDependencies {
             path: "f/system/hello_with_preprocessor".to_string(),
@@ -533,7 +529,7 @@ mod job_payload {
         .json_result()
         .unwrap();
         // Test the "lite" flow.
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         Ok(())
     }
 
@@ -577,7 +573,7 @@ mod job_payload {
             );
         };
         // Test the not "lite" flow.
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         // Deploy the flow to produce the "lite" version.
         let _ = RunJob::from(JobPayload::FlowDependencies {
             path: "f/system/hello_with_nodes_flow".to_string(),
@@ -590,7 +586,7 @@ mod job_payload {
         .json_result()
         .unwrap();
         // Test the "lite" flow.
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         Ok(())
     }
 
@@ -638,7 +634,7 @@ mod job_payload {
 
             assert_eq!(result, json!("Hello Jean Neige!"));
         };
-        test_for_versions(VERSION_FLAGS.iter().cloned(), test).await;
+        test_for_versions(VERSION_FLAGS.iter().copied(), test).await;
         Ok(())
     }
 

backend/tests/list_jobs.rs

@@ -0,0 +1,900 @@
+use serde::Deserialize;
+use serde_json::json;
+use sqlx::{Pool, Postgres};
+
+use windmill_common::{
+    jobs::{JobPayload, RawCode},
+    scripts::ScriptLang,
+};
+
+mod common;
+use common::*;
+
+#[derive(Debug, Deserialize)]
+struct ListJobsResponse {
+    #[serde(rename = "type")]
+    #[allow(dead_code)]
+    typ: String,
+    id: String,
+    #[serde(default)]
+    args: Option<serde_json::Value>,
+    #[serde(flatten)]
+    _extra: std::collections::HashMap<String, serde_json::Value>,
+}
+
+/// Response struct for queue/list endpoint (no type field)
+#[derive(Debug, Deserialize)]
+struct QueueJobResponse {
+    id: String,
+    #[serde(default)]
+    args: Option<serde_json::Value>,
+    #[serde(flatten)]
+    _extra: std::collections::HashMap<String, serde_json::Value>,
+}
+
+/// Response struct for completed/list endpoint
+#[cfg(feature = "python")]
+#[derive(Debug, Deserialize)]
+struct CompletedJobResponse {
+    id: String,
+    #[serde(default)]
+    args: Option<serde_json::Value>,
+    #[serde(flatten)]
+    _extra: std::collections::HashMap<String, serde_json::Value>,
+}
+
+/// Test that list_jobs returns jobs without args by default
+#[sqlx::test(fixtures("base"))]
+async fn test_list_jobs_without_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let client = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN".to_string(),
+    );
+
+    // Push a job to the queue with specific args
+    let job_id = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(x): return x * 2".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("x", json!(42))
+    .push(&db)
+    .await;
+
+    // Call list_jobs without include_args
+    let response = client
+        .client()
+        .get(format!("{}/w/test-workspace/jobs/list", client.baseurl()))
+        .send()
+        .await?;
+
+    assert!(response.status().is_success(), "list_jobs should succeed");
+
+    let jobs: Vec<ListJobsResponse> = response.json().await?;
+
+    // Find the job we created
+    let job = jobs
+        .iter()
+        .find(|j| j.id == job_id.to_string())
+        .expect("should find the created job");
+
+    // Args should be None when include_args is not set
+    assert!(
+        job.args.is_none(),
+        "args should not be included when include_args is not set"
+    );
+
+    Ok(())
+}
+
+/// Test that list_jobs returns jobs with args when include_args=true
+#[sqlx::test(fixtures("base"))]
+async fn test_list_jobs_with_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let client = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN".to_string(),
+    );
+
+    // Push a job to the queue with specific args
+    let job_id = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(x): return x * 2".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("x", json!(42))
+    .push(&db)
+    .await;
+
+    // Call list_jobs with include_args=true
+    let response = client
+        .client()
+        .get(format!(
+            "{}/w/test-workspace/jobs/list?include_args=true",
+            client.baseurl()
+        ))
+        .send()
+        .await?;
+
+    assert!(
+        response.status().is_success(),
+        "list_jobs with include_args should succeed"
+    );
+
+    let jobs: Vec<ListJobsResponse> = response.json().await?;
+
+    // Find the job we created
+    let job = jobs
+        .iter()
+        .find(|j| j.id == job_id.to_string())
+        .expect("should find the created job");
+
+    // Args should be present when include_args=true
+    assert!(
+        job.args.is_some(),
+        "args should be included when include_args=true"
+    );
+
+    let args = job.args.as_ref().unwrap();
+    assert_eq!(
+        args.get("x"),
+        Some(&json!(42)),
+        "args should contain the correct value"
+    );
+
+    Ok(())
+}
+
+/// Test that list_jobs returns completed jobs with args when include_args=true
+#[cfg(feature = "python")]
+#[sqlx::test(fixtures("base"))]
+async fn test_list_jobs_completed_with_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let client = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN".to_string(),
+    );
+
+    // Run a job to completion
+    let completed_job = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(x): return x * 2".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("x", json!(42))
+    .run_until_complete(&db, false, port)
+    .await;
+
+    let job_id = completed_job.id;
+
+    // Call list_jobs with include_args=true
+    let response = client
+        .client()
+        .get(format!(
+            "{}/w/test-workspace/jobs/list?include_args=true",
+            client.baseurl()
+        ))
+        .send()
+        .await?;
+
+    assert!(
+        response.status().is_success(),
+        "list_jobs with include_args should succeed"
+    );
+
+    let jobs: Vec<ListJobsResponse> = response.json().await?;
+
+    // Find the completed job
+    let job = jobs
+        .iter()
+        .find(|j| j.id == job_id.to_string())
+        .expect("should find the completed job");
+
+    // Args should be present when include_args=true
+    assert!(
+        job.args.is_some(),
+        "args should be included for completed jobs when include_args=true"
+    );
+
+    let args = job.args.as_ref().unwrap();
+    assert_eq!(
+        args.get("x"),
+        Some(&json!(42)),
+        "args should contain the correct value for completed jobs"
+    );
+
+    Ok(())
+}
+
+/// Test that list_jobs returns both queued and completed jobs with args
+#[cfg(feature = "python")]
+#[sqlx::test(fixtures("base"))]
+async fn test_list_jobs_mixed_queue_and_completed(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let client = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN".to_string(),
+    );
+
+    // Run a job to completion first
+    let completed_job = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(completed_arg): return completed_arg".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("completed_arg", json!("completed_value"))
+    .run_until_complete(&db, false, port)
+    .await;
+
+    let completed_job_id = completed_job.id;
+
+    // Push another job to the queue (don't run it)
+    let queued_job_id = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(queued_arg): return queued_arg".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("queued_arg", json!("queued_value"))
+    .push(&db)
+    .await;
+
+    // Call list_jobs with include_args=true
+    let response = client
+        .client()
+        .get(format!(
+            "{}/w/test-workspace/jobs/list?include_args=true",
+            client.baseurl()
+        ))
+        .send()
+        .await?;
+
+    assert!(
+        response.status().is_success(),
+        "list_jobs with include_args should succeed"
+    );
+
+    let jobs: Vec<ListJobsResponse> = response.json().await?;
+
+    // Find the completed job
+    let completed = jobs
+        .iter()
+        .find(|j| j.id == completed_job_id.to_string())
+        .expect("should find the completed job");
+
+    assert!(
+        completed.args.is_some(),
+        "completed job should have args when include_args=true"
+    );
+    assert_eq!(
+        completed.args.as_ref().unwrap().get("completed_arg"),
+        Some(&json!("completed_value")),
+        "completed job should have correct args"
+    );
+
+    // Find the queued job
+    let queued = jobs
+        .iter()
+        .find(|j| j.id == queued_job_id.to_string())
+        .expect("should find the queued job");
+
+    assert!(
+        queued.args.is_some(),
+        "queued job should have args when include_args=true"
+    );
+    assert_eq!(
+        queued.args.as_ref().unwrap().get("queued_arg"),
+        Some(&json!("queued_value")),
+        "queued job should have correct args"
+    );
+
+    Ok(())
+}
+
+/// Test list_jobs with multiple queued jobs and include_args
+#[sqlx::test(fixtures("base"))]
+async fn test_list_jobs_multiple_queued_with_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let client = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN".to_string(),
+    );
+
+    // Push two jobs with different args
+    let job1_id = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(x): return x".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("x", json!(1))
+    .push(&db)
+    .await;
+
+    let job2_id = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(y): return y".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("y", json!(2))
+    .push(&db)
+    .await;
+
+    // Test with include_args=true
+    let response = client
+        .client()
+        .get(format!(
+            "{}/w/test-workspace/jobs/list?include_args=true",
+            client.baseurl()
+        ))
+        .send()
+        .await?;
+
+    assert!(response.status().is_success(), "list_jobs should succeed");
+
+    let jobs: Vec<ListJobsResponse> = response.json().await?;
+
+    // Find both jobs
+    let job1 = jobs.iter().find(|j| j.id == job1_id.to_string())
+        .expect("should find job1");
+    let job2 = jobs.iter().find(|j| j.id == job2_id.to_string())
+        .expect("should find job2");
+
+    // Both should have args
+    assert!(job1.args.is_some(), "job1 args should be included");
+    assert!(job2.args.is_some(), "job2 args should be included");
+
+    // Check the args are correct
+    assert_eq!(
+        job1.args.as_ref().unwrap().get("x"),
+        Some(&json!(1)),
+        "job1 should have correct args"
+    );
+    assert_eq!(
+        job2.args.as_ref().unwrap().get("y"),
+        Some(&json!(2)),
+        "job2 should have correct args"
+    );
+
+    Ok(())
+}
+
+// ============================================================================
+// Tests for /queue/list endpoint
+// ============================================================================
+
+/// Test that queue/list returns jobs without args by default
+#[sqlx::test(fixtures("base"))]
+async fn test_queue_list_without_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let client = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN".to_string(),
+    );
+
+    // Push a job to the queue with specific args
+    let job_id = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(x): return x * 2".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("x", json!(42))
+    .push(&db)
+    .await;
+
+    // Call queue/list without include_args
+    let response = client
+        .client()
+        .get(format!(
+            "{}/w/test-workspace/jobs/queue/list",
+            client.baseurl()
+        ))
+        .send()
+        .await?;
+
+    assert!(
+        response.status().is_success(),
+        "queue/list should succeed"
+    );
+
+    let jobs: Vec<QueueJobResponse> = response.json().await?;
+
+    // Find the job we created
+    let job = jobs
+        .iter()
+        .find(|j| j.id == job_id.to_string())
+        .expect("should find the created job");
+
+    // Args should be None when include_args is not set
+    assert!(
+        job.args.is_none(),
+        "args should not be included when include_args is not set"
+    );
+
+    Ok(())
+}
+
+/// Test that queue/list returns jobs with args when include_args=true
+#[sqlx::test(fixtures("base"))]
+async fn test_queue_list_with_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let client = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN".to_string(),
+    );
+
+    // Push a job to the queue with specific args
+    let job_id = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(x): return x * 2".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("x", json!(42))
+    .push(&db)
+    .await;
+
+    // Call queue/list with include_args=true
+    let response = client
+        .client()
+        .get(format!(
+            "{}/w/test-workspace/jobs/queue/list?include_args=true",
+            client.baseurl()
+        ))
+        .send()
+        .await?;
+
+    assert!(
+        response.status().is_success(),
+        "queue/list with include_args should succeed"
+    );
+
+    let jobs: Vec<QueueJobResponse> = response.json().await?;
+
+    // Find the job we created
+    let job = jobs
+        .iter()
+        .find(|j| j.id == job_id.to_string())
+        .expect("should find the created job");
+
+    // Args should be present when include_args=true
+    assert!(
+        job.args.is_some(),
+        "args should be included when include_args=true"
+    );
+
+    let args = job.args.as_ref().unwrap();
+    assert_eq!(
+        args.get("x"),
+        Some(&json!(42)),
+        "args should contain the correct value"
+    );
+
+    Ok(())
+}
+
+/// Test queue/list with multiple jobs and include_args=true
+#[sqlx::test(fixtures("base"))]
+async fn test_queue_list_multiple_jobs_with_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let client = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN".to_string(),
+    );
+
+    // Push two jobs with different args
+    let job1_id = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(a): return a".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("a", json!("value_a"))
+    .push(&db)
+    .await;
+
+    let job2_id = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(b): return b".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("b", json!("value_b"))
+    .push(&db)
+    .await;
+
+    // Call queue/list with include_args=true
+    let response = client
+        .client()
+        .get(format!(
+            "{}/w/test-workspace/jobs/queue/list?include_args=true",
+            client.baseurl()
+        ))
+        .send()
+        .await?;
+
+    assert!(
+        response.status().is_success(),
+        "queue/list should succeed"
+    );
+
+    let jobs: Vec<QueueJobResponse> = response.json().await?;
+
+    // Find both jobs
+    let job1 = jobs
+        .iter()
+        .find(|j| j.id == job1_id.to_string())
+        .expect("should find job1");
+    let job2 = jobs
+        .iter()
+        .find(|j| j.id == job2_id.to_string())
+        .expect("should find job2");
+
+    // Both should have args
+    assert!(job1.args.is_some(), "job1 args should be included");
+    assert!(job2.args.is_some(), "job2 args should be included");
+
+    // Check the args are correct
+    assert_eq!(
+        job1.args.as_ref().unwrap().get("a"),
+        Some(&json!("value_a")),
+        "job1 should have correct args"
+    );
+    assert_eq!(
+        job2.args.as_ref().unwrap().get("b"),
+        Some(&json!("value_b")),
+        "job2 should have correct args"
+    );
+
+    Ok(())
+}
+
+// ============================================================================
+// Tests for /completed/list endpoint
+// ============================================================================
+
+/// Test that completed/list returns jobs without args by default
+#[cfg(feature = "python")]
+#[sqlx::test(fixtures("base"))]
+async fn test_completed_list_without_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let client = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN".to_string(),
+    );
+
+    // Run a job to completion
+    let completed_job = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(x): return x * 2".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("x", json!(42))
+    .run_until_complete(&db, false, port)
+    .await;
+
+    let job_id = completed_job.id;
+
+    // Call completed/list without include_args
+    let response = client
+        .client()
+        .get(format!(
+            "{}/w/test-workspace/jobs/completed/list",
+            client.baseurl()
+        ))
+        .send()
+        .await?;
+
+    assert!(
+        response.status().is_success(),
+        "completed/list should succeed"
+    );
+
+    let jobs: Vec<CompletedJobResponse> = response.json().await?;
+
+    // Find the completed job
+    let job = jobs
+        .iter()
+        .find(|j| j.id == job_id.to_string())
+        .expect("should find the completed job");
+
+    // Args should be None when include_args is not set
+    assert!(
+        job.args.is_none(),
+        "args should not be included when include_args is not set"
+    );
+
+    Ok(())
+}
+
+/// Test that completed/list returns jobs with args when include_args=true
+#[cfg(feature = "python")]
+#[sqlx::test(fixtures("base"))]
+async fn test_completed_list_with_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let client = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN".to_string(),
+    );
+
+    // Run a job to completion
+    let completed_job = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(x): return x * 2".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("x", json!(42))
+    .run_until_complete(&db, false, port)
+    .await;
+
+    let job_id = completed_job.id;
+
+    // Call completed/list with include_args=true
+    let response = client
+        .client()
+        .get(format!(
+            "{}/w/test-workspace/jobs/completed/list?include_args=true",
+            client.baseurl()
+        ))
+        .send()
+        .await?;
+
+    assert!(
+        response.status().is_success(),
+        "completed/list with include_args should succeed"
+    );
+
+    let jobs: Vec<CompletedJobResponse> = response.json().await?;
+
+    // Find the completed job
+    let job = jobs
+        .iter()
+        .find(|j| j.id == job_id.to_string())
+        .expect("should find the completed job");
+
+    // Args should be present when include_args=true
+    assert!(
+        job.args.is_some(),
+        "args should be included when include_args=true"
+    );
+
+    let args = job.args.as_ref().unwrap();
+    assert_eq!(
+        args.get("x"),
+        Some(&json!(42)),
+        "args should contain the correct value"
+    );
+
+    Ok(())
+}
+
+/// Test completed/list with multiple jobs and include_args=true
+#[cfg(feature = "python")]
+#[sqlx::test(fixtures("base"))]
+async fn test_completed_list_multiple_jobs_with_include_args(
+    db: Pool<Postgres>,
+) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let client = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN".to_string(),
+    );
+
+    // Run first job to completion
+    let completed_job1 = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(a): return a".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("a", json!("completed_a"))
+    .run_until_complete(&db, false, port)
+    .await;
+
+    let job1_id = completed_job1.id;
+
+    // Run second job to completion
+    let completed_job2 = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
+        content: "def main(b): return b".to_string(),
+        path: None,
+        language: ScriptLang::Python3,
+        lock: None,
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        concurrency_settings:
+            windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+    }))
+    .arg("b", json!("completed_b"))
+    .run_until_complete(&db, false, port)
+    .await;
+
+    let job2_id = completed_job2.id;
+
+    // Call completed/list with include_args=true
+    let response = client
+        .client()
+        .get(format!(
+            "{}/w/test-workspace/jobs/completed/list?include_args=true",
+            client.baseurl()
+        ))
+        .send()
+        .await?;
+
+    assert!(
+        response.status().is_success(),
+        "completed/list should succeed"
+    );
+
+    let jobs: Vec<CompletedJobResponse> = response.json().await?;
+
+    // Find both completed jobs
+    let job1 = jobs
+        .iter()
+        .find(|j| j.id == job1_id.to_string())
+        .expect("should find job1");
+    let job2 = jobs
+        .iter()
+        .find(|j| j.id == job2_id.to_string())
+        .expect("should find job2");
+
+    // Both should have args
+    assert!(job1.args.is_some(), "job1 args should be included");
+    assert!(job2.args.is_some(), "job2 args should be included");
+
+    // Check the args are correct
+    assert_eq!(
+        job1.args.as_ref().unwrap().get("a"),
+        Some(&json!("completed_a")),
+        "job1 should have correct args"
+    );
+    assert_eq!(
+        job2.args.as_ref().unwrap().get("b"),
+        Some(&json!("completed_b")),
+        "job2 should have correct args"
+    );
+
+    Ok(())
+}

backend/tests/secret_backend_integration.rs

@@ -0,0 +1,557 @@
+//! Integration tests for HashiCorp Vault secret backend.
+//!
+//! These tests require:
+//! 1. A PostgreSQL database (handled by sqlx test framework)
+//! 2. A running HashiCorp Vault instance
+//! 3. The RUN_VAULT_TESTS=1 environment variable to be set
+//!
+//! Environment variables:
+//! - RUN_VAULT_TESTS=1  - Required to run the tests
+//! - VAULT_ADDR         - Vault server address (default: http://127.0.0.1:8200)
+//! - VAULT_TOKEN        - Static token for static token tests (default: test-root-token)
+//! - BASE_URL           - Windmill instance URL for JWT tests (default: http://localhost:8000)
+//!
+//! Run tests (static token mode):
+//! ```bash
+//! RUN_VAULT_TESTS=1 VAULT_TOKEN=your-token cargo test -p windmill \
+//!     secret_backend_integration --features private,enterprise -- --nocapture
+//! ```
+//!
+//! Run tests (JWT mode - requires Windmill instance running for JWKS endpoint):
+//! ```bash
+//! RUN_VAULT_TESTS=1 BASE_URL=http://localhost:8000 cargo test -p windmill \
+//!     secret_backend_integration --features private,enterprise,openidconnect -- --nocapture
+//! ```
+
+#[cfg(all(feature = "private", feature = "enterprise"))]
+mod tests {
+    use sqlx::{Pool, Postgres};
+    use std::collections::HashMap;
+    use windmill_common::secret_backend::{
+        migrate_secrets_to_database, migrate_secrets_to_vault, test_vault_connection,
+        SecretBackend, VaultBackend, VaultSettings,
+    };
+
+    /// Check if vault tests should run (requires RUN_VAULT_TESTS=1 env var)
+    fn should_run_vault_tests() -> bool {
+        std::env::var("RUN_VAULT_TESTS")
+            .map(|v| v == "1" || v.to_lowercase() == "true")
+            .unwrap_or(false)
+    }
+
+    /// Set up BASE_URL for JWT tests (required for OIDC issuer URL generation)
+    async fn setup_base_url() {
+        let base_url = std::env::var("BASE_URL")
+            .unwrap_or_else(|_| "http://localhost:8000".to_string());
+        let mut url = windmill_common::BASE_URL.write().await;
+        *url = base_url;
+    }
+
+    /// Skip test if RUN_VAULT_TESTS is not set
+    macro_rules! skip_if_no_vault {
+        () => {
+            if !should_run_vault_tests() {
+                println!("Skipping test: RUN_VAULT_TESTS=1 not set");
+                println!("To run vault tests: RUN_VAULT_TESTS=1 cargo test ...");
+                return;
+            }
+        };
+    }
+
+    fn vault_settings_static_token() -> VaultSettings {
+        VaultSettings {
+            address: std::env::var("VAULT_ADDR")
+                .unwrap_or_else(|_| "http://127.0.0.1:8200".to_string()),
+            mount_path: "windmill".to_string(),
+            jwt_role: None, // Static token mode
+            namespace: None,
+            token: Some(
+                std::env::var("VAULT_TOKEN").unwrap_or_else(|_| "test-root-token".to_string()),
+            ),
+        }
+    }
+
+    fn vault_settings_jwt() -> VaultSettings {
+        VaultSettings {
+            address: std::env::var("VAULT_ADDR")
+                .unwrap_or_else(|_| "http://127.0.0.1:8200".to_string()),
+            mount_path: "windmill".to_string(),
+            jwt_role: Some("windmill-secrets".to_string()), // JWT mode
+            namespace: None,
+            token: None, // No static token - use JWT
+        }
+    }
+
+    // ==================== Static Token Tests ====================
+
+    /// Test Vault connection with static token
+    #[sqlx::test(fixtures("base", "secret_backend"))]
+    async fn test_vault_connection_static_token(db: Pool<Postgres>) {
+        skip_if_no_vault!();
+
+        let settings = vault_settings_static_token();
+        println!("Testing Vault connection with static token...");
+        println!("  Address: {}", settings.address);
+
+        let result = test_vault_connection(&settings, Some(&db)).await;
+        assert!(
+            result.is_ok(),
+            "Failed to connect to Vault: {:?}",
+            result.err()
+        );
+        println!("✓ Successfully connected to Vault with static token");
+    }
+
+    /// Test basic CRUD operations with static token
+    #[sqlx::test(fixtures("base", "secret_backend"))]
+    async fn test_vault_crud_static_token(_db: Pool<Postgres>) {
+        skip_if_no_vault!();
+
+        let settings = vault_settings_static_token();
+        let backend = VaultBackend::new(settings);
+
+        let workspace_id = "test-crud-static";
+        let path = "test-secret";
+        let value = "my-super-secret-value-123";
+
+        println!("Testing CRUD with static token...");
+
+        // Create
+        println!("  Creating secret...");
+        backend
+            .set_secret(workspace_id, path, value)
+            .await
+            .expect("Failed to create secret");
+        println!("  ✓ Created");
+
+        // Read
+        println!("  Reading secret...");
+        let read_value = backend
+            .get_secret(workspace_id, path)
+            .await
+            .expect("Failed to read secret");
+        assert_eq!(read_value, value);
+        println!("  ✓ Read (value matches)");
+
+        // Update
+        println!("  Updating secret...");
+        let new_value = "updated-secret-value-456";
+        backend
+            .set_secret(workspace_id, path, new_value)
+            .await
+            .expect("Failed to update secret");
+        let updated = backend
+            .get_secret(workspace_id, path)
+            .await
+            .expect("Failed to read updated secret");
+        assert_eq!(updated, new_value);
+        println!("  ✓ Updated");
+
+        // Delete
+        println!("  Deleting secret...");
+        backend
+            .delete_secret(workspace_id, path)
+            .await
+            .expect("Failed to delete secret");
+        let result = backend.get_secret(workspace_id, path).await;
+        assert!(result.is_err(), "Secret should be deleted");
+        println!("  ✓ Deleted");
+
+        println!("✓ CRUD operations successful with static token");
+    }
+
+    // ==================== JWT Auth Tests ====================
+
+    /// Test Vault connection with JWT authentication
+    #[sqlx::test(fixtures("base", "secret_backend"))]
+    async fn test_vault_connection_jwt(db: Pool<Postgres>) {
+        skip_if_no_vault!();
+        setup_base_url().await;
+
+        let settings = vault_settings_jwt();
+        println!("Testing Vault connection with JWT auth...");
+        println!("  Address: {}", settings.address);
+        println!("  JWT Role: {:?}", settings.jwt_role);
+        println!("  BASE_URL: {}", windmill_common::BASE_URL.read().await.clone());
+
+        let result = test_vault_connection(&settings, Some(&db)).await;
+        assert!(
+            result.is_ok(),
+            "Failed to connect to Vault with JWT: {:?}",
+            result.err()
+        );
+        println!("✓ Successfully connected to Vault with JWT auth");
+    }
+
+    /// Test basic CRUD operations with JWT authentication
+    #[cfg(feature = "openidconnect")]
+    #[sqlx::test(fixtures("base", "secret_backend"))]
+    async fn test_vault_crud_jwt(db: Pool<Postgres>) {
+        skip_if_no_vault!();
+        setup_base_url().await;
+
+        let settings = vault_settings_jwt();
+        let backend = VaultBackend::new_with_db(settings, db.clone());
+
+        let workspace_id = "test-crud-jwt";
+        let path = "jwt-test-secret";
+        let value = "jwt-authenticated-secret-value";
+
+        println!("Testing CRUD with JWT auth...");
+
+        // Create
+        println!("  Creating secret...");
+        backend
+            .set_secret(workspace_id, path, value)
+            .await
+            .expect("Failed to create secret with JWT");
+        println!("  ✓ Created");
+
+        // Read
+        println!("  Reading secret...");
+        let read_value = backend
+            .get_secret(workspace_id, path)
+            .await
+            .expect("Failed to read secret with JWT");
+        assert_eq!(read_value, value);
+        println!("  ✓ Read (value matches)");
+
+        // Delete (cleanup)
+        println!("  Deleting secret...");
+        backend
+            .delete_secret(workspace_id, path)
+            .await
+            .expect("Failed to delete secret with JWT");
+        println!("  ✓ Deleted");
+
+        println!("✓ CRUD operations successful with JWT auth");
+    }
+
+    // ==================== Migration Tests ====================
+
+    /// Test migration from database to Vault
+    #[sqlx::test(fixtures("base", "secret_backend"))]
+    async fn test_migrate_db_to_vault(db: Pool<Postgres>) {
+        skip_if_no_vault!();
+
+        let settings = vault_settings_static_token();
+
+        // Verify Vault connection
+        test_vault_connection(&settings, Some(&db))
+            .await
+            .expect("Failed to connect to Vault");
+
+        // Check initial state
+        let secrets_before = sqlx::query!(
+            "SELECT workspace_id, path, value FROM variable WHERE is_secret = true ORDER BY workspace_id, path"
+        )
+        .fetch_all(&db)
+        .await
+        .expect("Failed to query secrets");
+
+        println!(
+            "Found {} secrets in database before migration:",
+            secrets_before.len()
+        );
+        for s in &secrets_before {
+            println!("  - {}/{}: {} chars", s.workspace_id, s.path, s.value.len());
+        }
+
+        // Run migration
+        println!("\nMigrating secrets to Vault...");
+        let report = migrate_secrets_to_vault(&db, &settings)
+            .await
+            .expect("Migration to Vault failed");
+
+        println!("Migration report:");
+        println!("  Total secrets: {}", report.total_secrets);
+        println!("  Migrated: {}", report.migrated_count);
+        println!("  Failed: {}", report.failed_count);
+
+        if !report.failures.is_empty() {
+            println!("  Failures:");
+            for f in &report.failures {
+                println!("    - {}/{}: {}", f.workspace_id, f.path, f.error);
+            }
+        }
+
+        assert_eq!(report.failed_count, 0, "Migration had failures");
+        assert!(report.migrated_count > 0, "No secrets were migrated");
+
+        // Verify secrets in Vault
+        println!("\nVerifying secrets in Vault...");
+        let vault_backend = VaultBackend::new(settings.clone());
+
+        for secret in &secrets_before {
+            let result = vault_backend
+                .get_secret(&secret.workspace_id, &secret.path)
+                .await;
+            assert!(
+                result.is_ok(),
+                "Failed to read secret {}/{} from Vault: {:?}",
+                secret.workspace_id,
+                secret.path,
+                result.err()
+            );
+            println!(
+                "  ✓ {}/{} exists in Vault",
+                secret.workspace_id, secret.path
+            );
+        }
+
+        println!("\n✓ Migration to Vault completed successfully");
+    }
+
+    /// Test migration from Vault back to database
+    #[sqlx::test(fixtures("base", "secret_backend"))]
+    async fn test_migrate_vault_to_db(db: Pool<Postgres>) {
+        skip_if_no_vault!();
+
+        let settings = vault_settings_static_token();
+
+        test_vault_connection(&settings, Some(&db))
+            .await
+            .expect("Failed to connect to Vault");
+
+        // First migrate TO Vault
+        println!("Setting up: migrating secrets to Vault first...");
+        let to_vault = migrate_secrets_to_vault(&db, &settings)
+            .await
+            .expect("Initial migration to Vault failed");
+        assert!(to_vault.migrated_count > 0, "No secrets to test with");
+        println!("  Migrated {} secrets to Vault", to_vault.migrated_count);
+
+        // Clear database values
+        println!("\nClearing database secret values...");
+        sqlx::query!("UPDATE variable SET value = 'CLEARED' WHERE is_secret = true")
+            .execute(&db)
+            .await
+            .expect("Failed to clear values");
+
+        // Migrate back from Vault
+        println!("\nMigrating secrets from Vault to database...");
+        let report = migrate_secrets_to_database(&db, &settings)
+            .await
+            .expect("Migration to database failed");
+
+        println!("Migration report:");
+        println!("  Total secrets: {}", report.total_secrets);
+        println!("  Migrated: {}", report.migrated_count);
+        println!("  Failed: {}", report.failed_count);
+
+        assert_eq!(report.failed_count, 0, "Migration had failures");
+        assert!(report.migrated_count > 0, "No secrets were migrated");
+
+        // Verify restored
+        let restored = sqlx::query!(
+            "SELECT COUNT(*) as count FROM variable WHERE is_secret = true AND value != 'CLEARED'"
+        )
+        .fetch_one(&db)
+        .await
+        .expect("Failed to count restored");
+
+        assert!(
+            restored.count.unwrap_or(0) > 0,
+            "No secrets were restored in database"
+        );
+
+        println!("\n✓ Migration to database completed successfully");
+    }
+
+    // ==================== Variable Rename Tests ====================
+
+    /// Test renaming a variable path in Vault
+    #[sqlx::test(fixtures("base", "secret_backend"))]
+    async fn test_variable_rename(db: Pool<Postgres>) {
+        skip_if_no_vault!();
+        let _ = &db; // suppress unused warning
+
+        let settings = vault_settings_static_token();
+        let backend = VaultBackend::new(settings);
+
+        let workspace_id = "test-workspace";
+        let old_path = "u/test-user/old_secret_name";
+        let new_path = "u/test-user/new_secret_name";
+        let value = "secret-value-for-rename-test";
+
+        println!("Testing variable rename in Vault...");
+
+        // Create secret at old path
+        println!("  Creating secret at old path: {}", old_path);
+        backend
+            .set_secret(workspace_id, old_path, value)
+            .await
+            .expect("Failed to create secret");
+
+        // Verify it exists
+        let read_value = backend
+            .get_secret(workspace_id, old_path)
+            .await
+            .expect("Failed to read secret at old path");
+        assert_eq!(read_value, value);
+        println!("  ✓ Secret exists at old path");
+
+        // Simulate rename: read from old, write to new, delete old
+        println!("  Renaming: {} -> {}", old_path, new_path);
+        let secret_value = backend
+            .get_secret(workspace_id, old_path)
+            .await
+            .expect("Failed to read for rename");
+
+        backend
+            .set_secret(workspace_id, new_path, &secret_value)
+            .await
+            .expect("Failed to write to new path");
+
+        backend
+            .delete_secret(workspace_id, old_path)
+            .await
+            .expect("Failed to delete old path");
+
+        // Verify old path is gone
+        let old_result = backend.get_secret(workspace_id, old_path).await;
+        assert!(old_result.is_err(), "Old path should not exist");
+        println!("  ✓ Old path deleted");
+
+        // Verify new path exists with correct value
+        let new_value = backend
+            .get_secret(workspace_id, new_path)
+            .await
+            .expect("Failed to read new path");
+        assert_eq!(new_value, value);
+        println!("  ✓ New path exists with correct value");
+
+        // Cleanup
+        backend
+            .delete_secret(workspace_id, new_path)
+            .await
+            .expect("Failed to cleanup");
+
+        println!("\n✓ Variable rename completed successfully");
+    }
+
+    // ==================== Full Round Trip Test ====================
+
+    /// Test full round-trip: DB -> Vault -> DB with verification
+    #[sqlx::test(fixtures("base", "secret_backend"))]
+    async fn test_full_round_trip(db: Pool<Postgres>) {
+        skip_if_no_vault!();
+
+        let settings = vault_settings_static_token();
+
+        test_vault_connection(&settings, Some(&db))
+            .await
+            .expect("Failed to connect to Vault");
+
+        // Get original secrets
+        let original: HashMap<(String, String), String> = sqlx::query!(
+            "SELECT workspace_id, path, value FROM variable WHERE is_secret = true"
+        )
+        .fetch_all(&db)
+        .await
+        .expect("Failed to query")
+        .into_iter()
+        .map(|r| ((r.workspace_id, r.path), r.value))
+        .collect();
+
+        println!("Original secrets: {} entries", original.len());
+
+        // Step 1: DB -> Vault
+        println!("\n=== Step 1: Migrate DB -> Vault ===");
+        let to_vault = migrate_secrets_to_vault(&db, &settings)
+            .await
+            .expect("Migration to Vault failed");
+        println!("Migrated {} secrets to Vault", to_vault.migrated_count);
+        assert_eq!(to_vault.failed_count, 0);
+
+        // Step 2: Clear DB
+        println!("\n=== Step 2: Clear database values ===");
+        sqlx::query!("UPDATE variable SET value = 'ROUND_TRIP_CLEARED' WHERE is_secret = true")
+            .execute(&db)
+            .await
+            .expect("Failed to clear");
+
+        // Step 3: Vault -> DB
+        println!("\n=== Step 3: Migrate Vault -> DB ===");
+        let to_db = migrate_secrets_to_database(&db, &settings)
+            .await
+            .expect("Migration to database failed");
+        println!("Migrated {} secrets to database", to_db.migrated_count);
+        assert_eq!(to_db.failed_count, 0);
+
+        // Step 4: Verify
+        println!("\n=== Step 4: Verify round-trip integrity ===");
+        let restored: HashMap<(String, String), String> = sqlx::query!(
+            "SELECT workspace_id, path, value FROM variable WHERE is_secret = true"
+        )
+        .fetch_all(&db)
+        .await
+        .expect("Failed to query")
+        .into_iter()
+        .map(|r| ((r.workspace_id, r.path), r.value))
+        .collect();
+
+        for ((ws, path), _) in &original {
+            let restored_value = restored
+                .get(&(ws.clone(), path.clone()))
+                .expect(&format!("Secret {}/{} not found after round-trip", ws, path));
+
+            assert_ne!(
+                restored_value, "ROUND_TRIP_CLEARED",
+                "Secret {}/{} was not restored",
+                ws, path
+            );
+            println!("  ✓ {}/{}: restored", ws, path);
+        }
+
+        println!("\n✓ Full round-trip completed successfully!");
+    }
+
+    // ==================== Workspace Isolation Test ====================
+
+    /// Test that workspace isolation is maintained
+    #[sqlx::test(fixtures("base", "secret_backend"))]
+    async fn test_workspace_isolation(db: Pool<Postgres>) {
+        skip_if_no_vault!();
+
+        let settings = vault_settings_static_token();
+        let backend = VaultBackend::new(settings.clone());
+
+        // First migrate secrets to Vault
+        migrate_secrets_to_vault(&db, &settings)
+            .await
+            .expect("Migration failed");
+
+        println!("Testing workspace isolation...");
+
+        // Try to access workspace-2 secret from workspace-1 path (should fail)
+        let cross_access = backend
+            .get_secret("test-workspace", "u/test-user/other_secret")
+            .await;
+
+        assert!(
+            cross_access.is_err(),
+            "Cross-workspace access should fail!"
+        );
+        println!("✓ Cross-workspace access correctly denied");
+
+        // Verify own workspace access works
+        let ws1 = backend
+            .get_secret("test-workspace", "u/test-user/db_password")
+            .await;
+        assert!(ws1.is_ok(), "Same-workspace access should work");
+        println!("✓ Same-workspace access works");
+
+        println!("\n✓ Workspace isolation verified!");
+    }
+}
+
+// OSS version - just a placeholder to avoid compilation errors
+#[cfg(not(all(feature = "private", feature = "enterprise")))]
+mod tests {
+    #[test]
+    fn test_vault_requires_enterprise() {
+        println!("Vault integration tests require Enterprise Edition features");
+        println!("Run with: cargo test --features private,enterprise,openidconnect");
+    }
+}

backend/tests/secret_backend_migration.rs

@@ -0,0 +1,323 @@
+//! Integration tests for secret backend migration between database and HashiCorp Vault.
+//!
+//! These tests require:
+//! 1. A PostgreSQL database (handled by sqlx test framework)
+//! 2. A running HashiCorp Vault instance at http://127.0.0.1:8200
+//!
+//! To run these tests:
+//! ```bash
+//! # Start Vault in dev mode
+//! podman run -d --name vault-test -p 8200:8200 \
+//!     -e VAULT_DEV_ROOT_TOKEN_ID=test-root-token \
+//!     docker.io/hashicorp/vault:latest
+//!
+//! # Enable KV v2 secrets engine
+//! curl -s -H "X-Vault-Token: test-root-token" -X POST \
+//!     --data '{"type":"kv-v2"}' \
+//!     http://127.0.0.1:8200/v1/sys/mounts/windmill
+//!
+//! # Run the tests
+//! cargo test -p windmill secret_backend_migration -- --ignored --nocapture
+//! ```
+
+use sqlx::{Pool, Postgres};
+use windmill_common::error::Result;
+use windmill_common::secret_backend::{
+    vault_oss::{migrate_secrets_to_database, migrate_secrets_to_vault, test_vault_connection, VaultBackend},
+    SecretBackend, VaultSettings,
+};
+
+mod common;
+
+fn test_vault_settings() -> VaultSettings {
+    VaultSettings {
+        address: std::env::var("VAULT_ADDR").unwrap_or_else(|_| "http://127.0.0.1:8200".to_string()),
+        mount_path: "windmill".to_string(),
+        jwt_role: Some("windmill-secrets".to_string()),
+        namespace: None,
+        token: Some(
+            std::env::var("VAULT_TOKEN").unwrap_or_else(|_| "test-root-token".to_string()),
+        ),
+    }
+}
+
+/// Test that we can connect to Vault
+#[sqlx::test(fixtures("base", "secret_backend"))]
+#[ignore = "requires running Vault instance"]
+async fn test_vault_connection_works(db: Pool<Postgres>) {
+    let settings = test_vault_settings();
+
+    let result = test_vault_connection(&settings, Some(&db)).await;
+    assert!(result.is_ok(), "Failed to connect to Vault: {:?}", result.err());
+    println!("✓ Successfully connected to Vault at {}", settings.address);
+}
+
+/// Test migration from database to Vault
+#[sqlx::test(fixtures("base", "secret_backend"))]
+#[ignore = "requires running Vault instance"]
+async fn test_migrate_db_to_vault(db: Pool<Postgres>) {
+    let settings = test_vault_settings();
+
+    // First verify we can connect to Vault
+    test_vault_connection(&settings, Some(&db))
+        .await
+        .expect("Failed to connect to Vault");
+
+    // Check initial state - secrets should exist in database
+    let secrets_before = sqlx::query!(
+        "SELECT workspace_id, path, value FROM variable WHERE is_secret = true ORDER BY workspace_id, path"
+    )
+    .fetch_all(&db)
+    .await
+    .expect("Failed to query secrets");
+
+    println!("Found {} secrets in database before migration:", secrets_before.len());
+    for s in &secrets_before {
+        println!("  - {}/{}: {} chars", s.workspace_id, s.path, s.value.len());
+    }
+
+    // Run migration to Vault
+    println!("\nMigrating secrets to Vault...");
+    let report = migrate_secrets_to_vault(&db, &settings)
+        .await
+        .expect("Migration to Vault failed");
+
+    println!("Migration report:");
+    println!("  Total secrets: {}", report.total_secrets);
+    println!("  Migrated: {}", report.migrated_count);
+    println!("  Failed: {}", report.failed_count);
+
+    if !report.failures.is_empty() {
+        println!("  Failures:");
+        for f in &report.failures {
+            println!("    - {}/{}: {}", f.workspace_id, f.path, f.error);
+        }
+    }
+
+    assert_eq!(report.failed_count, 0, "Migration had failures");
+    assert!(report.migrated_count > 0, "No secrets were migrated");
+
+    // Verify secrets are in Vault
+    println!("\nVerifying secrets in Vault...");
+    let vault_backend = VaultBackend::new(settings.clone());
+
+    for secret in &secrets_before {
+        let result: Result<String> = vault_backend
+            .get_secret(&secret.workspace_id, &secret.path)
+            .await;
+        assert!(
+            result.is_ok(),
+            "Failed to read secret {}/{} from Vault: {:?}",
+            secret.workspace_id,
+            secret.path,
+            result.err()
+        );
+        println!("  ✓ {}/{} exists in Vault", secret.workspace_id, secret.path);
+    }
+
+    println!("\n✓ Migration to Vault completed successfully");
+}
+
+/// Test migration from Vault to database
+#[sqlx::test(fixtures("base", "secret_backend"))]
+#[ignore = "requires running Vault instance"]
+async fn test_migrate_vault_to_db(db: Pool<Postgres>) {
+    let settings = test_vault_settings();
+
+    // First verify we can connect to Vault
+    test_vault_connection(&settings, Some(&db))
+        .await
+        .expect("Failed to connect to Vault");
+
+    // First, migrate secrets TO Vault so we have something to migrate back
+    println!("Setting up: migrating secrets to Vault first...");
+    let to_vault_report = migrate_secrets_to_vault(&db, &settings)
+        .await
+        .expect("Initial migration to Vault failed");
+    assert!(to_vault_report.migrated_count > 0, "No secrets to test with");
+    println!("  Migrated {} secrets to Vault", to_vault_report.migrated_count);
+
+    // Clear the database values to simulate fresh migration back
+    println!("\nClearing database secret values...");
+    sqlx::query!("UPDATE variable SET value = 'CLEARED' WHERE is_secret = true")
+        .execute(&db)
+        .await
+        .expect("Failed to clear database values");
+
+    // Verify they were cleared
+    let cleared = sqlx::query!(
+        "SELECT COUNT(*) as count FROM variable WHERE is_secret = true AND value = 'CLEARED'"
+    )
+    .fetch_one(&db)
+    .await
+    .expect("Failed to count cleared");
+    println!("  Cleared {} secret values in database", cleared.count.unwrap_or(0));
+
+    // Now migrate from Vault back to database
+    println!("\nMigrating secrets from Vault to database...");
+    let report = migrate_secrets_to_database(&db, &settings)
+        .await
+        .expect("Migration to database failed");
+
+    println!("Migration report:");
+    println!("  Total secrets: {}", report.total_secrets);
+    println!("  Migrated: {}", report.migrated_count);
+    println!("  Failed: {}", report.failed_count);
+
+    if !report.failures.is_empty() {
+        println!("  Failures:");
+        for f in &report.failures {
+            println!("    - {}/{}: {}", f.workspace_id, f.path, f.error);
+        }
+    }
+
+    assert_eq!(report.failed_count, 0, "Migration had failures");
+    assert!(report.migrated_count > 0, "No secrets were migrated");
+
+    // Verify secrets are restored in database
+    println!("\nVerifying secrets in database...");
+    let secrets_after = sqlx::query!(
+        "SELECT workspace_id, path, value FROM variable WHERE is_secret = true AND value != 'CLEARED' ORDER BY workspace_id, path"
+    )
+    .fetch_all(&db)
+    .await
+    .expect("Failed to query restored secrets");
+
+    assert!(
+        !secrets_after.is_empty(),
+        "No secrets were restored in database"
+    );
+
+    for s in &secrets_after {
+        println!("  ✓ {}/{}: {} chars", s.workspace_id, s.path, s.value.len());
+    }
+
+    println!("\n✓ Migration to database completed successfully");
+}
+
+/// Test full round-trip migration: DB -> Vault -> DB
+#[sqlx::test(fixtures("base", "secret_backend"))]
+#[ignore = "requires running Vault instance"]
+async fn test_full_round_trip_migration(db: Pool<Postgres>) {
+    let settings = test_vault_settings();
+
+    // Verify Vault connection
+    test_vault_connection(&settings, Some(&db))
+        .await
+        .expect("Failed to connect to Vault");
+
+    // Get original secrets
+    let original_secrets: std::collections::HashMap<(String, String), String> = sqlx::query!(
+        "SELECT workspace_id, path, value FROM variable WHERE is_secret = true"
+    )
+    .fetch_all(&db)
+    .await
+    .expect("Failed to query original secrets")
+    .into_iter()
+    .map(|r| ((r.workspace_id, r.path), r.value))
+    .collect();
+
+    println!("Original secrets: {} entries", original_secrets.len());
+
+    // Step 1: Migrate to Vault
+    println!("\n=== Step 1: Migrate DB -> Vault ===");
+    let to_vault = migrate_secrets_to_vault(&db, &settings)
+        .await
+        .expect("Migration to Vault failed");
+    println!("Migrated {} secrets to Vault", to_vault.migrated_count);
+    assert_eq!(to_vault.failed_count, 0);
+
+    // Step 2: Clear database values
+    println!("\n=== Step 2: Clear database values ===");
+    sqlx::query!("UPDATE variable SET value = 'ROUND_TRIP_CLEARED' WHERE is_secret = true")
+        .execute(&db)
+        .await
+        .expect("Failed to clear values");
+
+    // Step 3: Migrate back from Vault
+    println!("\n=== Step 3: Migrate Vault -> DB ===");
+    let to_db = migrate_secrets_to_database(&db, &settings)
+        .await
+        .expect("Migration to database failed");
+    println!("Migrated {} secrets to database", to_db.migrated_count);
+    assert_eq!(to_db.failed_count, 0);
+
+    // Step 4: Verify round-trip integrity
+    println!("\n=== Step 4: Verify round-trip integrity ===");
+    let restored_secrets: std::collections::HashMap<(String, String), String> = sqlx::query!(
+        "SELECT workspace_id, path, value FROM variable WHERE is_secret = true"
+    )
+    .fetch_all(&db)
+    .await
+    .expect("Failed to query restored secrets")
+    .into_iter()
+    .map(|r| ((r.workspace_id, r.path), r.value))
+    .collect();
+
+    // Compare original and restored
+    for ((ws, path), _original_value) in &original_secrets {
+        let restored_value = restored_secrets
+            .get(&(ws.clone(), path.clone()))
+            .expect(&format!("Secret {}/{} not found after round-trip", ws, path));
+
+        // Note: Values might differ slightly due to encryption/decryption
+        // but they should not be the cleared value
+        assert_ne!(
+            restored_value, "ROUND_TRIP_CLEARED",
+            "Secret {}/{} was not restored",
+            ws, path
+        );
+        println!("  ✓ {}/{}: restored ({} chars)", ws, path, restored_value.len());
+    }
+
+    println!("\n✓ Full round-trip migration completed successfully!");
+    println!("  Original secrets: {}", original_secrets.len());
+    println!("  Restored secrets: {}", restored_secrets.len());
+}
+
+/// Test that workspace isolation is maintained during migration
+#[sqlx::test(fixtures("base", "secret_backend"))]
+#[ignore = "requires running Vault instance"]
+async fn test_workspace_isolation(db: Pool<Postgres>) {
+    let settings = test_vault_settings();
+
+    test_vault_connection(&settings, Some(&db))
+        .await
+        .expect("Failed to connect to Vault");
+
+    // Migrate all secrets to Vault
+    let report = migrate_secrets_to_vault(&db, &settings)
+        .await
+        .expect("Migration failed");
+
+    println!("Migrated {} secrets across workspaces", report.migrated_count);
+
+    // Verify workspace isolation in Vault
+    let vault_backend = VaultBackend::new(settings.clone());
+
+    // Try to access test-workspace-2 secret from test-workspace path (should fail)
+    let cross_workspace_result: Result<String> = vault_backend
+        .get_secret("test-workspace", "u/test-user/other_secret")
+        .await;
+
+    assert!(
+        cross_workspace_result.is_err(),
+        "Cross-workspace access should fail - workspace isolation violated!"
+    );
+    println!("✓ Cross-workspace access correctly denied");
+
+    // Verify each workspace's secrets are accessible from their own workspace
+    let ws1_result: Result<String> = vault_backend
+        .get_secret("test-workspace", "u/test-user/db_password")
+        .await;
+    assert!(ws1_result.is_ok(), "test-workspace secret should be accessible");
+    println!("✓ test-workspace secrets accessible");
+
+    let ws2_result: Result<String> = vault_backend
+        .get_secret("test-workspace-2", "u/test-user/other_secret")
+        .await;
+    assert!(ws2_result.is_ok(), "test-workspace-2 secret should be accessible");
+    println!("✓ test-workspace-2 secrets accessible");
+
+    println!("\n✓ Workspace isolation verified!");
+}