refactor: streamline skill loading and rendering

- Update skill loading to include body in SkillMetadata.
- Remove load_skill_body function and related references.
- Refactor skill rendering to use render_compact_skills.
- Adjust tests to reflect changes in skill loading and rendering logic.
- Simplify project configuration by modifying extend-exclude patterns.

Signed-off-by: Frost Ming <me@frostming.com>

Author: frostming

pyproject.toml

@@ -92,10 +92,7 @@ testpaths = ["tests"]
 target-version = "py312"
 line-length = 120
 fix = true
-extend-exclude = [
-    "src/bub/skills",
-    "backup",
-]
+extend-exclude = ["src/bub/skills/**/scripts/*.py"]
 
 [tool.ruff.lint]
 select = [

src/bub/app/runtime.py

@@ -23,7 +23,7 @@
 from bub.config.settings import Settings
 from bub.core import AgentLoop, InputRouter, LoopResult, ModelRunner
 from bub.integrations.republic_client import build_llm, build_tape_store, read_workspace_agents_prompt
-from bub.skills import SkillMetadata, discover_skills, load_skill_body
+from bub.skills.loader import SkillMetadata, discover_skills
 from bub.tape import TapeService
 from bub.tools import ProgressiveToolView, ToolRegistry
 from bub.tools.builtin import register_builtin_tools
@@ -98,11 +98,6 @@ def discover_skills(self) -> list[SkillMetadata]:
             return discovered
         return [skill for skill in discovered if skill.name.casefold() in self._allowed_skills]
 
-    def load_skill_body(self, skill_name: str) -> str | None:
-        if self._allowed_skills is not None and skill_name.casefold() not in self._allowed_skills:
-            return None
-        return load_skill_body(skill_name, self.workspace)
-
     def get_session(self, session_id: str) -> SessionRuntime:
         existing = self._sessions.get(session_id)
         if existing is not None:
@@ -128,7 +123,6 @@ def get_session(self, session_id: str) -> SessionRuntime:
             tool_view=tool_view,
             tools=registry.model_tools(),
             list_skills=self.discover_skills,
-            load_skill_body=self.load_skill_body,
             model=self.settings.model,
             max_steps=self.settings.max_steps,
             max_tokens=self.settings.max_tokens,

src/bub/core/model_runner.py

@@ -13,7 +13,7 @@
 
 from bub.core.router import AssistantRouteResult, InputRouter
 from bub.skills.loader import SkillMetadata
-from bub.skills.view import render_skill_prompt
+from bub.skills.view import render_compact_skills
 from bub.tape.service import TapeService
 from bub.tools.progressive import ProgressiveToolView
 from bub.tools.view import render_tool_prompt_block
@@ -56,7 +56,6 @@ def __init__(
         tool_view: ProgressiveToolView,
         tools: list[Tool],
         list_skills: Callable[[], list[SkillMetadata]],
-        load_skill_body: Callable[[str], str | None],
         model: str,
         max_steps: int,
         max_tokens: int,
@@ -69,14 +68,13 @@ def __init__(
         self._tool_view = tool_view
         self._tools = tools
         self._list_skills = list_skills
-        self._load_skill_body = load_skill_body
         self._model = model
         self._max_steps = max_steps
         self._max_tokens = max_tokens
         self._model_timeout_seconds = model_timeout_seconds
         self._base_system_prompt = base_system_prompt.strip()
         self._get_workspace_system_prompt = get_workspace_system_prompt
-        self._expanded_skills: dict[str, str] = {}
+        self._expanded_skills: set[str] = set()
 
     def reset_context(self) -> None:
         """Clear volatile model-side context caches within one session."""
@@ -192,7 +190,7 @@ def _render_system_prompt(self) -> str:
         blocks.append(_runtime_contract())
         blocks.append(render_tool_prompt_block(self._tool_view))
 
-        compact_skills = render_skill_prompt(self._list_skills())
+        compact_skills = render_compact_skills(self._list_skills(), self._expanded_skills)
         if compact_skills:
             blocks.append(compact_skills)
         return "\n\n".join(block for block in blocks if block.strip())
@@ -206,11 +204,7 @@ def _activate_hints(self, text: str) -> None:
             skill = skill_index.get(hint.casefold())
             if skill is None:
                 continue
-            if skill.name in self._expanded_skills:
-                continue
-            body = self._load_skill_body(skill.name)
-            if body:
-                self._expanded_skills[skill.name] = body
+            self._expanded_skills.add(skill.name)
 
     def _build_skill_index(self) -> dict[str, SkillMetadata]:
         return {skill.name.casefold(): skill for skill in self._list_skills()}

src/bub/core/router.py

@@ -316,7 +316,6 @@ def _resolve_internal_name(name: str) -> str:
         aliases = {
             "tool": "tool.describe",
             "tape": "tape.info",
-            "skill": "skills.describe",
         }
         return aliases.get(name, name)
 

src/bub/skills/__init__.py

@@ -1,6 +1,6 @@
 """Skill discovery package."""
 
-from bub.skills.loader import SkillMetadata, discover_skills, load_skill_body
-from bub.skills.view import render_skill_prompt
+from bub.skills.loader import SkillMetadata, discover_skills
+from bub.skills.view import render_compact_skills
 
-__all__ = ["SkillMetadata", "discover_skills", "load_skill_body", "render_skill_prompt"]
+__all__ = ["SkillMetadata", "discover_skills", "render_compact_skills"]

src/bub/skills/loader.py

@@ -19,6 +19,7 @@ class SkillMetadata:
     name: str
     description: str
     location: Path
+    body: str
     metadata: dict[str, Any] | None = None
     source: str = "unknown"
 
@@ -49,19 +50,6 @@ def discover_skills(workspace_path: Path) -> list[SkillMetadata]:
     return sorted(by_name.values(), key=lambda item: item.name.casefold())
 
 
-def load_skill_body(name: str, workspace_path: Path) -> str | None:
-    """Load full SKILL.md body for one skill name."""
-
-    lowered = name.casefold()
-    for skill in discover_skills(workspace_path):
-        if skill.name.casefold() == lowered:
-            try:
-                return skill.location.read_text(encoding="utf-8")
-            except OSError:
-                return None
-    return None
-
-
 def _read_skill(skill_dir: Path, *, source: str) -> SkillMetadata | None:
     skill_file = skill_dir / SKILL_FILE_NAME
     if not skill_file.is_file():
@@ -72,33 +60,36 @@ def _read_skill(skill_dir: Path, *, source: str) -> SkillMetadata | None:
     except OSError:
         return None
 
-    metadata = _parse_frontmatter(content)
+    metadata, body = _parse_frontmatter(content)
     name = str(metadata.get("name") or skill_dir.name).strip()
     description = str(metadata.get("description") or "No description provided.").strip()
     meta = cast(dict[str, Any], metadata.get("metadata"))
 
     if not name:
         return None
 
-    return SkillMetadata(name=name, description=description, location=skill_file.resolve(), source=source, metadata=meta)
+    return SkillMetadata(
+        name=name, description=description, location=skill_file.resolve(), source=source, metadata=meta, body=body
+    )
 
 
-def _parse_frontmatter(content: str) -> dict[str, object]:
+def _parse_frontmatter(content: str) -> tuple[dict[str, object], str]:
     lines = content.splitlines()
     if not lines or lines[0].strip() != "---":
-        return {}
+        return {}, content
 
     for idx, line in enumerate(lines[1:], start=1):
         if line.strip() == "---":
             payload = "\n".join(lines[1:idx])
             try:
                 parsed = yaml.safe_load(payload)
             except yaml.YAMLError:
-                return {}
+                parsed = {}
+            body = "\n".join(lines[idx + 1 :])
             if isinstance(parsed, dict):
-                return {str(key).lower(): value for key, value in parsed.items()}
-            return {}
-    return {}
+                return {str(key).lower(): value for key, value in parsed.items()}, body
+            return {}, body
+    return {}, content
 
 
 def _builtin_skills_root() -> Path:

src/bub/skills/skill-creator/scripts/quick_validate.py

@@ -77,8 +77,7 @@ def validate_skill(skill_path):
         if len(name) > MAX_SKILL_NAME_LENGTH:
             return (
                 False,
-                f"Name is too long ({len(name)} characters). "
-                f"Maximum is {MAX_SKILL_NAME_LENGTH} characters.",
+                f"Name is too long ({len(name)} characters). Maximum is {MAX_SKILL_NAME_LENGTH} characters.",
             )
 
     description = frontmatter.get("description", "")

src/bub/skills/telegram/scripts/telegram_edit.py

@@ -90,7 +90,7 @@ def main():
         sys.exit(1)
 
     try:
-        result = edit_message(bot_token, args.chat_id, args.message_id, args.text)
+        edit_message(bot_token, args.chat_id, args.message_id, args.text)
         print(f"✅ Message {args.message_id} edited successfully")
     except requests.HTTPError as e:
         print(f"❌ HTTP Error: {e}")

src/bub/skills/telegram/scripts/telegram_send.py

@@ -13,6 +13,7 @@
 A simple script to send messages via Telegram Bot API.
 Uses telegramify_markdown to convert markdown to Telegram MarkdownV2 format.
 """
+
 import argparse
 import os
 import sys
@@ -120,9 +121,7 @@ def send_message(
 
 def main():
     parser = argparse.ArgumentParser(description="Send messages via Telegram Bot API (auto-converts to MarkdownV2)")
-    parser.add_argument(
-        "--chat-id", "-c", required=True, help="Target chat ID"
-    )
+    parser.add_argument("--chat-id", "-c", required=True, help="Target chat ID")
     parser.add_argument(
         "--message",
         "-m",

src/bub/skills/view.py

@@ -5,38 +5,27 @@
 from bub.skills.loader import SkillMetadata
 
 
-def render_skill_prompt(skills: list[SkillMetadata]) -> str:
+def render_compact_skills(skills: list[SkillMetadata], expanded_skills: set[str]) -> str:
     """Render compact skill metadata for system prompt."""
 
     if not skills:
         return ""
-
-    channel_skills: dict[str, SkillMetadata] = {}
-
-    lines = ["<available_skills>"]
+    channel_skills: list[SkillMetadata] = [
+        skill for skill in skills if skill.metadata and skill.metadata.get("channel")
+    ]
+    lines = ["<basic_skills>"]
     for skill in skills:
         if skill.metadata and skill.metadata.get("channel"):
-            channel_skills[skill.metadata["channel"]] = skill
-        else:
-            lines.extend([
-                f"  <skill>",
-                f"    <name>{skill.name}</name>",
-                f"    <description>{skill.description}</description>",
-                f"    <location>{skill.location}</location>",
-                f"  </skill>",
-            ])
-    lines.append("</available_skills>")
-
+            continue
+        lines.append(f"### [{skill.name}]({skill.location})\n{skill.description} ###")
+        if skill.name in expanded_skills:
+            lines.append(f"{skill.body.rstrip()}\n")
+    lines.append("</basic_skills>")
     if channel_skills:
-        channel_lines = ["<channel_skills>"]
-        for channel, skill in channel_skills.items():
-            channel_lines.extend([
-                f"  <channel_skill>",
-                f"    <name>{channel}</name>",
-                f"    <description>{skill.description}</description>",
-                f"    <location>{skill.location}</location>",
-                f"  </channel_skill>",
-            ])
-        channel_lines.append("</channel_skills>")
-        lines = channel_lines + lines
+        lines.append("<channel_skills>")
+        for skill in channel_skills:
+            lines.append(f"### [{skill.name}]({skill.location})\n{skill.description} ###")
+            if skill.name in expanded_skills:
+                lines.append(f"{skill.body.rstrip()}\n")
+        lines.append("</channel_skills>")
     return "\n".join(lines)