mcp-cli-skill 0.6.2__tar.gz → 0.7.0__tar.gz

{mcp_cli_skill-0.6.2 → mcp_cli_skill-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: mcp-cli-skill
-Version: 0.6.2
+Version: 0.7.0
 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.6.2 → mcp_cli_skill-0.7.0}/SKILL.md

@@ -21,7 +21,7 @@ mcp-call <server> <tool> --key=value ...              # call a tool
 mcp-call <server> <tool> --input-json '{"key":"val"}'  # call with JSON args
 echo '{}' | mcp-call <server> <tool>                  # call with stdin JSON
 mcp-call --add <name> <cmd> [args] [--env K=V ...]    # add stdio server
-mcp-call --add-http <name> <url>                      # add HTTP server
+mcp-call --add-http <name> <url> [--header 'K: V' ...] # add HTTP server (auth via --header/-H)
 mcp-call --remove <name>                              # remove server
 mcp-call --sync                                       # re-sync from Claude configs
 mcp-call --completion <bash|zsh|fish>                 # print shell completion hook

{mcp_cli_skill-0.6.2 → mcp_cli_skill-0.7.0}/scripts/mcp_call.py

@@ -275,6 +275,22 @@ def _print_content(items):
             os.write(fd, base64.b64decode(item["data"]))
             os.close(fd)
             print(path)
+        elif item.get("type") == "resource_link":
+            line = item.get("uri", "")
+            if item.get("name"):
+                line += f"  ({item['name']})"
+            print(line)
+
+
+def _print_result(result):
+    """Print a tools/call result; exit 1 if the tool flagged an error."""
+    content = result.get("content", [])
+    _print_content(content)
+    # structured-only results (empty content) would otherwise print nothing
+    if not content and result.get("structuredContent") is not None:
+        print(json.dumps(result["structuredContent"], indent=2, default=str))
+    if result.get("isError"):
+        sys.exit(1)
 
 
 def _expand_env(val):
@@ -292,7 +308,10 @@ class HttpSession:
         self.session_id = None
         self.extra_headers = {k: _expand_env(v) for k, v in (extra_headers or {}).items()}
 
-    def _send(self, data, headers, timeout=30, max_redirects=3):
+    def _send(self, data, headers, timeout=None, max_redirects=3):
+        # Long-running tool calls (bash, LLM, etc) can exceed 30s; make it tunable.
+        if timeout is None:
+            timeout = int(os.environ.get("MCP_CALL_HTTP_TIMEOUT", "300"))
         """POST data and follow 307/308 redirects preserving method+body.
 
         urllib's default HTTPRedirectHandler does NOT follow 307/308 on POST,
@@ -354,6 +373,10 @@ class HttpSession:
         except urllib.error.URLError as e:
             print(f"Error: cannot connect to {self.url}: {e.reason}", file=sys.stderr)
             sys.exit(1)
+        except TimeoutError:
+            # urlopen raises bare TimeoutError in Python 3.10+, not URLError.
+            print(f"Error: request to {self.url} timed out. Set MCP_CALL_HTTP_TIMEOUT=<sec> for longer.", file=sys.stderr)
+            sys.exit(1)
 
     def notify(self, method, params=None):
         """Send JSON-RPC notification (no id, ignore response)."""
@@ -406,7 +429,7 @@ def http_call_tool(url, tool_name, tool_args, extra_headers=None):
     if "error" in resp:
         print(json.dumps(resp["error"], indent=2), file=sys.stderr)
         sys.exit(1)
-    _print_content(resp.get("result", {}).get("content", []))
+    _print_result(resp.get("result", {}))
 
 
 # --- Stdio transport ---
@@ -494,7 +517,7 @@ def stdio_call_tool(proc, tool_name, tool_args):
     if "error" in resp:
         print(json.dumps(resp["error"], indent=2), file=sys.stderr)
         sys.exit(1)
-    _print_content(resp.get("result", {}).get("content", []))
+    _print_result(resp.get("result", {}))
 
 
 # --- Tool discovery ---
@@ -505,17 +528,33 @@ def fetch_tools(config, server_name=""):
     if is_http(config):
         session = HttpSession(config["url"], config.get("headers"))
         http_init(session)
-        resp = session.rpc("tools/list", {}, msg_id=2)
-        if resp and "result" in resp:
-            tools = resp["result"].get("tools", [])
+        cursor, msg_id = None, 2
+        while True:
+            params = {"cursor": cursor} if cursor else {}
+            resp = session.rpc("tools/list", params, msg_id=msg_id)
+            if not resp or "result" not in resp:
+                break
+            tools += resp["result"].get("tools", [])
+            cursor = resp["result"].get("nextCursor")
+            if not cursor:
+                break
+            msg_id += 1
     else:
         proc = spawn_server(config)
         try:
             init_server(proc)
-            send(proc, "tools/list", {}, msg_id=2)
-            resp = recv(proc, expected_id=2)
-            if resp and "result" in resp:
-                tools = resp["result"].get("tools", [])
+            cursor, msg_id = None, 2
+            while True:
+                params = {"cursor": cursor} if cursor else {}
+                send(proc, "tools/list", params, msg_id=msg_id)
+                resp = recv(proc, expected_id=msg_id)
+                if not resp or "result" not in resp:
+                    break
+                tools += resp["result"].get("tools", [])
+                cursor = resp["result"].get("nextCursor")
+                if not cursor:
+                    break
+                msg_id += 1
         finally:
             proc.terminate()
             try:
@@ -529,7 +568,7 @@ def fetch_tools(config, server_name=""):
 
 def _colors():
     """Return ANSI color codes if stdout is a TTY, else empty strings."""
-    on = sys.stdout.isatty()
+    on = sys.stdout.isatty() and not os.environ.get("NO_COLOR")
     return {
         "bold": "\033[1m" if on else "",
         "dim": "\033[2m" if on else "",

{mcp_cli_skill-0.6.2 → mcp_cli_skill-0.7.0}/src/mcp_cli_skill/__init__.py

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

{mcp_cli_skill-0.6.2 → mcp_cli_skill-0.7.0}/src/mcp_cli_skill/cli.py

@@ -275,6 +275,22 @@ def _print_content(items):
             os.write(fd, base64.b64decode(item["data"]))
             os.close(fd)
             print(path)
+        elif item.get("type") == "resource_link":
+            line = item.get("uri", "")
+            if item.get("name"):
+                line += f"  ({item['name']})"
+            print(line)
+
+
+def _print_result(result):
+    """Print a tools/call result; exit 1 if the tool flagged an error."""
+    content = result.get("content", [])
+    _print_content(content)
+    # structured-only results (empty content) would otherwise print nothing
+    if not content and result.get("structuredContent") is not None:
+        print(json.dumps(result["structuredContent"], indent=2, default=str))
+    if result.get("isError"):
+        sys.exit(1)
 
 
 def _expand_env(val):
@@ -292,7 +308,10 @@ class HttpSession:
         self.session_id = None
         self.extra_headers = {k: _expand_env(v) for k, v in (extra_headers or {}).items()}
 
-    def _send(self, data, headers, timeout=30, max_redirects=3):
+    def _send(self, data, headers, timeout=None, max_redirects=3):
+        # Long-running tool calls (bash, LLM, etc) can exceed 30s; make it tunable.
+        if timeout is None:
+            timeout = int(os.environ.get("MCP_CALL_HTTP_TIMEOUT", "300"))
         """POST data and follow 307/308 redirects preserving method+body.
 
         urllib's default HTTPRedirectHandler does NOT follow 307/308 on POST,
@@ -354,6 +373,10 @@ class HttpSession:
         except urllib.error.URLError as e:
             print(f"Error: cannot connect to {self.url}: {e.reason}", file=sys.stderr)
             sys.exit(1)
+        except TimeoutError:
+            # urlopen raises bare TimeoutError in Python 3.10+, not URLError.
+            print(f"Error: request to {self.url} timed out. Set MCP_CALL_HTTP_TIMEOUT=<sec> for longer.", file=sys.stderr)
+            sys.exit(1)
 
     def notify(self, method, params=None):
         """Send JSON-RPC notification (no id, ignore response)."""
@@ -406,7 +429,7 @@ def http_call_tool(url, tool_name, tool_args, extra_headers=None):
     if "error" in resp:
         print(json.dumps(resp["error"], indent=2), file=sys.stderr)
         sys.exit(1)
-    _print_content(resp.get("result", {}).get("content", []))
+    _print_result(resp.get("result", {}))
 
 
 # --- Stdio transport ---
@@ -494,7 +517,7 @@ def stdio_call_tool(proc, tool_name, tool_args):
     if "error" in resp:
         print(json.dumps(resp["error"], indent=2), file=sys.stderr)
         sys.exit(1)
-    _print_content(resp.get("result", {}).get("content", []))
+    _print_result(resp.get("result", {}))
 
 
 # --- Tool discovery ---
@@ -505,17 +528,33 @@ def fetch_tools(config, server_name=""):
     if is_http(config):
         session = HttpSession(config["url"], config.get("headers"))
         http_init(session)
-        resp = session.rpc("tools/list", {}, msg_id=2)
-        if resp and "result" in resp:
-            tools = resp["result"].get("tools", [])
+        cursor, msg_id = None, 2
+        while True:
+            params = {"cursor": cursor} if cursor else {}
+            resp = session.rpc("tools/list", params, msg_id=msg_id)
+            if not resp or "result" not in resp:
+                break
+            tools += resp["result"].get("tools", [])
+            cursor = resp["result"].get("nextCursor")
+            if not cursor:
+                break
+            msg_id += 1
     else:
         proc = spawn_server(config)
         try:
             init_server(proc)
-            send(proc, "tools/list", {}, msg_id=2)
-            resp = recv(proc, expected_id=2)
-            if resp and "result" in resp:
-                tools = resp["result"].get("tools", [])
+            cursor, msg_id = None, 2
+            while True:
+                params = {"cursor": cursor} if cursor else {}
+                send(proc, "tools/list", params, msg_id=msg_id)
+                resp = recv(proc, expected_id=msg_id)
+                if not resp or "result" not in resp:
+                    break
+                tools += resp["result"].get("tools", [])
+                cursor = resp["result"].get("nextCursor")
+                if not cursor:
+                    break
+                msg_id += 1
         finally:
             proc.terminate()
             try:
@@ -529,7 +568,7 @@ def fetch_tools(config, server_name=""):
 
 def _colors():
     """Return ANSI color codes if stdout is a TTY, else empty strings."""
-    on = sys.stdout.isatty()
+    on = sys.stdout.isatty() and not os.environ.get("NO_COLOR")
     return {
         "bold": "\033[1m" if on else "",
         "dim": "\033[2m" if on else "",