hub: parse calls directly from dispatch

This will make it much easier for a user to see what was called.
We can do this for negotiation too.

Signed-off-by: vsoch <vsoch@users.noreply.github.com>

Author: vsoch

mcpserver/core/hub.py

@@ -125,6 +125,27 @@ def _print_banner(self):
         print("   Workers must use this secret to join the hub")
         print(f"   mcpserver start --join {self.registration_url}\n")
 
+    def jsonify_response(self, response):
+        """
+        Ensure we get the text, and separate and parse tool calls,
+        which the agent will return in a verbose mode.
+        """
+        result = result.content[0].text
+        
+        # Audit the tool calls (Did the agent just get lucky?)
+        calls = []
+        if "CALLS" in result:
+            try:
+                result, calls_block = result.split("CALLS")
+                calls = utils.format_calls(calls_block)
+            except:
+                print(f"Issue parsing calls, agent had malformed response: {result}")
+                pass
+
+        result = json.loads(utils.extract_code_block(result))
+        result["calls"] = calls
+        return result
+
     async def run_on_fleet_parallel(self, action_fn) -> Dict[str, Any]:
         """
         Run parallel sessions across all workers.
@@ -209,7 +230,7 @@ async def dispatch_job(worker_id: str, prompt: str) -> dict:
 
             async with info["client"] as sess:
                 result = await sess.call_tool("submit", {"request": prompt})
-                return json.loads(utils.extract_code_block(result.content[0].text))
+                return self.jsonify_response(result)
 
         @self.mcp.tool(name="negotiate_job")
         async def negotiate_job(prompt: str) -> dict:
@@ -253,6 +274,7 @@ async def negotiate_handler(wid, sess):
                 mcp_result = await sess.call_tool("ask_secretary", {"request": prompt})
                 raw_text = mcp_result.content[0].text
 
+                # TODO: vsoch: add support to parse the calls here too (like dispatch)
                 try:
                     # Parse and handle potential quote issues in LLM JSON
                     proposal_data = json.loads(utils.extract_code_block(raw_text))

mcpserver/utils/text.py

@@ -1,7 +1,11 @@
+import json
 import re
 
 
 def sanitize(name: str) -> str:
+    """
+    Sanitize worker ids and arguments for hub properties.
+    """
     # Replace hyphens/dots with underscores
     clean = name.replace("-", "_").replace(".", "_")
     # Python identifiers cannot start with a digit
@@ -10,8 +14,16 @@ def sanitize(name: str) -> str:
     return clean
 
 
-def format_rules(rules):
-    return "\n".join([f"- {r}" for r in rules])
+def format_calls(calls_block):
+    """
+    The secretary agent can return calls. We need to ensure we try
+    to get and parse them correctly.
+    """
+    calls = []
+    try:
+        return json.loads(extract_code_block(calls_block))
+    except:
+        return calls
 
 
 def extract_code_block(text):