From 7d7b1951cd35d7b5f06cc249ee938fec370a9fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Pacana?= Date: Wed, 5 Aug 2026 17:44:42 +0200 Subject: [PATCH] Stop carrying MCP config into worktrees * Keep per-checkout MCP configuration out of new wtc worktrees so local server settings do not leak across branches. --- modules/claude/worktree-create.sh | 2 +- modules/fish.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/claude/worktree-create.sh b/modules/claude/worktree-create.sh index 4b3a067..5cc5537 100644 --- a/modules/claude/worktree-create.sh +++ b/modules/claude/worktree-create.sh @@ -44,7 +44,7 @@ else fi # Carry uncommitted local config from the main checkout, if present. -CARRY=(devenv.nix devenv.yaml devenv.lock devenv.local.nix .envrc .env .mcp.json) +CARRY=(devenv.nix devenv.yaml devenv.lock devenv.local.nix .envrc .env) for item in "${CARRY[@]}"; do src="$MAIN_ROOT/$item" if [ -e "$src" ]; then diff --git a/modules/fish.nix b/modules/fish.nix index 2122d97..0615733 100644 --- a/modules/fish.nix +++ b/modules/fish.nix @@ -97,7 +97,7 @@ git -C "$main_root" worktree add -b "$branch" "$dest" "$base_ref"; or return end - for item in .envrc .env devenv.nix devenv.yaml devenv.lock devenv.local.nix .mcp.json + for item in .envrc .env devenv.nix devenv.yaml devenv.lock devenv.local.nix if test -e "$main_root/$item" cp -R "$main_root/$item" "$dest/$item" end -- 2.51.2