claude-mpm 5.4.85__py3-none-any.whl → 5.6.76__py3-none-any.whl

claude_mpm/cli/startup_display.py

@@ -7,7 +7,7 @@ Shows welcome message, version info, ASCII art, and what's new section.
 import os
 import re
 import shutil
-import subprocess
+import subprocess  # nosec B404 - required for git operations
 from pathlib import Path
 from typing import List
 
@@ -65,8 +65,8 @@ def _get_recent_commits(max_commits: int = 3) -> List[str]:
         if not is_git_repository("."):
             return []
 
-        # Run git log with custom format
-        result = subprocess.run(
+        # Run git log with custom format (safe - no user input)
+        result = subprocess.run(  # nosec B603 B607
             ["git", "log", "--format=%h • %ar • %s", f"-{max_commits}"],
             capture_output=True,
             text=True,
@@ -216,6 +216,59 @@ def _get_cwd_display(max_width: int = 40) -> str:
     return "..." + cwd[-(max_width - 3) :]
 
 
+def _count_mpm_skills() -> int:
+    """
+    Count user-level MPM skills from ~/.claude/skills/.
+
+    Returns:
+        Number of skill directories with SKILL.md files
+    """
+    try:
+        user_skills_dir = Path.home() / ".claude" / "skills"
+        if not user_skills_dir.exists():
+            return 0
+
+        # Count directories with SKILL.md (skill directories)
+        skill_count = 0
+        for item in user_skills_dir.iterdir():
+            if item.is_dir():
+                skill_file = item / "SKILL.md"
+                if skill_file.exists():
+                    skill_count += 1
+            # Also count standalone .md files (legacy format)
+            elif item.is_file() and item.suffix == ".md" and item.name != "README.md":
+                skill_count += 1
+
+        return skill_count
+    except Exception:
+        # Silent failure - return 0 if any error
+        return 0
+
+
+def _count_deployed_agents() -> int:
+    """
+    Count deployed agents from .claude/agents/.
+
+    Returns:
+        Number of deployed agent files
+    """
+    try:
+        deploy_target = Path.cwd() / ".claude" / "agents"
+        if not deploy_target.exists():
+            return 0
+
+        # Count .md files, excluding README and other docs
+        agent_files = [
+            f
+            for f in deploy_target.glob("*.md")
+            if not f.name.startswith(("README", "INSTRUCTIONS", "."))
+        ]
+        return len(agent_files)
+    except Exception:
+        # Silent failure - return 0 if any error
+        return 0
+
+
 def _format_two_column_line(
     left: str, right: str, left_panel_width: int, right_panel_width: int
 ) -> str:
@@ -402,11 +455,25 @@ def display_startup_banner(version: str, logging_level: str) -> None:
             )
         )
 
-    # Line 10: Model info | separator
+    # Line 10: Model info with counts | separator
     separator = "─" * right_panel_width
+    agent_count = _count_deployed_agents()
+    skill_count = _count_mpm_skills()
+
+    # Format: "Sonnet 4.5 · 44 agents, 19 skills"
+    if agent_count > 0 or skill_count > 0:
+        counts_text = []
+        if agent_count > 0:
+            counts_text.append(f"{agent_count} agent{'s' if agent_count != 1 else ''}")
+        if skill_count > 0:
+            counts_text.append(f"{skill_count} skill{'s' if skill_count != 1 else ''}")
+        model_info = f"Sonnet 4.5 · {', '.join(counts_text)}"
+    else:
+        model_info = "Sonnet 4.5 · Claude MPM"
+
     lines.append(
         _format_two_column_line(
-            "Sonnet 4.5 · Claude MPM", separator, left_panel_width, right_panel_width
+            model_info, separator, left_panel_width, right_panel_width
         )
     )
 
@@ -464,7 +531,7 @@ def should_show_banner(args) -> bool:
     """
     Determine if startup banner should be displayed.
 
-    Skip banner for: --help, --version, info, doctor, config, configure commands
+    Skip banner for: --help, --version, info, doctor, config, configure, oauth commands
     """
     # Check for help/version flags
     if hasattr(args, "help") and args.help:
@@ -473,7 +540,9 @@ def should_show_banner(args) -> bool:
         return False
 
     # Check for commands that should skip banner
-    skip_commands = {"info", "doctor", "config", "configure"}
+    # Commander has its own banner, so skip the main MPM banner
+    # OAuth commands are lightweight utilities that should run immediately
+    skip_commands = {"info", "doctor", "config", "configure", "commander", "oauth"}
     if hasattr(args, "command") and args.command in skip_commands:
         return False
 

claude_mpm/cli/startup_logging.py

@@ -672,7 +672,7 @@ async def trigger_vector_search_indexing(project_root: Optional[Path] = None) ->
             # Using installed binary
             cmd = [vector_search_path, "index", str(project_root)]
 
-        logger.info(
+        logger.debug(
             "MCP Vector Search: Starting background indexing for improved code search"
         )
 
@@ -761,7 +761,7 @@ def _start_vector_search_subprocess(project_root: Optional[Path] = None) -> None
         else:
             cmd = [vector_search_path, "index", str(project_root)]
 
-        logger.info(
+        logger.debug(
             "MCP Vector Search: Starting background indexing for improved code search"
         )
 

claude_mpm/cli/startup_migrations.py

@@ -0,0 +1,236 @@
+"""
+Startup migrations for claude-mpm.
+
+This module provides a migration registry pattern for automatically fixing
+configuration issues on first startup after an update. Migrations run once
+and are tracked in ~/.claude-mpm/migrations.yaml.
+
+Design Principles:
+- Non-blocking: Failures log warnings but don't stop startup
+- Idempotent: Safe to run multiple times (check before migrate)
+- Tracked: Each migration runs only once per installation
+- Early: Runs before agent sync in startup sequence
+"""
+
+import shutil
+from dataclasses import dataclass
+from datetime import datetime, timezone
+from pathlib import Path
+from typing import Callable
+
+import yaml
+
+from ..core.logging_utils import get_logger
+
+logger = get_logger(__name__)
+
+
+@dataclass
+class Migration:
+    """Definition of a startup migration."""
+
+    id: str
+    description: str
+    check: Callable[[], bool]  # Returns True if migration is needed
+    migrate: Callable[[], bool]  # Returns True if migration succeeded
+
+
+def _get_migrations_file() -> Path:
+    """Get path to migrations tracking file."""
+    return Path.home() / ".claude-mpm" / "migrations.yaml"
+
+
+def _load_completed_migrations() -> dict:
+    """Load completed migrations from tracking file.
+
+    Returns:
+        Dictionary with completed migrations data.
+    """
+    migrations_file = _get_migrations_file()
+    if not migrations_file.exists():
+        return {"migrations": []}
+
+    try:
+        with open(migrations_file) as f:
+            data = yaml.safe_load(f) or {}
+            return data if "migrations" in data else {"migrations": []}
+    except Exception as e:
+        logger.debug(f"Failed to load migrations file: {e}")
+        return {"migrations": []}
+
+
+def _save_completed_migration(migration_id: str) -> None:
+    """Save a completed migration to tracking file.
+
+    Args:
+        migration_id: The ID of the completed migration.
+    """
+    migrations_file = _get_migrations_file()
+    migrations_file.parent.mkdir(parents=True, exist_ok=True)
+
+    data = _load_completed_migrations()
+
+    # Add new migration entry
+    data["migrations"].append(
+        {"id": migration_id, "completed_at": datetime.now(timezone.utc).isoformat()}
+    )
+
+    try:
+        with open(migrations_file, "w") as f:
+            yaml.safe_dump(data, f, default_flow_style=False)
+    except Exception as e:
+        logger.warning(f"Failed to save migration tracking: {e}")
+
+
+def _is_migration_completed(migration_id: str) -> bool:
+    """Check if a migration has already been completed.
+
+    Args:
+        migration_id: The ID of the migration to check.
+
+    Returns:
+        True if the migration has been completed.
+    """
+    data = _load_completed_migrations()
+    completed_ids = [m.get("id") for m in data.get("migrations", [])]
+    return migration_id in completed_ids
+
+
+# =============================================================================
+# Migration: v5.6.76-cache-dir-rename
+# =============================================================================
+
+
+def _check_cache_dir_rename_needed() -> bool:
+    """Check if cache directory rename is needed.
+
+    Returns:
+        True if ~/.claude-mpm/cache/remote-agents/ exists.
+    """
+    old_cache_dir = Path.home() / ".claude-mpm" / "cache" / "remote-agents"
+    return old_cache_dir.exists()
+
+
+def _migrate_cache_dir_rename() -> bool:
+    """Rename remote-agents cache directory to agents.
+
+    This migration:
+    1. Moves ~/.claude-mpm/cache/remote-agents/ contents to ~/.claude-mpm/cache/agents/
+    2. Removes the old remote-agents directory
+    3. Updates configuration.yaml if it references the old path
+
+    Returns:
+        True if migration succeeded.
+    """
+    old_cache_dir = Path.home() / ".claude-mpm" / "cache" / "remote-agents"
+    new_cache_dir = Path.home() / ".claude-mpm" / "cache" / "agents"
+
+    try:
+        # Step 1: Move directory contents
+        if old_cache_dir.exists():
+            # Ensure parent directory exists
+            new_cache_dir.parent.mkdir(parents=True, exist_ok=True)
+
+            if new_cache_dir.exists():
+                # Merge: move contents from old to new
+                for item in old_cache_dir.iterdir():
+                    dest = new_cache_dir / item.name
+                    if not dest.exists():
+                        shutil.move(str(item), str(dest))
+                # Remove old directory after moving contents
+                shutil.rmtree(old_cache_dir, ignore_errors=True)
+            else:
+                # Simple rename if new dir doesn't exist
+                shutil.move(str(old_cache_dir), str(new_cache_dir))
+
+            logger.debug(
+                f"Moved cache directory from {old_cache_dir} to {new_cache_dir}"
+            )
+
+        # Step 2: Update configuration.yaml if needed
+        _update_configuration_cache_path()
+
+        return True
+
+    except Exception as e:
+        logger.warning(f"Cache directory migration failed: {e}")
+        return False
+
+
+def _update_configuration_cache_path() -> None:
+    """Update configuration.yaml to use new cache path if it references old path."""
+    config_file = Path.home() / ".claude-mpm" / "configuration.yaml"
+    if not config_file.exists():
+        return
+
+    try:
+        with open(config_file) as f:
+            content = f.read()
+
+        old_path_pattern = "/.claude-mpm/cache/remote-agents"
+        new_path_pattern = "/.claude-mpm/cache/agents"
+
+        if old_path_pattern in content:
+            updated_content = content.replace(old_path_pattern, new_path_pattern)
+            with open(config_file, "w") as f:
+                f.write(updated_content)
+            logger.debug("Updated configuration.yaml cache_dir path")
+
+    except Exception as e:
+        logger.debug(f"Failed to update configuration.yaml: {e}")
+
+
+# =============================================================================
+# Migration Registry
+# =============================================================================
+
+MIGRATIONS: list[Migration] = [
+    Migration(
+        id="v5.6.76-cache-dir-rename",
+        description="Rename remote-agents cache dir to agents",
+        check=_check_cache_dir_rename_needed,
+        migrate=_migrate_cache_dir_rename,
+    ),
+]
+
+
+def run_migrations() -> None:
+    """Run all pending startup migrations.
+
+    This function:
+    1. Iterates through the migration registry
+    2. Skips already-completed migrations
+    3. Checks if each migration is needed
+    4. Runs the migration if needed
+    5. Tracks completed migrations
+
+    Errors are logged but do not stop startup.
+    """
+    for migration in MIGRATIONS:
+        try:
+            # Skip if already completed
+            if _is_migration_completed(migration.id):
+                continue
+
+            # Check if migration is needed
+            if not migration.check():
+                # Mark as completed even if not needed (condition doesn't apply)
+                _save_completed_migration(migration.id)
+                continue
+
+            # Run the migration
+            print(f"⚙️  Running startup migration: {migration.description}")
+            logger.info(f"Running startup migration: {migration.id}")
+
+            success = migration.migrate()
+
+            if success:
+                _save_completed_migration(migration.id)
+                logger.info(f"Migration {migration.id} completed successfully")
+            else:
+                logger.warning(f"Migration {migration.id} failed")
+
+        except Exception as e:
+            # Non-blocking: log and continue
+            logger.warning(f"Migration {migration.id} error: {e}")
+            continue

claude_mpm/cli/utils.py

@@ -107,7 +107,7 @@ def get_agent_versions_display() -> Optional[str]:
                     base_version_tuple
                 )
                 output_lines.append(f"\n  Base Agent Version:  {base_version_str}")
-        except Exception:
+        except Exception:  # nosec B110 - intentional: version display is optional
             pass
 
         # Check for agents needing migration
@@ -173,8 +173,12 @@ def setup_logging(args) -> object:
     if not hasattr(args, "logging") or args.logging is None:
         args.logging = LogLevel.OFF.value
 
+    # Handle deprecated --verbose flag
+    if hasattr(args, "verbose") and args.verbose and args.logging == LogLevel.OFF.value:
+        args.logging = LogLevel.INFO.value
+
     # Handle deprecated --debug flag
-    if hasattr(args, "debug") and args.debug and args.logging == LogLevel.INFO.value:
+    if hasattr(args, "debug") and args.debug:
         args.logging = LogLevel.DEBUG.value
 
     # Only setup logging if not OFF
@@ -204,7 +208,7 @@ def ensure_directories() -> None:
         from ..init import ensure_directories as init_ensure_directories
 
         init_ensure_directories()
-    except Exception:
+    except Exception:  # nosec B110
         # Continue even if initialization fails
         # The individual commands will handle missing directories as needed
         pass

claude_mpm/commander/__init__.py

@@ -0,0 +1,78 @@
+"""MPM Commander - Multi-Project Orchestration.
+
+This module provides the core infrastructure for managing multiple projects
+with isolated state, work queues, and tool sessions.
+
+Key Components:
+    - ProjectRegistry: Thread-safe project management
+    - Project models: Data structures for state and sessions
+    - TmuxOrchestrator: Tmux session and pane management
+    - Config loading: .claude-mpm/ directory configuration
+    - CommanderDaemon: Main daemon process for orchestration
+    - ProjectSession: Per-project lifecycle management
+    - InstanceManager: Framework selection and instance lifecycle
+    - Frameworks: Claude Code, MPM framework abstractions
+    - Memory: Conversation storage, semantic search, context compression
+
+Example:
+    >>> from claude_mpm.commander import ProjectRegistry
+    >>> registry = ProjectRegistry()
+    >>> project = registry.register("/path/to/project")
+    >>> registry.update_state(project.id, ProjectState.WORKING)
+
+    >>> # Memory integration
+    >>> from claude_mpm.commander.memory import MemoryIntegration
+    >>> memory = MemoryIntegration.create()
+    >>> await memory.capture_project_conversation(project)
+"""
+
+from claude_mpm.commander.config import DaemonConfig
+from claude_mpm.commander.config_loader import load_project_config
+from claude_mpm.commander.daemon import CommanderDaemon
+from claude_mpm.commander.frameworks import (
+    BaseFramework,
+    ClaudeCodeFramework,
+    InstanceInfo,
+    MPMFramework,
+)
+from claude_mpm.commander.instance_manager import (
+    FrameworkNotFoundError,
+    InstanceAlreadyExistsError,
+    InstanceManager,
+    InstanceNotFoundError,
+)
+from claude_mpm.commander.models import (
+    Project,
+    ProjectState,
+    ThreadMessage,
+    ToolSession,
+)
+from claude_mpm.commander.project_session import ProjectSession, SessionState
+from claude_mpm.commander.registry import ProjectRegistry
+from claude_mpm.commander.tmux_orchestrator import (
+    TmuxNotFoundError,
+    TmuxOrchestrator,
+)
+
+__all__ = [
+    "BaseFramework",
+    "ClaudeCodeFramework",
+    "CommanderDaemon",
+    "DaemonConfig",
+    "FrameworkNotFoundError",
+    "InstanceAlreadyExistsError",
+    "InstanceInfo",
+    "InstanceManager",
+    "InstanceNotFoundError",
+    "MPMFramework",
+    "Project",
+    "ProjectRegistry",
+    "ProjectSession",
+    "ProjectState",
+    "SessionState",
+    "ThreadMessage",
+    "TmuxNotFoundError",
+    "TmuxOrchestrator",
+    "ToolSession",
+    "load_project_config",
+]

claude_mpm/commander/adapters/__init__.py

@@ -0,0 +1,60 @@
+"""Runtime adapters for MPM Commander.
+
+This package provides adapters for different AI coding tools, allowing
+the TmuxOrchestrator to interface with various runtimes in a uniform way.
+
+Two types of adapters:
+- RuntimeAdapter: Synchronous parsing and state detection
+- CommunicationAdapter: Async I/O and state management
+
+Available Runtime Adapters:
+- ClaudeCodeAdapter: Vanilla Claude Code CLI
+- AuggieAdapter: Auggie with MCP support
+- CodexAdapter: Codex (limited features)
+- MPMAdapter: Full MPM with agents, hooks, skills, monitoring
+
+Registry:
+- AdapterRegistry: Centralized adapter management with auto-detection
+"""
+
+from .auggie import AuggieAdapter
+from .base import (
+    Capability,
+    ParsedResponse,
+    RuntimeAdapter,
+    RuntimeCapability,
+    RuntimeInfo,
+)
+from .claude_code import ClaudeCodeAdapter
+from .codex import CodexAdapter
+from .communication import (
+    AdapterResponse,
+    AdapterState,
+    BaseCommunicationAdapter,
+    ClaudeCodeCommunicationAdapter,
+)
+from .mpm import MPMAdapter
+from .registry import AdapterRegistry
+
+# Auto-register all adapters
+AdapterRegistry.register("claude-code", ClaudeCodeAdapter)
+AdapterRegistry.register("auggie", AuggieAdapter)
+AdapterRegistry.register("codex", CodexAdapter)
+AdapterRegistry.register("mpm", MPMAdapter)
+
+__all__ = [
+    "AdapterRegistry",
+    "AdapterResponse",
+    "AdapterState",
+    "AuggieAdapter",
+    "BaseCommunicationAdapter",
+    "Capability",
+    "ClaudeCodeAdapter",
+    "ClaudeCodeCommunicationAdapter",
+    "CodexAdapter",
+    "MPMAdapter",
+    "ParsedResponse",
+    "RuntimeAdapter",
+    "RuntimeCapability",
+    "RuntimeInfo",
+]