MCP file system fixes for mcp client and tool dispatcher

Author: ELXaber

Project_Andrew/Andrew.rar

@@ -221,27 +221,26 @@ def call(self, tool_name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:
         tool_lower = tool_name.lower()
 
         # Route to correct server
-        if tool_lower in FS_TOOLS:
-            if not self.fs_available():
-                return _error_result(f"Filesystem MCP server not available at {self.fs_url}. "
-                                     f"Start it with: npx @modelcontextprotocol/server-filesystem C:\\CAIOS")
-            base = self.fs_url
-        elif tool_lower in WIN_TOOLS:
+        if tool_lower in WIN_TOOLS:
             if not self.win_available():
-                return _error_result(f"windows-mcp not available at {self.win_url}. "
-                                     f"Start it with: uvx windows-mcp serve --transport sse --host localhost --port 8000")
+                return _error_result(
+                    f"windows-mcp not available at {self.win_url}. "
+                    f"Start it with: uvx windows-mcp serve --transport streamable-http --host localhost --port 8000"
+                )
             base = self.win_url
         else:
-            # Unknown tool — try filesystem first, then windows
-            base = self.fs_url if self.fs_available() else self.win_url
+            # FS_TOOLS and unknown tools — not handled by MCP
+            return _error_result(
+                f"Tool '{tool_name}' is not a windows-mcp tool. "
+                f"File operations are handled by os_control.py via [TOOL:read_file] etc."
+            )
 
         rpc_result = _jsonrpc_call(
             base,
             'tools/call',
             {'name': tool_name, 'arguments': arguments},
             self._next_id(),
         )
-
         return _parse_mcp_result(rpc_result)
 
     # ── Convenience wrappers for common filesystem operations ──

Project_Andrew/caios_mcp_client.py

@@ -1,4 +1,4 @@
-#V06242026
+#V06252026
 # =============================================================================
 # PROJECT ANDREW – Tool Dispatcher
 # Intercepts LLM output for structured tool calls and routes them to the
@@ -431,8 +431,8 @@ def _dispatch_mcp(self, tool_name: str, attrs: Dict) -> str:
 
         # Map tag names to (mcp_tool_name, required_arg)
         route_map = {
-            'mcp_read':       ('read_file',      'path'),
-            'mcp_list':       ('list_directory', 'path'),
+            'mcp_read':       None,          # → os_control.read_file
+            'mcp_list':       None,          # → os_control (not implemented, use powershell)
             'mcp_write':      ('write_file',     'path'),
             'mcp_search':     ('search_files',   'path'),
             'mcp_powershell': ('powershell',     'command'),
@@ -450,6 +450,19 @@ def _dispatch_mcp(self, tool_name: str, attrs: Dict) -> str:
         if required_arg and required_arg not in mcp_args:
             return f'[TOOL RESULT] {tool_name}: missing required attr "{required_arg}"'
 
+        # mcp_read
+        if tool_name == 'mcp_read':
+            path = attrs.get('path', '')
+            controller = self._get_controller()
+            if controller:
+                return _handle_read_file({'path': path}, controller)
+            return '[TOOL RESULT] mcp_read: os_control not available'
+
+        # mcp_list
+        if tool_name == 'mcp_list':
+            cmd = f'Get-ChildItem "{attrs.get("path", "C:/CAIOS")}" | Select-Object Name'
+            return _handle_mcp_win({'command': cmd}, 'mcp_powershell')
+
         # mcp_write needs content attr too
         if tool_name == 'mcp_write' and 'content' not in mcp_args:
             return '[TOOL RESULT] mcp_write: missing required attr "content"'