mcp2cli 2.6.0__tar.gz → 2.7.0__tar.gz

{mcp2cli-2.6.0 → mcp2cli-2.7.0}/PKG-INFO

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

{mcp2cli-2.6.0 → mcp2cli-2.7.0}/pyproject.toml

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

{mcp2cli-2.6.0 → mcp2cli-2.7.0}/src/mcp2cli/__init__.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-__version__ = "2.6.0"
+__version__ = "2.7.0"
 
 import argparse
 import copy
@@ -481,6 +481,7 @@ def build_oauth_provider(
     *,
     client_id: str | None = None,
     client_secret: str | None = None,
+    client_name: str = "mcp2cli",
     scope: str | None = None,
     redirect_uri: str | None = None,
     flow: str = "auto",
@@ -559,6 +560,7 @@ def build_oauth_provider(
         redirect_uri = f"http://127.0.0.1:{port}/callback"
 
     client_metadata = OAuthClientMetadata(
+        client_name=client_name,
         redirect_uris=[redirect_uri],
         grant_types=["authorization_code", "refresh_token"],
         response_types=["code"],
@@ -1481,6 +1483,8 @@ def _baked_to_argv(config: dict) -> list[str]:
         argv += ["--oauth-client-id", config["oauth_client_id"]]
     if config.get("oauth_client_secret"):
         argv += ["--oauth-client-secret", config["oauth_client_secret"]]
+    if config.get("oauth_client_name") and config["oauth_client_name"] != "mcp2cli":
+        argv += ["--oauth-client-name", config["oauth_client_name"]]
     if config.get("oauth_scope"):
         argv += ["--oauth-scope", config["oauth_scope"]]
     if config.get("oauth_redirect_uri"):
@@ -1499,9 +1503,17 @@ _BAKE_NAME_RE = re.compile(r"^[a-z][a-z0-9-]*$")
 
 def _handle_bake(argv: list[str]) -> None:
     """Dispatch bake subcommands."""
-    if not argv:
-        print("Usage: mcp2cli bake <create|list|show|remove|update|install> ...")
-        sys.exit(1)
+    if not argv or argv[0] in ("-h", "--help"):
+        print("Usage: mcp2cli bake <command> [options]\n")
+        print("Commands:")
+        print("  create    Save connection settings as a named baked tool")
+        print("  list      List all baked tools")
+        print("  show      Show config for a baked tool (secrets masked)")
+        print("  remove    Delete a baked tool")
+        print("  update    Update settings on an existing baked tool")
+        print("  install   Create a ~/.local/bin wrapper script")
+        print("\nRun 'mcp2cli bake <command> --help' for command-specific help.")
+        sys.exit(0 if argv else 1)
     sub = argv[0]
     rest = argv[1:]
     dispatch = {
@@ -1533,6 +1545,7 @@ def _bake_create(argv: list[str]) -> None:
     p.add_argument("--oauth", action="store_true")
     p.add_argument("--oauth-client-id", default=None)
     p.add_argument("--oauth-client-secret", default=None)
+    p.add_argument("--oauth-client-name", default="mcp2cli")
     p.add_argument("--oauth-scope", default=None)
     p.add_argument("--oauth-redirect-uri", default=None, metavar="URI")
     p.add_argument(
@@ -1598,6 +1611,7 @@ def _bake_create(argv: list[str]) -> None:
         "oauth": args.oauth,
         "oauth_client_id": args.oauth_client_id,
         "oauth_client_secret": args.oauth_client_secret,
+        "oauth_client_name": args.oauth_client_name,
         "oauth_scope": args.oauth_scope,
         "oauth_redirect_uri": args.oauth_redirect_uri,
         "oauth_flow": args.oauth_flow,
@@ -3068,7 +3082,19 @@ def main():
 
 def _build_main_parser() -> argparse.ArgumentParser:
     """Build the global ArgumentParser for _main_impl."""
-    pre = argparse.ArgumentParser(add_help=False, allow_abbrev=False)
+    pre = argparse.ArgumentParser(
+        add_help=False,
+        allow_abbrev=False,
+        epilog=(
+            "subcommands:\n"
+            "  bake                Manage baked tool configurations\n"
+            "                      (create, list, show, remove, update, install)\n"
+            "  @<name>             Run a previously baked tool\n"
+            "\n"
+            "Run 'mcp2cli bake --help' for bake subcommand details."
+        ),
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+    )
     pre.add_argument("--spec", default=None, help="OpenAPI spec URL or file path")
     pre.add_argument("--mcp", default=None, help="MCP server URL (HTTP/SSE)")
     pre.add_argument("--mcp-stdio", default=None, help="MCP server command (stdio)")
@@ -3161,6 +3187,12 @@ def _build_main_parser() -> argparse.ArgumentParser:
         default=None,
         help="OAuth client secret — supports env:VAR and file:/path prefixes",
     )
+    pre.add_argument(
+        "--oauth-client-name",
+        default="mcp2cli",
+        help="Client name sent during OAuth Dynamic Client Registration (default: mcp2cli). "
+             "Some servers require a specific client name for DCR to succeed.",
+    )
     pre.add_argument(
         "--oauth-scope",
         default=None,
@@ -3309,6 +3341,7 @@ def _setup_oauth(pre_args):
         server_url,
         client_id=client_id,
         client_secret=client_secret,
+        client_name=getattr(pre_args, "oauth_client_name", "mcp2cli"),
         scope=pre_args.oauth_scope,
         redirect_uri=pre_args.oauth_redirect_uri,
         flow=flow,