hanzo-mcp 0.9.1__py3-none-any.whl → 0.9.3__py3-none-any.whl

hanzo_mcp/tools/agent/agent_tool_v1_deprecated.py

@@ -450,6 +450,9 @@ AGENT RESPONSES:
                 tool_call_count = len(message.tool_calls)
                 await tool_ctx.info(f"Processing {tool_call_count} tool calls")
 
+                # Track which tool calls we've processed to ensure all get results
+                tool_results_to_add = []
+
                 for tool_call in message.tool_calls:
                     total_tool_use_count += 1
                     function_name = tool_call.function.name
@@ -542,8 +545,8 @@ AGENT RESPONSES:
                     await tool_ctx.info(
                         f"tool {function_name} run with args {function_args} and return {tool_result[: min(100, len(tool_result))]}"
                     )
-                    # Add the tool result to messages
-                    messages.append(
+                    # Add the tool result to the list
+                    tool_results_to_add.append(
                         {
                             "role": "tool",
                             "tool_call_id": tool_call.id,
@@ -552,6 +555,9 @@ AGENT RESPONSES:
                         }
                     )
 
+                # Add all tool results to messages atomically
+                messages.extend(tool_results_to_add)
+
                 # Log progress
                 await tool_ctx.info(f"Processed {len(message.tool_calls)} tool calls. Total: {total_tool_use_count}")
 
@@ -559,6 +565,41 @@ AGENT RESPONSES:
                 await tool_ctx.error(f"Error in model call: {str(e)}")
                 # Avoid trying to JSON serialize message objects
                 await tool_ctx.error(f"Message count: {len(messages)}")
+
+                # CRITICAL FIX: Ensure we add tool_result messages for any tool_use blocks that were added
+                # Get the last assistant message (which has the tool_calls)
+                last_assistant_msg = None
+                for msg in reversed(messages):
+                    if msg.get("role") == "assistant" and hasattr(msg, "tool_calls"):
+                        last_assistant_msg = msg
+                        break
+
+                # If there are orphaned tool calls, add error results for them
+                if last_assistant_msg and hasattr(last_assistant_msg, "tool_calls"):
+                    # Count how many tool results we already have after this message
+                    tool_results_count = 0
+                    found_assistant = False
+                    for msg in reversed(messages):
+                        if msg == last_assistant_msg:
+                            found_assistant = True
+                            break
+                        if found_assistant and msg.get("role") == "tool":
+                            tool_results_count += 1
+
+                    # Add error results for any missing tool calls
+                    expected_results = len(last_assistant_msg.tool_calls)
+                    if tool_results_count < expected_results:
+                        for i in range(tool_results_count, expected_results):
+                            tool_call = last_assistant_msg.tool_calls[i]
+                            messages.append(
+                                {
+                                    "role": "tool",
+                                    "tool_call_id": tool_call.id,
+                                    "name": tool_call.function.name,
+                                    "content": f"Error: Tool execution interrupted - {str(e)}",
+                                }
+                            )
+
                 return f"Error in agent execution: {str(e)}"
 
         # If we've reached the limit, add a warning and get final response

hanzo_mcp/tools/common/auto_timeout.py

@@ -128,47 +128,67 @@ class MCPToolTimeoutManager:
 
 def with_auto_timeout(tool_name: str, timeout_manager: Optional[MCPToolTimeoutManager] = None):
     """Decorator to add automatic timeout and backgrounding to MCP tools.
-    
+
     Args:
         tool_name: Name of the tool (for logging and process tracking)
         timeout_manager: Optional timeout manager instance
-        
+
     Returns:
         Decorator function
     """
     if timeout_manager is None:
         timeout_manager = MCPToolTimeoutManager()
-    
+
     def decorator(func: Callable[..., Awaitable[Any]]) -> Callable[..., Awaitable[Any]]:
         @functools.wraps(func)
-        async def wrapper(ctx: MCPContext, **params: Any) -> Any:
+        async def wrapper(*args: Any, **params: Any) -> Any:
+            # Handle both method calls (with self) and function calls
+            # For methods: args = (self, ctx), For functions: args = (ctx,)
+            if len(args) >= 2:
+                # Method call: self, ctx, **params
+                self_or_ctx = args[0]
+                ctx = args[1]
+                call_func = lambda: func(self_or_ctx, ctx, **params)
+            elif len(args) == 1:
+                # Function call: ctx, **params
+                ctx = args[0]
+                call_func = lambda: func(ctx, **params)
+            else:
+                raise TypeError(f"Expected at least 1 argument (ctx), got {len(args)}")
+
             # Fast path for tests - skip timeout logic
             if os.getenv("HANZO_MCP_FAST_TESTS") == "1":
-                return await func(ctx, **params)
-            
+                return await call_func()
+
             # Get tool-specific timeout
             tool_timeout = timeout_manager._get_timeout_for_tool(tool_name)
-            
+
             # Create task for the tool execution
-            tool_task = asyncio.create_task(func(ctx, **params))
-            
+            tool_task = asyncio.create_task(call_func())
+
             try:
                 # Wait for completion with timeout
                 result = await asyncio.wait_for(tool_task, timeout=tool_timeout)
                 return result
-                
+
             except asyncio.TimeoutError:
                 # Tool timed out - background it
                 process_id = f"{tool_name}_{uuid.uuid4().hex[:8]}"
                 log_file = timeout_manager.process_manager.create_log_file(process_id)
-                
-                # Start background execution
+
+                # Start background execution (need to reconstruct the call)
+                async def background_call():
+                    if len(args) >= 2:
+                        return await func(args[0], ctx, **params)
+                    else:
+                        return await func(ctx, **params)
+
                 asyncio.create_task(
                     timeout_manager._background_tool_execution(
-                        func, tool_name, ctx, process_id, log_file, **params
+                        background_call, tool_name, ctx, process_id, log_file, **params
                     )
                 )
-                
+
                 # Return backgrounding message
                 timeout_formatted = format_timeout(tool_timeout)
                 return (
@@ -179,7 +199,7 @@ def with_auto_timeout(tool_name: str, timeout_manager: Optional[MCPToolTimeoutMa
                     f"Use 'process --action kill --id {process_id}' to cancel\\n\\n"
                     f"The {tool_name} operation is continuing in the background..."
                 )
-                
+
         return wrapper
     return decorator
 

hanzo_mcp/tools/filesystem/ast_tool.py

@@ -114,7 +114,7 @@ Searches code structure intelligently, understanding syntax and providing semant
             Tool result
         """
         tool_ctx = self.create_tool_context(ctx)
-        self.set_tool_context_info(tool_ctx)
+        await self.set_tool_context_info(tool_ctx)
 
         # Extract parameters
         pattern: Pattern = params["pattern"]

hanzo_mcp/tools/filesystem/base.py

@@ -104,10 +104,10 @@ class FilesystemBaseTool(FileSystemTool, ABC):
         tool_ctx = create_tool_context(ctx)
         return tool_ctx
 
-    def set_tool_context_info(self, tool_ctx: ToolContext) -> None:
+    async def set_tool_context_info(self, tool_ctx: ToolContext) -> None:
         """Set the tool info on the context.
 
         Args:
             tool_ctx: Tool context
         """
-        tool_ctx.set_tool_info(self.name)
+        await tool_ctx.set_tool_info(self.name)

hanzo_mcp/tools/filesystem/edit.py

@@ -108,7 +108,7 @@ Usage:
             Tool result
         """
         tool_ctx = self.create_tool_context(ctx)
-        self.set_tool_context_info(tool_ctx)
+        await self.set_tool_context_info(tool_ctx)
 
         # Extract parameters
         file_path: FilePath = params["file_path"]

hanzo_mcp/tools/filesystem/multi_edit.py

@@ -152,7 +152,7 @@ If you want to create a new file, use:
             Tool result
         """
         tool_ctx = self.create_tool_context(ctx)
-        self.set_tool_context_info(tool_ctx)
+        await self.set_tool_context_info(tool_ctx)
 
         # Extract parameters
         file_path: FilePath = params["file_path"]

hanzo_mcp/tools/filesystem/read.py

@@ -94,8 +94,6 @@ Usage:
 
     @override
     @auto_timeout("read")
-
-
     async def call(
         self,
         ctx: MCPContext,
@@ -111,7 +109,7 @@ Usage:
             Tool result
         """
         tool_ctx = self.create_tool_context(ctx)
-        self.set_tool_context_info(tool_ctx)
+        await self.set_tool_context_info(tool_ctx)
 
         # Extract parameters
         file_path = params.get("file_path")

hanzo_mcp/tools/filesystem/rules_tool.py

@@ -94,7 +94,7 @@ understand project-specific requirements and preferences."""
             Tool result
         """
         tool_ctx = self.create_tool_context(ctx)
-        self.set_tool_context_info(tool_ctx)
+        await self.set_tool_context_info(tool_ctx)
 
         # Extract parameters
         search_path = params.get("path", ".")

hanzo_mcp/tools/filesystem/symbols_tool.py

@@ -138,7 +138,7 @@ Finds code structures (functions, classes, methods) with full context."""
     ) -> str:
         """Execute symbols operation."""
         tool_ctx = self.create_tool_context(ctx)
-        self.set_tool_context_info(tool_ctx)
+        await self.set_tool_context_info(tool_ctx)
 
         # Extract action
         action = params.get("action", "search")

hanzo_mcp/tools/filesystem/write.py

@@ -92,7 +92,7 @@ Usage:
             Tool result
         """
         tool_ctx = self.create_tool_context(ctx)
-        self.set_tool_context_info(tool_ctx)
+        await self.set_tool_context_info(tool_ctx)
 
         # Extract parameters
         file_path: FilePath = params["file_path"]

{hanzo_mcp-0.9.1.dist-info → hanzo_mcp-0.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hanzo-mcp
-Version: 0.9.1
+Version: 0.9.3
 Summary: The Zen of Hanzo MCP: One server to rule them all. The ultimate MCP that orchestrates all others.
 Author-email: Hanzo Industries Inc <dev@hanzo.ai>
 License: MIT

{hanzo_mcp-0.9.1.dist-info → hanzo_mcp-0.9.3.dist-info}/RECORD

@@ -29,7 +29,7 @@ hanzo_mcp/tools/__init__.py,sha256=RZVr_s1Jnc1cCGcDU2FYKtPqZrTWa-ME9umPixl2YaU,1
 hanzo_mcp/tools/agent/__init__.py,sha256=K5fWO3MSpMoTHiP38qvZJ9VhOQQlFwSgIPI9fRWtIX4,4879
 hanzo_mcp/tools/agent/agent.py,sha256=FeWBHGkexpp50Ya7pA8APoHK4ZchDhIDh7eWEX_axDA,13038
 hanzo_mcp/tools/agent/agent_tool.py,sha256=ysNrkoEd4L2t32f0yS9sa7xFS9cDN6XzzQh2d2v3yfI,16801
-hanzo_mcp/tools/agent/agent_tool_v1_deprecated.py,sha256=m86qZC4FmNvRckKXcQlpw6N2hmQsUduzyizhenDG5Ps,26228
+hanzo_mcp/tools/agent/agent_tool_v1_deprecated.py,sha256=k-GoD6JS6GvPAJu4PPQrWy6VQVdWXGa2P1eB9LfBT9k,28353
 hanzo_mcp/tools/agent/clarification_protocol.py,sha256=QYJTmDSJVRDyZMow80TxWmnJurxuLo1MaIFge8t_Yvk,8041
 hanzo_mcp/tools/agent/clarification_tool.py,sha256=sye5Y7F8IOaDNh3ZHmcSDGPBJog9-ZJdutV2hGHc1vQ,2674
 hanzo_mcp/tools/agent/claude_cli_tool.py,sha256=55Wc0LKgYCtDKQ02NXOYPMhx-sW7fL_NSCx0upsvvb4,3812
@@ -52,7 +52,7 @@ hanzo_mcp/tools/agent/swarm_tool_v1_deprecated.py,sha256=Qx4GecLtIUFSCeBHjkdcKEM
 hanzo_mcp/tools/agent/tool_adapter.py,sha256=rLItgdKvvfzJL4chNIrNK_I5kSCm6ocmi83RQm93NgA,3191
 hanzo_mcp/tools/agent/unified_cli_tools.py,sha256=Cqi39TcT-88wZtlgOocsdE4HAD0xJtuAXjpnd_WwdkE,8230
 hanzo_mcp/tools/common/__init__.py,sha256=2gXIERXM7sALINWfDBbH_khzBRatvwQSWgpAvKlfy4o,1283
-hanzo_mcp/tools/common/auto_timeout.py,sha256=zF7UrB-5ybfMZlkdCpfX7SrElIYIw8WJQLQahgOro6o,8203
+hanzo_mcp/tools/common/auto_timeout.py,sha256=KJ7w_MLcIgwoPphM2Q3gSNG83nybracxsmEMaUGAZII,8980
 hanzo_mcp/tools/common/base.py,sha256=pI3uoXFDtjUKgCBXwcXe3coMBBcp9xfpxi_XhQKciUY,5964
 hanzo_mcp/tools/common/batch_tool.py,sha256=l1QXZ2A8qLBH021jpADIEpQbuNOjzCvNCdvIqxCGAHw,15788
 hanzo_mcp/tools/common/config_tool.py,sha256=fVh__RYg_FEU1kA0a2U3AeBJ1DEG_GWpA3sbD00D7QQ,15978
@@ -102,27 +102,27 @@ hanzo_mcp/tools/editor/neovim_edit.py,sha256=dEzrKXuZKLK16hMieywN0IycvltktzpEhNV
 hanzo_mcp/tools/editor/neovim_session.py,sha256=r9V9AEQu7xotGjhOdEIQvUKB5u8Hvel-QdMDeSeitTk,11759
 hanzo_mcp/tools/filesystem/__init__.py,sha256=bj4xfqzZuABKzGi1G0qgk5IIDsFlOa6k2nQLYLc28dc,8532
 hanzo_mcp/tools/filesystem/ast_multi_edit.py,sha256=kxJL-Nicav9Tn6BcDPBFKGq67XLWhtYgF1NV7UlhzK4,22180
-hanzo_mcp/tools/filesystem/ast_tool.py,sha256=KxT8XANBnlBvtNVZG00DU-CXkdQwzYdraJ3kYJfOr_w,7372
-hanzo_mcp/tools/filesystem/base.py,sha256=2lJLa4vmSGZz57v8KKVMI9_oLF4_-NYiYZVnm-GsyoQ,3762
+hanzo_mcp/tools/filesystem/ast_tool.py,sha256=ybm8R55-TtK6t8Y7CFUpqnqXeQ6eIs42M0A2OEWE4PY,7378
+hanzo_mcp/tools/filesystem/base.py,sha256=qKrN4VdO-oTWOGxpA7_Iu9UubHqIanlZjn9QRnHQBVA,3774
 hanzo_mcp/tools/filesystem/batch_search.py,sha256=8r4eDqNaYZzCvYUFV6YEsQ9KcIRP9N1Vsa96XHw6m1c,32830
 hanzo_mcp/tools/filesystem/content_replace.py,sha256=EA3vuIQp7St5r-ld-r8bnFfikvVDmdTbghBDl1rXTT0,9884
 hanzo_mcp/tools/filesystem/diff.py,sha256=bhhTtGU9tSZcigd53PBRBCzqmlAngMWlkWxK9j7TX0w,7635
 hanzo_mcp/tools/filesystem/directory_tree.py,sha256=xfr8Nxl5Na6W8kb2ktBuuE1S10FwQf2ZGoCCBLydvsk,10866
 hanzo_mcp/tools/filesystem/directory_tree_paginated.py,sha256=2ArA_Uaa76WfM-O8nx5dqD2uYdsImIJ_Ols57QzpouI,11599
-hanzo_mcp/tools/filesystem/edit.py,sha256=9VA0svYhozVwFKw5LJInPjgIa-bhKT5h5yS80fb0Efo,10505
+hanzo_mcp/tools/filesystem/edit.py,sha256=s2NKTG-vDrk1iyWJqwns7iXyM6pMpcm_D02-SYj4OEc,10511
 hanzo_mcp/tools/filesystem/find.py,sha256=EmfhYOhvKgdyk5pxOXymFf-bpXtSMLSxYetg4-D5N4E,15663
 hanzo_mcp/tools/filesystem/find_files.py,sha256=goo40H1w4F3Re5BwZdn5b8rft7Mxz8WM1pH_ZA1YgsA,10838
 hanzo_mcp/tools/filesystem/git_search.py,sha256=FQbC-vLf7KNKL83gCOosFw7xbxO_mG6GE_bjEqrGljs,16485
 hanzo_mcp/tools/filesystem/grep.py,sha256=K20loRoIZOKSaAO3Kcg2mCm5D2jyZCiIqmWQ71EZ3gE,17042
-hanzo_mcp/tools/filesystem/multi_edit.py,sha256=Kll71UaLGFL5HRySlV6mSQafpS4UoeSEuZxpcgqY4k8,14042
-hanzo_mcp/tools/filesystem/read.py,sha256=5OL4imSwTEs7jSQOo3OCjmlou_E8qdHBwxU6ikqPcqA,9386
-hanzo_mcp/tools/filesystem/rules_tool.py,sha256=gUkzq78_caNd8hytiUSAMv7Q_CzGlbng04laffx9XmM,8382
+hanzo_mcp/tools/filesystem/multi_edit.py,sha256=vZZCJ5tE_QCE-8WaY6i7af8hyPatdTCdhOHwbw-3rsQ,14048
+hanzo_mcp/tools/filesystem/read.py,sha256=oPSYXFWQf5R6Ch7v36yUliFf-HW7yjUv0hSWxkN2jUE,9390
+hanzo_mcp/tools/filesystem/rules_tool.py,sha256=JPGubQLiGvrrvQqscPQOmSNk6A3WH63iTHV6ldU6_1g,8388
 hanzo_mcp/tools/filesystem/search_tool.py,sha256=LFsu7OpTODUN2QnVzokN5y1obSrdsrFzclsNwkh2hjw,25833
-hanzo_mcp/tools/filesystem/symbols_tool.py,sha256=oYKcw-Y1BvPXGck0bA0kiXrl0bM5y9SVCNDRh_jCn5Y,15958
+hanzo_mcp/tools/filesystem/symbols_tool.py,sha256=ihZQ7-5X-ubPWXy8p13krFEuU-bJmyzBV8_cf556Deg,15964
 hanzo_mcp/tools/filesystem/tree.py,sha256=fM6dd7yG45TKNzFqHdM-Z0UzX-PoR2KqBxhCV4AnPoI,7281
 hanzo_mcp/tools/filesystem/unix_aliases.py,sha256=N4vy9SXtecCNtggv2zjFk8CmHvhuqTvR6Ha_KT1UE_g,3031
 hanzo_mcp/tools/filesystem/watch.py,sha256=k9BxZfHk7WV2KcE48NwnPnPvXsnb0GG6xb3nWlGCJ8g,6950
-hanzo_mcp/tools/filesystem/write.py,sha256=FYFhfTkJ_523DCWRhb58_X_bfWFObVcTtFj30OvGTsg,4777
+hanzo_mcp/tools/filesystem/write.py,sha256=_i5ut7x23p1UoXUQdvlyVlTO18gmedrHE8PVvagEzLc,4783
 hanzo_mcp/tools/jupyter/__init__.py,sha256=-7uAomIx8tboZ9gcal7t2MRvgZ9A3cltIYA4perfZVE,2646
 hanzo_mcp/tools/jupyter/base.py,sha256=4O8iMBNqlrCNFEbsihpHyX_nyUqLV7w3AWb_0kcKD14,9788
 hanzo_mcp/tools/jupyter/jupyter.py,sha256=HTcOtuL-I-t4k-luz3_iSPOe6aViKyGlIoK21I-YQmA,14933
@@ -188,8 +188,8 @@ hanzo_mcp/tools/vector/project_manager.py,sha256=usxOldFajm7UN-74yN7Qa5Xw7Or6EWm
 hanzo_mcp/tools/vector/vector.py,sha256=KMV1UHH6kCgTrglyLSfepbDDgOo6U3QMXpsCBQyq5to,9963
 hanzo_mcp/tools/vector/vector_index.py,sha256=Vtdx69DwtsCaokleBhUpaFhP9AQ6Lq7C6xsDbZjPqNY,4274
 hanzo_mcp/tools/vector/vector_search.py,sha256=bRy-Dcm0SsJD7eV99U_XMdSpenh5WAPimqXofrTNIwE,9402
-hanzo_mcp-0.9.1.dist-info/METADATA,sha256=n-cN_4WzeuxbLbIZvzQ8HAOyc0CEBhwV2yonmjic2vs,8974
-hanzo_mcp-0.9.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-hanzo_mcp-0.9.1.dist-info/entry_points.txt,sha256=ML30pedHV5wjthfztzMMz3uYhNdR_6inzYY5pSqNME4,142
-hanzo_mcp-0.9.1.dist-info/top_level.txt,sha256=eGFANatA0MHWiVlpS56fTYRIShtibrSom1uXI6XU0GU,10
-hanzo_mcp-0.9.1.dist-info/RECORD,,
+hanzo_mcp-0.9.3.dist-info/METADATA,sha256=YUL8XY22uipXy32CewjqmECQVEc411pKoAE9lWvqWdk,8974
+hanzo_mcp-0.9.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+hanzo_mcp-0.9.3.dist-info/entry_points.txt,sha256=ML30pedHV5wjthfztzMMz3uYhNdR_6inzYY5pSqNME4,142
+hanzo_mcp-0.9.3.dist-info/top_level.txt,sha256=eGFANatA0MHWiVlpS56fTYRIShtibrSom1uXI6XU0GU,10
+hanzo_mcp-0.9.3.dist-info/RECORD,,