mcp-cli-skill 0.8.1__tar.gz → 0.8.2__tar.gz

{mcp_cli_skill-0.8.1 → mcp_cli_skill-0.8.2}/.github/workflows/publish.yml

@@ -14,8 +14,8 @@ jobs:
       matrix:
         python: ["3.10", "3.13"]
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
       - run: python -m unittest discover tests -v
@@ -28,8 +28,8 @@ jobs:
     permissions:
       id-token: write  # PyPI Trusted Publishing
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.13"
       - name: Tag must match __version__

{mcp_cli_skill-0.8.1 → mcp_cli_skill-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: mcp-cli-skill
-Version: 0.8.1
+Version: 0.8.2
 Summary: Call any MCP server tool from the command line with shell composition support
 Project-URL: Homepage, https://github.com/wise-toddler/mcp-cli-skill
 Project-URL: Repository, https://github.com/wise-toddler/mcp-cli-skill

{mcp_cli_skill-0.8.1 → mcp_cli_skill-0.8.2}/SKILL.md

@@ -14,7 +14,7 @@ Always use `mcp-call` as the command, never `uvx mcp-cli-skill`.
 
 ```bash
 mcp-call --servers                                    # list configured servers
-mcp-call <server> --tools                             # list tools (human-readable)
+mcp-call <server> --tools                             # list tools (human-readable; --list / --help work too)
 mcp-call <server> --discover                          # list tools as JSON with schemas
 mcp-call <server> <tool> --schema                     # show tool's input schema as JSON
 mcp-call <server> <tool> --key=value ...              # call a tool
@@ -42,6 +42,8 @@ mcp-call --remove myredash
 mcp-call --sync
 ```
 
+An unknown option or tool name exits 2 with a "Did you mean" hint and is never sent to the server — use the hint instead of guessing another name.
+
 If a call exits 4 with "needs interactive browser login", ask the user to run the `mcp-call --login <name>` command it prints; don't run it yourself.
 
 ## Examples

{mcp_cli_skill-0.8.1 → mcp_cli_skill-0.8.2}/scripts/mcp_call.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 """Call any MCP server tool from CLI with --flag=value args."""
 import base64
+import difflib
 import hashlib
 import http.server
 import json
@@ -246,10 +247,17 @@ def parse_args():
     # `mcp-call <server> --login|--logout` alias the top-level flags
     if len(args) > 1 and args[1] in ("--login", "--logout"):
         return f"__{args[1][2:]}__", server, {"no_browser": "--no-browser" in args[2:]}
-    if len(args) < 2 or args[1] == "--tools":
+    # --list / --help / -h are what people (and agents) guess for "list tools"
+    if len(args) < 2 or args[1] in ("--tools", "--list", "--help", "-h"):
         return server, "__tools__", {}
     if args[1] == "--discover":
         return server, "__discover__", {}
+    if args[1].startswith("-"):
+        # MCP tool names never start with "-": a mistyped option, so never send it to the server
+        close = difflib.get_close_matches(args[1], ["--tools", "--discover", "--login", "--logout"], n=1)
+        hint = f" Did you mean {close[0]}?" if close else ""
+        print(f"Error: unknown option '{args[1]}'.{hint} List tools with: mcp-call {server} --tools", file=sys.stderr)
+        sys.exit(2)
 
     tool = args[1]
     tool_args = {}
@@ -1284,6 +1292,14 @@ def do_completion():
 
 # --- Main ---
 
+def _unknown_tool(server_name, tool_name, names):
+    """Exit 2 with close-match suggestions for a tool name the server doesn't have."""
+    close = difflib.get_close_matches(tool_name, names, n=3, cutoff=0.4)
+    hint = f" Did you mean: {', '.join(close)}?" if close else ""
+    print(f"Error: unknown tool '{tool_name}' for {server_name}.{hint} List tools with: mcp-call {server_name} --tools", file=sys.stderr)
+    sys.exit(2)
+
+
 def run_server(config, tool_name, tool_args, server_name=""):
     """Route to HTTP or stdio transport."""
     # tool discovery commands
@@ -1301,18 +1317,21 @@ def run_server(config, tool_name, tool_args, server_name=""):
                 if t["name"] == target:
                     print(json.dumps(t.get("inputSchema", {}), indent=2))
                     return
-            print(f"Error: tool '{target}' not found", file=sys.stderr)
-            sys.exit(1)
+            _unknown_tool(server_name, target, [t["name"] for t in tools])
         elif tool_name == "__help__":
             target = tool_args["_tool"]
             for t in tools:
                 if t["name"] == target:
                     _print_tool_help(server_name or "<server>", t)
                     return
-            print(f"Error: tool '{target}' not found", file=sys.stderr)
-            sys.exit(1)
+            _unknown_tool(server_name, target, [t["name"] for t in tools])
         return
-    # tool calls
+    # tool calls: a name missing from the cached list is a typo or a newly added tool,
+    # so re-fetch once (refreshes the cache) and only refuse if the server lacks it too
+    if server_name and tool_name not in [t.get("name") for t in _cache_read(server_name)]:
+        names = [t.get("name") for t in fetch_tools(config, server_name)]
+        if names and tool_name not in names:  # empty list = server can't list tools; let the call decide
+            _unknown_tool(server_name, tool_name, names)
     if is_http(config):
         http_call_tool(config["url"], tool_name, tool_args, config.get("headers"), server_name)
     else:

{mcp_cli_skill-0.8.1 → mcp_cli_skill-0.8.2}/src/mcp_cli_skill/__init__.py

@@ -1,2 +1,2 @@
 """MCP CLI - Call any MCP server tool from the command line."""
-__version__ = "0.8.1"
+__version__ = "0.8.2"

{mcp_cli_skill-0.8.1 → mcp_cli_skill-0.8.2}/src/mcp_cli_skill/cli.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 """Call any MCP server tool from CLI with --flag=value args."""
 import base64
+import difflib
 import hashlib
 import http.server
 import json
@@ -246,10 +247,17 @@ def parse_args():
     # `mcp-call <server> --login|--logout` alias the top-level flags
     if len(args) > 1 and args[1] in ("--login", "--logout"):
         return f"__{args[1][2:]}__", server, {"no_browser": "--no-browser" in args[2:]}
-    if len(args) < 2 or args[1] == "--tools":
+    # --list / --help / -h are what people (and agents) guess for "list tools"
+    if len(args) < 2 or args[1] in ("--tools", "--list", "--help", "-h"):
         return server, "__tools__", {}
     if args[1] == "--discover":
         return server, "__discover__", {}
+    if args[1].startswith("-"):
+        # MCP tool names never start with "-": a mistyped option, so never send it to the server
+        close = difflib.get_close_matches(args[1], ["--tools", "--discover", "--login", "--logout"], n=1)
+        hint = f" Did you mean {close[0]}?" if close else ""
+        print(f"Error: unknown option '{args[1]}'.{hint} List tools with: mcp-call {server} --tools", file=sys.stderr)
+        sys.exit(2)
 
     tool = args[1]
     tool_args = {}
@@ -1284,6 +1292,14 @@ def do_completion():
 
 # --- Main ---
 
+def _unknown_tool(server_name, tool_name, names):
+    """Exit 2 with close-match suggestions for a tool name the server doesn't have."""
+    close = difflib.get_close_matches(tool_name, names, n=3, cutoff=0.4)
+    hint = f" Did you mean: {', '.join(close)}?" if close else ""
+    print(f"Error: unknown tool '{tool_name}' for {server_name}.{hint} List tools with: mcp-call {server_name} --tools", file=sys.stderr)
+    sys.exit(2)
+
+
 def run_server(config, tool_name, tool_args, server_name=""):
     """Route to HTTP or stdio transport."""
     # tool discovery commands
@@ -1301,18 +1317,21 @@ def run_server(config, tool_name, tool_args, server_name=""):
                 if t["name"] == target:
                     print(json.dumps(t.get("inputSchema", {}), indent=2))
                     return
-            print(f"Error: tool '{target}' not found", file=sys.stderr)
-            sys.exit(1)
+            _unknown_tool(server_name, target, [t["name"] for t in tools])
         elif tool_name == "__help__":
             target = tool_args["_tool"]
             for t in tools:
                 if t["name"] == target:
                     _print_tool_help(server_name or "<server>", t)
                     return
-            print(f"Error: tool '{target}' not found", file=sys.stderr)
-            sys.exit(1)
+            _unknown_tool(server_name, target, [t["name"] for t in tools])
         return
-    # tool calls
+    # tool calls: a name missing from the cached list is a typo or a newly added tool,
+    # so re-fetch once (refreshes the cache) and only refuse if the server lacks it too
+    if server_name and tool_name not in [t.get("name") for t in _cache_read(server_name)]:
+        names = [t.get("name") for t in fetch_tools(config, server_name)]
+        if names and tool_name not in names:  # empty list = server can't list tools; let the call decide
+            _unknown_tool(server_name, tool_name, names)
     if is_http(config):
         http_call_tool(config["url"], tool_name, tool_args, config.get("headers"), server_name)
     else:

mcp_cli_skill-0.8.2/tests/test_args.py

@@ -0,0 +1,101 @@
+"""Mistyped options / tool names fail fast with a hint and never reach the server."""
+import json
+import os
+import subprocess
+import sys
+import tempfile
+import textwrap
+import unittest
+
+REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+FAKE_SERVER = textwrap.dedent("""
+    import json, os, sys
+    tools = os.environ.get("FAKE_TOOLS", "echo,slack_channel").split(",")
+    for line in sys.stdin:
+        msg = json.loads(line)
+        if msg.get("id") is None:
+            continue
+        method = msg["method"]
+        if method == "initialize":
+            res = {"protocolVersion": "2024-11-05", "capabilities": {}, "serverInfo": {"name": "fake", "version": "1"}}
+        elif method == "tools/list":
+            res = {"tools": [{"name": n, "inputSchema": {"type": "object", "properties": {}}} for n in tools]}
+        else:  # tools/call: log every name that actually reached the server
+            with open(os.environ["FAKE_LOG"], "a") as f:
+                f.write(msg["params"]["name"] + "\\n")
+            res = {"content": [{"type": "text", "text": "ok " + msg["params"]["name"]}]}
+        sys.stdout.write(json.dumps({"jsonrpc": "2.0", "id": msg["id"], "result": res}) + "\\n")
+        sys.stdout.flush()
+""")
+
+
+class ArgsTest(unittest.TestCase):
+    def setUp(self):
+        self.home = tempfile.mkdtemp()
+        self.log = os.path.join(self.home, "calls.log")
+        script = os.path.join(self.home, "fake_server.py")
+        with open(script, "w") as f:
+            f.write(FAKE_SERVER)
+        os.makedirs(os.path.join(self.home, ".mcp-cli"))
+        with open(os.path.join(self.home, ".mcp-cli", "servers.json"), "w") as f:
+            json.dump({"fake": {"command": sys.executable, "args": [script], "env": {"FAKE_LOG": self.log}}}, f)
+
+    def run_cli(self, *args, tools=None):
+        """Run mcp-call in a subprocess with an isolated HOME; return (exit code, stdout, stderr)."""
+        env = {**os.environ, "HOME": self.home, "PYTHONPATH": os.path.join(REPO, "src"), "NO_COLOR": "1"}
+        if tools:
+            env["FAKE_TOOLS"] = tools
+        p = subprocess.run([sys.executable, "-m", "mcp_cli_skill.cli", *args], env=env, cwd=REPO,
+                           stdin=subprocess.DEVNULL, capture_output=True, text=True, timeout=30)
+        return p.returncode, p.stdout, p.stderr
+
+    def calls(self):
+        if not os.path.exists(self.log):
+            return []
+        with open(self.log) as f:
+            return f.read().split()
+
+    def test_list_help_aliases_show_tools(self):
+        for flag in ("--tools", "--list", "--help", "-h"):
+            code, out, err = self.run_cli("fake", flag)
+            self.assertEqual(code, 0, f"{flag}: {err}")
+            self.assertIn("echo", out, flag)
+        self.assertEqual(self.calls(), [])
+
+    def test_unknown_option_fails_fast(self):
+        code, _, err = self.run_cli("fake", "--list-tools")
+        self.assertEqual(code, 2)
+        self.assertIn("unknown option '--list-tools'", err)
+        self.assertIn("Did you mean --tools?", err)
+        self.assertIn("mcp-call fake --tools", err)
+        self.assertEqual(self.calls(), [])
+
+    def test_unknown_tool_suggests_and_never_calls(self):
+        code, _, err = self.run_cli("fake", "ehco")
+        self.assertEqual(code, 2)
+        self.assertIn("unknown tool 'ehco'", err)
+        self.assertIn("Did you mean: echo", err)
+        self.assertEqual(self.calls(), [])
+
+    def test_known_tool_still_called(self):
+        code, out, err = self.run_cli("fake", "echo")
+        self.assertEqual(code, 0, err)
+        self.assertIn("ok echo", out)
+        self.assertEqual(self.calls(), ["echo"])
+
+    def test_stale_cache_new_tool_still_callable(self):
+        self.assertEqual(self.run_cli("fake", "echo")[0], 0)  # caches echo,slack_channel
+        code, out, err = self.run_cli("fake", "brand_new", tools="echo,slack_channel,brand_new")
+        self.assertEqual(code, 0, err)
+        self.assertIn("ok brand_new", out)
+        self.assertEqual(self.calls(), ["echo", "brand_new"])
+
+    def test_schema_unknown_tool_suggests(self):
+        code, _, err = self.run_cli("fake", "ech", "--schema")
+        self.assertEqual(code, 2)
+        self.assertIn("Did you mean: echo", err)
+
+
+if __name__ == "__main__":
+    unittest.main()