diff --git a/backend/src/models/task_attempt.rs b/backend/src/models/task_attempt.rs
index 1ddd4b23..07998b0a 100644
--- a/backend/src/models/task_attempt.rs
+++ b/backend/src/models/task_attempt.rs
@@ -268,15 +268,21 @@ impl TaskAttempt {
 
     /// Get the base directory for vibe-kanban worktrees
     pub fn get_worktree_base_dir() -> std::path::PathBuf {
+        let dir_name = if cfg!(debug_assertions) {
+            "vibe-kanban-dev"
+        } else {
+            "vibe-kanban"
+        };
+
         if cfg!(target_os = "macos") {
             // macOS already uses /var/folders/... which is persistent storage
-            std::env::temp_dir().join("vibe-kanban")
+            std::env::temp_dir().join(dir_name)
         } else if cfg!(target_os = "linux") {
             // Linux: use /var/tmp instead of /tmp to avoid RAM usage
-            std::path::PathBuf::from("/var/tmp/vibe-kanban")
+            std::path::PathBuf::from("/var/tmp").join(dir_name)
         } else {
             // Windows and other platforms: use temp dir with vibe-kanban subdirectory
-            std::env::temp_dir().join("vibe-kanban")
+            std::env::temp_dir().join(dir_name)
         }
     }
 
diff --git a/package.json b/package.json
index 09e14503..5aafdc99 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.43",
   "private": true,
   "scripts": {
-    "dev": "export FRONTEND_PORT=$(node scripts/setup-dev-environment.js frontend) && export BACKEND_PORT=$(node scripts/setup-dev-environment.js backend) && export DISABLE_WORKTREE_ORPHAN_CLEANUP=1 && concurrently \"npm run backend:dev:watch\" \"npm run frontend:dev\"",
+    "dev": "export FRONTEND_PORT=$(node scripts/setup-dev-environment.js frontend) && export BACKEND_PORT=$(node scripts/setup-dev-environment.js backend) && concurrently \"npm run backend:dev:watch\" \"npm run frontend:dev\"",
     "build": "npm run frontend:build && npm run backend:build",
     "build:single": "npm run frontend:build && npm run backend:build:single",
     "build:npm": "./build-npm-package.sh",
@@ -12,7 +12,7 @@
     "frontend:build": "cd frontend && npm run build",
     "cargo": "node scripts/cargo.js",
     "backend:dev": "BACKEND_PORT=$(node scripts/setup-dev-environment.js backend) npm run backend:dev:watch",
-    "backend:dev:watch": "npm run cargo -- watch -w backend -x 'run --manifest-path backend/Cargo.toml'",
+    "backend:dev:watch": "DISABLE_WORKTREE_ORPHAN_CLEANUP=1 npm run cargo -- watch -w backend -x 'run --manifest-path backend/Cargo.toml'",
     "backend:build": "npm run cargo -- build --release --manifest-path backend/Cargo.toml && npm run cargo -- build --release --bin mcp_task_server --manifest-path backend/Cargo.toml",
     "backend:build:single": "npm run cargo -- build --release --manifest-path backend/Cargo.toml",
     "backend:run": "npm run cargo -- run --manifest-path backend/Cargo.toml",