Update mcp-bridge OAuth server

.pytest_cache/v/cache/lastfailed

@@ -1,3 +1 @@
-{
-  "test_oauth_flow.py::test_mcp_tool_call_emits_native_image_content_end_to_end": true
-}
+{}

.pytest_cache/v/cache/nodeids

@@ -5,6 +5,7 @@
   "test_oauth_flow.py::test_mcp_tool_call_emits_native_image_content_end_to_end",
   "test_oauth_flow.py::test_mcp_tool_call_preserves_native_image_content",
   "test_oauth_flow.py::test_mcp_tool_list_reports_target_url_on_connect_failure",
+  "test_oauth_flow.py::test_mcp_tool_list_strips_remote_output_schema",
   "test_oauth_flow.py::test_normalize_remote_url_adds_http_for_localhost_target",
   "test_oauth_flow.py::test_normalize_remote_url_adds_https_for_bare_remote_host",
   "test_oauth_flow.py::test_oauth_metadata_and_flow",

README.md

@@ -125,6 +125,6 @@ python -c "import secrets; print(secrets.token_urlsafe(48))"
 - `mcp_connect` expects an HTTP(S) MCP URL such as `https://example.com/sse` or `http://127.0.0.1:4000/mcp`; bare remote hosts are normalized to `https://...`, while `localhost`/`127.0.0.1` targets are normalized to `http://...`.
 - `mcp_connect` now accepts optional `bearer_token` and `x_api_key` arguments for protected upstream MCP servers and verifies the remote endpoint by default during connect.
 - If you do not want to pass remote credentials on each call, set `REMOTE_MCP_BEARER_TOKEN` or `REMOTE_MCP_X_API_KEY` in the bridge environment and they will be applied automatically when explicit auth headers are absent.
-- Some MCP hosts only surface the first rich content item from a tool result; the bridge now prioritizes image items before text so screenshot-style tools remain visible.
+- FastMCP tool results are serialized as text-first when a tool returns mixed text plus image content, so the bridge emits image-only outputs whenever the upstream result includes images. This preserves screenshot rendering in hosts that otherwise hide the image behind the leading text item.
 - For Windows-MCP specifically, `Snapshot` only includes an actual screenshot when called with `use_vision=true`; plain `Snapshot` calls can legitimately return text-only desktop state.
 - Bridge sessions created by `mcp_connect` are in memory and reset when the Space restarts or sleeps.

app.py

@@ -94,31 +94,47 @@ def _prioritize_image_content(result: CallToolResult) -> CallToolResult:
 
 def _native_tool_outputs(result: CallToolResult) -> list[Any]:
     prioritized = _prioritize_image_content(result)
-    outputs: list[Any] = []
+    image_outputs: list[Any] = []
+    fallback_outputs: list[Any] = []
 
     for item in prioritized.content or []:
         item_type = getattr(item, "type", None)
-        if item_type == "text":
-            outputs.append(item.text)
-            continue
-
         if item_type == "image":
             mime_type = getattr(item, "mimeType", None) or "image/png"
             image_format = mime_type.split("/", 1)[1] if "/" in mime_type else "png"
-            outputs.append(Image(data=base64.b64decode(item.data), format=image_format))
+            image_outputs.append(Image(data=base64.b64decode(item.data), format=image_format))
+            continue
+
+        if item_type == "text":
+            fallback_outputs.append(item.text)
             continue
 
         if hasattr(item, "model_dump"):
-            outputs.append(json.dumps(item.model_dump(), ensure_ascii=False, indent=2))
+            fallback_outputs.append(json.dumps(item.model_dump(), ensure_ascii=False, indent=2))
         else:
-            outputs.append(str(item))
+            fallback_outputs.append(str(item))
+
+    if image_outputs:
+        return image_outputs
 
-    if outputs:
-        return outputs
+    if fallback_outputs:
+        return fallback_outputs
 
     return [json.dumps(prioritized.model_dump(), ensure_ascii=False, indent=2)]
 
 
+def _sanitized_tool_descriptor(tool: Any) -> Dict[str, Any]:
+    if hasattr(tool, "model_dump"):
+        descriptor = tool.model_dump()
+    elif isinstance(tool, dict):
+        descriptor = dict(tool)
+    else:
+        return {"name": str(tool)}
+
+    descriptor.pop("outputSchema", None)
+    return descriptor
+
+
 def _b64url(data: bytes) -> str:
     return base64.urlsafe_b64encode(data).decode("ascii").rstrip("=")
 
@@ -651,7 +667,7 @@ async def mcp_tool_list(session_id: str) -> Dict[str, Any]:
 
     return {
         "session_id": session_id,
-        "tools": [tool.model_dump() if hasattr(tool, "model_dump") else str(tool) for tool in tools],
+        "tools": [_sanitized_tool_descriptor(tool) for tool in tools],
     }
 
 

test_oauth_flow.py

@@ -180,7 +180,7 @@ def test_mcp_tool_call_emits_native_image_content_end_to_end(monkeypatch):
             )
         assert returned.content[0].type == "image"
         assert returned.content[0].mimeType == "image/png"
-        assert returned.content[1].type == "text"
+        assert len(returned.content) == 1
         assert returned.isError is False
 
     try:
@@ -191,6 +191,42 @@ def test_mcp_tool_call_emits_native_image_content_end_to_end(monkeypatch):
     assert fake_client.calls == [("Screenshot", {})]
 
 
+def test_mcp_tool_list_strips_remote_output_schema(monkeypatch):
+    class FakeTool:
+        def model_dump(self):
+            return {
+                "name": "mcp_windows_Screenshot",
+                "description": "fake screenshot tool",
+                "inputSchema": {"type": "object"},
+                "outputSchema": {"type": "object", "properties": {"image": {"type": "string"}}},
+            }
+
+    class ListingClient:
+        async def __aenter__(self):
+            return self
+
+        async def __aexit__(self, exc_type, exc, tb):
+            return False
+
+        async def list_tools(self):
+            return [FakeTool()]
+
+    session_id = "tool-list-session"
+    SESSIONS[session_id] = {"url": "https://example.test/sse", "headers": {}}
+    monkeypatch.setattr("app._remote_client", lambda url, headers=None: ListingClient())
+
+    async def run_test():
+        returned = await mcp_tool_list.fn(session_id)
+        assert returned["tools"][0]["name"] == "mcp_windows_Screenshot"
+        assert returned["tools"][0]["inputSchema"] == {"type": "object"}
+        assert "outputSchema" not in returned["tools"][0]
+
+    try:
+        asyncio.run(run_test())
+    finally:
+        SESSIONS.pop(session_id, None)
+
+
 def test_mcp_tool_list_reports_target_url_on_connect_failure(monkeypatch):
     session_id = "broken-session"
     SESSIONS[session_id] = {"url": "https://missing.example.test/sse", "headers": {}}