claude-mpm 4.21.3__py3-none-any.whl → 5.0.2__py3-none-any.whl

claude_mpm/core/interactive_session.py

@@ -85,8 +85,8 @@ class InteractiveSession:
                     self.logger.warning(f"WebSocket initialization failed: {error}")
                     # Continue without WebSocket - not a fatal error
 
-            # Display welcome message
-            self._display_welcome_message()
+            # Banner now displayed in CLI startup - see startup_display.py
+            # Removed duplicate _display_welcome_message() to consolidate with main banner
 
             # Log session start
             if self.runner.project_logger:
@@ -293,7 +293,12 @@ class InteractiveSession:
             return False, f"Unexpected error with Socket.IO: {e}"
 
     def _display_welcome_message(self) -> None:
-        """Display the interactive session welcome message."""
+        """Display the interactive session welcome message.
+
+        DEPRECATED: This method is kept for backward compatibility with tests.
+        The main banner is now displayed in startup_display.py during CLI startup.
+        This consolidated approach prevents duplicate banners.
+        """
         version_str = self.runner._get_version()
 
         # Get output style status
@@ -383,12 +388,82 @@ class InteractiveSession:
             self.logger.debug(f"Raw claude_args received: {self.runner.claude_args}")
             cmd.extend(self.runner.claude_args)
 
-        # Add system instructions
+        # Add --agents flag if native agents mode is enabled
+        if getattr(self.runner, "use_native_agents", False):
+            agents_flag = self._build_agents_flag()
+            if agents_flag:
+                # Add --agents JSON directly (already properly formatted)
+                cmd.extend(agents_flag)
+                self.logger.info("✓ Native agents mode: Using --agents CLI flag")
+
+        # Add system instructions with file-based caching
         from claude_mpm.core.claude_runner import create_simple_context
+        from claude_mpm.services.instructions.instruction_cache_service import (
+            InstructionCacheService,
+        )
 
         system_prompt = self.runner._create_system_prompt()
         if system_prompt and system_prompt != create_simple_context():
-            cmd.extend(["--append-system-prompt", system_prompt])
+            # Try to use cached instruction file for better performance
+            try:
+                # Initialize cache service with project root
+                if "CLAUDE_MPM_USER_PWD" in os.environ:
+                    project_root = Path(os.environ["CLAUDE_MPM_USER_PWD"])
+                else:
+                    project_root = Path.cwd()
+
+                # Instruction Caching (1M-446)
+                # Cache assembled instructions to file to avoid ARG_MAX limits on Linux/Windows.
+                # - Linux: 128 KB limit, instructions are ~152 KB (exceeds by 19.1%)
+                # - Windows: 32 KB limit (exceeds by 476%)
+                # Cache updates only when content hash changes (hash-based invalidation).
+                # Fallback to inline instruction if cache fails (graceful degradation).
+                cache_service = InstructionCacheService(project_root=project_root)
+
+                # Update cache with assembled instruction content
+                cache_result = cache_service.update_cache(
+                    instruction_content=system_prompt
+                )
+
+                # Use cache file if available
+                if (
+                    cache_result.get("updated")
+                    or cache_service.get_cache_path().exists()
+                ):
+                    cache_file = cache_service.get_cache_path()
+
+                    # Log cache operation
+                    if cache_result.get("updated"):
+                        self.logger.info(
+                            f"Instruction cache updated: {cache_result.get('reason', 'unknown')}"
+                        )
+                        self.logger.debug(
+                            f"Cache hash: {cache_result.get('content_hash', 'N/A')[:8]}..."
+                        )
+                        self.logger.debug(
+                            f"Cache size: {cache_result.get('content_size_kb', 'N/A')} KB"
+                        )
+                    else:
+                        self.logger.debug(
+                            f"Using cached instructions: {cache_result.get('reason', 'unknown')}"
+                        )
+
+                    # Use file-based loading for better performance
+                    cmd.extend(["--system-prompt-file", str(cache_file)])
+                    self.logger.info(
+                        f"✓ Using file-based instruction loading: {cache_file}"
+                    )
+                else:
+                    # Fallback to inline if cache file doesn't exist
+                    self.logger.warning(
+                        "Cache file not available, falling back to inline instruction"
+                    )
+                    cmd.extend(["--append-system-prompt", system_prompt])
+
+            except Exception as e:
+                # Graceful fallback - cache failures don't break deployment
+                self.logger.warning(f"Failed to cache instructions, using inline: {e}")
+                cmd.extend(["--append-system-prompt", system_prompt])
 
         # Final command verification
         # self.logger.info(f"Final Claude command built: {' '.join(cmd)}")
@@ -402,6 +477,38 @@ class InteractiveSession:
 
         return cmd
 
+    def _build_agents_flag(self) -> Optional[list]:
+        """Build --agents flag with all MPM agents.
+
+        Returns:
+            List with ["--agents", "<json>"] or None if conversion fails
+        """
+        try:
+            from claude_mpm.services.native_agent_converter import NativeAgentConverter
+
+            converter = NativeAgentConverter()
+            agents = converter.load_agents_from_templates()
+
+            if not agents:
+                self.logger.warning("No agents loaded for native mode")
+                return None
+
+            # Generate JSON for --agents flag
+            agents_json = converter.generate_agents_json(agents)
+            summary = converter.get_conversion_summary(agents)
+
+            self.logger.info(
+                f"Native agents: {summary['total_agents']} agents, "
+                f"{summary['json_size_kb']} KB JSON"
+            )
+
+            # Return as list: ["--agents", "<json>"]
+            return ["--agents", agents_json]
+
+        except Exception as e:
+            self.logger.error(f"Failed to build --agents flag: {e}", exc_info=True)
+            return None
+
     def _prepare_environment(self) -> dict:
         """Prepare clean environment variables for Claude."""
         clean_env = os.environ.copy()

claude_mpm/core/logger.py

@@ -225,7 +225,9 @@ def setup_logging(
 
             # Use rotating file handler
             file_handler = logging.handlers.RotatingFileHandler(
-                log_file, maxBytes=10 * 1024 * 1024, backupCount=5  # 10 MB
+                log_file,
+                maxBytes=10 * 1024 * 1024,
+                backupCount=5,  # 10 MB
             )
         else:
             # Use default log directory

claude_mpm/core/oneshot_session.py

@@ -7,6 +7,7 @@ breaking down the monolithic run_oneshot method into focused, testable component
 import contextlib
 import os
 import subprocess
+import tempfile
 import time
 import uuid
 from pathlib import Path
@@ -37,6 +38,7 @@ class OneshotSession:
         self.start_time = None
         self.session_id = None
         self.original_cwd = None
+        self.temp_system_prompt_file = None
 
     def initialize_session(self, prompt: str) -> Tuple[bool, Optional[str]]:
         """Initialize the oneshot session.
@@ -134,7 +136,13 @@ class OneshotSession:
     def _build_final_command(
         self, prompt: str, context: Optional[str], infrastructure: Dict[str, Any]
     ) -> list:
-        """Build the final command with prompt and system instructions."""
+        """Build the final command with prompt and system instructions.
+
+        Uses file-based caching to avoid Linux ARG_MAX limits:
+        - Linux MAX_ARG_STRLEN: 128 KB per argument
+        - System prompt size: ~138.7 KB (exceeds limit by 7.7 KB)
+        - Solution: Write to temp file, pass file path (~60 bytes)
+        """
         full_prompt = f"{context}\n\n{prompt}" if context else prompt
         cmd = infrastructure["cmd"] + ["--print", full_prompt]
 
@@ -148,9 +156,38 @@ class OneshotSession:
                 self.logger.warning("System prompt contains Python code references!")
 
         if system_prompt and system_prompt != self._get_simple_context():
-            # The problem might be with insert positioning
-            # Let's add system prompt differently
-            cmd.extend(["--append-system-prompt", system_prompt])
+            # Use file-based loading to avoid ARG_MAX limits (1M-485)
+            # Create temp file for system prompt
+            try:
+                # Create temp file in system temp directory
+                temp_fd, temp_path = tempfile.mkstemp(
+                    suffix=".md", prefix="claude_mpm_system_prompt_"
+                )
+
+                # Write system prompt to temp file
+                with os.fdopen(temp_fd, "w", encoding="utf-8") as f:
+                    f.write(system_prompt)
+
+                # Store temp file path for cleanup
+                self.temp_system_prompt_file = temp_path
+
+                # Use --system-prompt-file flag (matches interactive mode pattern)
+                cmd.extend(["--system-prompt-file", temp_path])
+
+                # User-visible notification
+                print(f"📄 Reading system prompt from: {temp_path}")
+
+                self.logger.info(
+                    f"Using file-based system prompt loading: {temp_path} "
+                    f"({len(system_prompt) / 1024:.1f} KB)"
+                )
+
+            except Exception as e:
+                # Fallback to inline if file creation fails
+                self.logger.warning(
+                    f"Failed to create temp file for system prompt, using inline: {e}"
+                )
+                cmd.extend(["--append-system-prompt", system_prompt])
 
         return cmd
 
@@ -203,6 +240,20 @@ class OneshotSession:
 
     def cleanup_session(self) -> None:
         """Clean up the session and restore state."""
+        # Clean up temp system prompt file
+        if self.temp_system_prompt_file:
+            try:
+                temp_file_path = Path(self.temp_system_prompt_file)
+                if temp_file_path.exists():
+                    temp_file_path.unlink()
+                    self.logger.debug(
+                        f"Cleaned up temp system prompt file: {self.temp_system_prompt_file}"
+                    )
+            except Exception as e:
+                self.logger.warning(f"Failed to clean up temp system prompt file: {e}")
+            finally:
+                self.temp_system_prompt_file = None
+
         # Restore original working directory
         if self.original_cwd:
             with contextlib.suppress(Exception):
@@ -268,8 +319,47 @@ class OneshotSession:
         if self.runner.claude_args:
             cmd.extend(self.runner.claude_args)
 
+        # Add --agents flag if native agents mode is enabled
+        if getattr(self.runner, "use_native_agents", False):
+            agents_flag = self._build_agents_flag()
+            if agents_flag:
+                cmd.extend(agents_flag)
+                self.logger.info("✓ Native agents mode: Using --agents CLI flag")
+
         return cmd
 
+    def _build_agents_flag(self) -> Optional[list]:
+        """Build --agents flag with all MPM agents.
+
+        Returns:
+            List with ["--agents", "<json>"] or None if conversion fails
+        """
+        try:
+            from claude_mpm.services.native_agent_converter import NativeAgentConverter
+
+            converter = NativeAgentConverter()
+            agents = converter.load_agents_from_templates()
+
+            if not agents:
+                self.logger.warning("No agents loaded for native mode")
+                return None
+
+            # Generate JSON for --agents flag
+            agents_json = converter.generate_agents_json(agents)
+            summary = converter.get_conversion_summary(agents)
+
+            self.logger.info(
+                f"Native agents: {summary['total_agents']} agents, "
+                f"{summary['json_size_kb']} KB JSON"
+            )
+
+            # Return as list: ["--agents", "<json>"]
+            return ["--agents", agents_json]
+
+        except Exception as e:
+            self.logger.error(f"Failed to build --agents flag: {e}", exc_info=True)
+            return None
+
     def _handle_successful_response(self, response: str, prompt: str) -> None:
         """Process a successful Claude response."""
         print(response)

claude_mpm/dashboard/static/css/activity.css

@@ -607,13 +607,13 @@ body .activity-tree-container .linear-tree .tree-node.tool.privileged-tool .tree
 }
 
 @keyframes pulse-todo {
-    0% { 
+    0% {
         background: #ebf8ff;
     }
-    50% { 
+    50% {
         background: #bee3f8;
     }
-    100% { 
+    100% {
         background: #ebf8ff;
     }
 }
@@ -648,14 +648,14 @@ body .activity-tree-container .linear-tree .tree-node.tool.privileged-tool .tree
 
 /* Status Animation */
 @keyframes pulse-status {
-    0% { 
-        opacity: 1; 
+    0% {
+        opacity: 1;
     }
-    50% { 
-        opacity: 0.7; 
+    50% {
+        opacity: 0.7;
     }
-    100% { 
-        opacity: 1; 
+    100% {
+        opacity: 1;
     }
 }
 
@@ -1059,23 +1059,23 @@ body .activity-tree-container .linear-tree .tree-node.tool.privileged-tool .tree
         flex-direction: column;
         gap: 15px;
     }
-    
+
     .activity-controls {
         width: 100%;
         flex-wrap: wrap;
         justify-content: center;
     }
-    
+
     .tree-legend {
         position: static;
         margin-top: 15px;
         max-width: 300px;
     }
-    
+
     .tree-params {
         max-width: 150px;
     }
-    
+
     .activity-controls input {
         width: 150px;
     }
@@ -1085,35 +1085,35 @@ body .activity-tree-container .linear-tree .tree-node.tool.privileged-tool .tree
     .activity-container {
         padding: 10px;
     }
-    
+
     .activity-tree-container {
         padding: 0;
     }
-    
+
     .linear-tree {
         padding: 10px;
     }
-    
+
     .tree-node[data-level="1"] {
         margin-left: 15px;
     }
-    
+
     .tree-node[data-level="2"] {
         margin-left: 30px;
     }
-    
+
     .tree-node[data-level="3"] {
         margin-left: 45px;
     }
-    
+
     .tree-node[data-level="4"] {
         margin-left: 60px;
     }
-    
+
     .tree-params {
         max-width: 100px;
     }
-    
+
     .stat-item {
         flex-direction: column;
         gap: 2px;
@@ -1127,188 +1127,188 @@ body .activity-tree-container .linear-tree .tree-node.tool.privileged-tool .tree
         background: #1a202c;
         color: #e2e8f0;
     }
-    
+
     /* D3 Dark Mode Styles */
     #activity-tree-svg {
         background: #1a202c;
     }
-    
+
     .node-label {
         fill: #e2e8f0;
     }
-    
+
     .node:hover .node-label {
         fill: #63b3ed;
     }
-    
+
     .link {
         stroke: #4a5568;
     }
-    
+
     .node:hover .link {
         stroke: #63b3ed;
     }
-    
+
     .d3-tooltip {
         background: rgba(45, 55, 72, 0.95) !important;
         color: #e2e8f0 !important;
         border: 1px solid #4a5568;
     }
-    
+
     .activity-header {
         background: #2d3748;
     }
-    
+
     .activity-controls select,
     .activity-controls input {
         background: #2d3748;
         color: #e2e8f0;
         border-color: #4a5568;
     }
-    
+
     .stat-label {
         color: #a0aec0;
     }
-    
+
     .stat-value {
         color: #e2e8f0;
     }
-    
+
     .tree-legend {
         background: rgba(45, 55, 72, 0.95);
         border-color: #4a5568;
     }
-    
+
     .legend-item {
         color: #e2e8f0;
     }
-    
+
     .tree-node:hover {
         background-color: #2d3748;
     }
-    
+
     .tree-node-content:hover {
         background-color: #4a5568;
     }
-    
+
     .tree-label {
         color: #e2e8f0;
     }
-    
+
     .tree-meta {
         color: #a0aec0;
     }
-    
+
     .tree-node.project-root {
         background: linear-gradient(135deg, #4299e1 0%, #553c9a 100%);
     }
-    
+
     .tree-node.session {
         background: #2d3748;
         border-color: #4a5568;
     }
-    
+
     .tree-node.session .tree-label {
         color: #e2e8f0;
     }
-    
+
     .tree-children {
         border-left-color: #4a5568;
     }
-    
+
     .tree-label.clickable:hover {
         background-color: rgba(74, 85, 104, 0.5);
         color: #e2e8f0;
     }
-    
+
     .module-item-details {
         color: #e2e8f0;
     }
-    
+
     .module-item-header {
         border-bottom-color: #4a5568;
     }
-    
+
     .module-item-header h6 {
         color: #e2e8f0;
     }
-    
+
     .detail-label {
         color: #a0aec0;
     }
-    
+
     .detail-value {
         color: #e2e8f0;
     }
-    
+
     .detail-section {
         border-top-color: #4a5568;
     }
-    
+
     .detail-section-title {
         color: #a0aec0;
     }
-    
+
     .tools-list, .params-list {
         background: #2d3748;
         border-color: #4a5568;
     }
-    
+
     .tool-summary {
         background: #4a5568;
         border-color: #718096;
         color: #e2e8f0;
     }
-    
+
     .tool-params-expanded {
         background: #2d3748;
         border-color: #4a5568;
         color: #e2e8f0;
     }
-    
+
     .param-line .param-key,
     .param-key {
         color: #9f7aea;
     }
-    
+
     .param-line .param-value,
     .param-value {
         color: #e2e8f0;
     }
-    
+
     .param-item {
         border-bottom-color: #4a5568;
     }
-    
+
     .param-text-short {
         background: #2d3748;
         border-color: #4a5568;
         color: #e2e8f0;
     }
-    
+
     .param-text,
     .param-text-long {
         background: #2d3748;
         border-color: #4a5568;
         color: #e2e8f0;
     }
-    
+
     .param-json {
         background: #1a202c;
         border-color: #4a5568;
         color: #e2e8f0;
     }
-    
+
     .param-primitive {
         background: #4a5568;
         color: #e2e8f0;
     }
-    
+
     .param-error {
         background: #742a2a;
         color: #feb2b2;
     }
-    
+
     .tool-result {
         background: #1a202c;
         border-color: #4a5568;
@@ -1548,20 +1548,20 @@ body .activity-tree-container .linear-tree .tree-node.tool.privileged-tool .tree
         flex-direction: column;
         gap: 8px;
     }
-    
+
     .summary-item {
         min-width: auto;
     }
-    
+
     .todo-checklist-item {
         padding: 6px;
     }
-    
+
     .todo-checkbox {
         width: 20px;
         height: 20px;
     }
-    
+
     .checkbox-icon {
         font-size: 12px;
     }
@@ -1572,21 +1572,21 @@ body .activity-tree-container .linear-tree .tree-node.tool.privileged-tool .tree
     .activity-header {
         display: none;
     }
-    
+
     .tree-legend {
         position: static;
         margin-bottom: 20px;
     }
-    
+
     .activity-tree-container {
         box-shadow: none;
         border: 1px solid #000;
     }
-    
+
     .tree-node {
         break-inside: avoid;
     }
-    
+
     .tree-status {
         border: 1px solid #000;
         background: transparent !important;