gopher-mcp-python 0.1.38__tar.gz → 0.1.39__tar.gz

{gopher_mcp_python-0.1.38 → gopher_mcp_python-0.1.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gopher-mcp-python
-Version: 0.1.38
+Version: 0.1.39
 Summary: Python SDK for Gopher MCP - AI Agent orchestration framework with native performance
 Author-email: Gopher Security <dev@gophersecurity.com>
 License: Apache-2.0

{gopher_mcp_python-0.1.38 → gopher_mcp_python-0.1.39}/gopher_mcp_python/__init__.py

@@ -53,7 +53,7 @@ from gopher_mcp_python.errors import (
 from gopher_mcp_python.server_config import ServerConfig, ServerConfigRoute
 from gopher_mcp_python.ffi import GopherOrchLibrary, GopherOrchHandle
 
-__version__ = "0.1.38"
+__version__ = "0.1.39"
 
 _AUTH_EXPORTS = {
     "GopherAuth",

{gopher_mcp_python-0.1.38 → gopher_mcp_python-0.1.39}/gopher_mcp_python/agent.py

@@ -32,7 +32,7 @@ import weakref
 from typing import Callable, Optional
 
 from gopher_mcp_python.gateway_elicitation_preflight import (
-    preflight_gateway_elicitation,
+    preflight_gateway_elicitation_with_status,
 )
 import gopher_mcp_python.oauth_resolver as oauth_resolver
 from gopher_mcp_python.config import GopherAgentConfig
@@ -51,6 +51,8 @@ from gopher_mcp_python.ffi import GopherOrchLibrary, GopherOrchHandle
 
 _initialized = False
 _cleanup_handler_registered = False
+_SKIP_DISCOVERY_ELICITATION_HEADER = "X-Gopher-Internal-Skip-Discovery-Elicitation"
+_PREFLIGHT_MCP_SESSION_HEADER = "X-Gopher-Internal-Preflight-Mcp-Session-Id"
 
 
 class GopherAgent:
@@ -432,11 +434,16 @@ class GopherAgent:
                     oauth=oauth,
                 )
             )
-        normalized_runtime_options = preflight_gateway_elicitation(
+        preflight = preflight_gateway_elicitation_with_status(
             url,
             normalized_runtime_options,
             create_options,
         )
+        normalized_runtime_options = _mark_discovery_elicitation_preflighted(
+            preflight.runtime_options,
+            preflight.handled,
+            preflight.session,
+        )
         return GopherAgent._create_from_ffi(
             lambda lib: lib.agent_create_by_url(
                 provider, model, url, normalized_runtime_options
@@ -634,6 +641,24 @@ def _should_skip_oauth(
     return any(name.lower() == "authorization" for name in runtime_options.headers)
 
 
+def _mark_discovery_elicitation_preflighted(
+    runtime_options: Optional[GopherAgentRuntimeOptions],
+    handled: bool,
+    session: Optional[str],
+) -> Optional[GopherAgentRuntimeOptions]:
+    if not handled:
+        return runtime_options
+    headers = dict(runtime_options.headers) if runtime_options is not None else {}
+    headers[_SKIP_DISCOVERY_ELICITATION_HEADER] = "1"
+    if session:
+        headers[_PREFLIGHT_MCP_SESSION_HEADER] = session
+    return GopherAgentRuntimeOptions(
+        access_token=runtime_options.access_token if runtime_options else None,
+        headers=headers,
+        elicitation=runtime_options.elicitation if runtime_options else None,
+    )
+
+
 def _build_create_error_message() -> str:
     """
     Build the AgentError message for a null native create*() result.

{gopher_mcp_python-0.1.38 → gopher_mcp_python-0.1.39}/gopher_mcp_python/gateway_elicitation_preflight.py

@@ -1,8 +1,8 @@
-"""Gateway URL elicitation preflight for direct create_with_url flows."""
+"""MCP URL elicitation preflight for direct create_with_url flows."""
 
+from dataclasses import dataclass
 import json
 import os
-import re
 import socket
 import time
 from typing import Callable, Dict, Optional
@@ -18,28 +18,46 @@ from gopher_mcp_python.runtime_options import (
     GopherAgentRuntimeOptions,
 )
 
-GATEWAY_PATH_RE = re.compile(r"^/v1/mcp/gateways/[^/]+/mcp/?$")
 MCP_PROTOCOL_VERSION = "2025-11-25"
 DEFAULT_PREFLIGHT_TIMEOUT_MS = 5000
 
 UrlOpen = Callable[..., object]
 
 
+@dataclass(frozen=True)
+class GatewayElicitationPreflightResult:
+    runtime_options: Optional[GopherAgentRuntimeOptions]
+    handled: bool
+    session: Optional[str] = None
+
+
 def preflight_gateway_elicitation(
     url: str,
     runtime_options: Optional[GopherAgentRuntimeOptions],
     create_options: Optional[GopherAgentCreateOptions],
     opener: UrlOpen = urlopen,
 ) -> Optional[GopherAgentRuntimeOptions]:
-    """Handle gateway second-step URL elicitation before native tool calls."""
-    if not _is_gopher_gateway_mcp_url(url):
-        return runtime_options
+    """Handle URL elicitation before native tool calls."""
+    return preflight_gateway_elicitation_with_status(
+        url, runtime_options, create_options, opener
+    ).runtime_options
+
+
+def preflight_gateway_elicitation_with_status(
+    url: str,
+    runtime_options: Optional[GopherAgentRuntimeOptions],
+    create_options: Optional[GopherAgentCreateOptions],
+    opener: UrlOpen = urlopen,
+) -> GatewayElicitationPreflightResult:
+    """Handle URL elicitation and report whether preflight accepted it."""
+    if not _is_http_mcp_url(url):
+        return GatewayElicitationPreflightResult(runtime_options, False)
     if create_options is None or create_options.elicitation is None:
-        return runtime_options
+        return GatewayElicitationPreflightResult(runtime_options, False)
 
     authorization = _authorization_header_value(runtime_options)
     if authorization is None:
-        return runtime_options
+        return GatewayElicitationPreflightResult(runtime_options, False)
 
     timeout_ms = (
         create_options.elicitation.timeout_ms
@@ -48,30 +66,34 @@ def preflight_gateway_elicitation(
     )
     timeout_ms = max(0, int(timeout_ms))
     if timeout_ms == 0:
-        return runtime_options
-
-    session = _initialize_gateway_session(url, authorization, opener)
-    if session is None:
-        return runtime_options
-
-    _notify_initialized(url, authorization, session, opener)
-    _list_tools(url, authorization, session, opener)
-    _handle_gateway_event_stream(
-        url, authorization, session, create_options, timeout_ms, opener
-    )
-    return _with_gateway_session_header(runtime_options, session)
-
+        return GatewayElicitationPreflightResult(runtime_options, False)
 
-def _is_gopher_gateway_mcp_url(value: str) -> bool:
+    try:
+        session = _initialize_gateway_session(url, authorization, opener)
+        if session is None:
+            return GatewayElicitationPreflightResult(runtime_options, False)
+
+        _notify_initialized(url, authorization, session, opener)
+        _list_tools(url, authorization, session, opener)
+        handled = _handle_gateway_event_stream(
+            url, authorization, session, create_options, timeout_ms, opener
+        )
+        return GatewayElicitationPreflightResult(
+            runtime_options,
+            handled,
+            session if handled else None,
+        )
+    except Exception as exc:
+        _log_debug("elicitation preflight skipped", {"error": str(exc)})
+        return GatewayElicitationPreflightResult(runtime_options, False)
+
+
+def _is_http_mcp_url(value: str) -> bool:
     try:
         parsed = urlparse(value)
     except Exception:
         return False
-    return (
-        parsed.hostname is not None
-        and parsed.hostname.endswith(".gopher.security")
-        and GATEWAY_PATH_RE.match(parsed.path) is not None
-    )
+    return parsed.scheme in ("http", "https") and parsed.netloc != ""
 
 
 def _authorization_header_value(
@@ -116,7 +138,7 @@ def _initialize_gateway_session(
     )
     session = _response_header(response, "mcp-session-id")
     _log_debug(
-        "gateway elicitation preflight initialized",
+        "elicitation preflight initialized",
         {"session_present": session is not None},
     )
     return session
@@ -159,7 +181,7 @@ def _handle_gateway_event_stream(
     create_options: GopherAgentCreateOptions,
     timeout_ms: int,
     opener: UrlOpen,
-) -> None:
+) -> bool:
     request = Request(
         url,
         method="GET",
@@ -174,12 +196,12 @@ def _handle_gateway_event_stream(
         response = opener(request, timeout=timeout_ms / 1000.0)
         event = _read_first_sse_event(response, timeout_ms)
     except (OSError, TimeoutError, socket.timeout) as exc:
-        _log_debug("gateway elicitation preflight skipped", {"error": str(exc)})
-        return
+        _log_debug("elicitation preflight skipped", {"error": str(exc)})
+        return False
 
     parsed = _parse_elicitation_event(event)
     if parsed is None:
-        return
+        return False
 
     action = resolve_elicitation_action_sync(
         create_options.elicitation,
@@ -197,9 +219,10 @@ def _handle_gateway_event_stream(
         opener,
     )
     _log_debug(
-        "gateway elicitation preflight answered",
+        "elicitation preflight answered",
         {"action": action, "session": session},
     )
+    return action == "accept"
 
 
 def _post_json(
@@ -289,19 +312,6 @@ def _response_header(response: object, name: str) -> Optional[str]:
     return None
 
 
-def _with_gateway_session_header(
-    options: Optional[GopherAgentRuntimeOptions],
-    session: str,
-) -> GopherAgentRuntimeOptions:
-    headers = dict(options.headers) if options is not None else {}
-    headers["Mcp-Session-Id"] = session
-    return GopherAgentRuntimeOptions(
-        access_token=options.access_token if options is not None else None,
-        headers=headers,
-        elicitation=options.elicitation if options is not None else None,
-    )
-
-
 def _string_field(value: Dict[str, object], field: str) -> Optional[str]:
     field_value = value.get(field)
     return field_value if isinstance(field_value, str) else None

{gopher_mcp_python-0.1.38 → gopher_mcp_python-0.1.39}/gopher_mcp_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gopher-mcp-python
-Version: 0.1.38
+Version: 0.1.39
 Summary: Python SDK for Gopher MCP - AI Agent orchestration framework with native performance
 Author-email: Gopher Security <dev@gophersecurity.com>
 License: Apache-2.0

{gopher_mcp_python-0.1.38 → gopher_mcp_python-0.1.39}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gopher-mcp-python"
-version = "0.1.38"
+version = "0.1.39"
 description = "Python SDK for Gopher MCP - AI Agent orchestration framework with native performance"
 readme = "README.md"
 license = {text = "Apache-2.0"}

{gopher_mcp_python-0.1.38 → gopher_mcp_python-0.1.39}/tests/test_agent_create_with_oauth.py

@@ -4,6 +4,9 @@ import pytest
 
 import gopher_mcp_python.agent as agent_module
 from gopher_mcp_python import AgentError, GopherAgent
+from gopher_mcp_python.gateway_elicitation_preflight import (
+    GatewayElicitationPreflightResult,
+)
 from gopher_mcp_python.runtime_options import GopherAgentRuntimeOptions
 
 
@@ -161,7 +164,7 @@ def test_create_with_url_explicit_token_skips_resolver(monkeypatch) -> None:
     agent.dispose()
 
 
-def test_create_with_url_passes_gateway_preflight_session_to_native(
+def test_create_with_url_passes_preflight_session_to_native(
     monkeypatch,
 ) -> None:
     fake = _install_fake_library(monkeypatch)
@@ -172,13 +175,10 @@ def test_create_with_url_passes_gateway_preflight_session_to_native(
 
     def preflight(url, runtime_options, create_options):
         preflight_calls.append((url, runtime_options, create_options))
-        return GopherAgentRuntimeOptions(
-            access_token=runtime_options.access_token,
-            headers={
-                **runtime_options.headers,
-                "Mcp-Session-Id": "session-1",
-            },
-            elicitation=runtime_options.elicitation,
+        return GatewayElicitationPreflightResult(
+            runtime_options,
+            True,
+            "session-1",
         )
 
     monkeypatch.setattr(
@@ -186,7 +186,9 @@ def test_create_with_url_passes_gateway_preflight_session_to_native(
         "resolve_url_runtime_options_with_oauth",
         resolver,
     )
-    monkeypatch.setattr(agent_module, "preflight_gateway_elicitation", preflight)
+    monkeypatch.setattr(
+        agent_module, "preflight_gateway_elicitation_with_status", preflight
+    )
 
     agent = GopherAgent.create_with_url(
         "Provider",
@@ -204,7 +206,8 @@ def test_create_with_url_passes_gateway_preflight_session_to_native(
     )
     assert call[4].headers == {
         "Authorization": "Bearer caller-token",
-        "Mcp-Session-Id": "session-1",
+        "X-Gopher-Internal-Preflight-Mcp-Session-Id": "session-1",
+        "X-Gopher-Internal-Skip-Discovery-Elicitation": "1",
     }
     assert preflight_calls[0][0] == (
         "https://mcp-test.gopher.security/v1/mcp/gateways/gw-1/mcp"

{gopher_mcp_python-0.1.38 → gopher_mcp_python-0.1.39}/tests/test_gateway_elicitation_preflight.py

@@ -5,6 +5,7 @@ import json
 from gopher_mcp_python import elicitation_runtime
 from gopher_mcp_python.gateway_elicitation_preflight import (
     preflight_gateway_elicitation,
+    preflight_gateway_elicitation_with_status,
 )
 from gopher_mcp_python.runtime_options import (
     GopherAgentCreateOptions,
@@ -52,7 +53,7 @@ def test_answers_gateway_url_elicitation_before_native_tool_calls() -> None:
     assert result is not None
     assert result.access_token == "gateway-token"
     assert result.headers["Authorization"] == "Bearer gateway-token"
-    assert result.headers["Mcp-Session-Id"] == "session-1"
+    assert "Mcp-Session-Id" not in result.headers
     assert len(opener.requests) == 5
     assert json.loads(opener.requests[0].data.decode("utf-8"))["method"] == (
         "initialize"
@@ -72,12 +73,87 @@ def test_answers_gateway_url_elicitation_before_native_tool_calls() -> None:
     }
 
 
-def test_does_nothing_for_non_gateway_urls() -> None:
+def test_also_preflights_server_urls() -> None:
+    elicitation_runtime.set_elicitation_input_for_test(lambda timeout_ms: "\n")
+    opener = FakeOpener(
+        [
+            FakeResponse(headers={"mcp-session-id": "session-1"}),
+            FakeResponse(),
+            FakeResponse(body=b'{"tools":[]}'),
+            FakeResponse(
+                lines=[
+                    b"event: message\n",
+                    (
+                        b'data: {"jsonrpc":"2.0","id":"server_elicitation_1",'
+                        b'"method":"elicitation/create","params":'
+                        b'{"elicitationId":"provider-auth","message":"Connect",'
+                        b'"mode":"url","url":"https://accounts.google.com/o/oauth2'
+                        b'/v2/auth?state=s"}}\n'
+                    ),
+                    b"\n",
+                ]
+            ),
+            FakeResponse(),
+        ]
+    )
+
+    result = preflight_gateway_elicitation(
+        "https://mcp.gopher.security/v1/mcp/servers/server-1/mcp",
+        GopherAgentRuntimeOptions(access_token="server-token"),
+        GopherAgentCreateOptions(elicitation={"open_browser": False}),
+        opener=opener,
+    )
+
+    assert result is not None
+    assert result.access_token == "server-token"
+    assert result.headers["Authorization"] == "Bearer server-token"
+    assert "Mcp-Session-Id" not in result.headers
+    assert len(opener.requests) == 5
+
+
+def test_reports_accepted_preflight_session() -> None:
+    elicitation_runtime.set_elicitation_input_for_test(lambda timeout_ms: "\n")
+    opener = FakeOpener(
+        [
+            FakeResponse(headers={"mcp-session-id": "session-1"}),
+            FakeResponse(),
+            FakeResponse(body=b'{"tools":[]}'),
+            FakeResponse(
+                lines=[
+                    b"event: message\n",
+                    (
+                        b'data: {"jsonrpc":"2.0","id":"server_elicitation_1",'
+                        b'"method":"elicitation/create","params":'
+                        b'{"elicitationId":"provider-auth","message":"Connect",'
+                        b'"mode":"url","url":"https://accounts.google.com/o/oauth2'
+                        b'/v2/auth?state=s"}}\n'
+                    ),
+                    b"\n",
+                ]
+            ),
+            FakeResponse(),
+        ]
+    )
+
+    result = preflight_gateway_elicitation_with_status(
+        "https://mcp.gopher.security/v1/mcp/servers/server-1/mcp",
+        GopherAgentRuntimeOptions(access_token="server-token"),
+        GopherAgentCreateOptions(elicitation={"open_browser": False}),
+        opener=opener,
+    )
+
+    assert result.handled is True
+    assert result.session == "session-1"
+    assert result.runtime_options is not None
+    assert "Mcp-Session-Id" not in result.runtime_options.headers
+
+
+def test_does_nothing_for_non_http_urls() -> None:
     opener = FakeOpener([])
     runtime_options = GopherAgentRuntimeOptions(access_token="token")
 
     result = preflight_gateway_elicitation(
-        "https://mcp.example.com/mcp",
+        "stdio://mcp.example.com/mcp",
         runtime_options,
         GopherAgentCreateOptions(),
         opener=opener,