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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: mcp-cli-skill
-Version: 0.8.2
+Version: 0.8.4
 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.2 → mcp_cli_skill-0.8.4}/scripts/mcp_call.py

@@ -296,6 +296,40 @@ def parse_args():
     return server, tool, tool_args
 
 
+def _named_file_with(items, data):
+    """Path named in a text block whose file holds exactly these bytes, else None."""
+    for it in items:
+        text = it.get("text", "") if it.get("type") == "text" else ""
+        for p in re.findall(r"[~/][^\s\"'`,;()<>\[\]{}]+", text):
+            p = os.path.expanduser(p.rstrip(".:"))
+            try:
+                if os.path.getsize(p) == len(data):
+                    with open(p, "rb") as f:
+                        if f.read() == data:
+                            return p
+            except OSError:
+                continue
+    return None
+
+
+def _save_image_copy(item, data):
+    """Write an image block to MCP_CALL_TMPDIR, pruning copies older than 24h; return its path."""
+    os.makedirs(MCP_CALL_TMPDIR, exist_ok=True)
+    cutoff = time.time() - 86400
+    for name in os.listdir(MCP_CALL_TMPDIR):
+        old = os.path.join(MCP_CALL_TMPDIR, name)
+        try:
+            if name.startswith("mcp-") and os.path.getmtime(old) < cutoff:
+                os.remove(old)
+        except OSError:
+            pass
+    ext = item.get("mimeType", "image/png").split("/")[-1]
+    fd, path = tempfile.mkstemp(suffix=f".{ext}", prefix="mcp-", dir=MCP_CALL_TMPDIR)
+    with os.fdopen(fd, "wb") as f:
+        f.write(data)
+    return path
+
+
 def _print_content(items):
     """Print MCP content blocks (text, image, etc.)."""
     for item in items:
@@ -305,12 +339,9 @@ def _print_content(items):
             except json.JSONDecodeError:
                 print(item["text"])
         elif item.get("type") == "image":
-            os.makedirs(MCP_CALL_TMPDIR, exist_ok=True)
-            ext = item.get("mimeType", "image/png").split("/")[-1]
-            fd, path = tempfile.mkstemp(suffix=f".{ext}", prefix="mcp-", dir=MCP_CALL_TMPDIR)
-            os.write(fd, base64.b64decode(item["data"]))
-            os.close(fd)
-            print(path)
+            data = base64.b64decode(item["data"])
+            # the server may already have saved this exact image (e.g. a --path arg): point at it, don't copy
+            print(_named_file_with(items, data) or _save_image_copy(item, data))
         elif item.get("type") == "resource_link":
             line = item.get("uri", "")
             if item.get("name"):
@@ -1036,10 +1067,11 @@ def is_http(config):
     return config.get("type") == "http" or "url" in config
 
 
-def _config_key(cfg):
-    """Hashable identity for a server config — used to collapse duplicates."""
+def _config_key(name, cfg):
+    """Hashable identity for a server config — used to collapse duplicate stdio servers."""
     if is_http(cfg):
-        return ("http", cfg["url"])
+        # same URL under another name is a different account or key, never an alias
+        return ("http", cfg["url"], name)
     return ("stdio", cfg.get("command", "?"), tuple(cfg.get("args", [])))
 
 
@@ -1049,15 +1081,25 @@ def _truncate(text, width):
 
 
 def list_servers(servers):
-    """Print configured servers grouped by transport, collapsing duplicates."""
+    """Print configured servers grouped by transport, collapsing duplicate stdio servers."""
     c = _colors()
     term_w = shutil.get_terminal_size((100, 24)).columns
     # split + group by config identity
     http_groups, stdio_groups = {}, {}
     for name, cfg in servers.items():
         bucket = http_groups if is_http(cfg) else stdio_groups
-        bucket.setdefault(_config_key(cfg), []).append(name)
+        bucket.setdefault(_config_key(name, cfg), []).append(name)
     max_name = min(max((len(n) for n in servers), default=20), 28)
+    tokens = _tokens_read()  # local file only; no network
+
+    def login_mark(name):
+        """'🔑 logged in' / '🔑 login needed' for servers with an OAuth entry, else ''."""
+        entry, cfg = tokens.get(name), servers[name]
+        if entry is None or not is_http(cfg):
+            return "", ""
+        if entry.get("access_token") and _norm_url(entry.get("url", "")) == _norm_url(_expand_env(cfg["url"])):
+            return "🔑 logged in", c["green"]
+        return "🔑 login needed", c["yellow"]
 
     def print_group(label, color, groups, target_fn):
         total = sum(len(v) for v in groups.values())
@@ -1069,12 +1111,15 @@ def list_servers(servers):
             names_sorted = sorted(names)
             primary = names_sorted[0]
             target = target_fn(key)
+            mark, mark_color = login_mark(primary)
             # compute remaining width for the target
             base = f"  ● {primary:<{max_name}}  "
             visible_len = len(base)
-            avail = max(20, term_w - visible_len - 4)
+            avail = max(20, term_w - visible_len - 4 - (len(mark) + 2 if mark else 0))
             target_disp = _truncate(target, avail)
             line = f"  {c['green']}●{c['reset']} {c['bold']}{primary:<{max_name}}{c['reset']}  {c['dim']}{target_disp}{c['reset']}"
+            if mark:
+                line += f"  {mark_color}{mark}{c['reset']}"
             if len(names_sorted) > 1:
                 line += f"  {c['yellow']}×{len(names_sorted)}{c['reset']}"
             print(line)

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

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

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

@@ -296,6 +296,40 @@ def parse_args():
     return server, tool, tool_args
 
 
+def _named_file_with(items, data):
+    """Path named in a text block whose file holds exactly these bytes, else None."""
+    for it in items:
+        text = it.get("text", "") if it.get("type") == "text" else ""
+        for p in re.findall(r"[~/][^\s\"'`,;()<>\[\]{}]+", text):
+            p = os.path.expanduser(p.rstrip(".:"))
+            try:
+                if os.path.getsize(p) == len(data):
+                    with open(p, "rb") as f:
+                        if f.read() == data:
+                            return p
+            except OSError:
+                continue
+    return None
+
+
+def _save_image_copy(item, data):
+    """Write an image block to MCP_CALL_TMPDIR, pruning copies older than 24h; return its path."""
+    os.makedirs(MCP_CALL_TMPDIR, exist_ok=True)
+    cutoff = time.time() - 86400
+    for name in os.listdir(MCP_CALL_TMPDIR):
+        old = os.path.join(MCP_CALL_TMPDIR, name)
+        try:
+            if name.startswith("mcp-") and os.path.getmtime(old) < cutoff:
+                os.remove(old)
+        except OSError:
+            pass
+    ext = item.get("mimeType", "image/png").split("/")[-1]
+    fd, path = tempfile.mkstemp(suffix=f".{ext}", prefix="mcp-", dir=MCP_CALL_TMPDIR)
+    with os.fdopen(fd, "wb") as f:
+        f.write(data)
+    return path
+
+
 def _print_content(items):
     """Print MCP content blocks (text, image, etc.)."""
     for item in items:
@@ -305,12 +339,9 @@ def _print_content(items):
             except json.JSONDecodeError:
                 print(item["text"])
         elif item.get("type") == "image":
-            os.makedirs(MCP_CALL_TMPDIR, exist_ok=True)
-            ext = item.get("mimeType", "image/png").split("/")[-1]
-            fd, path = tempfile.mkstemp(suffix=f".{ext}", prefix="mcp-", dir=MCP_CALL_TMPDIR)
-            os.write(fd, base64.b64decode(item["data"]))
-            os.close(fd)
-            print(path)
+            data = base64.b64decode(item["data"])
+            # the server may already have saved this exact image (e.g. a --path arg): point at it, don't copy
+            print(_named_file_with(items, data) or _save_image_copy(item, data))
         elif item.get("type") == "resource_link":
             line = item.get("uri", "")
             if item.get("name"):
@@ -1036,10 +1067,11 @@ def is_http(config):
     return config.get("type") == "http" or "url" in config
 
 
-def _config_key(cfg):
-    """Hashable identity for a server config — used to collapse duplicates."""
+def _config_key(name, cfg):
+    """Hashable identity for a server config — used to collapse duplicate stdio servers."""
     if is_http(cfg):
-        return ("http", cfg["url"])
+        # same URL under another name is a different account or key, never an alias
+        return ("http", cfg["url"], name)
     return ("stdio", cfg.get("command", "?"), tuple(cfg.get("args", [])))
 
 
@@ -1049,15 +1081,25 @@ def _truncate(text, width):
 
 
 def list_servers(servers):
-    """Print configured servers grouped by transport, collapsing duplicates."""
+    """Print configured servers grouped by transport, collapsing duplicate stdio servers."""
     c = _colors()
     term_w = shutil.get_terminal_size((100, 24)).columns
     # split + group by config identity
     http_groups, stdio_groups = {}, {}
     for name, cfg in servers.items():
         bucket = http_groups if is_http(cfg) else stdio_groups
-        bucket.setdefault(_config_key(cfg), []).append(name)
+        bucket.setdefault(_config_key(name, cfg), []).append(name)
     max_name = min(max((len(n) for n in servers), default=20), 28)
+    tokens = _tokens_read()  # local file only; no network
+
+    def login_mark(name):
+        """'🔑 logged in' / '🔑 login needed' for servers with an OAuth entry, else ''."""
+        entry, cfg = tokens.get(name), servers[name]
+        if entry is None or not is_http(cfg):
+            return "", ""
+        if entry.get("access_token") and _norm_url(entry.get("url", "")) == _norm_url(_expand_env(cfg["url"])):
+            return "🔑 logged in", c["green"]
+        return "🔑 login needed", c["yellow"]
 
     def print_group(label, color, groups, target_fn):
         total = sum(len(v) for v in groups.values())
@@ -1069,12 +1111,15 @@ def list_servers(servers):
             names_sorted = sorted(names)
             primary = names_sorted[0]
             target = target_fn(key)
+            mark, mark_color = login_mark(primary)
             # compute remaining width for the target
             base = f"  ● {primary:<{max_name}}  "
             visible_len = len(base)
-            avail = max(20, term_w - visible_len - 4)
+            avail = max(20, term_w - visible_len - 4 - (len(mark) + 2 if mark else 0))
             target_disp = _truncate(target, avail)
             line = f"  {c['green']}●{c['reset']} {c['bold']}{primary:<{max_name}}{c['reset']}  {c['dim']}{target_disp}{c['reset']}"
+            if mark:
+                line += f"  {mark_color}{mark}{c['reset']}"
             if len(names_sorted) > 1:
                 line += f"  {c['yellow']}×{len(names_sorted)}{c['reset']}"
             print(line)

{mcp_cli_skill-0.8.2 → mcp_cli_skill-0.8.4}/tests/test_args.py

@@ -5,13 +5,15 @@ import subprocess
 import sys
 import tempfile
 import textwrap
+import time
 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(",")
+    import base64, json, os, sys
+    tools = os.environ.get("FAKE_TOOLS", "echo,slack_channel,shot").split(",")
+    IMG = b"\\x89PNG fake image bytes"
     for line in sys.stdin:
         msg = json.loads(line)
         if msg.get("id") is None:
@@ -25,6 +27,14 @@ FAKE_SERVER = textwrap.dedent("""
             with open(os.environ["FAKE_LOG"], "a") as f:
                 f.write(msg["params"]["name"] + "\\n")
             res = {"content": [{"type": "text", "text": "ok " + msg["params"]["name"]}]}
+            if msg["params"]["name"] == "shot":  # like browser_screenshot: image block (+ saved file if path given)
+                img = {"type": "image", "data": base64.b64encode(IMG).decode(), "mimeType": "image/png"}
+                path = msg["params"].get("arguments", {}).get("path")
+                res = {"content": [img]}
+                if path:
+                    with open(path, "wb") as f:
+                        f.write(IMG)
+                    res["content"].append({"type": "text", "text": f"Saved {path} (1 KB)"})
         sys.stdout.write(json.dumps({"jsonrpc": "2.0", "id": msg["id"], "result": res}) + "\\n")
         sys.stdout.flush()
 """)
@@ -43,7 +53,7 @@ class ArgsTest(unittest.TestCase):
 
     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"}
+        env = {**os.environ, "HOME": self.home, "TMPDIR": 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,
@@ -91,6 +101,30 @@ class ArgsTest(unittest.TestCase):
         self.assertIn("ok brand_new", out)
         self.assertEqual(self.calls(), ["echo", "brand_new"])
 
+    def copies(self):
+        d = os.path.join(self.home, "mcp-call")
+        return sorted(os.listdir(d)) if os.path.isdir(d) else []
+
+    def test_image_already_saved_by_server_is_not_copied(self):
+        path = os.path.join(self.home, "shot.png")
+        code, out, err = self.run_cli("fake", "shot", f"--path={path}")
+        self.assertEqual(code, 0, err)
+        self.assertEqual(out.splitlines()[0], path)  # image block points at the server's file
+        self.assertEqual(self.copies(), [])
+
+    def test_image_without_saved_file_is_copied_and_old_copies_pruned(self):
+        os.makedirs(os.path.join(self.home, "mcp-call"))
+        stale, fresh = (os.path.join(self.home, "mcp-call", n) for n in ("mcp-stale.png", "mcp-fresh.png"))
+        for p in (stale, fresh):
+            open(p, "w").close()
+        os.utime(stale, (time.time() - 2 * 86400,) * 2)
+        code, out, err = self.run_cli("fake", "shot")
+        self.assertEqual(code, 0, err)
+        copy = out.strip()
+        with open(copy, "rb") as f:
+            self.assertEqual(f.read(), b"\x89PNG fake image bytes")
+        self.assertEqual(self.copies(), sorted(["mcp-fresh.png", os.path.basename(copy)]))
+
     def test_schema_unknown_tool_suggests(self):
         code, _, err = self.run_cli("fake", "ech", "--schema")
         self.assertEqual(code, 2)

{mcp_cli_skill-0.8.2 → mcp_cli_skill-0.8.4}/tests/test_oauth.py

@@ -382,6 +382,21 @@ class OAuthTest(unittest.TestCase):
         self.assertIn("browser profile", err)
         self.assertIn("Logged in to fake.", out)
 
+    def test_15_servers_lists_accounts_separately_with_login_state(self):
+        self.servers["fake-2"] = dict(self.servers["fake"])  # second account, same URL
+        cli._save_config(self.servers)
+        entry = self.seed()
+        store = {"fake": entry, "fake-2": {k: v for k, v in entry.items() if k != "access_token"}}
+        with open(cli.TOKENS_PATH, "w") as f:
+            json.dump(store, f)
+        code, out, err = self.run_cli("--servers")
+        self.assertEqual(code, 0, err)
+        self.assertNotIn("aliases", out)
+        rows = {line.split()[1]: line for line in out.splitlines() if line.strip().startswith("●")}
+        self.assertIn("logged in", rows["fake"])
+        self.assertIn("login needed", rows["fake-2"])
+        self.assertNotIn("🔑", rows["plain"])  # no OAuth entry, no marker
+
 
 if __name__ == "__main__":
     unittest.main()