mirror of
https://github.com/SuperClaude-Org/SuperClaude_Framework.git
synced 2025-12-17 17:56:46 +00:00
* Fix: Install only selected MCP servers and ensure valid empty backups This commit addresses two separate issues: 1. **MCP Installation:** The `install` command was installing all MCP servers instead of only the ones selected by the user. The `_install` method in `setup/components/mcp.py` was iterating through all available servers, not the user's selection. This has been fixed to respect the `selected_mcp_servers` configuration. A new test has been added to verify this fix. 2. **Backup Creation:** The `create_backup` method in `setup/core/installer.py` created an invalid `.tar.gz` file when the backup source was empty. This has been fixed to ensure that a valid, empty tar archive is always created. A test was added for this as well. Co-authored-by: Mithun Gowda B <mithungowda.b7411@gmail.com> Co-authored-by: Jules <jules-ai-assistant@users.noreply.github.com> * Fix: Correct installer validation for MCP and MCP Docs components This commit fixes a validation issue in the installer where it would incorrectly fail after a partial installation of MCP servers. The `MCPComponent` validation logic was checking for all "required" servers, regardless of whether they were selected by the user. This has been corrected to only validate the servers that were actually installed, by checking against the list of installed servers stored in the metadata. The metadata storage has also been fixed to only record the installed servers. The `MCPDocsComponent` was failing validation because it was not being registered in the metadata if no documentation files were installed. This has been fixed by ensuring the post-installation hook runs even when no files are copied. New tests have been added for both components to verify the corrected logic. Co-authored-by: Mithun Gowda B <mithungowda.b7411@gmail.com> Co-authored-by: Jules <jules-ai-assistant@users.noreply.github.com> * Fix: Allow re-installation of components and correct validation logic This commit fixes a bug that prevented new MCP servers from being installed on subsequent runs of the installer. It also fixes the validation logic that was causing failures after a partial installation. The key changes are: 1. A new `is_reinstallable` method has been added to the base `Component` class. This allows certain components (like the `mcp` component) to be re-run even if they are already marked as installed. 2. The installer logic has been updated to respect this new method. 3. The `MCPComponent` now correctly stores only the installed servers in the metadata. 4. The validation logic for `MCPComponent` and `MCPDocsComponent` has been corrected to prevent incorrect failures. New tests have been added to verify all aspects of the new logic. Co-authored-by: Mithun Gowda B <mithungowda.b7411@gmail.com> Co-authored-by: Jules <jules-ai-assistant@users.noreply.github.com> * feat: Display authors in UI header and update author info This commit implements the user's request to display author names and emails in the UI header of the installer. The key changes are: 1. The `__email__` field in `SuperClaude/__init__.py` has been updated to include both authors' emails. 2. The `display_header` function in `setup/utils/ui.py` has been modified to read the author and email information and display it. 3. A new test has been added to `tests/test_ui.py` to verify the new UI output. Co-authored-by: Mithun Gowda B <mithungowda.b7411@gmail.com> Co-authored-by: Jules <jules-ai-assistant@users.noreply.github.com> * feat: Version bump to 4.1.0 and various fixes This commit prepares the project for the v4.1.0 release. It includes a version bump across all relevant files and incorporates several bug fixes and feature enhancements from recent tasks. Key changes in this release: - **Version Bump**: The project version has been updated from 4.0.9 to 4.1.0 in all configuration files, documentation, and source code. - **Installer Fixes**: - Components can now be marked as `reinstallable`, allowing them to be re-run on subsequent installations. This fixes a bug where new MCP servers could not be added. - The validation logic for `mcp` and `mcp_docs` components has been corrected to avoid incorrect failures. - A bug in the backup creation process that created invalid empty archives has been fixed. - **UI Enhancements**: - Author names and emails are now displayed in the installer UI header. - **Metadata Updates**: - Mithun Gowda B has been added as an author. - **New Tests**: - Comprehensive tests have been added for the installer logic, MCP components, and UI changes to ensure correctness and prevent regressions. Co-authored-by: Mithun Gowda B <mithungowda.b7411@gmail.com> Co-authored-by: Jules <jules-ai-assistant@users.noreply.github.com> * fix: Resolve dependencies for partial installs and other fixes This commit addresses several issues, the main one being a dependency resolution failure during partial installations. Key changes: - **Dependency Resolution**: The installer now correctly resolves the full dependency tree when a user requests to install a subset of components. This fixes the "Unknown component: core" error. - **Component Re-installation**: A new `is_reinstallable` flag allows components like `mcp` to be re-run on subsequent installs, enabling the addition of new servers. - **Validation Logic**: The validation for `mcp` and `mcp_docs` has been corrected to avoid spurious failures. - **UI and Metadata**: Author information has been added to the UI header and source files. - **Version Bump**: The project version has been updated to 4.1.0. - **Tests**: New tests have been added to cover all the above changes. Co-authored-by: Mithun Gowda B <mithungowda.b7411@gmail.com> Co-authored-by: Jules <jules-ai-assistant@users.noreply.github.com> * fix: Installer fixes and version bump to 4.1.0 This commit includes a collection of fixes for the installer logic, UI enhancements, and a version bump to 4.1.0. Key changes: - **Dependency Resolution**: The installer now correctly resolves the full dependency tree for partial installations, fixing the "Unknown component: core" error. - **Component Re-installation**: A new `is_reinstallable` flag allows components like `mcp` to be re-run to add new servers. - **MCP Installation**: The non-interactive installation of the `mcp` component now correctly prompts the user to select servers. - **Validation Logic**: The post-installation validation logic has been corrected to only validate components from the current session and to use the correct list of installed servers. - **UI & Metadata**: Author information has been added to the UI and source files. - **Version Bump**: The project version has been updated from 4.0.9 to 4.1.0 across all files. - **Tests**: New tests have been added to cover all the bug fixes. Co-authored-by: Mithun Gowda B <mithungowda.b7411@gmail.com> Co-authored-by: Jules <jules-ai-assistant@users.noreply.github.com> * feat: Add --authors flag and multiple installer fixes This commit introduces the `--authors` flag to display author information and includes a collection of fixes for the installer logic. Key changes: - **New Feature**: Added an `--authors` flag that displays the names, emails, and GitHub usernames of the project authors. - **Dependency Resolution**: Fixed a critical bug where partial installations would fail due to unresolved dependencies. - **Component Re-installation**: Added a mechanism to allow components to be "reinstallable", fixing an issue that prevented adding new MCP servers on subsequent runs. - **MCP Installation**: The non-interactive installation of the `mcp` component now correctly prompts for server selection. - **Validation Logic**: Corrected the post-installation validation to prevent spurious errors. - **Version Bump**: The project version has been updated to 4.1.0. - **Metadata**: Author and GitHub information has been added to the source files. - **UI**: The installer header now displays author information. - **Tests**: Added new tests for all new features and bug fixes. Co-authored-by: Jules <jules-ai-assistant@users.noreply.github.com> --------- Co-authored-by: Mithun Gowda B <mithungowda.b7411@gmail.com> Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> Co-authored-by: Jules <jules-ai-assistant@users.noreply.github.com>
346 lines
12 KiB
Python
346 lines
12 KiB
Python
"""
|
|
Base installer logic for SuperClaude installation system fixed some issues
|
|
"""
|
|
|
|
from typing import List, Dict, Optional, Set, Tuple, Any
|
|
from pathlib import Path
|
|
import shutil
|
|
import tempfile
|
|
from datetime import datetime
|
|
from .base import Component
|
|
from ..utils.logger import get_logger
|
|
|
|
|
|
class Installer:
|
|
"""Main installer orchestrator"""
|
|
|
|
def __init__(self,
|
|
install_dir: Optional[Path] = None,
|
|
dry_run: bool = False):
|
|
"""
|
|
Initialize installer
|
|
|
|
Args:
|
|
install_dir: Target installation directory
|
|
dry_run: If True, only simulate installation
|
|
"""
|
|
from .. import DEFAULT_INSTALL_DIR
|
|
self.install_dir = install_dir or DEFAULT_INSTALL_DIR
|
|
self.dry_run = dry_run
|
|
self.components: Dict[str, Component] = {}
|
|
from ..services.settings import SettingsService
|
|
settings_manager = SettingsService(self.install_dir)
|
|
self.installed_components: Set[str] = set(settings_manager.get_installed_components().keys())
|
|
self.updated_components: Set[str] = set()
|
|
|
|
self.failed_components: Set[str] = set()
|
|
self.skipped_components: Set[str] = set()
|
|
self.backup_path: Optional[Path] = None
|
|
self.logger = get_logger()
|
|
|
|
def register_component(self, component: Component) -> None:
|
|
"""
|
|
Register a component for installation
|
|
|
|
Args:
|
|
component: Component instance to register
|
|
"""
|
|
metadata = component.get_metadata()
|
|
self.components[metadata['name']] = component
|
|
|
|
def register_components(self, components: List[Component]) -> None:
|
|
"""
|
|
Register multiple components
|
|
|
|
Args:
|
|
components: List of component instances
|
|
"""
|
|
for component in components:
|
|
self.register_component(component)
|
|
|
|
def resolve_dependencies(self, component_names: List[str]) -> List[str]:
|
|
"""
|
|
Resolve component dependencies in correct installation order
|
|
|
|
Args:
|
|
component_names: List of component names to install
|
|
|
|
Returns:
|
|
Ordered list of component names including dependencies
|
|
|
|
Raises:
|
|
ValueError: If circular dependencies detected or unknown component
|
|
"""
|
|
resolved = []
|
|
resolving = set()
|
|
|
|
def resolve(name: str) -> None:
|
|
if name in resolved:
|
|
return
|
|
|
|
if name in resolving:
|
|
raise ValueError(
|
|
f"Circular dependency detected involving {name}")
|
|
|
|
if name not in self.components:
|
|
raise ValueError(f"Unknown component: {name}")
|
|
|
|
resolving.add(name)
|
|
|
|
# Resolve dependencies first
|
|
for dep in self.components[name].get_dependencies():
|
|
resolve(dep)
|
|
|
|
resolving.remove(name)
|
|
resolved.append(name)
|
|
|
|
# Resolve each requested component
|
|
for name in component_names:
|
|
resolve(name)
|
|
|
|
return resolved
|
|
|
|
def validate_system_requirements(self) -> Tuple[bool, List[str]]:
|
|
"""
|
|
Validate system requirements for all registered components
|
|
|
|
Returns:
|
|
Tuple of (success: bool, error_messages: List[str])
|
|
"""
|
|
errors = []
|
|
|
|
# Check disk space (500MB minimum)
|
|
try:
|
|
stat = shutil.disk_usage(self.install_dir.parent)
|
|
free_mb = stat.free / (1024 * 1024)
|
|
if free_mb < 500:
|
|
errors.append(
|
|
f"Insufficient disk space: {free_mb:.1f}MB free (500MB required)"
|
|
)
|
|
except Exception as e:
|
|
errors.append(f"Could not check disk space: {e}")
|
|
|
|
# Check write permissions
|
|
test_file = self.install_dir / ".write_test"
|
|
try:
|
|
self.install_dir.mkdir(parents=True, exist_ok=True)
|
|
test_file.touch()
|
|
test_file.unlink()
|
|
except Exception as e:
|
|
errors.append(f"No write permission to {self.install_dir}: {e}")
|
|
|
|
return len(errors) == 0, errors
|
|
|
|
def create_backup(self) -> Optional[Path]:
|
|
"""
|
|
Create backup of existing installation
|
|
|
|
Returns:
|
|
Path to backup archive or None if no existing installation
|
|
"""
|
|
if not self.install_dir.exists():
|
|
return None
|
|
|
|
if self.dry_run:
|
|
return self.install_dir / "backup_dryrun.tar.gz"
|
|
|
|
# Create backup directory
|
|
backup_dir = self.install_dir / "backups"
|
|
backup_dir.mkdir(exist_ok=True)
|
|
|
|
# Create timestamped backup
|
|
timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
|
|
backup_name = f"superclaude_backup_{timestamp}"
|
|
backup_path = backup_dir / f"{backup_name}.tar.gz"
|
|
|
|
# Create temporary directory for backup
|
|
with tempfile.TemporaryDirectory() as temp_dir:
|
|
temp_backup = Path(temp_dir) / backup_name
|
|
|
|
# Ensure temp backup directory exists
|
|
temp_backup.mkdir(parents=True, exist_ok=True)
|
|
|
|
# Copy all files except backups and local directories
|
|
for item in self.install_dir.iterdir():
|
|
if item.name not in ["backups", "local"]:
|
|
try:
|
|
if item.is_file():
|
|
shutil.copy2(item, temp_backup / item.name)
|
|
elif item.is_dir():
|
|
shutil.copytree(item, temp_backup / item.name)
|
|
except Exception as e:
|
|
# Log warning but continue backup process
|
|
self.logger.warning(f"Could not backup {item.name}: {e}")
|
|
|
|
# Always create an archive, even if empty, to ensure it's a valid tarball
|
|
base_path = backup_dir / backup_name
|
|
shutil.make_archive(str(base_path), 'gztar', temp_backup)
|
|
|
|
if not any(temp_backup.iterdir()):
|
|
self.logger.warning(
|
|
f"No files to backup, created empty backup archive: {backup_path.name}"
|
|
)
|
|
|
|
self.backup_path = backup_path
|
|
return backup_path
|
|
|
|
def install_component(self, component_name: str,
|
|
config: Dict[str, Any]) -> bool:
|
|
"""
|
|
Install a single component
|
|
|
|
Args:
|
|
component_name: Name of component to install
|
|
config: Installation configuration
|
|
|
|
Returns:
|
|
True if successful, False otherwise
|
|
"""
|
|
if component_name not in self.components:
|
|
raise ValueError(f"Unknown component: {component_name}")
|
|
|
|
component = self.components[component_name]
|
|
|
|
# Skip if already installed and not in update mode, unless component is reinstallable
|
|
if not component.is_reinstallable() and component_name in self.installed_components and not config.get("update_mode"):
|
|
self.skipped_components.add(component_name)
|
|
self.logger.info(f"Skipping already installed component: {component_name}")
|
|
return True
|
|
|
|
# Check prerequisites
|
|
success, errors = component.validate_prerequisites()
|
|
if not success:
|
|
self.logger.error(f"Prerequisites failed for {component_name}:")
|
|
for error in errors:
|
|
self.logger.error(f" - {error}")
|
|
self.failed_components.add(component_name)
|
|
return False
|
|
|
|
# Perform installation
|
|
try:
|
|
if self.dry_run:
|
|
self.logger.info(f"[DRY RUN] Would install {component_name}")
|
|
success = True
|
|
else:
|
|
success = component.install(config)
|
|
|
|
if success:
|
|
self.installed_components.add(component_name)
|
|
self.updated_components.add(component_name)
|
|
else:
|
|
self.failed_components.add(component_name)
|
|
|
|
return success
|
|
|
|
except Exception as e:
|
|
self.logger.error(f"Error installing {component_name}: {e}")
|
|
self.failed_components.add(component_name)
|
|
return False
|
|
|
|
def install_components(self,
|
|
component_names: List[str],
|
|
config: Optional[Dict[str, Any]] = None) -> bool:
|
|
"""
|
|
Install multiple components in dependency order
|
|
|
|
Args:
|
|
component_names: List of component names to install
|
|
config: Installation configuration
|
|
|
|
Returns:
|
|
True if all successful, False if any failed
|
|
"""
|
|
config = config or {}
|
|
|
|
# Resolve dependencies
|
|
try:
|
|
ordered_names = self.resolve_dependencies(component_names)
|
|
except ValueError as e:
|
|
self.logger.error(f"Dependency resolution error: {e}")
|
|
return False
|
|
|
|
# Validate system requirements
|
|
success, errors = self.validate_system_requirements()
|
|
if not success:
|
|
self.logger.error("System requirements not met:")
|
|
for error in errors:
|
|
self.logger.error(f" - {error}")
|
|
return False
|
|
|
|
# Create backup if updating
|
|
if self.install_dir.exists() and not self.dry_run:
|
|
self.logger.info("Creating backup of existing installation...")
|
|
try:
|
|
self.create_backup()
|
|
except Exception as e:
|
|
self.logger.error(f"Failed to create backup: {e}")
|
|
return False
|
|
|
|
# Install each component
|
|
all_success = True
|
|
for name in ordered_names:
|
|
self.logger.info(f"Installing {name}...")
|
|
if not self.install_component(name, config):
|
|
all_success = False
|
|
# Continue installing other components even if one fails
|
|
|
|
if not self.dry_run:
|
|
self._run_post_install_validation()
|
|
|
|
return all_success
|
|
|
|
def _run_post_install_validation(self) -> None:
|
|
"""Run post-installation validation for all installed components"""
|
|
self.logger.info("Running post-installation validation...")
|
|
|
|
all_valid = True
|
|
for name in self.updated_components:
|
|
if name not in self.components:
|
|
self.logger.warning(f"Cannot validate component '{name}' as it was not part of this installation session.")
|
|
continue
|
|
|
|
component = self.components[name]
|
|
success, errors = component.validate_installation()
|
|
|
|
if success:
|
|
self.logger.info(f" ✓ {name}: Valid")
|
|
else:
|
|
self.logger.error(f" ✗ {name}: Invalid")
|
|
for error in errors:
|
|
self.logger.error(f" - {error}")
|
|
all_valid = False
|
|
|
|
if all_valid:
|
|
self.logger.info("All components validated successfully!")
|
|
else:
|
|
self.logger.error("Some components failed validation. Check errors above.")
|
|
|
|
def update_components(self, component_names: List[str], config: Dict[str, Any]) -> bool:
|
|
"""Alias for update operation (uses install logic)"""
|
|
config["update_mode"] = True
|
|
return self.install_components(component_names, config)
|
|
|
|
|
|
def get_installation_summary(self) -> Dict[str, Any]:
|
|
"""
|
|
Get summary of installation results
|
|
|
|
Returns:
|
|
Dict with installation statistics and results
|
|
"""
|
|
return {
|
|
'installed': list(self.installed_components),
|
|
'failed': list(self.failed_components),
|
|
'skipped': list(self.skipped_components),
|
|
'backup_path': str(self.backup_path) if self.backup_path else None,
|
|
'install_dir': str(self.install_dir),
|
|
'dry_run': self.dry_run
|
|
}
|
|
|
|
def get_update_summary(self) -> Dict[str, Any]:
|
|
return {
|
|
'updated': list(self.updated_components),
|
|
'failed': list(self.failed_components),
|
|
'backup_path': str(self.backup_path) if self.backup_path else None
|
|
}
|