mcp2cli 3.8.0__tar.gz → 3.8.1__tar.gz

{mcp2cli-3.8.0 → mcp2cli-3.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp2cli
-Version: 3.8.0
+Version: 3.8.1
 Summary: Turn any MCP server or OpenAPI spec into a CLI
 Author: Stephan Fitzpatrick
 Author-email: Stephan Fitzpatrick <stephan@knowsuchagency.com>
@@ -217,7 +217,7 @@ mcp2cli --graphql https://api.example.com/graphql users --limit 10
 mcp2cli --graphql https://api.example.com/graphql create-user --name "Alice" --email "alice@example.com"
 
 # Override auto-generated selection set fields
-mcp2cli --graphql https://api.example.com/graphql users --fields "id name email"
+mcp2cli --graphql https://api.example.com/graphql --fields "id name email" users
 
 # With auth
 mcp2cli --graphql https://api.example.com/graphql --auth-header "Authorization:Bearer tok_..." users
@@ -322,7 +322,7 @@ mcp2cli --spec ./spec.json --pretty list-pets
 mcp2cli --spec ./spec.json --raw get-data
 
 # Truncate large responses to first N records
-mcp2cli --spec ./spec.json list-records --head 5
+mcp2cli --spec ./spec.json --head 5 list-records
 
 # Pipe-friendly (compact JSON when not a TTY)
 mcp2cli --spec ./spec.json list-pets | jq '.[] | .name'

{mcp2cli-3.8.0 → mcp2cli-3.8.1}/README.md

@@ -198,7 +198,7 @@ mcp2cli --graphql https://api.example.com/graphql users --limit 10
 mcp2cli --graphql https://api.example.com/graphql create-user --name "Alice" --email "alice@example.com"
 
 # Override auto-generated selection set fields
-mcp2cli --graphql https://api.example.com/graphql users --fields "id name email"
+mcp2cli --graphql https://api.example.com/graphql --fields "id name email" users
 
 # With auth
 mcp2cli --graphql https://api.example.com/graphql --auth-header "Authorization:Bearer tok_..." users
@@ -303,7 +303,7 @@ mcp2cli --spec ./spec.json --pretty list-pets
 mcp2cli --spec ./spec.json --raw get-data
 
 # Truncate large responses to first N records
-mcp2cli --spec ./spec.json list-records --head 5
+mcp2cli --spec ./spec.json --head 5 list-records
 
 # Pipe-friendly (compact JSON when not a TTY)
 mcp2cli --spec ./spec.json list-pets | jq '.[] | .name'

{mcp2cli-3.8.0 → mcp2cli-3.8.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcp2cli"
-version = "3.8.0"
+version = "3.8.1"
 description = "Turn any MCP server or OpenAPI spec into a CLI"
 readme = "README.md"
 license = "MIT"

{mcp2cli-3.8.0 → mcp2cli-3.8.1}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "mcp2cli"
-version = "3.8.0"
+version = "3.8.1"
 description = "Turn any MCP server or OpenAPI spec into a CLI"
 readme = "README.md"
 license = "MIT"

{mcp2cli-3.8.0 → mcp2cli-3.8.1}/src/mcp2cli/__init__.py

@@ -24,7 +24,7 @@ import tempfile
 import threading
 import time
 import webbrowser
-from contextlib import asynccontextmanager
+from contextlib import asynccontextmanager, suppress
 from dataclasses import dataclass, field
 from http.server import HTTPServer, BaseHTTPRequestHandler
 from pathlib import Path
@@ -58,7 +58,7 @@ ARGPARSE_HELP_PERCENT_RE = re.compile(r"(?<!%)%(?![%\(])")
 class ParamDef:
     name: str  # kebab-case CLI flag
     original_name: str  # original name for API/tool call
-    python_type: type | None  # None means boolean (store_true)
+    python_type: type | None  # None means boolean (--flag / --no-flag)
     required: bool = False
     description: str = ""
     choices: list | None = None
@@ -1833,7 +1833,11 @@ def extract_openapi_commands(spec: dict) -> list[CommandDef]:
                     location=param.get("in", "query"),
                     schema=schema,
                     style=param.get("style"),
-                    explode=param.get("explode", False),
+                    explode=param.get(
+                        "explode",
+                        param.get("in", "query") == "query"
+                        and param.get("style", "form") == "form",
+                    ),
                 )
                 params.append(p)
 
@@ -2103,7 +2107,7 @@ def graphql_type_to_python(
         "ID": str,
         "Int": int,
         "Float": float,
-        "Boolean": None,  # store_true
+        "Boolean": None,  # boolean flag
     }
     py_type = scalar_map.get(type_name, str)
     return py_type, is_non_null, None
@@ -3043,13 +3047,18 @@ def build_argparse(
                 "are merged in (a conflicting value is an error)",
             )
 
+        cli_names = {p.cli_name or p.name for p in cmd.params}
         for p in cmd.params:
             flag = f"--{p.cli_name or p.name}"
             kwargs: dict = {}
             if p.python_type is not None:
                 kwargs["type"] = p.python_type
-            else:
+            elif f"no-{p.cli_name or p.name}" in cli_names:
+                # Another parameter already owns --no-<name>; keep the plain switch.
                 kwargs["action"] = "store_true"
+            else:
+                # --<name> sends true, --no-<name> sends false, omitted sends nothing.
+                kwargs["action"] = argparse.BooleanOptionalAction
             # Body/tool_input params are never argparse-required (--stdin bypasses them)
             if (
                 p.required
@@ -3283,6 +3292,30 @@ def _collect_openapi_params(
     return path, query_params, extra_headers, body, files
 
 
+def _serialize_openapi_query_params(cmd: CommandDef, query_params: dict) -> str:
+    """Encode query array atoms before joining their OpenAPI delimiters."""
+    parameters = {p.original_name: p for p in cmd.params if p.location == "query"}
+    parts = []
+    for name, value in query_params.items():
+        param = parameters[name]
+        separator = {"form": ",", "spaceDelimited": "%20", "pipeDelimited": "%7C"}.get(
+            param.style or "form"
+        )
+        if isinstance(value, list) and not param.explode and separator is not None:
+            if not value:
+                continue
+            atoms = [
+                quote(str(item).lower() if isinstance(item, bool) else str(item), safe="")
+                for item in value
+                if item is not None
+            ]
+            if atoms:
+                parts.append(f"{quote(name, safe='')}={separator.join(atoms)}")
+        else:
+            parts.append(str(httpx.QueryParams({name: value})))
+    return "&".join(part for part in parts if part)
+
+
 def execute_openapi(
     args: argparse.Namespace,
     cmd: CommandDef,
@@ -3297,6 +3330,14 @@ def execute_openapi(
 ):
     path, query_params, extra_headers, body, files = _collect_openapi_params(cmd, args)
     url = base_url.rstrip("/") + path
+    if query_params:
+        # Append to, rather than replace, any query string the spec path or
+        # base URL already carries (e.g. `/search?type=user`).
+        parsed = httpx.URL(url)
+        query = _serialize_openapi_query_params(cmd, query_params).encode("ascii")
+        if parsed.query:
+            query = parsed.query + b"&" + query
+        url = parsed.copy_with(query=query)
 
     is_multipart = files is not None or cmd.content_type == "multipart/form-data"
     headers = _build_http_headers(auth_headers, multipart=is_multipart)
@@ -3309,7 +3350,6 @@ def execute_openapi(
                     (cmd.method or "get").upper(),
                     url,
                     headers=headers,
-                    params=query_params or None,
                     data=body,
                     files=files,
                 )
@@ -3318,7 +3358,6 @@ def execute_openapi(
                     (cmd.method or "get").upper(),
                     url,
                     headers=headers,
-                    params=query_params or None,
                     data=body,
                 )
             else:
@@ -3326,7 +3365,6 @@ def execute_openapi(
                     (cmd.method or "get").upper(),
                     url,
                     headers=headers,
-                    params=query_params or None,
                     json=body,
                 )
             _handle_http_error(resp)
@@ -4045,7 +4083,7 @@ def session_start(
         _session_sock_path(name).unlink(missing_ok=True)
 
     # Spawn daemon
-    daemon_script = json.dumps(
+    daemon_config = json.dumps(
         {
             "name": name,
             "source": source,
@@ -4067,17 +4105,24 @@ def session_start(
             [
                 sys.executable,
                 "-c",
-                f"import mcp2cli; mcp2cli._run_session_daemon({json.dumps(daemon_script)})",
+                (
+                    "import sys; config = sys.stdin.read(); "
+                    "import mcp2cli; mcp2cli._run_session_daemon(config)"
+                ),
             ],
             start_new_session=True,
             stdout=log_file,
             stderr=log_file,
             stdin=subprocess.PIPE,
         )
-    # The daemon never reads stdin; closing the write end hands it EOF and
-    # leaves no descriptor behind in the parent.
+    # Keep resolved headers, environment values and source URLs out of argv.
+    # Read before importing mcp2cli so a large config cannot block our write
+    # during slow imports, before the startup timeout below takes effect.
+    # Closing the pipe completes the daemon's read and releases our descriptor.
     if proc.stdin is not None:
-        proc.stdin.close()
+        # An early exit can break either write or close; report it below.
+        with suppress(BrokenPipeError), proc.stdin:
+            proc.stdin.write(daemon_config.encode("utf-8"))
 
     # Wait for socket to appear
     sock_path = _session_sock_path(name)