diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15fca3e649..ae23b08efa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+## [1.649.0](https://github.com/windmill-labs/windmill/compare/v1.648.0...v1.649.0) (2026-03-03)
+
+
+### Features
+
+* **frontend:** add script recorder for offline replay ([#8200](https://github.com/windmill-labs/windmill/issues/8200)) ([c97d8b4](https://github.com/windmill-labs/windmill/commit/c97d8b4715f86ea83ab2c0223ba859ced690829a))
+* move index management out of /srch/, add storage size reporting ([#8169](https://github.com/windmill-labs/windmill/issues/8169)) ([ee01acd](https://github.com/windmill-labs/windmill/commit/ee01acd9a6a2cd68a3f226988bfb46f6a6e64c08))
+
+
+### Bug Fixes
+
+* clean up slow-load toast interval on component destroy ([#8207](https://github.com/windmill-labs/windmill/issues/8207)) ([26f4f2b](https://github.com/windmill-labs/windmill/commit/26f4f2b399b828185b553289d6560e12261030a3))
+* **frontend:** prevent subflow expansion from hiding all insertion points ([#8203](https://github.com/windmill-labs/windmill/issues/8203)) ([e97da86](https://github.com/windmill-labs/windmill/commit/e97da860672171e33054a77d71f4824bb09e540d))
+* gracefully handle malformed OAuth entries in instance config ([#8205](https://github.com/windmill-labs/windmill/issues/8205)) ([cac4bdd](https://github.com/windmill-labs/windmill/commit/cac4bdd54f0c3ea80844ac31f7597f418ff7d8ae))
+* skip stop_after_if evaluation for skipped (identity) flow steps ([#8201](https://github.com/windmill-labs/windmill/issues/8201)) ([e6f7775](https://github.com/windmill-labs/windmill/commit/e6f7775d4d9a052aefc37260c6ed161146841cd7))
+* use exact matching for python requirements directive parsing ([#8199](https://github.com/windmill-labs/windmill/issues/8199)) ([2b2be38](https://github.com/windmill-labs/windmill/commit/2b2be38f129bbe58b6bb3815c4bd94aa03a3da90))
+
+
+### Performance Improvements
+
+* use two-step query in input history to leverage v2_job index ([#8197](https://github.com/windmill-labs/windmill/issues/8197)) ([50defdd](https://github.com/windmill-labs/windmill/commit/50defdded113b4d2cf0991b3fb642d1cd9a462b7))
+
 ## [1.648.0](https://github.com/windmill-labs/windmill/compare/v1.647.2...v1.648.0) (2026-03-02)
 
 
diff --git a/backend/.sqlx/query-19a7ebb2e7e8e57b6e7c974da8eb7c6841a5c4ff12ba7c12c73d691c49dd99ed.json b/backend/.sqlx/query-19a7ebb2e7e8e57b6e7c974da8eb7c6841a5c4ff12ba7c12c73d691c49dd99ed.json
new file mode 100644
index 0000000000..18ad13d90f
--- /dev/null
+++ b/backend/.sqlx/query-19a7ebb2e7e8e57b6e7c974da8eb7c6841a5c4ff12ba7c12c73d691c49dd99ed.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT email FROM token WHERE token = $1 AND (expiration > NOW() OR expiration IS NULL)",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "email",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "19a7ebb2e7e8e57b6e7c974da8eb7c6841a5c4ff12ba7c12c73d691c49dd99ed"
+}
diff --git a/backend/.sqlx/query-5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55.json b/backend/.sqlx/query-5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55.json
index 713ccb9dd3..36ddb8ab9f 100644
--- a/backend/.sqlx/query-5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55.json
+++ b/backend/.sqlx/query-5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55.json
@@ -15,7 +15,7 @@
       ]
     },
     "nullable": [
-      null
+      true
     ]
   },
   "hash": "5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55"
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index a2a27a9413..d26d5b76d7 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -860,9 +860,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.16.0"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9a7b350e3bb1767102698302bc37256cbd48422809984b98d292c40e2579aa9"
+checksum = "94bffc006df10ac2a68c83692d734a465f8ee6c5b384d8545a636f81d858f4bf"
 dependencies = [
  "aws-lc-sys",
  "zeroize",
@@ -870,9 +870,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.37.1"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b092fe214090261288111db7a2b2c2118e5a7f30dc2569f1732c4069a6840549"
+checksum = "4321e568ed89bb5a7d291a7f37997c2c0df89809d7b6d12062c81ddb54aa782e"
 dependencies = [
  "cc",
  "cmake",
@@ -1334,9 +1334,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-xml"
-version = "0.60.14"
+version = "0.60.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b53543b4b86ed43f051644f704a98c7291b3618b67adf057ee77a366fa52fcaa"
+checksum = "0ce02add1aa3677d022f8adf81dcbe3046a95f17a1b1e8979c145cd21d3d22b3"
 dependencies = [
  "xmlparser",
 ]
@@ -6173,20 +6173,20 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "r-efi",
+ "r-efi 5.3.0",
  "wasip2",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
 dependencies = [
  "cfg-if",
  "libc",
- "r-efi",
+ "r-efi 6.0.0",
  "wasip2",
  "wasip3",
 ]
@@ -7421,9 +7421,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.11.0"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
 
 [[package]]
 name = "ipnetwork"
@@ -10723,6 +10723,12 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
 [[package]]
 name = "radium"
 version = "0.7.0"
@@ -13850,7 +13856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0"
 dependencies = [
  "fastrand",
- "getrandom 0.4.1",
+ "getrandom 0.4.2",
  "once_cell",
  "rustix 1.1.4",
  "windows-sys 0.61.2",
@@ -15732,7 +15738,7 @@ dependencies = [
 
 [[package]]
 name = "windmill"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-nats",
@@ -15796,7 +15802,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-alerting"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "axum 0.7.9",
  "chrono",
@@ -15809,7 +15815,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -15947,7 +15953,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-agent-workers"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "axum 0.7.9",
  "chrono",
@@ -15970,7 +15976,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-assets"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "axum 0.7.9",
  "chrono",
@@ -15983,7 +15989,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-auth"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "axum 0.7.9",
@@ -16009,7 +16015,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "reqwest 0.12.28",
  "serde",
@@ -16019,7 +16025,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-configs"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "axum 0.7.9",
  "chrono",
@@ -16036,7 +16042,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-debug"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "axum 0.7.9",
  "base64 0.22.1",
@@ -16059,7 +16065,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-embeddings"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "axum 0.7.9",
@@ -16082,7 +16088,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-flow-conversations"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "axum 0.7.9",
  "chrono",
@@ -16098,7 +16104,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-flows"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "axum 0.7.9",
  "chrono",
@@ -16118,7 +16124,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-groups"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "axum 0.7.9",
  "chrono",
@@ -16138,7 +16144,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-inputs"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "axum 0.7.9",
  "chrono",
@@ -16152,7 +16158,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-integration-tests"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-nats",
@@ -16179,7 +16185,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-jobs"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "axum 0.7.9",
@@ -16204,7 +16210,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-npm-proxy"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "axum 0.7.9",
  "flate2",
@@ -16222,7 +16228,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-openapi"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "axum 0.7.9",
@@ -16243,7 +16249,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-schedule"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "axum 0.7.9",
  "chrono",
@@ -16263,7 +16269,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-scripts"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "axum 0.7.9",
  "chrono",
@@ -16293,7 +16299,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-settings"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "axum 0.7.9",
@@ -16320,7 +16326,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-sse"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "lazy_static",
  "serde",
@@ -16332,7 +16338,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-users"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "argon2",
  "axum 0.7.9",
@@ -16355,7 +16361,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-workers"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "axum 0.7.9",
  "chrono",
@@ -16369,7 +16375,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-workspaces"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "axum 0.7.9",
  "chrono",
@@ -16399,7 +16405,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "chrono",
  "lazy_static",
@@ -16413,7 +16419,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "axum 0.7.9",
@@ -16432,7 +16438,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "aes-gcm",
  "anyhow",
@@ -16531,7 +16537,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-dep-map"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "chrono",
  "itertools 0.14.0",
@@ -16550,7 +16556,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "regex",
  "serde",
@@ -16565,7 +16571,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "astral-tokio-tar",
@@ -16589,7 +16595,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-jseval"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "futures",
@@ -16606,7 +16612,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "itertools 0.14.0",
  "lazy_static",
@@ -16622,7 +16628,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-mcp"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -16643,7 +16649,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-native-triggers"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -16674,7 +16680,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-oauth"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-oauth2",
@@ -16698,7 +16704,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-object-store"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -16732,7 +16738,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-operator"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "futures",
@@ -16750,7 +16756,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -16759,7 +16765,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -16771,7 +16777,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-csharp"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -16783,7 +16789,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -16795,7 +16801,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -16807,7 +16813,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-java"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -16819,7 +16825,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-nu"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "nu-parser",
@@ -16830,7 +16836,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -16841,7 +16847,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -16854,7 +16860,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -16878,7 +16884,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ruby"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -16892,7 +16898,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -16909,7 +16915,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -16924,7 +16930,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -16943,7 +16949,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "serde",
@@ -16954,7 +16960,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -16991,7 +16997,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-runtime-nativets"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "const_format",
@@ -17029,7 +17035,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "getrandom 0.3.4",
  "wasm-bindgen",
@@ -17040,7 +17046,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-store"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -17069,7 +17075,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-test-utils"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "axum 0.7.9",
@@ -17092,7 +17098,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -17125,7 +17131,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-email"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -17145,7 +17151,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-gcp"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -17179,7 +17185,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-http"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -17214,7 +17220,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-kafka"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -17237,7 +17243,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-mqtt"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -17261,7 +17267,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-nats"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-nats",
@@ -17285,7 +17291,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-postgres"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -17320,7 +17326,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-sqs"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -17348,7 +17354,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-websocket"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -17371,7 +17377,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-types"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "bitflags 2.9.4",
@@ -17389,7 +17395,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.648.0"
+version = "1.649.0"
 dependencies = [
  "anyhow",
  "async-once-cell",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 2d964c45b4..195d8bd30d 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.648.0"
+version = "1.649.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -76,7 +76,7 @@ members = [
 exclude = ["./windmill-duckdb-ffi-internal"]
 
 [workspace.package]
-version = "1.648.0"
+version = "1.649.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index e0d990384a..a71cab586d 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-9b3339730eb4bb0b564c7c56ac546f33fb3d8905
\ No newline at end of file
+6fd5a2ce908235a17975ad4dbdf0051cd89334f3
diff --git a/backend/src/main.rs b/backend/src/main.rs
index c4440b7f34..97980484a5 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -62,7 +62,7 @@ use windmill_common::{
     },
     worker::{
         is_native_mode_from_env, reload_custom_tags_setting, Connection, HUB_CACHE_DIR,
-        HUB_RT_CACHE_DIR, NATIVE_MODE_RESOLVED, TMP_DIR, TMP_LOGS_DIR, WORKER_GROUP,
+        HUB_RT_CACHE_DIR, NATIVE_MODE_RESOLVED, TMP_LOGS_DIR, WINDMILL_DIR, WORKER_GROUP,
     },
     KillpillSender, DEFAULT_HUB_BASE_URL, METRICS_ENABLED,
 };
@@ -238,8 +238,8 @@ async fn cache_hub_scripts(file_path: Option<String>) -> anyhow::Result<()> {
         )
     })?;
 
-    create_dir_all(HUB_CACHE_DIR)?;
-    create_dir_all(BUN_BUNDLE_CACHE_DIR)?;
+    create_dir_all(&*HUB_CACHE_DIR)?;
+    create_dir_all(&*BUN_BUNDLE_CACHE_DIR)?;
 
     for path in paths.values() {
         tracing::info!("Caching hub script at {path}");
@@ -249,7 +249,7 @@ async fn cache_hub_scripts(file_path: Option<String>) -> anyhow::Result<()> {
             .as_ref()
             .is_some_and(|x| x == &ScriptLang::Deno)
         {
-            let job_dir = format!("{}/cache_init/{}", TMP_DIR, Uuid::new_v4());
+            let job_dir = format!("{}/cache_init/{}", *WINDMILL_DIR, Uuid::new_v4());
             create_dir_all(&job_dir)?;
             let _ = windmill_worker::generate_deno_lock(
                 &Uuid::nil(),
@@ -267,7 +267,7 @@ async fn cache_hub_scripts(file_path: Option<String>) -> anyhow::Result<()> {
             tokio::fs::remove_dir_all(job_dir).await?;
         } else if res.language.as_ref().is_some_and(|x| x == &ScriptLang::Bun) {
             let job_id = Uuid::new_v4();
-            let job_dir = format!("{}/cache_init/{}", TMP_DIR, job_id);
+            let job_dir = format!("{}/cache_init/{}", *WINDMILL_DIR, job_id);
             create_dir_all(&job_dir)?;
             if let Some(lock) = res.lockfile {
                 let _ = windmill_worker::prepare_job_dir(&lock, &job_dir).await?;
@@ -384,9 +384,9 @@ async fn cache_hub_resource_types() -> anyhow::Result<()> {
 
     println!("Fetched {} resource types from hub", resource_types.len());
 
-    create_dir_all(HUB_RT_CACHE_DIR)?;
+    create_dir_all(&*HUB_RT_CACHE_DIR)?;
 
-    let cache_path = format!("{}/{}", HUB_RT_CACHE_DIR, HUB_RT_CACHE_FILE);
+    let cache_path = format!("{}/{}", *HUB_RT_CACHE_DIR, HUB_RT_CACHE_FILE);
     let content = serde_json::to_string_pretty(&resource_types)
         .with_context(|| "Failed to serialize resource types")?;
 
@@ -398,7 +398,7 @@ async fn cache_hub_resource_types() -> anyhow::Result<()> {
 }
 
 pub async fn sync_cached_resource_types(db: &sqlx::Pool<sqlx::Postgres>) -> anyhow::Result<()> {
-    let cache_path = format!("{}/{}", HUB_RT_CACHE_DIR, HUB_RT_CACHE_FILE);
+    let cache_path = format!("{}/{}", *HUB_RT_CACHE_DIR, HUB_RT_CACHE_FILE);
 
     if tokio::fs::metadata(&cache_path).await.is_err() {
         tracing::info!(
@@ -969,7 +969,7 @@ Windmill Community Edition {GIT_VERSION}
 
         DirBuilder::new()
             .recursive(true)
-            .create("/tmp/windmill")
+            .create(&*WINDMILL_DIR)
             .expect("could not create initial server dir");
 
         #[cfg(feature = "tantivy")]
@@ -1794,27 +1794,27 @@ pub async fn run_workers(
     let mut handles = Vec::with_capacity(num_workers as usize);
 
     for x in [
-        TMP_LOGS_DIR,
-        UV_CACHE_DIR,
-        DENO_CACHE_DIR,
-        DENO_CACHE_DIR_DEPS,
-        DENO_CACHE_DIR_NPM,
-        BUN_CACHE_DIR,
-        PY310_CACHE_DIR,
-        PY311_CACHE_DIR,
-        PY312_CACHE_DIR,
-        PY313_CACHE_DIR,
-        BUN_BUNDLE_CACHE_DIR,
-        GO_CACHE_DIR,
-        GO_BIN_CACHE_DIR,
-        RUST_CACHE_DIR,
-        CSHARP_CACHE_DIR,
-        NU_CACHE_DIR,
-        HUB_CACHE_DIR,
-        POWERSHELL_CACHE_DIR,
-        JAVA_CACHE_DIR,
-        RUBY_CACHE_DIR,
-        TAR_JAVA_CACHE_DIR, // for related places search: ADD_NEW_LANG
+        &*TMP_LOGS_DIR,
+        &*UV_CACHE_DIR,
+        &*DENO_CACHE_DIR,
+        &*DENO_CACHE_DIR_DEPS,
+        &*DENO_CACHE_DIR_NPM,
+        &*BUN_CACHE_DIR,
+        &*PY310_CACHE_DIR,
+        &*PY311_CACHE_DIR,
+        &*PY312_CACHE_DIR,
+        &*PY313_CACHE_DIR,
+        &*BUN_BUNDLE_CACHE_DIR,
+        &*GO_CACHE_DIR,
+        &*GO_BIN_CACHE_DIR,
+        &*RUST_CACHE_DIR,
+        &*CSHARP_CACHE_DIR,
+        &*NU_CACHE_DIR,
+        &*HUB_CACHE_DIR,
+        &*POWERSHELL_CACHE_DIR,
+        &*JAVA_CACHE_DIR,
+        &*RUBY_CACHE_DIR,
+        &*TAR_JAVA_CACHE_DIR, // for related places search: ADD_NEW_LANG
     ] {
         DirBuilder::new()
             .recursive(true)
diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs
index 17e79c3393..6baba34a02 100644
--- a/backend/src/monitor.rs
+++ b/backend/src/monitor.rs
@@ -73,7 +73,7 @@ use windmill_common::{
         load_periodic_bash_script_interval_from_env, load_whitelist_env_vars_from_env,
         load_worker_config, reload_custom_tags_setting, store_pull_query,
         store_suspended_pull_query, Connection, WorkerConfig, DEFAULT_TAGS_PER_WORKSPACE,
-        DEFAULT_TAGS_WORKSPACES, INDEXER_CONFIG, SCRIPT_TOKEN_EXPIRY, SMTP_CONFIG, TMP_DIR,
+        DEFAULT_TAGS_WORKSPACES, INDEXER_CONFIG, SCRIPT_TOKEN_EXPIRY, SMTP_CONFIG, WINDMILL_DIR,
         WORKER_CONFIG, WORKER_GROUP,
     },
     KillpillSender, BASE_URL, CRITICAL_ALERTS_ON_DB_OVERSIZE, CRITICAL_ALERT_MUTE_UI_ENABLED,
@@ -595,7 +595,7 @@ async fn sleep_until_next_minute_start_plus_one_s() {
 
 use windmill_common::tracing_init::TMP_WINDMILL_LOGS_SERVICE;
 async fn find_two_highest_files(hostname: &str) -> (Option<String>, Option<String>) {
-    let log_dir = format!("{}/{}/", TMP_WINDMILL_LOGS_SERVICE, hostname);
+    let log_dir = format!("{}/{}/", *TMP_WINDMILL_LOGS_SERVICE, hostname);
     let rd_dir = tokio::fs::read_dir(log_dir).await;
     if let Ok(mut log_files) = rd_dir {
         let mut highest_file: Option<String> = None;
@@ -614,7 +614,8 @@ async fn find_two_highest_files(hostname: &str) -> (Option<String>, Option<Strin
         (highest_file, second_highest_file)
     } else {
         tracing::error!(
-            "Error reading log files: {TMP_WINDMILL_LOGS_SERVICE}, {:#?}",
+            "Error reading log files: {}, {:#?}",
+            *TMP_WINDMILL_LOGS_SERVICE,
             rd_dir.unwrap_err()
         );
         (None, None)
@@ -716,7 +717,7 @@ async fn send_log_file_to_object_store(
         let s3_client = windmill_object_store::get_object_store().await;
         #[cfg(feature = "parquet")]
         if let Some(s3_client) = s3_client {
-            let path = std::path::Path::new(TMP_WINDMILL_LOGS_SERVICE)
+            let path = std::path::Path::new(&*TMP_WINDMILL_LOGS_SERVICE)
                 .join(hostname)
                 .join(&highest_file);
 
@@ -935,7 +936,7 @@ pub async fn delete_expired_items(db: &DB) -> () {
                     .iter()
                     .map(|f| format!("{}/{}", f.hostname, f.file_path))
                     .collect();
-                delete_log_files_from_disk_and_store(paths, TMP_WINDMILL_LOGS_SERVICE, windmill_common::tracing_init::LOGS_SERVICE).await;
+                delete_log_files_from_disk_and_store(paths, &*TMP_WINDMILL_LOGS_SERVICE, windmill_common::tracing_init::LOGS_SERVICE).await;
 
         }
         Err(e) => tracing::error!("Error deleting log file: {:?}", e),
@@ -1140,7 +1141,7 @@ async fn delete_expired_jobs_batch(
                     .filter_map(|opt| opt)
                     .flat_map(|inner_vec| inner_vec.into_iter())
                     .collect();
-                delete_log_files_from_disk_and_store(paths, TMP_DIR, "").await;
+                delete_log_files_from_disk_and_store(paths, &*WINDMILL_DIR, "").await;
             }
             Err(e) => tracing::error!("Error deleting job logs: {:?}", e),
         }
@@ -1367,7 +1368,7 @@ pub async fn reload_maven_settings_xml_setting(conn: &Connection) {
     let settings_xml = MAVEN_SETTINGS_XML.read().await.clone();
     match settings_xml {
         Some(ref content) if !content.trim().is_empty() => {
-            let m2_dir = format!("{JAVA_HOME_DIR}/.m2");
+            let m2_dir = format!("{}/.m2", *JAVA_HOME_DIR);
             if let Err(e) = tokio::fs::create_dir_all(&m2_dir).await {
                 tracing::error!("Failed to create .m2 directory: {e:#}");
                 return;
@@ -1378,7 +1379,7 @@ pub async fn reload_maven_settings_xml_setting(conn: &Connection) {
             }
         }
         _ => {
-            let settings_path = format!("{JAVA_HOME_DIR}/.m2/settings.xml");
+            let settings_path = format!("{}/.m2/settings.xml", *JAVA_HOME_DIR);
             let _ = tokio::fs::remove_file(&settings_path).await;
         }
     }
diff --git a/backend/tests/end_user_email.rs b/backend/tests/end_user_email.rs
new file mode 100644
index 0000000000..1a60f8672c
--- /dev/null
+++ b/backend/tests/end_user_email.rs
@@ -0,0 +1,323 @@
+//! Tests for WM_END_USER_EMAIL environment variable.
+//!
+//! These tests verify that WM_END_USER_EMAIL is populated with the authenticated
+//! user's email when executing app components.
+//!
+//! TODO: Add tests for scripts and flows once public execution endpoints are identified.
+//! Currently only apps support non-workspace-member execution via OptAuthed + token lookup.
+
+use serde_json::json;
+use sqlx::{Pool, Postgres};
+use windmill_common::worker::Connection;
+use windmill_test_utils::*;
+
+const SAME_WS_TOKEN: &str = "SECRET_TOKEN";
+const OTHER_WS_TOKEN: &str = "OTHER_WS_TOKEN";
+const NO_WS_TOKEN: &str = "NO_WS_TOKEN";
+
+const SAME_WS_EMAIL: &str = "test@windmill.dev";
+const OTHER_WS_EMAIL: &str = "other-ws@windmill.dev";
+const NO_WS_EMAIL: &str = "no-ws@windmill.dev";
+
+fn client() -> reqwest::Client {
+    reqwest::Client::new()
+}
+
+fn authed(builder: reqwest::RequestBuilder, token: &str) -> reqwest::RequestBuilder {
+    builder.header("Authorization", format!("Bearer {}", token))
+}
+
+// TODO: Script tests - need to identify public execution endpoints for non-workspace-members
+// async fn run_script(port: u16, token: &str) -> anyhow::Result<String> {
+//     let url = format!(
+//         "http://localhost:{}/api/w/test-workspace/jobs/run_wait_result/p/f/test/get_end_user_email",
+//         port
+//     );
+//     let resp = authed(client().post(&url), token)
+//         .json(&json!({}))
+//         .send()
+//         .await?;
+//     if !resp.status().is_success() {
+//         anyhow::bail!("script run failed: {} - {}", resp.status(), resp.text().await?);
+//     }
+//     Ok(resp.json::<serde_json::Value>().await?
+//         .as_str().unwrap_or("").to_string())
+// }
+
+// TODO: Flow tests - need to identify public execution endpoints for non-workspace-members
+// async fn run_flow(port: u16, token: &str) -> anyhow::Result<String> {
+//     let url = format!(
+//         "http://localhost:{}/api/w/test-workspace/jobs/run_wait_result/f/f/test/get_end_user_email_flow",
+//         port
+//     );
+//     let resp = authed(client().post(&url), token)
+//         .json(&json!({}))
+//         .send()
+//         .await?;
+//     if !resp.status().is_success() {
+//         anyhow::bail!("flow run failed: {} - {}", resp.status(), resp.text().await?);
+//     }
+//     Ok(resp.json::<serde_json::Value>().await?
+//         .as_str().unwrap_or("").to_string())
+// }
+
+/// Create an app with inline script via API
+async fn create_app_with_inline_script(port: u16, path: &str) -> anyhow::Result<()> {
+    let url = format!(
+        "http://localhost:{}/api/w/test-workspace/apps/create",
+        port
+    );
+    let resp = authed(client().post(&url), SAME_WS_TOKEN)
+        .json(&json!({
+            "path": path,
+            "summary": "Test app for WM_END_USER_EMAIL",
+            "value": {
+                "type": "app",
+                "grid": [],
+                "subgrids": {},
+                "hiddenInlineScripts": [{
+                    "name": "get_email",
+                    "language": "deno",
+                    "content": "export function main() { return Deno.env.get(\"WM_END_USER_EMAIL\") || \"\"; }",
+                    "path": "f/test/email_app/get_email"
+                }]
+            },
+            "policy": {
+                "execution_mode": "anonymous",
+                "on_behalf_of": null,
+                "on_behalf_of_email": null,
+                "triggerables_v2": {
+                    "get_email": {
+                        "static_inputs": {},
+                        "one_of_inputs": {}
+                    },
+                    // SHA256 hash of raw_code content for anonymous execution
+                    "rawscript/6428aba5aa2d3ea8e1215bfdccbedd3718b18da7a239e3778a9787bb9a0ea606": {
+                        "static_inputs": {},
+                        "one_of_inputs": {}
+                    }
+                }
+            }
+        }))
+        .send()
+        .await?;
+    if !resp.status().is_success() {
+        anyhow::bail!("create app failed: {} - {}", resp.status(), resp.text().await?);
+    }
+    Ok(())
+}
+
+/// Create a raw app with inline script via API (uses regular app endpoint with rawapp type)
+async fn create_raw_app_with_inline_script(port: u16, path: &str) -> anyhow::Result<()> {
+    let url = format!(
+        "http://localhost:{}/api/w/test-workspace/apps/create",
+        port
+    );
+    let resp = authed(client().post(&url), SAME_WS_TOKEN)
+        .json(&json!({
+            "path": path,
+            "summary": "Test raw app for WM_END_USER_EMAIL",
+            "value": {
+                "type": "rawapp",
+                "css": "",
+                "inlineScripts": [{
+                    "name": "get_email",
+                    "language": "deno",
+                    "content": "export function main() { return Deno.env.get(\"WM_END_USER_EMAIL\") || \"\"; }"
+                }]
+            },
+            "policy": {
+                "execution_mode": "anonymous",
+                "on_behalf_of": null,
+                "on_behalf_of_email": null,
+                "triggerables_v2": {
+                    "get_email": {
+                        "static_inputs": {},
+                        "one_of_inputs": {}
+                    },
+                    // SHA256 hash of raw_code content for anonymous execution
+                    "rawscript/6428aba5aa2d3ea8e1215bfdccbedd3718b18da7a239e3778a9787bb9a0ea606": {
+                        "static_inputs": {},
+                        "one_of_inputs": {}
+                    }
+                }
+            }
+        }))
+        .send()
+        .await?;
+    if !resp.status().is_success() {
+        anyhow::bail!("create raw app failed: {} - {}", resp.status(), resp.text().await?);
+    }
+    Ok(())
+}
+
+async fn run_app_inline_script(port: u16, token: &str, app_path: &str, force_viewer: bool) -> anyhow::Result<String> {
+    let url = format!(
+        "http://localhost:{}/api/w/test-workspace/apps_u/execute_component/{}",
+        port, app_path
+    );
+    let mut payload = json!({
+        "args": {},
+        "component": "get_email",
+        "raw_code": {
+            "language": "deno",
+            "content": "export function main() { return Deno.env.get(\"WM_END_USER_EMAIL\") || \"\"; }",
+            "path": format!("{}/get_email", app_path)
+        }
+    });
+    if force_viewer {
+        payload["force_viewer_static_fields"] = json!({});
+    }
+    let resp = authed(client().post(&url), token)
+        .json(&payload)
+        .send()
+        .await?;
+    if !resp.status().is_success() {
+        anyhow::bail!("app inline script run failed: {} - {}", resp.status(), resp.text().await?);
+    }
+    let job_id = resp.text().await?;
+    wait_for_job_result(port, token, &job_id).await
+}
+
+async fn run_raw_app_inline_script(port: u16, token: &str, app_path: &str, force_viewer: bool) -> anyhow::Result<String> {
+    let url = format!(
+        "http://localhost:{}/api/w/test-workspace/apps_u/execute_component/{}",
+        port, app_path
+    );
+    let mut payload = json!({
+        "args": {},
+        "component": "get_email",
+        "raw_code": {
+            "language": "deno",
+            "content": "export function main() { return Deno.env.get(\"WM_END_USER_EMAIL\") || \"\"; }"
+        }
+    });
+    if force_viewer {
+        payload["force_viewer_static_fields"] = json!({});
+    }
+    let resp = authed(client().post(&url), token)
+        .json(&payload)
+        .send()
+        .await?;
+    if !resp.status().is_success() {
+        anyhow::bail!("raw app inline script run failed: {} - {}", resp.status(), resp.text().await?);
+    }
+    let job_id = resp.text().await?;
+    wait_for_job_result(port, token, &job_id).await
+}
+
+async fn wait_for_job_result(port: u16, token: &str, job_id: &str) -> anyhow::Result<String> {
+    let url = format!(
+        "http://localhost:{}/api/w/test-workspace/jobs_u/completed/get_result/{}",
+        port, job_id
+    );
+    for _ in 0..100 {
+        tokio::time::sleep(std::time::Duration::from_millis(100)).await;
+        let resp = authed(client().get(&url), token).send().await?;
+        if resp.status().is_success() {
+            return Ok(resp.json::<serde_json::Value>().await?
+                .as_str().unwrap_or("").to_string());
+        }
+    }
+    anyhow::bail!("timeout waiting for job result")
+}
+
+// TODO: Script tests - need to identify public execution endpoints for non-workspace-members
+// #[cfg(feature = "deno_core")]
+// #[sqlx::test(fixtures("base", "end_user_email"))]
+// async fn test_script_wm_end_user_email(db: Pool<Postgres>) -> anyhow::Result<()> {
+//     initialize_tracing().await;
+//     set_jwt_secret().await;
+//     let server = ApiServer::start(db.clone()).await?;
+//     let port = server.addr.port();
+//
+//     in_test_worker(Connection::Sql(db.clone()), async move {
+//         let result = run_script(port, SAME_WS_TOKEN).await?;
+//         assert_eq!(result, SAME_WS_EMAIL, "same workspace user should get their email");
+//         Ok::<(), anyhow::Error>(())
+//     }, port).await?;
+//
+//     Ok(())
+// }
+
+// TODO: Flow tests - need to identify public execution endpoints for non-workspace-members
+// #[cfg(feature = "deno_core")]
+// #[sqlx::test(fixtures("base", "end_user_email"))]
+// async fn test_flow_wm_end_user_email(db: Pool<Postgres>) -> anyhow::Result<()> {
+//     initialize_tracing().await;
+//     set_jwt_secret().await;
+//     let server = ApiServer::start(db.clone()).await?;
+//     let port = server.addr.port();
+//
+//     in_test_worker(Connection::Sql(db.clone()), async move {
+//         let result = run_flow(port, SAME_WS_TOKEN).await?;
+//         assert_eq!(result, SAME_WS_EMAIL, "same workspace user should get their email");
+//         Ok::<(), anyhow::Error>(())
+//     }, port).await?;
+//
+//     Ok(())
+// }
+
+#[cfg(feature = "deno_core")]
+#[sqlx::test(fixtures("base", "end_user_email"))]
+async fn test_app_wm_end_user_email(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+    set_jwt_secret().await;
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+
+    let app_path = "f/test/email_app";
+
+    in_test_worker(Connection::Sql(db.clone()), async move {
+        // Create the app with inline script first
+        create_app_with_inline_script(port, app_path).await?;
+
+        // Same workspace user (force_viewer mode works for workspace members)
+        let result = run_app_inline_script(port, SAME_WS_TOKEN, app_path, true).await?;
+        assert_eq!(result, SAME_WS_EMAIL, "same workspace user should get their email");
+
+        // Other workspace user (uses app's anonymous policy + token lookup)
+        let result = run_app_inline_script(port, OTHER_WS_TOKEN, app_path, false).await?;
+        assert_eq!(result, OTHER_WS_EMAIL, "other workspace user should get their email");
+
+        // No workspace user (uses app's anonymous policy + token lookup)
+        let result = run_app_inline_script(port, NO_WS_TOKEN, app_path, false).await?;
+        assert_eq!(result, NO_WS_EMAIL, "no workspace user should get their email");
+
+        Ok::<(), anyhow::Error>(())
+    }, port).await?;
+
+    Ok(())
+}
+
+#[cfg(feature = "deno_core")]
+#[sqlx::test(fixtures("base", "end_user_email"))]
+async fn test_raw_app_wm_end_user_email(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+    set_jwt_secret().await;
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+
+    let app_path = "f/test/email_raw_app";
+
+    in_test_worker(Connection::Sql(db.clone()), async move {
+        // Create the raw app with inline script first
+        create_raw_app_with_inline_script(port, app_path).await?;
+
+        // Same workspace user (force_viewer mode works for workspace members)
+        let result = run_raw_app_inline_script(port, SAME_WS_TOKEN, app_path, true).await?;
+        assert_eq!(result, SAME_WS_EMAIL, "same workspace user should get their email");
+
+        // Other workspace user (uses app's anonymous policy + token lookup)
+        let result = run_raw_app_inline_script(port, OTHER_WS_TOKEN, app_path, false).await?;
+        assert_eq!(result, OTHER_WS_EMAIL, "other workspace user should get their email");
+
+        // No workspace user (uses app's anonymous policy + token lookup)
+        let result = run_raw_app_inline_script(port, NO_WS_TOKEN, app_path, false).await?;
+        assert_eq!(result, NO_WS_EMAIL, "no workspace user should get their email");
+
+        Ok::<(), anyhow::Error>(())
+    }, port).await?;
+
+    Ok(())
+}
diff --git a/backend/tests/fixtures/end_user_email.sql b/backend/tests/fixtures/end_user_email.sql
new file mode 100644
index 0000000000..654ad93680
--- /dev/null
+++ b/backend/tests/fixtures/end_user_email.sql
@@ -0,0 +1,63 @@
+-- Fixture for WM_END_USER_EMAIL tests
+-- Sets up 3 users with different workspace memberships:
+--   1. test@windmill.dev - in test-workspace (from base.sql)
+--   2. other-ws@windmill.dev - in other-workspace only
+--   3. no-ws@windmill.dev - not in any workspace
+
+-- Second workspace for cross-workspace user
+INSERT INTO workspace (id, name, owner)
+VALUES ('other-workspace', 'other-workspace', 'other-ws-user');
+
+INSERT INTO workspace_key(workspace_id, kind, key)
+VALUES ('other-workspace', 'cloud', 'other-key');
+
+INSERT INTO workspace_settings (workspace_id)
+VALUES ('other-workspace');
+
+INSERT INTO group_ (workspace_id, name, summary, extra_perms)
+VALUES ('other-workspace', 'all', 'All users', '{}');
+
+-- User in other-workspace only (not in test-workspace)
+INSERT INTO password(email, password_hash, login_type, super_admin, verified, name)
+VALUES ('other-ws@windmill.dev', 'hash', 'password', false, true, 'Other WS User');
+
+INSERT INTO usr(workspace_id, email, username, is_admin, role)
+VALUES ('other-workspace', 'other-ws@windmill.dev', 'other-ws-user', true, 'Admin');
+
+INSERT INTO token(token, email, label, super_admin)
+VALUES ('OTHER_WS_TOKEN', 'other-ws@windmill.dev', 'other ws token', false);
+
+-- User not in any workspace
+INSERT INTO password(email, password_hash, login_type, super_admin, verified, name)
+VALUES ('no-ws@windmill.dev', 'hash', 'password', false, true, 'No WS User');
+
+INSERT INTO token(token, email, label, super_admin)
+VALUES ('NO_WS_TOKEN', 'no-ws@windmill.dev', 'no ws token', false);
+
+-- Script that returns WM_END_USER_EMAIL (public via extra_perms)
+INSERT INTO script (workspace_id, created_by, content, schema, summary, description, path, hash, language, lock, kind, extra_perms)
+VALUES (
+    'test-workspace', 'test-user',
+    'export function main() { return Deno.env.get("WM_END_USER_EMAIL") || ""; }',
+    '{"$schema":"https://json-schema.org/draft/2020-12/schema","properties":{},"required":[],"type":"object"}',
+    'Returns WM_END_USER_EMAIL', '', 'f/test/get_end_user_email', 900001, 'deno', '', 'script',
+    '{"g/all": true}'
+);
+
+-- Flow that returns WM_END_USER_EMAIL (public via extra_perms)
+INSERT INTO flow (workspace_id, summary, description, path, versions, schema, value, edited_by, extra_perms)
+VALUES (
+    'test-workspace', 'Returns WM_END_USER_EMAIL', '', 'f/test/get_end_user_email_flow', '{900002}',
+    '{"$schema":"https://json-schema.org/draft/2020-12/schema","properties":{},"required":[],"type":"object"}',
+    '{"modules": [{"id": "a", "value": {"type": "rawscript", "language": "deno", "content": "export function main() { return Deno.env.get(\"WM_END_USER_EMAIL\") || \"\"; }", "input_transforms": {}}}]}',
+    'test-user',
+    '{"g/all": true}'
+);
+
+INSERT INTO flow_version (id, workspace_id, path, schema, value, created_by)
+VALUES (
+    900002, 'test-workspace', 'f/test/get_end_user_email_flow',
+    '{"$schema":"https://json-schema.org/draft/2020-12/schema","properties":{},"required":[],"type":"object"}',
+    '{"modules": [{"id": "a", "value": {"type": "rawscript", "language": "deno", "content": "export function main() { return Deno.env.get(\"WM_END_USER_EMAIL\") || \"\"; }", "input_transforms": {}}}]}',
+    'test-user'
+);
diff --git a/backend/tests/nativets_stress.rs b/backend/tests/nativets_stress.rs
index 9717403830..082a43be2c 100644
--- a/backend/tests/nativets_stress.rs
+++ b/backend/tests/nativets_stress.rs
@@ -206,7 +206,7 @@ fn spawn_workers(
 
     std::fs::DirBuilder::new()
         .recursive(true)
-        .create(windmill_worker::GO_BIN_CACHE_DIR)
+        .create(&*windmill_worker::GO_BIN_CACHE_DIR)
         .expect("could not create initial worker dir");
 
     let (tx, _) = KillpillSender::new(n + 1);
diff --git a/backend/tests/python_jobs.rs b/backend/tests/python_jobs.rs
index dd494de007..22c2313b91 100644
--- a/backend/tests/python_jobs.rs
+++ b/backend/tests/python_jobs.rs
@@ -1,7 +1,7 @@
-use windmill_test_utils::*;
 use sqlx::postgres::Postgres;
 use sqlx::Pool;
 use windmill_common::scripts::ScriptLang;
+use windmill_test_utils::*;
 
 #[cfg(feature = "python")]
 #[sqlx::test(fixtures("base", "lockfile_python"))]
@@ -188,7 +188,8 @@ def main():
         path: None,
         language: ScriptLang::Python3,
         lock: None,
-        concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default()
+            .into(),
         debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
         cache_ttl: None,
         cache_ignore_s3_path: None,
@@ -207,14 +208,14 @@ def main():
 #[cfg(feature = "python")]
 #[sqlx::test(fixtures("base"))]
 async fn test_python_global_site_packages(db: Pool<Postgres>) -> anyhow::Result<()> {
-    use windmill_common::{cache::concatcp, worker::ROOT_CACHE_DIR};
+    use windmill_common::worker::ROOT_CACHE_DIR;
 
     initialize_tracing().await;
     let server = ApiServer::start(db.clone()).await?;
     let port = server.addr.port();
 
     // Shared for all 3.12.*
-    let path = concatcp!(ROOT_CACHE_DIR, "python_3_12/global-site-packages").to_owned();
+    let path = format!("{}python_3_12/global-site-packages", *ROOT_CACHE_DIR);
     std::fs::create_dir_all(&path).unwrap();
     std::fs::write(path + "/my_global_site_package_3_12_any.py", "").unwrap();
 
@@ -237,7 +238,9 @@ def main():
             path: None,
             language: ScriptLang::Python3,
             lock: None,
-            concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+            concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default(
+            )
+            .into(),
             debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
             cache_ttl: None,
             cache_ignore_s3_path: None,
@@ -271,7 +274,9 @@ def main():
             path: None,
             language: ScriptLang::Python3,
             lock: None,
-            concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+            concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default(
+            )
+            .into(),
             debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
             cache_ttl: None,
             cache_ignore_s3_path: None,
@@ -310,7 +315,8 @@ def main():
         path: None,
         language: ScriptLang::Python3,
         lock: None,
-        concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default()
+            .into(),
         debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
         cache_ttl: None,
         cache_ignore_s3_path: None,
@@ -347,7 +353,8 @@ def main():
         path: None,
         language: ScriptLang::Python3,
         lock: None,
-        concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default().into(),
+        concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default()
+            .into(),
         debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
         cache_ttl: None,
         cache_ignore_s3_path: None,
diff --git a/backend/windmill-api-auth/src/auth.rs b/backend/windmill-api-auth/src/auth.rs
index 186f7af257..af212dc315 100644
--- a/backend/windmill-api-auth/src/auth.rs
+++ b/backend/windmill-api-auth/src/auth.rs
@@ -35,7 +35,45 @@ use windmill_common::{
 lazy_static::lazy_static! {
     // Global auth cache accessible from main.rs for direct invalidation
     pub static ref AUTH_CACHE: Cache<(String, String), ExpiringAuthCache> = Cache::new(300);
+    // Cache for token -> email lookups (for non-workspace-member authenticated users)
+    static ref TOKEN_EMAIL_CACHE: Cache<String, Option<String>> = Cache::new(500);
+}
 
+/// Get email from a valid token, with caching.
+/// Used for WM_END_USER_EMAIL when user is authenticated but not a workspace member.
+async fn get_email_from_token(db: &DB, token: &str) -> Option<String> {
+    if let Some(cached) = TOKEN_EMAIL_CACHE.get(token) {
+        return cached;
+    }
+
+    let email = sqlx::query_scalar!(
+        "SELECT email FROM token WHERE token = $1 AND (expiration > NOW() OR expiration IS NULL)",
+        token
+    )
+    .fetch_optional(db)
+    .await
+    .ok()
+    .flatten()
+    .flatten(); // email column is nullable, so we get Option<Option<String>>
+
+    TOKEN_EMAIL_CACHE.insert(token.to_string(), email.clone());
+    email
+}
+
+/// Get end user email from authenticated user or token.
+/// Returns email if user is authenticated (workspace member) or has valid instance token.
+pub async fn get_end_user_email(
+    db: &DB,
+    opt_authed: Option<&ApiAuthed>,
+    token: Option<&str>,
+) -> Option<String> {
+    if let Some(authed) = opt_authed {
+        return Some(authed.email.clone());
+    }
+    if let Some(token) = token {
+        return get_email_from_token(db, token).await;
+    }
+    None
 }
 // Global function to invalidate a specific token from cache
 pub fn invalidate_token_from_cache(token: &str) {
diff --git a/backend/windmill-api-auth/src/lib.rs b/backend/windmill-api-auth/src/lib.rs
index efab57cf91..5acb696bd4 100644
--- a/backend/windmill-api-auth/src/lib.rs
+++ b/backend/windmill-api-auth/src/lib.rs
@@ -29,8 +29,8 @@ use scopes::ScopeDefinition;
 
 // Re-export key auth types and functions
 pub use auth::{
-    invalidate_token_from_cache, AuthCache, ExpiringAuthCache, OptTokened, Tokened,
-    TruncatedTokenWithEmail, AUTH_CACHE,
+    get_end_user_email, invalidate_token_from_cache, AuthCache, ExpiringAuthCache, OptTokened,
+    Tokened, TruncatedTokenWithEmail, AUTH_CACHE,
 };
 
 // ------------ ApiAuthed & OptJobAuthed types ------------
diff --git a/backend/windmill-api-settings/src/lib.rs b/backend/windmill-api-settings/src/lib.rs
index 04a1eb617b..bf493f9420 100644
--- a/backend/windmill-api-settings/src/lib.rs
+++ b/backend/windmill-api-settings/src/lib.rs
@@ -1085,7 +1085,7 @@ async fn sync_cached_resource_types(
     require_super_admin(&db, &authed.email).await?;
 
     use windmill_common::worker::HUB_RT_CACHE_DIR;
-    let cache_path = format!("{}/resource_types.json", HUB_RT_CACHE_DIR);
+    let cache_path = format!("{}/resource_types.json", *HUB_RT_CACHE_DIR);
 
     let content = tokio::fs::read_to_string(&cache_path).await.map_err(|e| {
         error::Error::NotFound(format!(
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 4dc1d252c4..163217862e 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.648.0
+  version: 1.649.0
   title: Windmill API
 
   contact:
diff --git a/backend/windmill-api/src/apps.rs b/backend/windmill-api/src/apps.rs
index d156dc9c88..1cfbfa6e19 100644
--- a/backend/windmill-api/src/apps.rs
+++ b/backend/windmill-api/src/apps.rs
@@ -8,7 +8,7 @@ use std::{collections::HashMap, sync::Arc};
  * LICENSE-AGPL for a copy of the license.
  */
 use crate::{
-    auth::OptTokened,
+    auth::{get_end_user_email, OptTokened},
     db::{ApiAuthed, DB},
     jobs::RunJobQuery,
     users::{require_owner_of_path, OptAuthed},
@@ -2149,7 +2149,7 @@ async fn execute_component(
         (email.as_str(), permissioned_as)
     };
 
-    let end_user_email = opt_authed.as_ref().map(|a| a.email.clone());
+    let end_user_email = get_end_user_email(&db, opt_authed.as_ref(), tokened.token.as_deref()).await;
 
     let (uuid, mut tx) = push(
         &db,
diff --git a/backend/windmill-api/src/auth.rs b/backend/windmill-api/src/auth.rs
index 144703ba5c..66a67c5f97 100644
--- a/backend/windmill-api/src/auth.rs
+++ b/backend/windmill-api/src/auth.rs
@@ -1,4 +1,5 @@
 pub use windmill_api_auth::auth::{
-    invalidate_token_from_cache, list_tokens_internal, transform_old_scope_to_new_scope, AuthCache,
-    ExpiringAuthCache, OptTokened, Tokened, TruncatedTokenWithEmail,
+    get_end_user_email, invalidate_token_from_cache, list_tokens_internal,
+    transform_old_scope_to_new_scope, AuthCache, ExpiringAuthCache, OptTokened, Tokened,
+    TruncatedTokenWithEmail,
 };
diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs
index 420bbf24b9..d58dcd3c69 100644
--- a/backend/windmill-api/src/jobs.rs
+++ b/backend/windmill-api/src/jobs.rs
@@ -47,7 +47,7 @@ use windmill_common::runtime_assets::{register_runtime_asset, InsertRuntimeAsset
 use windmill_common::scripts::ScriptRunnableSettingsInline;
 use windmill_common::triggers::TriggerMetadata;
 use windmill_common::utils::{RunnableKind, WarnAfterExt};
-use windmill_common::worker::{Connection, CLOUD_HOSTED, TMP_DIR};
+use windmill_common::worker::{Connection, CLOUD_HOSTED, WINDMILL_DIR};
 use windmill_common::workspace_dependencies::{
     RawWorkspaceDependencies, MIN_VERSION_WORKSPACE_DEPENDENCIES,
 };
@@ -1412,7 +1412,7 @@ async fn get_logs_from_disk(
     if log_offset > 0 {
         if let Some(file_index) = log_file_index.clone() {
             for file_p in &file_index {
-                if !tokio::fs::metadata(format!("{TMP_DIR}/{file_p}"))
+                if !tokio::fs::metadata(format!("{}/{file_p}", *WINDMILL_DIR))
                     .await
                     .is_ok()
                 {
@@ -1427,7 +1427,7 @@ async fn get_logs_from_disk(
             "#.to_string(),
                 ));
                 for file_p in file_index.clone() {
-                    let mut file = tokio::fs::File::open(format!("{TMP_DIR}/{file_p}")).await.map_err(to_anyhow)?;
+                    let mut file = tokio::fs::File::open(format!("{}/{file_p}", *WINDMILL_DIR)).await.map_err(to_anyhow)?;
                     let mut buffer = Vec::new();
                     file.read_to_end(&mut buffer).await.map_err(to_anyhow)?;
                     yield Ok(bytes::Bytes::from(buffer)) as anyhow::Result<bytes::Bytes>;
@@ -5888,7 +5888,7 @@ async fn get_log_file(Path((_w_id, file_p)): Path<(String, String)>) -> error::R
         ));
     }
 
-    let local_file = format!("{TMP_DIR}/logs/{file_p}");
+    let local_file = format!("{}/logs/{file_p}", *WINDMILL_DIR);
     if tokio::fs::metadata(&local_file).await.is_ok() {
         let mut file = tokio::fs::File::open(local_file).await.map_err(to_anyhow)?;
         let mut buffer = Vec::new();
@@ -5934,10 +5934,10 @@ async fn get_log_file(Path((_w_id, file_p)): Path<(String, String)>) -> error::R
     }
 
     #[cfg(not(all(feature = "enterprise", feature = "parquet")))]
-        return Err(error::Error::NotFound(format!(
-            "File not found on server logs volume /tmp/windmill/logs and no distributed logs s3 storage for {}",
-            file_p
-        )));
+    return Err(error::Error::NotFound(format!(
+        "File not found on server logs volume {}/logs and no distributed logs s3 storage for {}",
+        *WINDMILL_DIR, file_p
+    )));
 }
 
 async fn get_job_update(
diff --git a/backend/windmill-api/src/lib.rs b/backend/windmill-api/src/lib.rs
index 9b713cad0a..528e60b02f 100644
--- a/backend/windmill-api/src/lib.rs
+++ b/backend/windmill-api/src/lib.rs
@@ -262,7 +262,7 @@ pub async fn run_server(
 ) -> anyhow::Result<()> {
     let user_db = UserDB::new(db.clone());
 
-    for x in [HUB_CACHE_DIR] {
+    for x in [&*HUB_CACHE_DIR] {
         DirBuilder::new()
             .recursive(true)
             .create(x)
diff --git a/backend/windmill-api/src/service_logs.rs b/backend/windmill-api/src/service_logs.rs
index 20d2b58d0e..c83bb21f2c 100644
--- a/backend/windmill-api/src/service_logs.rs
+++ b/backend/windmill-api/src/service_logs.rs
@@ -102,7 +102,11 @@ async fn get_log_file(
     #[cfg(feature = "parquet")]
     if let Some(s3_client) = s3_client {
         let path = format!("{}{}", windmill_common::tracing_init::LOGS_SERVICE, path);
-        let file = s3_client.get(&windmill_object_store::object_store_reexports::Path::from(path)).await;
+        let file = s3_client
+            .get(&windmill_object_store::object_store_reexports::Path::from(
+                path,
+            ))
+            .await;
         match file {
             Ok(file) => {
                 let bytes = file.bytes().await;
@@ -126,7 +130,7 @@ async fn get_log_file(
             }
         }
     }
-    let file = tokio::fs::read(format!("{}{}", TMP_WINDMILL_LOGS_SERVICE, path)).await;
+    let file = tokio::fs::read(format!("{}{}", *TMP_WINDMILL_LOGS_SERVICE, path)).await;
     if let Ok(bytes) = file {
         Ok(content_plain(Body::from(bytes::Bytes::from(bytes))))
     } else {
diff --git a/backend/windmill-api/src/workspaces_export.rs b/backend/windmill-api/src/workspaces_export.rs
index c881e9ae9b..091c465a61 100644
--- a/backend/windmill-api/src/workspaces_export.rs
+++ b/backend/windmill-api/src/workspaces_export.rs
@@ -43,6 +43,7 @@ use windmill_common::runnable_settings::{ConcurrencySettings, DebouncingSettings
 use windmill_common::scripts::ScriptRunnableSettingsHandle;
 use windmill_common::utils::require_admin;
 use windmill_common::variables::decrypt;
+use windmill_common::worker::WINDMILL_DIR;
 use windmill_common::{
     db::UserDB,
     error::{to_anyhow, Error, Result},
@@ -372,7 +373,7 @@ pub(crate) async fn tarball_workspace(
 
     let mut tx = user_db.begin(&authed).await?;
 
-    let tmp_dir = TempDir::new_in("/tmp/windmill/")?;
+    let tmp_dir = TempDir::new_in(&*WINDMILL_DIR)?;
 
     let name = match archive_type.as_deref() {
         Some("tar") | None => Ok(format!("windmill-{w_id}.tar")),
diff --git a/backend/windmill-common/src/bench.rs b/backend/windmill-common/src/bench.rs
index b87872119b..1ed2b9aa56 100644
--- a/backend/windmill-common/src/bench.rs
+++ b/backend/windmill-common/src/bench.rs
@@ -1,5 +1,5 @@
 use crate::{
-    worker::{write_file, TMP_DIR},
+    worker::{write_file, WINDMILL_DIR},
     DB,
 };
 use serde::Serialize;
@@ -113,7 +113,8 @@ impl BenchmarkInfo {
             "Writing benchmark {path}, duration of benchmark: {total_duration}ms and RPS: {}{pool_info}",
             self.iters as f64 / total_duration as f64 * 1000.0
         );
-        write_file(TMP_DIR, path, &serde_json::to_string(&self).unwrap()).expect("write profiling");
+        write_file(&WINDMILL_DIR, path, &serde_json::to_string(&self).unwrap())
+            .expect("write profiling");
         Ok(())
     }
 }
diff --git a/backend/windmill-common/src/jobs.rs b/backend/windmill-common/src/jobs.rs
index bc40e4cd75..583914c573 100644
--- a/backend/windmill-common/src/jobs.rs
+++ b/backend/windmill-common/src/jobs.rs
@@ -18,7 +18,7 @@ use crate::{
     scripts::{get_full_hub_script_by_path, ScriptHash, ScriptLang},
     users::username_to_permissioned_as,
     utils::{StripPath, HTTP_CLIENT},
-    worker::{to_raw_value, CUSTOM_TAGS_PER_WORKSPACE, TMP_DIR},
+    worker::{to_raw_value, CUSTOM_TAGS_PER_WORKSPACE, WINDMILL_DIR},
     FlowVersionInfo, ScriptHashInfo, Tag,
 };
 
@@ -225,7 +225,7 @@ pub async fn get_logs_from_disk(
     if log_offset > 0 {
         if let Some(file_index) = log_file_index.clone() {
             for file_p in &file_index {
-                if !tokio::fs::metadata(format!("{TMP_DIR}/{file_p}"))
+                if !tokio::fs::metadata(format!("{}/{file_p}", *WINDMILL_DIR))
                     .await
                     .is_ok()
                 {
@@ -236,7 +236,7 @@ pub async fn get_logs_from_disk(
             let logs = logs.to_string();
             let stream = async_stream::stream! {
                 for file_p in file_index.clone() {
-                    let mut file = tokio::fs::File::open(format!("{TMP_DIR}/{file_p}")).await.map_err(to_anyhow)?;
+                    let mut file = tokio::fs::File::open(format!("{}/{file_p}", *WINDMILL_DIR)).await.map_err(to_anyhow)?;
                     let mut buffer = Vec::new();
                     file.read_to_end(&mut buffer).await.map_err(to_anyhow)?;
                     yield Ok(bytes::Bytes::from(buffer)) as anyhow::Result<bytes::Bytes>;
diff --git a/backend/windmill-common/src/scripts.rs b/backend/windmill-common/src/scripts.rs
index 68f77a2303..cfff28dbcb 100644
--- a/backend/windmill-common/src/scripts.rs
+++ b/backend/windmill-common/src/scripts.rs
@@ -206,12 +206,12 @@ pub async fn get_full_hub_script_by_path(
     let version = path_iterator
         .next()
         .ok_or_else(|| Error::internal_err(format!("expected hub path to have version number")))?;
-    let cache_path = format!("{HUB_CACHE_DIR}/{version}");
+    let cache_path = format!("{}/{version}", *HUB_CACHE_DIR);
     let script;
     if tokio::fs::metadata(&cache_path).await.is_err() {
         script = get_full_hub_script_by_path_inner(path, http_client, db).await?;
         if let Err(e) = crate::worker::write_file(
-            HUB_CACHE_DIR,
+            &HUB_CACHE_DIR,
             &version,
             &serde_json::to_string(&script).map_err(to_anyhow)?,
         ) {
diff --git a/backend/windmill-common/src/tracing_init.rs b/backend/windmill-common/src/tracing_init.rs
index 701a0887d0..f4892b67c9 100644
--- a/backend/windmill-common/src/tracing_init.rs
+++ b/backend/windmill-common/src/tracing_init.rs
@@ -6,8 +6,6 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
-use const_format::concatcp;
-
 use std::{
     collections::HashMap,
     sync::{Arc, RwLock},
@@ -61,7 +59,9 @@ fn create_targets_filter(default_env_filter: LevelFilter) -> Targets {
 
 pub const LOGS_SERVICE: &str = "logs/services/";
 
-pub const TMP_WINDMILL_LOGS_SERVICE: &str = concatcp!("/tmp/windmill/", LOGS_SERVICE);
+lazy_static::lazy_static! {
+    pub static ref TMP_WINDMILL_LOGS_SERVICE: String = format!("{}/{}", *crate::worker::WINDMILL_DIR, LOGS_SERVICE);
+}
 
 pub fn initialize_tracing(
     hostname: &str,
@@ -108,7 +108,7 @@ pub fn initialize_tracing(
 
     use tracing_appender::rolling::{RollingFileAppender, Rotation};
 
-    let log_dir = format!("{}/{}/", TMP_WINDMILL_LOGS_SERVICE, hostname);
+    let log_dir = format!("{}/{}/", *TMP_WINDMILL_LOGS_SERVICE, hostname);
     std::fs::create_dir_all(&log_dir).unwrap();
     let file_appender = RollingFileAppender::builder()
         .rotation(Rotation::MINUTELY)
diff --git a/backend/windmill-common/src/worker.rs b/backend/windmill-common/src/worker.rs
index 1a2d55b896..8d95541f61 100644
--- a/backend/windmill-common/src/worker.rs
+++ b/backend/windmill-common/src/worker.rs
@@ -2,7 +2,6 @@
 use anyhow::anyhow;
 use axum::http::HeaderMap;
 use bytes::Bytes;
-use const_format::concatcp;
 use itertools::Itertools;
 use regex::Regex;
 use reqwest_middleware::ClientWithMiddleware;
@@ -274,7 +273,9 @@ lazy_static::lazy_static! {
     pub static ref ROOT_STANDALONE_BUNDLE_DIR: String = format!("{}/.windmill/standalone_bundle", std::env::var("HOME").unwrap_or_else(|_| "/root".to_string()));
 }
 
-pub const ROOT_CACHE_NOMOUNT_DIR: &str = concatcp!(TMP_DIR, "/cache_nomount/");
+lazy_static::lazy_static! {
+    pub static ref ROOT_CACHE_NOMOUNT_DIR: String = format!("{}/cache_nomount/", *WINDMILL_DIR);
+}
 
 /// Whether native mode is forced by the environment (NATIVE_MODE=true env var or WORKER_GROUP=native).
 /// This does NOT account for native_mode set in the DB worker group config — for that, read
@@ -490,13 +491,23 @@ pub async fn store_pull_query(wc: &WorkerConfig) {
     *l = queries;
 }
 
-pub const TMP_DIR: &str = "/tmp/windmill";
-pub const TMP_LOGS_DIR: &str = concatcp!(TMP_DIR, "/logs");
-
-pub const HUB_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "hub");
-pub const HUB_RT_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "hub_rt");
-
-pub const ROOT_CACHE_DIR: &str = concatcp!(TMP_DIR, "/cache/");
+lazy_static::lazy_static! {
+    pub static ref WINDMILL_DIR: String = {
+        let dir = std::env::var("WINDMILL_DIR")
+            .unwrap_or_else(|_| "/tmp/windmill".to_string());
+        if dir.is_empty() {
+            panic!("WINDMILL_DIR must not be empty");
+        }
+        if dir.ends_with('/') || dir.ends_with('\\') {
+            panic!("WINDMILL_DIR must not end with a trailing slash, got: {dir}");
+        }
+        dir
+    };
+    pub static ref TMP_LOGS_DIR: String = format!("{}/logs", *WINDMILL_DIR);
+    pub static ref ROOT_CACHE_DIR: String = format!("{}/cache/", *WINDMILL_DIR);
+    pub static ref HUB_CACHE_DIR: String = format!("{}hub", *ROOT_CACHE_DIR);
+    pub static ref HUB_RT_CACHE_DIR: String = format!("{}hub_rt", *ROOT_CACHE_DIR);
+}
 
 pub fn write_file(dir: &str, path: &str, content: &str) -> error::Result<File> {
     let path = format!("{}/{}", dir, path);
diff --git a/backend/windmill-duckdb-ffi-internal/Cargo.lock b/backend/windmill-duckdb-ffi-internal/Cargo.lock
index 07e428c633..559196a3c2 100644
--- a/backend/windmill-duckdb-ffi-internal/Cargo.lock
+++ b/backend/windmill-duckdb-ffi-internal/Cargo.lock
@@ -2164,6 +2164,7 @@ version = "0.1.0"
 dependencies = [
  "chrono",
  "duckdb",
+ "regex",
  "rust_decimal",
  "serde",
  "serde_json",
diff --git a/backend/windmill-duckdb-ffi-internal/Cargo.toml b/backend/windmill-duckdb-ffi-internal/Cargo.toml
index 7043b33ee5..7eb6869ab9 100644
--- a/backend/windmill-duckdb-ffi-internal/Cargo.toml
+++ b/backend/windmill-duckdb-ffi-internal/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2024"
 [dependencies]
 chrono = "0.4.41"
 duckdb = { version = "1.4.4", features = ["bundled"] }
+regex = "1"
 rust_decimal = "1.37.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "^1", features = ["preserve_order", "raw_value"] }
diff --git a/backend/windmill-duckdb-ffi-internal/src/lib.rs b/backend/windmill-duckdb-ffi-internal/src/lib.rs
index c5c819e60b..2701319d6e 100644
--- a/backend/windmill-duckdb-ffi-internal/src/lib.rs
+++ b/backend/windmill-duckdb-ffi-internal/src/lib.rs
@@ -1,12 +1,14 @@
 use std::{
     collections::HashMap,
-    ffi::{CStr, CString, c_char, c_uint},
+    ffi::{c_char, c_uint, CStr, CString},
     ptr::null_mut,
+    sync::LazyLock,
 };
 
-use duckdb::{Row, core::LogicalTypeId, params_from_iter, types::TimeUnit};
-use rust_decimal::{Decimal, prelude::FromPrimitive};
-use serde::Deserialize;
+use duckdb::{core::LogicalTypeId, params_from_iter, types::TimeUnit, Row};
+use regex::Regex;
+use rust_decimal::{prelude::FromPrimitive, Decimal};
+use serde::{Deserialize, Serialize};
 use serde_json::value::RawValue;
 
 #[derive(Deserialize, Clone, Debug, PartialEq, Default)]
@@ -96,6 +98,218 @@ pub extern "C" fn run_duckdb_ffi(
     })
 }
 
+#[derive(Serialize, Debug)]
+struct PrepareQueryColumnInfo {
+    name: String,
+    #[serde(rename = "type")]
+    type_name: String,
+}
+
+#[derive(Serialize, Debug)]
+struct PrepareQueryResult {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    columns: Option<Vec<PrepareQueryColumnInfo>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    error: Option<String>,
+}
+
+fn is_setup_statement(query: &str) -> bool {
+    let trimmed = query.trim_start();
+    let upper = trimmed.to_uppercase();
+    upper.starts_with("ATTACH")
+        || upper.starts_with("USE")
+        || upper.starts_with("INSTALL")
+        || upper.starts_with("LOAD")
+        || upper.starts_with("SET")
+        || upper.starts_with("RESET")
+        || upper.starts_with("CREATE OR REPLACE SECRET")
+        || upper.starts_with("CREATE SECRET")
+}
+
+/// Returns true if the query is expected to return a result set and can be wrapped with DESCRIBE.
+fn is_describable_query(query: &str) -> bool {
+    let trimmed = query.trim_start();
+    let upper = trimmed.to_uppercase();
+    upper.starts_with("SELECT")
+        || upper.starts_with("WITH")
+        || upper.starts_with("VALUES")
+        || upper.starts_with("TABLE")
+        || upper.starts_with("FROM")
+}
+
+static PARAM_RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\$\d+").expect("invalid regex"));
+
+fn replace_params_with_null(query: &str) -> String {
+    PARAM_RE.replace_all(query, "NULL").to_string()
+}
+
+#[unsafe(no_mangle)]
+pub extern "C" fn prepare_duckdb_ffi(
+    query_block_list: *const *const c_char,
+    query_block_list_count: usize,
+    token: *const c_char,
+    base_internal_url: *const c_char,
+    w_id: *const c_char,
+) -> *mut c_char {
+    let r = match convert_prepare_args(
+        query_block_list,
+        query_block_list_count,
+        token,
+        base_internal_url,
+        w_id,
+    )
+    .and_then(|(query_block_list, token, base_internal_url, w_id)| {
+        prepare_duckdb_internal(query_block_list, token, base_internal_url, w_id)
+    }) {
+        Ok(result) => result,
+        Err(err) => {
+            let err = serde_json::to_string(&err)
+                .unwrap_or_else(|_| "Unknown error in duckdb ffi lib".to_string());
+            format!("ERROR {}", err)
+        }
+    };
+
+    CString::new(r).map(|s| s.into_raw()).unwrap_or_else(|e| {
+        println!("Failed to allocate error string in duckdb ffi lib: {:?}", e);
+        null_mut()
+    })
+}
+
+fn setup_duckdb_connection(
+    conn: &duckdb::Connection,
+    token: &str,
+    base_internal_url: &str,
+    w_id: &str,
+) -> Result<(), String> {
+    let (s3_access_key, s3_secret_key) = token.rsplit_once('.').unwrap_or(("", token));
+    let (s3_endpoint_ssl, s3_endpoint) = base_internal_url
+        .split_once("://")
+        .unwrap_or(("http", &base_internal_url));
+    let s3_endpoint_ssl = s3_endpoint_ssl == "https";
+
+    conn.execute_batch(&format!(
+        "INSTALL httpfs; LOAD httpfs;
+        INSTALL azure; LOAD azure;
+        CREATE OR REPLACE SECRET s3_secret (
+            TYPE s3,
+            PROVIDER config,
+            KEY_ID '{s3_access_key}',
+            SECRET '{s3_secret_key}',
+            ENDPOINT '{s3_endpoint}/api/w/{w_id}/s3_proxy',
+            URL_STYLE path,
+            USE_SSL {s3_endpoint_ssl}
+        );
+        CREATE OR REPLACE SECRET gcs_secret (
+            TYPE gcs,
+            KEY_ID '{s3_access_key}',
+            SECRET '{s3_secret_key}',
+            ENDPOINT '{s3_endpoint}/api/w/{w_id}/s3_proxy',
+            USE_SSL {s3_endpoint_ssl}
+        );
+        ",
+    ))
+    .map_err(|e| format!("Error setting up S3 secret: {}", e.to_string()))
+}
+
+fn convert_prepare_args<'a>(
+    query_block_list: *const *const c_char,
+    query_block_list_count: usize,
+    token: *const c_char,
+    base_internal_url: *const c_char,
+    w_id: *const c_char,
+) -> Result<(Vec<&'a str>, &'a str, &'a str, &'a str), String> {
+    let query_block_list = unsafe {
+        std::slice::from_raw_parts(query_block_list, query_block_list_count)
+            .iter()
+            .map(|q| {
+                CStr::from_ptr(*q).to_str().unwrap_or_else(|e| {
+                    println!(
+                        "Invalid query_block string pointer in duckdb ffi: {}",
+                        e.to_string()
+                    );
+                    "Invalid query_block string pointer in duckdb ffi"
+                })
+            })
+            .collect::<Vec<_>>()
+    };
+    let token = unsafe { CStr::from_ptr(token) }
+        .to_str()
+        .map_err(|e| format!("Invalid token string: {}", e.to_string()))?;
+    let base_internal_url = unsafe { CStr::from_ptr(base_internal_url) }
+        .to_str()
+        .map_err(|e| format!("Invalid base_internal_url string: {}", e.to_string()))?;
+    let w_id = unsafe { CStr::from_ptr(w_id) }
+        .to_str()
+        .map_err(|e| format!("Invalid w_id string: {}", e.to_string()))?;
+    Ok((query_block_list, token, base_internal_url, w_id))
+}
+
+fn prepare_duckdb_internal(
+    query_block_list: Vec<&str>,
+    token: &str,
+    base_internal_url: &str,
+    w_id: &str,
+) -> Result<String, String> {
+    let conn = duckdb::Connection::open_in_memory().map_err(|e| e.to_string())?;
+
+    setup_duckdb_connection(&conn, token, base_internal_url, w_id)?;
+
+    let mut results: Vec<PrepareQueryResult> = vec![];
+
+    // IMPORTANT: Setup statements (ATTACH, USE, INSTALL, etc.) are executed but intentionally
+    // do not produce a PrepareQueryResult entry. The frontend prepends these as connection setup
+    // before the actual user queries, and mapPrepareResults expects results.length to equal the
+    // number of user queries (not setup statements). If a new setup-like statement is added to
+    // the connection flow (e.g. in setup_duckdb_connection or transform_attach_ducklake) without
+    // also being caught by is_setup_statement, the result count will mismatch and the frontend
+    // will throw.
+    for query_block in &query_block_list {
+        if is_setup_statement(query_block) {
+            conn.execute_batch(query_block)
+                .map_err(|e| format!("Error executing setup statement: {}", e.to_string()))?;
+            continue;
+        }
+
+        let modified_query = replace_params_with_null(query_block);
+        // Validate the query parses correctly by preparing it
+        if let Err(e) = conn.prepare(&modified_query) {
+            results.push(PrepareQueryResult { columns: None, error: Some(e.to_string()) });
+            continue;
+        }
+
+        // DESCRIBE only works on queries that return result sets (SELECT, WITH, VALUES, TABLE,
+        // FROM). For non-returning statements (INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, etc.)
+        // we skip DESCRIBE and assume no columns.
+        if !is_describable_query(&modified_query) {
+            results.push(PrepareQueryResult { columns: Some(vec![]), error: None });
+            continue;
+        }
+
+        // Note: We have to use a DESCRIBE statement and cannot simply use the
+        // methods returned by .prepare() because they panic if the statement was
+        // not executed at least once (which we specifically do not want to do).
+        let describe_query = format!("DESCRIBE {}", modified_query);
+        match conn.prepare(&describe_query).and_then(|mut stmt| {
+            let rows = stmt.query_map([], |row| {
+                Ok(PrepareQueryColumnInfo {
+                    name: row.get::<_, String>(0)?,
+                    type_name: row.get::<_, String>(1)?,
+                })
+            })?;
+            rows.collect::<std::result::Result<Vec<_>, _>>()
+        }) {
+            Ok(columns) => {
+                results.push(PrepareQueryResult { columns: Some(columns), error: None });
+            }
+            Err(e) => {
+                results.push(PrepareQueryResult { columns: None, error: Some(e.to_string()) });
+            }
+        }
+    }
+
+    serde_json::to_string(&results).map_err(|e| e.to_string())
+}
+
 fn convert_args<'a>(
     query_block_list: *const *const c_char,
     query_block_list_count: usize,
@@ -170,38 +384,7 @@ fn run_duckdb_internal<'a>(
 ) -> Result<(String, Option<Vec<String>>), String> {
     let conn = duckdb::Connection::open_in_memory().map_err(|e| e.to_string())?;
 
-    let (s3_access_key, s3_secret_key) = token.split_at(token.rfind('.').unwrap_or(0));
-    let s3_secret_key = &s3_secret_key[1..];
-    let (s3_endpoint_ssl, s3_endpoint) = base_internal_url
-        .split_once("://")
-        .unwrap_or(("http", &base_internal_url));
-    let s3_endpoint_ssl = match s3_endpoint_ssl {
-        "https" => true,
-        _ => false,
-    };
-
-    conn.execute_batch(&format!(
-        "INSTALL httpfs; LOAD httpfs;
-        INSTALL azure; LOAD azure;
-        CREATE OR REPLACE SECRET s3_secret (
-            TYPE s3,
-            PROVIDER config,
-            KEY_ID '{s3_access_key}',
-            SECRET '{s3_secret_key}',
-            ENDPOINT '{s3_endpoint}/api/w/{w_id}/s3_proxy',
-            URL_STYLE path,
-            USE_SSL {s3_endpoint_ssl}
-        );
-        CREATE OR REPLACE SECRET gcs_secret (
-            TYPE gcs,
-            KEY_ID '{s3_access_key}',
-            SECRET '{s3_secret_key}',
-            ENDPOINT '{s3_endpoint}/api/w/{w_id}/s3_proxy',
-            USE_SSL {s3_endpoint_ssl}
-        );
-        ",
-    ))
-    .map_err(|e| format!("Error setting up S3 secret: {}", e.to_string()))?;
+    setup_duckdb_connection(&conn, token, base_internal_url, w_id)?;
 
     let mut results: Vec<Vec<Box<RawValue>>> = vec![];
     let mut column_order = None;
diff --git a/backend/windmill-runtime-nativets/src/lib.rs b/backend/windmill-runtime-nativets/src/lib.rs
index a523106cbc..e81925e7bb 100644
--- a/backend/windmill-runtime-nativets/src/lib.rs
+++ b/backend/windmill-runtime-nativets/src/lib.rs
@@ -45,7 +45,7 @@ use uuid::Uuid;
 
 use windmill_common::error::Error;
 use windmill_common::result_stream::append_result_stream_db;
-use windmill_common::worker::{write_file, Connection, TMP_DIR};
+use windmill_common::worker::{write_file, Connection, WINDMILL_DIR};
 
 // ── Permission container ─────────────────────────────────────────────
 
@@ -151,7 +151,9 @@ static RUNTIME_SNAPSHOT: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/FETCH
 
 pub(crate) const WINDMILL_CLIENT: &str = include_str!("./windmill-client.js");
 
-const ERROR_DIR: &str = const_format::concatcp!(TMP_DIR, "/native_errors");
+lazy_static::lazy_static! {
+    static ref ERROR_DIR: String = format!("{}/native_errors", *WINDMILL_DIR);
+}
 
 lazy_static! {
     static ref RE_PROXY: Regex =
@@ -263,14 +265,14 @@ fn capture_proxy(s: &str) -> Option<(String, Option<(String, String)>)> {
 }
 
 fn write_error_expr(expr: &str, uuid: &Uuid) {
-    if let Err(e) = std::fs::create_dir_all(ERROR_DIR) {
-        tracing::error!("failed to create error dir {ERROR_DIR}: {e}");
+    if let Err(e) = std::fs::create_dir_all(&*ERROR_DIR) {
+        tracing::error!("failed to create error dir {}: {e}", *ERROR_DIR);
         return;
     }
-    let dir_entries = match std::fs::read_dir(ERROR_DIR) {
+    let dir_entries = match std::fs::read_dir(&*ERROR_DIR) {
         Ok(entries) => entries.count(),
         Err(_) => {
-            tracing::error!("failed to read error dir {ERROR_DIR}");
+            tracing::error!("failed to read error dir {}", *ERROR_DIR);
             return;
         }
     };
@@ -279,15 +281,16 @@ fn write_error_expr(expr: &str, uuid: &Uuid) {
         tracing::info!("native error for job {uuid}: {expr}");
     }
     if dir_entries >= 100 {
-        tracing::info!("Too many error files in {ERROR_DIR}, skipping write");
+        tracing::info!("Too many error files in {}, skipping write", *ERROR_DIR);
         return;
     }
 
     let path = format!("/{uuid}.js");
     tracing::info!(
-        "nativets job {uuid} failed, writing error expr to {ERROR_DIR}/{path} for debugging: {path}"
+        "nativets job {uuid} failed, writing error expr to {}/{path} for debugging: {path}",
+        *ERROR_DIR
     );
-    if let Err(e) = write_file(ERROR_DIR, &path, expr) {
+    if let Err(e) = write_file(&ERROR_DIR, &path, expr) {
         tracing::error!("failed to write error expr to file {path}: {e}");
     }
 }
diff --git a/backend/windmill-store/src/resources.rs b/backend/windmill-store/src/resources.rs
index bcac53e7d2..6b414ca10f 100644
--- a/backend/windmill-store/src/resources.rs
+++ b/backend/windmill-store/src/resources.rs
@@ -47,7 +47,7 @@ use windmill_common::{
         StripPath,
     },
     variables,
-    worker::{CLOUD_HOSTED, TMP_DIR},
+    worker::{CLOUD_HOSTED, WINDMILL_DIR},
     PgDatabase,
 };
 
@@ -1752,7 +1752,7 @@ async fn write_ssh_file(
     var_path: &str,
 ) -> std::result::Result<std::path::PathBuf, (error::Error, std::path::PathBuf)> {
     let id_file_name = format!(".ssh_id_priv_{}", Uuid::new_v4());
-    let loc = std::path::Path::new(TMP_DIR)
+    let loc = std::path::Path::new(&*WINDMILL_DIR)
         .join("ssh_ids")
         .join(id_file_name);
 
diff --git a/backend/windmill-test-utils/src/lib.rs b/backend/windmill-test-utils/src/lib.rs
index adbeb83ee7..69e7fc0558 100644
--- a/backend/windmill-test-utils/src/lib.rs
+++ b/backend/windmill-test-utils/src/lib.rs
@@ -380,7 +380,7 @@ pub fn spawn_test_worker(
 
     std::fs::DirBuilder::new()
         .recursive(true)
-        .create(windmill_worker::GO_BIN_CACHE_DIR)
+        .create(&*windmill_worker::GO_BIN_CACHE_DIR)
         .expect("could not create initial worker dir");
 
     let (tx, rx) = KillpillSender::new(1);
diff --git a/backend/windmill-worker/nsjail/run.powershell.config.proto b/backend/windmill-worker/nsjail/run.powershell.config.proto
index 87b6abda21..afe9d5df9f 100644
--- a/backend/windmill-worker/nsjail/run.powershell.config.proto
+++ b/backend/windmill-worker/nsjail/run.powershell.config.proto
@@ -127,7 +127,7 @@ iface_no_lo: true
 
 mount {
     src: "{CACHE_DIR}"
-    dst: "/tmp/windmill/cache/powershell"
+    dst: "{CACHE_DIR}"
     is_bind: true
     rw: false
     mandatory: false
diff --git a/backend/windmill-worker/src/ansible_executor.rs b/backend/windmill-worker/src/ansible_executor.rs
index aa250de4ab..253384f6f2 100644
--- a/backend/windmill-worker/src/ansible_executor.rs
+++ b/backend/windmill-worker/src/ansible_executor.rs
@@ -33,9 +33,9 @@ use crate::{
         read_and_check_result, start_child_process, transform_json, OccupancyMetrics,
     },
     handle_child::handle_child,
+    is_sandboxing_enabled,
     python_executor::{create_dependencies_dir, handle_python_reqs, uv_pip_compile},
-    is_sandboxing_enabled, DISABLE_NUSER, GIT_PATH, HOME_ENV, NSJAIL_PATH, PATH_ENV, PROXY_ENVS,
-    PY_INSTALL_DIR, TZ_ENV,
+    DISABLE_NUSER, GIT_PATH, HOME_ENV, NSJAIL_PATH, PATH_ENV, PROXY_ENVS, PY_INSTALL_DIR, TZ_ENV,
 };
 use windmill_common::client::AuthedClient;
 
@@ -1184,7 +1184,7 @@ mount {{
             job_dir,
             "run.config.proto",
             &NSJAIL_CONFIG_RUN_ANSIBLE_CONTENT
-                .replace("{PY_INSTALL_DIR}", PY_INSTALL_DIR)
+                .replace("{PY_INSTALL_DIR}", &*PY_INSTALL_DIR)
                 .replace("{JOB_DIR}", job_dir)
                 .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string())
                 .replace("{SHARED_MOUNT}", shared_mount)
diff --git a/backend/windmill-worker/src/bash_executor.rs b/backend/windmill-worker/src/bash_executor.rs
index 64270b4044..30348895cf 100644
--- a/backend/windmill-worker/src/bash_executor.rs
+++ b/backend/windmill-worker/src/bash_executor.rs
@@ -194,7 +194,7 @@ exit $exit_status
                 .replace("{JOB_DIR}", job_dir)
                 .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string())
                 .replace("{SHARED_MOUNT}", shared_mount)
-                .replace("{TRACING_PROXY_CA_CERT_PATH}", TRACING_PROXY_CA_CERT_PATH)
+                .replace("{TRACING_PROXY_CA_CERT_PATH}", &*TRACING_PROXY_CA_CERT_PATH)
                 .replace("#{DEV}", DEV_CONF_NSJAIL),
         )?;
         let mut cmd_args = vec![
diff --git a/backend/windmill-worker/src/bun_executor.rs b/backend/windmill-worker/src/bun_executor.rs
index 9c46db572d..08a61645ce 100644
--- a/backend/windmill-worker/src/bun_executor.rs
+++ b/backend/windmill-worker/src/bun_executor.rs
@@ -737,7 +737,7 @@ async fn pull_codebase(w_id: &str, id: &str, job_dir: &str) -> Result<PulledCode
 
     let bun_cache_path = format!(
         "{}/{}.{}",
-        windmill_common::worker::ROOT_CACHE_NOMOUNT_DIR,
+        *windmill_common::worker::ROOT_CACHE_NOMOUNT_DIR,
         path,
         if is_tar { "tar" } else { "js" }
     );
@@ -921,7 +921,7 @@ pub async fn compute_bundle_local_and_remote_path(
     };
 
     let hash = windmill_common::utils::calculate_hash(&input_src);
-    let local_path = format!("{BUN_BUNDLE_CACHE_DIR}/{hash}");
+    let local_path = format!("{}/{hash}", *BUN_BUNDLE_CACHE_DIR);
 
     #[cfg(windows)]
     let local_path = local_path.replace("/tmp", r"C:\tmp").replace("/", r"\");
@@ -1495,7 +1495,7 @@ try {{
                         },
                     ),
                 )
-                .replace("{TRACING_PROXY_CA_CERT_PATH}", TRACING_PROXY_CA_CERT_PATH)
+                .replace("{TRACING_PROXY_CA_CERT_PATH}", &*TRACING_PROXY_CA_CERT_PATH)
                 .replace("#{DEV}", DEV_CONF_NSJAIL),
         )?;
 
diff --git a/backend/windmill-worker/src/common.rs b/backend/windmill-worker/src/common.rs
index e03f90525e..1239aa8d7d 100644
--- a/backend/windmill-worker/src/common.rs
+++ b/backend/windmill-worker/src/common.rs
@@ -15,10 +15,6 @@ use tokio::process::Command;
 use tokio::{fs::File, io::AsyncReadExt};
 
 use windmill_common::flows::Step;
-#[cfg(feature = "parquet")]
-use windmill_types::s3::{LargeFileStorage, ObjectStoreResource, S3Object};
-#[cfg(feature = "parquet")]
-use windmill_object_store::get_etag_or_empty;
 use windmill_common::variables::{build_crypt_with_key_suffix, decrypt};
 use windmill_common::worker::{
     to_raw_value, update_ping_for_failed_init_script_query, write_file, Connection, Ping, PingType,
@@ -32,6 +28,10 @@ use windmill_common::{
     utils::configure_client,
     variables::ContextualVariable,
 };
+#[cfg(feature = "parquet")]
+use windmill_object_store::get_etag_or_empty;
+#[cfg(feature = "parquet")]
+use windmill_types::s3::{LargeFileStorage, ObjectStoreResource, S3Object};
 
 use anyhow::{anyhow, Result};
 use windmill_parser_sql::{s3_mode_extension, S3ModeArgs, S3ModeFormat};
@@ -1090,7 +1090,7 @@ fn tentatively_improve_error(err: Error, executable: &str) -> Error {
 
 pub async fn clean_cache() -> error::Result<()> {
     tracing::info!("Started cleaning cache");
-    tokio::fs::remove_dir_all(ROOT_CACHE_DIR).await?;
+    tokio::fs::remove_dir_all(&*ROOT_CACHE_DIR).await?;
     tracing::info!("Finished cleaning cache");
     Ok(())
 }
@@ -1557,4 +1557,3 @@ mod tests {
         assert!(result.is_err());
     }
 }
-
diff --git a/backend/windmill-worker/src/csharp_executor.rs b/backend/windmill-worker/src/csharp_executor.rs
index e4c32648d0..4c3e63f4c9 100644
--- a/backend/windmill-worker/src/csharp_executor.rs
+++ b/backend/windmill-worker/src/csharp_executor.rs
@@ -13,14 +13,11 @@ use itertools::Itertools;
 #[cfg(feature = "csharp")]
 use tokio::{fs::File, io::AsyncReadExt, process::Command};
 #[cfg(feature = "csharp")]
-use windmill_common::{
-    utils::calculate_hash,
-    worker::write_file,
-};
+use windmill_common::{utils::calculate_hash, worker::write_file};
 
-use windmill_common::error::{self, Error};
 #[cfg(feature = "csharp")]
 use crate::global_cache::save_cache;
+use windmill_common::error::{self, Error};
 #[cfg(feature = "csharp")]
 use windmill_queue::append_logs;
 
@@ -105,8 +102,8 @@ pub async fn generate_nuget_lockfile(
     let mut gen_lockfile_cmd = Command::new(DOTNET_PATH.as_str());
     gen_lockfile_cmd
         .current_dir(job_dir)
-        .env("DOTNET_CLI_HOME", CSHARP_CACHE_DIR)
-        .env("NUGET_PACKAGES", format!("{CSHARP_CACHE_DIR}/nuget"))
+        .env("DOTNET_CLI_HOME", &*CSHARP_CACHE_DIR)
+        .env("NUGET_PACKAGES", format!("{}/nuget", *CSHARP_CACHE_DIR))
         .env("DOTNET_CLI_TELEMETRY_OPTOUT", "true")
         .env("DOTNET_NOLOGO", "true")
         .env("MSBUILDDISABLENODEREUSE", "1")
@@ -367,8 +364,8 @@ async fn build_cs_proj(
         .env("PATH", PATH_ENV.as_str())
         .env("BASE_INTERNAL_URL", base_internal_url)
         .env("HOME", HOME_ENV.as_str())
-        .env("DOTNET_CLI_HOME", CSHARP_CACHE_DIR)
-        .env("NUGET_PACKAGES", format!("{CSHARP_CACHE_DIR}/nuget"))
+        .env("DOTNET_CLI_HOME", &*CSHARP_CACHE_DIR)
+        .env("NUGET_PACKAGES", format!("{}/nuget", *CSHARP_CACHE_DIR))
         .env("DOTNET_CLI_TELEMETRY_OPTOUT", "true")
         .env("DOTNET_NOLOGO", "true")
         .env("MSBUILDDISABLENODEREUSE", "1")
@@ -434,7 +431,7 @@ async fn build_cs_proj(
         }
     }
 
-    let bin_path = format!("{}/{hash}", CSHARP_CACHE_DIR);
+    let bin_path = format!("{}/{hash}", *CSHARP_CACHE_DIR);
     #[cfg(unix)]
     let target = format!("{job_dir}/Main");
     #[cfg(windows)]
@@ -516,11 +513,10 @@ pub async fn handle_csharp_job(
         inner_content,
         requirements_o.unwrap_or(&String::new())
     ));
-    let bin_path = format!("{}/{hash}", CSHARP_CACHE_DIR);
+    let bin_path = format!("{}/{hash}", *CSHARP_CACHE_DIR);
     let remote_path = format!("{CSHARP_OBJECT_STORE_PREFIX}{hash}");
 
-    let (cache, cache_logs) =
-        crate::global_cache::load_cache(&bin_path, &remote_path, false).await;
+    let (cache, cache_logs) = crate::global_cache::load_cache(&bin_path, &remote_path, false).await;
 
     let cache_logs = if cache {
         #[cfg(unix)]
@@ -591,11 +587,11 @@ pub async fn handle_csharp_job(
             "run.config.proto",
             &NSJAIL_CONFIG_RUN_CSHARP_CONTENT
                 .replace("{JOB_DIR}", job_dir)
-                .replace("{CACHE_DIR}", CSHARP_CACHE_DIR)
+                .replace("{CACHE_DIR}", &*CSHARP_CACHE_DIR)
                 .replace("{CACHE_HASH}", &hash)
                 .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string())
                 .replace("{SHARED_MOUNT}", shared_mount)
-                .replace("{TRACING_PROXY_CA_CERT_PATH}", TRACING_PROXY_CA_CERT_PATH)
+                .replace("{TRACING_PROXY_CA_CERT_PATH}", &*TRACING_PROXY_CA_CERT_PATH)
                 .replace("#{DEV}", DEV_CONF_NSJAIL),
         )?;
         let mut nsjail_cmd = Command::new(NSJAIL_PATH.as_str());
@@ -608,8 +604,8 @@ pub async fn handle_csharp_job(
             .env("PATH", PATH_ENV.as_str())
             .env("TZ", TZ_ENV.as_str())
             .env("BASE_INTERNAL_URL", base_internal_url)
-            .env("DOTNET_CLI_HOME", CSHARP_CACHE_DIR)
-            .env("NUGET_PACKAGES", format!("{CSHARP_CACHE_DIR}/nuget"))
+            .env("DOTNET_CLI_HOME", &*CSHARP_CACHE_DIR)
+            .env("NUGET_PACKAGES", format!("{}/nuget", *CSHARP_CACHE_DIR))
             .env("DOTNET_CLI_TELEMETRY_OPTOUT", "true")
             .env("DOTNET_NOLOGO", "true")
             .env("DOTNET_ROOT", DOTNET_ROOT.as_str())
@@ -640,8 +636,8 @@ pub async fn handle_csharp_job(
             .envs(get_proxy_envs_for_lang(&ScriptLang::CSharp).await?)
             .env("PATH", PATH_ENV.as_str())
             .env("TZ", TZ_ENV.as_str())
-            .env("DOTNET_CLI_HOME", CSHARP_CACHE_DIR)
-            .env("NUGET_PACKAGES", format!("{CSHARP_CACHE_DIR}/nuget"))
+            .env("DOTNET_CLI_HOME", &*CSHARP_CACHE_DIR)
+            .env("NUGET_PACKAGES", format!("{}/nuget", *CSHARP_CACHE_DIR))
             .env("DOTNET_CLI_TELEMETRY_OPTOUT", "true")
             .env("DOTNET_NOLOGO", "true")
             .env("DOTNET_ROOT", DOTNET_ROOT.as_str())
diff --git a/backend/windmill-worker/src/deno_executor.rs b/backend/windmill-worker/src/deno_executor.rs
index 66d8ae8673..19831eadd0 100644
--- a/backend/windmill-worker/src/deno_executor.rs
+++ b/backend/windmill-worker/src/deno_executor.rs
@@ -443,7 +443,8 @@ try {{
         }
 
         let allow_read = format!(
-            "--allow-read=./,/tmp/windmill/cache/deno/,{}",
+            "--allow-read=./,{}/,{}",
+            *DENO_CACHE_DIR,
             DENO_PATH.as_str()
         );
         if let Some(deno_flags) = DENO_FLAGS.as_ref() {
@@ -504,7 +505,8 @@ try {{
     *has_stream = handle_result.result_stream.is_some();
 
     // logs.push_str(format!("execute: {:?}\n", start.elapsed().as_millis()).as_str());
-    if let Err(e) = tokio::fs::remove_dir_all(format!("{DENO_CACHE_DIR}/gen/file/{job_dir}")).await
+    if let Err(e) =
+        tokio::fs::remove_dir_all(format!("{}/gen/file/{job_dir}", *DENO_CACHE_DIR)).await
     {
         tracing::error!("failed to remove deno gen tmp cache dir: {}", e);
     }
diff --git a/backend/windmill-worker/src/duckdb_executor.rs b/backend/windmill-worker/src/duckdb_executor.rs
index 73136e1cc0..45e2f647a5 100644
--- a/backend/windmill-worker/src/duckdb_executor.rs
+++ b/backend/windmill-worker/src/duckdb_executor.rs
@@ -161,6 +161,22 @@ pub async fn do_duckdb(
         let base_internal_url = client.base_internal_url.clone();
         let w_id = job.workspace_id.clone();
 
+        if annotations.prepare {
+            let result = tokio::task::spawn_blocking(move || {
+                prepare_duckdb_ffi_safe(
+                    query_block_list.iter().map(String::as_str),
+                    &token,
+                    &base_internal_url,
+                    &w_id,
+                )
+            })
+            .await
+            .map_err(|e| Error::from(to_anyhow(e)))
+            .and_then(|r| r)?;
+
+            return Ok(result);
+        }
+
         let result = tokio::task::spawn_blocking(move || {
             run_duckdb_ffi_safe(
                 query_block_list.iter().map(String::as_str),
@@ -248,6 +264,18 @@ struct DuckDbFfiLib {
             collect_first_row_only: bool,
         ) -> *mut c_char,
     >,
+    prepare_duckdb_ffi: Option<
+        Symbol<
+            'static,
+            unsafe extern "C" fn(
+                query_block_list: *const *const c_char,
+                query_block_list_count: usize,
+                token: *const c_char,
+                base_internal_url: *const c_char,
+                w_id: *const c_char,
+            ) -> *mut c_char,
+        >,
+    >,
     free_cstr: Symbol<'static, unsafe extern "C" fn(string: *mut c_char) -> ()>,
 }
 
@@ -307,8 +335,11 @@ impl DuckDbFfiLib {
             }
         }
 
+        let prepare_duckdb_ffi = unsafe { lib.get(b"prepare_duckdb_ffi").ok() };
+
         Ok(DuckDbFfiLib {
             run_duckdb_ffi: unsafe { lib.get(b"run_duckdb_ffi").map_err(to_anyhow)? },
+            prepare_duckdb_ffi,
             free_cstr: unsafe { lib.get(b"free_cstr").map_err(to_anyhow)? },
         })
     }
@@ -388,6 +419,56 @@ fn run_duckdb_ffi_safe<'a>(
     }
 }
 
+fn prepare_duckdb_ffi_safe<'a>(
+    query_block_list: impl Iterator<Item = &'a str>,
+    token: &str,
+    base_internal_url: &str,
+    w_id: &str,
+) -> Result<Box<RawValue>> {
+    let query_block_list = query_block_list
+        .map(|s| {
+            CString::new(s).map_err(|e| {
+                Error::ExecutionErr(format!("Failed CString conversion: {}", e.to_string()))
+            })
+        })
+        .collect::<Result<Vec<_>>>()?;
+    let query_block_list = query_block_list
+        .iter()
+        .map(|s| s.as_ptr())
+        .collect::<Vec<_>>();
+
+    let token = CString::new(token).map_err(to_anyhow)?;
+    let base_internal_url = CString::new(base_internal_url).map_err(to_anyhow)?;
+    let w_id = CString::new(w_id).map_err(to_anyhow)?;
+
+    let lib = DuckDbFfiLib::get_singleton()?;
+    let prepare_fn = lib.prepare_duckdb_ffi.as_ref().ok_or_else(|| {
+        Error::InternalErr(
+            "prepare_duckdb_ffi not available in duckdb ffi library. Please update to the latest windmill_duckdb_ffi_lib.".to_string(),
+        )
+    })?;
+    let free_cstr = &lib.free_cstr;
+
+    let result_str = unsafe {
+        let ptr = prepare_fn(
+            query_block_list.as_ptr(),
+            query_block_list.len(),
+            token.as_ptr(),
+            base_internal_url.as_ptr(),
+            w_id.as_ptr(),
+        );
+        let str = CStr::from_ptr(ptr).to_string_lossy().to_string();
+        free_cstr(ptr);
+        str
+    };
+
+    if result_str.starts_with("ERROR") {
+        Err(Error::ExecutionErr(result_str[6..].to_string()))
+    } else {
+        Ok(serde_json::value::RawValue::from_string(result_str).map_err(to_anyhow)?)
+    }
+}
+
 struct ParsedAttachDbResource<'a> {
     resource_path: &'a str,
     name: &'a str,
diff --git a/backend/windmill-worker/src/global_cache.rs b/backend/windmill-worker/src/global_cache.rs
index 812be2fc7a..ea5a9ded46 100644
--- a/backend/windmill-worker/src/global_cache.rs
+++ b/backend/windmill-worker/src/global_cache.rs
@@ -18,8 +18,8 @@ pub async fn build_tar_and_push(
     custom_folder_name: Option<String>,
     platform_agnostic: bool,
 ) -> error::Result<()> {
-    use windmill_object_store::object_store_reexports::Path;
     use tokio::fs::create_dir_all;
+    use windmill_object_store::object_store_reexports::Path;
 
     use crate::TAR_PYBASE_CACHE_DIR;
 
@@ -33,7 +33,7 @@ pub async fn build_tar_and_push(
         folder.split("/").last().unwrap().to_owned()
     };
 
-    let prefix = &format!("{TAR_PYBASE_CACHE_DIR}/{}", lang);
+    let prefix = &format!("{}/{}", *TAR_PYBASE_CACHE_DIR, lang);
     let tar_path = format!("{prefix}/{folder_name}_tar.tar");
 
     create_dir_all(prefix).await?;
@@ -197,7 +197,9 @@ pub async fn exists_in_cache(bin_path: &str, _remote_path: &str) -> bool {
         #[cfg(all(feature = "enterprise", feature = "parquet"))]
         if let Some(os) = windmill_object_store::get_object_store().await {
             return os
-                .get(&windmill_object_store::object_store_reexports::Path::from(_remote_path))
+                .get(&windmill_object_store::object_store_reexports::Path::from(
+                    _remote_path,
+                ))
                 .await
                 .is_ok();
         }
@@ -221,7 +223,7 @@ pub async fn save_cache(
         let file_to_cache = if is_dir {
             let tar_path = format!(
                 "{}/tar/{}_tar.tar",
-                windmill_common::worker::ROOT_CACHE_DIR,
+                *windmill_common::worker::ROOT_CACHE_DIR,
                 local_cache_path
                     .split("/")
                     .last()
diff --git a/backend/windmill-worker/src/go_executor.rs b/backend/windmill-worker/src/go_executor.rs
index 35307baa72..29fff1a2ba 100644
--- a/backend/windmill-worker/src/go_executor.rs
+++ b/backend/windmill-worker/src/go_executor.rs
@@ -2,6 +2,7 @@ use crate::{common::MaybeLock, get_proxy_envs_for_lang};
 use std::{collections::HashMap, fs::DirBuilder, process::Stdio};
 use windmill_common::scripts::ScriptLang;
 
+use crate::global_cache::save_cache;
 use itertools::Itertools;
 use serde_json::value::RawValue;
 use tokio::{
@@ -15,7 +16,6 @@ use windmill_common::{
     utils::calculate_hash,
     worker::{write_file, Connection, GoAnnotations},
 };
-use crate::global_cache::save_cache;
 use windmill_parser_go::{parse_go_imports, REQUIRE_PARSE};
 use windmill_queue::{append_logs, CanceledBy, MiniPulledJob};
 
@@ -108,10 +108,9 @@ pub async fn handle_go_job(
         .expect("could not create go job dir");
 
     let hash = calculate_hash(&format!("{}{:?}v2", inner_content, &maybe_lock));
-    let bin_path = format!("{}/{hash}", GO_BIN_CACHE_DIR);
+    let bin_path = format!("{}/{hash}", *GO_BIN_CACHE_DIR);
     let remote_path = format!("{GO_OBJECT_STORE_PREFIX}{hash}");
-    let (cache, cache_logs) =
-        crate::global_cache::load_cache(&bin_path, &remote_path, false).await;
+    let (cache, cache_logs) = crate::global_cache::load_cache(&bin_path, &remote_path, false).await;
 
     let (skip_go_mod, skip_tidy) = if cache {
         (true, true)
@@ -238,15 +237,15 @@ func Run(req Req) (interface{{}}, error){{
             .env("GOPATH", {
                 #[cfg(unix)]
                 {
-                    GO_CACHE_DIR
+                    GO_CACHE_DIR.as_str()
                 }
                 #[cfg(windows)]
                 {
-                    windows_gopath()
+                    &windows_gopath()
                 }
             })
             .env("HOME", HOME_ENV.as_str())
-            .env("GOCACHE", GO_CACHE_DIR)
+            .env("GOCACHE", GO_CACHE_DIR.as_str())
             .envs(PROXY_ENVS.clone())
             .args(vec!["build", "main.go"])
             .stdout(Stdio::piped())
@@ -347,7 +346,7 @@ func Run(req Req) (interface{{}}, error){{
                 .replace("{JOB_DIR}", job_dir)
                 .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string())
                 .replace("{SHARED_MOUNT}", shared_mount)
-                .replace("{TRACING_PROXY_CA_CERT_PATH}", TRACING_PROXY_CA_CERT_PATH)
+                .replace("{TRACING_PROXY_CA_CERT_PATH}", &*TRACING_PROXY_CA_CERT_PATH)
                 .replace("#{DEV}", DEV_CONF_NSJAIL),
         )?;
         let mut nsjail_cmd = Command::new(NSJAIL_PATH.as_str());
@@ -384,11 +383,11 @@ func Run(req Req) (interface{{}}, error){{
             .env("GOPATH", {
                 #[cfg(unix)]
                 {
-                    GO_CACHE_DIR
+                    GO_CACHE_DIR.as_str()
                 }
                 #[cfg(windows)]
                 {
-                    windows_gopath()
+                    &windows_gopath()
                 }
             })
             .env("HOME", HOME_ENV.as_str());
@@ -508,7 +507,7 @@ pub async fn install_go_dependencies(
                     #[cfg(windows)]
                     child_cmd.env("GOPATH", windows_gopath());
                     #[cfg(unix)]
-                    child_cmd.env("GOPATH", GO_CACHE_DIR);
+                    child_cmd.env("GOPATH", GO_CACHE_DIR.as_str());
 
                     #[cfg(windows)]
                     set_windows_env_vars(&mut child_cmd);
@@ -591,11 +590,11 @@ pub async fn install_go_dependencies(
         .env("GOPATH", {
             #[cfg(unix)]
             {
-                GO_CACHE_DIR
+                GO_CACHE_DIR.as_str()
             }
             #[cfg(windows)]
             {
-                windows_gopath()
+                &windows_gopath()
             }
         })
         .args(vec!["mod", mod_command])
diff --git a/backend/windmill-worker/src/java_executor.rs b/backend/windmill-worker/src/java_executor.rs
index 49129848ce..efbe403145 100644
--- a/backend/windmill-worker/src/java_executor.rs
+++ b/backend/windmill-worker/src/java_executor.rs
@@ -1,5 +1,6 @@
 use std::{collections::HashMap, path::PathBuf, process::Stdio};
 
+use crate::global_cache::save_cache;
 use anyhow::{anyhow, bail};
 use async_recursion::async_recursion;
 use itertools::Itertools;
@@ -15,7 +16,6 @@ use windmill_common::{
     utils::calculate_hash,
     worker::{copy_dir_recursively, write_file, Connection},
 };
-use crate::global_cache::save_cache;
 use windmill_parser::Arg;
 use windmill_parser_java::parse_java_sig_meta;
 use windmill_queue::{append_logs, CanceledBy, MiniPulledJob};
@@ -185,8 +185,8 @@ pub async fn resolve<'a>(
         cmd.env_clear()
             .current_dir(job_dir.to_owned())
             .env("PATH", PATH_ENV.as_str())
-            .env("HOME", JAVA_HOME_DIR)
-            .env("COURSIER_CACHE", COURSIER_CACHE_DIR)
+            .env("HOME", &*JAVA_HOME_DIR)
+            .env("COURSIER_CACHE", &*COURSIER_CACHE_DIR)
             .envs(PROXY_ENVS.clone());
 
         // Configure proxies
@@ -208,7 +208,7 @@ pub async fn resolve<'a>(
                 cmd.arg(&format!("-Dhttp.nonProxyHosts=\"{}\"", val));
             }
         }
-        cmd.arg(&format!("-Duser.home={}", JAVA_HOME_DIR));
+        cmd.arg(&format!("-Duser.home={}", *JAVA_HOME_DIR));
         if metadata(TRUST_STORE_PATH.clone()).await.is_ok() {
             cmd.args(&[
                 &format!("-Djavax.net.ssl.trustStore={}", *TRUST_STORE_PATH),
@@ -223,7 +223,7 @@ pub async fn resolve<'a>(
             "--parallel",
             &format!("{}", *JAVA_CONCURRENT_DOWNLOADS),
             "--cache",
-            COURSIER_CACHE_DIR,
+            &*COURSIER_CACHE_DIR,
         ])
         .args(&get_repos(job_id, w_id, conn).await)
         .args(&deps.split("\n").collect_vec())
@@ -276,7 +276,8 @@ async fn install<'a>(
             match (it.next(), it.next(), it.next()) {
                 (Some(group_id), Some(artifact_id), Some(version)) => {
                     let path = format!(
-                        "{JAVA_REPOSITORY_DIR}/{}/{artifact_id}/{version}",
+                        "{}/{}/{artifact_id}/{version}",
+                        *JAVA_REPOSITORY_DIR,
                         group_id.replace(".", "/")
                     );
                     Ok(RequiredDependency {
@@ -312,7 +313,7 @@ async fn install<'a>(
         metadata(TRUST_STORE_PATH.clone()).await,
     );
     let job_dir = job_dir.to_owned();
-    let fetch_dir = format!("{JAVA_CACHE_DIR}/tmp-fetch-{}", Uuid::new_v4());
+    let fetch_dir = format!("{}/tmp-fetch-{}", *JAVA_CACHE_DIR, Uuid::new_v4());
     let fetch_dir2 = fetch_dir.clone();
     par_install_language_dependencies_all_at_once(
         deps,
@@ -334,8 +335,8 @@ async fn install<'a>(
             cmd.env_clear()
                 .current_dir(&job_dir)
                 .env("PATH", PATH_ENV.as_str())
-                .env("HOME", JAVA_HOME_DIR)
-                .env("COURSIER_CACHE", COURSIER_CACHE_DIR)
+                .env("HOME", &*JAVA_HOME_DIR)
+                .env("COURSIER_CACHE", &*COURSIER_CACHE_DIR)
                 .envs(PROXY_ENVS.clone());
             // Configure proxies
             {
@@ -357,7 +358,7 @@ async fn install<'a>(
                 }
             }
 
-            cmd.arg(&format!("-Duser.home={}", JAVA_HOME_DIR));
+            cmd.arg(&format!("-Duser.home={}", *JAVA_HOME_DIR));
             if trust_store_metadata.is_ok() {
                 cmd.args(&[
                     &format!("-Djavax.net.ssl.trustStore={}", *TRUST_STORE_PATH),
@@ -400,7 +401,7 @@ async fn install<'a>(
                 if depth == 3 {
                     copy_dir_recursively(
                         &PathBuf::from(path),
-                        &PathBuf::from(JAVA_REPOSITORY_DIR),
+                        &PathBuf::from(&*JAVA_REPOSITORY_DIR),
                     )?;
 
                     return Ok(());
@@ -465,7 +466,7 @@ async fn compile<'a>(
     let reserved_variables =
         get_reserved_variables(job, &client.token, conn, parent_runnable_path.clone()).await?;
     let hash = compute_hash(inner_content, *requirements_o);
-    let bin_path = format!("{}/{hash}", JAVA_CACHE_DIR);
+    let bin_path = format!("{}/{hash}", *JAVA_CACHE_DIR);
     let remote_path = format!("java_jar/{hash}");
     let (cache, ..) = crate::global_cache::load_cache(&bin_path, &remote_path, true).await;
 
@@ -501,7 +502,7 @@ async fn compile<'a>(
             cmd.env_clear()
                 .current_dir(job_dir.to_owned())
                 .env("PATH", PATH_ENV.as_str())
-                .env("HOME", JAVA_HOME_DIR)
+                .env("HOME", &*JAVA_HOME_DIR)
                 .env("BASE_INTERNAL_URL", base_internal_url)
                 .envs(envs)
                 .envs(reserved_variables)
@@ -604,7 +605,7 @@ async fn run<'a>(
             "run.config.proto",
             &NSJAIL_CONFIG_RUN_JAVA_CONTENT
                 .replace("{JOB_DIR}", job_dir)
-                .replace("{CACHE_DIR}", JAVA_CACHE_DIR)
+                .replace("{CACHE_DIR}", &*JAVA_CACHE_DIR)
                 .replace("{SHARED_MOUNT}", &shared_mount)
                 // .replace("{CACHED_TARGET}", &shared_mount)
                 .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string()),
@@ -613,7 +614,7 @@ async fn run<'a>(
         cmd.env_clear()
             .current_dir(job_dir)
             .env("PATH", PATH_ENV.as_str())
-            .env("HOME", JAVA_HOME_DIR)
+            .env("HOME", &*JAVA_HOME_DIR)
             .env("BASE_INTERNAL_URL", base_internal_url)
             .envs(envs)
             .envs(reserved_variables)
@@ -671,7 +672,7 @@ async fn run<'a>(
         cmd.env_clear()
             .current_dir(job_dir.to_owned())
             .env("PATH", PATH_ENV.as_str())
-            .env("HOME", JAVA_HOME_DIR)
+            .env("HOME", &*JAVA_HOME_DIR)
             .env("BASE_INTERNAL_URL", base_internal_url)
             .envs(envs)
             .envs(reserved_variables);
diff --git a/backend/windmill-worker/src/nu_executor.rs b/backend/windmill-worker/src/nu_executor.rs
index a4320a3612..ca309105b5 100644
--- a/backend/windmill-worker/src/nu_executor.rs
+++ b/backend/windmill-worker/src/nu_executor.rs
@@ -16,8 +16,8 @@ use crate::{
         build_command_with_isolation, create_args_and_out_file, get_reserved_variables,
         read_result, start_child_process, OccupancyMetrics, DEV_CONF_NSJAIL,
     },
-    get_proxy_envs_for_lang, handle_child, is_sandboxing_enabled, DISABLE_NUSER, NSJAIL_PATH, PATH_ENV,
-    TRACING_PROXY_CA_CERT_PATH,
+    get_proxy_envs_for_lang, handle_child, is_sandboxing_enabled, DISABLE_NUSER, NSJAIL_PATH,
+    PATH_ENV, TRACING_PROXY_CA_CERT_PATH,
 };
 use windmill_common::client::AuthedClient;
 use windmill_common::scripts::ScriptLang;
@@ -253,7 +253,7 @@ async fn run<'a>(
                 .replace("{NU_PATH}", &NU_PATH)
                 .replace("{SHARED_MOUNT}", &shared_mount)
                 .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string())
-                .replace("{TRACING_PROXY_CA_CERT_PATH}", TRACING_PROXY_CA_CERT_PATH)
+                .replace("{TRACING_PROXY_CA_CERT_PATH}", &*TRACING_PROXY_CA_CERT_PATH)
                 .replace("#{DEV}", DEV_CONF_NSJAIL),
         )?;
         let mut nsjail_cmd = Command::new(NSJAIL_PATH.as_str());
diff --git a/backend/windmill-worker/src/pwsh_executor.rs b/backend/windmill-worker/src/pwsh_executor.rs
index acae81a588..961a49a58a 100644
--- a/backend/windmill-worker/src/pwsh_executor.rs
+++ b/backend/windmill-worker/src/pwsh_executor.rs
@@ -159,7 +159,7 @@ try {
 
 async fn scan_module_directories() -> Result<HashMap<String, String>, Error> {
     let mut module_dirs = HashMap::new();
-    let cache_dir = std::path::Path::new(POWERSHELL_CACHE_DIR);
+    let cache_dir = std::path::Path::new(&*POWERSHELL_CACHE_DIR);
 
     if let Ok(entries) = fs::read_dir(cache_dir) {
         for entry in entries {
@@ -391,7 +391,7 @@ pub async fn handle_powershell_job(
             .join(", ");
 
         let install_string = generate_powershell_install_code()
-            .replace("{path}", POWERSHELL_CACHE_DIR)
+            .replace("{path}", &*POWERSHELL_CACHE_DIR)
             .replace("{job_id}", &job.id.to_string())
             .replace("{has_private_repo}", &format!("${has_private_repo}"))
             .replace("{has_credentials}", &format!("${has_credentials}"))
@@ -442,7 +442,7 @@ $PSModulePathBackup = $env:PSModulePath
 $env:PSModulePath = \"$PSHome/Modules\"
 Get-Module -ListAvailable | Import-Module
 $env:PSModulePath = \"{}:$PSModulePathBackup\"",
-        POWERSHELL_CACHE_DIR
+        *POWERSHELL_CACHE_DIR
     );
 
     #[cfg(windows)]
@@ -452,7 +452,7 @@ $PSModulePathBackup = $env:PSModulePath
 $env:PSModulePath = \"C:\\Program Files\\PowerShell\\7\\Modules\"
 Get-Module -ListAvailable | Import-Module
 $env:PSModulePath = \"{};$PSModulePathBackup\"",
-        POWERSHELL_CACHE_DIR
+        *POWERSHELL_CACHE_DIR
     );
 
     // NOTE: powershell error handling / termination is quite tricky compared to bash
@@ -525,7 +525,7 @@ $env:PSModulePath = \"{};$PSModulePathBackup\"",
                 .replace("{JOB_DIR}", job_dir)
                 .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string())
                 .replace("{SHARED_MOUNT}", shared_mount)
-                .replace("{CACHE_DIR}", POWERSHELL_CACHE_DIR),
+                .replace("{CACHE_DIR}", &*POWERSHELL_CACHE_DIR),
         )?;
         let cmd_args = vec![
             "--config",
diff --git a/backend/windmill-worker/src/python_executor.rs b/backend/windmill-worker/src/python_executor.rs
index 047521a0b4..b289f05380 100644
--- a/backend/windmill-worker/src/python_executor.rs
+++ b/backend/windmill-worker/src/python_executor.rs
@@ -278,7 +278,7 @@ pub async fn uv_pip_compile(
             "requirements.txt",
             // Target to /tmp/windmill/cache/uv
             "--cache-dir",
-            UV_CACHE_DIR,
+            &*UV_CACHE_DIR,
         ];
 
         args.extend(["-p", &py_version_str, "--python-preference", "only-managed"]);
@@ -805,7 +805,7 @@ mount {{
             "run.config.proto",
             &NSJAIL_CONFIG_RUN_PYTHON3_CONTENT
                 .replace("{JOB_DIR}", job_dir)
-                .replace("{PY_INSTALL_DIR}", PY_INSTALL_DIR)
+                .replace("{PY_INSTALL_DIR}", &*PY_INSTALL_DIR)
                 .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string())
                 .replace("{SHARED_MOUNT}", shared_mount)
                 .replace("{SHARED_DEPENDENCIES}", shared_deps.as_str())
@@ -815,7 +815,7 @@ mount {{
                     "{ADDITIONAL_PYTHON_PATHS}",
                     additional_python_paths_folders.as_str(),
                 )
-                .replace("{TRACING_PROXY_CA_CERT_PATH}", TRACING_PROXY_CA_CERT_PATH)
+                .replace("{TRACING_PROXY_CA_CERT_PATH}", &*TRACING_PROXY_CA_CERT_PATH)
                 .replace("#{DEV}", DEV_CONF_NSJAIL),
         )?;
     } else {
@@ -1410,10 +1410,10 @@ async fn spawn_uv_install(
             &nsjail_proto,
             NSJAIL_CONFIG_DOWNLOAD_PY_CONTENT
                 .replace("{WORKER_DIR}", worker_dir)
-                .replace("{PY_INSTALL_DIR}", &PY_INSTALL_DIR)
+                .replace("{PY_INSTALL_DIR}", &*PY_INSTALL_DIR)
                 .replace("{TARGET_DIR}", &venv_p)
                 .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string())
-                .replace("{TRACING_PROXY_CA_CERT_PATH}", TRACING_PROXY_CA_CERT_PATH)
+                .replace("{TRACING_PROXY_CA_CERT_PATH}", &*TRACING_PROXY_CA_CERT_PATH)
                 .replace("#{DEV}", DEV_CONF_NSJAIL)
                 .as_str(),
         )?;
diff --git a/backend/windmill-worker/src/python_versions.rs b/backend/windmill-worker/src/python_versions.rs
index 52636808a6..78b03deb07 100644
--- a/backend/windmill-worker/src/python_versions.rs
+++ b/backend/windmill-worker/src/python_versions.rs
@@ -18,6 +18,8 @@ use windmill_common::{
 use anyhow::{anyhow, bail};
 use windmill_queue::append_logs;
 
+#[cfg(unix)]
+use crate::python_executor::UV_PATH;
 use crate::{
     common::{start_child_process, OccupancyMetrics},
     handle_child::handle_child,
@@ -25,8 +27,6 @@ use crate::{
     HOME_ENV, INSTANCE_PYTHON_VERSION, PATH_ENV, PROXY_ENVS, PY_INSTALL_DIR, UV_CACHE_DIR,
     WIN_ENVS,
 };
-#[cfg(unix)]
-use crate::python_executor::UV_PATH;
 
 impl From<PyV> for PyVAlias {
     fn from(value: PyV) -> Self {
@@ -234,7 +234,8 @@ impl PyV {
     pub(crate) fn to_cache_dir(&self, ignore_patch: bool) -> String {
         use windmill_common::worker::ROOT_CACHE_DIR;
         format!(
-            "{ROOT_CACHE_DIR}{}",
+            "{}{}",
+            *ROOT_CACHE_DIR,
             self.to_cache_dir_top_level(ignore_patch)
         )
     }
@@ -311,7 +312,7 @@ impl PyV {
             Command::new(uv_cmd)
                 .env_clear()
                 .envs(WIN_ENVS.to_vec())
-                .env("UV_CACHE_DIR", UV_CACHE_DIR)
+                .env("UV_CACHE_DIR", &*UV_CACHE_DIR)
                 .args([
                     "python",
                     "list",
@@ -539,8 +540,8 @@ impl PyV {
             ])
             // TODO: Do we need these?
             .envs([
-                ("UV_PYTHON_INSTALL_DIR", PY_INSTALL_DIR),
-                ("UV_CACHE_DIR", UV_CACHE_DIR),
+                ("UV_PYTHON_INSTALL_DIR", &*PY_INSTALL_DIR),
+                ("UV_CACHE_DIR", &*UV_CACHE_DIR),
             ])
             .stdout(Stdio::piped())
             .stderr(Stdio::piped());
@@ -630,11 +631,9 @@ impl PyV {
                 "--system",
                 "--python-preference=only-managed",
             ])
-            .envs([
-                ("UV_PYTHON_INSTALL_DIR", PY_INSTALL_DIR),
-                ("UV_PYTHON_PREFERENCE", "only-managed"),
-                ("UV_CACHE_DIR", UV_CACHE_DIR),
-            ])
+            .env("UV_PYTHON_INSTALL_DIR", &*PY_INSTALL_DIR)
+            .env("UV_PYTHON_PREFERENCE", "only-managed")
+            .env("UV_CACHE_DIR", &*UV_CACHE_DIR)
             // .stdout(Stdio::piped())
             .stderr(Stdio::piped())
             .output()
diff --git a/backend/windmill-worker/src/ruby_executor.rs b/backend/windmill-worker/src/ruby_executor.rs
index 869b58d7de..11031fa481 100644
--- a/backend/windmill-worker/src/ruby_executor.rs
+++ b/backend/windmill-worker/src/ruby_executor.rs
@@ -1,7 +1,6 @@
 use std::{collections::HashMap, process::Stdio};
 
 use anyhow::anyhow;
-use const_format::concatcp;
 use itertools::Itertools;
 use regex::Regex;
 use tokio::{
@@ -122,7 +121,7 @@ pub async fn prepare<'a>(
         .write_all(&wrap(inner_content)?.into_bytes())
         .await?;
 
-    let mini_wm_path = format!("{RUBY_CACHE_DIR}/gems/windmill-internal/windmill");
+    let mini_wm_path = format!("{}/gems/windmill-internal/windmill", *RUBY_CACHE_DIR);
     if !std::fs::metadata(&mini_wm_path).is_ok() {
         fs::create_dir_all(&mini_wm_path).await?;
 
@@ -339,7 +338,7 @@ Your Gemfile syntax will continue to work as-is."
                 &NSJAIL_CONFIG_LOCK_RUBY_CONTENT
                     .replace("{JOB_DIR}", job_dir)
                     .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string())
-                    .replace("{TRACING_PROXY_CA_CERT_PATH}", TRACING_PROXY_CA_CERT_PATH)
+                    .replace("{TRACING_PROXY_CA_CERT_PATH}", &*TRACING_PROXY_CA_CERT_PATH)
                     .replace("#{DEV}", DEV_CONF_NSJAIL), // .replace("{BUILD}", &build_dir),
             )?;
             let mut cmd = Command::new(NSJAIL_PATH.as_str());
@@ -588,7 +587,7 @@ async fn install<'a>(
         // 123...zx-activesupport-8.0.2
         // ^^^^^^^^ hash based on source and type (GEM or GIT)
         let handle = format!("{}-{}-{}", hash, pkg, version);
-        let path = format!("{RUBY_CACHE_DIR}/gems/{}", &handle);
+        let path = format!("{}/gems/{}", *RUBY_CACHE_DIR, &handle);
 
         deps.push(RequiredDependency {
             path,
@@ -632,7 +631,7 @@ async fn install<'a>(
                     &NSJAIL_CONFIG_DOWNLOAD_RUBY_CONTENT
                         .replace("{TARGET}", &dependency.path)
                         .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string())
-                        .replace("{TRACING_PROXY_CA_CERT_PATH}", TRACING_PROXY_CA_CERT_PATH)
+                        .replace("{TRACING_PROXY_CA_CERT_PATH}", &*TRACING_PROXY_CA_CERT_PATH)
                         .replace("#{DEV}", DEV_CONF_NSJAIL), // .replace("{BUILD}", &build_dir),
                 )?;
                 let mut cmd = Command::new(NSJAIL_PATH.as_str());
@@ -741,9 +740,9 @@ async fn install<'a>(
     };
     // Include builtin windmill client
     {
-        const WM_INTERNAL: &str = concatcp!(RUBY_CACHE_DIR, "/gems/windmill-internal");
-        res.top_level_paths.push(WM_INTERNAL.to_owned());
-        res.rubylib += format!(":{WM_INTERNAL}").as_str();
+        let wm_internal = format!("{}/gems/windmill-internal", *RUBY_CACHE_DIR);
+        res.top_level_paths.push(wm_internal.clone());
+        res.rubylib += format!(":{wm_internal}").as_str();
     }
     Ok(res)
 }
@@ -800,7 +799,7 @@ mount {{
                 .replace("{JOB_DIR}", job_dir)
                 .replace("{SHARED_MOUNT}", &shared_mount)
                 .replace("{SHARED_DEPENDENCIES}", &shared_deps)
-                .replace("{TRACING_PROXY_CA_CERT_PATH}", TRACING_PROXY_CA_CERT_PATH)
+                .replace("{TRACING_PROXY_CA_CERT_PATH}", &*TRACING_PROXY_CA_CERT_PATH)
                 .replace("#{DEV}", DEV_CONF_NSJAIL)
                 .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string()),
         )?;
diff --git a/backend/windmill-worker/src/rust_executor.rs b/backend/windmill-worker/src/rust_executor.rs
index 54d90550b0..216c59f2cd 100644
--- a/backend/windmill-worker/src/rust_executor.rs
+++ b/backend/windmill-worker/src/rust_executor.rs
@@ -5,6 +5,7 @@ use std::{collections::HashMap, process::Stdio};
 use uuid::Uuid;
 use windmill_parser_rust::parse_rust_deps_into_manifest;
 
+use crate::global_cache::save_cache;
 use itertools::Itertools;
 use tokio::{
     fs::{create_dir_all, File},
@@ -16,7 +17,6 @@ use windmill_common::{
     utils::calculate_hash,
     worker::{write_file, Connection},
 };
-use crate::global_cache::save_cache;
 use windmill_queue::MiniPulledJob;
 use windmill_queue::{append_logs, CanceledBy};
 
@@ -337,7 +337,7 @@ async fn get_build_dir(
                 if !is_sandboxing_enabled() {
                     // If nsjail is disabled then entire worker has shared build directory
                     // It drastically improves cache hit-rate.
-                    Some((format!("{RUST_CACHE_DIR}/build/{worker_name}"), true))
+                    Some((format!("{}/build/{worker_name}", *RUST_CACHE_DIR), true))
                 } else {
                     // If nsjail is enabled, having global shared directory is vulnerability and target for an attack
                     // Instead we either:
@@ -345,7 +345,8 @@ async fn get_build_dir(
                     // 2. If user is not known or something else goes wrong - use random build dir. This is equivalent to no cache at all.
                     Some((
                         format!(
-                            "{RUST_CACHE_DIR}/build/{}@{}@{}",
+                            "{}/build/{}@{}@{}",
+                            *RUST_CACHE_DIR,
                             &job.workspace_id,
                             p.replace('/', "."),
                             &job.created_by
@@ -355,7 +356,10 @@ async fn get_build_dir(
                 }
             }
         })
-        .unwrap_or((format!("{RUST_CACHE_DIR}/build/{}", Uuid::new_v4()), false));
+        .unwrap_or((
+            format!("{}/build/{}", *RUST_CACHE_DIR, Uuid::new_v4()),
+            false,
+        ));
 
     {
         let (t, r, g) = (
@@ -449,7 +453,7 @@ pub async fn build_rust_crate(
     is_preview: bool,
 ) -> error::Result<String> {
     ensure_rust_runtime_dirs();
-    let bin_path = format!("{}/{hash}", RUST_CACHE_DIR);
+    let bin_path = format!("{}/{hash}", *RUST_CACHE_DIR);
 
     let build_dir = get_build_dir(job, job_dir, conn, worker_name, is_preview).await?;
 
@@ -459,9 +463,9 @@ pub async fn build_rust_crate(
             "download.config.proto",
             &NSJAIL_CONFIG_COMPILE_RUST_CONTENT
                 .replace("{JOB_DIR}", job_dir)
-                .replace("{CACHE_DIR}", RUST_CACHE_DIR)
+                .replace("{CACHE_DIR}", &*RUST_CACHE_DIR)
                 .replace("{CARGO_HOME}", CARGO_HOME.as_str())
-                .replace("{TRACING_PROXY_CA_CERT_PATH}", TRACING_PROXY_CA_CERT_PATH)
+                .replace("{TRACING_PROXY_CA_CERT_PATH}", &*TRACING_PROXY_CA_CERT_PATH)
                 .replace("#{DEV}", DEV_CONF_NSJAIL)
                 .replace("{BUILD}", &build_dir),
         )?;
@@ -605,14 +609,13 @@ pub async fn handle_rust_job(
     check_executor_binary_exists("cargo", CARGO_PATH.as_str(), "rust")?;
 
     let hash = compute_rust_hash(inner_content, requirements_o);
-    let bin_path = format!("{}/{hash}", RUST_CACHE_DIR);
+    let bin_path = format!("{}/{hash}", *RUST_CACHE_DIR);
     let remote_path = format!("{RUST_OBJECT_STORE_PREFIX}{hash}");
 
     let reserved_variables =
         get_reserved_variables(job, &client.token, conn, parent_runnable_path).await?;
 
-    let (cache, cache_logs) =
-        crate::global_cache::load_cache(&bin_path, &remote_path, false).await;
+    let (cache, cache_logs) = crate::global_cache::load_cache(&bin_path, &remote_path, false).await;
 
     let cache_logs = if cache {
         let target = format!("{job_dir}/main");
@@ -669,10 +672,10 @@ pub async fn handle_rust_job(
             "run.config.proto",
             &NSJAIL_CONFIG_RUN_RUST_CONTENT
                 .replace("{JOB_DIR}", job_dir)
-                .replace("{CACHE_DIR}", RUST_CACHE_DIR)
+                .replace("{CACHE_DIR}", &*RUST_CACHE_DIR)
                 .replace("{CACHE_HASH}", &hash)
                 .replace("{CLONE_NEWUSER}", &(!*DISABLE_NUSER).to_string())
-                .replace("{TRACING_PROXY_CA_CERT_PATH}", TRACING_PROXY_CA_CERT_PATH)
+                .replace("{TRACING_PROXY_CA_CERT_PATH}", &*TRACING_PROXY_CA_CERT_PATH)
                 .replace("#{DEV}", DEV_CONF_NSJAIL)
                 .replace("{SHARED_MOUNT}", shared_mount),
         )?;
diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index c354d34ee2..49a1048afd 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -37,7 +37,7 @@ use windmill_common::{
     utils::{create_directory_async, WarnAfterExt},
     worker::{
         make_pull_query, write_file, Connection, HttpClient, MAX_TIMEOUT,
-        MIN_PERIODIC_SCRIPT_INTERVAL_SECONDS, ROOT_CACHE_DIR, ROOT_CACHE_NOMOUNT_DIR, TMP_DIR,
+        MIN_PERIODIC_SCRIPT_INTERVAL_SECONDS, ROOT_CACHE_DIR, ROOT_CACHE_NOMOUNT_DIR, WINDMILL_DIR,
     },
     worker_group_job_stats::JobStatsMap,
     KillpillSender,
@@ -47,7 +47,6 @@ use windmill_common::{
 use windmill_common::ee_oss::LICENSE_KEY_VALID;
 
 use anyhow::Result;
-use const_format::concatcp;
 #[cfg(feature = "prometheus")]
 use prometheus::IntCounter;
 
@@ -196,45 +195,47 @@ use windmill_common::bench::{benchmark_init, benchmark_verify, BenchmarkInfo, Be
 
 use windmill_common::add_time;
 
-pub const PY310_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "python_3_10");
-pub const PY311_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "python_3_11");
-pub const PY312_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "python_3_12");
-pub const PY313_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "python_3_13");
+lazy_static::lazy_static! {
+    pub static ref PY310_CACHE_DIR: String = format!("{}python_3_10", *ROOT_CACHE_DIR);
+    pub static ref PY311_CACHE_DIR: String = format!("{}python_3_11", *ROOT_CACHE_DIR);
+    pub static ref PY312_CACHE_DIR: String = format!("{}python_3_12", *ROOT_CACHE_DIR);
+    pub static ref PY313_CACHE_DIR: String = format!("{}python_3_13", *ROOT_CACHE_DIR);
 
-pub const TAR_JAVA_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "tar/java");
+    pub static ref TAR_JAVA_CACHE_DIR: String = format!("{}tar/java", *ROOT_CACHE_DIR);
 
-pub const UV_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "uv");
-pub const PY_INSTALL_DIR: &str = concatcp!(ROOT_CACHE_DIR, "py_runtime");
-pub const TAR_PYBASE_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "tar");
-pub const DENO_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "deno");
-pub const DENO_CACHE_DIR_DEPS: &str = concatcp!(ROOT_CACHE_DIR, "deno/deps");
-pub const DENO_CACHE_DIR_NPM: &str = concatcp!(ROOT_CACHE_DIR, "deno/npm");
+    pub static ref UV_CACHE_DIR: String = format!("{}uv", *ROOT_CACHE_DIR);
+    pub static ref PY_INSTALL_DIR: String = format!("{}py_runtime", *ROOT_CACHE_DIR);
+    pub static ref TAR_PYBASE_CACHE_DIR: String = format!("{}tar", *ROOT_CACHE_DIR);
+    pub static ref DENO_CACHE_DIR: String = format!("{}deno", *ROOT_CACHE_DIR);
+    pub static ref DENO_CACHE_DIR_DEPS: String = format!("{}deno/deps", *ROOT_CACHE_DIR);
+    pub static ref DENO_CACHE_DIR_NPM: String = format!("{}deno/npm", *ROOT_CACHE_DIR);
 
-pub const GO_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "go");
-pub const RUST_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "rust");
-pub const NU_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "nu");
-pub const CSHARP_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "csharp");
+    pub static ref GO_CACHE_DIR: String = format!("{}go", *ROOT_CACHE_DIR);
+    pub static ref RUST_CACHE_DIR: String = format!("{}rust", *ROOT_CACHE_DIR);
+    pub static ref NU_CACHE_DIR: String = format!("{}nu", *ROOT_CACHE_DIR);
+    pub static ref CSHARP_CACHE_DIR: String = format!("{}csharp", *ROOT_CACHE_DIR);
 
-// Java
-pub const JAVA_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "java");
-pub const COURSIER_CACHE_DIR: &str = concatcp!(JAVA_CACHE_DIR, "/coursier-cache");
-pub const JAVA_REPOSITORY_DIR: &str = concatcp!(JAVA_CACHE_DIR, "/repository");
-pub const JAVA_HOME_DIR: &str = concatcp!(JAVA_CACHE_DIR, "/home");
+    // Java
+    pub static ref JAVA_CACHE_DIR: String = format!("{}java", *ROOT_CACHE_DIR);
+    pub static ref COURSIER_CACHE_DIR: String = format!("{}/coursier-cache", *JAVA_CACHE_DIR);
+    pub static ref JAVA_REPOSITORY_DIR: String = format!("{}/repository", *JAVA_CACHE_DIR);
+    pub static ref JAVA_HOME_DIR: String = format!("{}/home", *JAVA_CACHE_DIR);
 
-// Ruby
-pub const RUBY_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "ruby");
+    // Ruby
+    pub static ref RUBY_CACHE_DIR: String = format!("{}ruby", *ROOT_CACHE_DIR);
 
-// for related places search: ADD_NEW_LANG
-pub const BUN_CACHE_DIR: &str = concatcp!(ROOT_CACHE_NOMOUNT_DIR, "bun");
-pub const BUN_BUNDLE_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "bun");
-pub const BUN_CODEBASE_BUNDLE_CACHE_DIR: &str = concatcp!(ROOT_CACHE_NOMOUNT_DIR, "script_bundle");
+    // for related places search: ADD_NEW_LANG
+    pub static ref BUN_CACHE_DIR: String = format!("{}bun", *ROOT_CACHE_NOMOUNT_DIR);
+    pub static ref BUN_BUNDLE_CACHE_DIR: String = format!("{}bun", *ROOT_CACHE_DIR);
+    pub static ref BUN_CODEBASE_BUNDLE_CACHE_DIR: String = format!("{}script_bundle", *ROOT_CACHE_NOMOUNT_DIR);
 
-pub const GO_BIN_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "gobin");
-pub const POWERSHELL_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "powershell");
-pub const COMPOSER_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "composer");
+    pub static ref GO_BIN_CACHE_DIR: String = format!("{}gobin", *ROOT_CACHE_DIR);
+    pub static ref POWERSHELL_CACHE_DIR: String = format!("{}powershell", *ROOT_CACHE_DIR);
+    pub static ref COMPOSER_CACHE_DIR: String = format!("{}composer", *ROOT_CACHE_DIR);
 
-pub const TRACING_PROXY_CA_CERT_PATH: &str =
-    concatcp!(ROOT_CACHE_NOMOUNT_DIR, "tracing_proxy_ca.pem");
+    pub static ref TRACING_PROXY_CA_CERT_PATH: String =
+        format!("{}tracing_proxy_ca.pem", *ROOT_CACHE_NOMOUNT_DIR);
+}
 
 const NUM_SECS_PING: u64 = 5;
 const NUM_SECS_READINGS: u64 = 60;
@@ -1375,7 +1376,7 @@ pub async fn run_worker(
 
     let start_time = Instant::now();
 
-    let worker_dir = format!("{TMP_DIR}/{worker_name}");
+    let worker_dir = format!("{}/{worker_name}", *WINDMILL_DIR);
     tracing::debug!(worker = %worker_name, hostname = %hostname, worker_dir = %worker_dir, "Creating worker dir");
 
     #[cfg(feature = "python")]
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 41204c956a..cc1417c4b3 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.648.0";
+export const VERSION = "v1.649.0";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/src/main.ts b/cli/src/main.ts
index 38b68bb0f4..b584c540d8 100755
--- a/cli/src/main.ts
+++ b/cli/src/main.ts
@@ -67,7 +67,7 @@ export {
   workspaceAdd,
 };
 
-export const VERSION = "1.648.0";
+export const VERSION = "1.649.0";
 
 // Re-exported from constants.ts to maintain backwards compatibility
 export { WM_FORK_PREFIX } from "./core/constants.ts";
diff --git a/console-bk-leftup.txt b/console-bk-leftup.txt
new file mode 100644
index 0000000000..b526ad9ffc
--- /dev/null
+++ b/console-bk-leftup.txt
@@ -0,0 +1,694 @@
+Total messages: 23 (Errors: 0, Warnings: 1)
+
+[DEBUG] Building graph @ http://localhost:5183/src/lib/components/graph/graphBuilder.svelte.ts?t=1772535251657:65
+[DEBUG] layoutNodes same nodes @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772544066222:516
+[DEBUG] [vite] connecting... @ http://localhost:5183/@vite/client:730
+[DEBUG] [vite] connected. @ http://localhost:5183/@vite/client:832
+[DEBUG] Building graph @ http://localhost:5183/src/lib/components/graph/graphBuilder.svelte.ts?t=1772535251657:65
+[DEBUG] Building graph @ http://localhost:5183/src/lib/components/graph/graphBuilder.svelte.ts?t=1772535251657:65
+[DEBUG] layoutNodes 3 @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772544066222:521
+[LOG] ELK input nodes: [Trigger(trigger) ← [], Input(input2) ← [Trigger], Result(result) ← [Input]] @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772544066222:535
+[LOG] ELK graph: {
+  "id": "root",
+  "layoutOptions": {
+    "elk.algorithm": "layered",
+    "elk.direction": "DOWN",
+    "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+    "elk.spacing.nodeNode": "50",
+    "elk.layered.nodePlacement.strategy": "NETWORK_SIMPLEX",
+    "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP",
+    "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES"
+  },
+  "children": [
+    {
+      "id": "Trigger",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Input",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Result",
+      "width": 275,
+      "height": 34
+    }
+  ],
+  "edges": [
+    {
+      "id": "e-Trigger-Input",
+      "sources": [
+        "Trigger"
+      ],
+      "targets": [
+        "Input"
+      ]
+    },
+    {
+      "id": "e-Input-Result",
+      "sources": [
+        "Input"
+      ],
+      "targets": [
+        "Result"
+      ]
+    }
+  ]
+} @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772544066222:536
+[LOG] cancelling request: {reason: saveAndClear, abortController: undefined} @ http://localhost:5183/src/lib/components/copilot/chat/AIChatManager.svelte.ts?t=1772535251800:1024
+[LOG] loadFlow @ http://localhost:5183/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte?t=1772544066222:100
+[LOG] ELK result: {
+  "id": "root",
+  "layoutOptions": {
+    "elk.algorithm": "layered",
+    "elk.direction": "DOWN",
+    "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+    "elk.spacing.nodeNode": "50",
+    "elk.layered.nodePlacement.strategy": "NETWORK_SIMPLEX",
+    "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP",
+    "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES"
+  },
+  "children": [
+    {
+      "id": "Trigger",
+      "width": 275,
+      "height": 34,
+      "$H": 277,
+      "x": 12,
+      "y": 12
+    },
+    {
+      "id": "Input",
+      "width": 275,
+      "height": 34,
+      "$H": 279,
+      "x": 12,
+      "y": 108
+    },
+    {
+      "id": "Result",
+      "width": 275,
+      "height": 34,
+      "$H": 281,
+      "x": 12,
+      "y": 204
+    }
+  ],
+  "edges": [
+    {
+      "id": "e-Trigger-Input",
+      "sources": [
+        "Trigger"
+      ],
+      "targets": [
+        "Input"
+      ],
+      "sections": [
+        {
+          "id": "e-Trigger-Input_s0",
+          "startPoint": {
+            "x": 150,
+            "y": 46
+          },
+          "endPoint": {
+            "x": 150,
+            "y": 108
+          },
+          "incomingShape": "Trigger",
+          "outgoingShape": "Input"
+        }
+      ],
+      "container": "root"
+    },
+    {
+      "id": "e-Input-Result",
+      "sources": [
+        "Input"
+      ],
+      "targets": [
+        "Result"
+      ],
+      "sections": [
+        {
+          "id": "e-Input-Result_s0",
+          "startPoint": {
+            "x": 150,
+            "y": 142
+          },
+          "endPoint": {
+            "x": 150,
+            "y": 204
+          },
+          "incomingShape": "Input",
+          "outgoingShape": "Result"
+        }
+      ],
+      "container": "root"
+    }
+  ],
+  "$H": 13,
+  "x": 0,
+  "y": 0,
+  "width": 299,
+  "height": 250
+} @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772544066222:540
+[LOG] Welcome back admin to testing @ http://localhost:5183/src/routes/(root)/+layout.svelte?t=1772535251800:68
+[WARNING] using deprecated parameters for the initialization function; pass a single object instead @ http://localhost:5183/node_modules/@sveltejs/kit/src/runtime/client/client.js?v=5452fe86:3211
+[DEBUG] Building graph @ http://localhost:5183/src/lib/components/graph/graphBuilder.svelte.ts?t=1772535251657:65
+[DEBUG] Building graph @ http://localhost:5183/src/lib/components/graph/graphBuilder.svelte.ts?t=1772535251657:65
+[DEBUG] Building graph @ http://localhost:5183/src/lib/components/graph/graphBuilder.svelte.ts?t=1772535251657:65
+[DEBUG] layoutNodes 14 @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772544066222:521
+[LOG] ELK input nodes: [Trigger(trigger) ← [], Input(input2) ← [Trigger], Result(result) ← [a-end], a(module) ← [Input], a-end(branchAllEnd) ← [c,d,g], a-branch-0(branchAllStart) ← [a], b(module) ← [a-branch-0], c(module) ← [b], a-branch-1(branchAllStart) ← [a], d(module) ← [a-branch-1], a-branch-2(branchAllStart) ← [a], e(module) ← [a-branch-2], f(module) ← [e], g(module) ← [f]] @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772544066222:535
+[LOG] ELK graph: {
+  "id": "root",
+  "layoutOptions": {
+    "elk.algorithm": "layered",
+    "elk.direction": "DOWN",
+    "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+    "elk.spacing.nodeNode": "50",
+    "elk.layered.nodePlacement.strategy": "NETWORK_SIMPLEX",
+    "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP",
+    "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES"
+  },
+  "children": [
+    {
+      "id": "Trigger",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Input",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Result",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "a-end",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "a",
+      "layoutOptions": {
+        "elk.algorithm": "layered",
+        "elk.direction": "DOWN",
+        "elk.spacing.nodeNode": "50",
+        "elk.separateConnectedComponents": "false",
+        "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES",
+        "elk.layered.nodePlacement.strategy": "BRANDES_KOEPF",
+        "elk.layered.nodePlacement.bk.fixedAlignment": "LEFTUP"
+      },
+      "children": [
+        {
+          "id": "a-branch-0",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "b",
+              "width": 275,
+              "height": 34
+            },
+            {
+              "id": "c",
+              "width": 275,
+              "height": 34
+            }
+          ],
+          "edges": [
+            {
+              "id": "e-b-c",
+              "sources": [
+                "b"
+              ],
+              "targets": [
+                "c"
+              ]
+            }
+          ]
+        },
+        {
+          "id": "a-branch-1",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "d",
+              "width": 275,
+              "height": 34
+            }
+          ],
+          "edges": []
+        },
+        {
+          "id": "a-branch-2",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "e",
+              "width": 275,
+              "height": 34
+            },
+            {
+              "id": "f",
+              "width": 275,
+              "height": 34
+            },
+            {
+              "id": "g",
+              "width": 275,
+              "height": 34
+            }
+          ],
+          "edges": [
+            {
+              "id": "e-e-f",
+              "sources": [
+                "e"
+              ],
+              "targets": [
+                "f"
+              ]
+            },
+            {
+              "id": "e-f-g",
+              "sources": [
+                "f"
+              ],
+              "targets": [
+                "g"
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "edges": [
+    {
+      "id": "e-Trigger-Input",
+      "sources": [
+        "Trigger"
+      ],
+      "targets": [
+        "Input"
+      ]
+    },
+    {
+      "id": "e-a-end-Result",
+      "sources": [
+        "a-end"
+      ],
+      "targets": [
+        "Result"
+      ]
+    },
+    {
+      "id": "e-Input-a",
+      "sources": [
+        "Input"
+      ],
+      "targets": [
+        "a"
+      ]
+    },
+    {
+      "id": "e-a-a-end",
+      "sources": [
+        "a"
+      ],
+      "targets": [
+        "a-end"
+      ]
+    }
+  ]
+} @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772544066222:536
+[LOG] ELK result: {
+  "id": "root",
+  "layoutOptions": {
+    "elk.algorithm": "layered",
+    "elk.direction": "DOWN",
+    "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+    "elk.spacing.nodeNode": "50",
+    "elk.layered.nodePlacement.strategy": "NETWORK_SIMPLEX",
+    "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP",
+    "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES"
+  },
+  "children": [
+    {
+      "id": "Trigger",
+      "width": 275,
+      "height": 34,
+      "$H": 352,
+      "x": 385,
+      "y": 12
+    },
+    {
+      "id": "Input",
+      "width": 275,
+      "height": 34,
+      "$H": 354,
+      "x": 385,
+      "y": 108
+    },
+    {
+      "id": "Result",
+      "width": 275,
+      "height": 34,
+      "$H": 356,
+      "x": 385,
+      "y": 636
+    },
+    {
+      "id": "a-end",
+      "width": 275,
+      "height": 34,
+      "$H": 358,
+      "x": 385,
+      "y": 540
+    },
+    {
+      "id": "a",
+      "layoutOptions": {
+        "elk.algorithm": "layered",
+        "elk.direction": "DOWN",
+        "elk.spacing.nodeNode": "50",
+        "elk.separateConnectedComponents": "false",
+        "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES",
+        "elk.layered.nodePlacement.strategy": "BRANDES_KOEPF",
+        "elk.layered.nodePlacement.bk.fixedAlignment": "LEFTUP"
+      },
+      "children": [
+        {
+          "id": "a-branch-0",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "b",
+              "width": 275,
+              "height": 34,
+              "$H": 364,
+              "x": 12,
+              "y": 12
+            },
+            {
+              "id": "c",
+              "width": 275,
+              "height": 34,
+              "$H": 366,
+              "x": 12,
+              "y": 108
+            }
+          ],
+          "edges": [
+            {
+              "id": "e-b-c",
+              "sources": [
+                "b"
+              ],
+              "targets": [
+                "c"
+              ],
+              "sections": [
+                {
+                  "id": "e-b-c_s0",
+                  "startPoint": {
+                    "x": 149.5,
+                    "y": 46
+                  },
+                  "endPoint": {
+                    "x": 149.5,
+                    "y": 108
+                  },
+                  "incomingShape": "b",
+                  "outgoingShape": "c"
+                }
+              ],
+              "container": "a-branch-0"
+            }
+          ],
+          "$H": 362,
+          "x": 12,
+          "y": 60,
+          "width": 299,
+          "height": 154
+        },
+        {
+          "id": "a-branch-1",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "d",
+              "width": 275,
+              "height": 34,
+              "$H": 370,
+              "x": 12,
+              "y": 12
+            }
+          ],
+          "edges": [],
+          "$H": 368,
+          "x": 361,
+          "y": 108,
+          "width": 299,
+          "height": 58
+        },
+        {
+          "id": "a-branch-2",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "e",
+              "width": 275,
+              "height": 34,
+              "$H": 374,
+              "x": 12,
+              "y": 12
+            },
+            {
+              "id": "f",
+              "width": 275,
+              "height": 34,
+              "$H": 376,
+              "x": 12,
+              "y": 108
+            },
+            {
+              "id": "g",
+              "width": 275,
+              "height": 34,
+              "$H": 378,
+              "x": 12,
+              "y": 204
+            }
+          ],
+          "edges": [
+            {
+              "id": "e-e-f",
+              "sources": [
+                "e"
+              ],
+              "targets": [
+                "f"
+              ],
+              "sections": [
+                {
+                  "id": "e-e-f_s0",
+                  "startPoint": {
+                    "x": 149.5,
+                    "y": 46
+                  },
+                  "endPoint": {
+                    "x": 149.5,
+                    "y": 108
+                  },
+                  "incomingShape": "e",
+                  "outgoingShape": "f"
+                }
+              ],
+              "container": "a-branch-2"
+            },
+            {
+              "id": "e-f-g",
+              "sources": [
+                "f"
+              ],
+              "targets": [
+                "g"
+              ],
+              "sections": [
+                {
+                  "id": "e-f-g_s0",
+                  "startPoint": {
+                    "x": 149.5,
+                    "y": 142
+                  },
+                  "endPoint": {
+                    "x": 149.5,
+                    "y": 204
+                  },
+                  "incomingShape": "f",
+                  "outgoingShape": "g"
+                }
+              ],
+              "container": "a-branch-2"
+            }
+          ],
+          "$H": 372,
+          "x": 710,
+          "y": 12,
+          "width": 299,
+          "height": 250
+        }
+      ],
+      "$H": 360,
+      "x": 12,
+      "y": 204,
+      "width": 1021,
+      "height": 274
+    }
+  ],
+  "edges": [
+    {
+      "id": "e-Trigger-Input",
+      "sources": [
+        "Trigger"
+      ],
+      "targets": [
+        "Input"
+      ],
+      "sections": [
+        {
+          "id": "e-Trigger-Input_s0",
+          "startPoint": {
+            "x": 523,
+            "y": 46
+          },
+          "endPoint": {
+            "x": 523,
+            "y": 108
+          },
+          "incomingShape": "Trigger",
+          "outgoingShape": "Input"
+        }
+      ],
+      "container": "root"
+    },
+    {
+      "id": "e-a-end-Result",
+      "sources": [
+        "a-end"
+      ],
+      "targets": [
+        "Result"
+      ],
+      "sections": [
+        {
+          "id": "e-a-end-Result_s0",
+          "startPoint": {
+            "x": 523,
+            "y": 574
+          },
+          "endPoint": {
+            "x": 523,
+            "y": 636
+          },
+          "incomingShape": "a-end",
+          "outgoingShape": "Result"
+        }
+      ],
+      "container": "root"
+    },
+    {
+      "id": "e-Input-a",
+      "sources": [
+        "Input"
+      ],
+      "targets": [
+        "a"
+      ],
+      "sections": [
+        {
+          "id": "e-Input-a_s0",
+          "startPoint": {
+            "x": 523,
+            "y": 142
+          },
+          "endPoint": {
+            "x": 523,
+            "y": 204
+          },
+          "incomingShape": "Input",
+          "outgoingShape": "a"
+        }
+      ],
+      "container": "root"
+    },
+    {
+      "id": "e-a-a-end",
+      "sources": [
+        "a"
+      ],
+      "targets": [
+        "a-end"
+      ],
+      "sections": [
+        {
+          "id": "e-a-a-end_s0",
+          "startPoint": {
+            "x": 523,
+            "y": 478
+          },
+          "endPoint": {
+            "x": 523,
+            "y": 540
+          },
+          "incomingShape": "a",
+          "outgoingShape": "a-end"
+        }
+      ],
+      "container": "root"
+    }
+  ],
+  "$H": 350,
+  "x": 0,
+  "y": 0,
+  "width": 1045,
+  "height": 682
+} @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772544066222:540
+[DEBUG] Building graph @ http://localhost:5183/src/lib/components/graph/graphBuilder.svelte.ts?t=1772535251657:65
+[DEBUG] layoutNodes same nodes @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772544066222:516
\ No newline at end of file
diff --git a/console-branchall.txt b/console-branchall.txt
new file mode 100644
index 0000000000..a265fb88e8
--- /dev/null
+++ b/console-branchall.txt
@@ -0,0 +1,425 @@
+Total messages: 36 (Errors: 0, Warnings: 1)
+Returning 22 messages for level "info"
+
+[LOG] ELK input nodes: [Trigger(trigger) ← [], Input(input2) ← [Trigger], Result(result) ← [Input]] @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543608757:531
+[LOG] ELK graph: {
+  "id": "root",
+  "layoutOptions": {
+    "elk.algorithm": "layered",
+    "elk.direction": "DOWN",
+    "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+    "elk.spacing.nodeNode": "50",
+    "elk.layered.nodePlacement.strategy": "NETWORK_SIMPLEX",
+    "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP",
+    "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES"
+  },
+  "children": [
+    {
+      "id": "Trigger",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Input",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Result",
+      "width": 275,
+      "height": 34
+    }
+  ],
+  "edges": [
+    {
+      "id": "e-Trigger-Input",
+      "sources": [
+        "Trigger"
+      ],
+      "targets": [
+        "Input"
+      ]
+    },
+    {
+      "id": "e-Input-Result",
+      "sources": [
+        "Input"
+      ],
+      "targets": [
+        "Result"
+      ]
+    }
+  ]
+} @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543608757:532
+[LOG] cancelling request: {reason: saveAndClear, abortController: undefined} @ http://localhost:5183/src/lib/components/copilot/chat/AIChatManager.svelte.ts?t=1772535251800:1024
+[LOG] loadFlow @ http://localhost:5183/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte?t=1772543608757:100
+[LOG] Welcome back admin to testing @ http://localhost:5183/src/routes/(root)/+layout.svelte?t=1772535251800:68
+[WARNING] using deprecated parameters for the initialization function; pass a single object instead @ http://localhost:5183/node_modules/@sveltejs/kit/src/runtime/client/client.js?v=5452fe86:3211
+[LOG] ELK input nodes: [Trigger(trigger) ← [], Input(input2) ← [Trigger], Result(result) ← [a-end], a(module) ← [Input], a-end(branchAllEnd) ← [c,d,g], a-branch-0(branchAllStart) ← [a], b(module) ← [a-branch-0], c(module) ← [b], a-branch-1(branchAllStart) ← [a], d(module) ← [a-branch-1], a-branch-2(branchAllStart) ← [a], e(module) ← [a-branch-2], f(module) ← [e], g(module) ← [f]] @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543608757:531
+[LOG] ELK graph: {
+  "id": "root",
+  "layoutOptions": {
+    "elk.algorithm": "layered",
+    "elk.direction": "DOWN",
+    "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+    "elk.spacing.nodeNode": "50",
+    "elk.layered.nodePlacement.strategy": "NETWORK_SIMPLEX",
+    "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP",
+    "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES"
+  },
+  "children": [
+    {
+      "id": "Trigger",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Input",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Result",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "a-end",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "a",
+      "layoutOptions": {
+        "elk.algorithm": "layered",
+        "elk.direction": "RIGHT",
+        "elk.spacing.nodeNode": "50"
+      },
+      "children": [
+        {
+          "id": "a-branch-0",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "b",
+              "width": 275,
+              "height": 34
+            },
+            {
+              "id": "c",
+              "width": 275,
+              "height": 34
+            }
+          ],
+          "edges": [
+            {
+              "id": "e-b-c",
+              "sources": [
+                "b"
+              ],
+              "targets": [
+                "c"
+              ]
+            }
+          ]
+        },
+        {
+          "id": "a-branch-1",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "d",
+              "width": 275,
+              "height": 34
+            }
+          ],
+          "edges": []
+        },
+        {
+          "id": "a-branch-2",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "e",
+              "width": 275,
+              "height": 34
+            },
+            {
+              "id": "f",
+              "width": 275,
+              "height": 34
+            },
+            {
+              "id": "g",
+              "width": 275,
+              "height": 34
+            }
+          ],
+          "edges": [
+            {
+              "id": "e-e-f",
+              "sources": [
+                "e"
+              ],
+              "targets": [
+                "f"
+              ]
+            },
+            {
+              "id": "e-f-g",
+              "sources": [
+                "f"
+              ],
+              "targets": [
+                "g"
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "edges": [
+    {
+      "id": "e-Trigger-Input",
+      "sources": [
+        "Trigger"
+      ],
+      "targets": [
+        "Input"
+      ]
+    },
+    {
+      "id": "e-a-end-Result",
+      "sources": [
+        "a-end"
+      ],
+      "targets": [
+        "Result"
+      ]
+    },
+    {
+      "id": "e-Input-a",
+      "sources": [
+        "Input"
+      ],
+      "targets": [
+        "a"
+      ]
+    },
+    {
+      "id": "e-a-a-end",
+      "sources": [
+        "a"
+      ],
+      "targets": [
+        "a-end"
+      ]
+    }
+  ]
+} @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543608757:532
+[LOG] RawScript module b without assets field, parsing @ http://localhost:5183/src/lib/components/flows/FlowAssetsHandler.svelte?t=1772535251800:149
+[LOG] Parsing assets for RawScript module b @ http://localhost:5183/src/lib/components/flows/FlowAssetsHandler.svelte?t=1772535251800:121
+[LOG] RawScript module c without assets field, parsing @ http://localhost:5183/src/lib/components/flows/FlowAssetsHandler.svelte?t=1772535251800:149
+[LOG] Parsing assets for RawScript module c @ http://localhost:5183/src/lib/components/flows/FlowAssetsHandler.svelte?t=1772535251800:121
+[LOG] RawScript module d without assets field, parsing @ http://localhost:5183/src/lib/components/flows/FlowAssetsHandler.svelte?t=1772535251800:149
+[LOG] Parsing assets for RawScript module d @ http://localhost:5183/src/lib/components/flows/FlowAssetsHandler.svelte?t=1772535251800:121
+[LOG] RawScript module e without assets field, parsing @ http://localhost:5183/src/lib/components/flows/FlowAssetsHandler.svelte?t=1772535251800:149
+[LOG] Parsing assets for RawScript module e @ http://localhost:5183/src/lib/components/flows/FlowAssetsHandler.svelte?t=1772535251800:121
+[LOG] RawScript module f without assets field, parsing @ http://localhost:5183/src/lib/components/flows/FlowAssetsHandler.svelte?t=1772535251800:149
+[LOG] Parsing assets for RawScript module f @ http://localhost:5183/src/lib/components/flows/FlowAssetsHandler.svelte?t=1772535251800:121
+[LOG] RawScript module g without assets field, parsing @ http://localhost:5183/src/lib/components/flows/FlowAssetsHandler.svelte?t=1772535251800:149
+[LOG] Parsing assets for RawScript module g @ http://localhost:5183/src/lib/components/flows/FlowAssetsHandler.svelte?t=1772535251800:121
+[LOG] ELK input nodes: [Trigger(trigger) ← [], Input(input2) ← [Trigger], Result(result) ← [a-end], a(module) ← [Input], a-end(branchAllEnd) ← [c,d,g], a-branch-0(branchAllStart) ← [a], b(module) ← [a-branch-0], c(module) ← [b], a-branch-1(branchAllStart) ← [a], d(module) ← [a-branch-1], a-branch-2(branchAllStart) ← [a], e(module) ← [a-branch-2], f(module) ← [e], g(module) ← [f]] @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543608757:531
+[LOG] ELK graph: {
+  "id": "root",
+  "layoutOptions": {
+    "elk.algorithm": "layered",
+    "elk.direction": "DOWN",
+    "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+    "elk.spacing.nodeNode": "50",
+    "elk.layered.nodePlacement.strategy": "NETWORK_SIMPLEX",
+    "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP",
+    "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES"
+  },
+  "children": [
+    {
+      "id": "Trigger",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Input",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Result",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "a-end",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "a",
+      "layoutOptions": {
+        "elk.algorithm": "layered",
+        "elk.direction": "RIGHT",
+        "elk.spacing.nodeNode": "50"
+      },
+      "children": [
+        {
+          "id": "a-branch-0",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "b",
+              "width": 275,
+              "height": 34
+            },
+            {
+              "id": "c",
+              "width": 275,
+              "height": 34
+            }
+          ],
+          "edges": [
+            {
+              "id": "e-b-c",
+              "sources": [
+                "b"
+              ],
+              "targets": [
+                "c"
+              ]
+            }
+          ]
+        },
+        {
+          "id": "a-branch-1",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "d",
+              "width": 275,
+              "height": 34
+            }
+          ],
+          "edges": []
+        },
+        {
+          "id": "a-branch-2",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "e",
+              "width": 275,
+              "height": 34
+            },
+            {
+              "id": "f",
+              "width": 275,
+              "height": 34
+            },
+            {
+              "id": "g",
+              "width": 275,
+              "height": 34
+            }
+          ],
+          "edges": [
+            {
+              "id": "e-e-f",
+              "sources": [
+                "e"
+              ],
+              "targets": [
+                "f"
+              ]
+            },
+            {
+              "id": "e-f-g",
+              "sources": [
+                "f"
+              ],
+              "targets": [
+                "g"
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "edges": [
+    {
+      "id": "e-Trigger-Input",
+      "sources": [
+        "Trigger"
+      ],
+      "targets": [
+        "Input"
+      ]
+    },
+    {
+      "id": "e-a-end-Result",
+      "sources": [
+        "a-end"
+      ],
+      "targets": [
+        "Result"
+      ]
+    },
+    {
+      "id": "e-Input-a",
+      "sources": [
+        "Input"
+      ],
+      "targets": [
+        "a"
+      ]
+    },
+    {
+      "id": "e-a-a-end",
+      "sources": [
+        "a"
+      ],
+      "targets": [
+        "a-end"
+      ]
+    }
+  ]
+} @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543608757:532
\ No newline at end of file
diff --git a/console-output.txt b/console-output.txt
new file mode 100644
index 0000000000..9cac191d43
--- /dev/null
+++ b/console-output.txt
@@ -0,0 +1,149 @@
+Total messages: 15 (Errors: 0, Warnings: 0)
+Returning 6 messages for level "info"
+
+[LOG] ELK input nodes: [Trigger(trigger) ← [], Input(input2) ← [Trigger], Result(result) ← [Input]] @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543608757:531
+[LOG] ELK graph: {
+  "id": "root",
+  "layoutOptions": {
+    "elk.algorithm": "layered",
+    "elk.direction": "DOWN",
+    "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+    "elk.spacing.nodeNode": "50",
+    "elk.layered.nodePlacement.strategy": "NETWORK_SIMPLEX",
+    "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP",
+    "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES"
+  },
+  "children": [
+    {
+      "id": "Trigger",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Input",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Result",
+      "width": 275,
+      "height": 34
+    }
+  ],
+  "edges": [
+    {
+      "id": "e-Trigger-Input",
+      "sources": [
+        "Trigger"
+      ],
+      "targets": [
+        "Input"
+      ]
+    },
+    {
+      "id": "e-Input-Result",
+      "sources": [
+        "Input"
+      ],
+      "targets": [
+        "Result"
+      ]
+    }
+  ]
+} @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543608757:532
+[LOG] cancelling request: {reason: saveAndClear, abortController: undefined} @ http://localhost:5183/src/lib/components/copilot/chat/AIChatManager.svelte.ts?t=1772535251800:1024
+[LOG] loadFlow @ http://localhost:5183/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte?t=1772543608757:100
+[LOG] ELK input nodes: [Trigger(trigger) ← [], Input(input2) ← [Trigger], Result(result) ← [a-end], a(module) ← [Input], a-end(branchOneEnd) ← [a-branch-default], a-branch-default(branchOneStart) ← [a]] @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543608757:531
+[LOG] ELK graph: {
+  "id": "root",
+  "layoutOptions": {
+    "elk.algorithm": "layered",
+    "elk.direction": "DOWN",
+    "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+    "elk.spacing.nodeNode": "50",
+    "elk.layered.nodePlacement.strategy": "NETWORK_SIMPLEX",
+    "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP",
+    "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES"
+  },
+  "children": [
+    {
+      "id": "Trigger",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Input",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Result",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "a-end",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "a",
+      "layoutOptions": {
+        "elk.algorithm": "layered",
+        "elk.direction": "RIGHT",
+        "elk.spacing.nodeNode": "50"
+      },
+      "children": [
+        {
+          "id": "a-branch-default",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [],
+          "edges": []
+        }
+      ]
+    }
+  ],
+  "edges": [
+    {
+      "id": "e-Trigger-Input",
+      "sources": [
+        "Trigger"
+      ],
+      "targets": [
+        "Input"
+      ]
+    },
+    {
+      "id": "e-a-end-Result",
+      "sources": [
+        "a-end"
+      ],
+      "targets": [
+        "Result"
+      ]
+    },
+    {
+      "id": "e-Input-a",
+      "sources": [
+        "Input"
+      ],
+      "targets": [
+        "a"
+      ]
+    },
+    {
+      "id": "e-a-a-end",
+      "sources": [
+        "a"
+      ],
+      "targets": [
+        "a-end"
+      ]
+    }
+  ]
+} @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543608757:532
\ No newline at end of file
diff --git a/console-result.txt b/console-result.txt
new file mode 100644
index 0000000000..f3476393ff
--- /dev/null
+++ b/console-result.txt
@@ -0,0 +1,674 @@
+Total messages: 21 (Errors: 0, Warnings: 1)
+Returning 10 messages for level "info"
+
+[LOG] ELK input nodes: [Trigger(trigger) ← [], Input(input2) ← [Trigger], Result(result) ← [Input]] @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543797839:531
+[LOG] ELK graph: {
+  "id": "root",
+  "layoutOptions": {
+    "elk.algorithm": "layered",
+    "elk.direction": "DOWN",
+    "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+    "elk.spacing.nodeNode": "50",
+    "elk.layered.nodePlacement.strategy": "NETWORK_SIMPLEX",
+    "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP",
+    "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES"
+  },
+  "children": [
+    {
+      "id": "Trigger",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Input",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Result",
+      "width": 275,
+      "height": 34
+    }
+  ],
+  "edges": [
+    {
+      "id": "e-Trigger-Input",
+      "sources": [
+        "Trigger"
+      ],
+      "targets": [
+        "Input"
+      ]
+    },
+    {
+      "id": "e-Input-Result",
+      "sources": [
+        "Input"
+      ],
+      "targets": [
+        "Result"
+      ]
+    }
+  ]
+} @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543797839:532
+[LOG] cancelling request: {reason: saveAndClear, abortController: undefined} @ http://localhost:5183/src/lib/components/copilot/chat/AIChatManager.svelte.ts?t=1772535251800:1024
+[LOG] loadFlow @ http://localhost:5183/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte?t=1772543797839:100
+[LOG] Welcome back admin to testing @ http://localhost:5183/src/routes/(root)/+layout.svelte?t=1772535251800:68
+[LOG] ELK result: {
+  "id": "root",
+  "layoutOptions": {
+    "elk.algorithm": "layered",
+    "elk.direction": "DOWN",
+    "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+    "elk.spacing.nodeNode": "50",
+    "elk.layered.nodePlacement.strategy": "NETWORK_SIMPLEX",
+    "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP",
+    "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES"
+  },
+  "children": [
+    {
+      "id": "Trigger",
+      "width": 275,
+      "height": 34,
+      "$H": 277,
+      "x": 12,
+      "y": 12
+    },
+    {
+      "id": "Input",
+      "width": 275,
+      "height": 34,
+      "$H": 279,
+      "x": 12,
+      "y": 108
+    },
+    {
+      "id": "Result",
+      "width": 275,
+      "height": 34,
+      "$H": 281,
+      "x": 12,
+      "y": 204
+    }
+  ],
+  "edges": [
+    {
+      "id": "e-Trigger-Input",
+      "sources": [
+        "Trigger"
+      ],
+      "targets": [
+        "Input"
+      ],
+      "sections": [
+        {
+          "id": "e-Trigger-Input_s0",
+          "startPoint": {
+            "x": 150,
+            "y": 46
+          },
+          "endPoint": {
+            "x": 150,
+            "y": 108
+          },
+          "incomingShape": "Trigger",
+          "outgoingShape": "Input"
+        }
+      ],
+      "container": "root"
+    },
+    {
+      "id": "e-Input-Result",
+      "sources": [
+        "Input"
+      ],
+      "targets": [
+        "Result"
+      ],
+      "sections": [
+        {
+          "id": "e-Input-Result_s0",
+          "startPoint": {
+            "x": 150,
+            "y": 142
+          },
+          "endPoint": {
+            "x": 150,
+            "y": 204
+          },
+          "incomingShape": "Input",
+          "outgoingShape": "Result"
+        }
+      ],
+      "container": "root"
+    }
+  ],
+  "$H": 13,
+  "x": 0,
+  "y": 0,
+  "width": 299,
+  "height": 250
+} @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543797839:536
+[WARNING] using deprecated parameters for the initialization function; pass a single object instead @ http://localhost:5183/node_modules/@sveltejs/kit/src/runtime/client/client.js?v=5452fe86:3211
+[LOG] ELK input nodes: [Trigger(trigger) ← [], Input(input2) ← [Trigger], Result(result) ← [a-end], a(module) ← [Input], a-end(branchAllEnd) ← [c,d,g], a-branch-0(branchAllStart) ← [a], b(module) ← [a-branch-0], c(module) ← [b], a-branch-1(branchAllStart) ← [a], d(module) ← [a-branch-1], a-branch-2(branchAllStart) ← [a], e(module) ← [a-branch-2], f(module) ← [e], g(module) ← [f]] @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543797839:531
+[LOG] ELK graph: {
+  "id": "root",
+  "layoutOptions": {
+    "elk.algorithm": "layered",
+    "elk.direction": "DOWN",
+    "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+    "elk.spacing.nodeNode": "50",
+    "elk.layered.nodePlacement.strategy": "NETWORK_SIMPLEX",
+    "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP",
+    "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES"
+  },
+  "children": [
+    {
+      "id": "Trigger",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Input",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "Result",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "a-end",
+      "width": 275,
+      "height": 34
+    },
+    {
+      "id": "a",
+      "layoutOptions": {
+        "elk.algorithm": "layered",
+        "elk.direction": "DOWN",
+        "elk.spacing.nodeNode": "50"
+      },
+      "children": [
+        {
+          "id": "a-branch-0",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "b",
+              "width": 275,
+              "height": 34
+            },
+            {
+              "id": "c",
+              "width": 275,
+              "height": 34
+            }
+          ],
+          "edges": [
+            {
+              "id": "e-b-c",
+              "sources": [
+                "b"
+              ],
+              "targets": [
+                "c"
+              ]
+            }
+          ]
+        },
+        {
+          "id": "a-branch-1",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "d",
+              "width": 275,
+              "height": 34
+            }
+          ],
+          "edges": []
+        },
+        {
+          "id": "a-branch-2",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "e",
+              "width": 275,
+              "height": 34
+            },
+            {
+              "id": "f",
+              "width": 275,
+              "height": 34
+            },
+            {
+              "id": "g",
+              "width": 275,
+              "height": 34
+            }
+          ],
+          "edges": [
+            {
+              "id": "e-e-f",
+              "sources": [
+                "e"
+              ],
+              "targets": [
+                "f"
+              ]
+            },
+            {
+              "id": "e-f-g",
+              "sources": [
+                "f"
+              ],
+              "targets": [
+                "g"
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "edges": [
+    {
+      "id": "e-Trigger-Input",
+      "sources": [
+        "Trigger"
+      ],
+      "targets": [
+        "Input"
+      ]
+    },
+    {
+      "id": "e-a-end-Result",
+      "sources": [
+        "a-end"
+      ],
+      "targets": [
+        "Result"
+      ]
+    },
+    {
+      "id": "e-Input-a",
+      "sources": [
+        "Input"
+      ],
+      "targets": [
+        "a"
+      ]
+    },
+    {
+      "id": "e-a-a-end",
+      "sources": [
+        "a"
+      ],
+      "targets": [
+        "a-end"
+      ]
+    }
+  ]
+} @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543797839:532
+[LOG] ELK result: {
+  "id": "root",
+  "layoutOptions": {
+    "elk.algorithm": "layered",
+    "elk.direction": "DOWN",
+    "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+    "elk.spacing.nodeNode": "50",
+    "elk.layered.nodePlacement.strategy": "NETWORK_SIMPLEX",
+    "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP",
+    "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES"
+  },
+  "children": [
+    {
+      "id": "Trigger",
+      "width": 275,
+      "height": 34,
+      "$H": 352,
+      "x": 36,
+      "y": 12
+    },
+    {
+      "id": "Input",
+      "width": 275,
+      "height": 34,
+      "$H": 354,
+      "x": 36,
+      "y": 108
+    },
+    {
+      "id": "Result",
+      "width": 275,
+      "height": 34,
+      "$H": 356,
+      "x": 36,
+      "y": 888
+    },
+    {
+      "id": "a-end",
+      "width": 275,
+      "height": 34,
+      "$H": 358,
+      "x": 36,
+      "y": 792
+    },
+    {
+      "id": "a",
+      "layoutOptions": {
+        "elk.algorithm": "layered",
+        "elk.direction": "DOWN",
+        "elk.spacing.nodeNode": "50"
+      },
+      "children": [
+        {
+          "id": "a-branch-0",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "b",
+              "width": 275,
+              "height": 34,
+              "$H": 364,
+              "x": 12,
+              "y": 12
+            },
+            {
+              "id": "c",
+              "width": 275,
+              "height": 34,
+              "$H": 366,
+              "x": 12,
+              "y": 108
+            }
+          ],
+          "edges": [
+            {
+              "id": "e-b-c",
+              "sources": [
+                "b"
+              ],
+              "targets": [
+                "c"
+              ],
+              "sections": [
+                {
+                  "id": "e-b-c_s0",
+                  "startPoint": {
+                    "x": 149.5,
+                    "y": 46
+                  },
+                  "endPoint": {
+                    "x": 149.5,
+                    "y": 108
+                  },
+                  "incomingShape": "b",
+                  "outgoingShape": "c"
+                }
+              ],
+              "container": "a-branch-0"
+            }
+          ],
+          "$H": 362,
+          "x": 12,
+          "y": 90,
+          "width": 299,
+          "height": 154
+        },
+        {
+          "id": "a-branch-1",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "d",
+              "width": 275,
+              "height": 34,
+              "$H": 370,
+              "x": 12,
+              "y": 12
+            }
+          ],
+          "edges": [],
+          "$H": 368,
+          "x": 12,
+          "y": 12,
+          "width": 299,
+          "height": 58
+        },
+        {
+          "id": "a-branch-2",
+          "layoutOptions": {
+            "elk.algorithm": "layered",
+            "elk.direction": "DOWN",
+            "elk.layered.spacing.nodeNodeBetweenLayers": "62",
+            "elk.spacing.nodeNode": "50"
+          },
+          "children": [
+            {
+              "id": "e",
+              "width": 275,
+              "height": 34,
+              "$H": 374,
+              "x": 12,
+              "y": 12
+            },
+            {
+              "id": "f",
+              "width": 275,
+              "height": 34,
+              "$H": 376,
+              "x": 12,
+              "y": 108
+            },
+            {
+              "id": "g",
+              "width": 275,
+              "height": 34,
+              "$H": 378,
+              "x": 12,
+              "y": 204
+            }
+          ],
+          "edges": [
+            {
+              "id": "e-e-f",
+              "sources": [
+                "e"
+              ],
+              "targets": [
+                "f"
+              ],
+              "sections": [
+                {
+                  "id": "e-e-f_s0",
+                  "startPoint": {
+                    "x": 149.5,
+                    "y": 46
+                  },
+                  "endPoint": {
+                    "x": 149.5,
+                    "y": 108
+                  },
+                  "incomingShape": "e",
+                  "outgoingShape": "f"
+                }
+              ],
+              "container": "a-branch-2"
+            },
+            {
+              "id": "e-f-g",
+              "sources": [
+                "f"
+              ],
+              "targets": [
+                "g"
+              ],
+              "sections": [
+                {
+                  "id": "e-f-g_s0",
+                  "startPoint": {
+                    "x": 149.5,
+                    "y": 142
+                  },
+                  "endPoint": {
+                    "x": 149.5,
+                    "y": 204
+                  },
+                  "incomingShape": "f",
+                  "outgoingShape": "g"
+                }
+              ],
+              "container": "a-branch-2"
+            }
+          ],
+          "$H": 372,
+          "x": 12,
+          "y": 264,
+          "width": 299,
+          "height": 250
+        }
+      ],
+      "$H": 360,
+      "x": 12,
+      "y": 204,
+      "width": 323,
+      "height": 526
+    }
+  ],
+  "edges": [
+    {
+      "id": "e-Trigger-Input",
+      "sources": [
+        "Trigger"
+      ],
+      "targets": [
+        "Input"
+      ],
+      "sections": [
+        {
+          "id": "e-Trigger-Input_s0",
+          "startPoint": {
+            "x": 174,
+            "y": 46
+          },
+          "endPoint": {
+            "x": 174,
+            "y": 108
+          },
+          "incomingShape": "Trigger",
+          "outgoingShape": "Input"
+        }
+      ],
+      "container": "root"
+    },
+    {
+      "id": "e-a-end-Result",
+      "sources": [
+        "a-end"
+      ],
+      "targets": [
+        "Result"
+      ],
+      "sections": [
+        {
+          "id": "e-a-end-Result_s0",
+          "startPoint": {
+            "x": 174,
+            "y": 826
+          },
+          "endPoint": {
+            "x": 174,
+            "y": 888
+          },
+          "incomingShape": "a-end",
+          "outgoingShape": "Result"
+        }
+      ],
+      "container": "root"
+    },
+    {
+      "id": "e-Input-a",
+      "sources": [
+        "Input"
+      ],
+      "targets": [
+        "a"
+      ],
+      "sections": [
+        {
+          "id": "e-Input-a_s0",
+          "startPoint": {
+            "x": 174,
+            "y": 142
+          },
+          "endPoint": {
+            "x": 174,
+            "y": 204
+          },
+          "incomingShape": "Input",
+          "outgoingShape": "a"
+        }
+      ],
+      "container": "root"
+    },
+    {
+      "id": "e-a-a-end",
+      "sources": [
+        "a"
+      ],
+      "targets": [
+        "a-end"
+      ],
+      "sections": [
+        {
+          "id": "e-a-a-end_s0",
+          "startPoint": {
+            "x": 174,
+            "y": 730
+          },
+          "endPoint": {
+            "x": 174,
+            "y": 792
+          },
+          "incomingShape": "a",
+          "outgoingShape": "a-end"
+        }
+      ],
+      "container": "root"
+    }
+  ],
+  "$H": 350,
+  "x": 0,
+  "y": 0,
+  "width": 347,
+  "height": 934
+} @ http://localhost:5183/src/lib/components/graph/FlowGraphV2.svelte?t=1772543797839:536
\ No newline at end of file
diff --git a/flow-layout-after-fix.png b/flow-layout-after-fix.png
new file mode 100644
index 0000000000..27a560905a
Binary files /dev/null and b/flow-layout-after-fix.png differ
diff --git a/flow-layout-bk-leftup.png b/flow-layout-bk-leftup.png
new file mode 100644
index 0000000000..a669cbe467
Binary files /dev/null and b/flow-layout-bk-leftup.png differ
diff --git a/flow-layout-branch-all-regression.png b/flow-layout-branch-all-regression.png
new file mode 100644
index 0000000000..e05f863db3
Binary files /dev/null and b/flow-layout-branch-all-regression.png differ
diff --git a/flow-layout-branchall-3branches.png b/flow-layout-branchall-3branches.png
new file mode 100644
index 0000000000..b6cc9defe0
Binary files /dev/null and b/flow-layout-branchall-3branches.png differ
diff --git a/flow-layout-branchall-direction-down.png b/flow-layout-branchall-direction-down.png
new file mode 100644
index 0000000000..0a6e24cf7a
Binary files /dev/null and b/flow-layout-branchall-direction-down.png differ
diff --git a/flow-layout-branchone.png b/flow-layout-branchone.png
new file mode 100644
index 0000000000..cfd6d0dd7f
Binary files /dev/null and b/flow-layout-branchone.png differ
diff --git a/flow-layout-final.png b/flow-layout-final.png
new file mode 100644
index 0000000000..6b9b7c23d4
Binary files /dev/null and b/flow-layout-final.png differ
diff --git a/flow-layout-fitview-topalign.png b/flow-layout-fitview-topalign.png
new file mode 100644
index 0000000000..0e1741e41d
Binary files /dev/null and b/flow-layout-fitview-topalign.png differ
diff --git a/flow-layout-fitview.png b/flow-layout-fitview.png
new file mode 100644
index 0000000000..86bec17f1a
Binary files /dev/null and b/flow-layout-fitview.png differ
diff --git a/flow-layout-fix-v3-fitview.png b/flow-layout-fix-v3-fitview.png
new file mode 100644
index 0000000000..a24241ce80
Binary files /dev/null and b/flow-layout-fix-v3-fitview.png differ
diff --git a/flow-layout-fix-v3.png b/flow-layout-fix-v3.png
new file mode 100644
index 0000000000..853bf4b4c1
Binary files /dev/null and b/flow-layout-fix-v3.png differ
diff --git a/flow-layout-group-compounds.png b/flow-layout-group-compounds.png
new file mode 100644
index 0000000000..f39e458b1a
Binary files /dev/null and b/flow-layout-group-compounds.png differ
diff --git a/flow-layout-hierarchical-v1.png b/flow-layout-hierarchical-v1.png
new file mode 100644
index 0000000000..5d08bd4a1e
Binary files /dev/null and b/flow-layout-hierarchical-v1.png differ
diff --git a/flow-layout-modelorder.png b/flow-layout-modelorder.png
new file mode 100644
index 0000000000..a669cbe467
Binary files /dev/null and b/flow-layout-modelorder.png differ
diff --git a/flow-layout-nodewidths-fitview.png b/flow-layout-nodewidths-fitview.png
new file mode 100644
index 0000000000..b0bf6cdf0d
Binary files /dev/null and b/flow-layout-nodewidths-fitview.png differ
diff --git a/flow-layout-nodewidths-fix.png b/flow-layout-nodewidths-fix.png
new file mode 100644
index 0000000000..aa54414597
Binary files /dev/null and b/flow-layout-nodewidths-fix.png differ
diff --git a/flow-layout-restored.png b/flow-layout-restored.png
new file mode 100644
index 0000000000..2f6dee18af
Binary files /dev/null and b/flow-layout-restored.png differ
diff --git a/flow-layout-separateCC.png b/flow-layout-separateCC.png
new file mode 100644
index 0000000000..184ace8b52
Binary files /dev/null and b/flow-layout-separateCC.png differ
diff --git a/flow-layout-swim-padding.png b/flow-layout-swim-padding.png
new file mode 100644
index 0000000000..db4ace0e07
Binary files /dev/null and b/flow-layout-swim-padding.png differ
diff --git a/flow-layout-topalign.png b/flow-layout-topalign.png
new file mode 100644
index 0000000000..5ba8241404
Binary files /dev/null and b/flow-layout-topalign.png differ
diff --git a/flow-layout-with-postprocess-v2.png b/flow-layout-with-postprocess-v2.png
new file mode 100644
index 0000000000..981ca3f4dd
Binary files /dev/null and b/flow-layout-with-postprocess-v2.png differ
diff --git a/flow-layout-with-postprocess.png b/flow-layout-with-postprocess.png
new file mode 100644
index 0000000000..55b8171542
Binary files /dev/null and b/flow-layout-with-postprocess.png differ
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 520148b1d6..c24e48e02d 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.648.0",
+	"version": "1.649.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.648.0",
+			"version": "1.649.0",
 			"hasInstallScript": true,
 			"license": "AGPL-3.0",
 			"dependencies": {
diff --git a/frontend/package.json b/frontend/package.json
index 9232f07db8..d6c6554459 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.648.0",
+	"version": "1.649.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/frontend/src/lib/components/DBManagerDrawer.svelte b/frontend/src/lib/components/DBManagerDrawer.svelte
index c5986e18a4..5996d98075 100644
--- a/frontend/src/lib/components/DBManagerDrawer.svelte
+++ b/frontend/src/lib/components/DBManagerDrawer.svelte
@@ -6,27 +6,20 @@
 	import DrawerContent from './common/drawer/DrawerContent.svelte'
 	import Select from './select/Select.svelte'
 	import { ArrowLeft, Expand, LoaderCircle, Minimize, RefreshCcw } from 'lucide-svelte'
-	import type { DbInput } from './dbTypes'
 	import DBManagerContent from './DBManagerContent.svelte'
 	import { resource } from 'runed'
+	import { untrack } from 'svelte'
+	import type { DbManagerUriState } from './dbManagerDrawerModel.svelte'
 
 	interface Props {
+		uriState: DbManagerUriState
 		/** Z-index offset for the drawer, useful when opening from within modals */
 		offset?: number
 	}
 
-	let { offset = 0 }: Props = $props()
+	let { uriState, offset = 0 }: Props = $props()
 
-	let input: DbInput | undefined = $state()
-	let open = $derived(!!input)
-
-	// For datatable inputs, track the selected datatable separately
-	let selectedDatatable = $state<string | undefined>(undefined)
-
-	// Check if input is a datatable type
-	const isDatatableInput = $derived(
-		input?.type === 'database' && input.resourcePath.startsWith('datatable://')
-	)
+	let open = $derived(uriState.open)
 
 	// Load available datatables when drawer opens with datatable input
 	const datatables = resource<string[]>([], async () => {
@@ -39,16 +32,6 @@
 		}
 	})
 
-	// Computed input that updates when selectedDatatable changes
-	const effectiveInput: DbInput | undefined = $derived.by(() => {
-		if (!input) return undefined
-		if (!isDatatableInput || !selectedDatatable) return input
-		return {
-			...input,
-			resourcePath: `datatable://${selectedDatatable}`
-		}
-	})
-
 	const datatableItems = $derived(
 		datatables.current.map((dt) => ({
 			value: dt,
@@ -56,32 +39,26 @@
 		}))
 	)
 
-	export function openDrawer(nInput: DbInput) {
-		input = nInput
-		if (isDatatableInput) {
-			datatables.refetch()
+	// Refetch datatables when switching to a datatable input
+	$effect(() => {
+		if (uriState.isDatatableInput) {
+			untrack(() => datatables.refetch())
 		}
-		// If it's a datatable input, extract the datatable name for the selector
-		if (nInput.type === 'database' && nInput.resourcePath.startsWith('datatable://')) {
-			selectedDatatable = nInput.resourcePath.replace('datatable://', '')
-			datatables.refetch()
-		} else {
-			selectedDatatable = undefined
-		}
-	}
-	export function closeDrawer() {
-		input = undefined
-		selectedDatatable = undefined
+	})
+
+	function handleClose() {
+		uriState.closeDrawer()
 		dbManagerContent?.clearReplResult()
-		if (window.location.hash.startsWith('#dbmanager:'))
-			history.replaceState('', document.title, window.location.href.replace(/#dbmanager:.*$/, ''))
 	}
 
 	let windowWidth = $state(window.innerWidth)
 	let expand = $state(false)
 
 	$effect(() => {
-		if (!open) expand = false
+		if (!open) {
+			expand = false
+			uriState.closeDrawer()
+		}
 	})
 
 	let dbManagerContent: DBManagerContent | undefined = $state()
@@ -96,7 +73,7 @@
 	size={expand ? `${windowWidth}px` : '1200px'}
 	preventEscape
 	{offset}
-	on:close={closeDrawer}
+	on:close={handleClose}
 >
 	<DrawerContent
 		title={hasReplResult ? 'Query Result' : 'Database Manager'}
@@ -104,18 +81,24 @@
 			if (hasReplResult) {
 				dbManagerContent?.clearReplResult()
 			} else {
-				closeDrawer()
+				handleClose()
 			}
 		}}
 		CloseIcon={hasReplResult ? ArrowLeft : undefined}
 		noPadding
 		id="db-manager-drawer"
 	>
-		{#if effectiveInput && $workspaceStore}
-			{#key selectedDatatable}
-				<DBManagerContent bind:this={dbManagerContent} input={effectiveInput} bind:hasReplResult>
+		{#if uriState.effectiveInput && $workspaceStore}
+			{#key uriState.selectedDatatable}
+				<DBManagerContent
+					bind:this={dbManagerContent}
+					input={uriState.effectiveInput}
+					bind:hasReplResult
+					bind:selectedSchemaKey={uriState.selectedSchema}
+					bind:selectedTableKey={uriState.selectedTable}
+				>
 					{#snippet dbSelector()}
-						{#if isDatatableInput}
+						{#if uriState.isDatatableInput}
 							{#if datatables.loading}
 								<div class="flex items-center gap-2 text-tertiary ml-2">
 									<LoaderCircle size={14} class="animate-spin" />
@@ -125,7 +108,7 @@
 								<Select
 									transformInputSelectedText={(s) => `Datatable: ${s}`}
 									items={datatableItems}
-									bind:value={selectedDatatable}
+									bind:value={uriState.selectedDatatable}
 									placeholder="Select data table"
 									size="md"
 								/>
diff --git a/frontend/src/lib/components/DatatablePicker.svelte b/frontend/src/lib/components/DatatablePicker.svelte
index 68cdccea63..e533e63f93 100644
--- a/frontend/src/lib/components/DatatablePicker.svelte
+++ b/frontend/src/lib/components/DatatablePicker.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { WorkspaceService } from '$lib/gen'
-	import { globalDbManagerDrawer, workspaceStore } from '$lib/stores'
+	import { workspaceStore } from '$lib/stores'
 
 	import Select from './select/Select.svelte'
 	import ExploreAssetButton, { assetCanBeExplored } from './ExploreAssetButton.svelte'
@@ -31,7 +31,7 @@
 	let datatables = usePromise(() =>
 		WorkspaceService.listDataTables({ workspace: $workspaceStore ?? '' })
 	)
-	let dbManagerDrawer = $derived(globalDbManagerDrawer.val)
+
 </script>
 
 <div class={className}>
@@ -49,7 +49,6 @@
 		<ExploreAssetButton
 			class="mt-1 w-fit"
 			asset={{ kind: 'datatable', path: value }}
-			{dbManagerDrawer}
 		/>
 	{/if}
 </div>
diff --git a/frontend/src/lib/components/DropdownV2Inner.svelte b/frontend/src/lib/components/DropdownV2Inner.svelte
index 21157bd6b2..b56a5cce70 100644
--- a/frontend/src/lib/components/DropdownV2Inner.svelte
+++ b/frontend/src/lib/components/DropdownV2Inner.svelte
@@ -62,6 +62,9 @@
 						{item.displayName}
 					</p>
 					{@render item.extra?.()}
+					{#if item.shortcut}
+						<span class="ml-auto pl-4 text-2xs text-secondary shrink-0">{item.shortcut}</span>
+					{/if}
 					{#if item.tooltip}
 						<Tooltip>
 							{#snippet text()}
diff --git a/frontend/src/lib/components/DucklakePicker.svelte b/frontend/src/lib/components/DucklakePicker.svelte
index 9260c99bf9..e84ddb9060 100644
--- a/frontend/src/lib/components/DucklakePicker.svelte
+++ b/frontend/src/lib/components/DucklakePicker.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { WorkspaceService } from '$lib/gen'
-	import { globalDbManagerDrawer, workspaceStore } from '$lib/stores'
+	import { workspaceStore } from '$lib/stores'
 
 	import Select from './select/Select.svelte'
 	import ExploreAssetButton, { assetCanBeExplored } from './ExploreAssetButton.svelte'
@@ -31,7 +31,7 @@
 	let ducklakes = usePromise(() =>
 		WorkspaceService.listDucklakes({ workspace: $workspaceStore ?? '' })
 	)
-	let dbManagerDrawer = $derived(globalDbManagerDrawer.val)
+
 </script>
 
 <div class={className}>
@@ -49,7 +49,6 @@
 		<ExploreAssetButton
 			class="mt-1 w-fit"
 			asset={{ kind: 'ducklake', path: value }}
-			{dbManagerDrawer}
 		/>
 	{/if}
 </div>
diff --git a/frontend/src/lib/components/ExploreAssetButton.svelte b/frontend/src/lib/components/ExploreAssetButton.svelte
index ba623b4e4e..6cba9a0515 100644
--- a/frontend/src/lib/components/ExploreAssetButton.svelte
+++ b/frontend/src/lib/components/ExploreAssetButton.svelte
@@ -16,9 +16,8 @@
 	import { isDbType } from '$lib/components/dbTypes'
 	import { formatAsset, type Asset } from '$lib/components/assets/lib'
 	import { Button, ButtonType } from '$lib/components/common'
-	import DbManagerDrawer from '$lib/components/DBManagerDrawer.svelte'
 	import S3FilePicker from '$lib/components/S3FilePicker.svelte'
-	import { userStore } from '$lib/stores'
+	import { globalDbManagerDrawer, userStore } from '$lib/stores'
 	import { isS3Uri } from '$lib/utils'
 	import { Database, File } from 'lucide-svelte'
 	import DucklakeIcon from './icons/DucklakeIcon.svelte'
@@ -27,7 +26,6 @@
 		asset,
 		_resourceMetadata,
 		s3FilePicker,
-		dbManagerDrawer,
 		onClick,
 		class: className = '',
 		noText = false,
@@ -38,7 +36,6 @@
 		asset: Asset
 		_resourceMetadata?: { resource_type?: string }
 		s3FilePicker?: S3FilePicker
-		dbManagerDrawer?: DbManagerDrawer
 		onClick?: () => void
 		class?: string
 		noText?: boolean
@@ -46,6 +43,8 @@
 		btnClasses?: string
 		disabled?: boolean
 	} = $props()
+
+	let dbManagerDrawer = $derived(globalDbManagerDrawer.val)
 	const assetUri = $derived(formatAsset(asset))
 </script>
 
diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index 8ec0acbdf1..d3187c43aa 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -862,14 +862,6 @@
 
 	const mod = isMac() ? '⌘' : 'Ctrl+'
 
-	const undoShortcutSnippet = createRawSnippet(() => ({
-		render: () => `<span class="ml-auto text-2xs text-tertiary">${mod}Z</span>`
-	}))
-
-	const redoShortcutSnippet = createRawSnippet(() => ({
-		render: () => `<span class="ml-auto text-2xs text-tertiary">${mod}⇧Z</span>`
-	}))
-
 	function getMoreItems(): Item[] {
 		return [
 			...baseMenuItems,
@@ -878,7 +870,7 @@
 				icon: Undo,
 				action: () => handleUndo(),
 				disabled: $history.index === 0,
-				extra: undoShortcutSnippet,
+				shortcut: `${mod}Z`,
 				separatorTop: baseMenuItems.length > 0
 			},
 			{
@@ -886,7 +878,7 @@
 				icon: Redo,
 				action: () => handleRedo(),
 				disabled: $history.index === $history.history.length - 1,
-				extra: redoShortcutSnippet
+				shortcut: `${mod}⇧Z`
 			},
 			{
 				displayName: 'Tutorials',
diff --git a/frontend/src/lib/components/ResourcePicker.svelte b/frontend/src/lib/components/ResourcePicker.svelte
index 062e39804b..6806e60d3c 100644
--- a/frontend/src/lib/components/ResourcePicker.svelte
+++ b/frontend/src/lib/components/ResourcePicker.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { ResourceService, WorkspaceService } from '$lib/gen'
-	import { globalDbManagerDrawer, workspaceStore } from '$lib/stores'
+	import { workspaceStore } from '$lib/stores'
 	import { onMount, untrack } from 'svelte'
 	import AppConnect from './AppConnectDrawer.svelte'
 	import ResourceEditorDrawer from './ResourceEditorDrawer.svelte'
@@ -174,7 +174,6 @@
 
 	let appConnect: AppConnect | undefined = $state()
 	let resourceEditor: ResourceEditorDrawer | undefined = $state()
-	let dbManagerDrawer = $derived(globalDbManagerDrawer.val)
 	let hovering = $state(false)
 	let isDatatableSelected = $derived(value?.startsWith('datatable://') ?? false)
 </script>
@@ -317,7 +316,6 @@
 			class="mt-1"
 			_resourceMetadata={{ resource_type: resourceType }}
 			asset={{ kind: 'resource', path: value }}
-			{dbManagerDrawer}
 		/>
 	{/if}
 </div>
diff --git a/frontend/src/lib/components/RunsPage.svelte b/frontend/src/lib/components/RunsPage.svelte
index 59b63ab313..d03495c052 100644
--- a/frontend/src/lib/components/RunsPage.svelte
+++ b/frontend/src/lib/components/RunsPage.svelte
@@ -148,7 +148,9 @@
 		(v) => {
 			v.maxTs ? (filters.val.max_ts = new Date(v.maxTs)) : delete filters.val.max_ts
 			v.minTs ? (filters.val.min_ts = new Date(v.minTs)) : delete filters.val.min_ts
-			v.timeframe ? (filters.val.timeframe = v.timeframe) : delete filters.val.timeframe
+			v.timeframe && v.timeframe !== 'Latest runs'
+				? (filters.val.timeframe = v.timeframe)
+				: delete filters.val.timeframe
 		}
 	)
 	let timeframe = $derived(_timeframe.val)
diff --git a/frontend/src/lib/components/assets/AssetButtons.svelte b/frontend/src/lib/components/assets/AssetButtons.svelte
index 241a0f050e..9364bf710b 100644
--- a/frontend/src/lib/components/assets/AssetButtons.svelte
+++ b/frontend/src/lib/components/assets/AssetButtons.svelte
@@ -8,7 +8,6 @@
 
 	type Props = {
 		s3FilePicker?: any | undefined
-		dbManagerDrawer?: any | undefined
 		resourceEditorDrawer?: ResourceEditorDrawer | undefined
 		resourceDataCache: Record<string, string | undefined>
 		asset: Asset
@@ -18,7 +17,6 @@
 	}
 	let {
 		s3FilePicker,
-		dbManagerDrawer,
 		resourceEditorDrawer,
 		resourceDataCache,
 		asset,
@@ -71,7 +69,6 @@
 		<ExploreAssetButton
 			{asset}
 			{s3FilePicker}
-			{dbManagerDrawer}
 			onClick={() => onClick?.()}
 			noText
 			_resourceMetadata={{ resource_type: resourceDataCacheValue }}
diff --git a/frontend/src/lib/components/assets/AssetsDropdownButton.svelte b/frontend/src/lib/components/assets/AssetsDropdownButton.svelte
index 1e1e1871ae..5c530cf606 100644
--- a/frontend/src/lib/components/assets/AssetsDropdownButton.svelte
+++ b/frontend/src/lib/components/assets/AssetsDropdownButton.svelte
@@ -14,7 +14,7 @@
 	} from './lib'
 	import { untrack } from 'svelte'
 	import { ResourceService, WorkspaceService } from '$lib/gen'
-	import { globalDbManagerDrawer, workspaceStore } from '$lib/stores'
+	import { workspaceStore } from '$lib/stores'
 	import Tooltip from '../meltComponents/Tooltip.svelte'
 	import Tooltip2 from '../Tooltip.svelte'
 	import ResourceEditorDrawer from '../ResourceEditorDrawer.svelte'
@@ -48,7 +48,6 @@
 	let blueBgDiv: HTMLDivElement | undefined = $state()
 
 	let s3FilePicker: S3FilePicker | undefined = $state()
-	let dbManagerDrawer = $derived(globalDbManagerDrawer.val)
 	let resourceEditorDrawer: ResourceEditorDrawer | undefined = $state()
 	let isOpen = $state(false)
 	let resourceDataCache: Record<string, string | undefined> = $state({})
@@ -209,7 +208,6 @@
 						onClick={() => (isOpen = false)}
 						{asset}
 						{resourceDataCache}
-						{dbManagerDrawer}
 						{resourceEditorDrawer}
 						{s3FilePicker}
 						{ducklakeNotFound}
diff --git a/frontend/src/lib/components/assets/JobAssetsViewer.svelte b/frontend/src/lib/components/assets/JobAssetsViewer.svelte
index 2eccf66d51..86b9c7eca7 100644
--- a/frontend/src/lib/components/assets/JobAssetsViewer.svelte
+++ b/frontend/src/lib/components/assets/JobAssetsViewer.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { ResourceService, type Job } from '$lib/gen'
 	import { inferAssets } from '$lib/infer'
-	import { globalDbManagerDrawer, workspaceStore } from '$lib/stores'
+	import { workspaceStore } from '$lib/stores'
 	import { usePromise } from '$lib/svelte5Utils.svelte'
 	import { pruneNullishArray, uniqueBy } from '$lib/utils'
 	import ResourceEditorDrawer from '../ResourceEditorDrawer.svelte'
@@ -64,7 +64,6 @@
 	})
 
 	let s3FilePicker: S3FilePicker | undefined = $state()
-	let dbManagerDrawer = $derived(globalDbManagerDrawer.val)
 	let resourceEditorDrawer: ResourceEditorDrawer | undefined = $state()
 </script>
 
@@ -86,7 +85,6 @@
 				<AssetButtons
 					{asset}
 					{resourceDataCache}
-					{dbManagerDrawer}
 					{resourceEditorDrawer}
 					{s3FilePicker}
 				/>
diff --git a/frontend/src/lib/components/dbManagerDrawerModel.svelte.ts b/frontend/src/lib/components/dbManagerDrawerModel.svelte.ts
new file mode 100644
index 0000000000..c03695e0a3
--- /dev/null
+++ b/frontend/src/lib/components/dbManagerDrawerModel.svelte.ts
@@ -0,0 +1,207 @@
+import { z } from 'zod'
+import { useSearchParams } from '$lib/svelte5UtilsKit.svelte'
+import type { DbInput, DbType } from './dbTypes'
+import { isDbType } from './dbTypes'
+
+/**
+ * Single URL param `dbm` encodes the full DB manager state:
+ *   firstSegment~path~schema.table
+ *
+ * firstSegment:
+ *   datatable              – database with datatable:// resource (resourceType always postgresql)
+ *   ducklake               – ducklake connection
+ *   postgresql, mysql, …   – regular database (the segment IS the resource type)
+ *
+ * schema.table (third segment, optional):
+ *   schema.table  – both
+ *   .table        – table only
+ *   schema.       – schema only
+ *   (omitted)     – neither
+ *
+ * Default schemas (omitted from URL, restored on parse):
+ *   datatable → public
+ *   ducklake  → main
+ *
+ * Examples:
+ *   datatable~main~.customers          (schema "public" implied)
+ *   ducklake~main~.orders              (schema "main" implied)
+ *   postgresql~$res:u/user/my_pg~public.customers
+ */
+
+const dbManagerSchema = z.object({
+	dbm: z.string().nullable()
+})
+
+interface ParsedDbm {
+	type: 'database' | 'datatable' | 'ducklake'
+	path: string
+	resType?: string
+	schema?: string
+	table?: string
+}
+
+function parseDbm(raw: unknown): ParsedDbm | null {
+	if (!raw || typeof raw !== 'string') return null
+	const parts = raw.split('~')
+	if (parts.length < 2 || !parts[1]) return null
+
+	const firstSeg = parts[0]
+	const path = parts[1]
+	const schemaTable = parts[2] ?? ''
+
+	let type: ParsedDbm['type']
+	let resType: string | undefined
+	if (firstSeg === 'datatable') {
+		type = 'datatable'
+	} else if (firstSeg === 'ducklake') {
+		type = 'ducklake'
+	} else if (isDbType(firstSeg)) {
+		type = 'database'
+		resType = firstSeg
+	} else {
+		return null
+	}
+
+	let schema: string | undefined
+	let table: string | undefined
+	if (schemaTable) {
+		const dotIdx = schemaTable.indexOf('.')
+		if (dotIdx === 0) {
+			table = schemaTable.slice(1) || undefined
+		} else if (dotIdx === schemaTable.length - 1) {
+			schema = schemaTable.slice(0, -1) || undefined
+		} else if (dotIdx > 0) {
+			schema = schemaTable.slice(0, dotIdx)
+			table = schemaTable.slice(dotIdx + 1)
+		}
+	}
+
+	// Restore default schema when omitted for datatable/ducklake
+	if (!schema && table && type in defaultSchemas) {
+		schema = defaultSchemas[type]
+	}
+
+	return { type, path, resType, schema, table }
+}
+
+const defaultSchemas: Record<string, string> = { datatable: 'public', ducklake: 'main' }
+
+function buildDbm(p: ParsedDbm): string {
+	const firstSeg = p.type === 'database' ? p.resType! : p.type
+	const schema = p.schema === defaultSchemas[p.type] ? undefined : p.schema
+	let schemaTable = ''
+	if (schema && p.table) {
+		schemaTable = `${schema}.${p.table}`
+	} else if (p.table) {
+		schemaTable = `.${p.table}`
+	} else if (schema) {
+		schemaTable = `${schema}.`
+	}
+	return schemaTable ? `${firstSeg}~${p.path}~${schemaTable}` : `${firstSeg}~${p.path}`
+}
+
+export interface DbManagerUriState {
+	readonly input: DbInput | undefined
+	readonly effectiveInput: DbInput | undefined
+	readonly isDatatableInput: boolean
+	selectedDatatable: string | undefined
+	selectedSchema: string | undefined
+	selectedTable: string | undefined
+	readonly open: boolean
+	openDrawer: (nInput: DbInput) => void
+	closeDrawer: () => void
+}
+
+export function useDbManagerUriState(): DbManagerUriState {
+	const params = useSearchParams(dbManagerSchema)
+
+	const parsed = $derived(parseDbm(params.dbm))
+
+	let input: DbInput | undefined = $derived.by(() => {
+		if (!parsed) return undefined
+		if (parsed.type === 'ducklake') {
+			return {
+				type: 'ducklake' as const,
+				ducklake: parsed.path,
+				specificTable: parsed.table
+			}
+		}
+		// datatable or database
+		const resType = parsed.type === 'datatable' ? 'postgresql' : parsed.resType
+		if (!isDbType(resType ?? undefined)) return undefined
+		return {
+			type: 'database' as const,
+			resourceType: resType as DbType,
+			resourcePath: parsed.type === 'datatable' ? `datatable://${parsed.path}` : parsed.path,
+			specificSchema: parsed.schema,
+			specificTable: parsed.table
+		}
+	})
+
+	const isDatatableInput = $derived(parsed?.type === 'datatable')
+
+	function updateField(updates: Partial<ParsedDbm>) {
+		const p = parseDbm(params.dbm)
+		if (!p) return
+		Object.assign(p, updates)
+		params.dbm = buildDbm(p)
+	}
+
+	function openDrawer(nInput: DbInput) {
+		if (nInput.type === 'database') {
+			const isDatatable = nInput.resourcePath.startsWith('datatable://')
+			params.dbm = buildDbm({
+				type: isDatatable ? 'datatable' : 'database',
+				path: isDatatable ? nInput.resourcePath.slice('datatable://'.length) : nInput.resourcePath,
+				resType: isDatatable ? undefined : nInput.resourceType,
+				schema: nInput.specificSchema,
+				table: nInput.specificTable
+			})
+		} else {
+			params.dbm = buildDbm({
+				type: 'ducklake',
+				path: nInput.ducklake,
+				table: nInput.specificTable
+			})
+		}
+	}
+
+	function closeDrawer() {
+		params.dbm = null
+	}
+
+	return {
+		get input() {
+			return input
+		},
+		get effectiveInput() {
+			return input
+		},
+		get isDatatableInput() {
+			return isDatatableInput
+		},
+		get selectedDatatable() {
+			return parsed?.type === 'datatable' ? parsed.path : undefined
+		},
+		set selectedDatatable(v: string | undefined) {
+			if (v) updateField({ path: v })
+		},
+		get selectedSchema() {
+			return parsed?.schema
+		},
+		set selectedSchema(v: string | undefined) {
+			updateField({ schema: v })
+		},
+		get selectedTable() {
+			return parsed?.table
+		},
+		set selectedTable(v: string | undefined) {
+			updateField({ table: v })
+		},
+		get open() {
+			return !!input
+		},
+		openDrawer,
+		closeDrawer
+	}
+}
diff --git a/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte b/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
index 8ebf167d51..c8418e5183 100644
--- a/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
+++ b/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
@@ -16,6 +16,11 @@
 	import FlowResult from './FlowResult.svelte'
 	import type { StateStore } from '$lib/utils'
 	import FlowSelectionPanel from './FlowSelectionPanel.svelte'
+	import {
+		resolveSelectedModuleIds,
+		locateModules,
+		areContiguousSiblings
+	} from '../multiSelectUtils'
 
 	interface Props {
 		noEditor?: boolean
@@ -89,10 +94,29 @@
 	$effect(() => {
 		computeMissingInputWarnings(flowStore, flowStateStore.val, flowInputsStore)
 	})
+
+	// Derived state for multi-select operations in the side panel
+	let resolvedModuleIds = $derived(
+		resolveSelectedModuleIds(selectionManager.selectedIds, flowStore.val.value.modules ?? [])
+	)
+	let canMoveSelected = $derived(
+		resolvedModuleIds.length > 0 &&
+			areContiguousSiblings(
+				locateModules(resolvedModuleIds, flowStore.val.value.modules ?? [])
+			)
+	)
 </script>
 
 {#if selectionManager && selectionManager.selectedIds.length > 1}
-	<FlowSelectionPanel {selectionManager} {noEditor} />
+	<FlowSelectionPanel
+		{selectionManager}
+		{noEditor}
+		onDeleteSelected={() => flowModuleSchemaMap?.deleteMultiple(resolvedModuleIds)}
+		onDuplicateSelected={() => flowModuleSchemaMap?.duplicateMultiple(resolvedModuleIds)}
+		onMoveSelected={() => flowModuleSchemaMap?.moveMultiple(resolvedModuleIds)}
+		{canMoveSelected}
+		resolvedCount={resolvedModuleIds.length}
+	/>
 {:else if selectedId?.startsWith('settings')}
 	<FlowSettings {enableAi} {noEditor} />
 {:else if selectedId === 'Input'}
diff --git a/frontend/src/lib/components/flows/content/FlowLoop.svelte b/frontend/src/lib/components/flows/content/FlowLoop.svelte
index f087079356..886f57386f 100644
--- a/frontend/src/lib/components/flows/content/FlowLoop.svelte
+++ b/frontend/src/lib/components/flows/content/FlowLoop.svelte
@@ -425,7 +425,6 @@
 									on:blur={() => {
 										iteratorFieldFocused = false
 									}}
-									autofocus
 									lang="javascript"
 									bind:code={mod.value.iterator.expr}
 									class="h-full"
diff --git a/frontend/src/lib/components/flows/content/FlowSelectionPanel.svelte b/frontend/src/lib/components/flows/content/FlowSelectionPanel.svelte
index b14f090afc..7efb44b82d 100644
--- a/frontend/src/lib/components/flows/content/FlowSelectionPanel.svelte
+++ b/frontend/src/lib/components/flows/content/FlowSelectionPanel.svelte
@@ -2,14 +2,29 @@
 	import FlowCard from '../common/FlowCard.svelte'
 	import type { SelectionManager } from '$lib/components/graph/selectionUtils.svelte'
 	import { Button } from '$lib/components/common'
+	import DropdownV2 from '$lib/components/DropdownV2.svelte'
 	import { getNoteEditorContext } from '$lib/components/graph/noteEditor.svelte'
-	import { StickyNote } from 'lucide-svelte'
+	import { StickyNote, Move, Copy, Trash2 } from 'lucide-svelte'
+	import type { Item } from '$lib/utils'
 
 	interface Props {
 		selectionManager: SelectionManager
 		noEditor: boolean
+		onDeleteSelected?: () => void
+		onDuplicateSelected?: () => void
+		onMoveSelected?: () => void
+		canMoveSelected?: boolean
+		resolvedCount?: number
 	}
-	let { selectionManager, noEditor }: Props = $props()
+	let {
+		selectionManager,
+		noEditor,
+		onDeleteSelected,
+		onDuplicateSelected,
+		onMoveSelected,
+		canMoveSelected = false,
+		resolvedCount = 0
+	}: Props = $props()
 
 	const noteEditorContext = getNoteEditorContext()
 
@@ -19,20 +34,44 @@
 			noteEditorContext.noteEditor.createGroupNote(selectionManager.selectedIds)
 		}
 	}
+
+	let menuItems: Item[] = $derived([
+		{
+			displayName: 'Move',
+			icon: Move,
+			action: () => onMoveSelected?.(),
+			disabled: !canMoveSelected
+		},
+		{
+			displayName: 'Duplicate',
+			icon: Copy,
+			action: () => onDuplicateSelected?.()
+		},
+		{
+			displayName: `Delete (${resolvedCount})`,
+			icon: Trash2,
+			type: 'delete',
+			action: () => onDeleteSelected?.()
+		}
+	])
 </script>
 
 <FlowCard {noEditor} title="Multiple Selection">
 	{#snippet action()}
-		<Button
-			onClick={addGroupNote}
-			disabled={!noteEditorContext?.noteEditor || selectionManager.selectedIds.length === 0}
-			startIcon={{ icon: StickyNote }}
-		>
-			Create group note
-		</Button>
+		<div class="flex gap-1 items-center">
+			<Button
+				onClick={addGroupNote}
+				disabled={!noteEditorContext?.noteEditor || selectionManager.selectedIds.length === 0}
+				startIcon={{ icon: StickyNote }}
+			>
+				Create group note
+			</Button>
+			{#if resolvedCount > 0}
+				<DropdownV2 items={menuItems} />
+			{/if}
+		</div>
 	{/snippet}
 	<div class="px-4">
-		<p class="text-xs text-secondary mb-4">{selectionManager.selectedIds.length} nodes selected</p>
 		<div class="space-y-2 mb-4">
 			{#each selectionManager.selectedIds as nodeId}
 				<div class="text-sm px-2 py-1 bg-surface rounded border">
diff --git a/frontend/src/lib/components/flows/flowModuleNextId.ts b/frontend/src/lib/components/flows/flowModuleNextId.ts
index 34bed860f8..e10c900982 100644
--- a/frontend/src/lib/components/flows/flowModuleNextId.ts
+++ b/frontend/src/lib/components/flows/flowModuleNextId.ts
@@ -17,3 +17,15 @@ export function nextId(flowState: FlowState, fullFlow: OpenFlow): string {
 	}, 0)
 	return numberToChars(max)
 }
+
+// Computes a copy id like "a2", "a3", etc. based on the original id
+export function copyId(originalId: string, flowState: FlowState, fullFlow: OpenFlow): string {
+	const allIds = new Set(dfs(fullFlow.value.modules, (fm) => fm.id).concat(Object.keys(flowState)))
+	for (let n = 2; n < 10000; n++) {
+		const candidate = `${originalId}${n}`
+		if (!allIds.has(candidate)) {
+			return candidate
+		}
+	}
+	return `${originalId}10000`
+}
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
index 8836edb708..0a0fe310f0 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
@@ -2,12 +2,13 @@
 	import { preventDefault, stopPropagation } from 'svelte/legacy'
 
 	import Popover from '$lib/components/Popover.svelte'
-	import { classNames, type StateStore } from '$lib/utils'
+	import DropdownV2 from '$lib/components/DropdownV2.svelte'
+	import { classNames, type Item, type StateStore } from '$lib/utils'
 	import {
 		Bed,
 		Database,
 		Gauge,
-		Move,
+		EllipsisVertical,
 		PhoneIncoming,
 		Repeat,
 		Square,
@@ -20,7 +21,7 @@
 		Timer,
 		Maximize2
 	} from 'lucide-svelte'
-	import { createEventDispatcher, getContext, onDestroy } from 'svelte'
+	import { createEventDispatcher, getContext } from 'svelte'
 	import { fade } from 'svelte/transition'
 	import type { FlowEditorContext } from '../types'
 	import { twMerge } from 'tailwind-merge'
@@ -48,6 +49,7 @@
 	import type { ModuleActionInfo } from '$lib/components/flows/flowDiff'
 	import DiffActionBar from './DiffActionBar.svelte'
 	import { getGraphContext } from '$lib/components/graph/graphContext'
+	import MoveHandleButton from '$lib/components/graph/MoveHandleButton.svelte'
 
 	interface Props {
 		selected?: boolean
@@ -69,7 +71,6 @@
 		id?: string | undefined
 		label: string
 		path?: string
-		modType?: string | undefined
 		nodeState?: FlowNodeState
 		concurrency?: boolean
 		// TODO: Implement for this one. See how concurrency is implemented.
@@ -89,6 +90,7 @@
 		isOwner?: boolean
 		enableTestRun?: boolean
 		maximizeSubflow?: () => void
+		menuItems?: Item[]
 	}
 
 	let {
@@ -106,7 +108,6 @@
 		id = undefined,
 		label,
 		path = '',
-		modType = undefined,
 		nodeState,
 		concurrency = false,
 		debouncing = false,
@@ -123,7 +124,8 @@
 		onEditInput,
 		flowJob,
 		enableTestRun = false,
-		maximizeSubflow = undefined
+		maximizeSubflow = undefined,
+		menuItems = undefined
 	}: Props = $props()
 
 	// AI action colors take priority over execution state
@@ -138,6 +140,9 @@
 	const diffManager = flowGraphContext?.diffManager
 	const moveManager = flowGraphContext?.moveManager
 
+	// Hide per-node action buttons when multiple nodes are selected (multi-select mode)
+	let isMultiSelected = $derived((flowGraphContext?.selectionManager?.selectedIds?.length ?? 0) > 1)
+
 	let pickableIds: Record<string, any> | undefined = $state(undefined)
 
 	const dispatch = createEventDispatcher()
@@ -161,6 +166,7 @@
 	let outputPicker: OutputPicker | undefined = $state(undefined)
 	let testJob: any | undefined = $state(undefined)
 	let outputPickerBarOpen = $state(false)
+	let dropdownOpen = $state(false)
 
 	let flowStateStore = $derived(flowEditorContext?.flowStateStore)
 
@@ -188,42 +194,6 @@
 
 	let isDragging = $derived(!!moveManager?.dragging)
 
-	// --- Drag handle logic ---
-	let dragCleanup: (() => void) | undefined
-
-	function onMovePointerDown(e: Event) {
-		const pe = e as PointerEvent
-		const startX = pe.clientX
-		const startY = pe.clientY
-		let didDrag = false
-
-		function onMovePointer(me: PointerEvent) {
-			const dx = me.clientX - startX
-			const dy = me.clientY - startY
-			if (!didDrag && Math.sqrt(dx * dx + dy * dy) > 5) {
-				didDrag = true
-				if (moveManager && id) {
-					moveManager.startDrag(id, startX, startY)
-				}
-			}
-		}
-
-		function onUp() {
-			document.removeEventListener('pointermove', onMovePointer)
-			document.removeEventListener('pointerup', onUp)
-			dragCleanup = undefined
-			if (!didDrag) {
-				dispatch('move')
-			}
-		}
-
-		document.addEventListener('pointermove', onMovePointer)
-		document.addEventListener('pointerup', onUp)
-		dragCleanup = onUp
-	}
-
-	onDestroy(() => dragCleanup?.())
-
 	const outputPickerVisible = $derived(
 		editMode && (isConnectingCandidate || alwaysShowOutputPicker) && !!id && !isDragging
 	)
@@ -467,6 +437,7 @@
 				{deletable}
 				{bold}
 				bind:editId
+				disableEditId={isMultiSelected}
 				{hover}
 				{colorClasses}
 			>
@@ -475,7 +446,7 @@
 				{/snippet}
 			</FlowModuleSchemaItemViewer>
 
-			{#if outputPickerVisible}
+			{#if outputPickerVisible && !isMultiSelected}
 				<OutputPicker
 					bind:this={outputPicker}
 					{selected}
@@ -518,50 +489,6 @@
 				{@render buttonMaximizeSubflow?.()}
 			{/if}
 
-			{#if id !== 'preprocessor'}
-				<!-- The `style="will-change: transform;"` fixes a bug in Safari where the close and move
-			 		 and delete buttons would get clipped (unless an animation is running) -->
-				<div
-					class={twMerge('absolute -translate-y-[100%] top-2 right-4 h-7 p-1 min-w-7')}
-					style="will-change: transform;"
-				>
-					<button
-						class={twMerge(
-							'trash center-center p-1 text-secondary shadow-sm bg-surface duration-0 hover:bg-surface-tertiary cursor-grab',
-							hover || selected ? 'block' : '!hidden',
-							'shadow-md rounded-md',
-							'group-hover:block',
-							'touch-none'
-						)}
-						onpointerdown={stopPropagation(preventDefault(onMovePointerDown))}
-						title="Move"
-					>
-						<Move size={12} />
-					</button>
-				</div>
-			{/if}
-
-			<div
-				class="absolute -translate-y-[100%] top-2 -right-2 h-7 p-1 min-w-7"
-				style="will-change: transform;"
-			>
-				<button
-					class={twMerge(
-						'trash center-center text-secondary shadow-sm bg-surface duration-0 hover:bg-red-400 hover:text-white p-1',
-						selected || hover ? 'block' : '!hidden',
-						'group-hover:block',
-						'shadow-md rounded-md'
-					)}
-					title="Delete"
-					onclick={stopPropagation(
-						preventDefault((event) => dispatch('delete', { id, type: modType }))
-					)}
-					onpointerdown={stopPropagation(preventDefault(() => {}))}
-				>
-					<X size={12} />
-				</button>
-			</div>
-
 			{#if (id && Object.values($flowInputsStore?.[id]?.flowStepWarnings || {}).length > 0) || Boolean(warningMessage)}
 				<Popover
 					style="will-change: transform;"
@@ -591,6 +518,52 @@
 					<TriangleAlert size={12} strokeWidth={2} />
 				</Popover>
 			{/if}
+
+			{#if !isMultiSelected && id !== 'preprocessor' && moveManager && id}
+				<div
+					class="absolute -translate-y-[100%] top-2 right-5 h-7 p-1 min-w-7"
+					style="will-change: transform;"
+				>
+					<MoveHandleButton
+						{moveManager}
+						moduleId={id}
+						singleNode
+						visible={hover || selected || dropdownOpen}
+						onClickMove={() => dispatch('move')}
+						class="trash group-hover:block"
+					/>
+				</div>
+			{/if}
+
+			{#if !isMultiSelected && id !== 'preprocessor' && menuItems && menuItems.length > 0}
+				<div
+					class="absolute -translate-y-[100%] top-2 -right-2 h-7 p-1 min-w-7"
+					style="will-change: transform;"
+				>
+					<DropdownV2
+						items={menuItems}
+						placement="bottom-end"
+						bind:open={dropdownOpen}
+						fixedHeight={false}
+						usePointerDownOutside
+					>
+						{#snippet buttonReplacement()}
+							<button
+								class={twMerge(
+									'trash center-center p-1 text-secondary shadow-sm bg-surface duration-0 hover:bg-surface-tertiary',
+									hover || selected || dropdownOpen ? 'block' : '!hidden',
+									'shadow-md rounded-md',
+									'group-hover:block'
+								)}
+								onpointerdown={stopPropagation(preventDefault(() => {}))}
+								title="Actions"
+							>
+								<EllipsisVertical size={12} />
+							</button>
+						{/snippet}
+					</DropdownV2>
+				</div>
+			{/if}
 		{:else if maximizeSubflow !== undefined}
 			{@render buttonMaximizeSubflow?.()}
 		{/if}
@@ -603,7 +576,7 @@
 			onmouseenter={() => (hover = true)}
 			onmouseleave={() => (hover = false)}
 		>
-			{#if (hover || selected || testRunDropdownOpen) && outputPickerVisible}
+			{#if !isMultiSelected && (hover || selected || testRunDropdownOpen) && outputPickerVisible}
 				<div transition:fade={{ duration: 100 }}>
 					{#if !testIsLoading}
 						<Button
@@ -655,13 +628,13 @@
 </div>
 
 {#snippet buttonMaximizeSubflow()}
-	<div class="absolute -translate-y-[100%] top-2 right-10 h-7 p-1">
+	<div class="absolute -translate-y-[100%] top-2 right-12 h-7 p-1">
 		<button
 			title="Expand subflow"
 			class={twMerge(
 				'center-center text-secondary shadow-sm bg-surface duration-0 hover:bg-surface-tertiary p-1',
 				'shadow-md rounded-md',
-				hover || selected ? 'opacity-100' : 'opacity-50'
+				!isMultiSelected && (hover || selected) ? 'opacity-100' : 'opacity-50'
 			)}
 			onclick={(e) => {
 				e.stopPropagation()
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaItemViewer.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaItemViewer.svelte
index 6425711661..8ee9b8ba11 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaItemViewer.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaItemViewer.svelte
@@ -15,6 +15,7 @@
 		deletable?: boolean
 		bold?: boolean
 		editId?: boolean
+		disableEditId?: boolean
 		hover?: boolean
 		colorClasses?: FlowNodeColorClasses
 		icon?: import('svelte').Snippet
@@ -28,6 +29,7 @@
 		deletable = false,
 		bold = false,
 		editId = $bindable(false),
+		disableEditId = false,
 		hover = false,
 		colorClasses,
 		icon,
@@ -74,16 +76,18 @@
 				)}
 				baseClass={twMerge('!px-1')}
 				title={id}
-				clickable
-				onclick={(e) => {
-					e?.preventDefault()
-					e?.stopPropagation()
-					editId = !editId
-					onclick?.()
-				}}
+				clickable={!disableEditId}
+				onclick={disableEditId
+					? undefined
+					: (e) => {
+							e?.preventDefault()
+							e?.stopPropagation()
+							editId = !editId
+							onclick?.()
+						}}
 			>
 				<span class="max-w-full text-2xs truncate flex items-center">
-					{#if editId || (hover && deletable)}
+					{#if !disableEditId && (editId || (hover && deletable))}
 						<span transition:slide={{ axis: 'x', duration: 100 }}>
 							<Pencil size={10} class="mr-1" />
 						</span>
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
index 6dbaea9f67..eada672f24 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
@@ -18,11 +18,13 @@
 	import { emptyFlowModuleState } from '../utils.svelte'
 
 	import { dfs } from '../dfs'
+	import { nextId, copyId } from '../flowModuleNextId'
 	import { push } from '$lib/history.svelte'
 	import ConfirmationModal from '$lib/components/common/confirmationModal/ConfirmationModal.svelte'
 	import Portal from '$lib/components/Portal.svelte'
 
 	import { getDependentComponents } from '../flowExplorer'
+	import { locateModules, groupByParent } from '../multiSelectUtils'
 	import { workspaceStore } from '$lib/stores'
 	import { copilotInfo } from '$lib/aiStore'
 	import FlowTutorials from '$lib/components/FlowTutorials.svelte'
@@ -345,6 +347,80 @@
 		noteMode = !noteMode
 	}
 
+	export function deleteMultiple(ids: string[]) {
+		const deletingSet = new Set(ids)
+		const allDeps: Record<string, string[]> = {}
+		for (const id of ids) {
+			const deps = getDependentComponents(id, flowStore.val)
+			for (const [depId, exprs] of Object.entries(deps)) {
+				if (!deletingSet.has(depId)) {
+					allDeps[depId] = [...(allDeps[depId] ?? []), ...exprs]
+				}
+			}
+		}
+
+		const cb = () => {
+			push(history, flowStore.val)
+			for (const id of ids) {
+				removeAtId(flowStore.val.value.modules, id)
+				delete flowStateStore.val[id]
+			}
+			selectionManager.clearSelection()
+			refreshStateStore(flowStore)
+		}
+
+		if (Object.keys(allDeps).length > 0) {
+			dependents = allDeps
+			deleteCallback = cb
+		} else {
+			cb()
+		}
+	}
+
+	export function duplicateMultiple(ids: string[]) {
+		const locations = locateModules(ids, flowStore.val.value.modules)
+		const groups = groupByParent(locations)
+
+		push(history, flowStore.val)
+
+		const allCloneIds: string[] = []
+
+		for (const group of groups) {
+			const sorted = [...group].sort((a, b) => a.index - b.index)
+			const parentArr = sorted[0].parentArray
+			const lastIndex = sorted[sorted.length - 1].index
+
+			const clones: FlowModule[] = []
+			for (const loc of sorted) {
+				const original = parentArr[loc.index]
+				const clone: FlowModule = $state.snapshot(original)
+
+				clone.id = copyId(original.id, flowStateStore.val, flowStore.val)
+				flowStateStore.val[clone.id] = emptyFlowModuleState()
+
+				dfs([clone], (mod) => {
+					if (mod.id !== clone.id) {
+						const newModId = nextId(flowStateStore.val, flowStore.val)
+						mod.id = newModId
+						flowStateStore.val[newModId] = emptyFlowModuleState()
+					}
+				})
+
+				clones.push(clone)
+				allCloneIds.push(clone.id)
+			}
+
+			parentArr.splice(lastIndex + 1, 0, ...clones)
+		}
+
+		refreshStateStore(flowStore)
+		selectionManager.selectByIds(allCloneIds)
+	}
+
+	export function moveMultiple(ids: string[]) {
+		moveManager.toggleMovingMultiple(ids)
+	}
+
 	const dispatch = createEventDispatcher<{
 		generateStep: { moduleId: string; instructions: string; lang: ScriptLang }
 		change: void
@@ -533,18 +609,37 @@
 					if (flowStore.val.value.modules && Array.isArray(flowStore.val.value.modules)) {
 						await tick()
 						if (moveManager.movingModuleId) {
-							// console.log('modules', modules, movingModules, movingModule)
 							push(history, flowStore.val)
-							let indexToRemove = originalModules.findIndex((m) => moveManager.movingModuleId == m.id)
-
-							let [removedModule] = originalModules.splice(indexToRemove, 1)
-							// When moving within the same array, removal shifts subsequent indices down by 1
-							let insertIndex = detail.index
-							if (originalModules === targetModules && indexToRemove < detail.index) {
-								insertIndex -= 1
+							if (!originalModules || !targetModules) {
+								moveManager.clearMoving()
+								return
+							}
+							if (moveManager.movingIds && moveManager.movingIds.length > 1) {
+								// Multi-move: splice out all moving modules from their parent, insert at target
+								const firstIndex = originalModules.findIndex(
+									(m) => m.id === moveManager.movingIds?.[0]
+								)
+								const removedModules = originalModules.splice(
+									firstIndex,
+									moveManager.movingIds.length
+								)
+								let insertIndex = detail.index
+								if (originalModules === targetModules && firstIndex < detail.index) {
+									insertIndex -= moveManager.movingIds.length
+								}
+								targetModules.splice(insertIndex, 0, ...removedModules)
+								selectionManager.selectByIds(removedModules.map((m) => m.id))
+							} else {
+								let indexToRemove = originalModules.findIndex((m) => moveManager.movingModuleId == m.id)
+								let [removedModule] = originalModules.splice(indexToRemove, 1)
+								// When moving within the same array, removal shifts subsequent indices down by 1
+								let insertIndex = detail.index
+								if (originalModules === targetModules && indexToRemove < detail.index) {
+									insertIndex -= 1
+								}
+								targetModules.splice(insertIndex, 0, removedModule)
+								selectionManager.selectId(removedModule.id)
 							}
-							targetModules.splice(insertIndex, 0, removedModule)
-							selectionManager.selectId(removedModule.id)
 							moveManager.clearMoving()
 						} else {
 							if (detail.isPreprocessor) {
@@ -678,6 +773,41 @@
 			onMove={(id) => {
 				moveManager.toggleMoving(id)
 			}}
+			onDuplicate={(id) => {
+				let targetModules: FlowModule[] | undefined
+				let targetIndex: number = -1
+
+				dfs(flowStore.val.value.modules, (mod, modules) => {
+					const idx = modules.findIndex((m) => m.id === id)
+					if (idx !== -1) {
+						targetModules = modules
+						targetIndex = idx
+					}
+				})
+
+				if (!targetModules || targetIndex === -1) return
+
+				push(history, flowStore.val)
+
+				const original = targetModules[targetIndex]
+				const clone: FlowModule = $state.snapshot(original)
+
+				// Assign copy id to the clone, and fresh ids to nested modules
+				clone.id = copyId(original.id, flowStateStore.val, flowStore.val)
+				flowStateStore.val[clone.id] = emptyFlowModuleState()
+
+				dfs([clone], (mod) => {
+					if (mod.id !== clone.id) {
+						const newModId = nextId(flowStateStore.val, flowStore.val)
+						mod.id = newModId
+						flowStateStore.val[newModId] = emptyFlowModuleState()
+					}
+				})
+
+				targetModules.splice(targetIndex + 1, 0, clone)
+				refreshStateStore(flowStore)
+				selectionManager.selectId(clone.id)
+			}}
 			onUpdateMock={(detail) => {
 				let module = findModuleById(detail.id)
 				module.mock = $state.snapshot(detail.mock)
@@ -696,6 +826,10 @@
 				}
 			}}
 			multiSelectEnabled
+			movingIds={moveManager.movingIds}
+			onDeleteMultiple={deleteMultiple}
+			onDuplicateMultiple={duplicateMultiple}
+			onMoveMultiple={moveMultiple}
 		/>
 	</div>
 </div>
diff --git a/frontend/src/lib/components/flows/map/MapItem.svelte b/frontend/src/lib/components/flows/map/MapItem.svelte
index 417ce58346..1a65452873 100644
--- a/frontend/src/lib/components/flows/map/MapItem.svelte
+++ b/frontend/src/lib/components/flows/map/MapItem.svelte
@@ -5,7 +5,7 @@
 	import FlowModuleSchemaItem from './FlowModuleSchemaItem.svelte'
 	import FlowModuleIcon from '../FlowModuleIcon.svelte'
 	import { prettyLanguage } from '$lib/common'
-	import { msToSec } from '$lib/utils'
+	import { msToSec, type Item } from '$lib/utils'
 	import FlowJobsMenu from './FlowJobsMenu.svelte'
 	import {
 		isTriggerStep,
@@ -47,6 +47,7 @@
 		flowJob?: Job | undefined
 		isOwner?: boolean
 		maximizeSubflow?: () => void
+		menuItems?: Item[]
 	}
 
 	let {
@@ -67,7 +68,8 @@
 		onEditInput,
 		flowJob,
 		isOwner = false,
-		maximizeSubflow
+		maximizeSubflow,
+		menuItems = undefined
 	}: Props = $props()
 
 	const { selectionManager, moveManager } = getGraphContext()
@@ -117,12 +119,11 @@
 					: ''
 			: ''
 	)
-
 </script>
 
 {#if mod}
 	<div class="relative">
-		{#if moveManager?.movingModuleId == mod.id}
+		{#if moveManager?.movingModuleId == mod.id && !moveManager?.movingIds?.includes(mod.id)}
 			<div class="absolute z-10 inset-0 flex items-center justify-center">
 				<Button variant="accent" on:click={() => dispatch('move')} size="xs" destructive>
 					Cancel move
@@ -171,6 +172,7 @@
 					deletable={insertable}
 					{editMode}
 					{moduleAction}
+					{menuItems}
 					label={`${
 						mod.summary || (mod.value.type == 'forloopflow' ? 'For loop' : 'While loop')
 					}  ${mod.value.parallel ? '(parallel)' : ''} ${
@@ -205,6 +207,7 @@
 					deletable={insertable}
 					{editMode}
 					{moduleAction}
+					{menuItems}
 					on:changeId
 					on:delete
 					on:move
@@ -224,6 +227,7 @@
 					deletable={insertable}
 					{editMode}
 					{moduleAction}
+					{menuItems}
 					on:changeId
 					on:delete
 					on:move
@@ -243,6 +247,7 @@
 					{retries}
 					{editMode}
 					{moduleAction}
+					{menuItems}
 					on:changeId
 					on:pointerdown={handlePointerDown}
 					on:delete
@@ -256,7 +261,6 @@
 					deletable={insertable}
 					id={mod.id}
 					{...itemProps}
-					modType={mod.value.type}
 					{nodeState}
 					label={mod.summary ||
 						(mod.value.type === 'aiagent' ? 'AI Agent' : undefined) ||
diff --git a/frontend/src/lib/components/flows/map/VirtualItem.svelte b/frontend/src/lib/components/flows/map/VirtualItem.svelte
index d3f67ccb2f..f7a08f1933 100644
--- a/frontend/src/lib/components/flows/map/VirtualItem.svelte
+++ b/frontend/src/lib/components/flows/map/VirtualItem.svelte
@@ -10,6 +10,7 @@
 	import FlowGraphPreviewButton from './FlowGraphPreviewButton.svelte'
 	import type { Job } from '$lib/gen'
 	import { getNodeColorClasses, aiActionToNodeState } from '$lib/components/graph'
+	import { getGraphContext } from '$lib/components/graph/graphContext'
 
 	interface Props {
 		label?: string | undefined
@@ -69,6 +70,12 @@
 		flowHasChanged = false
 	}: Props = $props()
 
+	const flowGraphContext = getGraphContext()
+
+	let isMultiSelected = $derived(
+		(flowGraphContext?.selectionManager?.selectedIds?.length ?? 0) > 1
+	)
+
 	const outputPickerVisible = $derived(
 		(nodeKind || (inputJson && Object.keys(inputJson).length > 0)) && editMode
 	)
@@ -125,7 +132,7 @@
 					</div>
 				{/if}
 			</div>
-			{#if outputPickerVisible}
+			{#if outputPickerVisible && !isMultiSelected}
 				<OutputPicker
 					{selected}
 					{hover}
@@ -201,7 +208,7 @@
 					hoverButton = false
 				}}
 			>
-				{#if outputPickerVisible}
+				{#if outputPickerVisible && !isMultiSelected}
 					<div transition:fade={{ duration: 100 }}>
 						<FlowGraphPreviewButton
 							{isRunning}
diff --git a/frontend/src/lib/components/flows/multiSelectUtils.ts b/frontend/src/lib/components/flows/multiSelectUtils.ts
new file mode 100644
index 0000000000..8848cc3a4d
--- /dev/null
+++ b/frontend/src/lib/components/flows/multiSelectUtils.ts
@@ -0,0 +1,136 @@
+import type { FlowModule } from '$lib/gen'
+import { dfs } from './dfs'
+
+/** Virtual/non-module node IDs that should be filtered out of multi-select operations */
+const VIRTUAL_ID_PREFIXES = ['Input', 'Result', 'Trigger', 'preprocessor', 'failure']
+
+function isVirtualId(id: string): boolean {
+	if (VIRTUAL_ID_PREFIXES.includes(id)) return true
+	if (
+		id.endsWith('-start') ||
+		id.endsWith('-end') ||
+		id.includes('-branch-') ||
+		id.startsWith('subflow:')
+	) {
+		return true
+	}
+	return false
+}
+
+/**
+ * Single DFS pass to build a map of moduleId → set of ancestor module IDs.
+ * Used to deduplicate nested selections (keep container, drop children).
+ */
+function buildAncestorMap(modules: FlowModule[]): Map<string, Set<string>> {
+	const ancestors = new Map<string, Set<string>>()
+
+	function walk(mods: FlowModule[], parentAncestors: Set<string>) {
+		for (const mod of mods) {
+			ancestors.set(mod.id, parentAncestors)
+			const childAncestors = new Set([...parentAncestors, mod.id])
+
+			const val = mod.value
+			if (val.type === 'forloopflow' || val.type === 'whileloopflow') {
+				walk(val.modules, childAncestors)
+			} else if (val.type === 'branchall') {
+				for (const branch of val.branches) walk(branch.modules, childAncestors)
+			} else if (val.type === 'branchone') {
+				for (const branch of val.branches) walk(branch.modules, childAncestors)
+				walk(val.default, childAncestors)
+			}
+		}
+	}
+
+	walk(modules, new Set())
+	return ancestors
+}
+
+/**
+ * Filter raw selected node IDs down to the minimal set of top-level module IDs:
+ * 1. Filter out virtual graph nodes (Input, Result, Trigger, -start, -end, -branch-*, subflow:*, preprocessor, failure)
+ * 2. Verify each ID exists as a real module in the flow module tree
+ * 3. Deduplicate nested: if a container (loop/branch) AND its children are both selected, keep only the container
+ */
+export function resolveSelectedModuleIds(rawIds: string[], modules: FlowModule[]): string[] {
+	// Step 1: Filter out virtual IDs
+	const candidateIds = rawIds.filter((id) => !isVirtualId(id))
+
+	// Step 2+3: Single DFS to build ancestor map (also verifies existence)
+	const ancestorMap = buildAncestorMap(modules)
+	const verifiedIds = candidateIds.filter((id) => ancestorMap.has(id))
+
+	// If any ancestor of this module is also selected, it's a nested child — drop it
+	const selectedSet = new Set(verifiedIds)
+	return verifiedIds.filter((id) => {
+		const ancestors = ancestorMap.get(id)!
+		for (const ancestor of ancestors) {
+			if (selectedSet.has(ancestor)) return false
+		}
+		return true
+	})
+}
+
+export type ModuleLocation = {
+	id: string
+	parentArray: FlowModule[]
+	index: number
+}
+
+/**
+ * For each ID, find its parent array (reference) and index using DFS.
+ */
+export function locateModules(ids: string[], modules: FlowModule[]): ModuleLocation[] {
+	const idSet = new Set(ids)
+	const locations: ModuleLocation[] = []
+
+	dfs(modules, (mod, parentModules) => {
+		if (idSet.has(mod.id)) {
+			const index = parentModules.findIndex((m) => m.id === mod.id)
+			if (index !== -1) {
+				locations.push({ id: mod.id, parentArray: parentModules, index })
+			}
+		}
+	})
+
+	return locations
+}
+
+/**
+ * Group locations that share the same parent array, sorted by index within each group.
+ */
+export function groupByParent(locations: ModuleLocation[]): ModuleLocation[][] {
+	const groups = new Map<FlowModule[], ModuleLocation[]>()
+	for (const loc of locations) {
+		const existing = groups.get(loc.parentArray)
+		if (existing) {
+			existing.push(loc)
+		} else {
+			groups.set(loc.parentArray, [loc])
+		}
+	}
+	// Sort each group by index
+	for (const group of groups.values()) {
+		group.sort((a, b) => a.index - b.index)
+	}
+	return Array.from(groups.values())
+}
+
+/**
+ * True if all locations share the same parent array and have consecutive indices.
+ * Required for move to be valid.
+ */
+export function areContiguousSiblings(locations: ModuleLocation[]): boolean {
+	if (locations.length === 0) return false
+	if (locations.length === 1) return true
+
+	// All must share the same parent
+	const parent = locations[0].parentArray
+	if (!locations.every((loc) => loc.parentArray === parent)) return false
+
+	// Sort by index and check contiguity
+	const sorted = [...locations].sort((a, b) => a.index - b.index)
+	for (let i = 1; i < sorted.length; i++) {
+		if (sorted[i].index !== sorted[i - 1].index + 1) return false
+	}
+	return true
+}
diff --git a/frontend/src/lib/components/graph/DragCoordinator.svelte b/frontend/src/lib/components/graph/DragCoordinator.svelte
index ed277da2f0..cba81e71d4 100644
--- a/frontend/src/lib/components/graph/DragCoordinator.svelte
+++ b/frontend/src/lib/components/graph/DragCoordinator.svelte
@@ -21,7 +21,15 @@
 
 	onMount(() => {
 		moveManager.setScreenToFlowPosition(screenToFlowPosition)
-		moveManager.setComputeDraggedNodeIds((moduleId) => getSubflowNodeIds(moduleId, nodes, edges))
+		moveManager.setComputeDraggedNodeIds((moduleIds) => {
+			const combined = new Set<string>()
+			for (const id of moduleIds) {
+				for (const nodeId of getSubflowNodeIds(id, nodes, edges)) {
+					combined.add(nodeId)
+				}
+			}
+			return combined
+		})
 	})
 
 	$effect(() => {
@@ -33,11 +41,17 @@
 
 		function onPointerUp(_e: PointerEvent) {
 			const moduleId = moveManager.dragging?.moduleId
+			const selectedIds = moveManager.dragging?.selectedIds
 			const zone = moveManager.endDrag()
 			if (zone && moduleId) {
-				// Set movingModuleId directly (non-toggle) so the insert handler knows which module to relocate
-				moveManager.setMoving(moduleId)
-				// Then trigger the insert, which detects movingModuleId and performs the splice
+				// Set moving state so the insert handler knows which module(s) to relocate
+				if (selectedIds && selectedIds.length > 1) {
+					moveManager.movingModuleId = selectedIds[0]
+					moveManager.movingIds = selectedIds
+				} else {
+					moveManager.setMoving(moduleId)
+				}
+				// Then trigger the insert, which detects movingModuleId/movingIds and performs the splice
 				eventHandlers.insert({
 					sourceId: zone.sourceId,
 					targetId: zone.targetId,
diff --git a/frontend/src/lib/components/graph/DragGhost.svelte b/frontend/src/lib/components/graph/DragGhost.svelte
index 8490168d90..0aefc5c9e8 100644
--- a/frontend/src/lib/components/graph/DragGhost.svelte
+++ b/frontend/src/lib/components/graph/DragGhost.svelte
@@ -42,8 +42,19 @@
 		return { x: n.position.x, y: n.position.y }
 	}
 
-	function computeGhost(moduleId: string, allNodes: Node[], allEdges: Edge[]) {
-		const { sfNodes, sfEdges } = getSubflowNodesAndEdges(moduleId, allNodes, allEdges)
+	function computeGhost(moduleId: string, draggedNodeIds: Set<string>, allNodes: Node[], allEdges: Edge[]) {
+		// Use pre-computed draggedNodeIds when available (covers multi-select),
+		// otherwise fall back to single-module subflow computation.
+		let sfNodes: Node[]
+		let sfEdges: Edge[]
+		if (draggedNodeIds.size > 0) {
+			sfNodes = allNodes.filter((n) => draggedNodeIds.has(n.id))
+			sfEdges = allEdges.filter((e) => draggedNodeIds.has(e.source) && draggedNodeIds.has(e.target))
+		} else {
+			const result = getSubflowNodesAndEdges(moduleId, allNodes, allEdges)
+			sfNodes = result.sfNodes
+			sfEdges = result.sfEdges
+		}
 		if (sfNodes.length === 0) return undefined
 
 		// Compute bounding box using absolute positions
@@ -108,8 +119,7 @@
 	let ghost = $derived.by(() => {
 		const moduleId = moveManager.dragging?.moduleId
 		if (!moduleId) return undefined
-		// Compute ghost once at drag start — don't react to node/edge changes during drag
-		return untrack(() => computeGhost(moduleId, nodes, edges))
+		return untrack(() => computeGhost(moduleId, moveManager.draggedNodeIds, nodes, edges))
 	})
 </script>
 
diff --git a/frontend/src/lib/components/graph/FlowGraphV2.svelte b/frontend/src/lib/components/graph/FlowGraphV2.svelte
index 0052b72087..f3e71d8236 100644
--- a/frontend/src/lib/components/graph/FlowGraphV2.svelte
+++ b/frontend/src/lib/components/graph/FlowGraphV2.svelte
@@ -77,6 +77,11 @@
 	import { computeNoteNodes } from './noteUtils.svelte'
 	import { Tooltip } from '../meltComponents'
 	import { getNoteEditorContext } from './noteEditor.svelte'
+	import {
+		resolveSelectedModuleIds,
+		locateModules,
+		areContiguousSiblings
+	} from '../flows/multiSelectUtils'
 
 	let useDataflow: Writable<boolean | undefined> = writable<boolean | undefined>(false)
 	let showAssets: Writable<boolean | undefined> = writable<boolean | undefined>(true)
@@ -130,6 +135,10 @@
 		notes?: FlowNote[]
 		chatInputEnabled?: boolean
 		multiSelectEnabled?: boolean
+		onDeleteMultiple?: (ids: string[]) => void
+		onDuplicateMultiple?: (ids: string[]) => void
+		onMoveMultiple?: (ids: string[]) => void
+		movingIds?: string[]
 		onDelete?: (id: string) => void
 		onInsert?: (detail: {
 			sourceId?: string
@@ -149,6 +158,7 @@
 		onDeleteBranch?: (detail: { id: string; index: number }) => Promise<void>
 		onChangeId?: (detail: { id: string; newId: string; deps: Record<string, string[]> }) => void
 		onMove?: (id: string) => void
+		onDuplicate?: (id: string) => void
 		onUpdateMock?: (detail: { mock: FlowModule['mock']; id: string }) => void
 		onTestUpTo?: ((id: string) => void) | undefined
 		onSelectedIteration?: onSelectedIteration
@@ -174,6 +184,7 @@
 		onInsert = undefined,
 		onDelete = undefined,
 		onMove = undefined,
+		onDuplicate = undefined,
 		onDeleteBranch = undefined,
 		onNewBranch = undefined,
 		onSelect = undefined,
@@ -230,7 +241,11 @@
 		diffBeforeFlow = undefined,
 		currentInputSchema = undefined,
 		markRemovedAsShadowed = false,
-		multiSelectEnabled = false
+		multiSelectEnabled = false,
+		onDeleteMultiple = undefined,
+		onDuplicateMultiple = undefined,
+		onMoveMultiple = undefined,
+		movingIds = undefined
 	}: Props = $props()
 
 	// Initialize note manager with fine-grained reactivity
@@ -392,6 +407,9 @@
 		move: (detail) => {
 			onMove?.(detail.id)
 		},
+		duplicate: (detail) => {
+			onDuplicate?.(detail.id)
+		},
 		selectedIteration: (detail) => {
 			onSelectedIteration?.(detail)
 		},
@@ -472,6 +490,15 @@
 
 	let canUseDiffDrawer = $derived(diffBeforeFlow || moduleActions || editMode)
 
+	// Derived state for multi-select operations
+	let resolvedModuleIds = $derived(
+		resolveSelectedModuleIds(selectionManager.selectedIds, effectiveModules ?? [])
+	)
+	let canMoveSelected = $derived(
+		resolvedModuleIds.length > 0 &&
+			areContiguousSiblings(locateModules(resolvedModuleIds, effectiveModules ?? []))
+	)
+
 	// Initialize moduleTracker with effectiveModules
 	let moduleTracker = $state(new ChangeTracker<FlowModule[]>([]))
 
@@ -530,6 +557,31 @@
 				exitNoteMode?.()
 			}
 		}
+		if ((event.key === 'Backspace' || event.key === 'Delete') && editMode) {
+			const active = document.activeElement
+			if (active && active !== document.body && !flowContainer?.contains(active)) {
+				return
+			}
+			if (
+				active instanceof HTMLInputElement ||
+				active instanceof HTMLTextAreaElement ||
+				active?.getAttribute('contenteditable') === 'true'
+			) {
+				return
+			}
+			if (noteManager.selectedNoteId && noteEditorContext) {
+				noteEditorContext.noteEditor.deleteNote(noteManager.selectedNoteId)
+				noteManager.clearNoteSelection()
+				return
+			}
+			if (resolvedModuleIds.length > 1) {
+				onDeleteMultiple?.(resolvedModuleIds)
+			} else if (resolvedModuleIds.length === 1) {
+				onDelete?.(resolvedModuleIds[0])
+			} else if (selectedId) {
+				onDelete?.(selectedId)
+			}
+		}
 	}
 
 	async function updateStores() {
@@ -929,6 +981,7 @@
 				elevateNodesOnSelect={false}
 				{proOptions}
 				multiSelectionKey={'Shift'}
+				deleteKey={null}
 				nodesDraggable={false}
 				--background-color={false}
 			>
@@ -940,8 +993,17 @@
 
 				{#if multiSelectEnabled}
 					<SelectionBoundingBox
-						selectedNodes={selectionManager.selectedIds}
+						selectedNodes={selectionManager.selectedIds.filter(id =>
+							nodesWithOffset.some(n => n.id === id)
+						)}
 						allNodes={nodesWithOffset as (Node & { type: string })[]}
+						onDeleteSelected={() => onDeleteMultiple?.(resolvedModuleIds)}
+						onDuplicateSelected={() => onDuplicateMultiple?.(resolvedModuleIds)}
+						onMoveSelected={() => onMoveMultiple?.(resolvedModuleIds)}
+						onCancelMove={() => onMoveMultiple?.(movingIds ?? [])}
+						{canMoveSelected}
+						isMoving={movingIds != null && movingIds.length > 0}
+						{resolvedModuleIds}
 					/>
 				{/if}
 
@@ -1056,4 +1118,8 @@
 		display: none;
 		pointer-events: none;
 	}
+
+	:global(.svelte-flow__selection-wrapper) {
+		pointer-events: none !important;
+	}
 </style>
diff --git a/frontend/src/lib/components/graph/MoveHandleButton.svelte b/frontend/src/lib/components/graph/MoveHandleButton.svelte
new file mode 100644
index 0000000000..d077f0d03d
--- /dev/null
+++ b/frontend/src/lib/components/graph/MoveHandleButton.svelte
@@ -0,0 +1,74 @@
+<script lang="ts">
+	import { stopPropagation, preventDefault } from 'svelte/legacy'
+	import { onDestroy } from 'svelte'
+	import { Move } from 'lucide-svelte'
+	import { twMerge } from 'tailwind-merge'
+	import type { MoveManager } from './moveManager.svelte'
+
+	interface Props {
+		moveManager: MoveManager
+		moduleId: string
+		selectedIds?: string[]
+		singleNode?: boolean
+		visible?: boolean
+		onClickMove?: () => void
+		class?: string
+	}
+
+	let {
+		moveManager,
+		moduleId,
+		selectedIds,
+		singleNode = false,
+		visible = true,
+		onClickMove,
+		class: extraClass
+	}: Props = $props()
+
+	let dragCleanup: (() => void) | undefined
+
+	function onPointerDown(e: Event) {
+		const pe = e as PointerEvent
+		const startX = pe.clientX
+		const startY = pe.clientY
+		let didDrag = false
+
+		function onMove(me: PointerEvent) {
+			const dx = me.clientX - startX
+			const dy = me.clientY - startY
+			if (!didDrag && Math.sqrt(dx * dx + dy * dy) > 5) {
+				didDrag = true
+				moveManager.startDrag(moduleId, startX, startY, singleNode ? undefined : selectedIds)
+			}
+		}
+
+		function onUp() {
+			document.removeEventListener('pointermove', onMove)
+			document.removeEventListener('pointerup', onUp)
+			dragCleanup = undefined
+			if (!didDrag) {
+				onClickMove?.()
+			}
+		}
+
+		document.addEventListener('pointermove', onMove)
+		document.addEventListener('pointerup', onUp)
+		dragCleanup = onUp
+	}
+
+	onDestroy(() => dragCleanup?.())
+</script>
+
+<button
+	class={twMerge(
+		'center-center p-1 text-secondary shadow-sm bg-surface duration-0 hover:bg-surface-tertiary cursor-grab',
+		visible ? '' : '!hidden',
+		'shadow-md rounded-md',
+		'touch-none',
+		extraClass
+	)}
+	onpointerdown={stopPropagation(preventDefault(onPointerDown))}
+	title="Move"
+>
+	<Move size={12} />
+</button>
diff --git a/frontend/src/lib/components/graph/SelectionBoundingBox.svelte b/frontend/src/lib/components/graph/SelectionBoundingBox.svelte
index 5faff92d28..e1248b52ef 100644
--- a/frontend/src/lib/components/graph/SelectionBoundingBox.svelte
+++ b/frontend/src/lib/components/graph/SelectionBoundingBox.svelte
@@ -1,23 +1,46 @@
 <script lang="ts">
 	import { ViewportPortal, type Node } from '@xyflow/svelte'
 	import { calculateNodesBoundsWithOffset } from './util'
-	import { StickyNote } from 'lucide-svelte'
-	import Button from '../common/button/Button.svelte'
+	import { StickyNote, Move, Copy, Trash2, EllipsisVertical } from 'lucide-svelte'
+	import { Button } from '../common'
+	import DropdownV2 from '../DropdownV2.svelte'
 	import { getNoteEditorContext } from './noteEditor.svelte'
 	import { getGraphContext } from './graphContext'
+	import MoveHandleButton from './MoveHandleButton.svelte'
 	import { tick } from 'svelte'
+	import { isMac, type Item } from '$lib/utils'
 
 	interface Props {
 		selectedNodes: string[]
 		allNodes: (Node & { type: string })[]
+		onDeleteSelected?: () => void
+		onDuplicateSelected?: () => void
+		onMoveSelected?: () => void
+		onCancelMove?: () => void
+		canMoveSelected?: boolean
+		isMoving?: boolean
+		resolvedModuleIds?: string[]
 	}
 
-	let { selectedNodes, allNodes }: Props = $props()
+	let {
+		selectedNodes,
+		allNodes,
+		onDeleteSelected,
+		onDuplicateSelected,
+		onMoveSelected,
+		onCancelMove,
+		canMoveSelected = false,
+		isMoving = false,
+		resolvedModuleIds = []
+	}: Props = $props()
+
+	let resolvedCount = $derived(resolvedModuleIds.length)
 
 	// Get NoteEditor context for group note creation
 	const noteEditorContext = getNoteEditorContext()
-	// Get Graph context for clearFlowSelection function
+	// Get Graph context for clearFlowSelection function and moveManager
 	const graphContext = getGraphContext()
+	const moveManager = graphContext?.moveManager
 
 	function handleAddGroupNote() {
 		if (selectedNodes.length > 0 && noteEditorContext?.noteEditor && graphContext) {
@@ -32,7 +55,38 @@
 		}
 	}
 
-	let bounds = $derived(() => {
+	let menuItems: Item[] = $derived([
+		{
+			displayName: 'Move',
+			icon: Move,
+			action: () => onMoveSelected?.(),
+			disabled: !canMoveSelected
+		},
+		{
+			displayName: 'Duplicate',
+			icon: Copy,
+			action: () => onDuplicateSelected?.()
+		},
+		{
+			displayName: `Delete (${resolvedCount})`,
+			icon: Trash2,
+			type: 'delete',
+			shortcut: isMac() ? '⌫' : 'Del',
+			action: () => onDeleteSelected?.()
+		},
+		...(noteEditorContext?.noteEditor
+			? [
+					{
+						displayName: 'Add note',
+						icon: StickyNote,
+						separatorTop: true,
+						action: handleAddGroupNote
+					}
+				]
+			: [])
+	])
+
+	let bounds = $derived.by(() => {
 		if (selectedNodes.length === 0) {
 			return null
 		}
@@ -53,8 +107,8 @@
 	})
 </script>
 
-{#if bounds() && selectedNodes.length > 1}
-	{@const currentBounds = bounds()!}
+{#if bounds && selectedNodes.length > 1}
+	{@const currentBounds = bounds!}
 	<ViewportPortal target="front">
 		<div
 			class={'absolute cursor-pointer bg-surface-selected/40 rounded-md pointer-events-none'}
@@ -63,20 +117,37 @@
 			style:height="{currentBounds.height}px"
 			style:z-index="10"
 		>
-			<!-- Add Group Note Button positioned in top-right corner -->
-			{#if noteEditorContext?.noteEditor}
-				<div class="absolute -top-4 -right-1 z-20" style="pointer-events: auto;">
-					<Button
-						unifiedSize="sm"
-						variant="accent"
-						title="Create group note ({selectedNodes.length} nodes)"
-						onclick={handleAddGroupNote}
-						startIcon={{ icon: StickyNote }}
+			<div
+				class="absolute -top-4 -right-1 z-20 flex gap-2 items-center"
+				style="pointer-events: auto;"
+			>
+				{#if isMoving}
+					<Button variant="accent" onClick={() => onCancelMove?.()} size="xs" destructive
+						>Cancel move</Button
 					>
-						Create group note ({selectedNodes.length} nodes)
-					</Button>
-				</div>
-			{/if}
+				{:else if resolvedCount > 0}
+					{#if canMoveSelected && moveManager && resolvedModuleIds.length > 0}
+						<div class="">
+							<MoveHandleButton
+								{moveManager}
+								moduleId={resolvedModuleIds[0]}
+								selectedIds={resolvedModuleIds}
+								onClickMove={() => onMoveSelected?.()}
+							/>
+						</div>
+					{/if}
+					<DropdownV2 items={menuItems} size="sm" placement="right-start">
+						{#snippet buttonReplacement()}
+							<button
+								class="center-center p-1 rounded-md shadow-md bg-surface text-secondary hover:bg-surface-tertiary"
+								title="Actions"
+							>
+								<EllipsisVertical size={12} />
+							</button>
+						{/snippet}
+					</DropdownV2>
+				{/if}
+			</div>
 		</div>
 	</ViewportPortal>
 {/if}
diff --git a/frontend/src/lib/components/graph/compoundLayout.ts b/frontend/src/lib/components/graph/compoundLayout.ts
index 9adeb951c9..acb7094ed6 100644
--- a/frontend/src/lib/components/graph/compoundLayout.ts
+++ b/frontend/src/lib/components/graph/compoundLayout.ts
@@ -495,7 +495,6 @@ function layoutLevel(
  */
 export function compoundLayout(
 	nodes: { id: string; parentIds?: string[] }[],
-	_edges: { source: string; target: string }[],
 	constants?: Partial<LayoutConstants>
 ): LayoutResult {
 	const c: LayoutConstants = {
diff --git a/frontend/src/lib/components/graph/graphBuilder.svelte.ts b/frontend/src/lib/components/graph/graphBuilder.svelte.ts
index cddc76545d..ee45c4dc95 100644
--- a/frontend/src/lib/components/graph/graphBuilder.svelte.ts
+++ b/frontend/src/lib/components/graph/graphBuilder.svelte.ts
@@ -56,6 +56,7 @@ export type GraphEventHandlers = {
 	delete: (detail: { id: string }, label: string) => void
 	newBranch: (id: string) => void
 	move: (detail: { id: string }) => void
+	duplicate: (detail: { id: string }) => void
 	selectedIteration: onSelectedIteration
 	changeId: (newId: string) => void
 	simplifyFlow: (b: boolean) => void
diff --git a/frontend/src/lib/components/graph/moveManager.svelte.ts b/frontend/src/lib/components/graph/moveManager.svelte.ts
index 7f13c44171..605c4b849a 100644
--- a/frontend/src/lib/components/graph/moveManager.svelte.ts
+++ b/frontend/src/lib/components/graph/moveManager.svelte.ts
@@ -22,6 +22,7 @@ export type DropZoneRegistration = {
 
 type DragInfo = {
 	moduleId: string
+	selectedIds?: string[]
 }
 
 /**
@@ -54,22 +55,13 @@ export function getSubflowNodeIds(
 	// Include child nodes (e.g. asset/AI tool nodes) of nodes added via edges.
 	// Nodes found through disableMoveIds (like inner module "b") may have children
 	// ("b-asset-in-...") that weren't caught by the initial prefix match on moduleId.
-	// Only scan children of edge-added nodes that aren't already covered by the
-	// moduleId prefix (those children were already captured in the first pass).
-	const newFromEdges: string[] = []
-	for (const id of nodeIds) {
-		if (id !== moduleId && !id.startsWith(nodeIdPrefix)) {
-			newFromEdges.push(id)
-		}
-	}
-	if (newFromEdges.length > 0) {
-		for (const n of allNodes) {
-			if (!nodeIds.has(n.id)) {
-				for (const id of newFromEdges) {
-					if (n.id.startsWith(id + '-')) {
-						nodeIds.add(n.id)
-						break
-					}
+	const edgeMatchedIds = [...nodeIds]
+	for (const n of allNodes) {
+		if (!nodeIds.has(n.id)) {
+			for (const id of edgeMatchedIds) {
+				if (n.id.startsWith(id + '-')) {
+					nodeIds.add(n.id)
+					break
 				}
 			}
 		}
@@ -88,35 +80,57 @@ export class MoveManager {
 	/** The module ID currently being moved via legacy click-to-move */
 	movingModuleId = $state<string | undefined>(undefined)
 
+	/** Multiple module IDs being moved together (multi-select move) */
+	movingIds = $state<string[] | undefined>(undefined)
+
 	toggleMoving(id: string) {
 		if (this.movingModuleId === id) {
 			this.movingModuleId = undefined
 			this.#updateDraggedNodeIds(undefined)
 		} else {
 			this.movingModuleId = id
-			this.#updateDraggedNodeIds(id)
+			this.#updateDraggedNodeIds([id])
+		}
+	}
+
+	toggleMovingMultiple(ids: string[]) {
+		if (
+			this.movingIds &&
+			this.movingIds.length === ids.length &&
+			this.movingIds.every((id, i) => id === ids[i])
+		) {
+			this.movingModuleId = undefined
+			this.movingIds = undefined
+			this.#updateDraggedNodeIds(undefined)
+		} else {
+			this.movingModuleId = ids[0]
+			this.movingIds = ids
+			this.#updateDraggedNodeIds(ids)
 		}
 	}
 
 	setMoving(id: string) {
 		this.movingModuleId = id
-		this.#updateDraggedNodeIds(id)
+		this.#updateDraggedNodeIds([id])
 	}
 
 	clearMoving() {
 		this.movingModuleId = undefined
+		this.movingIds = undefined
 		this.#updateDraggedNodeIds(undefined)
 	}
 
-	#computeDraggedNodeIds: ((moduleId: string) => Set<string>) | undefined
+	#computeDraggedNodeIds: ((moduleIds: string[]) => Set<string>) | undefined
 
-	setComputeDraggedNodeIds(fn: (moduleId: string) => Set<string>) {
+	setComputeDraggedNodeIds(fn: (moduleIds: string[]) => Set<string>) {
 		this.#computeDraggedNodeIds = fn
 	}
 
-	#updateDraggedNodeIds(moduleId: string | undefined) {
+	#updateDraggedNodeIds(moduleIds: string[] | undefined) {
 		this.draggedNodeIds =
-			moduleId && this.#computeDraggedNodeIds ? this.#computeDraggedNodeIds(moduleId) : new Set()
+			moduleIds && moduleIds.length > 0 && this.#computeDraggedNodeIds
+				? this.#computeDraggedNodeIds(moduleIds)
+				: new Set()
 	}
 
 	#screenToFlowPosition: ((pos: { x: number; y: number }) => { x: number; y: number }) | undefined
@@ -134,14 +148,19 @@ export class MoveManager {
 		this.#registeredDropZones.delete(edgeId)
 	}
 
-	startDrag(moduleId: string, screenX: number, screenY: number) {
+	startDrag(moduleId: string, screenX: number, screenY: number, selectedIds?: string[]) {
 		// Clear any active click-to-move so only drag mode is active
 		this.movingModuleId = undefined
-		this.dragging = { moduleId }
+		this.dragging = { moduleId, selectedIds }
 		this.ghostScreenX = screenX
 		this.ghostScreenY = screenY
 		this.nearestDropZone = undefined
-		this.#updateDraggedNodeIds(moduleId)
+		// Compute dragged node IDs for the primary module plus any additional selected modules
+		const allIds =
+			selectedIds && selectedIds.length > 0
+				? [moduleId, ...selectedIds.filter((id) => id !== moduleId)]
+				: [moduleId]
+		this.#updateDraggedNodeIds(allIds)
 	}
 
 	updateDrag(screenX: number, screenY: number) {
diff --git a/frontend/src/lib/components/graph/noteManager.svelte.ts b/frontend/src/lib/components/graph/noteManager.svelte.ts
index 6e605327a8..3ce16495a8 100644
--- a/frontend/src/lib/components/graph/noteManager.svelte.ts
+++ b/frontend/src/lib/components/graph/noteManager.svelte.ts
@@ -133,6 +133,13 @@ export class NoteManager {
 		}
 	}
 
+	/**
+	 * Get the currently selected note ID
+	 */
+	get selectedNoteId(): string | undefined {
+		return this.#selectedNoteId
+	}
+
 	/**
 	 * Check if a note is currently selected
 	 */
diff --git a/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte b/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte
index de74cd22cd..8f1ca0017f 100644
--- a/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte
+++ b/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte
@@ -213,7 +213,7 @@
 
 	{#if moveManager?.movingModuleId && data?.insertable}
 		<div class="edgeButtonContainer nodrag nopan" style:transform="translate(-50%, -50%)">
-			{#if !data.disableMoveIds?.includes(moveManager.movingModuleId)}
+			{#if !(moveManager.movingIds ?? [moveManager.movingModuleId]).some((id) => data.disableMoveIds?.includes(id))}
 				<button
 					title="Paste module"
 					onclick={() => {
diff --git a/frontend/src/lib/components/graph/renderers/nodes/AssetNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/AssetNode.svelte
index 87a86d4ad5..64eb8e1c08 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/AssetNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/AssetNode.svelte
@@ -233,7 +233,7 @@
 	import type { Edge, Node } from '@xyflow/svelte'
 
 	import { getNodeColorClasses, NODE } from '../../util'
-	import { globalDbManagerDrawer, userStore } from '$lib/stores'
+	import { userStore } from '$lib/stores'
 	import { deepEqual } from 'fast-equals'
 	import { slide } from 'svelte/transition'
 	import AssetColumnBadges from '$lib/components/assets/AssetColumnBadges.svelte'
@@ -311,7 +311,6 @@
 							noText
 							buttonVariant="accent"
 							s3FilePicker={flowGraphAssetsCtx?.val.s3FilePicker}
-							dbManagerDrawer={globalDbManagerDrawer.val}
 							_resourceMetadata={cachedResourceMetadata}
 						/>
 					</div>
diff --git a/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte
index 251192b0d8..df9631db0e 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte
@@ -1,12 +1,11 @@
 <script lang="ts">
 	import MapItem from '$lib/components/flows/map/MapItem.svelte'
-	import { GitBranchPlus } from 'lucide-svelte'
+	import { GitBranchPlus, Move, Copy, Trash2, StickyNote } from 'lucide-svelte'
 	import NodeWrapper from './NodeWrapper.svelte'
 	import type { ModuleN } from '../../graphBuilder.svelte'
 	import { jobToGraphModuleState } from '$lib/components/modulesTest.svelte'
 	import { getNoteEditorContext } from '../../noteEditor.svelte'
-	import type { ContextMenuItem } from '../../../common/contextmenu/ContextMenu.svelte'
-	import { addGroupNoteContextMenuItem } from '../../noteUtils.svelte'
+	import { isMac, type Item } from '$lib/utils'
 
 	interface Props {
 		data: ModuleN['data']
@@ -43,12 +42,48 @@
 	})
 
 	// Define context menu items
-	const contextMenuItems: ContextMenuItem[] = $derived(
-		data.editMode ? [addGroupNoteContextMenuItem(data.id, noteEditorContext)] : []
+	let noteDisabled = $derived(
+		!noteEditorContext?.noteEditor ||
+		(noteEditorContext?.noteEditor?.isNodeOnlyMemberOfGroupNote(data.id) ?? false)
+	)
+
+	const menuItems: Item[] = $derived(
+		data.editMode
+			? [
+					{
+						displayName: 'Move',
+						icon: Move,
+						action: () => data.eventHandlers.move({ id: data.id })
+					},
+					{
+						displayName: 'Duplicate',
+						icon: Copy,
+						action: () => data.eventHandlers.duplicate({ id: data.id })
+					},
+					{
+						displayName: 'Delete',
+						icon: Trash2,
+						type: 'delete' as const,
+						shortcut: isMac() ? '⌫' : 'Del',
+						action: () => data.eventHandlers.delete({ id: data.id }, '')
+					},
+					{
+						displayName: 'Add note',
+						icon: StickyNote,
+						separatorTop: true,
+						disabled: noteDisabled,
+						action: () => {
+							if (noteEditorContext?.noteEditor && !noteDisabled) {
+								noteEditorContext.noteEditor.createGroupNote([data.id])
+							}
+						}
+					}
+				]
+			: []
 	)
 </script>
 
-<NodeWrapper {contextMenuItems}>
+<NodeWrapper {menuItems}>
 	{#snippet children({ darkMode })}
 		<MapItem
 			moduleId={data.id}
@@ -56,6 +91,7 @@
 			insertable={data.insertable}
 			editMode={data.editMode}
 			moduleAction={data.moduleAction}
+			{menuItems}
 			annotation={flowJobs &&
 			(data.module.value.type === 'forloopflow' || data.module.value.type === 'whileloopflow')
 				? 'Iteration: ' +
diff --git a/frontend/src/lib/components/graph/renderers/nodes/NodeWrapper.svelte b/frontend/src/lib/components/graph/renderers/nodes/NodeWrapper.svelte
index 4b2907a53f..0563a32636 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/NodeWrapper.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/NodeWrapper.svelte
@@ -4,12 +4,14 @@
 	import { twMerge } from 'tailwind-merge'
 	import ContextMenu, { type ContextMenuItem } from '../../../common/contextmenu/ContextMenu.svelte'
 	import { getGraphContext } from '../../graphContext'
+	import type { Item } from '$lib/utils'
 
 	interface Props {
 		enableSourceHandle?: boolean
 		enableTargetHandle?: boolean
 		wrapperClass?: string
 		contextMenuItems?: ContextMenuItem[]
+		menuItems?: Item[]
 		/** xyflow node ID — used to fade nodes that are part of a moving subflow */
 		nodeId?: string
 		children?: import('svelte').Snippet<[any]>
@@ -20,10 +22,22 @@
 		enableTargetHandle = true,
 		wrapperClass = '',
 		contextMenuItems = undefined,
+		menuItems = undefined,
 		nodeId = undefined,
 		children
 	}: Props = $props()
 
+	let resolvedContextMenuItems: ContextMenuItem[] | undefined = $derived(
+		contextMenuItems ??
+			menuItems?.map((item) => ({
+				id: item.displayName,
+				label: item.displayName,
+				icon: item.icon,
+				disabled: item.disabled,
+				onClick: item.action as (() => void) | undefined
+			}))
+	)
+
 	const { moveManager } = getGraphContext()
 
 	let faded = $derived(
@@ -35,8 +49,8 @@
 
 <DarkModeObserver bind:darkMode />
 
-{#if contextMenuItems && contextMenuItems.length > 0}
-	<ContextMenu items={contextMenuItems}>
+{#if resolvedContextMenuItems && resolvedContextMenuItems.length > 0}
+	<ContextMenu items={resolvedContextMenuItems}>
 		<div class={twMerge('relative rounded-md', faded ? 'opacity-30' : '', wrapperClass)}>
 			{@render children?.({ darkMode })}
 		</div>
diff --git a/frontend/src/lib/components/graph/selectionUtils.svelte.ts b/frontend/src/lib/components/graph/selectionUtils.svelte.ts
index 8abc7fa563..daa9de3ecf 100644
--- a/frontend/src/lib/components/graph/selectionUtils.svelte.ts
+++ b/frontend/src/lib/components/graph/selectionUtils.svelte.ts
@@ -78,13 +78,24 @@ export class SelectionManager {
 		}
 
 		// If the new selection is the same as the current selection, do nothing
-		if (JSON.stringify(nodes) === JSON.stringify($state.snapshot(this.#selectedNodes))) {
+		const newIds = nodes.map((n) => n.id).join(',')
+		const currentIds = this.#selectedNodes.map((n) => n.id).join(',')
+		if (newIds === currentIds) {
 			return
 		}
 
 		this.#selectedNodes = nodes
 	}
 
+	// Select multiple nodes by their IDs
+	selectByIds(ids: string[]) {
+		if (!ids || ids.length === 0) {
+			this.clearSelection()
+			return
+		}
+		this.#selectedNodes = ids.map((id) => ({ id }))
+	}
+
 	// Clear all selections
 	clearSelection() {
 		this.#selectedNodes = [{ id: 'settings' }]
diff --git a/frontend/src/lib/components/sidebar/FavoriteMenu.svelte b/frontend/src/lib/components/sidebar/FavoriteMenu.svelte
index d0a14143ca..056bca1489 100644
--- a/frontend/src/lib/components/sidebar/FavoriteMenu.svelte
+++ b/frontend/src/lib/components/sidebar/FavoriteMenu.svelte
@@ -10,7 +10,7 @@
 			flow: `/flows/get/${path}`,
 			app: `/apps/get/${path}`,
 			raw_app: `/apps_raw/get/${path}`,
-			asset: `#dbmanager:${path}`
+			asset: '#'
 		}[kind]
 	}
 	export function getFavoriteLabel(path: string, kind: FavoriteKind): string {
diff --git a/frontend/src/lib/components/workspaceSettings/CustomInstanceDbSelect.svelte b/frontend/src/lib/components/workspaceSettings/CustomInstanceDbSelect.svelte
index b74d7c9b92..44a4dcc6bf 100644
--- a/frontend/src/lib/components/workspaceSettings/CustomInstanceDbSelect.svelte
+++ b/frontend/src/lib/components/workspaceSettings/CustomInstanceDbSelect.svelte
@@ -8,14 +8,12 @@
 	import CustomInstanceDbWizardModal from './CustomInstanceDbWizardModal.svelte'
 	import { ArrowRight, TriangleAlert } from 'lucide-svelte'
 	import type { ConfirmationModalHandle } from '../common/confirmationModal/asyncConfirmationModal.svelte'
-	import DBManagerDrawer from '../DBManagerDrawer.svelte'
 	import type { Snippet } from 'svelte'
 
 	type Props = {
 		value: string | undefined
 		customInstanceDbs: ResourceReturn<ListCustomInstanceDbsResponse>
 		confirmationModal: ConfirmationModalHandle
-		dbManagerDrawer: DBManagerDrawer | undefined
 		wizardBottomHint?: Snippet | undefined
 		class?: string
 		tag?: CustomInstanceDbTag
@@ -24,7 +22,6 @@
 		value = $bindable(),
 		customInstanceDbs,
 		confirmationModal,
-		dbManagerDrawer,
 		wizardBottomHint,
 		class: className,
 		tag
@@ -90,7 +87,6 @@
 <CustomInstanceDbWizardModal
 	{customInstanceDbs}
 	{confirmationModal}
-	{dbManagerDrawer}
 	{tag}
 	bottomHint={wizardBottomHint}
 	bind:opened={
diff --git a/frontend/src/lib/components/workspaceSettings/CustomInstanceDbWizardModal.svelte b/frontend/src/lib/components/workspaceSettings/CustomInstanceDbWizardModal.svelte
index b69f3512af..12338a4bae 100644
--- a/frontend/src/lib/components/workspaceSettings/CustomInstanceDbWizardModal.svelte
+++ b/frontend/src/lib/components/workspaceSettings/CustomInstanceDbWizardModal.svelte
@@ -24,7 +24,6 @@
 	type Props = {
 		customInstanceDbs: ResourceReturn<ListCustomInstanceDbsResponse>
 		confirmationModal: ConfirmationModalHandle
-		dbManagerDrawer: any | undefined
 		bottomHint?: Snippet | undefined
 		opened: { status: CustomInstanceDb | undefined; dbname: string } | undefined
 		tag?: CustomInstanceDbTag
@@ -33,7 +32,6 @@
 	let {
 		customInstanceDbs,
 		confirmationModal,
-		dbManagerDrawer,
 		bottomHint,
 		opened = $bindable(),
 		tag
@@ -76,7 +74,6 @@
 						class="flex-1"
 						asset={{ kind: 'resource', path: 'CUSTOM_INSTANCE_DB/' + dbname }}
 						_resourceMetadata={{ resource_type: 'postgresql' }}
-						{dbManagerDrawer}
 						disabled={!$isCustomInstanceDbEnabled || !enableManageButton}
 						onClick={() => (opened = undefined)}
 					/>
diff --git a/frontend/src/lib/components/workspaceSettings/DataTableSettings.svelte b/frontend/src/lib/components/workspaceSettings/DataTableSettings.svelte
index 188d736e9f..6410e6a1af 100644
--- a/frontend/src/lib/components/workspaceSettings/DataTableSettings.svelte
+++ b/frontend/src/lib/components/workspaceSettings/DataTableSettings.svelte
@@ -62,7 +62,7 @@
 	import { random_adj } from '../random_positive_adjetive'
 	import { sendUserToast } from '$lib/toast'
 	import { SettingService, WorkspaceService, type GetSettingsResponse } from '$lib/gen'
-	import { globalDbManagerDrawer, workspaceStore } from '$lib/stores'
+	import { workspaceStore } from '$lib/stores'
 	import { createAsyncConfirmationModal } from '../common/confirmationModal/asyncConfirmationModal.svelte'
 	import ConfirmationModal from '../common/confirmationModal/ConfirmationModal.svelte'
 	import { resource } from 'runed'
@@ -141,7 +141,6 @@
 	}
 
 	let confirmationModal = createAsyncConfirmationModal()
-	let dbManagerDrawer = $derived(globalDbManagerDrawer.val)
 	let dirtyMap = $derived.by(() => {
 		const map: Record<string, boolean> = {}
 		for (let i = 0; i < tempSettings.dataTables.length; i++) {
@@ -245,7 +244,6 @@
 								<CustomInstanceDbSelect
 									class="flex-1"
 									{confirmationModal}
-									{dbManagerDrawer}
 									{customInstanceDbs}
 									bind:value={dataTable.database.resource_path}
 									tag="datatable"
@@ -265,7 +263,6 @@
 								<ExploreAssetButton
 									class="h-9"
 									asset={{ kind: 'datatable', path: dataTable.name }}
-									{dbManagerDrawer}
 									disabled
 								/>
 							</svelte:fragment>
@@ -275,7 +272,6 @@
 						<ExploreAssetButton
 							class="h-9"
 							asset={{ kind: 'datatable', path: dataTable.name }}
-							{dbManagerDrawer}
 						/>
 					{/if}
 				</Cell>
diff --git a/frontend/src/lib/components/workspaceSettings/DucklakeSettings.svelte b/frontend/src/lib/components/workspaceSettings/DucklakeSettings.svelte
index ac8c20377d..c264219922 100644
--- a/frontend/src/lib/components/workspaceSettings/DucklakeSettings.svelte
+++ b/frontend/src/lib/components/workspaceSettings/DucklakeSettings.svelte
@@ -68,7 +68,7 @@
 	import { SettingService, WorkspaceService } from '$lib/gen'
 	import type { GetSettingsResponse } from '$lib/gen'
 
-	import { globalDbManagerDrawer, workspaceStore } from '$lib/stores'
+	import { workspaceStore } from '$lib/stores'
 	import { sendUserToast } from '$lib/toast'
 	import ExploreAssetButton from '../ExploreAssetButton.svelte'
 	import Tooltip from '../Tooltip.svelte'
@@ -187,7 +187,6 @@
 			'Where the data is actually stored, in parquet format. You need to configure a workspace storage first'
 	}
 
-	let dbManagerDrawer = $derived(globalDbManagerDrawer.val)
 	let confirmationModal = createAsyncConfirmationModal()
 </script>
 
@@ -293,7 +292,6 @@
 									bind:value={ducklake.catalog.resource_path}
 									{customInstanceDbs}
 									{confirmationModal}
-									{dbManagerDrawer}
 									tag="ducklake"
 								>
 									{#snippet wizardBottomHint()}
@@ -372,7 +370,6 @@
 						{:else}
 							<ExploreAssetButton
 								asset={{ kind: 'ducklake', path: ducklake.name }}
-								{dbManagerDrawer}
 							/>
 						{/if}
 					</div>
diff --git a/frontend/src/lib/infer.svelte.ts b/frontend/src/lib/infer.svelte.ts
index 419020631c..cbdfa95505 100644
--- a/frontend/src/lib/infer.svelte.ts
+++ b/frontend/src/lib/infer.svelte.ts
@@ -4,6 +4,13 @@ import { ChangeOnDeepInequality, MapResource } from './svelte5Utils.svelte'
 import { sqlDataTypeToJsTypeHeuristic } from './components/apps/components/display/dbtable/utils'
 import { chunkBy, clone, getQueryStmtCountHeuristic } from './utils'
 
+function extractErrorMessage(e: unknown): string {
+	if (e != null && typeof e === 'object' && 'body' in e) {
+		return (e as any).body?.error?.message ?? JSON.stringify(e)
+	}
+	return e instanceof Error ? e.message : JSON.stringify(e)
+}
+
 function computeQueryKey(query: InferAssetsSqlQueryDetails, workspace?: string) {
 	return `${query.source_kind}::${query.source_name}::${query.source_schema}::${workspace}::${query.query_string}`
 }
@@ -21,66 +28,26 @@ export function usePreparedAssetSqlQueries(
 			),
 		async (toFetch) => {
 			let queries = Object.entries(clone(toFetch))
-			// We only support preparing datatable source kinds for now.
-			queries = queries.filter(([_, q]) => q.source_kind === 'datatable')
+			queries = queries.filter(
+				([_, q]) => q.source_kind === 'datatable' || q.source_kind === 'ducklake'
+			)
 			// We only support preparing single-statement queries for now.
 			queries = queries.filter(([_, q]) => getQueryStmtCountHeuristic(q.query_string) === 1)
 
 			if (!queries?.length) return {}
-			try {
-				// We chunk by source_name to minimize the number of requests.
-				// For example if we have 10 queries on the same data table,
-				// we can prepare them all with a single script.
-				queries.sort((a, b) => a[1].source_name.localeCompare(b[1].source_name))
-				let results = (
-					await Promise.all(
-						chunkBy(queries, ([key, q]) => q.source_name).map(async (chunk) => {
-							console.log(
-								'Preparing chunk of queries:',
-								chunk.map(([_, q]) => q)
-							)
-							let queryContent = chunk
-								.flatMap(([key, q]) => [
-									q.source_schema ? `SET search_path TO ${q.source_schema};` : 'RESET search_path;',
-									q.query_string + (q.query_string.trim().endsWith(';') ? '' : ';')
-								])
-								.join('\n')
-							queryContent =
-								'-- prepare\n--result_collection=all_statements_first_row\n' + queryContent
+			let datatableQueries = queries.filter(([_, q]) => q.source_kind === 'datatable')
+			let ducklakeQueries = queries.filter(([_, q]) => q.source_kind === 'ducklake')
 
-							let res = (await JobService.runScriptPreviewAndWaitResult({
-								workspace: getWorkspace()!,
-								requestBody: {
-									language: 'postgresql',
-									content: queryContent,
-									args: { database: `datatable://${chunk[0][1]?.source_name}` }
-								}
-							})) as { error?: string; columns?: { name: string; type: string }[] }[]
+			let allResults: [string, PreparedAssetsSqlQuery][] = []
 
-							console.log('Prepared query content:', res)
-
-							let res2: [string, PreparedAssetsSqlQuery][] = res.map((r, i) => [
-								chunk[i][0],
-								r.columns
-									? {
-											columns: Object.fromEntries(
-												r.columns.map(({ name, type }) => [
-													name,
-													sqlDataTypeToJsTypeHeuristic(type)
-												])
-											)
-										}
-									: { error: r.error ?? "Couldn't prepare query " }
-							])
-							return res2
-						})
-					)
-				).flat()
-
-				return Object.fromEntries(results)
-			} catch (e) {
-				throw e
+			if (datatableQueries.length) {
+				allResults.push(...(await prepareDatatableQueries(datatableQueries, getWorkspace)))
 			}
+			if (ducklakeQueries.length) {
+				allResults.push(...(await prepareDucklakeQueries(ducklakeQueries, getWorkspace)))
+			}
+
+			return Object.fromEntries(allResults)
 		}
 	)
 
@@ -96,3 +63,104 @@ export function usePreparedAssetSqlQueries(
 		}
 	}
 }
+
+type QueryEntry = [string, InferAssetsSqlQueryDetails]
+
+function mapPrepareResults(
+	res: { error?: string; columns?: { name: string; type: string }[] }[],
+	chunk: QueryEntry[]
+): [string, PreparedAssetsSqlQuery][] {
+	if (res.length !== chunk.length) {
+		throw new Error(`Prepare results count mismatch: got ${res.length}, expected ${chunk.length}`)
+	}
+	return res.map((r, i) => [
+		chunk[i]?.[0],
+		r.columns
+			? {
+					columns: Object.fromEntries(
+						r.columns.map(({ name, type: t }) => [name, sqlDataTypeToJsTypeHeuristic(t)])
+					)
+				}
+			: { error: r.error ?? "Couldn't prepare query " }
+	])
+}
+
+async function prepareDatatableQueries(
+	queries: QueryEntry[],
+	getWorkspace: () => string | undefined
+): Promise<[string, PreparedAssetsSqlQuery][]> {
+	queries.sort((a, b) => a[1].source_name.localeCompare(b[1].source_name))
+	let results = (
+		await Promise.all(
+			chunkBy(queries, ([_, q]) => q.source_name).map(async (chunk) => {
+				let queryContent = chunk
+					.flatMap(([_, q]) => [
+						q.source_schema ? `SET search_path TO ${q.source_schema};` : 'RESET search_path;',
+						q.query_string + (q.query_string.trim().endsWith(';') ? '' : ';')
+					])
+					.join('\n')
+				queryContent = '-- prepare\n--result_collection=all_statements_first_row\n' + queryContent
+
+				try {
+					let res = (await JobService.runScriptPreviewAndWaitResult({
+						workspace: getWorkspace()!,
+						requestBody: {
+							language: 'postgresql',
+							content: queryContent,
+							args: { database: `datatable://${chunk[0][1]?.source_name}` }
+						}
+					})) as { error?: string; columns?: { name: string; type: string }[] }[]
+
+					return mapPrepareResults(res, chunk)
+				} catch (e) {
+					const error = extractErrorMessage(e)
+					return chunk.map(([key]) => [key, { error }] as [string, PreparedAssetsSqlQuery])
+				}
+			})
+		)
+	).flat()
+	return results
+}
+
+async function prepareDucklakeQueries(
+	queries: QueryEntry[],
+	getWorkspace: () => string | undefined
+): Promise<[string, PreparedAssetsSqlQuery][]> {
+	queries.sort((a, b) => a[1].source_name.localeCompare(b[1].source_name))
+	let results = (
+		await Promise.all(
+			chunkBy(queries, ([_, q]) => `${q.source_name}::${q.source_schema ?? ''}`).map(
+				async (chunk) => {
+					let sourceName = chunk[0][1].source_name
+					let sourceSchema = chunk[0][1].source_schema
+					let attachSetup = `ATTACH 'ducklake://${sourceName}' AS dl;\n`
+					attachSetup += sourceSchema ? `USE dl.${sourceSchema};\n` : `USE dl;\n`
+
+					let queryContent = chunk
+						.map(([_, q]) => q.query_string + (q.query_string.trim().endsWith(';') ? '' : ';'))
+						.join('\n')
+					queryContent =
+						'-- prepare\n--result_collection=all_statements_first_row\n' +
+						attachSetup +
+						queryContent
+
+					try {
+						let res = (await JobService.runScriptPreviewAndWaitResult({
+							workspace: getWorkspace()!,
+							requestBody: {
+								language: 'duckdb',
+								content: queryContent,
+								args: {}
+							}
+						})) as { error?: string; columns?: { name: string; type: string }[] }[]
+						return mapPrepareResults(res, chunk)
+					} catch (e) {
+						const error = extractErrorMessage(e)
+						return chunk.map(([key]) => [key, { error }] as [string, PreparedAssetsSqlQuery])
+					}
+				}
+			)
+		)
+	).flat()
+	return results
+}
diff --git a/frontend/src/lib/script_helpers.ts b/frontend/src/lib/script_helpers.ts
index f8fc95c8f3..6485970f27 100644
--- a/frontend/src/lib/script_helpers.ts
+++ b/frontend/src/lib/script_helpers.ts
@@ -30,6 +30,9 @@ def main():
     # wmill.setState(newState)
     # 4. Return the new rows
     # return range from (state to newState)
+    #
+    # For more complex states, consider using Data Tables:
+    # https://www.windmill.dev/docs/core_concepts/persistent_storage/data_tables
     return [1, 2, 3]`
 
 const PYTHON_INIT_CODE = `import os
@@ -554,6 +557,9 @@ export async function main() {
   // await wmill.setState(newState)
   // 4. Return the new rows
   // return range from (state to newState)
+  //
+  // For more complex states, consider using Data Tables:
+  // https://www.windmill.dev/docs/core_concepts/persistent_storage/data_tables
 
   return [1,2,3]
 
@@ -575,6 +581,9 @@ export async function main() {
   // await wmill.setState(newState)
   // 4. Return the new rows
   // return range from (state to newState)
+  //
+  // For more complex states, consider using Data Tables:
+  // https://www.windmill.dev/docs/core_concepts/persistent_storage/data_tables
 
   return [1,2,3]
 
@@ -599,6 +608,9 @@ func main() (interface{}, error) {
 	// 3. Compare the two states and update the internal state
 	wmill.SetState(4)
 	// 4. Return the new rows
+	//
+	// For more complex states, consider using Data Tables:
+	// https://www.windmill.dev/docs/core_concepts/persistent_storage/data_tables
 
 	return state, nil
 
diff --git a/frontend/src/lib/stores.ts b/frontend/src/lib/stores.ts
index a397cb4b7f..6a9a8e7805 100644
--- a/frontend/src/lib/stores.ts
+++ b/frontend/src/lib/stores.ts
@@ -14,6 +14,7 @@ import {
 import { getLocalSetting, type StateStore } from './utils'
 import { createState } from './svelte5Utils.svelte'
 import { DEFAULT_HUB_BASE_URL } from './hub'
+import type { DbManagerUriState } from './components/dbManagerDrawerModel.svelte'
 
 export interface UserExt {
 	email: string
@@ -126,9 +127,7 @@ export const codeCompletionSessionEnabled = writable<boolean>(
 
 export const usedTriggerKinds = writable<string[]>([])
 
-export let globalDbManagerDrawer: StateStore<any | undefined> = createState({
-	val: undefined
-})
+export let globalDbManagerDrawer: StateStore<DbManagerUriState | undefined> = { val: undefined }
 
 type SQLBaseSchema = {
 	[schemaKey: string]: {
diff --git a/frontend/src/lib/svelte5UtilsKit.svelte.ts b/frontend/src/lib/svelte5UtilsKit.svelte.ts
index cadd2dee1e..921d41614e 100644
--- a/frontend/src/lib/svelte5UtilsKit.svelte.ts
+++ b/frontend/src/lib/svelte5UtilsKit.svelte.ts
@@ -107,9 +107,10 @@ export function useSearchParams<S extends z.ZodType>(schema: S): SearchParamsRes
 				} else {
 					sp.set(key, serializeParam(v))
 				}
+				const hash = window.location.hash
 				const newUrl = sp.toString()
-					? `${window.location.pathname}?${sp}`
-					: window.location.pathname
+					? `${window.location.pathname}?${sp}${hash}`
+					: `${window.location.pathname}${hash}`
 				history.replaceState(history.state, '', newUrl)
 			},
 			enumerable: true,
diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts
index 0847fc35cb..496dba427b 100644
--- a/frontend/src/lib/utils.ts
+++ b/frontend/src/lib/utils.ts
@@ -17,6 +17,7 @@ export { sendUserToast }
 import type { AnyMeltElement } from '@melt-ui/svelte'
 import type { TriggerKind } from './components/triggers'
 import { stateSnapshot } from './svelte5Utils.svelte'
+
 export namespace OpenApi {
 	export enum OpenApiVersion {
 		V2,
@@ -1495,6 +1496,7 @@ export type Item = {
 	tooltip?: string
 	separatorTop?: boolean
 	submenuItems?: Item[]
+	shortcut?: string
 }
 
 export function isObjectTooBig(obj: any): boolean {
diff --git a/frontend/src/routes/(root)/(logged)/+layout.svelte b/frontend/src/routes/(root)/(logged)/+layout.svelte
index 4260bbeede..e9b1884df2 100644
--- a/frontend/src/routes/(root)/(logged)/+layout.svelte
+++ b/frontend/src/routes/(root)/(logged)/+layout.svelte
@@ -11,13 +11,7 @@
 		UserService,
 		WorkspaceService
 	} from '$lib/gen'
-	import {
-		capitalize,
-		classNames,
-		getModifierKey,
-		parseDbInputFromAssetSyntax,
-		sendUserToast
-	} from '$lib/utils'
+	import { capitalize, classNames, getModifierKey, sendUserToast } from '$lib/utils'
 	import WorkspaceMenu from '$lib/components/sidebar/WorkspaceMenu.svelte'
 	import SidebarContent from '$lib/components/sidebar/SidebarContent.svelte'
 	import CriticalAlertModal from '$lib/components/sidebar/CriticalAlertModal.svelte'
@@ -66,8 +60,8 @@
 	import AiChatLayout from '$lib/components/copilot/chat/AiChatLayout.svelte'
 	import { DEFAULT_HUB_BASE_URL } from '$lib/hub'
 	import DBManagerDrawer from '$lib/components/DBManagerDrawer.svelte'
-	import { watchOnce } from 'runed'
 	import { useIsDarkMode } from '$lib/components/DarkModeObserver.svelte'
+	import { useDbManagerUriState } from '$lib/components/dbManagerDrawerModel.svelte'
 	interface Props {
 		children?: import('svelte').Snippet
 	}
@@ -439,18 +433,8 @@
 			untrack(() => loadProtectionRules(workspace))
 		}
 	})
-	watchOnce(
-		() => globalDbManagerDrawer.val,
-		() => {
-			if (!globalDbManagerDrawer.val) return
-			const hash = window.location.hash
-			if (hash.startsWith('#dbmanager:')) {
-				const [_, path] = hash.split('#dbmanager:')
-				const dbInput = parseDbInputFromAssetSyntax(path)
-				if (dbInput) globalDbManagerDrawer.val?.openDrawer(dbInput)
-			}
-		}
-	)
+
+	globalDbManagerDrawer.val = useDbManagerUriState()
 </script>
 
 <svelte:window bind:innerWidth />
@@ -786,6 +770,6 @@
 	<CenteredModal title="Loading user..." loading={true}></CenteredModal>
 {/if}
 
-{#if $workspaceStore}
-	<DBManagerDrawer bind:this={globalDbManagerDrawer.val} />
+{#if $workspaceStore && globalDbManagerDrawer.val}
+	<DBManagerDrawer uriState={globalDbManagerDrawer.val} />
 {/if}
diff --git a/frontend/src/routes/(root)/(logged)/assets/+page.svelte b/frontend/src/routes/(root)/(logged)/assets/+page.svelte
index 7eac2cc535..032a60af66 100644
--- a/frontend/src/routes/(root)/(logged)/assets/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/assets/+page.svelte
@@ -99,7 +99,6 @@
 	let assets = $derived(_assets.current?.flatMap((page) => page.assets))
 
 	let s3FilePicker: S3FilePicker | undefined = $state()
-	let dbManagerDrawer = $derived(globalDbManagerDrawer.val) as any
 	let assetsUsageDropdown: AssetsUsageDrawer | undefined = $state()
 
 	let allS3Storages = resource(
@@ -192,7 +191,6 @@
 										<ExploreAssetButton
 											asset={{ kind: props.assetKind, path: item.value }}
 											{s3FilePicker}
-											{dbManagerDrawer}
 											btnClasses="dark:bg-surface"
 										/>
 									</div>
@@ -337,7 +335,6 @@
 							<ExploreAssetButton
 								{asset}
 								{s3FilePicker}
-								{dbManagerDrawer}
 								_resourceMetadata={asset.metadata}
 							/>
 						{/if}
diff --git a/frontend/src/routes/(root)/(logged)/resources/+page.svelte b/frontend/src/routes/(root)/(logged)/resources/+page.svelte
index f0ac8ae9d6..abf17b88bb 100644
--- a/frontend/src/routes/(root)/(logged)/resources/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/resources/+page.svelte
@@ -35,8 +35,7 @@
 		enterpriseLicense,
 		userStore,
 		workspaceStore,
-		userWorkspaces,
-		globalDbManagerDrawer
+		userWorkspaces
 	} from '$lib/stores'
 	import { sendUserToast } from '$lib/toast'
 	import {
@@ -557,8 +556,6 @@
 		}
 	})
 
-	let dbManagerDrawer = $derived(globalDbManagerDrawer.val) as any
-
 	let showTable = $derived(
 		tab == 'workspace' || tab == 'states' || tab == 'cache' || tab == 'theme'
 	)
@@ -1064,7 +1061,6 @@
 											{#if path && assetCanBeExplored({ kind: 'resource', path }, { resource_type }) && !$userStore?.operator}
 												<ExploreAssetButton
 													asset={{ kind: 'resource', path }}
-													{dbManagerDrawer}
 													_resourceMetadata={{ resource_type }}
 													class="w-24"
 												/>
diff --git a/frontend/src/routes/test_dev/elk_viewer/+page.svelte b/frontend/src/routes/test_dev/elk_viewer/+page.svelte
new file mode 100644
index 0000000000..5181f4ad72
--- /dev/null
+++ b/frontend/src/routes/test_dev/elk_viewer/+page.svelte
@@ -0,0 +1,266 @@
+<script lang="ts">
+	import '@xyflow/svelte/dist/base.css'
+	import {
+		SvelteFlow,
+		SvelteFlowProvider,
+		type Node,
+		type Edge,
+		Controls
+	} from '@xyflow/svelte'
+
+	let jsonInput = $state(SAMPLE_ELK_RESULT)
+	let error = $state('')
+	let nodes = $state.raw<Node[]>([])
+	let edges = $state.raw<Edge[]>([])
+
+	/**
+	 * Parse an ELK layout result using SvelteFlow's parentId system.
+	 *
+	 * Approach:
+	 * - Compound nodes (have children) → rendered as group wrappers (dashed border)
+	 *   Position is relative to their own parent (or absolute if at root).
+	 * - Leaf nodes → rendered as regular nodes with parentId pointing to their
+	 *   compound parent. Position is relative to parent (ELK already gives relative coords).
+	 * - Nodes must be ordered: parents before children.
+	 */
+	function parseElkResult(elkResult: any) {
+		const svelteNodes: Node[] = []
+		const svelteEdges: Edge[] = []
+
+		function walkNodes(elkNode: any, parentId: string | undefined) {
+			for (const child of elkNode.children ?? []) {
+				const isCompound = child.children?.length > 0
+
+				const node: Node = {
+					id: child.id,
+					position: { x: child.x ?? 0, y: child.y ?? 0 },
+					data: { label: child.id },
+					type: 'default',
+					...(parentId ? { parentId } : {}),
+					...(isCompound
+						? {
+								style: `width: ${child.width}px; height: ${child.height}px; background: rgba(100,149,237,0.06); border: 1px dashed #6495ed; border-radius: 8px; font-size: 10px; color: #6495ed; padding: 4px;`,
+								// Prevent group from intercepting pointer events on children
+								selectable: false
+							}
+						: {
+								style: `width: ${child.width ?? 275}px; height: ${child.height ?? 34}px; font-size: 11px;`
+							})
+				}
+
+				// Parent (compound) nodes must come before their children
+				svelteNodes.push(node)
+
+				if (isCompound) {
+					// Recurse: children will get parentId = this compound's id
+					walkNodes(child, child.id)
+				}
+			}
+		}
+
+		function walkEdges(elkNode: any) {
+			for (const edge of elkNode.edges ?? []) {
+				svelteEdges.push({
+					id: edge.id,
+					source: edge.sources?.[0] ?? '',
+					target: edge.targets?.[0] ?? '',
+					type: 'default'
+				})
+			}
+			for (const child of elkNode.children ?? []) {
+				walkEdges(child)
+			}
+		}
+
+		walkNodes(elkResult, undefined)
+		walkEdges(elkResult)
+
+		return { svelteNodes, svelteEdges }
+	}
+
+	function renderFromJson() {
+		try {
+			const parsed = JSON.parse(jsonInput)
+			const { svelteNodes, svelteEdges } = parseElkResult(parsed)
+			nodes = svelteNodes
+			edges = svelteEdges
+			error = ''
+		} catch (e: any) {
+			error = e.message
+		}
+	}
+
+	$effect(() => {
+		renderFromJson()
+	})
+
+	const proOptions = { hideAttribution: true }
+</script>
+
+<div class="flex h-screen w-screen">
+	<!-- Left: JSON editor -->
+	<div class="w-[500px] flex flex-col border-r border-gray-300 bg-white">
+		<div class="flex items-center justify-between p-2 border-b border-gray-200 bg-gray-50">
+			<h2 class="text-sm font-bold">ELK Result JSON</h2>
+			<button
+				class="px-3 py-1 text-sm bg-blue-600 text-white rounded hover:bg-blue-700"
+				onclick={renderFromJson}
+			>
+				Render
+			</button>
+		</div>
+		{#if error}
+			<div class="p-2 text-xs text-red-600 bg-red-50 border-b border-red-200">{error}</div>
+		{/if}
+		<textarea
+			class="flex-1 p-2 font-mono text-xs resize-none border-0 outline-none"
+			bind:value={jsonInput}
+			spellcheck="false"
+		></textarea>
+	</div>
+
+	<!-- Right: SvelteFlow canvas -->
+	<div class="flex-1 relative">
+		<SvelteFlowProvider>
+			<SvelteFlow
+				{nodes}
+				{edges}
+				fitView
+				{proOptions}
+				minZoom={0.1}
+				maxZoom={3}
+				nodesDraggable={false}
+			>
+				<Controls />
+			</SvelteFlow>
+		</SvelteFlowProvider>
+	</div>
+</div>
+
+<style>
+	:global(.svelte-flow) {
+		background: #fafafa;
+	}
+</style>
+
+<script module lang="ts">
+	/**
+	 * Sample ELK result demonstrating the wrapper approach:
+	 *
+	 * - `a` is a regular leaf node (the branchAll step), rendered before the wrapper
+	 * - `a__group` is the invisible compound wrapper (holds all branch lanes)
+	 * - Each `a-branch-X` is a compound lane (dashed border for debug)
+	 *   with the branch-start label as its FIRST child node
+	 * - Remaining nodes (b, c, d, ...) are leaf children inside their lane
+	 *
+	 * Edges at root: Trigger→Input→a→a__group→a-end→Result
+	 * Edges inside lanes: branch-label→content nodes
+	 */
+	const SAMPLE_ELK_RESULT = JSON.stringify(
+		{
+			id: 'root',
+			layoutOptions: {
+				'elk.algorithm': 'layered',
+				'elk.direction': 'DOWN'
+			},
+			children: [
+				{ id: 'Trigger', width: 275, height: 34, x: 385, y: 12 },
+				{ id: 'Input', width: 275, height: 34, x: 385, y: 108 },
+				// `a` = branchAll step, rendered as a regular leaf node
+				{ id: 'a', width: 275, height: 34, x: 385, y: 204 },
+				// `a__group` = invisible wrapper compound for the branch lanes
+				// width/height must fully contain all children (no overflow)
+				// max child right = 710+299 = 1009, +12 padding = 1021
+				// max child bottom = 12+346 = 358, +12 padding = 370
+				{
+					id: 'a__group',
+					x: 12,
+					y: 300,
+					width: 1021,
+					height: 370,
+					children: [
+						// Lane 0: compound with branch-start label as first child
+						{
+							id: 'a-branch-0',
+							x: 12,
+							y: 12,
+							width: 299,
+							height: 250,
+							children: [
+								// First child = branch start label node
+								{ id: 'a-branch-0-label', width: 275, height: 34, x: 12, y: 12 },
+								{ id: 'b', width: 275, height: 34, x: 12, y: 108 },
+								{ id: 'c', width: 275, height: 34, x: 12, y: 204 }
+							],
+							edges: [
+								{
+									id: 'e-label0-b',
+									sources: ['a-branch-0-label'],
+									targets: ['b']
+								},
+								{ id: 'e-b-c', sources: ['b'], targets: ['c'] }
+							]
+						},
+						// Lane 1
+						{
+							id: 'a-branch-1',
+							x: 361,
+							y: 12,
+							width: 299,
+							height: 154,
+							children: [
+								{ id: 'a-branch-1-label', width: 275, height: 34, x: 12, y: 12 },
+								{ id: 'd', width: 275, height: 34, x: 12, y: 108 }
+							],
+							edges: [
+								{
+									id: 'e-label1-d',
+									sources: ['a-branch-1-label'],
+									targets: ['d']
+								}
+							]
+						},
+						// Lane 2
+						{
+							id: 'a-branch-2',
+							x: 710,
+							y: 12,
+							width: 299,
+							height: 346,
+							children: [
+								{ id: 'a-branch-2-label', width: 275, height: 34, x: 12, y: 12 },
+								{ id: 'e', width: 275, height: 34, x: 12, y: 108 },
+								{ id: 'f', width: 275, height: 34, x: 12, y: 204 },
+								{ id: 'g', width: 275, height: 34, x: 12, y: 300 }
+							],
+							edges: [
+								{
+									id: 'e-label2-e',
+									sources: ['a-branch-2-label'],
+									targets: ['e']
+								},
+								{ id: 'e-e-f', sources: ['e'], targets: ['f'] },
+								{ id: 'e-f-g', sources: ['f'], targets: ['g'] }
+							]
+						}
+					],
+					edges: []
+				},
+				// a__group bottom = 300+370 = 670, +62 gap = 732
+				{ id: 'a-end', width: 275, height: 34, x: 385, y: 732 },
+				{ id: 'Result', width: 275, height: 34, x: 385, y: 828 }
+			],
+			edges: [
+				{ id: 'e-Trigger-Input', sources: ['Trigger'], targets: ['Input'] },
+				{ id: 'e-Input-a', sources: ['Input'], targets: ['a'] },
+				{ id: 'e-a-group', sources: ['a'], targets: ['a__group'] },
+				{ id: 'e-group-end', sources: ['a__group'], targets: ['a-end'] },
+				{ id: 'e-a-end-Result', sources: ['a-end'], targets: ['Result'] }
+			],
+			width: 1045,
+			height: 874
+		},
+		null,
+		2
+	)
+</script>
diff --git a/lsp/Pipfile b/lsp/Pipfile
index c01fab216e..37aecedea0 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.648.0"
+wmill = ">=1.649.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 9f9ee14ffb..2b181a6c7b 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: '3.0.3'
 
 info:
-  version: 1.648.0
+  version: 1.649.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 53f6b21227..ec7cea297d 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
     RootModule        = 'WindmillClient.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.648.0'
+    ModuleVersion     = '1.649.0'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 0d6daad51f..368b0de11b 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.648.0"
+version = "1.649.0"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index e4842b836b..8b07a94942 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.648.0",
+  "version": "1.649.0",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./sqlUtils.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index 71689ffd27..a5cd2f4395 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.648.0",
+  "version": "1.649.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "sideEffects": false,
diff --git a/version.txt b/version.txt
index 53ea075c24..c34844244a 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.648.0
+1.649.0