mcp-cli-skill 0.4.7__tar.gz → 0.4.9__tar.gz

{mcp_cli_skill-0.4.7 → mcp_cli_skill-0.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-cli-skill
-Version: 0.4.7
+Version: 0.4.9
 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
@@ -54,6 +54,20 @@ mcp-call --remove myserver
 mcp-call --sync    # re-sync from Claude configs
 ```
 
+### Environment variables
+
+`${VAR}` patterns in URLs, headers, command args, and env values are expanded at runtime:
+
+```json
+{
+  "myapi": {
+    "type": "http",
+    "url": "https://${API_HOST}/mcp",
+    "headers": { "X-API-Key": "${MY_API_KEY}" }
+  }
+}
+```
+
 ## Why?
 
 MCP tool calls can't use shell composition. This CLI lets agents (or you) use:

{mcp_cli_skill-0.4.7 → mcp_cli_skill-0.4.9}/README.md

@@ -38,6 +38,20 @@ mcp-call --remove myserver
 mcp-call --sync    # re-sync from Claude configs
 ```
 
+### Environment variables
+
+`${VAR}` patterns in URLs, headers, command args, and env values are expanded at runtime:
+
+```json
+{
+  "myapi": {
+    "type": "http",
+    "url": "https://${API_HOST}/mcp",
+    "headers": { "X-API-Key": "${MY_API_KEY}" }
+  }
+}
+```
+
 ## Why?
 
 MCP tool calls can't use shell composition. This CLI lets agents (or you) use:

{mcp_cli_skill-0.4.7 → mcp_cli_skill-0.4.9}/scripts/mcp_call.py

@@ -6,6 +6,7 @@ import os
 import subprocess
 import sys
 import tempfile
+import re
 import urllib.request
 import urllib.error
 
@@ -193,15 +194,20 @@ def _print_content(items):
             print(path)
 
 
+def _expand_env(val):
+    """Expand ${VAR} patterns in a string using env variables."""
+    return re.sub(r'\$\{(\w+)\}', lambda m: os.environ.get(m.group(1), m.group(0)), val)
+
+
 # --- HTTP transport ---
 
 class HttpSession:
     """Manages HTTP MCP session with session ID tracking."""
 
     def __init__(self, url, extra_headers=None):
-        self.url = url
+        self.url = _expand_env(url)
         self.session_id = None
-        self.extra_headers = extra_headers or {}
+        self.extra_headers = {k: _expand_env(v) for k, v in (extra_headers or {}).items()}
 
     def rpc(self, method, params=None, msg_id=1):
         """Send JSON-RPC over HTTP and return response."""
@@ -212,6 +218,7 @@ class HttpSession:
         headers = {
             "Content-Type": "application/json",
             "Accept": "application/json, text/event-stream",
+            "User-Agent": "mcp-cli/1.0",
         }
         headers.update(self.extra_headers)
         if self.session_id:
@@ -332,8 +339,8 @@ def recv(proc, expected_id=None):
 
 def spawn_server(config):
     """Spawn MCP server subprocess."""
-    cmd = [config["command"]] + config.get("args", [])
-    env = {**os.environ, **config.get("env", {})}
+    cmd = [_expand_env(config["command"])] + [_expand_env(a) for a in config.get("args", [])]
+    env = {**os.environ, **{k: _expand_env(v) for k, v in config.get("env", {}).items()}}
     return subprocess.Popen(
         cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
         stderr=subprocess.PIPE, text=True, env=env

{mcp_cli_skill-0.4.7 → mcp_cli_skill-0.4.9}/src/mcp_cli_skill/__init__.py

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

{mcp_cli_skill-0.4.7 → mcp_cli_skill-0.4.9}/src/mcp_cli_skill/cli.py

@@ -6,6 +6,7 @@ import os
 import subprocess
 import sys
 import tempfile
+import re
 import urllib.request
 import urllib.error
 
@@ -193,15 +194,20 @@ def _print_content(items):
             print(path)
 
 
+def _expand_env(val):
+    """Expand ${VAR} patterns in a string using env variables."""
+    return re.sub(r'\$\{(\w+)\}', lambda m: os.environ.get(m.group(1), m.group(0)), val)
+
+
 # --- HTTP transport ---
 
 class HttpSession:
     """Manages HTTP MCP session with session ID tracking."""
 
     def __init__(self, url, extra_headers=None):
-        self.url = url
+        self.url = _expand_env(url)
         self.session_id = None
-        self.extra_headers = extra_headers or {}
+        self.extra_headers = {k: _expand_env(v) for k, v in (extra_headers or {}).items()}
 
     def rpc(self, method, params=None, msg_id=1):
         """Send JSON-RPC over HTTP and return response."""
@@ -212,6 +218,7 @@ class HttpSession:
         headers = {
             "Content-Type": "application/json",
             "Accept": "application/json, text/event-stream",
+            "User-Agent": "mcp-cli/1.0",
         }
         headers.update(self.extra_headers)
         if self.session_id:
@@ -332,8 +339,8 @@ def recv(proc, expected_id=None):
 
 def spawn_server(config):
     """Spawn MCP server subprocess."""
-    cmd = [config["command"]] + config.get("args", [])
-    env = {**os.environ, **config.get("env", {})}
+    cmd = [_expand_env(config["command"])] + [_expand_env(a) for a in config.get("args", [])]
+    env = {**os.environ, **{k: _expand_env(v) for k, v in config.get("env", {}).items()}}
     return subprocess.Popen(
         cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
         stderr=subprocess.PIPE, text=True, env=env