home-persist: auto-repair legacy nested symlink artifact (1.2.1)

Systems affected by the pre-1.2.0 bug still have a stale symlink inside the
home directory (e.g. $HOME/.claude/.claude → /mnt/home-persist/.claude).
Detect it before the merge — readlink -f match on $target — and drop it, so
the subsequent cp -an doesn't copy it into the volume as a self-loop and the
ln -sfn below replaces the directory 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.2.0",
+  "version": "1.2.1",
   "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

@@ -74,6 +74,21 @@ for mf in "${manifests[@]}"; do
     mkdir -p "$(dirname "$target")" "$(dirname "$link")"
 
     if [ -e "$link" ] && [ ! -L "$link" ]; then
+      # Auto-repair the <1.2.0 artifact: if $link is still a real directory
+      # and contains a dangling-style symlink named after rel's basename
+      # pointing at $target, that's the nested symlink the old code produced
+      # (e.g. $HOME/.claude/.claude → /mnt/home-persist/.claude). Drop it
+      # before the merge so it isn't copied into the volume as a self-loop.
+      stale="$link/$(basename "$rel")"
+      if [ -L "$stale" ]; then
+        stale_resolved="$(readlink -f "$stale" 2>/dev/null || true)"
+        target_resolved="$(readlink -f "$target" 2>/dev/null || true)"
+        if [ -n "$stale_resolved" ] && [ "$stale_resolved" = "$target_resolved" ]; then
+          log "repairing legacy nested symlink $stale"
+          rm -f "$stale"
+        fi
+      fi
+
       if [ ! -e "$target" ]; then
         mv "$link" "$target"
       elif [ -d "$link" ] && [ -d "$target" ]; then