claude-mpm 4.1.26__py3-none-any.whl → 5.0.9__py3-none-any.whl

claude_mpm/services/agents/deployment/agent_template_builder.py

@@ -8,9 +8,12 @@ maintainability and testability.
 """
 
 import json
+import re
 from pathlib import Path
 from typing import Any, Dict, List
 
+import yaml
+
 from claude_mpm.core.logging_config import get_logger
 
 
@@ -29,6 +32,301 @@ class AgentTemplateBuilder:
         """Initialize the template builder."""
         self.logger = get_logger(__name__)
 
+    def normalize_tools_input(self, tools):
+        """Normalize various tool input formats to a consistent list.
+
+        Handles multiple input formats:
+        - None/empty: Returns default tools
+        - String: Splits by comma and strips whitespace
+        - List: Ensures all items are strings and strips whitespace
+        - Dict: Takes enabled tools (where value is True)
+
+        Args:
+            tools: Tools input in various formats (str, list, dict, or None)
+
+        Returns:
+            List of tool names, normalized and cleaned
+        """
+        default_tools = ["Read", "Write", "Edit", "Grep", "Glob", "Bash"]
+
+        # Handle None or empty
+        if not tools:
+            self.logger.debug("No tools provided, using defaults")
+            return default_tools
+
+        # Convert to list format
+        if isinstance(tools, str):
+            # Split by comma, strip whitespace
+            tool_list = [t.strip() for t in tools.split(",") if t.strip()]
+            self.logger.debug(f"Converted string tools '{tools}' to list: {tool_list}")
+        elif isinstance(tools, list):
+            # Ensure all items are strings and strip whitespace
+            tool_list = [str(t).strip() for t in tools if t and str(t).strip()]
+            self.logger.debug(f"Normalized list tools: {tool_list}")
+        elif isinstance(tools, dict):
+            # Handle dict format - take enabled tools
+            tool_list = [k for k, v in tools.items() if v]
+            self.logger.info(f"Converting dict tools format: {tools} -> {tool_list}")
+        else:
+            self.logger.warning(f"Unknown tools format: {type(tools)}, using defaults")
+            return default_tools
+
+        # Return processed list or defaults if empty
+        if not tool_list:
+            self.logger.debug("Tools list empty after processing, using defaults")
+            return default_tools
+
+        return tool_list
+
+    def _discover_base_agent_templates(self, agent_file: Path) -> List[Path]:
+        """Discover BASE-AGENT.md files in hierarchy from agent file to repository root.
+
+        This method implements hierarchical BASE template discovery by walking up the
+        directory tree from the agent file location and collecting all BASE-AGENT.md
+        files found along the way.
+
+        Composition Order (closest to farthest):
+        1. Local BASE-AGENT.md (same directory as agent)
+        2. Parent BASE-AGENT.md (parent directory)
+        3. Grandparent BASE-AGENT.md (grandparent directory)
+        ... continuing to repository root
+
+        Args:
+            agent_file: Path to the agent template file
+
+        Returns:
+            List of BASE-AGENT.md paths ordered from closest to farthest
+            (same directory to root)
+
+        Example:
+            Given structure:
+            repo/
+              BASE-AGENT.md           # Root (index 2)
+              engineering/
+                BASE-AGENT.md         # Parent (index 1)
+                python/
+                  BASE-AGENT.md       # Local (index 0)
+                  fastapi-engineer.md # Agent file
+
+            Returns: [
+                repo/engineering/python/BASE-AGENT.md,
+                repo/engineering/BASE-AGENT.md,
+                repo/BASE-AGENT.md
+            ]
+        """
+        base_templates = []
+        current_dir = agent_file.parent
+
+        # Walk up directory tree until we reach root or a reasonable limit
+        # Stop at repository root or after 10 levels (safety limit)
+        max_depth = 10
+        depth = 0
+
+        while current_dir and depth < max_depth:
+            # Check for BASE-AGENT.md in current directory
+            base_agent_file = current_dir / "BASE-AGENT.md"
+            if base_agent_file.exists() and base_agent_file.is_file():
+                base_templates.append(base_agent_file)
+                self.logger.debug(f"Found BASE-AGENT.md at: {base_agent_file}")
+
+            # Stop at git repository root if detected
+            if (current_dir / ".git").exists():
+                self.logger.debug(f"Reached git repository root at: {current_dir}")
+                break
+
+            # Stop at common repository root indicators
+            if current_dir.name in [".claude-mpm", "remote-agents", "cache"]:
+                self.logger.debug(
+                    f"Reached repository root indicator at: {current_dir}"
+                )
+                break
+
+            # Move to parent directory
+            parent = current_dir.parent
+            if parent == current_dir:  # Reached filesystem root
+                break
+
+            current_dir = parent
+            depth += 1
+
+        if base_templates:
+            self.logger.info(
+                f"Discovered {len(base_templates)} BASE-AGENT.md file(s) for {agent_file.name}"
+            )
+
+        return base_templates
+
+    def _parse_markdown_template(self, template_path: Path) -> dict:
+        """Parse Markdown template with YAML frontmatter.
+
+        Extracts metadata from YAML frontmatter and content from Markdown body.
+        Supports the new agent template format with YAML frontmatter between --- delimiters.
+
+        Args:
+            template_path: Path to the Markdown template file
+
+        Returns:
+            Dictionary containing metadata and instructions
+
+        Raises:
+            ValueError: If frontmatter is missing or malformed
+            yaml.YAMLError: If YAML parsing fails
+        """
+        content = template_path.read_text(encoding="utf-8")
+
+        # Split frontmatter and body
+        # Format: ---\n<yaml>\n---\n<markdown>
+        if not content.startswith("---"):
+            raise ValueError(
+                f"Markdown template missing YAML frontmatter: {template_path}"
+            )
+
+        # Split by --- delimiters
+        parts = content.split("---", 2)
+        if len(parts) < 3:
+            raise ValueError(f"Malformed YAML frontmatter in template: {template_path}")
+
+        # parts[0] is empty (before first ---)
+        # parts[1] is YAML frontmatter
+        # parts[2] is Markdown content
+        yaml_content = parts[1].strip()
+        markdown_content = parts[2].strip()
+
+        # Parse YAML frontmatter
+        try:
+            metadata = yaml.safe_load(yaml_content)
+            if not isinstance(metadata, dict):
+                raise ValueError(
+                    f"YAML frontmatter must be a dictionary: {template_path}"
+                )
+        except yaml.YAMLError as e:
+            self.logger.error(
+                f"Failed to parse YAML frontmatter in {template_path}: {e}"
+            )
+            raise
+
+        # Validate required fields
+        required_fields = ["name", "description", "version"]
+        missing_fields = [field for field in required_fields if field not in metadata]
+        if missing_fields:
+            raise ValueError(
+                f"Missing required fields in template {template_path}: {missing_fields}"
+            )
+
+        # Add the markdown content as instructions field
+        metadata["instructions"] = markdown_content
+
+        # Normalize metadata structure to match JSON template format
+        # JSON templates have these fields at top level, Markdown may have them nested
+        self._normalize_metadata_structure(metadata)
+
+        return metadata
+
+    def _normalize_metadata_structure(self, metadata: dict) -> None:
+        """Normalize metadata structure to match expected JSON template format.
+
+        This ensures both Markdown and JSON templates produce the same metadata structure
+        for downstream processing.
+
+        Args:
+            metadata: Metadata dictionary to normalize (modified in-place)
+        """
+        # Map Markdown frontmatter fields to JSON template structure
+        # Handle tags: YAML list vs JSON comma-separated string
+        if "tags" in metadata and isinstance(metadata["tags"], list):
+            # Keep as list for now, normalize_tools_input will handle both formats
+            pass
+
+        # Map agent_id to name if name is missing
+        if "agent_id" in metadata and "name" not in metadata:
+            metadata["name"] = metadata["agent_id"]
+
+        # Ensure capabilities dict exists
+        if "capabilities" not in metadata:
+            metadata["capabilities"] = {}
+
+        # Merge top-level capability fields into capabilities dict
+        capability_fields = ["memory_limit", "cpu_limit", "network_access"]
+        for field in capability_fields:
+            if field in metadata:
+                metadata["capabilities"][field] = metadata.pop(field)
+
+        # Add model to capabilities if present at top level
+        if "model" in metadata and "model" not in metadata["capabilities"]:
+            metadata["capabilities"]["model"] = metadata["model"]
+
+    def _load_base_agent_instructions(self, agent_type: str) -> str:
+        """Load BASE instructions for a specific agent type.
+
+        DEPRECATED: This method loads BASE_{TYPE}.md files (old pattern).
+        New pattern uses hierarchical BASE-AGENT.md files discovered via
+        _discover_base_agent_templates() and composed in build_agent_markdown().
+
+        Args:
+            agent_type: The type of agent (engineer, qa, ops, research, documentation)
+
+        Returns:
+            The BASE instructions content or empty string if not found
+        """
+        if not agent_type:
+            return ""
+
+        try:
+            # Construct BASE file name
+            base_file = f"BASE_{agent_type.upper()}.md"
+
+            # Try to find BASE file in agents directory
+            # First try current working directory structure
+            agents_dir = Path(__file__).parent.parent.parent.parent / "agents"
+            base_path = agents_dir / base_file
+
+            if not base_path.exists():
+                # Try packaged resources if available
+                try:
+                    from importlib.resources import files
+
+                    agents_package = files("claude_mpm.agents")
+                    base_resource = agents_package / base_file
+                    if base_resource.is_file():
+                        content = base_resource.read_text(encoding="utf-8")
+                        self.logger.debug(
+                            f"Loaded BASE instructions from package: {base_file}"
+                        )
+                        return content
+                except (ImportError, Exception) as e:
+                    self.logger.debug(
+                        f"Could not load BASE instructions from package: {e}"
+                    )
+
+                # Final fallback - try multiple possible locations
+                possible_paths = [
+                    Path.cwd() / "src" / "claude_mpm" / "agents" / base_file,
+                    Path(__file__).parent.parent.parent.parent / "agents" / base_file,
+                    Path.home() / ".claude-mpm" / "agents" / base_file,
+                ]
+
+                for path in possible_paths:
+                    if path.exists():
+                        base_path = path
+                        break
+                else:
+                    self.logger.debug(
+                        f"No BASE instructions found for type: {agent_type}"
+                    )
+                    return ""
+
+            if base_path.exists():
+                self.logger.debug(f"Loading BASE instructions from {base_path}")
+                return base_path.read_text(encoding="utf-8")
+            self.logger.debug(f"No BASE instructions found for type: {agent_type}")
+            return ""
+
+        except Exception as e:
+            self.logger.warning(
+                f"Error loading BASE instructions for {agent_type}: {e}"
+            )
+            return ""
+
     def build_agent_markdown(
         self,
         agent_name: str,
@@ -41,7 +339,7 @@ class AgentTemplateBuilder:
 
         Args:
             agent_name: Name of the agent
-            template_path: Path to the agent template JSON file
+            template_path: Path to the agent template (JSON or Markdown file)
             base_agent_data: Base agent configuration data
             source_info: Source of the agent (system/project/user)
 
@@ -51,16 +349,34 @@ class AgentTemplateBuilder:
         Raises:
             FileNotFoundError: If template file doesn't exist
             json.JSONDecodeError: If template JSON is invalid
+            yaml.YAMLError: If template YAML is invalid
+            ValueError: If template format is unsupported or malformed
         """
         if not template_path.exists():
             raise FileNotFoundError(f"Template file not found: {template_path}")
 
+        # Format detection: route to appropriate parser
         try:
-            template_content = template_path.read_text()
-            template_data = json.loads(template_content)
+            if template_path.suffix == ".md":
+                # Parse Markdown template with YAML frontmatter
+                self.logger.debug(f"Parsing Markdown template: {template_path}")
+                template_data = self._parse_markdown_template(template_path)
+            elif template_path.suffix == ".json":
+                # Parse JSON template (legacy format)
+                self.logger.debug(f"Parsing JSON template: {template_path}")
+                template_content = template_path.read_text()
+                template_data = json.loads(template_content)
+            else:
+                raise ValueError(
+                    f"Unsupported template format: {template_path.suffix}. "
+                    f"Expected .md or .json"
+                )
         except json.JSONDecodeError as e:
             self.logger.error(f"Invalid JSON in template {template_path}: {e}")
             raise
+        except (yaml.YAMLError, ValueError) as e:
+            self.logger.error(f"Invalid template {template_path}: {e}")
+            raise
 
         # Extract tools from template with fallback
         # Handle both dict and list formats for capabilities (backward compatibility)
@@ -69,13 +385,39 @@ class AgentTemplateBuilder:
             capabilities.get("tools") if isinstance(capabilities, dict) else None
         )
 
-        tools = (
+        # Get raw tools from various possible locations
+        raw_tools = (
             template_data.get("tools")
             or capabilities_tools
             or template_data.get("configuration_fields", {}).get("tools")
-            or ["Read", "Write", "Edit", "Grep", "Glob", "LS"]  # Default fallback
         )
 
+        # Normalize tools to a consistent list format
+        tools = self.normalize_tools_input(raw_tools)
+
+        # Log if we see non-standard tool names (info level, not warning)
+        standard_tools = {
+            "Read",
+            "Write",
+            "Edit",
+            "MultiEdit",  # File operations
+            "Grep",
+            "Glob",
+            "LS",  # Search and navigation
+            "Bash",
+            "BashOutput",
+            "KillShell",  # Command execution
+            "TodoWrite",
+            "ExitPlanMode",  # Task management
+            "WebSearch",
+            "WebFetch",  # Web operations
+            "NotebookRead",
+            "NotebookEdit",  # Jupyter notebook support
+        }
+        non_standard = [t for t in tools if t not in standard_tools]
+        if non_standard:
+            self.logger.info(f"Using non-standard tools: {non_standard}")
+
         # Extract model from template with fallback
         capabilities_model = (
             capabilities.get("model") if isinstance(capabilities, dict) else None
@@ -88,19 +430,14 @@ class AgentTemplateBuilder:
             or "sonnet"  # Default fallback
         )
 
-        # Convert tools list to comma-separated string (no spaces!)
-        tools_str = ",".join(tools) if isinstance(tools, list) else str(tools)
-
-        # Validate tools format - CRITICAL: No spaces allowed!
-        if ", " in tools_str:
-            self.logger.error(f"Tools contain spaces: '{tools_str}'")
-            raise ValueError(
-                f"Tools must be comma-separated WITHOUT spaces: {tools_str}"
-            )
+        # Convert tools list to comma-separated string (without spaces for compatibility)
+        ",".join(tools)
 
-        # Map model names to Claude Code format
+        # Map model names to Claude Code format (as required)
         model_map = {
             "claude-3-5-sonnet-20241022": "sonnet",
+            "claude-3-5-haiku-20241022": "haiku",
+            "claude-3-opus-20240229": "opus",
             "claude-3-5-sonnet": "sonnet",
             "claude-3-sonnet": "sonnet",
             "claude-3-haiku": "haiku",
@@ -112,6 +449,9 @@ class AgentTemplateBuilder:
 
         if model in model_map:
             model = model_map[model]
+        else:
+            # Default to sonnet if model not found in map
+            model = "sonnet"
 
         # Get response format from template or use base agent default
         template_data.get("response", {}).get("format", "structured")
@@ -122,8 +462,6 @@ class AgentTemplateBuilder:
         # CRITICAL: NO underscores allowed - they cause silent failures!
 
         # Validate the name before proceeding
-        import re
-
         if not re.match(r"^[a-z0-9]+(-[a-z0-9]+)*$", claude_code_name):
             self.logger.error(
                 f"Invalid agent name '{claude_code_name}' - must match ^[a-z0-9]+(-[a-z0-9]+)*$"
@@ -133,12 +471,17 @@ class AgentTemplateBuilder:
             )
 
         # Extract description from template with fallback
-        description = (
+        raw_description = (
             template_data.get("description")
             or template_data.get("metadata", {}).get("description")
             or f"{agent_name.title()} agent for specialized tasks"
         )
 
+        # Convert to multiline format with examples for Claude Code compatibility
+        description = self._create_multiline_description(
+            raw_description, agent_name, template_data
+        )
+
         # Extract custom metadata fields
         metadata = template_data.get("metadata", {})
         agent_version = (
@@ -163,7 +506,7 @@ class AgentTemplateBuilder:
 
         if template_color:
             # Use the color specified in the template
-            color = template_color
+            pass
         else:
             # Fallback to default color map based on agent type
             color_map = {
@@ -174,7 +517,7 @@ class AgentTemplateBuilder:
                 "documentation": "cyan",  # Changed default to match template preference
                 "ops": "gray",
             }
-            color = color_map.get(agent_type, "blue")
+            color_map.get(agent_type, "blue")
 
         # Check if we should include tools field (only if significantly restricting)
         # Claude Code approach: omit tools field unless specifically restricting
@@ -188,41 +531,58 @@ class AgentTemplateBuilder:
         has_core_tools = len(agent_tools.intersection(core_tools)) >= 5
 
         # Include tools field only if agent is clearly restricted (missing core tools or very few tools)
-        include_tools_field = not has_core_tools or len(agent_tools) < 6
+        not has_core_tools or len(agent_tools) < 6
 
-        # Build YAML frontmatter using Claude Code's minimal format
-        # ONLY include fields that Claude Code recognizes
+        # Build YAML frontmatter with all relevant metadata from JSON template
+        # Include all fields that are useful for agent management and functionality
         #
-        # CLAUDE CODE COMPATIBLE FORMAT:
+        # COMPREHENSIVE AGENT FRONTMATTER FORMAT:
         # - name: kebab-case agent name (required)
-        # - description: when/why to use this agent (required)
-        # - version: agent version for update tracking (recommended)
-        # - tools: comma-separated tool list (optional, only if restricting)
-        # - color, author, tags: metadata fields (optional)
+        # - description: when/why to use this agent with examples (required, multiline)
+        # - model: mapped model name (required)
+        # - type: agent type for categorization and functionality (optional but important)
+        # - category: organizational category (optional)
+        # - color: visual identifier (optional)
+        # - version: agent version for update tracking (optional)
+        # - author: creator information (optional)
+        # - created_at: creation timestamp (optional)
+        # - updated_at: last update timestamp (optional)
+        # - tags: list of tags for search and categorization (optional)
         frontmatter_lines = [
             "---",
             f"name: {claude_code_name}",
-            f"description: {description}",
-            f'version: "{agent_version}"',
         ]
 
-        # Add optional metadata if available
+        # Add description as single-line YAML string with \n escapes
+        frontmatter_lines.append(
+            f"description: {self._format_description_for_yaml(description)}"
+        )
+
+        # Add model field (required for Claude Code)
+        frontmatter_lines.append(f"model: {model}")
+
+        # Add type field (important for agent categorization)
+        if agent_type and agent_type != "general":
+            frontmatter_lines.append(f"type: {agent_type}")
+
+        # Add optional metadata fields
         if metadata.get("color"):
             frontmatter_lines.append(f"color: {metadata['color']}")
-        if metadata.get("author"):
-            frontmatter_lines.append(f"author: {metadata['author']}")
-        if metadata.get("tags"):
-            frontmatter_lines.append("tags:")
-            for tag in metadata["tags"][:10]:  # Limit to 10 tags
-                frontmatter_lines.append(f"  - {tag}")
-        if metadata.get("priority"):
-            frontmatter_lines.append(f"priority: {metadata['priority']}")
         if metadata.get("category"):
             frontmatter_lines.append(f"category: {metadata['category']}")
-
-        # Only include tools if restricting to subset
-        if include_tools_field:
-            frontmatter_lines.append(f"tools: {tools_str}")
+        # Always include version field to prevent deployment comparison issues
+        if agent_version:
+            frontmatter_lines.append(f'version: "{agent_version}"')
+        if metadata.get("author"):
+            frontmatter_lines.append(f'author: "{metadata["author"]}"')
+        if metadata.get("created_at"):
+            frontmatter_lines.append(f"created_at: {metadata['created_at']}")
+        if metadata.get("updated_at"):
+            frontmatter_lines.append(f"updated_at: {metadata['updated_at']}")
+        # Add tags as comma-separated string if they exist (consistent with tools format)
+        if metadata.get("tags") and isinstance(metadata["tags"], list):
+            tags_str = ",".join(metadata["tags"])
+            frontmatter_lines.append(f"tags: {tags_str}")
 
         frontmatter_lines.extend(
             [
@@ -234,12 +594,53 @@ class AgentTemplateBuilder:
         frontmatter = "\n".join(frontmatter_lines)
 
         # Get agent instructions from template data (primary) or base agent data (fallback)
-        content = (
-            template_data.get("instructions")
-            or base_agent_data.get("content")
-            or base_agent_data.get("instructions")
-            or "# Agent Instructions\n\nThis agent provides specialized assistance."
-        )
+        raw_instructions = template_data.get("instructions")
+
+        # Handle dictionary instructions format
+        if isinstance(raw_instructions, dict):
+            agent_specific_instructions = self._convert_instructions_dict_to_markdown(
+                raw_instructions
+            )
+        else:
+            agent_specific_instructions = (
+                raw_instructions
+                or base_agent_data.get("content")
+                or base_agent_data.get("instructions")
+                or "# Agent Instructions\n\nThis agent provides specialized assistance."
+            )
+
+        # Compose hierarchical BASE-AGENT.md templates
+        # Order: agent-specific + local BASE + parent BASE + ... + root BASE
+        content_parts = [agent_specific_instructions]
+
+        # Discover BASE-AGENT.md files in directory hierarchy
+        base_templates = self._discover_base_agent_templates(template_path)
+
+        # Append each BASE template (order: closest to farthest)
+        for base_template_path in base_templates:
+            try:
+                base_content = base_template_path.read_text(encoding="utf-8")
+                if base_content.strip():
+                    content_parts.append(base_content)
+                    self.logger.debug(
+                        f"Composed BASE template: {base_template_path.relative_to(template_path.parent.parent) if template_path.parent.parent in base_template_path.parents else base_template_path.name}"
+                    )
+            except Exception as e:
+                self.logger.warning(
+                    f"Failed to read BASE template {base_template_path}: {e}"
+                )
+
+        # Fallback: Load legacy BASE_{TYPE}.md if no hierarchical templates found
+        if len(content_parts) == 1:  # Only agent-specific instructions
+            legacy_base_instructions = self._load_base_agent_instructions(agent_type)
+            if legacy_base_instructions:
+                content_parts.append(legacy_base_instructions)
+                self.logger.debug(
+                    f"Using legacy BASE_{agent_type.upper()}.md (no hierarchical BASE-AGENT.md found)"
+                )
+
+        # Join all parts with separator
+        content = "\n\n---\n\n".join(content_parts)
 
         # Add memory update instructions if not already present
         if "memory-update" not in content and "Remember" not in content:
@@ -316,7 +717,8 @@ Only include memories that are:
         )
 
         # Get tools and model with fallbacks
-        tools = merged_config.get("tools", ["Read", "Write", "Edit"])
+        raw_tools = merged_config.get("tools")
+        tools = self.normalize_tools_input(raw_tools)
         model = merged_config.get("model", "sonnet")
 
         # Format tools as YAML list
@@ -464,3 +866,490 @@ tools:
             formatted_items.append(f"{indent_str}- {item}")
 
         return "\n".join(formatted_items)
+
+    def _create_multiline_description(
+        self, raw_description: str, agent_name: str, template_data: dict
+    ) -> str:
+        """
+        Create a comprehensive multiline description with examples for Claude Code compatibility.
+        Based on Claude's software-engineer.md format: detailed when/why description with examples.
+
+        Args:
+            raw_description: Original single-line description
+            agent_name: Name of the agent
+            template_data: Template data for extracting examples
+
+        Returns:
+            Formatted multiline description with examples in Claude Code format
+        """
+        raw_description = self._format_to_single_line(raw_description)
+
+        # Get agent type for creating targeted descriptions
+        agent_type = template_data.get("agent_type", "general")
+
+        # Create enhanced description based on agent type
+        enhanced_description = self._create_enhanced_description(
+            raw_description, agent_name, agent_type, template_data
+        )
+
+        # Add examples
+        examples = self._extract_examples_from_template(template_data, agent_name)
+        if not examples:
+            examples = self._generate_default_examples(agent_name, template_data)
+
+        # Combine enhanced description with examples
+        if examples:
+            description_parts = [enhanced_description, "", *examples]
+        else:
+            description_parts = [enhanced_description]
+
+        return "\n".join(description_parts)
+
+    def _format_to_single_line(self, description: str) -> str:
+        """
+        Format description to single line by removing line breaks and normalizing whitespace.
+
+        Args:
+            description: Raw description text
+
+        Returns:
+            Single-line formatted description
+        """
+        if not description:
+            return description
+
+        # Remove all line breaks and normalize whitespace
+        single_line = " ".join(description.strip().split())
+
+        # Remove redundant spaces around punctuation
+        single_line = re.sub(r"\s+([,.!?;:])", r"\1", single_line)
+        return re.sub(r"([,.!?;:])\s+", r"\1 ", single_line)
+
+    def _create_enhanced_description(
+        self,
+        raw_description: str,
+        agent_name: str,
+        agent_type: str,
+        template_data: dict,
+    ) -> str:
+        """
+        Create an enhanced description based on agent type that follows Claude's format.
+
+        Args:
+            raw_description: Original description
+            agent_name: Name of the agent
+            agent_type: Type of agent (engineer, qa, research, etc.)
+            template_data: Template data for additional context
+
+        Returns:
+            Enhanced description string
+        """
+        # Type-specific enhanced descriptions following Claude's software-engineer.md pattern
+        enhanced_descriptions = {
+            "engineer": "Use this agent when you need to implement new features, write production-quality code, refactor existing code, or solve complex programming challenges. This agent excels at translating requirements into well-architected, maintainable code solutions across various programming languages and frameworks.",
+            "qa": "Use this agent when you need comprehensive testing, quality assurance validation, or test automation. This agent specializes in creating robust test suites, identifying edge cases, and ensuring code quality through systematic testing approaches across different testing methodologies.",
+            "research": "Use this agent when you need to investigate codebases, analyze system architecture, or gather technical insights. This agent excels at code exploration, pattern identification, and providing comprehensive analysis of existing systems while maintaining strict memory efficiency.",
+            "ops": "Use this agent when you need infrastructure management, deployment automation, or operational excellence. This agent specializes in DevOps practices, cloud operations, monitoring setup, and maintaining reliable production systems.",
+            "security": "Use this agent when you need security analysis, vulnerability assessment, or secure coding practices. This agent excels at identifying security risks, implementing security best practices, and ensuring applications meet security standards.",
+            "documentation": "Use this agent when you need to create, update, or maintain technical documentation. This agent specializes in writing clear, comprehensive documentation including API docs, user guides, and technical specifications.",
+        }
+
+        # Get the enhanced description or fallback to the original with improvements
+        if agent_type in enhanced_descriptions:
+            return enhanced_descriptions[agent_type]
+        # Enhance the raw description if it's a custom type
+        if raw_description and len(raw_description) > 10:
+            return f"Use this agent when you need specialized assistance with {raw_description.lower()}. This agent provides targeted expertise and follows best practices for {agent_name.replace('-', ' ')} related tasks."
+        return f"Use this agent when you need specialized assistance from the {agent_name.replace('-', ' ')} agent. This agent provides targeted expertise and follows established best practices."
+
+    def _extract_examples_from_template(
+        self, template_data: dict, agent_name: str
+    ) -> List[str]:
+        """
+        Extract examples from template data and format with commentary.
+        Creates ONE example with commentary from template data.
+
+        Args:
+            template_data: Template data
+            agent_name: Name of the agent
+
+        Returns:
+            List of example strings (single example with commentary)
+        """
+        examples = []
+
+        # Check for examples in knowledge section
+        knowledge = template_data.get("knowledge", {})
+        template_examples = knowledge.get("examples", [])
+
+        if template_examples:
+            # Take only the first example and add commentary
+            example = template_examples[0]
+            scenario = example.get("scenario", "")
+            approach = example.get("approach", "")
+            commentary = example.get("commentary", "")
+
+            if scenario and approach:
+                examples.extend(
+                    [
+                        "<example>",
+                        f"Context: {scenario}",
+                        f'user: "I need help with {scenario.lower()}"',
+                        f'assistant: "I\'ll use the {agent_name} agent to {approach.lower()}."',
+                        "<commentary>",
+                        (
+                            commentary
+                            if commentary
+                            else f"This agent is well-suited for {scenario.lower()} because it specializes in {approach.lower()} with targeted expertise."
+                        ),
+                        "</commentary>",
+                        "</example>",
+                    ]
+                )
+
+        # Check for triggers that can be converted to examples
+        interactions = template_data.get("interactions", {})
+        triggers = interactions.get("triggers", [])
+
+        if triggers and not examples:
+            # Convert first trigger to example with commentary
+            trigger = triggers[0]
+
+            # Handle both string and dict trigger formats
+            if isinstance(trigger, dict):
+                # New format with pattern and confidence
+                trigger_text = trigger.get("pattern", "")
+            else:
+                # Old format with simple string
+                trigger_text = str(trigger)
+
+            # Skip if we don't have valid trigger text
+            if not trigger_text:
+                return examples
+
+            agent_type = template_data.get("agent_type", "general")
+
+            examples.extend(
+                [
+                    "<example>",
+                    f"Context: When user needs {trigger_text}",
+                    f'user: "{trigger_text}"',
+                    f'assistant: "I\'ll use the {agent_name} agent for {trigger_text}."',
+                    "<commentary>",
+                    f"This {agent_type} agent is appropriate because it has specialized capabilities for {trigger_text.lower()} tasks.",
+                    "</commentary>",
+                    "</example>",
+                ]
+            )
+
+        return examples
+
+    def _generate_default_examples(
+        self, agent_name: str, template_data: dict
+    ) -> List[str]:
+        """
+        Generate default examples when none are available in template.
+        Creates ONE example with commentary for each agent type.
+
+        Args:
+            agent_name: Name of the agent
+            template_data: Template data for context
+
+        Returns:
+            List of example strings (single example with commentary)
+        """
+        agent_type = template_data.get("agent_type", "general")
+
+        # Create type-specific examples with commentary inside
+        type_examples = {
+            "engineer": [
+                "<example>",
+                "Context: When you need to implement new features or write code.",
+                'user: "I need to add authentication to my API"',
+                f'assistant: "I\'ll use the {agent_name} agent to implement a secure authentication system for your API."',
+                "<commentary>",
+                "The engineer agent is ideal for code implementation tasks because it specializes in writing production-quality code, following best practices, and creating well-architected solutions.",
+                "</commentary>",
+                "</example>",
+            ],
+            "ops": [
+                "<example>",
+                "Context: When you need to deploy or manage infrastructure.",
+                'user: "I need to deploy my application to the cloud"',
+                f'assistant: "I\'ll use the {agent_name} agent to set up and deploy your application infrastructure."',
+                "<commentary>",
+                "The ops agent excels at infrastructure management and deployment automation, ensuring reliable and scalable production systems.",
+                "</commentary>",
+                "</example>",
+            ],
+            "qa": [
+                "<example>",
+                "Context: When you need to test or validate functionality.",
+                'user: "I need to write tests for my new feature"',
+                f'assistant: "I\'ll use the {agent_name} agent to create comprehensive tests for your feature."',
+                "<commentary>",
+                "The QA agent specializes in comprehensive testing strategies, quality assurance validation, and creating robust test suites that ensure code reliability.",
+                "</commentary>",
+                "</example>",
+            ],
+            "research": [
+                "<example>",
+                "Context: When you need to investigate or analyze existing codebases.",
+                'user: "I need to understand how the authentication system works in this project"',
+                f'assistant: "I\'ll use the {agent_name} agent to analyze the codebase and explain the authentication implementation."',
+                "<commentary>",
+                "The research agent is perfect for code exploration and analysis tasks, providing thorough investigation of existing systems while maintaining memory efficiency.",
+                "</commentary>",
+                "</example>",
+            ],
+            "security": [
+                "<example>",
+                "Context: When you need to review code for security vulnerabilities.",
+                'user: "I need a security review of my authentication implementation"',
+                f'assistant: "I\'ll use the {agent_name} agent to conduct a thorough security analysis of your authentication code."',
+                "<commentary>",
+                "The security agent specializes in identifying security risks, vulnerability assessment, and ensuring applications meet security standards and best practices.",
+                "</commentary>",
+                "</example>",
+            ],
+            "documentation": [
+                "<example>",
+                "Context: When you need to create or update technical documentation.",
+                'user: "I need to document this new API endpoint"',
+                f'assistant: "I\'ll use the {agent_name} agent to create comprehensive API documentation."',
+                "<commentary>",
+                "The documentation agent excels at creating clear, comprehensive technical documentation including API docs, user guides, and technical specifications.",
+                "</commentary>",
+                "</example>",
+            ],
+        }
+
+        return type_examples.get(
+            agent_type,
+            [
+                "<example>",
+                f"Context: When you need specialized assistance from the {agent_name} agent.",
+                f'user: "I need help with {agent_name.replace("-", " ")} tasks"',
+                f'assistant: "I\'ll use the {agent_name} agent to provide specialized assistance."',
+                "<commentary>",
+                f"This agent provides targeted expertise for {agent_name.replace('-', ' ')} related tasks and follows established best practices.",
+                "</commentary>",
+                "</example>",
+            ],
+        )
+
+    def _indent_multiline_text(self, text: str, spaces: int) -> str:
+        """
+        Indent multiline text with specified number of spaces.
+
+        Args:
+            text: Text to indent
+            spaces: Number of spaces for indentation
+
+        Returns:
+            Indented text
+        """
+        if not text:
+            return ""
+
+        indent = " " * spaces
+        lines = text.split("\n")
+        indented_lines = []
+
+        for line in lines:
+            if line.strip():  # Non-empty lines get indented
+                indented_lines.append(indent + line)
+            else:  # Empty lines stay empty
+                indented_lines.append("")
+
+        return "\n".join(indented_lines)
+
+    def _format_description_for_yaml(self, description: str) -> str:
+        """Format description as a single-line YAML string with escaped newlines.
+
+        Args:
+            description: Multi-line description text
+
+        Returns:
+            Single-line YAML-formatted string with \n escapes
+        """
+        if not description:
+            return '""'
+
+        # The description already contains actual newlines, we need to escape them
+        # Replace actual newlines with \n escape sequence
+        escaped = description.replace("\n", "\\n")
+
+        # Escape any quotes in the description
+        escaped = escaped.replace('"', '\\"')
+
+        # Return as quoted string
+        return f'"{escaped}"'
+
+    def _convert_instructions_dict_to_markdown(self, instructions_dict: dict) -> str:
+        """Convert complex instructions dictionary to markdown format.
+
+        Args:
+            instructions_dict: Dictionary containing structured instructions
+
+        Returns:
+            Formatted markdown string representing the instructions
+        """
+        if not instructions_dict:
+            return "# Agent Instructions\n\nThis agent provides specialized assistance."
+
+        markdown_parts = []
+
+        # Add primary role
+        if "primary_role" in instructions_dict:
+            markdown_parts.extend(["# Role", "", instructions_dict["primary_role"], ""])
+
+        # Add core identity
+        if "core_identity" in instructions_dict:
+            markdown_parts.extend(
+                ["## Core Identity", "", instructions_dict["core_identity"], ""]
+            )
+
+        # Add responsibilities
+        if "responsibilities" in instructions_dict:
+            markdown_parts.extend(["## Responsibilities", ""])
+
+            responsibilities = instructions_dict["responsibilities"]
+            if isinstance(responsibilities, list):
+                for resp in responsibilities:
+                    if isinstance(resp, dict):
+                        area = resp.get("area", "Unknown Area")
+                        tasks = resp.get("tasks", [])
+
+                        markdown_parts.extend([f"### {area}", ""])
+
+                        if isinstance(tasks, list):
+                            for task in tasks:
+                                markdown_parts.append(f"- {task}")
+
+                        markdown_parts.append("")
+                    else:
+                        markdown_parts.append(f"- {resp}")
+
+            markdown_parts.append("")
+
+        # Add analytical framework
+        if "analytical_framework" in instructions_dict:
+            framework = instructions_dict["analytical_framework"]
+            if isinstance(framework, dict):
+                markdown_parts.extend(["## Analytical Framework", ""])
+
+                for framework_area, framework_data in framework.items():
+                    markdown_parts.extend(
+                        [f"### {framework_area.replace('_', ' ').title()}", ""]
+                    )
+
+                    if isinstance(framework_data, dict):
+                        for category, items in framework_data.items():
+                            markdown_parts.extend(
+                                [f"#### {category.replace('_', ' ').title()}", ""]
+                            )
+
+                            if isinstance(items, list):
+                                for item in items:
+                                    markdown_parts.append(f"- {item}")
+                            elif isinstance(items, str):
+                                markdown_parts.append(items)
+
+                            markdown_parts.append("")
+                    elif isinstance(framework_data, list):
+                        for item in framework_data:
+                            markdown_parts.append(f"- {item}")
+                        markdown_parts.append("")
+
+        # Add methodologies
+        if "methodologies" in instructions_dict:
+            methodologies = instructions_dict["methodologies"]
+            if isinstance(methodologies, dict):
+                markdown_parts.extend(["## Methodologies", ""])
+
+                for method_name, method_data in methodologies.items():
+                    markdown_parts.extend(
+                        [f"### {method_name.replace('_', ' ').title()}", ""]
+                    )
+
+                    if isinstance(method_data, dict):
+                        for key, value in method_data.items():
+                            if isinstance(value, list):
+                                markdown_parts.extend(
+                                    [f"#### {key.replace('_', ' ').title()}", ""]
+                                )
+                                for item in value:
+                                    markdown_parts.append(f"- {item}")
+                                markdown_parts.append("")
+                            elif isinstance(value, str):
+                                markdown_parts.extend(
+                                    [
+                                        f"**{key.replace('_', ' ').title()}**: {value}",
+                                        "",
+                                    ]
+                                )
+
+        # Add quality standards
+        if "quality_standards" in instructions_dict:
+            standards = instructions_dict["quality_standards"]
+            if isinstance(standards, dict):
+                markdown_parts.extend(["## Quality Standards", ""])
+
+                for standard_area, standard_items in standards.items():
+                    markdown_parts.extend(
+                        [f"### {standard_area.replace('_', ' ').title()}", ""]
+                    )
+
+                    if isinstance(standard_items, list):
+                        for item in standard_items:
+                            markdown_parts.append(f"- {item}")
+                    elif isinstance(standard_items, str):
+                        markdown_parts.append(standard_items)
+
+                    markdown_parts.append("")
+
+        # Add communication style
+        if "communication_style" in instructions_dict:
+            comm_style = instructions_dict["communication_style"]
+            if isinstance(comm_style, dict):
+                markdown_parts.extend(["## Communication Style", ""])
+
+                for style_area, style_items in comm_style.items():
+                    markdown_parts.extend(
+                        [f"### {style_area.replace('_', ' ').title()}", ""]
+                    )
+
+                    if isinstance(style_items, list):
+                        for item in style_items:
+                            markdown_parts.append(f"- {item}")
+                    elif isinstance(style_items, str):
+                        markdown_parts.append(style_items)
+
+                    markdown_parts.append("")
+
+        # If no specific sections were found, convert as generic dict
+        if not markdown_parts:
+            markdown_parts = ["# Agent Instructions", ""]
+            for key, value in instructions_dict.items():
+                key_title = key.replace("_", " ").title()
+                if isinstance(value, str):
+                    markdown_parts.extend([f"## {key_title}", "", value, ""])
+                elif isinstance(value, list):
+                    markdown_parts.extend([f"## {key_title}", ""])
+                    for item in value:
+                        markdown_parts.append(f"- {item}")
+                    markdown_parts.append("")
+                elif isinstance(value, dict):
+                    markdown_parts.extend([f"## {key_title}", ""])
+                    # Simple dict formatting
+                    for subkey, subvalue in value.items():
+                        if isinstance(subvalue, str):
+                            markdown_parts.extend(
+                                [
+                                    f"**{subkey.replace('_', ' ').title()}**: {subvalue}",
+                                    "",
+                                ]
+                            )
+
+        return "\n".join(markdown_parts).strip()