mcp-stdio 0.3.0__tar.gz → 0.3.2__tar.gz

{mcp_stdio-0.3.0 → mcp_stdio-0.3.2}/.github/workflows/release.yml

@@ -91,6 +91,12 @@ jobs:
         run: |
           VERSION="${GITHUB_REF_NAME#v}"
           jq --arg v "$VERSION" '.version = $v | .packages[0].version = $v' server.json > server.tmp && mv server.tmp server.json
+          # Sanity check: ensure placeholder was replaced
+          if jq -e '.version == "0.0.0" or .packages[0].version == "0.0.0"' server.json > /dev/null; then
+            echo "::error::server.json still contains placeholder 0.0.0 after patching"
+            exit 1
+          fi
+          echo "Patched server.json to version $VERSION"
 
       - name: Install mcp-publisher
         run: |

{mcp_stdio-0.3.0 → mcp_stdio-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-stdio
-Version: 0.3.0
+Version: 0.3.2
 Summary: Stdio-to-HTTP relay for MCP servers
 Project-URL: Homepage, https://github.com/shigechika/mcp-stdio
 Project-URL: Issues, https://github.com/shigechika/mcp-stdio/issues
@@ -13,6 +13,9 @@ Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.10
 Requires-Dist: httpx>=0.25.0
@@ -34,13 +37,15 @@ Stdio-to-HTTP relay for MCP servers — bridges Claude Desktop/Code to remote St
 [MCP](https://modelcontextprotocol.io/) clients like Claude Desktop and Claude Code see mcp-stdio as a locally running self-hosted MCP server, while it relays all requests to a remote MCP server over Streamable HTTP:
 
 ```mermaid
-flowchart LR
+flowchart BT
     A[Claude<br>CLI/Desktop] <-- stdio --> B(mcp-stdio)
-    B <== "HTTPS<br>(Bearer/Headers)" ==> C[Remote<br>MCP Server]
+    B <== "<b>HTTPS</b><br>Bearer Token<br>Header<br>OAuth" ==> C[Remote<br>MCP Server]
+    B -. "OAuth 2.1<br>(PKCE)" .-> D[Authorization<br>Server]
+    D -. callback .-> B
     style B fill:#4a5,stroke:#333,color:#fff
 ```
 
-Bearer tokens and custom headers are forwarded to the remote server.
+Bearer tokens, custom headers, and OAuth 2.1 credentials are forwarded to the remote server.
 
 ## Install
 
@@ -156,6 +161,7 @@ Works around known issues in Claude Code's HTTP transport:
 - **Bearer token not sent** — Claude Code ignores `Authorization` header on tool calls ([#28293](https://github.com/anthropics/claude-code/issues/28293), [#33817](https://github.com/anthropics/claude-code/issues/33817))
 - **Missing Accept header** — servers return 406, misinterpreted as auth failure ([#42470](https://github.com/anthropics/claude-code/issues/42470))
 - **OAuth fallback loop** — Claude Code enters OAuth discovery even when not needed ([#34008](https://github.com/anthropics/claude-code/issues/34008), [#39271](https://github.com/anthropics/claude-code/issues/39271))
+- **Session lost after disconnect** — mcp-stdio recovers MCP sessions automatically on 404 ([#34498](https://github.com/anthropics/claude-code/issues/34498), [#38631](https://github.com/anthropics/claude-code/issues/38631))
 - **Proxy settings ignored** — Claude Code does not respect `NO_PROXY` ([#34804](https://github.com/anthropics/claude-code/issues/34804)); mcp-stdio inherits proxy settings from httpx
 
 ## Features
@@ -186,6 +192,8 @@ Works around known issues in Claude Code's HTTP transport:
 5. Maintains the `Mcp-Session-Id` header across requests
 6. On 401, refreshes the OAuth token and retries; on 404, resets the session
 
+OAuth tokens are stored in `~/.config/mcp-stdio/tokens.json` (permissions 0600).
+
 ## License
 
 MIT

{mcp_stdio-0.3.0 → mcp_stdio-0.3.2}/README.ja.md

@@ -9,13 +9,15 @@ MCP サーバー向け stdio-to-HTTP リレー — Claude Desktop/Code とリモ
 [MCP](https://modelcontextprotocol.io/) クライアント（Claude Desktop, Claude Code）に対してローカルで稼働するセルフホスト MCP サーバのように振る舞いつつ、リモート MCP サーバへの Streamable HTTP 接続を橋渡しします：
 
 ```mermaid
-flowchart LR
+flowchart BT
     A[Claude<br>CLI/Desktop] <-- stdio --> B(mcp-stdio)
-    B <== "HTTPS<br>(Bearer/Headers)" ==> C[Remote<br>MCP Server]
+    B <== "<b>HTTPS</b><br>Bearer Token<br>Header<br>OAuth" ==> C[Remote<br>MCP Server]
+    B -. "OAuth 2.1<br>(PKCE)" .-> D[Authorization<br>Server]
+    D -. callback .-> B
     style B fill:#4a5,stroke:#333,color:#fff
 ```
 
-Bearer token やカスタムヘッダーをリモートサーバーへ転送します。
+Bearer token、カスタムヘッダー、OAuth 2.1 認証情報をリモートサーバーへ転送します。
 
 ## インストール
 
@@ -131,7 +133,8 @@ Claude Code の HTTP transport の既知の問題を回避できます：
 - **Bearer token が送信されない** — ツール呼び出し時に `Authorization` ヘッダーが無視される（[#28293](https://github.com/anthropics/claude-code/issues/28293), [#33817](https://github.com/anthropics/claude-code/issues/33817)）
 - **Accept ヘッダーの欠落** — サーバーが 406 を返し、認証エラーと誤認される（[#42470](https://github.com/anthropics/claude-code/issues/42470)）
 - **OAuth フォールバックループ** — OAuth 不要なサーバーでも OAuth 検出が走る（[#34008](https://github.com/anthropics/claude-code/issues/34008), [#39271](https://github.com/anthropics/claude-code/issues/39271)）
-- **プロキシ設定が無視される** — Claude Code が `NO_PROXY` を尊重しない（[#34804](https://github.com/anthropics/claude-code/issues/34804)）; mcp-stdio は httpx 経由でプロキシ設定を継承
+- **切断後にセッションが失われる** — mcp-stdio は 404 で MCP セッションを自動回復（[#34498](https://github.com/anthropics/claude-code/issues/34498), [#38631](https://github.com/anthropics/claude-code/issues/38631)）
+- **プロキシ設定が無視される** — Claude Code が `NO_PROXY` を尊重しない（[#34804](https://github.com/anthropics/claude-code/issues/34804)）; mcp-stdio は httpx 経由でプロキシ設定を��承
 
 ## 機能
 
@@ -161,6 +164,8 @@ Claude Code の HTTP transport の既知の問題を回避できます：
 5. `Mcp-Session-Id` ヘッダーをリクエスト間で維持
 6. 401 で OAuth トークンをリフレッシュしてリトライ、404 でセッションをリセット
 
+OAuth トークンは `~/.config/mcp-stdio/tokens.json` に保存されます（パーミッション 0600）。
+
 ## ライセンス
 
 MIT

{mcp_stdio-0.3.0 → mcp_stdio-0.3.2}/README.md

@@ -11,13 +11,15 @@ Stdio-to-HTTP relay for MCP servers — bridges Claude Desktop/Code to remote St
 [MCP](https://modelcontextprotocol.io/) clients like Claude Desktop and Claude Code see mcp-stdio as a locally running self-hosted MCP server, while it relays all requests to a remote MCP server over Streamable HTTP:
 
 ```mermaid
-flowchart LR
+flowchart BT
     A[Claude<br>CLI/Desktop] <-- stdio --> B(mcp-stdio)
-    B <== "HTTPS<br>(Bearer/Headers)" ==> C[Remote<br>MCP Server]
+    B <== "<b>HTTPS</b><br>Bearer Token<br>Header<br>OAuth" ==> C[Remote<br>MCP Server]
+    B -. "OAuth 2.1<br>(PKCE)" .-> D[Authorization<br>Server]
+    D -. callback .-> B
     style B fill:#4a5,stroke:#333,color:#fff
 ```
 
-Bearer tokens and custom headers are forwarded to the remote server.
+Bearer tokens, custom headers, and OAuth 2.1 credentials are forwarded to the remote server.
 
 ## Install
 
@@ -133,6 +135,7 @@ Works around known issues in Claude Code's HTTP transport:
 - **Bearer token not sent** — Claude Code ignores `Authorization` header on tool calls ([#28293](https://github.com/anthropics/claude-code/issues/28293), [#33817](https://github.com/anthropics/claude-code/issues/33817))
 - **Missing Accept header** — servers return 406, misinterpreted as auth failure ([#42470](https://github.com/anthropics/claude-code/issues/42470))
 - **OAuth fallback loop** — Claude Code enters OAuth discovery even when not needed ([#34008](https://github.com/anthropics/claude-code/issues/34008), [#39271](https://github.com/anthropics/claude-code/issues/39271))
+- **Session lost after disconnect** — mcp-stdio recovers MCP sessions automatically on 404 ([#34498](https://github.com/anthropics/claude-code/issues/34498), [#38631](https://github.com/anthropics/claude-code/issues/38631))
 - **Proxy settings ignored** — Claude Code does not respect `NO_PROXY` ([#34804](https://github.com/anthropics/claude-code/issues/34804)); mcp-stdio inherits proxy settings from httpx
 
 ## Features
@@ -163,6 +166,8 @@ Works around known issues in Claude Code's HTTP transport:
 5. Maintains the `Mcp-Session-Id` header across requests
 6. On 401, refreshes the OAuth token and retries; on 404, resets the session
 
+OAuth tokens are stored in `~/.config/mcp-stdio/tokens.json` (permissions 0600).
+
 ## License
 
 MIT

{mcp_stdio-0.3.0 → mcp_stdio-0.3.2}/pyproject.toml

@@ -13,6 +13,9 @@ classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Software Development :: Libraries",
 ]
 dependencies = [

{mcp_stdio-0.3.0 → mcp_stdio-0.3.2}/server.json

@@ -7,13 +7,13 @@
     "url": "https://github.com/shigechika/mcp-stdio",
     "source": "github"
   },
-  "version": "0.2.1",
+  "version": "0.0.0",
   "packages": [
     {
       "registryType": "pypi",
       "registryBaseUrl": "https://pypi.org",
       "identifier": "mcp-stdio",
-      "version": "0.2.1",
+      "version": "0.0.0",
       "runtimeHint": "uvx",
       "transport": {
         "type": "stdio"

{mcp_stdio-0.3.0 → mcp_stdio-0.3.2}/src/mcp_stdio/__init__.py

@@ -1,3 +1,3 @@
 """mcp-stdio: Stdio-to-HTTP relay for MCP servers."""
 
-__version__ = "0.3.0"
+__version__ = "0.3.2"

{mcp_stdio-0.3.0 → mcp_stdio-0.3.2}/src/mcp_stdio/oauth.py

@@ -62,8 +62,7 @@ def _fetch_authorization_server_metadata(
             return OAuthMetadata(
                 authorization_endpoint=data.get("authorization_endpoint")
                 or f"{auth_server_url}/authorize",
-                token_endpoint=data.get("token_endpoint")
-                or f"{auth_server_url}/token",
+                token_endpoint=data.get("token_endpoint") or f"{auth_server_url}/token",
                 registration_endpoint=data.get("registration_endpoint") or None,
             )
     except Exception:
@@ -71,9 +70,7 @@ def _fetch_authorization_server_metadata(
     return None
 
 
-def discover_oauth_metadata(
-    server_url: str, client: httpx.Client
-) -> OAuthMetadata:
+def discover_oauth_metadata(server_url: str, client: httpx.Client) -> OAuthMetadata:
     """Discover OAuth authorization server metadata.
 
     Follows the MCP spec discovery flow:
@@ -224,10 +221,7 @@ def _make_callback_handler(
                 msg = html.escape(result.error)
                 body = f"<h1>Authorization failed</h1><p>{msg}</p>"
             else:
-                body = (
-                    "<h1>Authorization successful</h1>"
-                    "<p>You can close this tab.</p>"
-                )
+                body = "<h1>Authorization successful</h1><p>You can close this tab.</p>"
             self.wfile.write(body.encode())
 
         def log_message(self, format: str, *args: Any) -> None:
@@ -407,7 +401,10 @@ def ensure_token(
                     registration_endpoint=cached.registration_endpoint,
                 )
                 data = _token_response_to_data(
-                    raw, metadata, cached.client_id, cached.client_secret,
+                    raw,
+                    metadata,
+                    cached.client_id,
+                    cached.client_secret,
                     previous_refresh_token=cached.refresh_token,
                 )
                 save_token(server_url, data)
@@ -504,7 +501,13 @@ def ensure_token(
     # Token exchange (RFC 8707: include resource indicator)
     log("exchanging authorization code for token")
     raw = exchange_code(
-        metadata, cid, csecret, code, code_verifier, redirect_uri, client,
+        metadata,
+        cid,
+        csecret,
+        code,
+        code_verifier,
+        redirect_uri,
+        client,
         resource=server_url,
     )
     data = _token_response_to_data(raw, metadata, cid, csecret)

{mcp_stdio-0.3.0 → mcp_stdio-0.3.2}/src/mcp_stdio/relay.py

@@ -38,25 +38,6 @@ def _error_response(message: str, req_id: Any = None) -> str:
     )
 
 
-def send_request(
-    client: httpx.Client,
-    url: str,
-    content: str,
-    headers: dict[str, str],
-) -> httpx.Response:
-    """Send a request with retry on transient errors."""
-    last_error: Exception | None = None
-    for attempt in range(1, MAX_RETRIES + 1):
-        try:
-            return client.post(url, content=content, headers=headers)
-        except (httpx.ConnectError, httpx.ReadTimeout, httpx.WriteTimeout) as e:
-            last_error = e
-            log(f"attempt {attempt}/{MAX_RETRIES} failed: {e}")
-            if attempt < MAX_RETRIES:
-                time.sleep(RETRY_DELAY * attempt)
-    raise last_error  # type: ignore[misc]
-
-
 class _StreamResult:
     """Result of a streaming request."""
 
@@ -281,9 +262,7 @@ def run(
                     req_headers = dict(headers)
                     if session_id:
                         req_headers["Mcp-Session-Id"] = session_id
-                    result = _post_and_stream(
-                        client, url, line, req_headers, req_id
-                    )
+                    result = _post_and_stream(client, url, line, req_headers, req_id)
                     if result is None:
                         continue
                 else:

{mcp_stdio-0.3.0 → mcp_stdio-0.3.2}/src/mcp_stdio/token_store.py

@@ -5,14 +5,18 @@ from __future__ import annotations
 import json
 import os
 import stat
-from dataclasses import asdict, dataclass, field
+from dataclasses import asdict, dataclass
 from pathlib import Path
 from typing import Any
 
 
-_STORE_DIR = Path.home() / ".mcp-stdio"
+_STORE_DIR = Path.home() / ".config" / "mcp-stdio"
 _STORE_FILE = _STORE_DIR / "tokens.json"
 
+# Legacy path (v0.3.0 and earlier)
+_LEGACY_STORE_DIR = Path.home() / ".mcp-stdio"
+_LEGACY_STORE_FILE = _LEGACY_STORE_DIR / "tokens.json"
+
 
 @dataclass
 class TokenData:
@@ -37,8 +41,27 @@ def _ensure_store_dir() -> None:
     _STORE_DIR.mkdir(mode=0o700, parents=True, exist_ok=True)
 
 
+def _migrate_legacy_store() -> None:
+    """Migrate tokens from ~/.mcp-stdio/ to ~/.config/mcp-stdio/ if needed."""
+    if not _LEGACY_STORE_FILE.exists():
+        return
+    if _STORE_FILE.exists():
+        # New file already exists — just remove legacy
+        _LEGACY_STORE_FILE.unlink()
+    else:
+        _ensure_store_dir()
+        _LEGACY_STORE_FILE.rename(_STORE_FILE)
+        os.chmod(_STORE_FILE, stat.S_IRUSR | stat.S_IWUSR)
+    # Remove legacy directory if empty
+    try:
+        _LEGACY_STORE_DIR.rmdir()
+    except OSError:
+        pass  # Not empty or already gone
+
+
 def _read_store() -> dict[str, Any]:
     """Read the token store file."""
+    _migrate_legacy_store()
     if not _STORE_FILE.exists():
         return {}
     try:
@@ -48,10 +71,29 @@ def _read_store() -> dict[str, Any]:
 
 
 def _write_store(data: dict[str, Any]) -> None:
-    """Write the token store file with secure permissions."""
+    """Write the token store file atomically with secure permissions.
+
+    Uses a temp file created with 0o600 from the start (no umask window),
+    then atomically renames it over the target file so a crash mid-write
+    cannot corrupt existing tokens.
+    """
     _ensure_store_dir()
-    _STORE_FILE.write_text(json.dumps(data, indent=2))
-    os.chmod(_STORE_FILE, stat.S_IRUSR | stat.S_IWUSR)  # 0o600
+    payload = json.dumps(data, indent=2).encode("utf-8")
+    tmp_path = _STORE_FILE.with_suffix(_STORE_FILE.suffix + f".tmp.{os.getpid()}")
+    flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
+    fd = os.open(tmp_path, flags, stat.S_IRUSR | stat.S_IWUSR)  # 0o600
+    try:
+        with os.fdopen(fd, "wb") as f:
+            f.write(payload)
+            f.flush()
+            os.fsync(f.fileno())
+        os.replace(tmp_path, _STORE_FILE)
+    except Exception:
+        try:
+            tmp_path.unlink()
+        except OSError:
+            pass
+        raise
 
 
 def load_token(server_url: str) -> TokenData | None:

{mcp_stdio-0.3.0 → mcp_stdio-0.3.2}/tests/test_cli.py

@@ -1,6 +1,5 @@
 """Tests for mcp_stdio.cli module."""
 
-import sys
 from unittest.mock import patch
 
 import pytest
@@ -45,15 +44,27 @@ class TestMain:
             assert exc_info.value.code == 2
 
     def test_headers_and_bearer_token(self):
-        with patch("sys.argv", [
-            "mcp-stdio",
-            "https://example.com/mcp",
-            "--bearer-token", "tok123",
-            "-H", "X-Custom: val",
-        ]), patch("mcp_stdio.cli.run") as mock_run:
+        with (
+            patch(
+                "sys.argv",
+                [
+                    "mcp-stdio",
+                    "https://example.com/mcp",
+                    "--bearer-token",
+                    "tok123",
+                    "-H",
+                    "X-Custom: val",
+                ],
+            ),
+            patch("mcp_stdio.cli.run") as mock_run,
+        ):
             main()
             call_kwargs = mock_run.call_args
-            headers = call_kwargs.kwargs["headers"] if call_kwargs.kwargs else call_kwargs[1]["headers"]
+            headers = (
+                call_kwargs.kwargs["headers"]
+                if call_kwargs.kwargs
+                else call_kwargs[1]["headers"]
+            )
             # If called positionally
             if not headers:
                 headers = call_kwargs[0][1]
@@ -62,31 +73,49 @@ class TestMain:
 
     def test_bearer_token_from_env(self, monkeypatch):
         monkeypatch.setenv("MCP_BEARER_TOKEN", "env-token")
-        with patch("sys.argv", ["mcp-stdio", "https://example.com/mcp"]), \
-             patch("mcp_stdio.cli.run") as mock_run:
+        with (
+            patch("sys.argv", ["mcp-stdio", "https://example.com/mcp"]),
+            patch("mcp_stdio.cli.run") as mock_run,
+        ):
             main()
-            headers = mock_run.call_args[1]["headers"] if mock_run.call_args[1] else mock_run.call_args[0][1]
+            headers = (
+                mock_run.call_args[1]["headers"]
+                if mock_run.call_args[1]
+                else mock_run.call_args[0][1]
+            )
             assert headers["Authorization"] == "Bearer env-token"
 
     def test_custom_timeouts(self):
-        with patch("sys.argv", [
-            "mcp-stdio",
-            "https://example.com/mcp",
-            "--timeout-connect", "5",
-            "--timeout-read", "60",
-        ]), patch("mcp_stdio.cli.run") as mock_run:
+        with (
+            patch(
+                "sys.argv",
+                [
+                    "mcp-stdio",
+                    "https://example.com/mcp",
+                    "--timeout-connect",
+                    "5",
+                    "--timeout-read",
+                    "60",
+                ],
+            ),
+            patch("mcp_stdio.cli.run") as mock_run,
+        ):
             main()
             kwargs = mock_run.call_args
             assert kwargs.kwargs["timeout_connect"] == 5.0
             assert kwargs.kwargs["timeout_read"] == 60.0
 
     def test_oauth_and_bearer_token_mutually_exclusive(self):
-        with patch("sys.argv", [
-            "mcp-stdio",
-            "https://example.com/mcp",
-            "--oauth",
-            "--bearer-token", "tok",
-        ]):
+        with patch(
+            "sys.argv",
+            [
+                "mcp-stdio",
+                "https://example.com/mcp",
+                "--oauth",
+                "--bearer-token",
+                "tok",
+            ],
+        ):
             with pytest.raises(SystemExit) as exc_info:
                 main()
             assert exc_info.value.code == 1