mcp2cli 2.4.2__tar.gz → 2.5.0__tar.gz

{mcp2cli-2.4.2 → mcp2cli-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp2cli
-Version: 2.4.2
+Version: 2.5.0
 Summary: Turn any MCP server or OpenAPI spec into a CLI
 Author: Stephan Fitzpatrick
 Author-email: Stephan Fitzpatrick <stephan@knowsuchagency.com>

{mcp2cli-2.4.2 → mcp2cli-2.5.0}/pyproject.toml

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

{mcp2cli-2.4.2 → mcp2cli-2.5.0}/src/mcp2cli/__init__.py

@@ -466,11 +466,18 @@ def build_oauth_provider(
     client_id: str | None = None,
     client_secret: str | None = None,
     scope: str | None = None,
+    redirect_uri: str | None = None,
 ) -> "httpx.Auth":
     """Build an OAuth provider for HTTP connections.
 
-    If client_id and client_secret are provided, uses client credentials flow.
-    Otherwise, uses authorization code + PKCE with a local callback server.
+    - client_id + client_secret  → client credentials flow (machine-to-machine).
+    - client_id only             → authorization code + PKCE, pre-configured client
+                                   (no dynamic client registration).
+    - neither                    → authorization code + PKCE with dynamic client
+                                   registration.
+
+    redirect_uri controls the full callback URL (scheme, host, port, path).
+    When None, defaults to http://127.0.0.1:<random-free-port>/callback.
     """
     storage = FileTokenStorage(server_url)
 
@@ -488,10 +495,39 @@ def build_oauth_provider(
         )
 
     from mcp.client.auth.oauth2 import OAuthClientProvider
-    from mcp.shared.auth import OAuthClientMetadata
+    from mcp.shared.auth import OAuthClientInformationFull, OAuthClientMetadata
+
+    _LOOPBACK_HOSTS = {"localhost", "127.0.0.1", "::1"}
 
-    port = _find_free_port()
-    redirect_uri = f"http://127.0.0.1:{port}/callback"
+    if redirect_uri is not None:
+        parsed = urlparse(redirect_uri)
+        if parsed.scheme != "http":
+            print(
+                f"Error: --oauth-redirect-uri must use http://, got '{parsed.scheme}://'. "
+                "The local callback server is plain HTTP; use http://<host>:<port>/path.",
+                file=sys.stderr,
+            )
+            sys.exit(1)
+        if parsed.port is None:
+            print(
+                "Error: --oauth-redirect-uri must include an explicit port number "
+                "(e.g. http://localhost:3334/oauth/callback).",
+                file=sys.stderr,
+            )
+            sys.exit(1)
+        if (parsed.hostname or "") not in _LOOPBACK_HOSTS:
+            print(
+                f"Error: --oauth-redirect-uri host must be a loopback address "
+                f"(localhost, 127.0.0.1, or ::1), got '{parsed.hostname}'.",
+                file=sys.stderr,
+            )
+            sys.exit(1)
+        callback_host = parsed.hostname
+        port = parsed.port
+    else:
+        port = _find_free_port()
+        callback_host = "127.0.0.1"
+        redirect_uri = f"http://127.0.0.1:{port}/callback"
 
     client_metadata = OAuthClientMetadata(
         redirect_uris=[redirect_uri],
@@ -500,13 +536,36 @@ def build_oauth_provider(
         scope=scope,
     )
 
+    if client_id:
+        # Pre-seed storage with the caller-supplied client_id so the OAuth
+        # provider skips dynamic client registration entirely.  The write is
+        # synchronous (plain file I/O) so no async context is needed here.
+        pre_client_info = OAuthClientInformationFull(
+            client_id=client_id,
+            client_secret=None,
+            token_endpoint_auth_method="none",
+            redirect_uris=[redirect_uri],
+            grant_types=["authorization_code", "refresh_token"],
+            response_types=["code"],
+            scope=scope,
+        )
+        storage._client_path.write_text(pre_client_info.model_dump_json())
+
     # Reset callback handler state
     _CallbackHandler.auth_code = None
     _CallbackHandler.state = None
     _CallbackHandler.error = None
     _CallbackHandler.done = threading.Event()
 
-    server = HTTPServer(("127.0.0.1", port), _CallbackHandler)
+    if callback_host == "::1":
+        import socket as _socket
+
+        class _IPv6HTTPServer(HTTPServer):
+            address_family = _socket.AF_INET6
+
+        server = _IPv6HTTPServer((callback_host, port), _CallbackHandler)
+    else:
+        server = HTTPServer((callback_host, port), _CallbackHandler)
 
     async def redirect_handler(auth_url: str) -> None:
         print(f"Opening browser for authorization...", file=sys.stderr)
@@ -1102,8 +1161,28 @@ def extract_graphql_commands(schema: dict) -> list[CommandDef]:
     return commands
 
 
-def list_graphql_commands(commands: list[CommandDef]):
+def _truncate_description(description: str, max_len: int) -> str:
+    """Truncate at a word boundary and append '...'."""
+    if len(description) <= max_len:
+        return description
+    return description[:max_len].rsplit(" ", 1)[0].rstrip() + "..."
+
+
+def _wrap_description(description: str, indent: int, total_width: int = 110) -> str:
+    """Wrap long descriptions; indent continuation lines to align with description column."""
+    import textwrap
+    return textwrap.fill(
+        description,
+        width=total_width,
+        subsequent_indent=" " * indent,
+        break_long_words=False,
+        break_on_hyphens=False,
+    )
+
+
+def list_graphql_commands(commands: list[CommandDef], verbose: bool = False):
     """Group commands by operation type and print."""
+
     groups: dict[str, list[CommandDef]] = {}
     for cmd in commands:
         key = cmd.graphql_operation_type or "other"
@@ -1116,7 +1195,14 @@ def list_graphql_commands(commands: list[CommandDef]):
         label = "queries" if group == "query" else "mutations"
         print(f"\n{label}:")
         for cmd in cmds:
-            desc = f"  {cmd.description[:60]}" if cmd.description else ""
+            if cmd.description:
+                if verbose:
+                    wrapped = _wrap_description(cmd.description, indent=42, total_width=100)
+                    desc = f"  {wrapped}"
+                else:
+                    desc = f"  {_truncate_description(cmd.description, 60)}"
+            else:
+                desc = ""
             print(f"  {cmd.name:<40}{desc}")
 
 
@@ -1232,18 +1318,19 @@ def handle_graphql(
     oauth_provider: "httpx.Auth | None" = None,
     jq_expr: str | None = None,
     head: int | None = None,
+    verbose: bool = False,
 ):
     """Top-level handler for --graphql mode."""
     schema = load_graphql_schema(url, auth_headers, cache_key, ttl, refresh, oauth_provider=oauth_provider)
     commands = extract_graphql_commands(schema)
 
     if list_mode:
-        list_graphql_commands(commands)
+        list_graphql_commands(commands, verbose=verbose)
         return
 
     if not remaining:
         print("Available operations:")
-        list_graphql_commands(commands)
+        list_graphql_commands(commands, verbose=verbose)
         print("\nUse --list for the same output, or provide a subcommand.")
         return
 
@@ -1353,6 +1440,8 @@ def _baked_to_argv(config: dict) -> list[str]:
         argv += ["--oauth-client-secret", config["oauth_client_secret"]]
     if config.get("oauth_scope"):
         argv += ["--oauth-scope", config["oauth_scope"]]
+    if config.get("oauth_redirect_uri"):
+        argv += ["--oauth-redirect-uri", config["oauth_redirect_uri"]]
     return argv
 
 
@@ -1400,6 +1489,7 @@ def _bake_create(argv: list[str]) -> None:
     p.add_argument("--oauth-client-id", default=None)
     p.add_argument("--oauth-client-secret", default=None)
     p.add_argument("--oauth-scope", default=None)
+    p.add_argument("--oauth-redirect-uri", default=None, metavar="URI")
     p.add_argument("--include", default="", help="Comma-separated include globs")
     p.add_argument("--exclude", default="", help="Comma-separated exclude globs")
     p.add_argument("--methods", default="", help="Comma-separated HTTP methods")
@@ -1453,6 +1543,7 @@ def _bake_create(argv: list[str]) -> None:
         "oauth_client_id": args.oauth_client_id,
         "oauth_client_secret": args.oauth_client_secret,
         "oauth_scope": args.oauth_scope,
+        "oauth_redirect_uri": args.oauth_redirect_uri,
         "include": [x.strip() for x in args.include.split(",") if x.strip()],
         "exclude": [x.strip() for x in args.exclude.split(",") if x.strip()],
         "methods": [x.strip().upper() for x in args.methods.split(",") if x.strip()],
@@ -1658,7 +1749,7 @@ def build_argparse(
 # ---------------------------------------------------------------------------
 
 
-def list_openapi_commands(commands: list[CommandDef]):
+def list_openapi_commands(commands: list[CommandDef], verbose: bool = False):
     groups: dict[str, list[CommandDef]] = {}
     for cmd in commands:
         prefix = cmd.name.split("-", 1)[0] if "-" in cmd.name else "other"
@@ -1670,13 +1761,24 @@ def list_openapi_commands(commands: list[CommandDef]):
             method = (cmd.method or "").upper()
             line = f"  {cmd.name:<45} {method:<6}"
             if cmd.description:
-                line += f" {cmd.description[:60]}"
+                if verbose:
+                    wrapped = _wrap_description(cmd.description, indent=54, total_width=110)
+                    line += f" {wrapped}"
+                else:
+                    line += f" {_truncate_description(cmd.description, 60)}"
             print(line)
 
 
-def list_mcp_commands(commands: list[CommandDef]):
+def list_mcp_commands(commands: list[CommandDef], verbose: bool = False):
     for cmd in commands:
-        desc = f"  {cmd.description[:70]}" if cmd.description else ""
+        if cmd.description:
+            if verbose:
+                wrapped = _wrap_description(cmd.description, indent=42, total_width=110)
+                desc = f"  {wrapped}"
+            else:
+                desc = f"  {_truncate_description(cmd.description, 70)}"
+        else:
+            desc = ""
         print(f"  {cmd.name:<40}{desc}")
 
 
@@ -1856,6 +1958,7 @@ def run_mcp_http(
     search_pattern: str | None = None,
     jq_expr: str | None = None,
     head: int | None = None,
+    verbose: bool = False,
 ):
     extra = dict(
         resource_action=resource_action,
@@ -1866,6 +1969,7 @@ def run_mcp_http(
         search_pattern=search_pattern,
         jq_expr=jq_expr,
         head=head,
+        verbose=verbose,
     )
 
     async def _run():
@@ -1951,6 +2055,7 @@ def run_mcp_stdio(
     search_pattern: str | None = None,
     jq_expr: str | None = None,
     head: int | None = None,
+    verbose: bool = False,
 ):
     extra = dict(
         resource_action=resource_action,
@@ -1961,6 +2066,7 @@ def run_mcp_stdio(
         search_pattern=search_pattern,
         jq_expr=jq_expr,
         head=head,
+        verbose=verbose,
     )
 
     import anyio
@@ -2012,6 +2118,7 @@ async def _mcp_session(
     search_pattern: str | None = None,
     jq_expr: str | None = None,
     head: int | None = None,
+    verbose: bool = False,
 ):
     # Handle resource operations
     if resource_action:
@@ -2048,7 +2155,7 @@ async def _mcp_session(
             print(f"\nTools matching '{search_pattern}':")
         else:
             print("\nAvailable tools:")
-        list_mcp_commands(commands)
+        list_mcp_commands(commands, verbose=verbose)
         return
 
     if tool_name is None:
@@ -2666,6 +2773,7 @@ def handle_mcp(
     bake_config: BakeConfig | None = None,
     jq_expr: str | None = None,
     head: int | None = None,
+    verbose: bool = False,
 ):
     key = cache_key_override or cache_key_for(source)
 
@@ -2700,7 +2808,7 @@ def handle_mcp(
                 commands, bake_config.include, bake_config.exclude, bake_config.methods,
             )
             print("\nAvailable tools:")
-            list_mcp_commands(commands)
+            list_mcp_commands(commands, verbose=verbose)
             return
         _dispatch_mcp_call(
             source, is_stdio, auth_headers, env_vars,
@@ -2708,6 +2816,7 @@ def handle_mcp(
             toon=toon, transport=transport, oauth_provider=oauth_provider,
             search_pattern=search_pattern,
             jq_expr=jq_expr, head=head,
+            verbose=verbose,
         )
         return
 
@@ -2725,7 +2834,7 @@ def handle_mcp(
 
     if not remaining:
         print("Available tools:")
-        list_mcp_commands(commands)
+        list_mcp_commands(commands, verbose=verbose)
         print("\nUse --list for the same output, or provide a subcommand.")
         return
 
@@ -2923,6 +3032,12 @@ def _build_main_parser() -> argparse.ArgumentParser:
         metavar="PATTERN",
         help="Search tools by name or description (case-insensitive substring match)",
     )
+    pre.add_argument(
+        "--verbose",
+        action="store_true",
+        dest="verbose",
+        help="Show full tool descriptions in --list output, wrapped to terminal width (default: truncated with ...)",
+    )
     pre.add_argument("--pretty", action="store_true", help="Pretty-print JSON output")
     pre.add_argument("--raw", action="store_true", help="Print raw response body")
     pre.add_argument(
@@ -2985,6 +3100,13 @@ def _build_main_parser() -> argparse.ArgumentParser:
         default=None,
         help="OAuth scope(s) to request",
     )
+    pre.add_argument(
+        "--oauth-redirect-uri",
+        default=None,
+        metavar="URI",
+        help="Full redirect URI for the OAuth callback (e.g. http://localhost:3334/oauth/callback). "
+             "Overrides the default http://127.0.0.1:<random-port>/callback.",
+    )
     # Resource flags
     pre.add_argument(
         "--list-resources", action="store_true", help="List available resources"
@@ -3066,12 +3188,6 @@ def _setup_oauth(pre_args):
     if not use_oauth:
         return None
 
-    if pre_args.oauth_client_id and not pre_args.oauth_client_secret:
-        print(
-            "Error: --oauth-client-secret is required with --oauth-client-id",
-            file=sys.stderr,
-        )
-        sys.exit(1)
     if pre_args.oauth_client_secret and not pre_args.oauth_client_id:
         print(
             "Error: --oauth-client-id is required with --oauth-client-secret",
@@ -3109,6 +3225,7 @@ def _setup_oauth(pre_args):
         client_id=client_id,
         client_secret=client_secret,
         scope=pre_args.oauth_scope,
+        redirect_uri=pre_args.oauth_redirect_uri,
     )
 
 
@@ -3221,7 +3338,7 @@ def _handle_session_operations(
             print(f"\nTools matching '{search_pattern}':")
         else:
             print("\nAvailable tools:")
-        list_mcp_commands(commands)
+        list_mcp_commands(commands, verbose=pre_args.verbose)
         return True
 
     # Tool call via session
@@ -3229,7 +3346,7 @@ def _handle_session_operations(
         result = _session_request(sess_name, "list_tools")
         commands = extract_mcp_commands(result)
         print("Available tools:")
-        list_mcp_commands(commands)
+        list_mcp_commands(commands, verbose=pre_args.verbose)
         print("\nUse --list for the same output, or provide a subcommand.")
         return True
 
@@ -3326,7 +3443,7 @@ def _handle_openapi_mode(
                 print(f"\nNo tools matching '{search_pattern}'.")
                 return
             print(f"\nTools matching '{search_pattern}':")
-        list_openapi_commands(commands)
+        list_openapi_commands(commands, verbose=pre_args.verbose)
         return
 
     if not remaining:
@@ -3428,6 +3545,7 @@ def _main_impl(argv: list[str], bake_config: BakeConfig | None = None):
             oauth_provider=oauth_provider,
             jq_expr=pre_args.jq,
             head=pre_args.head,
+            verbose=pre_args.verbose,
         )
         return
 
@@ -3459,6 +3577,7 @@ def _main_impl(argv: list[str], bake_config: BakeConfig | None = None):
             bake_config=bake_config,
             jq_expr=pre_args.jq,
             head=pre_args.head,
+            verbose=pre_args.verbose,
         )
         return