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

Prevent auto-update when installing specific Claude Code versions

Author: alex-feel

scripts/install_claude.py

@@ -1753,52 +1753,6 @@ def _download_claude_direct_from_gcs(version: str, target_path: Path) -> bool:
                 temp_path.unlink()
 
 
-def _run_claude_install_setup() -> bool:
-    """Run claude install to configure PATH and shell integration.
-
-    Executes the install subcommand WITHOUT version argument to avoid
-    triggering the version-check bug. This only performs PATH setup.
-
-    Returns:
-        True if setup succeeded, False otherwise.
-
-    Note:
-        Windows uses ~/.local/bin/claude.exe, Unix uses ~/.local/bin/claude.
-    """
-    if sys.platform == 'win32':
-        native_path = Path.home() / '.local' / 'bin' / 'claude.exe'
-    else:
-        native_path = Path.home() / '.local' / 'bin' / 'claude'
-
-    if not native_path.exists():
-        error(f'Cannot run install setup - {native_path.name} not found')
-        return False
-
-    info(f'Running {native_path.name} install for PATH setup...')
-
-    # Run install subcommand without version to avoid triggering the bug
-    # The install subcommand configures PATH and shell integration
-    result = run_command([str(native_path), 'install'], capture_output=True)
-
-    if result.returncode == 0:
-        success('PATH setup completed successfully')
-        return True
-
-    # Non-zero return may still be okay if PATH is already configured
-    warning(f'Install subcommand returned code {result.returncode}')
-    if result.stderr:
-        info(f'Output: {result.stderr}')
-
-    # Verify the binary is executable
-    version_result = run_command([str(native_path), '--version'], capture_output=True)
-    if version_result.returncode == 0:
-        info(f'Claude binary is functional: {version_result.stdout.strip()}')
-        return True
-
-    error('Claude binary may not be functional')
-    return False
-
-
 def _ensure_local_bin_in_path_unix() -> bool:
     """Ensure ~/.local/bin is in PATH on Unix-like systems.
 
@@ -1894,10 +1848,11 @@ def install_claude_native_windows(version: str | None = None) -> bool:
 
     # Attempt direct download from GCS
     if _download_claude_direct_from_gcs(version, native_target):
-        # Run install subcommand for PATH setup (without version argument)
-        _run_claude_install_setup()
-
-        # Ensure ~/.local/bin is in PATH
+        # Configure PATH directly without calling 'claude install'.
+        # The 'claude install' subcommand triggers auto-update behavior,
+        # which would replace the downloaded specific version with the latest.
+        # Using ensure_local_bin_in_path_windows() updates PATH via Windows
+        # registry and current session without any auto-update risk.
         info('Updating PATH for native installation...')
         ensure_local_bin_in_path_windows()
 
@@ -2115,8 +2070,8 @@ def install_claude_native_macos(version: str | None = None) -> bool:
 
     Implements a hybrid approach to work around Anthropic's installer bug:
     - For latest version (None or 'latest'): Use native installer with 'latest'
-    - For specific versions: Download directly from GCS bucket, then run
-      'claude install' for PATH setup (bypasses buggy version check)
+    - For specific versions: Download directly from GCS bucket, then configure
+      PATH directly via shell profiles (avoids auto-update behavior)
 
     Args:
         version: Specific version to install (e.g., "2.0.76"). If None or
@@ -2147,29 +2102,28 @@ def install_claude_native_macos(version: str | None = None) -> bool:
             # Make binary executable
             native_path.chmod(0o755)
 
-            # Run 'claude install' for PATH setup (without version to avoid bug)
-            if _run_claude_install_setup():
-                _ensure_local_bin_in_path_unix()
+            # Configure PATH directly without calling 'claude install'.
+            # The 'claude install' subcommand triggers auto-update behavior,
+            # which would replace the downloaded specific version with the latest.
+            # Using _ensure_local_bin_in_path_unix() updates shell profiles
+            # and current session PATH without any auto-update risk.
+            _ensure_local_bin_in_path_unix()
 
-                time.sleep(1)
+            time.sleep(1)
 
-                # Verify installation
-                is_installed, claude_path, source = verify_claude_installation()
-                if is_installed and source == 'native':
-                    success(f'Native installation verified at: {claude_path}')
-                    return True
-                if is_installed:
-                    warning(f'Claude found but from {source} source at: {claude_path}')
-                    warning('Direct download did not create expected file at ~/.local/bin/claude')
-                    error('Installation failed - file not created at expected location')
-                    return False
-                warning('Installation failed - no Claude executable found')
-                error('Claude not accessible after direct download')
+            # Verify installation
+            is_installed, claude_path, source = verify_claude_installation()
+            if is_installed and source == 'native':
+                success(f'Native installation verified at: {claude_path}')
+                return True
+            if is_installed:
+                warning(f'Claude found but from {source} source at: {claude_path}')
+                warning('Direct download did not create expected file at ~/.local/bin/claude')
+                error('Installation failed - file not created at expected location')
                 return False
-            # Install setup failed, but binary exists - try to continue
-            warning('PATH setup failed, but binary was downloaded')
-            _ensure_local_bin_in_path_unix()
-            return native_path.exists()
+            warning('Installation failed - no Claude executable found')
+            error('Claude not accessible after direct download')
+            return False
 
         # GCS download failed - fall back to native installer with "latest"
         warning(f'Direct download failed for version {version}, falling back to native installer')
@@ -2266,8 +2220,8 @@ def install_claude_native_linux(version: str | None = None) -> bool:
 
     Implements a hybrid approach to work around Anthropic's installer bug:
     - For latest version (None or 'latest'): Use native installer with 'latest'
-    - For specific versions: Download directly from GCS bucket, then run
-      'claude install' for PATH setup (bypasses buggy version check)
+    - For specific versions: Download directly from GCS bucket, then configure
+      PATH directly via shell profiles (avoids auto-update behavior)
 
     Supports: Ubuntu 20.04+, Debian 10+, and other modern Linux distributions.
 
@@ -2303,29 +2257,28 @@ def install_claude_native_linux(version: str | None = None) -> bool:
         # Make binary executable
         native_path.chmod(0o755)
 
-        # Run 'claude install' for PATH setup (without version to avoid bug)
-        if _run_claude_install_setup():
-            _ensure_local_bin_in_path_unix()
+        # Configure PATH directly without calling 'claude install'.
+        # The 'claude install' subcommand triggers auto-update behavior,
+        # which would replace the downloaded specific version with the latest.
+        # Using _ensure_local_bin_in_path_unix() updates shell profiles
+        # and current session PATH without any auto-update risk.
+        _ensure_local_bin_in_path_unix()
 
-            time.sleep(1)
+        time.sleep(1)
 
-            # Verify installation
-            is_installed, claude_path, source = verify_claude_installation()
-            if is_installed and source == 'native':
-                success(f'Native installation verified at: {claude_path}')
-                return True
-            if is_installed:
-                warning(f'Claude found but from {source} source at: {claude_path}')
-                warning('Direct download did not create expected file at ~/.local/bin/claude')
-                error('Installation failed - file not created at expected location')
-                return False
-            warning('Installation failed - no Claude executable found')
-            error('Claude not accessible after direct download')
+        # Verify installation
+        is_installed, claude_path, source = verify_claude_installation()
+        if is_installed and source == 'native':
+            success(f'Native installation verified at: {claude_path}')
+            return True
+        if is_installed:
+            warning(f'Claude found but from {source} source at: {claude_path}')
+            warning('Direct download did not create expected file at ~/.local/bin/claude')
+            error('Installation failed - file not created at expected location')
             return False
-        # Install setup failed, but binary exists - try to continue
-        warning('PATH setup failed, but binary was downloaded')
-        _ensure_local_bin_in_path_unix()
-        return native_path.exists()
+        warning('Installation failed - no Claude executable found')
+        error('Claude not accessible after direct download')
+        return False
 
     # GCS download failed - fall back to native installer with "latest"
     warning(f'Direct download failed for version {version}, falling back to native installer')

tests/test_install_claude_additional.py

@@ -687,55 +687,6 @@ def test_download_claude_direct_from_gcs_ssl_fallback(
         mock_replace.assert_called()  # Atomic file move
 
 
-class TestRunClaudeInstallSetup:
-    """Test claude.exe install subcommand for PATH setup."""
-
-    @patch('install_claude.run_command')
-    @patch('pathlib.Path.exists', return_value=True)
-    def test_run_claude_install_setup_success(self, mock_exists, mock_run):
-        """Test successful PATH setup via install subcommand."""
-        # Verify mock configuration
-        assert mock_exists.return_value is True
-        mock_run.return_value = subprocess.CompletedProcess([], 0, '', '')
-
-        result = install_claude._run_claude_install_setup()
-
-        assert result is True
-        mock_run.assert_called_once()
-        # Verify install subcommand was called without version
-        call_args = mock_run.call_args[0][0]
-        assert 'install' in call_args
-        assert len(call_args) == 2  # Only [path, 'install'], no version
-
-    @patch('pathlib.Path.exists', return_value=False)
-    def test_run_claude_install_setup_binary_not_found(self, mock_exists):
-        """Test PATH setup when binary doesn't exist."""
-        # Verify mock configuration
-        assert mock_exists.return_value is False
-
-        result = install_claude._run_claude_install_setup()
-
-        assert result is False
-
-    @patch('install_claude.run_command')
-    @patch('pathlib.Path.exists', return_value=True)
-    def test_run_claude_install_setup_nonzero_but_functional(self, mock_exists, mock_run):
-        """Test PATH setup with non-zero return but binary is functional."""
-        # Verify mock configuration
-        assert mock_exists.return_value is True
-        # First call (install) returns non-zero
-        # Second call (--version) succeeds
-        mock_run.side_effect = [
-            subprocess.CompletedProcess([], 1, '', 'Some warning'),
-            subprocess.CompletedProcess([], 0, 'claude 2.0.76', ''),
-        ]
-
-        result = install_claude._run_claude_install_setup()
-
-        assert result is True
-        assert mock_run.call_count == 2
-
-
 class TestHybridInstallApproach:
     """Test the hybrid installation approach for Windows."""
 
@@ -775,7 +726,6 @@ def test_install_claude_native_windows_latest_uses_installer(
 
     @patch('platform.system', return_value='Windows')
     @patch('install_claude._download_claude_direct_from_gcs')
-    @patch('install_claude._run_claude_install_setup')
     @patch('install_claude.ensure_local_bin_in_path_windows')
     @patch('install_claude.verify_claude_installation')
     @patch('time.sleep')
@@ -784,15 +734,17 @@ def test_install_claude_native_windows_specific_version_uses_gcs(
         mock_sleep,
         mock_verify,
         mock_ensure_path,
-        mock_setup,
         mock_gcs_download,
         mock_system,
     ):
-        """Test that specific version uses GCS direct download."""
+        """Test that specific version uses GCS direct download.
+
+        The implementation configures PATH directly via ensure_local_bin_in_path_windows()
+        without calling 'claude install', which would trigger auto-update behavior.
+        """
         # Verify mock configuration
         assert mock_system.return_value == 'Windows'
         mock_gcs_download.return_value = True
-        mock_setup.return_value = True
         mock_verify.return_value = (True, 'C:\\Users\\Test\\.local\\bin\\claude.exe', 'native')
 
         result = install_claude.install_claude_native_windows(version='2.0.76')
@@ -1043,7 +995,6 @@ def test_install_claude_native_macos_latest_uses_installer(
 
     @patch('sys.platform', 'darwin')
     @patch('install_claude._download_claude_direct_from_gcs')
-    @patch('install_claude._run_claude_install_setup')
     @patch('install_claude._ensure_local_bin_in_path_unix')
     @patch('install_claude.verify_claude_installation')
     @patch('pathlib.Path.chmod')
@@ -1054,12 +1005,14 @@ def test_install_claude_native_macos_specific_version_uses_gcs(
         mock_chmod,
         mock_verify,
         mock_ensure_path,
-        mock_setup,
         mock_gcs_download,
     ):
-        """Test that specific version uses GCS direct download on macOS."""
+        """Test that specific version uses GCS direct download on macOS.
+
+        The implementation configures PATH directly via _ensure_local_bin_in_path_unix()
+        without calling 'claude install', which would trigger auto-update behavior.
+        """
         mock_gcs_download.return_value = True
-        mock_setup.return_value = True
         mock_verify.return_value = (True, '/Users/Test/.local/bin/claude', 'native')
 
         result = install_claude.install_claude_native_macos(version='2.0.76')
@@ -1136,7 +1089,6 @@ def test_install_claude_native_linux_latest_uses_installer(
 
     @patch('platform.system', return_value='Linux')
     @patch('install_claude._download_claude_direct_from_gcs')
-    @patch('install_claude._run_claude_install_setup')
     @patch('install_claude._ensure_local_bin_in_path_unix')
     @patch('install_claude.verify_claude_installation')
     @patch('pathlib.Path.chmod')
@@ -1147,13 +1099,15 @@ def test_install_claude_native_linux_specific_version_uses_gcs(
         mock_chmod,
         mock_verify,
         mock_ensure_path,
-        mock_setup,
         mock_gcs_download,
         mock_platform,
     ):
-        """Test that specific version uses GCS direct download on Linux."""
+        """Test that specific version uses GCS direct download on Linux.
+
+        The implementation configures PATH directly via _ensure_local_bin_in_path_unix()
+        without calling 'claude install', which would trigger auto-update behavior.
+        """
         mock_gcs_download.return_value = True
-        mock_setup.return_value = True
         mock_verify.return_value = (True, '/home/test/.local/bin/claude', 'native')
 
         result = install_claude.install_claude_native_linux(version='2.0.76')