Merge branch 'main' into fix/diff-window-layout-restoration

Author: alvarosevilla95

.claude/hooks/format.sh

@@ -0,0 +1,100 @@
+#!/usr/bin/env bash
+#
+# Claude Code Hook: Format Files
+# Triggers after Claude edits/writes files and runs nix fmt
+#
+# Environment variables provided by Claude Code:
+# - CLAUDE_PROJECT_DIR: Path to the project directory
+# - CLAUDE_TOOL_NAME: Name of the tool that was executed
+# - CLAUDE_TOOL_ARGS: JSON string containing tool arguments
+
+set -euo pipefail
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+# Log function
+log() {
+  echo -e "[$(date '+%H:%M:%S')] $1" >&2
+}
+
+# Parse tool arguments to get the file path
+get_file_path() {
+  # Read hook input from stdin
+  local hook_input
+  if [ -t 0 ]; then
+    # No stdin input available
+    log "DEBUG: No stdin input available"
+    return
+  fi
+
+  hook_input=$(cat)
+  log "DEBUG: Hook input = $hook_input"
+
+  # Try to extract file_path from tool_input
+  local file_path
+  file_path=$(echo "$hook_input" | grep -o '"file_path"[[:space:]]*:[[:space:]]*"[^"]*"' | sed 's/.*"file_path"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/')
+
+  if [ -n "$file_path" ]; then
+    echo "$file_path"
+    return
+  fi
+
+  # Try extracting any file path from the input
+  local any_file_path
+  any_file_path=$(echo "$hook_input" | grep -o '"[^"]*\.[^"]*"' | sed 's/"//g' | head -1)
+
+  if [ -n "$any_file_path" ]; then
+    echo "$any_file_path"
+    return
+  fi
+
+  log "DEBUG: Could not extract file path from hook input"
+}
+
+# Main logic
+main() {
+  log "${YELLOW}Claude Code Hook: File Formatter${NC}"
+
+  # Get the file path from tool arguments
+  FILE_PATH=$(get_file_path)
+
+  if [ -z "$FILE_PATH" ]; then
+    log "${RED}Error: Could not determine file path from tool arguments${NC}"
+    exit 1
+  fi
+
+  log "Tool: ${CLAUDE_TOOL_NAME:-unknown}, File: $FILE_PATH"
+
+  # Check if file exists
+  if [ ! -f "$FILE_PATH" ]; then
+    log "${RED}Error: File does not exist: $FILE_PATH${NC}"
+    exit 1
+  fi
+
+  log "${YELLOW}Formatting file with nix fmt...${NC}"
+
+  # Change to project directory
+  cd "${CLAUDE_PROJECT_DIR}"
+
+  # Run nix fmt on the file
+  if nix fmt "$FILE_PATH" 2>/dev/null; then
+    log "${GREEN}✓ Successfully formatted: $FILE_PATH${NC}"
+    exit 0
+  else
+    EXIT_CODE=$?
+    log "${RED}✗ nix fmt failed with exit code $EXIT_CODE${NC}"
+    log "${RED}This indicates the file has formatting issues that need manual attention${NC}"
+
+    # Don't fail the hook - just warn about formatting issues
+    # This allows Claude's operation to continue while alerting about format problems
+    log "${YELLOW}Continuing with Claude's operation, but please fix formatting issues${NC}"
+    exit 0
+  fi
+}
+
+# Run main function
+main "$@"

.claude/settings.json

@@ -0,0 +1,15 @@
+{
+  "hooks": {
+    "PostToolUse": [
+      {
+        "matcher": "Write|Edit",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "$CLAUDE_PROJECT_DIR/.claude/hooks/format.sh"
+          }
+        ]
+      }
+    ]
+  }
+}

.envrc

@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
 
-if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
-  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.7; then
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.7/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
 fi
 
 nix_direnv_manual_reload
 
 use flake .
+
+# Add fixtures/bin to PATH for nvim config aliases
+PATH_add fixtures/bin

.gitignore

@@ -61,4 +61,6 @@ luacov.stats.out
 # direnv
 .direnv
 
-.claude
+.claude/*
+!.claude/settings.json
+!.claude/hooks/

.luarc.json

@@ -205,6 +205,8 @@ lua/claudecode/
 
 ## Testing
 
+### Automated Testing
+
 Three-layer testing strategy using busted:
 
 ```lua
@@ -234,6 +236,31 @@ describe("full flow", function()
 end)
 ```
 
+### Integration Testing with Fixtures
+
+Manual testing with real Neovim configurations in the `fixtures/` directory:
+
+```bash
+# Test with different file explorers
+source fixtures/nvim-aliases.sh
+vv nvim-tree  # Test with nvim-tree integration
+vv oil        # Test with oil.nvim integration
+vv mini-files # Test with mini.files integration
+vv netrw      # Test with built-in netrw
+
+# Each fixture provides:
+# - Complete Neovim configuration
+# - Plugin dependencies
+# - Development keybindings
+# - Integration-specific testing scenarios
+```
+
+**Fixture Architecture**:
+
+- `fixtures/bin/` - Helper scripts (`vv`, `vve`, `list-configs`)
+- `fixtures/[integration]/` - Complete Neovim configs for testing
+- `fixtures/nvim-aliases.sh` - Shell aliases for easy testing
+
 ## Performance & Security
 
 - **Debounced Updates**: 50ms delay on selection changes