diff --git a/jarvis_mcp/client.py b/jarvis_mcp/client.py
index 2d7d2d3..11ce23a 100644
--- a/jarvis_mcp/client.py
+++ b/jarvis_mcp/client.py
@@ -16,10 +16,14 @@ class MCPClient:
         await self.session.initialize()
 
     async def list_tools(self):
+        if not self.session:
+            await self.connect()
         return await self.session.list_tools()
 
-    async def call_tool(self, name, args):
-        return await self.session.call_tool(name, args)
+    async def call_tool(self, name: str, arguments: dict):
+        if not self.session:
+            await self.connect()
+        return await self.session.call_tool(name, arguments)
 
     async def close(self):
         if self._client: