bone-agent 1.3.2 → 1.4.0

package/src/tools/search_plugins.py

@@ -1,38 +1,41 @@
-"""search_plugins core tool for on-demand plugin discovery.
+"""search_plugins core tool for on-demand capability discovery.
 
 This tool lets the LLM agent search for available plugin tools and
-activate them. Plugin schemas are not sent by default to avoid context
-bloat — they are only included after activation.
+stored skills, then explicitly activate plugins or load skills through
+the same entrypoint. Plugin schemas are not sent by default to avoid
+context bloat — they are only included after activation.
 """
 
-from typing import List, Optional
-from pathlib import Path
-
 from tools.helpers.base import tool, ToolRegistry, TERMINAL_NONE
 
+HEADER_MATCHES = "Capability matches for: "
+HEADER_ALL = "All available capabilities"
+
 
 @tool(
     name="search_plugins",
     description=(
-        "Search for available plugin tools that can help with your task. "
-        "Plugin tools are NOT in your available tools by default — use this "
-        "to discover and activate them. Returns matching plugin names and "
-        "descriptions. Once activated, the plugin's full schema will be "
-        "available in your next response."
+        "Search for available plugin tools and saved skills that can help "
+        "with your task. Plugins are NOT in your available tools by default "
+        "— use this to discover and activate them. Skills can also be loaded "
+        "through this same tool by passing explicit capability names in 'load'. "
+        "Once a plugin is activated, its full schema will be available in your "
+        "next response."
     ),
     parameters={
         "type": "object",
         "properties": {
             "query": {
                 "type": "string",
-                "description": "Search query describing what you need (e.g., 'send email', 'query database', 'http request')"
+                "description": "Search query describing what you need (e.g., 'send email', 'query database', 'http request'). Omit to list all available plugins and skills."
             },
-            "category": {
-                "type": "string",
-                "description": "Optional category filter (e.g., 'email', 'database', 'analysis')"
+            "load": {
+                "type": "array",
+                "items": {"type": "string"},
+                "description": "Optional list of exact capability names from the current search results to activate or load. Plugins are activated; skills are injected into the current chat."
             }
         },
-        "required": ["query"]
+        "required": []
     },
     requires_approval=False,
     terminal_policy=TERMINAL_NONE,
@@ -41,69 +44,134 @@ from tools.helpers.base import tool, ToolRegistry, TERMINAL_NONE
     category="core"
 )
 def search_plugins(
-    query: str,
-    category: str = None,
+    query: str = "",
+    load: list[str] | None = None,
+    chat_manager=None,
 ) -> str:
-    """Search the plugin manifest and activate matching plugins.
-
-    Args:
-        query: Search query describing the needed capability
-        category: Optional category filter
+    """Search discoverable capabilities and optionally activate/load selected matches.
 
-    Returns:
-        Formatted result with activated plugin names and descriptions
-    """
+    When using `load`, `query` must be provided so selections come from the current search results."""
+    from core.skills import SkillError, activate_skill, validate_skill_name
     from tools.helpers.plugin_manifest import plugin_manifest
 
-    # Check if any core tool matches the query — early return
     core_tools = ToolRegistry.get_all(include_plugins=False)
-    query_lower = query.lower()
-    for ct in core_tools:
-        if query_lower == ct.name.lower() or query_lower in ct.name.lower():
-            return (
-                f"exit_code=0\n"
-                f"'{query}' matches a core tool that is already available: **{ct.name}**.\n"
-                f"Description: {ct.description}"
-            )
-
-    # Search the plugin manifest
-    matches = plugin_manifest.search(query, category=category, max_results=5)
+    core_tool_note = None
+    query = query.strip()
+
+    if load and not query:
+        return "\n".join([
+            "exit_code=1",
+            "Loading capabilities requires a query so selections come from the current search results.",
+        ])
+
+    # No query → list everything
+    if not query:
+        matches = plugin_manifest.list_all_capabilities()
+    else:
+        query_lower = query.lower()
+        for ct in core_tools:
+            if query_lower == ct.name.lower():
+                core_tool_note = (
+                    f"Core tool already available: {ct.name}\n"
+                    f"  {ct.description}"
+                )
+                break
+
+        matches = plugin_manifest.search_capabilities(query, max_results=10)
 
     if not matches:
-        # No matches — suggest available categories
-        categories = plugin_manifest.get_categories()
-        if categories:
-            cat_list = ", ".join(f"'{c}'" for c in categories)
-            return (
-                f"exit_code=0\n"
-                f"No plugins found matching '{query}'.\n"
-                f"Available plugin categories: {cat_list}\n"
-                f"Total plugins in manifest: {plugin_manifest.plugin_count()}"
-            )
-        return (
-            f"exit_code=0\n"
-            f"No plugins found matching '{query}'. "
-            f"No plugins are currently registered in the manifest."
-        )
-
-    # Activate matched plugins in the registry
-    activated = []
-    already_active = []
-    for tool_def in matches:
-        if ToolRegistry.is_plugin_active(tool_def.name):
-            already_active.append(tool_def.name)
+        lines = ["exit_code=0"]
+        if core_tool_note:
+            lines.extend([core_tool_note, ""])
+        if query:
+            lines.append(f"No matches for: {query}")
         else:
-            ToolRegistry.activate_plugin(tool_def)
-            activated.append(tool_def.name)
-
-    # Build result
-    lines = [f"exit_code=0\nFound {len(matches)} plugin(s) matching '{query}':\n"]
-
-    for tool_def in matches:
-        status = "activated" if tool_def.name in activated else "already active"
-        cat_part = f" [{tool_def.category}]" if tool_def.category else ""
-        lines.append(f"- **{tool_def.name}**{cat_part} ({status}): {tool_def.description}")
-        if tool_def.tags:
-            lines.append(f"  Tags: {', '.join(tool_def.tags)}")
+            lines.append("No plugins or skills available.")
+        return "\n".join(lines)
+
+    requested = [name for name in (load or []) if isinstance(name, str) and name.strip()]
+    requested_normalized = {name.strip().lower(): name.strip() for name in requested}
+    matched_by_name = {match.name.lower(): match for match in matches}
+
+    plugin_count = 0
+    skill_count = 0
+    loaded_plugins = []
+    loaded_skills = []
+    load_errors = []
+
+    for match in matches:
+        if match.kind == "plugin" and match.tool_def:
+            plugin_count += 1
+            if ToolRegistry.is_plugin_active(match.tool_def.name):
+                match.already_active = True
+            if match.name.lower() in requested_normalized and not match.already_active:
+                if ToolRegistry.activate_plugin(match.tool_def):
+                    match.activated = True
+                    loaded_plugins.append(match.name)
+                else:
+                    load_errors.append(f"Plugin '{match.name}' is disabled. Enable it before loading.")
+            continue
+        skill_count += 1
+        if match.name.lower() in requested_normalized:
+            if chat_manager is None:
+                load_errors.append(f"Skill '{match.name}' cannot be loaded without an active chat.")
+                continue
+            try:
+                skill_name = validate_skill_name(match.name)
+                activate_skill(chat_manager, skill_name)
+                loaded_skills.append(skill_name)
+            except SkillError as exc:
+                load_errors.append(str(exc))
+
+    missing_requested = [
+        original_name
+        for normalized_name, original_name in requested_normalized.items()
+        if normalized_name not in matched_by_name
+    ]
+    for missing in missing_requested:
+        load_errors.append(f"Capability '{missing}' was not found in the current search results.")
+
+    lines = ["exit_code=0"]
+    if core_tool_note:
+        lines.extend([core_tool_note, ""])
+
+    if query:
+        lines.extend([
+            f"{HEADER_MATCHES}{query}",
+            f"Results: {len(matches)} total ({plugin_count} plugin, {skill_count} skill)",
+            "",
+        ])
+    else:
+        lines.extend([
+            HEADER_ALL,
+            f"Total: {len(matches)} ({plugin_count} plugin, {skill_count} skill)",
+            "",
+        ])
+
+    for match in matches:
+        if match.kind == "plugin":
+            status = "disabled" if ToolRegistry.is_disabled(match.name) else "activated" if match.activated else "active" if match.already_active else "available"
+            lines.append(f"- {match.name}")
+            lines.append("  type: plugin")
+            lines.append(f"  status: {status}")
+            lines.append(f"  summary: {match.description}")
+            if match.tags:
+                lines.append(f"  tags: {', '.join(match.tags)}")
+            continue
+
+        lines.append(f"- {match.name}")
+        lines.append("  type: skill")
+        lines.append(f"  summary: {match.description}")
+        if match.tags:
+            lines.append(f"  tags: {', '.join(match.tags)}")
+
+    if requested:
+        lines.append("")
+        if loaded_plugins:
+            lines.append(f"Activated plugins: {', '.join(loaded_plugins)}")
+        if loaded_skills:
+            lines.append(f"Loaded skills: {', '.join(loaded_skills)}")
+        if load_errors:
+            lines.append(f"Load issues: {'; '.join(load_errors)}")
 
     return "\n".join(lines)

package/src/tools/shell.py

@@ -231,13 +231,13 @@ def run_shell_command(command, repo_root, rg_exe_path, console, debug_mode, giti
 
 @tool(
     name="execute_command",
-    description="Execute shell commands for git, system tasks, file ops, network, and package management. Runs from repo root. Use for git, ps, systemctl, rm, mv, cp, mkdir, ping, curl, wget, ssh, pacman, pip, npm, apt. Disallowed: rg, cat, ls, grep, find, head, tail, sed, awk, sort, uniq, wc, echo, touch, get-content, type, get-childitem, dir, new-item, set-content, add-content, tee. Use native tools instead.",
+    description="Execute shell commands for git, system tasks, file ops, network, and package management. Runs from repo root. Multi-line shell commands are supported and preserved exactly, including heredocs. Use for git, ps, systemctl, rm, mv, cp, mkdir, ping, curl, wget, ssh, pacman, pip, npm, apt. Disallowed: rg, cat, ls, grep, find, head, tail, sed, awk, sort, uniq, wc, echo, touch, get-content, type, get-childitem, dir, new-item, set-content, add-content, tee. Use native tools instead.",
     parameters={
         "type": "object",
         "properties": {
             "command": {
                 "type": "string",
-                "description": "Command to execute"
+                "description": "Shell command to execute from the repo root. May be a single-line command or a multi-line shell script/heredoc; newlines are preserved exactly."
             },
             "reason": {
                 "type": "string",
@@ -262,7 +262,7 @@ def execute_command(
     """Execute a shell command.
 
     Args:
-        command: Command string to execute
+        command: Command string to execute. May contain newlines/heredocs; preserved exactly for shell execution.
         repo_root: Repository root directory (injected by context)
         rg_exe_path: Path to rg executable (injected by context)
         console: Rich console for output (injected by context)