mirror of
https://github.com/SuperClaude-Org/SuperClaude_Framework.git
synced 2025-12-29 16:16:08 +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. * 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. * Add Docker support and framework enhancements - Add serena-docker.json MCP configuration - Update MCP configs and installer components - Enhance CLI commands with new functionality - Add symbols utility for framework operations - Improve UI and logging components --------- 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> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Mithun Gowda B <mithungowda.b7411@gmail.com>
316 lines
11 KiB
Python
316 lines
11 KiB
Python
"""
|
|
CLAUDE.md Manager for preserving user customizations while managing framework imports
|
|
"""
|
|
|
|
import re
|
|
from pathlib import Path
|
|
from typing import List, Set, Dict, Optional
|
|
from ..utils.logger import get_logger
|
|
|
|
|
|
class CLAUDEMdService:
|
|
"""Manages CLAUDE.md file updates while preserving user customizations"""
|
|
|
|
def __init__(self, install_dir: Path):
|
|
"""
|
|
Initialize CLAUDEMdService
|
|
|
|
Args:
|
|
install_dir: Installation directory (typically ~/.claude)
|
|
"""
|
|
self.install_dir = install_dir
|
|
self.claude_md_path = install_dir / "CLAUDE.md"
|
|
self.logger = get_logger()
|
|
|
|
def read_existing_imports(self) -> Set[str]:
|
|
"""
|
|
Parse CLAUDE.md for existing @import statements
|
|
|
|
Returns:
|
|
Set of already imported filenames (without @)
|
|
"""
|
|
existing_imports = set()
|
|
|
|
if not self.claude_md_path.exists():
|
|
return existing_imports
|
|
|
|
try:
|
|
with open(self.claude_md_path, 'r', encoding='utf-8') as f:
|
|
content = f.read()
|
|
|
|
# Find all @import statements using regex
|
|
import_pattern = r'^@([^\s\n]+\.md)\s*$'
|
|
matches = re.findall(import_pattern, content, re.MULTILINE)
|
|
existing_imports.update(matches)
|
|
|
|
self.logger.debug(f"Found existing imports: {existing_imports}")
|
|
|
|
except Exception as e:
|
|
self.logger.warning(f"Could not read existing CLAUDE.md imports: {e}")
|
|
|
|
return existing_imports
|
|
|
|
def read_existing_content(self) -> str:
|
|
"""
|
|
Read existing CLAUDE.md content
|
|
|
|
Returns:
|
|
Existing content or empty string if file doesn't exist
|
|
"""
|
|
if not self.claude_md_path.exists():
|
|
return ""
|
|
|
|
try:
|
|
with open(self.claude_md_path, 'r', encoding='utf-8') as f:
|
|
return f.read()
|
|
except Exception as e:
|
|
self.logger.warning(f"Could not read existing CLAUDE.md: {e}")
|
|
return ""
|
|
|
|
def extract_user_content(self, content: str) -> str:
|
|
"""
|
|
Extract user content (everything before framework imports section)
|
|
|
|
Args:
|
|
content: Full CLAUDE.md content
|
|
|
|
Returns:
|
|
User content without framework imports
|
|
"""
|
|
# Look for framework imports section marker
|
|
framework_marker = "# ===================================================\n# SuperClaude Framework Components"
|
|
|
|
if framework_marker in content:
|
|
user_content = content.split(framework_marker)[0].rstrip()
|
|
else:
|
|
# If no framework section exists, preserve all content
|
|
user_content = content.rstrip()
|
|
|
|
return user_content
|
|
|
|
def organize_imports_by_category(self, files_by_category: Dict[str, List[str]]) -> str:
|
|
"""
|
|
Organize imports into categorized sections
|
|
|
|
Args:
|
|
files_by_category: Dict mapping category names to lists of files
|
|
|
|
Returns:
|
|
Formatted import sections
|
|
"""
|
|
if not files_by_category:
|
|
return ""
|
|
|
|
sections = []
|
|
|
|
# Framework imports section header
|
|
sections.append("# ===================================================")
|
|
sections.append("# SuperClaude Framework Components")
|
|
sections.append("# ===================================================")
|
|
sections.append("")
|
|
|
|
# Add each category
|
|
for category, files in files_by_category.items():
|
|
if files:
|
|
sections.append(f"# {category}")
|
|
for file in sorted(files):
|
|
sections.append(f"@{file}")
|
|
sections.append("")
|
|
|
|
return "\n".join(sections)
|
|
|
|
def add_imports(self, files: List[str], category: str = "Framework") -> bool:
|
|
"""
|
|
Add new imports with duplicate checking and user content preservation
|
|
|
|
Args:
|
|
files: List of filenames to import
|
|
category: Category name for organizing imports
|
|
|
|
Returns:
|
|
True if successful, False otherwise
|
|
"""
|
|
try:
|
|
# Ensure CLAUDE.md exists
|
|
self.ensure_claude_md_exists()
|
|
|
|
# Read existing content and imports
|
|
existing_content = self.read_existing_content()
|
|
existing_imports = self.read_existing_imports()
|
|
|
|
# Filter out files already imported
|
|
new_files = [f for f in files if f not in existing_imports]
|
|
|
|
if not new_files:
|
|
self.logger.info("All files already imported, no changes needed")
|
|
return True
|
|
|
|
self.logger.info(f"Adding {len(new_files)} new imports to category '{category}': {new_files}")
|
|
|
|
# Extract user content (preserve everything before framework section)
|
|
user_content = self.extract_user_content(existing_content)
|
|
|
|
# Parse existing framework imports by category
|
|
existing_framework_imports = self._parse_existing_framework_imports(existing_content)
|
|
|
|
# Add new files to the specified category
|
|
if category not in existing_framework_imports:
|
|
existing_framework_imports[category] = []
|
|
existing_framework_imports[category].extend(new_files)
|
|
|
|
# Build new content
|
|
new_content_parts = []
|
|
|
|
# Add user content
|
|
if user_content.strip():
|
|
new_content_parts.append(user_content)
|
|
new_content_parts.append("") # Add blank line before framework section
|
|
|
|
# Add organized framework imports
|
|
framework_section = self.organize_imports_by_category(existing_framework_imports)
|
|
if framework_section:
|
|
new_content_parts.append(framework_section)
|
|
|
|
# Write updated content
|
|
new_content = "\n".join(new_content_parts)
|
|
|
|
with open(self.claude_md_path, 'w', encoding='utf-8') as f:
|
|
f.write(new_content)
|
|
|
|
self.logger.success(f"Updated CLAUDE.md with {len(new_files)} new imports")
|
|
return True
|
|
|
|
except Exception as e:
|
|
self.logger.error(f"Failed to update CLAUDE.md: {e}")
|
|
return False
|
|
|
|
def _parse_existing_framework_imports(self, content: str) -> Dict[str, List[str]]:
|
|
"""
|
|
Parse existing framework imports organized by category
|
|
|
|
Args:
|
|
content: Full CLAUDE.md content
|
|
|
|
Returns:
|
|
Dict mapping category names to lists of imported files
|
|
"""
|
|
imports_by_category = {}
|
|
|
|
# Look for framework imports section
|
|
framework_marker = "# ===================================================\n# SuperClaude Framework Components"
|
|
|
|
if framework_marker not in content:
|
|
return imports_by_category
|
|
|
|
# Extract framework section
|
|
framework_section = content.split(framework_marker)[1] if framework_marker in content else ""
|
|
|
|
# Parse categories and imports
|
|
lines = framework_section.split('\n')
|
|
current_category = None
|
|
|
|
for line in lines:
|
|
line = line.strip()
|
|
|
|
# Skip section header lines and empty lines
|
|
if line.startswith('# ===') or not line:
|
|
continue
|
|
|
|
# Category header (starts with # but not the section divider)
|
|
if line.startswith('# ') and not line.startswith('# ==='):
|
|
current_category = line[2:].strip() # Remove "# "
|
|
if current_category not in imports_by_category:
|
|
imports_by_category[current_category] = []
|
|
|
|
# Import line (starts with @)
|
|
elif line.startswith('@') and current_category:
|
|
import_file = line[1:].strip() # Remove "@"
|
|
if import_file not in imports_by_category[current_category]:
|
|
imports_by_category[current_category].append(import_file)
|
|
|
|
return imports_by_category
|
|
|
|
def ensure_claude_md_exists(self) -> None:
|
|
"""
|
|
Create CLAUDE.md with default content if it doesn't exist
|
|
"""
|
|
if self.claude_md_path.exists():
|
|
return
|
|
|
|
try:
|
|
# Create directory if it doesn't exist
|
|
self.claude_md_path.parent.mkdir(parents=True, exist_ok=True)
|
|
|
|
# Default CLAUDE.md content
|
|
default_content = """# SuperClaude Entry Point
|
|
|
|
This file serves as the entry point for the SuperClaude framework.
|
|
You can add your own custom instructions and configurations here.
|
|
|
|
The SuperClaude framework components will be automatically imported below.
|
|
"""
|
|
|
|
with open(self.claude_md_path, 'w', encoding='utf-8') as f:
|
|
f.write(default_content)
|
|
|
|
self.logger.info("Created CLAUDE.md with default content")
|
|
|
|
except Exception as e:
|
|
self.logger.error(f"Failed to create CLAUDE.md: {e}")
|
|
raise
|
|
|
|
def remove_imports(self, files: List[str]) -> bool:
|
|
"""
|
|
Remove specific imports from CLAUDE.md
|
|
|
|
Args:
|
|
files: List of filenames to remove from imports
|
|
|
|
Returns:
|
|
True if successful, False otherwise
|
|
"""
|
|
try:
|
|
if not self.claude_md_path.exists():
|
|
return True # Nothing to remove
|
|
|
|
existing_content = self.read_existing_content()
|
|
user_content = self.extract_user_content(existing_content)
|
|
existing_framework_imports = self._parse_existing_framework_imports(existing_content)
|
|
|
|
# Remove files from all categories
|
|
removed_any = False
|
|
for category, category_files in existing_framework_imports.items():
|
|
for file in files:
|
|
if file in category_files:
|
|
category_files.remove(file)
|
|
removed_any = True
|
|
|
|
# Remove empty categories
|
|
existing_framework_imports = {k: v for k, v in existing_framework_imports.items() if v}
|
|
|
|
if not removed_any:
|
|
return True # Nothing was removed
|
|
|
|
# Rebuild content
|
|
new_content_parts = []
|
|
|
|
if user_content.strip():
|
|
new_content_parts.append(user_content)
|
|
new_content_parts.append("")
|
|
|
|
framework_section = self.organize_imports_by_category(existing_framework_imports)
|
|
if framework_section:
|
|
new_content_parts.append(framework_section)
|
|
|
|
# Write updated content
|
|
new_content = "\n".join(new_content_parts)
|
|
|
|
with open(self.claude_md_path, 'w', encoding='utf-8') as f:
|
|
f.write(new_content)
|
|
|
|
self.logger.info(f"Removed {len(files)} imports from CLAUDE.md")
|
|
return True
|
|
|
|
except Exception as e:
|
|
self.logger.error(f"Failed to remove imports from CLAUDE.md: {e}")
|
|
return False |