copiplot review changes

Author: BartoszBlizniak

cloudsmith_cli/cli/commands/mcp.py

@@ -8,6 +8,7 @@
 from typing import Dict, List
 
 import click
+import json5
 
 from ...core.mcp import server
 from ...core.mcp.data import OpenAPITool
@@ -398,9 +399,14 @@ def configure_client(client_name, server_config, is_global=True, profile=None):
     if config_path.exists():
         with open(config_path) as f:
             try:
-                config = json.load(f)
-            except json.JSONDecodeError:
-                raise ValueError(f"Invalid JSON in config file: {config_path}")
+                # VS Code settings.json supports JSONC (comments and trailing commas)
+                # Use json5 for VS Code to handle this, standard json for others
+                if client_name == "vscode":
+                    config = json5.load(f)
+                else:
+                    config = json.load(f)
+            except (json.JSONDecodeError, ValueError) as e:
+                raise ValueError(f"Invalid JSON in config file: {config_path}: {e}")
 
     # Determine server name based on profile
     server_name = f"cloudsmith-{profile}" if profile else "cloudsmith"

cloudsmith_cli/cli/decorators.py

@@ -348,7 +348,7 @@ def initialise_mcp(f):
         help="Show all tools",
     )
     @click.option(
-        "-d",
+        "-D",
         "--allow-destructive-tools",
         default=False,
         is_flag=True,

cloudsmith_cli/core/mcp/server.py

@@ -209,10 +209,16 @@ async def load_openapi_spec(self):
         ) as http_client:
             for version, endpoint in API_VERSIONS_TO_DISCOVER.items():
                 spec_url = f"{self.api_base_url}/{version}/{endpoint}"
-                response = await http_client.get(spec_url)
-                response.raise_for_status()
+                try:
+                    response = await http_client.get(spec_url)
+                    response.raise_for_status()
+                except httpx.HTTPStatusError:
+                    # This version is not available, try the next one
+                    continue
                 self.spec = response.json()
                 await self._generate_tools_from_spec()
+                # Stop after the first successful spec load to avoid duplicate tools
+                break
 
     def _get_tool_groups(self, tool_name: str) -> List[str]:
         """
@@ -436,7 +442,9 @@ def _get_request_params(
                 if "enum" in param_schema:
                     if value not in param_schema["enum"]:
                         allowed_values = ", ".join(param_schema["enum"])
-                        return f"Invalid value '{value}' for parameter '{key}'. Allowed values: {allowed_values}"
+                        raise ValueError(
+                            f"Invalid value '{value}' for parameter '{key}'. Allowed values: {allowed_values}"
+                        )
 
                 validated_arguments[key] = value
             else:
@@ -473,7 +481,12 @@ async def _execute_api_call(
         # Build URL with path parameters
         url = tool.base_url + tool.path
 
-        url, query_params, body_params = self._get_request_params(url, tool, arguments)
+        try:
+            url, query_params, body_params = self._get_request_params(
+                url, tool, arguments
+            )
+        except ValueError as e:
+            return str(e)
 
         if tool.query_filter:
             parsed_simplified_filter = parse.parse_qs(tool.query_filter)

requirements.txt

@@ -94,6 +94,8 @@ jaraco-context==6.1.0
     # via keyring
 jaraco-functools==4.4.0
     # via keyring
+json5==0.13.0
+    # via cloudsmith-cli (setup.py)
 keyring==25.7.0
     # via cloudsmith-cli (setup.py)
 mccabe==0.7.0

setup.py

@@ -54,6 +54,7 @@ def get_long_description():
         "click-didyoumean>=0.0.3",
         "click-spinner>=0.1.7",
         "cloudsmith-api>=2.0.22,<3.0",  # Compatible upto (but excluding) 3.0+
+        "json5>=0.9.0",  # For parsing JSONC (JSON with comments) in VS Code settings
         "keyring>=25.4.1",
         "mcp==1.9.1",
         "toon-python==0.1.2",