Merge pull request #46 from alex-feel/alex-feel-dev

Fix hooks

Author: alex-feel

environments/examples/python.yaml

@@ -27,10 +27,11 @@ slash-commands:
 output-styles:
     # Add output styles if needed
 hooks:
-    - event: PostToolUse
-      matcher: Edit|MultiEdit|Write
-      type: command
-      command: .claude/hooks/python_ruff_lint.py
-      files:
+    files:
         - hooks/examples/python_ruff_lint.py
+    events:
+        - event: PostToolUse
+          matcher: Edit|MultiEdit|Write
+          type: command
+          command: python_ruff_lint.py
 system-prompt: system-prompts/examples/python-developer.md

environments/templates/basic-template.yaml

@@ -58,18 +58,29 @@ output-styles:
 
 # Hooks for automatic actions (optional)
 hooks:
-    # Example: Run linter on file changes
-    # - event: PostToolUse
-    #   matcher: Edit|MultiEdit|Write  # Regex pattern
-    #   type: command
-    #   command: .claude/hooks/your-script.py
-    #   files:  # Files to download for this hook
-    #     - hooks/examples/your-script.py
+    # Files to download for all hooks (listed once, used by multiple events)
+    files:
+        # - hooks/examples/your-script.py
+        # - hooks/examples/another-script.py
 
-    # Example: Notification hook
-    # - event: Notification
-    #   type: command
-    #   command: notify-send 'Claude Code' 'Task Complete'
+    # Hook events configuration
+    events:
+        # Example: Run linter on file changes
+        # - event: PostToolUse
+        #   matcher: Edit|MultiEdit|Write  # Regex pattern
+        #   type: command
+        #   command: your-script.py  # Reference the filename from 'files' section above
+
+        # Example: Type checking on Python files
+        # - event: PostToolUse
+        #   matcher: "\.py$"  # Only Python files
+        #   type: command
+        #   command: another-script.py
+
+        # Example: Notification hook
+        # - event: Notification
+        #   type: command
+        #   command: notify-send 'Claude Code' 'Task Complete'
 
 # System prompt file (required)
 # Path is relative to the repository root

hooks/README.md

@@ -179,16 +179,40 @@ Hooks have access to standard environment variables plus:
 
 ### Chaining Hooks
 Multiple hooks can run for the same event:
+
+**In environment YAML configuration:**
+```yaml
+hooks:
+  files:
+    - hooks/examples/format_check.py
+    - hooks/examples/type_check.py
+    - hooks/examples/run_tests.py
+  events:
+    - event: PostToolUse
+      matcher: "\.py$"
+      type: command
+      command: format_check.py
+    - event: PostToolUse
+      matcher: "\.py$"
+      type: command
+      command: type_check.py
+    - event: PostToolUse
+      matcher: "\.py$"
+      type: command
+      command: run_tests.py
+```
+
+**Resulting settings.json:**
 ```json
 {
   "hooks": {
     "PostToolUse": [
       {
         "matcher": "\.py$",
         "hooks": [
-          {"type": "command", "command": "black --check"},
-          {"type": "command", "command": "mypy"},
-          {"type": "command", "command": "pytest"}
+          {"type": "command", "command": "py C:/Users/user/.claude/hooks/format_check.py"},
+          {"type": "command", "command": "py C:/Users/user/.claude/hooks/type_check.py"},
+          {"type": "command", "command": "py C:/Users/user/.claude/hooks/run_tests.py"}
         ]
       }
     ]

scripts/setup-environment.py

@@ -464,7 +464,7 @@ def configure_all_mcp_servers(servers: list[dict[str, Any]]) -> bool:
     return True
 
 
-def create_additional_settings(hooks: list[dict[str, Any]], claude_user_dir: Path) -> bool:
+def create_additional_settings(hooks: dict[str, Any], claude_user_dir: Path) -> bool:
     """Create additional-settings.json with environment-specific hooks.
 
     This file is always overwritten to avoid duplicate hooks when re-running the installer.
@@ -492,33 +492,32 @@ def create_additional_settings(hooks: list[dict[str, Any]], claude_user_dir: Pat
         'hooks': {},
     }
 
-    # Process each hook
-    for hook in hooks:
-        # Ensure hook is a dict (should be with PyYAML)
-        if not isinstance(hook, dict):
-            warning(f'Unexpected hook format: {type(hook)} - {hook}')
-            continue
+    # Extract files and events from the hooks configuration
+    hook_files = hooks.get('files', [])
+    hook_events = hooks.get('events', [])
+
+    # Download all hook files first
+    if hook_files:
+        hooks_dir = claude_user_dir / 'hooks'
+        hooks_dir.mkdir(parents=True, exist_ok=True)
+        for file in hook_files:
+            url = f'{REPO_BASE_URL}/{file}'
+            filename = Path(file).name
+            destination = hooks_dir / filename
+            download_file(url, destination)
+
+    # Process each hook event
+    for hook in hook_events:
 
         event = hook.get('event')
         matcher = hook.get('matcher', '')
         hook_type = hook.get('type', 'command')
         command = hook.get('command')
-        files = hook.get('files', [])
 
         if not event or not command:
             warning('Invalid hook configuration, skipping')
             continue
 
-        # Download hook files if specified
-        if files:
-            hooks_dir = claude_user_dir / 'hooks'
-            hooks_dir.mkdir(parents=True, exist_ok=True)
-            for file in files:
-                url = f'{REPO_BASE_URL}/{file}'
-                filename = Path(file).name
-                destination = hooks_dir / filename
-                download_file(url, destination)
-
         # Add to settings
         if event not in settings['hooks']:
             settings['hooks'][event] = []
@@ -614,32 +613,14 @@ def create_launcher_script(claude_user_dir: Path, command_name: str, system_prom
     exit 1
 }}
 
-# Build the bash command with all arguments
+# Call the shared script instead of building complex command
+$scriptPath = Join-Path $claudeUserDir "launch-{command_name}.sh"
+
 if ($args.Count -gt 0) {{
     Write-Host "Passing additional arguments: $args" -ForegroundColor Cyan
-    # Properly escape arguments for bash (quote args with spaces)
-    $escapedArgs = @()
-    foreach ($arg in $args) {{
-        if ($arg -match ' ') {{
-            # If arg contains spaces, wrap in single quotes for bash
-            $escapedArgs += "'$arg'"
-        }} else {{
-            $escapedArgs += $arg
-        }}
-    }}
-    $argsString = $escapedArgs -join ' '
-    # Use a here-string to avoid complex quote escaping
-    $bashCommand = @"
-p=`$(tr -d '\\\\r' < ~/.claude/prompts/{system_prompt_file}); s=~/.claude/additional-settings.json; \\
-exec claude --append-system-prompt=\\"`$p\\" --settings=\\"`$s\\" $argsString
-"@
-    & $bashPath -lc $bashCommand
+    & $bashPath --login $scriptPath @args
 }} else {{
-    # Use --% to stop PowerShell parsing, with literal command string
-    $bashCommand = "p=`$(tr -d '\\r' < ~/.claude/prompts/{system_prompt_file}); " + `
-                   "s=~/.claude/additional-settings.json; " + `
-                   "exec claude --append-system-prompt=\\`"`$p\\`" --settings=\\`"`$s\\`""
-    & $bashPath --% -lc $bashCommand
+    & $bashPath --login $scriptPath
 }}
 '''
             launcher_path.write_text(launcher_content)
@@ -660,19 +641,45 @@ def create_launcher_script(claude_user_dir: Path, command_name: str, system_prom
 
 echo Starting Claude Code with {command_name} configuration...
 
-REM Build the command with all arguments
-set BASH_EXE="C:\\Program Files\\Git\\bin\\bash.exe"
-set CMD_PREFIX=p=$(tr -d '\\r' ^< ~/.claude/prompts/{system_prompt_file})
-set SETTINGS_PATH=~/.claude/additional-settings.json
+REM Call shared script instead of complex command
+set "BASH_EXE=C:\\Program Files\\Git\\bin\\bash.exe"
+if not exist "%BASH_EXE%" set "BASH_EXE=C:\\Program Files (x86)\\Git\\bin\\bash.exe"
+
+set "SCRIPT_WIN=%USERPROFILE%\\.claude\\launch-{command_name}.sh"
+
 if "%~1"=="" (
-    %BASH_EXE% -lc "%CMD_PREFIX%; exec claude --append-system-prompt=\\"$p\\" --settings=\\"%SETTINGS_PATH%\\""
+    "%BASH_EXE%" --login "%SCRIPT_WIN%"
 ) else (
     echo Passing additional arguments: %*
-    %BASH_EXE% -lc "%CMD_PREFIX%; exec claude --append-system-prompt=\\"$p\\" --settings=\\"%SETTINGS_PATH%\\" %*"
+    "%BASH_EXE%" --login "%SCRIPT_WIN%" %*
 )
 '''
             batch_path.write_text(batch_content)
 
+            # Create shared POSIX script that actually launches Claude
+            shared_sh = claude_user_dir / f'launch-{command_name}.sh'
+            shared_sh_content = f'''#!/usr/bin/env bash
+set -euo pipefail
+
+PROMPT_PATH="$HOME/.claude/prompts/{system_prompt_file}"
+if [ ! -f "$PROMPT_PATH" ]; then
+  echo "Error: System prompt not found at $PROMPT_PATH" >&2
+  exit 1
+fi
+
+# Read prompt and get Windows path for settings
+PROMPT_CONTENT=$(tr -d '\\r' < "$PROMPT_PATH")
+# Try to get Windows path format; fallback to Unix path if cygpath is not available
+SETTINGS_WIN="$(cygpath -m "$HOME/.claude/additional-settings.json" 2>/dev/null ||
+  echo "$HOME/.claude/additional-settings.json")"
+
+exec claude --append-system-prompt "$PROMPT_CONTENT" --settings "$SETTINGS_WIN" "$@"
+'''
+            shared_sh.write_text(shared_sh_content, newline='\n')
+            # Make it executable for bash
+            with contextlib.suppress(Exception):
+                shared_sh.chmod(0o755)
+
         else:
             # Create bash launcher for Unix-like systems
             launcher_path = launcher_path.with_suffix('.sh')
@@ -731,13 +738,13 @@ def register_global_command(launcher_path: Path, command_name: str, system_promp
             batch_path = local_bin / f'{command_name}.cmd'
             batch_content = f'''@echo off
 REM Global {command_name} command for CMD
-set BASH_EXE="C:\\Program Files\\Git\\bin\\bash.exe"
-set CMD_PREFIX=p=$(tr -d '\\r' ^< ~/.claude/prompts/{system_prompt_file})
-set SETTINGS_PATH=~/.claude/additional-settings.json
+set "BASH_EXE=C:\\Program Files\\Git\\bin\\bash.exe"
+if not exist "%BASH_EXE%" set "BASH_EXE=C:\\Program Files (x86)\\Git\\bin\\bash.exe"
+set "SCRIPT_WIN=%USERPROFILE%\\.claude\\launch-{command_name}.sh"
 if "%~1"=="" (
-    %BASH_EXE% -lc "%CMD_PREFIX%; exec claude --append-system-prompt=\\"$p\\" --settings=\\"%SETTINGS_PATH%\\""
+    "%BASH_EXE%" --login "%SCRIPT_WIN%"
 ) else (
-    %BASH_EXE% -lc "%CMD_PREFIX%; exec claude --append-system-prompt=\\"$p\\" --settings=\\"%SETTINGS_PATH%\\" %*"
+    "%BASH_EXE%" --login "%SCRIPT_WIN%" %*
 )
 '''
             batch_path.write_text(batch_content)
@@ -767,14 +774,14 @@ def register_global_command(launcher_path: Path, command_name: str, system_promp
 
 # Read the prompt content and pass it directly to claude
 PROMPT_CONTENT=$(cat "$PROMPT_PATH")
-SETTINGS_PATH="$HOME/.claude/additional-settings.json"
+SETTINGS_WIN="$(cygpath -m "$HOME/.claude/additional-settings.json")"
 
 # Pass all arguments to claude with the system prompt
 if [ $# -gt 0 ]; then
     echo "Passing additional arguments: $@"
-    claude --append-system-prompt "$PROMPT_CONTENT" --settings "$SETTINGS_PATH" "$@"
+    claude --settings "$SETTINGS_WIN" --append-system-prompt "$PROMPT_CONTENT" "$@"
 else
-    claude --append-system-prompt "$PROMPT_CONTENT" --settings "$SETTINGS_PATH"
+    claude --settings "$SETTINGS_WIN" --append-system-prompt "$PROMPT_CONTENT"
 fi
 '''
             bash_wrapper_path.write_text(bash_content, newline='\n')  # Use Unix line endings
@@ -931,11 +938,8 @@ def main() -> None:
         # Step 9: Configure hooks
         print()
         print(f'{Colors.CYAN}Step 9: Configuring hooks...{Colors.NC}')
-        hooks = config.get('hooks', [])
-        if hooks:
-            create_additional_settings(hooks, claude_user_dir)
-        else:
-            info('No hooks configured')
+        hooks = config.get('hooks', {})
+        create_additional_settings(hooks, claude_user_dir)
 
         # Step 10: Create launcher script
         print()
@@ -966,7 +970,7 @@ def main() -> None:
         print(f'   * Output styles: {len(output_styles) if output_styles else 0} installed')
         print('   * System prompt: Configured')
         print(f'   * MCP servers: {len(mcp_servers)} configured')
-        print(f'   * Hooks: {len(hooks) if hooks else 0} configured')
+        print(f'   * Hooks: {len(hooks.get("events", [])) if hooks else 0} configured')
         print(f'   * Global command: {command_name} registered')
 
         print()

technical-docs/APPEND_SYSTEM_PROMPT_CMD.md

@@ -1,3 +1,5 @@
+> **Note**: This document explains the CMD one-liner approach for directly passing system prompts. For a more robust solution that handles additional flags like `--settings` and works consistently across all Windows shells, see [SHARED_POSIX_SCRIPT_APPROACH.md](SHARED_POSIX_SCRIPT_APPROACH.md).
+
 Here is a precise, end-to-end explanation of why the **CMD** one-liner works and what each part does:
 
 ```cmd

technical-docs/APPEND_SYSTEM_PROMPT_POWERSHELL.md

@@ -1,3 +1,5 @@
+> **Note**: This document explains the PowerShell one-liner approach for directly passing system prompts. For a more robust solution that handles additional flags like `--settings` and works consistently across all Windows shells, see [SHARED_POSIX_SCRIPT_APPROACH.md](SHARED_POSIX_SCRIPT_APPROACH.md).
+
 Here is a precise, end-to-end explanation of what every character in your working line does, why earlier attempts failed, and why this one succeeds.
 
 ```powershell