nocfo-cli 1.3.0__tar.gz → 1.4.1__tar.gz

{nocfo_cli-1.3.0 → nocfo_cli-1.4.1}/PKG-INFO

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

{nocfo_cli-1.3.0 → nocfo_cli-1.4.1}/pyproject.toml

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

{nocfo_cli-1.3.0 → nocfo_cli-1.4.1}/src/nocfo_toolkit/mcp/contract_validation.py

@@ -13,6 +13,7 @@ from nocfo_toolkit.mcp.server import (
     MCP_OPENAPI_ROUTE_MAPS,
     apply_mcp_operation_metadata,
     apply_mcp_namespace_names,
+    restore_openapi_output_schema,
 )
 from nocfo_toolkit.openapi import filter_mcp_spec
 
@@ -35,6 +36,7 @@ class MCPContractValidationResult:
 def _apply_component_mcp_metadata(route: Any, component: Any) -> None:
     apply_mcp_namespace_names(route, component)
     apply_mcp_operation_metadata(route, component)
+    restore_openapi_output_schema(route, component)
 
 
 def _get_base_url(openapi_spec: dict[str, Any]) -> str:
@@ -146,7 +148,7 @@ def _build_result(
 def validate_openapi_mcp_contract(
     openapi_spec: dict[str, Any],
     *,
-    validate_output: bool = True,
+    validate_output: bool = False,
 ) -> MCPContractValidationResult:
     """Validate that MCP-tagged operations map cleanly to FastMCP components.
 
@@ -186,7 +188,7 @@ def validate_openapi_mcp_contract(
 def assert_openapi_mcp_contract_valid(
     openapi_spec: dict[str, Any],
     *,
-    validate_output: bool = True,
+    validate_output: bool = False,
 ) -> MCPContractValidationResult:
     """Assert MCP contract validity and return the validation result."""
     result = validate_openapi_mcp_contract(

{nocfo_cli-1.3.0 → nocfo_cli-1.4.1}/src/nocfo_toolkit/mcp/http_error_capture.py

@@ -21,21 +21,31 @@ def get_last_http_error() -> dict[str, Any] | None:
 
 
 async def capture_http_error_response(response: httpx.Response) -> None:
-    """Store status/payload for the latest non-success HTTP response."""
+    """Store status/payload for the latest HTTP response.
 
-    if response.status_code < 400:
-        _LAST_HTTP_ERROR.set(None)
-        return
+    FastMCP can issue downstream requests with streaming enabled. In that mode,
+    accessing ``response.content``/``response.json`` without ``aread()`` raises
+    ``ResponseNotRead``. We therefore always drain the body first, even for
+    success responses, so tool handlers can safely decode the payload.
+    """
 
     try:
         await response.aread()
-    except httpx.HTTPError:
-        pass
+    except (httpx.HTTPError, httpx.StreamError):
+        # Keep best-effort behavior: failures here should not shadow the original
+        # tool error path. The middleware still clears stale captured state below.
+        _LAST_HTTP_ERROR.set(None)
+        return
+
+    if response.status_code < 400:
+        _LAST_HTTP_ERROR.set(None)
+        return
 
     try:
         payload: Any = response.json() if response.content else None
-    except (ValueError, httpx.ResponseNotRead):
-        payload = (response.text or "").strip()[:1000] or None
+    except ValueError:
+        text = response.text.strip()
+        payload = text[:1000] if text else None
 
     _LAST_HTTP_ERROR.set(
         {

{nocfo_cli-1.3.0 → nocfo_cli-1.4.1}/src/nocfo_toolkit/mcp/server.py

@@ -32,6 +32,8 @@ from nocfo_toolkit.openapi import (
     load_openapi_spec,
 )
 
+from fastmcp.utilities.openapi import extract_output_schema_from_responses
+
 if TYPE_CHECKING:
     from fastmcp import FastMCP
 
@@ -133,6 +135,29 @@ def apply_mcp_operation_metadata(route: Any, component: Any) -> None:
     component.meta = meta
 
 
+def restore_openapi_output_schema(route: Any, component: Any) -> None:
+    """Restore the real OpenAPI output schema on tools for agent-facing metadata.
+
+    When ``validate_output=False`` FastMCP replaces the output schema with a
+    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.
+    """
+    if not isinstance(component, Tool):
+        return
+    responses = getattr(route, "responses", None)
+    if responses is None:
+        return
+    real_schema = extract_output_schema_from_responses(
+        responses,
+        getattr(route, "response_schemas", None),
+        getattr(route, "openapi_version", None),
+    )
+    if real_schema is not None:
+        component.output_schema = real_schema
+
+
 def _get_server_instructions(openapi_spec: dict[str, Any]) -> str | None:
     """Read backend-owned MCP server instructions from OpenAPI root extensions."""
     instructions = openapi_spec.get(X_NOCFO_MCP_SERVER_INSTRUCTIONS)
@@ -200,6 +225,7 @@ def create_server(
     from fastmcp import FastMCP
 
     opts = options or MCPServerOptions()
+
     if opts.auth_mode == "oauth":
         client = _create_oauth_client(
             config,
@@ -228,6 +254,7 @@ def create_server(
     def component_mapper(route: Any, component: Any) -> None:
         apply_mcp_namespace_names(route, component)
         apply_mcp_operation_metadata(route, component)
+        restore_openapi_output_schema(route, component)
         if opts.auth_mode == "oauth" and isinstance(
             component, (Tool, OpenAPIResource, OpenAPIResourceTemplate)
         ):
@@ -245,7 +272,7 @@ def create_server(
         middleware=[MCPToolErrorMiddleware()],
         route_maps=MCP_OPENAPI_ROUTE_MAPS,
         mcp_component_fn=component_mapper,
-        validate_output=True,
+        validate_output=False,
     )