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

Add support for always thinking enabled and correct some messages

Author: alex-feel

scripts/setup_environment.py

@@ -2549,6 +2549,11 @@ def process_skill(
 
         # Destination preserves relative path structure (e.g., scripts/fill_form.py)
         destination = skill_dir / file_path
+
+        # Check if destination already exists (consistent with handle_resource)
+        if destination.exists():
+            info(f'  File already exists: {file_path} (overwriting)')
+
         destination.parent.mkdir(parents=True, exist_ok=True)
 
         # Build source path
@@ -3083,6 +3088,7 @@ def create_additional_settings(
     permissions: dict[str, Any] | None = None,
     env: dict[str, str] | None = None,
     include_co_authored_by: bool | None = None,
+    always_thinking_enabled: bool | None = None,
 ) -> bool:
     """Create {command_name}-additional-settings.json with environment-specific settings.
 
@@ -3097,6 +3103,7 @@ def create_additional_settings(
         permissions: Optional permissions configuration dict
         env: Optional environment variables dict
         include_co_authored_by: Optional flag to include co-authored-by in commits
+        always_thinking_enabled: Optional flag to enable always-on thinking mode
 
     Returns:
         bool: True if successful, False otherwise.
@@ -3135,6 +3142,11 @@ def create_additional_settings(
         settings['includeCoAuthoredBy'] = include_co_authored_by
         info(f'Setting includeCoAuthoredBy: {include_co_authored_by}')
 
+    # Add alwaysThinkingEnabled if explicitly set (None means not configured, leave as default)
+    if always_thinking_enabled is not None:
+        settings['alwaysThinkingEnabled'] = always_thinking_enabled
+        info(f'Setting alwaysThinkingEnabled: {always_thinking_enabled}')
+
     # Handle hooks if present
     hook_events: list[dict[str, Any]] = []
 
@@ -3231,7 +3243,7 @@ def create_additional_settings(
     try:
         with open(additional_settings_path, 'w') as f:
             json.dump(settings, f, indent=2)
-        success(f'Created {command_name}-additional-settings.json with environment hooks')
+        success(f'Created {command_name}-additional-settings.json')
         return True
     except Exception as e:
         error(f'Failed to save {command_name}-additional-settings.json: {e}')
@@ -3942,6 +3954,9 @@ def main() -> None:
         # Extract include_co_authored_by configuration
         include_co_authored_by = config.get('include-co-authored-by')
 
+        # Extract always_thinking_enabled configuration
+        always_thinking_enabled = config.get('always-thinking-enabled')
+
         # Extract claude-code-version configuration
         claude_code_version = config.get('claude-code-version')
         claude_code_version_normalized = None  # Default to latest
@@ -4113,6 +4128,7 @@ def main() -> None:
                 permissions,
                 env_variables,
                 include_co_authored_by,
+                always_thinking_enabled,
             )
 
             # Step 13: Create launcher script

tests/test_setup_environment.py

@@ -885,6 +885,62 @@ def test_create_additional_settings_with_hooks(self, mock_download):
             assert 'hooks' in settings
             assert 'PostToolUse' in settings['hooks']
 
+    def test_create_additional_settings_always_thinking_enabled_true(self):
+        """Test alwaysThinkingEnabled set to true."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            claude_dir = Path(tmpdir)
+
+            result = setup_environment.create_additional_settings(
+                {},
+                claude_dir,
+                'test-env',
+                always_thinking_enabled=True,
+            )
+
+            assert result is True
+            settings_file = claude_dir / 'test-env-additional-settings.json'
+            settings = json.loads(settings_file.read_text())
+
+            assert 'alwaysThinkingEnabled' in settings
+            assert settings['alwaysThinkingEnabled'] is True
+
+    def test_create_additional_settings_always_thinking_enabled_false(self):
+        """Test alwaysThinkingEnabled set to false."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            claude_dir = Path(tmpdir)
+
+            result = setup_environment.create_additional_settings(
+                {},
+                claude_dir,
+                'test-env',
+                always_thinking_enabled=False,
+            )
+
+            assert result is True
+            settings_file = claude_dir / 'test-env-additional-settings.json'
+            settings = json.loads(settings_file.read_text())
+
+            assert 'alwaysThinkingEnabled' in settings
+            assert settings['alwaysThinkingEnabled'] is False
+
+    def test_create_additional_settings_always_thinking_enabled_none_not_included(self):
+        """Test alwaysThinkingEnabled not included when None."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            claude_dir = Path(tmpdir)
+
+            result = setup_environment.create_additional_settings(
+                {},
+                claude_dir,
+                'test-env',
+                always_thinking_enabled=None,
+            )
+
+            assert result is True
+            settings_file = claude_dir / 'test-env-additional-settings.json'
+            settings = json.loads(settings_file.read_text())
+
+            assert 'alwaysThinkingEnabled' not in settings
+
 
 class TestCreateLauncherScript:
     """Test launcher script creation."""