✨ enhanced intelligence

Author: FJRG2007

src/agent.py

@@ -180,12 +180,12 @@ def format_file_context(file_contents: List[Dict[str, str]]) -> str:
 
 # Patterns to detect tool calls in text responses
 TOOL_CALL_PATTERNS = [
-    # Pattern: <function/name>{"arg": "value"}</function
-    r'<function/(\w+)>\s*(\{[^}]*\})\s*</function',
-    # Pattern: <function name="name">{"arg": "value"}</function>
-    r'<function\s+name="(\w+)">\s*(\{[^}]*\})\s*</function>',
-    # Pattern: ```json\n{"name": "func", "arguments": {...}}```
-    r'```json\s*\{\s*"name"\s*:\s*"(\w+)"\s*,\s*"arguments"\s*:\s*(\{[^}]*\})\s*\}\s*```',
+    # Pattern: <function/name>{"arg": "value"}</function (also handles <functions/name>)
+    r'<functions?/([\w/]+)>\s*(\{[^}]*\})\s*</function',
+    # Pattern: <function name="name">{"arg": "value"}</function> (also handles prefixed names)
+    r'<function\s+name="([\w./]+)">\s*(\{[^}]*\})\s*</function>',
+    # Pattern: ```json\n{"name": "func", "arguments": {...}}``` (also handles prefixed names)
+    r'```json\s*\{\s*"name"\s*:\s*"([\w./]+)"\s*,\s*"arguments"\s*:\s*(\{[^}]*\})\s*\}\s*```',
 ]
 
 # ═══════════════════════════════════════════════════════════════════════════════
@@ -405,18 +405,54 @@ def _save_conversation(self):
         """Save the current conversation state"""
         history_manager.update_conversation(self.messages)
 
+    def _normalize_tool_name(self, name: str) -> str:
+        """
+        Normalize a tool name by stripping common prefixes.
+        Some models add prefixes like 'functions/' or 'tools.' to tool names.
+        """
+        prefixes_to_strip = [
+            "repo_browser.", "repo_browser/",
+            "functions.", "functions/",
+            "tools.", "tools/",
+            "file_ops.", "file_ops/",
+            "system.", "system/"
+        ]
+        for prefix in prefixes_to_strip:
+            if name.startswith(prefix):
+                return name[len(prefix):]
+        return name
+
     def _filter_valid_tool_calls(self, tool_calls: List[Any]) -> List[Any]:
         """
         Filter out tool calls for unknown/invalid tools.
         Some models (especially Llama) may hallucinate tool names like 'commentary'.
+        Also normalizes tool names by stripping common prefixes (functions/, tools., etc.)
         """
         valid_calls = []
+        invalid_tools = []
+
         for tc in tool_calls:
             tool_name = tc.name if hasattr(tc, 'name') else tc.get('name', '')
-            if tool_name in TOOLS:
+            # Normalize the tool name by stripping prefixes
+            normalized_name = self._normalize_tool_name(tool_name)
+
+            if normalized_name in TOOLS:
+                # Update the tool call with the normalized name
+                if hasattr(tc, 'name'):
+                    tc.name = normalized_name
+                elif isinstance(tc, dict):
+                    tc['name'] = normalized_name
                 valid_calls.append(tc)
             else:
+                invalid_tools.append(tool_name)
                 log_debug(f"Ignoring unknown tool call: {tool_name}")
+
+        # If invalid tools were detected, show warning
+        if invalid_tools:
+            display_warning(f"Ignored invalid tool(s): {', '.join(invalid_tools)}")
+            available = list(TOOLS.keys())[:15]  # Show first 15 tools
+            log_debug(f"Available tools: {available}")
+
         return valid_calls
 
     def _parse_tool_calls_from_text(self, text: str) -> List[ToolCall]:
@@ -433,15 +469,16 @@ def _parse_tool_calls_from_text(self, text: str) -> List[ToolCall]:
                 func_name = match[0]
                 args_str = match[1]
 
-                # Validate that it's a known tool
-                if func_name in TOOLS:
+                # Normalize and validate that it's a known tool
+                normalized_name = self._normalize_tool_name(func_name)
+                if normalized_name in TOOLS:
                     call_id += 1
                     tool_calls.append(ToolCall(
                         id=f"text_call_{call_id}",
-                        name=func_name,
+                        name=normalized_name,
                         arguments=args_str
                     ))
-                    log_debug(f"Parsed tool call from text: {func_name}")
+                    log_debug(f"Parsed tool call from text: {normalized_name}")
 
         return tool_calls
 

src/config.py

@@ -378,6 +378,13 @@ def items(self):
 ## TASK DIVISION (spawn_agents)
 For 3+ independent subtasks, use spawn_agents to parallelize work.
 
+## TOOL USAGE - CRITICAL
+- ONLY use tools that are explicitly provided to you
+- NEVER invent or guess tool names - use EXACT names from the tool list
+- Available tools: list_files_in_dir, read_file, create_file, create_folder, run_command, move_path, delete_path, glob_search, grep_search, find_and_replace, web_search, fetch_url, search_and_summarize, spawn_agents, check_agent_tasks
+- If you need functionality not available, use run_command with appropriate shell commands
+- DO NOT add prefixes like "functions/", "tools.", or "system." to tool names
+
 ## RESPONSES
 - Be concise: "Created file.py" - done
 - Don't repeat file contents unless asked

src/tools.py

@@ -1014,8 +1014,17 @@ def execute_tool(name: str, args: Dict[str, Any]) -> str:
     """Execute a tool by name with given arguments"""
     # Strip common prefixes that some models add incorrectly
     # e.g., "repo_browser.list_files_in_dir" -> "list_files_in_dir"
+    # e.g., "functions/create_file" -> "create_file"
     original_name = name
-    prefixes_to_strip = ["repo_browser.", "functions.", "tools.", "file_ops.", "system."]
+
+    # Handle both dot (.) and slash (/) separators
+    prefixes_to_strip = [
+        "repo_browser.", "repo_browser/",
+        "functions.", "functions/",
+        "tools.", "tools/",
+        "file_ops.", "file_ops/",
+        "system.", "system/"
+    ]
     for prefix in prefixes_to_strip:
         if name.startswith(prefix):
             name = name[len(prefix):]

static-api/version.json

@@ -1,3 +1,3 @@
 {
-    "version": "0.0.0.40"
+    "version": "0.0.0.41"
 }