Handle null bundle returned from the registry and improve messages

Author: adwsingh

aws/aws-mcp-cli-commands/src/main/java/software/amazon/smithy/java/aws/mcp/cli/AwsMcpRegistry.java

@@ -56,8 +56,8 @@ public List<RegistryEntry> listMcpBundles() {
     }
 
     @Override
-    public Bundle getMcpBundle(String name) {
-        var bundle = AwsServiceBundler.builder().serviceName(name).build().bundle();
+    public Bundle getMcpBundle(String id) {
+        var bundle = AwsServiceBundler.builder().serviceName(id).build().bundle();
         return Bundle.builder()
                 .smithyBundle(SmithyMcpBundle.builder().bundle(bundle).build())
                 .build();

mcp/mcp-bundle-api/src/main/java/software/amazon/smithy/mcp/bundle/api/Registry.java

@@ -41,6 +41,6 @@ public BundleMetadata getBundleMetadata() {
 
     List<RegistryEntry> listMcpBundles();
 
-    Bundle getMcpBundle(String name);
+    Bundle getMcpBundle(String id);
 
 }

mcp/mcp-cli/src/main/java/software/amazon/smithy/java/mcp/cli/commands/InstallBundle.java

@@ -8,6 +8,8 @@
 import static picocli.CommandLine.Command;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
@@ -17,16 +19,17 @@
 import software.amazon.smithy.java.mcp.cli.ExecutionContext;
 import software.amazon.smithy.java.mcp.cli.SmithyMcpCommand;
 import software.amazon.smithy.java.mcp.cli.model.Config;
+import software.amazon.smithy.mcp.bundle.api.model.Bundle;
 
-@Command(name = "install", description = "Downloads and adds a bundle from the MCP registry.")
+@Command(name = "install", description = "Downloads and installs a MCP server from the MCP registry.")
 public class InstallBundle extends SmithyMcpCommand {
 
     @Option(names = {"-r", "--registry"},
-            description = "Name of the registry to list the bundles from. If not provided it will use the default registry.")
+            description = "Name of the registry to list the mcp server from. If not provided it will use the default registry.")
     String registryName;
 
-    @Parameters(description = "Names of the MCP bundles to install.")
-    Set<String> names;
+    @Parameters(description = "Id(s) of the MCP server(s) to install.")
+    Set<String> ids;
 
     @ArgGroup
     ClientsInput clientsInput;
@@ -35,11 +38,24 @@ public class InstallBundle extends SmithyMcpCommand {
     protected void execute(ExecutionContext context) throws IOException {
         var registry = context.registry();
         var config = context.config();
-        for (var name : names) {
-            var bundle = registry.getMcpBundle(name);
-            ConfigUtils.addMcpBundle(config, name, bundle);
-            ConfigUtils.createWrapperAndUpdateClientConfigs(name, bundle, config, clientsInput);
-            System.out.println("Successfully installed " + name);
+
+        // First, collect all server and validate they exist
+        Map<String, Bundle> bundles = new HashMap<>();
+        for (var id : ids) {
+            var bundle = registry.getMcpBundle(id);
+            if (bundle == null) {
+                throw new IllegalArgumentException("MCP with id '" + id + "' not found.");
+            }
+            bundles.put(id, bundle);
+        }
+
+        // Now install all server
+        for (var entry : bundles.entrySet()) {
+            var id = entry.getKey();
+            var bundle = entry.getValue();
+            ConfigUtils.addMcpBundle(config, id, bundle);
+            ConfigUtils.createWrapperAndUpdateClientConfigs(id, bundle, config, clientsInput);
+            System.out.println("Successfully installed " + id);
         }
     }
 

mcp/mcp-cli/src/main/java/software/amazon/smithy/java/mcp/cli/commands/UninstallBundle.java

@@ -13,11 +13,11 @@
 import software.amazon.smithy.java.mcp.cli.ExecutionContext;
 import software.amazon.smithy.java.mcp.cli.SmithyMcpCommand;
 
-@Command(name = "uninstall", description = "Uninstall a MCP bundle.")
+@Command(name = "uninstall", description = "Uninstall a MCP server.")
 public class UninstallBundle extends SmithyMcpCommand {
 
-    @Parameters(description = "Name of the MCP bundle to uninstall.")
-    String name;
+    @Parameters(description = "Id of the MCP server to uninstall.")
+    String id;
 
     @Option(names = {"--clients"},
             description = "Names of client configs to update. If not specified all client configs registered would be updated.")
@@ -26,13 +26,13 @@ public class UninstallBundle extends SmithyMcpCommand {
     @Override
     protected void execute(ExecutionContext context) throws Exception {
         var config = context.config();
-        if (!config.getToolBundles().containsKey(name)) {
-            System.out.println("No such MCP bundle exists. Nothing to do.");
+        if (!config.getToolBundles().containsKey(id)) {
+            System.out.println("No such MCP server is installed. Nothing to do.");
             return;
         }
-        ConfigUtils.removeMcpBundle(config, name);
-        System.out.println("Uninstalled MCP bundle: " + name);
-        ConfigUtils.removeFromClientConfigs(config, name, clients);
+        ConfigUtils.removeMcpBundle(config, id);
+        System.out.println("Uninstalled MCP bundle: " + id);
+        ConfigUtils.removeFromClientConfigs(config, id, clients);
         System.out.println("Updated client configs");
     }
 }