Add create command and have a concept of local bundles

adwsingh · adwsingh · commit df4999a9e42d · 2025-06-30T16:20:37.000-07:00
diff --git a/aws/aws-mcp-cli-commands/build.gradle.kts b/aws/aws-mcp-cli-commands/build.gradle.kts
@@ -24,3 +24,7 @@ dependencies {
 tasks.compileJava {
     options.compilerArgs.add("-Aproject=${project.name}")
 }
+
+tasks.withType<JavaCompile> {
+    options.release.set(21)
+}
diff --git a/aws/aws-mcp-cli-commands/src/main/java/software/amazon/smithy/java/aws/mcp/cli/commands/AddAwsServiceBundle.java b/aws/aws-mcp-cli-commands/src/main/java/software/amazon/smithy/java/aws/mcp/cli/commands/AddAwsServiceBundle.java
@@ -17,7 +17,7 @@
 import software.amazon.smithy.mcp.bundle.api.model.BundleMetadata;
 import software.amazon.smithy.mcp.bundle.api.model.SmithyMcpBundle;
 
-@Command(name = "add-aws-bundle")
+@Command(name = "add-aws-bundle", hidden = true, description = "Deprecated!. Use the create command.")
 public class AddAwsServiceBundle extends AbstractAddBundle {
 
     @Option(names = "--overwrite",
diff --git a/aws/aws-mcp-cli-commands/src/main/java/software/amazon/smithy/java/aws/mcp/cli/commands/CreateAwsServiceBundle.java b/aws/aws-mcp-cli-commands/src/main/java/software/amazon/smithy/java/aws/mcp/cli/commands/CreateAwsServiceBundle.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.java.aws.mcp.cli.commands;
+
+import static picocli.CommandLine.ArgGroup;
+import static picocli.CommandLine.Parameters;
+
+import java.util.Set;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+import software.amazon.smithy.java.aws.servicebundle.bundler.AwsServiceBundler;
+import software.amazon.smithy.java.mcp.cli.AbstractCreateBundle;
+import software.amazon.smithy.mcp.bundle.api.model.Bundle;
+import software.amazon.smithy.mcp.bundle.api.model.BundleMetadata;
+import software.amazon.smithy.mcp.bundle.api.model.SmithyMcpBundle;
+
+@Command(name = "aws-service-mcp", description = "Create an MCP for an AWS service.")
+public class CreateAwsServiceBundle extends AbstractCreateBundle<CreateAwsServiceBundle.CreateAwsServiceBundleInput> {
+
+    @ArgGroup(multiplicity = "1")
+    Input input;
+
+    @Override
+    protected CreateAwsServiceBundleInput getInput() {
+        return input.cliInput;
+    }
+
+    @Override
+    protected Bundle getNewBundle(CreateAwsServiceBundleInput input) {
+        var bundleBuilder = AwsServiceBundler.builder()
+                .serviceName(input.awsServiceName);
+        if (input.allowedApis != null) {
+            // User explicitly specified allowed APIs
+            bundleBuilder.exposedOperations(input.allowedApis);
+            // If readOnlyApis is also requested, include those as well
+            if (Boolean.TRUE.equals(input.readOnlyApis)) {
+                bundleBuilder.readOnlyOperations();
+            }
+        } else if (!Boolean.FALSE.equals(input.readOnlyApis)) {
+            //If nothing is specified then default to only readOnlyOperations.
+            bundleBuilder.readOnlyOperations();
+        } else {
+            throw new IllegalArgumentException("You have turned off readOnlyApis and also not specified any " +
+                    "allowedApis so there are no operations to create a bundle for.");
+        }
+
+        if (input.blockedApis != null) {
+            // Always apply blocked operations if specified
+            bundleBuilder.blockedOperations(input.blockedApis);
+        }
+        return Bundle.builder()
+                .smithyBundle(SmithyMcpBundle.builder()
+                        .bundle(bundleBuilder.build().bundle())
+                        .metadata(BundleMetadata.builder()
+                                .name(input.name)
+                                .description(input.description)
+                                .build())
+                        .build())
+                .build();
+    }
+
+    public static class Input {
+        @ArgGroup(exclusive = false)
+        CreateAwsServiceBundleInput cliInput;
+
+        @ArgGroup(multiplicity = "1")
+        JsonInput jsonInput;
+
+    }
+
+    public static class CreateAwsServiceBundleInput extends CreateBundleInput {
+        @Parameters(description = "Name of aws service to create the bundle for.")
+        String awsServiceName;
+
+        @Option(names = {"-a", "--allowed-apis"}, description = "List of APIs to expose in the MCP server")
+        protected Set<String> allowedApis;
+
+        @Option(names = {"-b", "--blocked-apis"}, description = "List of APIs to hide in the MCP server")
+        protected Set<String> blockedApis;
+
+        @Option(names = "--read-only-apis",
+                description = "Include read only APIs in the MCP server")
+        protected Boolean readOnlyApis;
+    }
+}
diff --git a/aws/aws-mcp-cli-commands/src/main/resources/META-INF/services/software.amazon.smithy.java.mcp.cli.AbstractCreateBundle b/aws/aws-mcp-cli-commands/src/main/resources/META-INF/services/software.amazon.smithy.java.mcp.cli.AbstractCreateBundle
@@ -0,0 +1 @@
+software.amazon.smithy.java.aws.mcp.cli.commands.CreateAwsServiceBundle
diff --git a/mcp/mcp-bundle-api/src/main/java/software/amazon/smithy/mcp/bundle/api/ModifiableRegistry.java b/mcp/mcp-bundle-api/src/main/java/software/amazon/smithy/mcp/bundle/api/ModifiableRegistry.java
@@ -7,6 +7,6 @@
 
 import software.amazon.smithy.mcp.bundle.api.model.Bundle;
 
-public interface ModifiableRegistry extends Registry {
-    void publishBundle(Bundle bundle);
+public interface ModifiableRegistry<T> extends Registry {
+    void publishBundle(Bundle bundle, T args);
 }
diff --git a/mcp/mcp-cli-api/build.gradle.kts b/mcp/mcp-cli-api/build.gradle.kts
@@ -51,6 +51,10 @@ tasks.named("compileJava") {
     dependsOn("smithyBuild")
 }
 
+tasks.withType<JavaCompile> {
+    options.release.set(21)
+}
+
 // Needed because sources-jar needs to run after smithy-build is done
 tasks.sourcesJar {
     mustRunAfter(tasks.compileJava)
diff --git a/mcp/mcp-cli-api/model/main.smithy b/mcp/mcp-cli-api/model/main.smithy
@@ -33,6 +33,11 @@ structure CommonToolConfig {
 
     @required
     bundleLocation: Location
+
+    @default(false)
+    local: PrimitiveBoolean
+
+    description: String
 }
 
 map Registries {
diff --git a/mcp/mcp-cli-api/src/main/java/software/amazon/smithy/java/mcp/cli/AbstractCreateBundle.java b/mcp/mcp-cli-api/src/main/java/software/amazon/smithy/java/mcp/cli/AbstractCreateBundle.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.java.mcp.cli;
+
+import static picocli.CommandLine.Option;
+
+import picocli.CommandLine.ArgGroup;
+import software.amazon.smithy.mcp.bundle.api.model.Bundle;
+
+public abstract class AbstractCreateBundle<T extends AbstractCreateBundle.CreateBundleInput> extends SmithyMcpCommand {
+
+    public abstract static class CreateBundleInput {
+        @Option(names = "--overwrite",
+                description = "Overwrite existing MCP server.",
+                defaultValue = "false")
+        boolean overwrite;
+
+        @Option(names = {"-n", "--name"}, description = "Name to assign to the MCP server. Eg: (aws-dynamodb-mcp)",
+                required = true)
+        public String name;
+
+        @Option(names = {"-d", "--description"}, description = "Description of this mcp server", required = true)
+        public String description;
+
+        @ArgGroup
+        ClientsInput clientsInput;
+    }
+
+    public static class JsonInput {
+        @Option(names = {"--input"}, description = "Provide the input in json format.", required = true)
+        String inputJson;
+
+        @Option(names = {"--input-file"}, description = "Provide path to a file which contains input in json format.",
+                required = true)
+        String inputJsonFile;
+    }
+
+    @Override
+    protected void execute(ExecutionContext context) throws Exception {
+        var input = getInput();
+        var config = context.config();
+        if (!input.overwrite && config.getToolBundles().containsKey(input.name)) {
+            throw new IllegalArgumentException("Tool bundle " + input.name
+                    + " already exists. Either choose a new name or pass --overwrite to overwrite the existing tool bundle");
+        }
+
+        var bundle = getNewBundle(input);
+        ConfigUtils.addMcpBundle(config, input.name, bundle, true);
+        ConfigUtils.createWrapperAndUpdateClientConfigs(input.name, bundle, config, input.clientsInput);
+        System.out.println("Successfully created bundle " + input.name);
+    }
+
+    protected abstract T getInput();
+
+    protected abstract Bundle getNewBundle(T input);
+}
diff --git a/mcp/mcp-cli-api/src/main/java/software/amazon/smithy/java/mcp/cli/ClientsInput.java b/mcp/mcp-cli-api/src/main/java/software/amazon/smithy/java/mcp/cli/ClientsInput.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.java.mcp.cli;
+
+import java.util.Set;
+import picocli.CommandLine.Option;
+
+public final class ClientsInput {
+    @Option(names = {"--clients"},
+            description = "Names of client configs to update. If not specified all client configs registered would be updated")
+    public Set<String> clients = Set.of();
+
+    @Option(names = "--print-client-config",
+            description = "If specified will not edit the client configs and only print to console.")
+    public Boolean print;
+}
diff --git a/mcp/mcp-cli-api/src/main/java/software/amazon/smithy/java/mcp/cli/ConfigUtils.java b/mcp/mcp-cli-api/src/main/java/software/amazon/smithy/java/mcp/cli/ConfigUtils.java
@@ -41,6 +41,7 @@
 import software.amazon.smithy.mcp.bundle.api.model.Bundle;
 import software.amazon.smithy.mcp.bundle.api.model.ExecSpec;
 import software.amazon.smithy.mcp.bundle.api.model.GenericBundle;
+import software.amazon.smithy.mcp.bundle.api.model.SmithyMcpBundle;
 
 /**
  * Utility class for managing Smithy MCP configuration files.
@@ -282,38 +283,48 @@ private static Set<ClientConfig> getClientConfigsToUpdate(Config config, Set<Str
         return clientConfigsToUpdate;
     }
 
-    private static void addMcpBundle(Config config, String toolBundleName, CliBundle mcpBundleConfig)
+    private static void writeMcpBundle(String toolBundleName, Bundle bundle)
             throws IOException {
-        var serializedBundle = toJson(mcpBundleConfig.mcpBundle());
+        var serializedBundle = toJson(bundle);
         Files.write(getBundleFileLocation(toolBundleName),
                 serializedBundle,
                 StandardOpenOption.TRUNCATE_EXISTING,
                 StandardOpenOption.CREATE);
-        addMcpBundleConfig(config, toolBundleName, mcpBundleConfig.mcpBundleConfig());
     }
 
     public static McpBundleConfig addMcpBundle(Config config, String toolBundleName, Bundle bundle)
             throws IOException {
+        return addMcpBundle(config, toolBundleName, bundle, false);
+    }
+
+    public static McpBundleConfig addMcpBundle(Config config, String toolBundleName, Bundle bundle, boolean isLocal)
+            throws IOException {
         var location = Location.builder()
                 .fileLocation(ConfigUtils.getBundleFileLocation(toolBundleName).toString())
                 .build();
         var builder = McpBundleConfig.builder();
-        switch (bundle.type()) {
-            case smithyBundle -> builder.smithyModeled(SmithyModeledBundleConfig.builder()
+        switch (bundle.getValue()) {
+            case SmithyMcpBundle smithyBundle -> builder.smithyModeled(SmithyModeledBundleConfig.builder()
                     .name(toolBundleName)
+                    .description(smithyBundle.getMetadata().getDescription())
                     .bundleLocation(location)
+                    .local(isLocal)
                     .build());
-            case genericBundle -> {
-                GenericBundle genericBundle = bundle.getValue();
+            case GenericBundle genericBundle -> {
                 install(genericBundle.getInstall());
                 builder.genericConfig(
-                        GenericToolBundleConfig.builder().name(toolBundleName).bundleLocation(location).build());
+                        GenericToolBundleConfig.builder()
+                                .name(toolBundleName)
+                                .local(isLocal)
+                                .bundleLocation(location)
+                                .description(genericBundle.getMetadata().getDescription())
+                                .build());
             }
             default -> throw new IllegalStateException("Unexpected bundle type: " + bundle.type());
         }
 
         var mcpBundleConfig = builder.build();
-        addMcpBundle(config, toolBundleName, new CliBundle(bundle, mcpBundleConfig));
+        writeMcpBundle(toolBundleName, bundle);
         addMcpBundleConfig(config, toolBundleName, mcpBundleConfig);
         return mcpBundleConfig;
     }
@@ -489,4 +500,48 @@ private static void printUnixPathInstructions(String shimsDirStr) {
         System.out.println("Add this line to your shell profile (~/.bashrc, ~/.zshrc, etc.) to make it permanent");
         System.out.println();
     }
+
+    public static void createWrapperAndUpdateClientConfigs(
+            String name,
+            Bundle bundle,
+            Config config,
+            ClientsInput input
+    ) throws IOException {
+        boolean shouldCreateWrapper = true;
+        List<String> args = List.of();
+        String command = name;
+        if (bundle.getValue() instanceof GenericBundle genericBundle && genericBundle.isExecuteDirectly()) {
+            command = genericBundle.getRun().getExecutable();
+            args = genericBundle.getRun().getArgs();
+            shouldCreateWrapper = false;
+        }
+
+        if (shouldCreateWrapper) {
+            createWrapperScript(name);
+            ensureMcpServersDirInPath();
+        }
+
+        var newClientConfig = McpServerConfig.builder()
+                .command(command)
+                .args(args)
+                .build();
+        //By default, print the output if there are no configured client configs.
+        Set<String> clientConfigs;
+        boolean print;
+        if (input == null) {
+            clientConfigs = config.getClientConfigs().stream().map(ClientConfig::getName).collect(Collectors.toSet());
+            print = clientConfigs.isEmpty();
+        } else {
+            print = input.print;
+            clientConfigs = input.clients;
+        }
+
+        if (print) {
+            System.out.println("You can add the following to your MCP Servers config to use " + name);
+            var serializedConfig = ByteBufferUtils.getBytes(JSON_CODEC.serialize(newClientConfig));
+            System.out.println(new String(serializedConfig, StandardCharsets.UTF_8));
+        } else {
+            addToClientConfigs(config, name, clientConfigs, newClientConfig);
+        }
+    }
 }
diff --git a/mcp/mcp-cli/src/main/java/software/amazon/smithy/java/mcp/cli/McpCli.java b/mcp/mcp-cli/src/main/java/software/amazon/smithy/java/mcp/cli/McpCli.java
@@ -9,6 +9,8 @@
 import java.util.ServiceLoader;
 import picocli.CommandLine;
 import software.amazon.smithy.java.mcp.cli.commands.Configure;
+import software.amazon.smithy.java.mcp.cli.commands.CreateBundle;
+import software.amazon.smithy.java.mcp.cli.commands.CreateGenericBundle;
 import software.amazon.smithy.java.mcp.cli.commands.InstallBundle;
 import software.amazon.smithy.java.mcp.cli.commands.ListBundles;
 import software.amazon.smithy.java.mcp.cli.commands.StartServer;
@@ -31,12 +33,17 @@ public static void main(String[] args) {
         addSystemProperties();
         var configureCommand = new CommandLine(new Configure());
         discoverConfigurationCommands().forEach(configureCommand::addSubcommand);
+        var createCommand = new CommandLine(new CreateBundle())
+                .addSubcommand(new CreateGenericBundle());
+        discoverCreateBundleCommands().forEach(createCommand::addSubcommand);
         var commandLine = new CommandLine(new McpRegistry())
                 .addSubcommand(new StartServer())
                 .addSubcommand(new ListBundles())
                 .addSubcommand(new InstallBundle())
                 .addSubcommand(new UninstallBundle())
-                .addSubcommand(configureCommand);
+                .addSubcommand(configureCommand)
+                .addSubcommand(createCommand);
+        discoverSmithyMcpCommands().forEach(commandLine::addSubcommand);
         System.exit(commandLine.execute(args));
     }
 
@@ -55,4 +62,28 @@ private static List<ConfigurationCommand> discoverConfigurationCommands() {
                 .map(ServiceLoader.Provider::get)
                 .toList();
     }
+
+    /**
+     * Discovers and loads all AbstractCreateBundle implementations using the Java ServiceLoader.
+     *
+     * @return A list of discovered configuration commands
+     */
+    private static List<AbstractCreateBundle> discoverCreateBundleCommands() {
+        return ServiceLoader.load(AbstractCreateBundle.class)
+                .stream()
+                .map(ServiceLoader.Provider::get)
+                .toList();
+    }
+
+    /**
+     * Discovers and loads all AbstractCreateBundle implementations using the Java ServiceLoader.
+     *
+     * @return A list of discovered configuration commands
+     */
+    private static List<SmithyMcpCommand> discoverSmithyMcpCommands() {
+        return ServiceLoader.load(SmithyMcpCommand.class)
+                .stream()
+                .map(ServiceLoader.Provider::get)
+                .toList();
+    }
 }
diff --git a/mcp/mcp-cli/src/main/java/software/amazon/smithy/java/mcp/cli/commands/Configure.java b/mcp/mcp-cli/src/main/java/software/amazon/smithy/java/mcp/cli/commands/Configure.java
diff --git a/mcp/mcp-cli/src/main/java/software/amazon/smithy/java/mcp/cli/commands/CreateBundle.java b/mcp/mcp-cli/src/main/java/software/amazon/smithy/java/mcp/cli/commands/CreateBundle.java
diff --git a/mcp/mcp-cli/src/main/java/software/amazon/smithy/java/mcp/cli/commands/CreateGenericBundle.java b/mcp/mcp-cli/src/main/java/software/amazon/smithy/java/mcp/cli/commands/CreateGenericBundle.java
diff --git a/mcp/mcp-cli/src/main/java/software/amazon/smithy/java/mcp/cli/commands/InstallBundle.java b/mcp/mcp-cli/src/main/java/software/amazon/smithy/java/mcp/cli/commands/InstallBundle.java
diff --git a/mcp/mcp-cli/src/main/java/software/amazon/smithy/java/mcp/cli/commands/ListBundles.java b/mcp/mcp-cli/src/main/java/software/amazon/smithy/java/mcp/cli/commands/ListBundles.java

Original file line number	Diff line number	Diff line change
`@@ -24,3 +24,7 @@ dependencies {`
`24`	`24`	`tasks.compileJava {`
`25`	`25`	`options.compilerArgs.add("-Aproject=${project.name}")`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+tasks.withType<JavaCompile> {`
	`29`	`+ options.release.set(21)`
	`30`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+software.amazon.smithy.java.aws.mcp.cli.commands.CreateAwsServiceBundle`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`
`8`	`8`	`import software.amazon.smithy.mcp.bundle.api.model.Bundle;`
`9`	`9`
`10`		`-public interface ModifiableRegistry extends Registry {`
`11`		`- void publishBundle(Bundle bundle);`
	`10`	`+public interface ModifiableRegistry<T> extends Registry {`
	`11`	`+ void publishBundle(Bundle bundle, T args);`
`12`	`12`	`}`