Harrison/claude skills

libs/deepagents-cli/deepagents_cli/agent.py

@@ -13,6 +13,7 @@
 from langgraph.checkpoint.memory import InMemorySaver
 
 from .config import COLORS, config, console, get_default_coding_instructions
+from .skills import discover_skills, format_skills_section
 
 
 def list_agents():
@@ -85,7 +86,11 @@ def get_system_prompt() -> str:
     Returns:
         The system prompt string (without agent.md content)
     """
-    return f"""### Current Working Directory
+    # Discover available skills
+    skills = discover_skills()
+    skills_section = format_skills_section(skills)
+
+    prompt = f"""### Current Working Directory
 
 The filesystem backend is currently operating in: `{Path.cwd()}`
 
@@ -98,7 +103,13 @@ def get_system_prompt() -> str:
 - When starting a task → Check if you have guides or examples in /memories/
 - At the beginning of new sessions → Consider checking `ls /memories/` to see what context you have
 
-Base your answers on saved knowledge (from /memories/) when available, supplemented by general knowledge.
+Base your answers on saved knowledge (from /memories/) when available, supplemented by general knowledge."""
+
+    # Add skills section if any skills were found
+    if skills_section:
+        prompt += f"\n\n{skills_section}"
+
+    return prompt + """
 
 ### Human-in-the-Loop Tool Approval
 

libs/deepagents-cli/deepagents_cli/config.py

@@ -94,7 +94,7 @@ def get_default_coding_instructions() -> str:
     These are the immutable base instructions that cannot be modified by the agent.
     Long-term memory (agent.md) is handled separately by the middleware.
     """
-    default_prompt_path = Path(__file__).parent.parent / "default_agent_prompt.md"
+    default_prompt_path = Path(__file__).parent / "default_agent_prompt.md"
     return default_prompt_path.read_text()
 
 

libs/deepagents-cli/deepagents_cli/skills.py

@@ -0,0 +1,180 @@
+"""Claude Skills discovery and parsing for deepagents CLI."""
+
+import re
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Optional
+
+
+@dataclass
+class Skill:
+    """Represents a Claude Skill with its metadata."""
+
+    name: str
+    description: str
+    path: Path
+    license: Optional[str] = None
+    allowed_tools: Optional[list[str]] = None
+    metadata: Optional[dict] = None
+
+
+def parse_yaml_frontmatter(content: str) -> tuple[dict, str]:
+    """Parse YAML frontmatter from markdown content.
+
+    Args:
+        content: Markdown content with optional YAML frontmatter
+
+    Returns:
+        Tuple of (frontmatter_dict, remaining_content)
+    """
+    # Check if content starts with ---
+    if not content.startswith("---"):
+        return {}, content
+
+    # Find the closing ---
+    match = re.match(r"^---\s*\n(.*?)\n---\s*\n(.*)$", content, re.DOTALL)
+    if not match:
+        return {}, content
+
+    yaml_content = match.group(1)
+    remaining_content = match.group(2)
+
+    # Simple YAML parser for our needs (name, description, license, allowed-tools, metadata)
+    frontmatter = {}
+    current_key = None
+    list_items = []
+
+    for line in yaml_content.split("\n"):
+        # Check for key: value
+        if ":" in line and not line.strip().startswith("-"):
+            if current_key and list_items:
+                frontmatter[current_key] = list_items
+                list_items = []
+
+            key, value = line.split(":", 1)
+            key = key.strip()
+            value = value.strip()
+
+            if value:
+                frontmatter[key] = value
+                current_key = None
+            else:
+                # This might be a list or multi-line value
+                current_key = key
+        # Check for list item
+        elif line.strip().startswith("-") and current_key:
+            item = line.strip()[1:].strip()
+            list_items.append(item)
+
+    # Handle final list
+    if current_key and list_items:
+        frontmatter[current_key] = list_items
+
+    return frontmatter, remaining_content
+
+
+def parse_skill_md(skill_path: Path) -> Optional[Skill]:
+    """Parse a SKILL.md file and extract metadata.
+
+    Args:
+        skill_path: Path to the skill directory containing SKILL.md
+
+    Returns:
+        Skill object if valid, None if invalid or missing required fields
+    """
+    skill_md_path = skill_path / "SKILL.md"
+
+    if not skill_md_path.exists():
+        return None
+
+    try:
+        content = skill_md_path.read_text(encoding="utf-8")
+    except Exception:
+        return None
+
+    frontmatter, _ = parse_yaml_frontmatter(content)
+
+    # Required fields
+    name = frontmatter.get("name")
+    description = frontmatter.get("description")
+
+    if not name or not description:
+        return None
+
+    # Optional fields
+    license_val = frontmatter.get("license")
+    allowed_tools = frontmatter.get("allowed-tools")
+    metadata = frontmatter.get("metadata")
+
+    # Convert metadata string to dict if needed (simplified)
+    if isinstance(metadata, str):
+        metadata = {"raw": metadata}
+
+    return Skill(
+        name=name,
+        description=description,
+        path=skill_path,
+        license=license_val,
+        allowed_tools=allowed_tools if isinstance(allowed_tools, list) else None,
+        metadata=metadata if isinstance(metadata, dict) else None,
+    )
+
+
+def discover_skills(skills_dir: Optional[Path] = None) -> list[Skill]:
+    """Discover all Claude Skills in the skills directory.
+
+    Args:
+        skills_dir: Path to skills directory (defaults to ~/.claude/skills)
+
+    Returns:
+        List of discovered Skill objects
+    """
+    if skills_dir is None:
+        skills_dir = Path.home() / ".claude" / "skills"
+
+    if not skills_dir.exists() or not skills_dir.is_dir():
+        return []
+
+    skills = []
+
+    try:
+        for item in skills_dir.iterdir():
+            if not item.is_dir():
+                continue
+
+            skill = parse_skill_md(item)
+            if skill:
+                skills.append(skill)
+    except Exception:
+        # Silently fail if we can't read the directory
+        return []
+
+    return sorted(skills, key=lambda s: s.name)
+
+
+def format_skills_section(skills: list[Skill]) -> str:
+    """Format the skills section for the system prompt.
+
+    Args:
+        skills: List of discovered skills
+
+    Returns:
+        Formatted markdown section describing available skills
+    """
+    if not skills:
+        return ""
+
+    lines = [
+        "### Available Skills",
+        "",
+        "You have access to Claude Skills located in ~/.claude/skills/. When a task matches a skill's description, read the skill's SKILL.md file to get full instructions and follow them carefully.",
+        "",
+    ]
+
+    for skill in skills:
+        lines.append(f"**{skill.name}**: {skill.description}")
+        lines.append(f"  - Location: `{skill.path}`")
+        lines.append(f"  - Instructions: `{skill.path / 'SKILL.md'}`")
+        lines.append("")
+
+    return "\n".join(lines)