[scripts] Derive main project from worktree path in merge-worktree.

diff --git a/.claude/scripts/merge-worktree b/.claude/scripts/merge-worktree
index 3561f1e24597f14691170517a4a2bd511ad7efcb..c88081bcc2b0c006f4b43227c7e4ce9560dbe2cf 100755 (executable)
--- a/.claude/scripts/merge-worktree
+++ b/.claude/scripts/merge-worktree
@@ -6,7 +6,7 @@
 
 set -o errexit -o nounset
 
-PROJECT_DIR="${CLAUDE_PROJECT_DIR:-$(pwd)}"
+PROJECT_DIR="$(echo "$PWD" | sed 's|/\.claude/worktrees/.*||')"
 
 # Absolute paths to Guix profile directories, avoiding $PATH lookup.
 GUIX_PROFILE="$HOME/.guix-profile"

diff --git a/.claude/settings.json b/.claude/settings.json
index f9249f50e5de002ad952d67dc8d95633884e0632..6bd7704f1d324100f8d042a8d1589fc962c1525b 100644 (file)
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -1,5 +1,6 @@
 {
   "env": {
+    "CLAUDE_PROJECT_DIR": "$PWD",
     "GUIX_BIN": "/run/current-system/profile/bin",
     "PROFILE": "nonfree"
   },