diff --git a/.claude/settings.json b/.claude/settings.json
index fcd49c3140..cf8bfdd284 100644
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -110,7 +110,6 @@
     ]
   },
   "enabledPlugins": {
-    "rust-analyzer-lsp@claude-plugins-official": true,
     "typescript-lsp@claude-plugins-official": true,
     "code-review@claude-plugins-official": true
   }
diff --git a/.wmdev.yaml b/.wmdev.yaml
index c028c8f3bf..1a949c94e2 100644
--- a/.wmdev.yaml
+++ b/.wmdev.yaml
@@ -2,6 +2,8 @@ name: Windmill
 
 startupEnvs:
   CARGO_FEATURES: "quickjs"
+  WM_CLONE_DB: false
+  USE_RUST_PLUGIN: false
 
 services:
   - name: BE
diff --git a/scripts/worktree-env b/scripts/worktree-env
index ae83b09405..5fd8490bc2 100755
--- a/scripts/worktree-env
+++ b/scripts/worktree-env
@@ -61,7 +61,7 @@ if command -v psql &>/dev/null; then
   if psql "$db_conn/postgres" -tc "SELECT 1 FROM pg_database WHERE datname = '${db_name}'" 2>/dev/null | grep -q 1; then
     echo "Database $db_name already exists"
   else
-    if [[ -n "${WM_CLONE_DB:-}" ]]; then
+    if [[ "${WM_CLONE_DB:-}" == "1" || "${WM_CLONE_DB:-}" == "true" ]]; then
       # Terminate active connections so CREATE DATABASE ... TEMPLATE works
       psql "$db_conn/postgres" -c "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = 'windmill' AND pid <> pg_backend_pid();" 2>/dev/null || true
       psql "$db_conn/postgres" -c "CREATE DATABASE ${db_name} TEMPLATE windmill" 2>/dev/null \
@@ -178,13 +178,20 @@ if [ -n "$ee_repo" ]; then
   if [ -d "$ee_worktree_dir" ]; then
     ee_rel=$(python3 -c "import os; print(os.path.relpath('$ee_worktree_dir', '$(pwd)'))" 2>/dev/null || echo "$ee_worktree_dir")
     mkdir -p .claude
+    rust_plugin=""
+    if [[ "${USE_RUST_PLUGIN:-}" == "1" || "${USE_RUST_PLUGIN:-}" == "true" ]]; then
+      rust_plugin=',
+  "enabledPlugins": {
+    "rust-analyzer-lsp@claude-plugins-official": true
+  }'
+    fi
     cat > .claude/settings.local.json <<EOFCLAUDE
 {
   "permissions": {
     "additionalDirectories": [
       "$ee_rel"
     ]
-  }
+  }${rust_plugin}
 }
 EOFCLAUDE
     echo "Created .claude/settings.local.json with EE path: $ee_rel"