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

Add config file support for hooks

Author: alex-feel

scripts/setup_environment.py

@@ -3380,6 +3380,7 @@ def create_additional_settings(
         matcher = hook.get('matcher', '')
         hook_type = hook.get('type', 'command')
         command = hook.get('command')
+        config = hook.get('config')  # Optional config file reference
 
         if not event or not command:
             warning('Invalid hook configuration, skipping')
@@ -3435,12 +3436,28 @@ def create_additional_settings(
                 # For .pyw files on Windows, uv automatically uses pythonw
                 # Use --no-project flag to prevent uv from detecting and applying project Python requirements
                 full_command = f'uv run --no-project --python 3.12 {hook_path_str}'
+
+                # Append config file path if specified
+                if config:
+                    # Strip query parameters from config filename
+                    clean_config = config.split('?')[0] if '?' in config else config
+                    config_path = claude_user_dir / 'hooks' / Path(clean_config).name
+                    config_path_str = config_path.as_posix()
+                    full_command = f'{full_command} {config_path_str}'
             else:
                 # Other file - build absolute path and use as-is
                 # System will handle execution based on file extension (.sh, .bat, .cmd, .ps1, etc.)
                 hook_path = claude_user_dir / 'hooks' / Path(clean_command).name
                 hook_path_str = hook_path.as_posix()
                 full_command = hook_path_str
+
+                # Append config file path if specified
+                if config:
+                    # Strip query parameters from config filename
+                    clean_config = config.split('?')[0] if '?' in config else config
+                    config_path = claude_user_dir / 'hooks' / Path(clean_config).name
+                    config_path_str = config_path.as_posix()
+                    full_command = f'{full_command} {config_path_str}'
         else:
             # Direct command with spaces - use as-is
             full_command = command

tests/conftest.py

@@ -55,13 +55,17 @@ def sample_environment_config() -> dict[str, Any]:
         ],
         'slash-commands': ['commands/test-command.md'],
         'hooks': {
-            'files': ['hooks/test-hook.py'],
+            'files': [
+                'hooks/test-hook.py',
+                'configs/test-hook-config.yaml',
+            ],
             'events': [
                 {
                     'event': 'PostToolUse',
                     'matcher': 'Edit|Write',
                     'type': 'command',
                     'command': 'test-hook.py',
+                    'config': 'test-hook-config.yaml',
                 },
             ],
         },

tests/test_setup_environment_additional.py

@@ -2345,3 +2345,174 @@ def test_refresh_path_from_registry_no_path_found(self):
         with patch('setup_environment.winreg.OpenKey', side_effect=FileNotFoundError()):
             result = setup_environment.refresh_path_from_registry()
             assert result is False  # Should return False when no PATH found
+
+
+class TestHookConfigFileSupport:
+    """Test hook configuration file support in create_additional_settings."""
+
+    def test_create_additional_settings_hook_with_config(self) -> None:
+        """Test hook configuration with config file reference."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            claude_dir = Path(tmpdir)
+            hooks_dir = claude_dir / 'hooks'
+            hooks_dir.mkdir(parents=True, exist_ok=True)
+
+            # Create dummy hook and config files
+            hook_file = hooks_dir / 'protect_critical_files.py'
+            hook_file.write_text('#!/usr/bin/env python3\nprint("hook")')
+            config_file = hooks_dir / 'protect_config.yaml'
+            config_file.write_text('protected_files: []')
+
+            hooks = {
+                'files': [
+                    'hooks/library/protect_critical_files.py',
+                    'configs/protect_config.yaml',
+                ],
+                'events': [
+                    {
+                        'event': 'PreToolUse',
+                        'matcher': 'Edit|Write',
+                        'type': 'command',
+                        'command': 'protect_critical_files.py',
+                        'config': 'protect_config.yaml',
+                    },
+                ],
+            }
+
+            result = setup_environment.create_additional_settings(
+                hooks,
+                claude_dir,
+                'test',
+            )
+
+            assert result is True
+            settings_file = claude_dir / 'test-additional-settings.json'
+            settings = json.loads(settings_file.read_text())
+
+            # Verify command includes config path
+            hook_cmd = settings['hooks']['PreToolUse'][0]['hooks'][0]['command']
+            assert 'protect_critical_files.py' in hook_cmd
+            assert 'protect_config.yaml' in hook_cmd
+            assert hook_cmd.endswith('protect_config.yaml')
+
+    def test_create_additional_settings_hook_without_config_backward_compat(self) -> None:
+        """Test that hooks without config field still work (backward compatibility)."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            claude_dir = Path(tmpdir)
+            hooks_dir = claude_dir / 'hooks'
+            hooks_dir.mkdir(parents=True, exist_ok=True)
+
+            hook_file = hooks_dir / 'test.py'
+            hook_file.write_text('print("test")')
+
+            hooks = {
+                'files': ['hooks/test.py'],
+                'events': [
+                    {
+                        'event': 'PostToolUse',
+                        'matcher': 'Edit',
+                        'type': 'command',
+                        'command': 'test.py',
+                        # No 'config' field - backward compatibility
+                    },
+                ],
+            }
+
+            result = setup_environment.create_additional_settings(
+                hooks,
+                claude_dir,
+                'test',
+            )
+
+            assert result is True
+            settings_file = claude_dir / 'test-additional-settings.json'
+            settings = json.loads(settings_file.read_text())
+
+            # Verify command does NOT include config path
+            hook_cmd = settings['hooks']['PostToolUse'][0]['hooks'][0]['command']
+            assert 'test.py' in hook_cmd
+            # Command should end with the Python file, not a config
+            assert hook_cmd.endswith('test.py')
+
+    def test_create_additional_settings_hook_config_with_query_params(self) -> None:
+        """Test hook config with query parameters in filename."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            claude_dir = Path(tmpdir)
+            hooks_dir = claude_dir / 'hooks'
+            hooks_dir.mkdir(parents=True, exist_ok=True)
+
+            hook_file = hooks_dir / 'hook.py'
+            hook_file.write_text('print("hook")')
+            config_file = hooks_dir / 'config.yaml'
+            config_file.write_text('key: value')
+
+            hooks = {
+                'files': [
+                    'hooks/hook.py?token=abc123',
+                    'configs/config.yaml?token=abc123',
+                ],
+                'events': [
+                    {
+                        'event': 'PreToolUse',
+                        'matcher': '',
+                        'type': 'command',
+                        'command': 'hook.py',
+                        'config': 'config.yaml?token=abc123',
+                    },
+                ],
+            }
+
+            result = setup_environment.create_additional_settings(
+                hooks,
+                claude_dir,
+                'test',
+            )
+
+            assert result is True
+            settings_file = claude_dir / 'test-additional-settings.json'
+            settings = json.loads(settings_file.read_text())
+
+            # Verify query params are stripped from config path
+            hook_cmd = settings['hooks']['PreToolUse'][0]['hooks'][0]['command']
+            assert 'config.yaml' in hook_cmd
+            assert '?token=' not in hook_cmd
+
+    def test_create_additional_settings_non_python_hook_with_config(self) -> None:
+        """Test non-Python hook with config file."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            claude_dir = Path(tmpdir)
+            hooks_dir = claude_dir / 'hooks'
+            hooks_dir.mkdir(parents=True, exist_ok=True)
+
+            hook_file = hooks_dir / 'hook.sh'
+            hook_file.write_text('#!/bin/bash\necho "hook"')
+            config_file = hooks_dir / 'config.yaml'
+            config_file.write_text('key: value')
+
+            hooks = {
+                'files': ['hooks/hook.sh', 'configs/config.yaml'],
+                'events': [
+                    {
+                        'event': 'SessionStart',
+                        'matcher': '',
+                        'type': 'command',
+                        'command': 'hook.sh',
+                        'config': 'config.yaml',
+                    },
+                ],
+            }
+
+            result = setup_environment.create_additional_settings(
+                hooks,
+                claude_dir,
+                'test',
+            )
+
+            assert result is True
+            settings_file = claude_dir / 'test-additional-settings.json'
+            settings = json.loads(settings_file.read_text())
+
+            # Non-Python scripts should also get config appended
+            hook_cmd = settings['hooks']['SessionStart'][0]['hooks'][0]['command']
+            assert 'hook.sh' in hook_cmd
+            assert 'config.yaml' in hook_cmd