misc: use structured path for errors

src/wf_mcp/broker/catalog.py

@@ -14,6 +14,7 @@ from ..capabilities import (
 )
 from ..connections import qualify_node_name
 from ..models import CatalogSnapshot
+from ..sdk.converters import workflow_output_schema_from_mcp_tool_schema
 
 
 def snapshot_from_specs(
@@ -42,7 +43,9 @@ def snapshot_from_specs(
             description=entry.description,
             outcomes=entry.outcomes,
             input_schema=entry.input_schema,
-            output_schema=entry.output_schema,
+            output_schema=workflow_output_schema_from_mcp_tool_schema(
+                entry.output_schema
+            ),
         )
         for entry in catalog.entries()
     ]
@@ -127,7 +130,9 @@ class CombinedCatalog:
                     "description": entry.description,
                     "outcomes": list(entry.outcomes),
                     "input_schema": entry.input_schema,
-                    "output_schema": entry.output_schema,
+                    "output_schema": workflow_output_schema_from_mcp_tool_schema(
+                        entry.output_schema
+                    ),
                 }
                 for entry in self.entries()
             ],

src/wf_mcp/broker/service/core.py

@@ -50,6 +50,7 @@ from ...models import (
     RawWorkflowPlan,
 )
 from ...runtime import ToolExecutor
+from ...sdk.converters import workflow_output_schema_from_mcp_tool_schema
 from ...sdk import BackendAdapter
 from ...shared.errors import error_payload
 from ...shared.names import RESERVED_CONNECTION_IDS
@@ -875,7 +876,8 @@ class WfMcpService:
         """
         model_prefix = entry.qualified_name.replace(".", "_").replace("-", "_")
         input_model = _model_from_schema(f"{model_prefix}_Input", entry.input_schema)
-        output_model = _model_from_schema(f"{model_prefix}_Output", entry.output_schema)
+        output_schema = workflow_output_schema_from_mcp_tool_schema(entry.output_schema)
+        output_model = _model_from_schema(f"{model_prefix}_Output", output_schema)
 
         async def invoke_tool(payload: BaseModel) -> NodeReturn[BaseModel]:
             connection = self.connections.get(entry.connection_id)
@@ -901,7 +903,7 @@ class WfMcpService:
             is_async=True,
             accepts_context=False,
             input_schema_contract=entry.input_schema,
-            output_schema_contract=entry.output_schema,
+            output_schema_contract=output_schema,
         )
 
     def _get_qualified_spec(self, qualified_name: str) -> NodeSpec[Any, Any]: