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

Use PowerShell for Windows dependencies instead of bash

Author: alex-feel

scripts/setup_environment.py

@@ -2802,8 +2802,9 @@ def execute_dependency(dep: str) -> bool:
                 parts_with_force = parts[:3] + ['--force'] + parts[3:]
                 result = run_command(parts_with_force, capture_output=False)
             else:
-                # Use bash for consistent cross-platform behavior
-                result = run_bash_command(dep, capture_output=False)
+                # Windows dependencies are PowerShell commands (user-provided in YAML)
+                # This is different from MCP server config which uses bash for generated commands
+                result = run_command(['powershell', '-NoProfile', '-Command', dep], capture_output=False)
         else:
             if parts[0] == 'uv' and len(parts) >= 3 and parts[1] == 'tool' and parts[2] == 'install':
                 dep_with_force = dep.replace('uv tool install', 'uv tool install --force')

tests/test_setup_environment.py

@@ -532,7 +532,7 @@ def test_get_auth_headers_from_env_github(self):
         headers = setup_environment.get_auth_headers('https://github.com/repo', None)
         assert headers == {'Authorization': 'Bearer gh_token'}
 
-    @patch.dict('os.environ', {'REPO_TOKEN': 'generic_token'})
+    @patch.dict('os.environ', {'REPO_TOKEN': 'generic_token'}, clear=True)
     def test_get_auth_headers_from_env_generic(self):
         """Test getting generic token from environment."""
         headers = setup_environment.get_auth_headers('https://gitlab.com/repo', None)

tests/test_setup_environment_additional.py

@@ -1524,17 +1524,17 @@ class TestInstallDependenciesEdgeCases:
     """Test dependency installation edge cases."""
 
     @patch('platform.system', return_value='Windows')
-    @patch('setup_environment.run_bash_command')
-    def test_install_dependencies_windows_bash_execution(self, mock_bash, _mock_system):
-        """Test bash execution for unknown commands on Windows."""
-        mock_bash.return_value = subprocess.CompletedProcess([], 0, '', '')
+    @patch('setup_environment.run_command')
+    def test_install_dependencies_windows_powershell_execution(self, mock_run, _mock_system):
+        """Test PowerShell execution for unknown commands on Windows."""
+        mock_run.return_value = subprocess.CompletedProcess([], 0, '', '')
 
         result = setup_environment.install_dependencies({'windows': ['custom-command install package']})
         assert result is True
 
-        # Should use bash for command execution
-        call_args = mock_bash.call_args[0][0]
-        assert 'custom-command install package' in call_args
+        # Should use PowerShell with -NoProfile flag for command execution
+        call_args = mock_run.call_args[0][0]
+        assert call_args == ['powershell', '-NoProfile', '-Command', 'custom-command install package']
 
     @patch('platform.system', return_value='Linux')
     @patch('setup_environment.run_command')
@@ -1550,17 +1550,17 @@ def test_install_dependencies_uv_tool_force_linux(self, mock_run, _mock_system):
         assert 'uv tool install --force pytest' in ' '.join(call_args)
 
     @patch('platform.system', return_value='Windows')
-    @patch('setup_environment.run_bash_command')
-    def test_install_dependencies_failure_continues(self, mock_bash, _mock_system):
+    @patch('setup_environment.run_command')
+    def test_install_dependencies_failure_continues(self, mock_run, _mock_system):
         """Test that dependency installation continues after failure."""
-        mock_bash.side_effect = [
+        mock_run.side_effect = [
             subprocess.CompletedProcess([], 1, '', 'Error'),  # First fails
             subprocess.CompletedProcess([], 0, '', ''),  # Second succeeds
         ]
 
         result = setup_environment.install_dependencies({'windows': ['failing-dep', 'working-dep']})
         assert result is True
-        assert mock_bash.call_count == 2
+        assert mock_run.call_count == 2
 
 
 class TestDeriveBaseURLEdgeCases: