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

Remove deprecated CLI config update from update_install_method_config

Author: alex-feel

scripts/install_claude.py

@@ -356,19 +356,21 @@ def remove_npm_claude() -> bool:
 
 
 def update_install_method_config(method: str = 'native') -> bool:
-    """Update installMethod in Claude configuration with CLI-first strategy.
+    """Update installMethod in Claude configuration via direct file modification.
 
-    Uses the official Claude CLI as the primary method for updating config,
-    with direct file modification as a fallback for edge cases where the
-    CLI is unavailable or fails (e.g., corrupted binary, permission issues).
+    Directly modifies ~/.claude.json to set the installMethod value.
+    This eliminates System Diagnostics warnings about config mismatch.
 
-    This eliminates System Diagnostics warnings about config mismatch by
-    ensuring ~/.claude.json reflects the actual installation method.
+    The `claude config` CLI command was deprecated in v1.0.7 and removed
+    in v2.0.0. Direct file modification is the only supported method
+    for updating configuration in Claude Code v2.x.
 
     Args:
         method: Installation method to set. Valid values:
             - 'native': For native (non-npm) installations
             - 'npm-global': For npm global installations
+            - 'system': For system-level installations
+            - 'local': For local installations
 
     Returns:
         True if configuration was successfully updated, False otherwise.
@@ -377,28 +379,7 @@ def update_install_method_config(method: str = 'native') -> bool:
         This function is non-blocking - failure does not affect the calling
         installation function's success status. A warning is logged on failure
         to inform the user that manual config update may be needed.
-
-    Example:
-        >>> # Called after successful native installation verification
-        >>> if is_installed and source == 'native':
-        ...     remove_npm_claude()
-        ...     update_install_method_config('native')
     """
-    # PRIMARY: Use Claude CLI (official API)
-    # This respects Claude Code's config format and any future format changes
-    claude_path = find_command_robust('claude')
-    if claude_path:
-        result = run_command(
-            [claude_path, 'config', 'set', '-g', 'installMethod', method],
-            capture_output=True,
-        )
-        if result.returncode == 0:
-            success(f'Updated installMethod to "{method}" via CLI')
-            return True
-        warning('CLI config update failed, trying direct file update...')
-
-    # FALLBACK: Direct file modification
-    # Only used when CLI is unavailable or fails (edge cases)
     config_path = Path.home() / '.claude.json'
     try:
         config: dict[str, Any] = {}
@@ -411,12 +392,11 @@ def update_install_method_config(method: str = 'native') -> bool:
         with open(config_path, 'w', encoding='utf-8') as f:
             json.dump(config, f, indent=2)
 
-        success(f'Updated installMethod to "{method}" via direct file update')
+        success(f'Updated installMethod to "{method}" in ~/.claude.json')
         return True
 
     except json.JSONDecodeError as e:
         warning(f'Could not parse existing config: {e}')
-        warning('Config file may be corrupted - manual fix may be needed')
         return False
     except PermissionError as e:
         warning(f'Permission denied updating config: {e}')

tests/test_install_claude.py

@@ -1925,61 +1925,20 @@ def test_remove_npm_claude_windows_npm_path(
 class TestUpdateInstallMethodConfig:
     """Test update_install_method_config() function for config updates."""
 
-    @patch('install_claude.run_command')
-    @patch('install_claude.find_command_robust')
-    def test_update_config_cli_success(
-        self, mock_find: MagicMock, mock_run: MagicMock,
-    ) -> None:
-        """Test update_install_method_config returns True when CLI succeeds."""
-        mock_find.return_value = '/usr/local/bin/claude'
-        mock_run.return_value = MagicMock(returncode=0)
-
-        result = install_claude.update_install_method_config('native')
-
-        assert result is True
-        mock_find.assert_called_once_with('claude')
-        mock_run.assert_called_once()
-        # Verify correct CLI command
-        args = mock_run.call_args[0][0]
-        assert args == ['/usr/local/bin/claude', 'config', 'set', '-g', 'installMethod', 'native']
-
-    def test_update_config_no_cli_fallback_to_file(
+    def test_update_config_file_modification(
         self, tmp_path: Path,
     ) -> None:
-        """Test update_install_method_config uses file fallback when CLI not found."""
+        """Test update_install_method_config updates config file."""
         config_file = tmp_path / '.claude.json'
         config_file.write_text('{"existingKey": "value"}')
 
-        with (
-            patch('install_claude.find_command_robust', return_value=None),
-            patch('install_claude.Path.home', return_value=tmp_path),
-        ):
-            result = install_claude.update_install_method_config('native')
-
-        assert result is True
-        # Verify file was updated
-        config = json.loads(config_file.read_text())
-        assert config['installMethod'] == 'native'
-        assert config['existingKey'] == 'value'  # Preserved
-
-    @patch('install_claude.run_command')
-    @patch('install_claude.find_command_robust')
-    def test_update_config_cli_fails_fallback_to_file(
-        self, mock_find: MagicMock, mock_run: MagicMock, tmp_path: Path,
-    ) -> None:
-        """Test update_install_method_config uses file fallback when CLI fails."""
-        mock_find.return_value = '/usr/local/bin/claude'
-        mock_run.return_value = MagicMock(returncode=1)  # CLI fails
-
-        config_file = tmp_path / '.claude.json'
-        config_file.write_text('{}')
-
         with patch('install_claude.Path.home', return_value=tmp_path):
             result = install_claude.update_install_method_config('native')
 
         assert result is True
         config = json.loads(config_file.read_text())
         assert config['installMethod'] == 'native'
+        assert config['existingKey'] == 'value'
 
     def test_update_config_creates_new_file(
         self, tmp_path: Path,
@@ -1988,10 +1947,7 @@ def test_update_config_creates_new_file(
         config_file = tmp_path / '.claude.json'
         assert not config_file.exists()
 
-        with (
-            patch('install_claude.find_command_robust', return_value=None),
-            patch('install_claude.Path.home', return_value=tmp_path),
-        ):
+        with patch('install_claude.Path.home', return_value=tmp_path):
             result = install_claude.update_install_method_config('native')
 
         assert result is True
@@ -2006,13 +1962,10 @@ def test_update_config_corrupted_file(
         config_file = tmp_path / '.claude.json'
         config_file.write_text('not valid json {{{')
 
-        with (
-            patch('install_claude.find_command_robust', return_value=None),
-            patch('install_claude.Path.home', return_value=tmp_path),
-        ):
+        with patch('install_claude.Path.home', return_value=tmp_path):
             result = install_claude.update_install_method_config('native')
 
-        assert result is False  # Should fail gracefully
+        assert result is False
 
     def test_update_config_permission_denied(
         self, tmp_path: Path,
@@ -2022,7 +1975,6 @@ def test_update_config_permission_denied(
         config_file.write_text('{}')
 
         with (
-            patch('install_claude.find_command_robust', return_value=None),
             patch('install_claude.Path.home', return_value=tmp_path),
             patch('builtins.open', side_effect=PermissionError('Permission denied')),
         ):
@@ -2038,51 +1990,32 @@ def test_update_config_preserves_existing_keys(
         existing_config = {
             'theme': 'dark',
             'telemetry': False,
-            'installMethod': 'global',  # Old value to be updated
+            'installMethod': 'global',
         }
         config_file.write_text(json.dumps(existing_config))
 
-        with (
-            patch('install_claude.find_command_robust', return_value=None),
-            patch('install_claude.Path.home', return_value=tmp_path),
-        ):
+        with patch('install_claude.Path.home', return_value=tmp_path):
             result = install_claude.update_install_method_config('native')
 
         assert result is True
         config = json.loads(config_file.read_text())
         assert config['installMethod'] == 'native'
-        assert config['theme'] == 'dark'  # Preserved
-        assert config['telemetry'] is False  # Preserved
+        assert config['theme'] == 'dark'
+        assert config['telemetry'] is False
 
-    @patch('install_claude.run_command')
-    @patch('install_claude.find_command_robust')
-    def test_update_config_npm_global_method(
-        self, mock_find: MagicMock, mock_run: MagicMock,
+    def test_update_config_npm_global_method_file(
+        self, tmp_path: Path,
     ) -> None:
         """Test update_install_method_config works with npm-global method."""
-        mock_find.return_value = '/usr/local/bin/claude'
-        mock_run.return_value = MagicMock(returncode=0)
-
-        result = install_claude.update_install_method_config('npm-global')
-
-        assert result is True
-        args = mock_run.call_args[0][0]
-        assert args[-1] == 'npm-global'
-
-    @patch('install_claude.run_command')
-    @patch('install_claude.find_command_robust')
-    def test_update_config_windows_claude_path(
-        self, mock_find: MagicMock, mock_run: MagicMock,
-    ) -> None:
-        """Test update_install_method_config works with Windows claude path."""
-        mock_find.return_value = r'C:\Users\test\.local\bin\claude.exe'
-        mock_run.return_value = MagicMock(returncode=0)
+        config_file = tmp_path / '.claude.json'
+        config_file.write_text('{}')
 
-        result = install_claude.update_install_method_config('native')
+        with patch('install_claude.Path.home', return_value=tmp_path):
+            result = install_claude.update_install_method_config('npm-global')
 
         assert result is True
-        args = mock_run.call_args[0][0]
-        assert args[0] == r'C:\Users\test\.local\bin\claude.exe'
+        config = json.loads(config_file.read_text())
+        assert config['installMethod'] == 'npm-global'
 
 
 class TestNativeInstallCallsConfigUpdate: