home-persist: merge dir-vs-dir collisions instead of nesting symlink (1.2.0)

When $HOME/<p>/ existed as a real directory AND the volume already had the
same path populated, the seeding mv was skipped and `ln -sfn $target $link`
landed *inside* the existing directory — producing e.g. $HOME/.claude/.claude
instead of $HOME/.claude → /mnt/home-persist/.claude.

Detect the dir-vs-dir collision, merge home → volume without clobbering
(volume wins, matching the stated model), then drop the home dir so the
symlink replaces it cleanly.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: chapterjason

src/home-persist/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "id": "home-persist",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "name": "home-persist",
   "description": "Symlinks selected paths under $HOME into a per-owner persistence volume mounted at /mnt/home-persist. Features and users declare paths via JSON manifests in /etc/devcontainer-persist.d/, and an onCreateCommand materializes the symlinks on every create. Requires the consumer to bind-mount a persistent source to /mnt/home-persist in devcontainer.json.",
   "documentationURL": "https://github.com/SoureCode/devcontainer-features/tree/master/src/home-persist",

src/home-persist/resolve.sh

@@ -73,8 +73,19 @@ for mf in "${manifests[@]}"; do
     target="$STATE/$rel"
     mkdir -p "$(dirname "$target")" "$(dirname "$link")"
 
-    if [ -e "$link" ] && [ ! -L "$link" ] && [ ! -e "$target" ]; then
-      mv "$link" "$target"
+    if [ -e "$link" ] && [ ! -L "$link" ]; then
+      if [ ! -e "$target" ]; then
+        mv "$link" "$target"
+      elif [ -d "$link" ] && [ -d "$target" ]; then
+        # Both sides are directories and the volume is already populated. Merge
+        # home into the volume without clobbering (volume wins, per the stated
+        # model), then drop the now-redundant home dir so `ln -sfn` below
+        # replaces it with the symlink. Without this branch, `ln -sfn` against
+        # a real directory creates the link *inside* it — that's how we ended
+        # up with $HOME/.claude/.claude.
+        cp -an "$link"/. "$target"/
+        rm -rf "$link"
+      fi
     fi
 
     # Pre-create directory targets so the symlink isn't dangling — consumer