From 38395c238f0a65c2efea9bbacd92a8bc7a8cfe5e Mon Sep 17 00:00:00 2001
From: John Ogle <john@ogle.fyi>
Date: Sat, 10 Jan 2026 12:24:06 -0800
Subject: [PATCH] Fix race condition in Claude Code skill installation

---
 home/roles/development/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/home/roles/development/default.nix b/home/roles/development/default.nix
index b9d8ff0..f691cf6 100644
--- a/home/roles/development/default.nix
+++ b/home/roles/development/default.nix
@@ -85,12 +85,17 @@ in
         fi
       done
 
-      # Copy local skills from this repo
+      # Copy local skills from this repo (with retry for race conditions with running Claude)
       for file in ${./skills}/*.md; do
         if [ -f "$file" ]; then
           filename=$(basename "$file" .md)
           dest="$HOME/.claude/commands/''${filename}.md"
-          cp "$file" "$dest"
+          # Remove existing file first, then copy with retry on failure
+          rm -f "$dest" 2>/dev/null || true
+          if ! cp "$file" "$dest" 2>/dev/null; then
+            sleep 0.5
+            cp "$file" "$dest" || echo "Warning: Failed to copy $filename.md to commands"
+          fi
         fi
       done