nocfo-cli 1.4.3__tar.gz → 1.4.5__tar.gz

{nocfo_cli-1.4.3 → nocfo_cli-1.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nocfo-cli
-Version: 1.4.3
+Version: 1.4.5
 Summary: NoCFO CLI, MCP server, and Cursor skill toolkit.
 License: MIT
 License-File: LICENSE

{nocfo_cli-1.4.3 → nocfo_cli-1.4.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "nocfo-cli"
-version = "1.4.3"
+version = "1.4.5"
 description = "NoCFO CLI, MCP server, and Cursor skill toolkit."
 authors = ["NoCFO"]
 readme = "README.md"

{nocfo_cli-1.4.3 → nocfo_cli-1.4.5}/src/nocfo_toolkit/mcp/middleware.py

@@ -83,9 +83,23 @@ class MCPToolErrorMiddleware(Middleware):
                 normalized.get("summary"),
             )
             raise ToolError(json.dumps(normalized, ensure_ascii=True)) from exc
-        except Exception:
+        except Exception as exc:
             logger.exception("MCP tool call crashed tool=%s", tool_name)
-            raise
+            captured = get_last_http_error()
+            if captured:
+                normalized = normalize_http_error(
+                    tool_name=tool_name,
+                    status_code=captured.get("status_code"),
+                    payload=captured.get("payload"),
+                    fallback_message=f"{type(exc).__name__}: {exc}",
+                )
+            else:
+                normalized = {
+                    "tool": tool_name,
+                    "error_type": "tool_error",
+                    "summary": f"{type(exc).__name__}: {exc}",
+                }
+            raise ToolError(json.dumps(normalized, ensure_ascii=True)) from exc
         finally:
             clear_last_http_error()
 

{nocfo_cli-1.4.3 → nocfo_cli-1.4.5}/src/nocfo_toolkit/mcp/server.py

@@ -15,6 +15,7 @@ from fastmcp.server.providers.openapi.components import (
 )
 from fastmcp.server.providers.openapi.routing import MCPType, RouteMap
 from fastmcp.tools.tool import Tool
+from mcp import types as mcp_types
 
 from nocfo_toolkit.config import AUTH_HEADER_SCHEME, ToolkitConfig
 from nocfo_toolkit.mcp.auth import (
@@ -125,6 +126,36 @@ def apply_mcp_operation_metadata(route: Any, component: Any) -> None:
     component.meta = meta
 
 
+def patch_mcp_runtime_output_validation(server: FastMCP) -> None:
+    """Disable SDK output validation at runtime without changing listed schemas.
+
+    MCP SDK validates tool outputs against ``outputSchema`` unconditionally in the
+    low-level ``call_tool`` handler. We patch the low-level lookup used only by that
+    validation path to return a cloned tool definition with ``outputSchema=None``.
+    ``tools/list`` responses are unaffected and keep the original schema intact.
+    """
+    lowlevel = getattr(server, "_mcp_server", None)
+    if lowlevel is None:
+        return
+    if getattr(lowlevel, "_nocfo_runtime_output_validation_patched", False):
+        return
+
+    original_get_cached_tool_definition = lowlevel._get_cached_tool_definition
+
+    async def _get_cached_tool_definition_without_output_schema(
+        tool_name: str,
+    ) -> mcp_types.Tool | None:
+        tool = await original_get_cached_tool_definition(tool_name)
+        if tool is None or tool.outputSchema is None:
+            return tool
+        return tool.model_copy(update={"outputSchema": None})
+
+    lowlevel._get_cached_tool_definition = (
+        _get_cached_tool_definition_without_output_schema
+    )
+    lowlevel._nocfo_runtime_output_validation_patched = True
+
+
 def restore_openapi_output_schema(route: Any, component: Any) -> None:
     """Restore the real OpenAPI output schema on tools for agent-facing metadata.
 
@@ -132,7 +163,11 @@ def restore_openapi_output_schema(route: Any, component: Any) -> None:
     permissive fallback so that runtime responses are never rejected.  This
     function re-derives the accurate schema from the route and writes it back
     onto the tool so that ``tools/list`` still exposes precise type information
-    to the agent — without enforcing it at call time.
+    to the agent.
+
+    Runtime output validation bypass is handled separately in
+    :func:`patch_mcp_runtime_output_validation`, so the listed schema can remain
+    fully backend-authored (including enums and other constraints).
     """
     if not isinstance(component, Tool):
         return
@@ -254,7 +289,7 @@ def create_server(
                 required_scopes=opts.required_scopes,
             )
 
-    return FastMCP.from_openapi(
+    server = FastMCP.from_openapi(
         openapi_spec=filtered_spec,
         client=client,
         name=opts.name,
@@ -265,6 +300,8 @@ def create_server(
         mcp_component_fn=component_mapper,
         validate_output=False,
     )
+    patch_mcp_runtime_output_validation(server)
+    return server
 
 
 def run_server(