diff --git a/.gitignore b/.gitignore
index 606b4fad..e4713d20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,6 @@ npm-debug.log
 /.expert
 
 # Claude Code MCP config (port varies per worktree)
-/.mcp.json
 /.claude/audit
 /.claude/reviews
 /.claude/plans
diff --git a/.mcp.json b/.mcp.json
new file mode 100644
index 00000000..097e8111
--- /dev/null
+++ b/.mcp.json
@@ -0,0 +1,28 @@
+{
+  "mcpServers": {
+    "tidewave": {
+      "type": "http",
+      "url": "http://127.0.0.1:4003/tidewave/mcp",
+      "directTools": true
+    },
+    "backlog": {
+      "type": "stdio",
+      "command": "backlog",
+      "args": [
+        "mcp",
+        "start"
+      ],
+      "env": {},
+      "directTools": true
+    },
+    "chrome-devtools-mcp": {
+      "type": "stdio",
+      "command": "npx",
+      "args": [
+        "-y",
+        "chrome-devtools-mcp@latest"
+      ],
+      "directTools": true
+    }
+  }
+}
diff --git a/scripts/dev/worktree-setup b/scripts/dev/worktree-setup
index 77a53870..c6aefe67 100755
--- a/scripts/dev/worktree-setup
+++ b/scripts/dev/worktree-setup
@@ -61,18 +61,10 @@ for db in music_library_dev.db music_library_background_dev.db music_library_tel
   fi
 done
 
-# Generate .mcp.json for Claude Code / Tidewave
-debug_msg "Generating .mcp.json (Tidewave on port $new_port)"
-cat > "$current_dir/.mcp.json" <<EOF
-{
-  "mcpServers": {
-    "tidewave": {
-      "type": "http",
-      "url": "http://127.0.0.1:${new_port}/tidewave/mcp"
-    }
-  }
-}
-EOF
+# Copy .mcp.json from main worktree and update Tidewave port
+debug_msg "Copying .mcp.json and updating Tidewave port to $new_port"
+cp "$main_worktree/.mcp.json" "$current_dir/.mcp.json"
+sed -i '' "s|http://127.0.0.1:[0-9]*/tidewave/mcp|http://127.0.0.1:${new_port}/tidewave/mcp|" "$current_dir/.mcp.json"
 
 # Run standard dev setup
 debug_msg "Running dev:setup"