Merge branch 'main' into install-lots-of-servers

Author: rhernandez35

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

@@ -34,24 +34,25 @@ public class AddAwsServiceBundle extends AbstractAddBundle {
     @Option(names = {"-b", "--blocked-apis"}, description = "List of APIs to hide in the MCP server")
     protected Set<String> blockedApis;
 
-    @Option(names = "--include-write-apis",
-            description = "Include write APIs in the MCP server")
-    Boolean includeWriteApis;
+    @Option(names = "--read-only-apis",
+            description = "Include read only APIs in the MCP server",
+            defaultValue = "true")
+    protected boolean readOnlyApis;
 
     @Override
     protected CliBundle getNewToolConfig() {
         var bundleBuilder = AwsServiceBundler.builder()
                 .serviceName(awsServiceName);
-        //If nothing is specified then default to only readOnlyOperations.
+        if (readOnlyApis) {
+            // Include read-only apis unless disabled
+            bundleBuilder.readOnlyOperations();
+        }
         if (allowedApis != null) {
             // User explicitly specified allowed APIs - use only those
             bundleBuilder.exposedOperations(allowedApis);
-        } else if (includeWriteApis == null || !includeWriteApis) {
-            // Default case or explicit false - read-only operations
-            bundleBuilder.readOnlyOperations();
         }
-        // Always apply blocked operations if specified
         if (blockedApis != null) {
+            // Always apply blocked operations if specified
             bundleBuilder.blockedOperations(blockedApis);
         }
         var bundle = bundleBuilder.build().bundle();

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ jmh = "0.7.3"
 test-logger-plugin = "4.0.0"
 spotbugs = "6.0.22"
 spotless = "7.0.4"
-smithy-gradle-plugins = "1.2.0"
+smithy-gradle-plugins = "1.3.0"
 assertj = "3.27.3"
 jackson = "2.19.0"
 netty = "4.2.2.Final"

mcp/mcp-cli-api/src/main/java/software/amazon/smithy/java/mcp/cli/ConfigUtils.java

@@ -15,6 +15,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -53,8 +54,12 @@ private ConfigUtils() {}
             .serializeTypeInDocuments(false)
             .build();
 
+    private static final String OS = System.getProperty("os.name").toLowerCase();
+    private static final boolean WINDOWS = OS.contains("windows");
+
     private static final Path CONFIG_DIR = resolveFromHomeDir(".config", "smithy-mcp");
     private static final Path BUNDLE_DIR = CONFIG_DIR.resolve("bundles");
+    private static final Path SHIMS_DIR = CONFIG_DIR.resolve("mcp-servers");
     private static final Path CONFIG_PATH = CONFIG_DIR.resolve("config.json");
 
     private static final DefaultConfigProvider DEFAULT_CONFIG_PROVIDER;
@@ -63,6 +68,7 @@ private ConfigUtils() {}
         try {
             ensureDirectoryExists(CONFIG_DIR);
             ensureDirectoryExists(BUNDLE_DIR);
+            ensureDirectoryExists(SHIMS_DIR);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -169,6 +175,8 @@ public static void removeMcpBundle(Config currentConfig, String bundleName) thro
         updateConfig(newConfig);
         var bundleFile = getBundleFileLocation(bundleName);
         Files.deleteIfExists(bundleFile);
+        // Remove wrapper script if it exists
+        removeWrapperScript(bundleName);
     }
 
     public static void addToClientConfigs(Config config, String name, Set<String> clients, McpServerConfig serverConfig)
@@ -333,4 +341,112 @@ private static String captureProcessOutput(Process process) throws IOException {
             return in.lines().collect(Collectors.joining(System.lineSeparator()));
         }
     }
+
+    public static void createWrapperScript(String bundleName) throws IOException {
+        Path scriptPath = SHIMS_DIR.resolve(bundleName);
+        String scriptContent = createScriptContent(bundleName);
+
+        Files.writeString(scriptPath, scriptContent, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+        scriptPath.toFile().setExecutable(true);
+    }
+
+    private static String createScriptContent(String bundleName) {
+        if (WINDOWS) {
+            return "@echo off\nmcp-registry start-server " + bundleName + " %*\n";
+        } else {
+            return "#!/bin/bash\nexec mcp-registry start-server " + bundleName + " \"$@\"\n";
+        }
+    }
+
+    public static void removeWrapperScript(String bundleName) throws IOException {
+        Path scriptPath = SHIMS_DIR.resolve(bundleName);
+        Files.deleteIfExists(scriptPath);
+    }
+
+    public static boolean isMcpServersDirInPath() {
+        String pathEnv = System.getenv("PATH");
+        if (pathEnv == null) {
+            return false;
+        }
+
+        String shimsDirStr = SHIMS_DIR.toAbsolutePath().toString();
+        return pathEnv.contains(shimsDirStr);
+    }
+
+    public static void ensureMcpServersDirInPath() {
+        if (isMcpServersDirInPath()) {
+            return;
+        }
+
+        String shimsDirStr = SHIMS_DIR.toAbsolutePath().toString();
+
+        if (WINDOWS) {
+            printWindowsPathInstructions(shimsDirStr);
+        } else {
+            if (!tryAddToShellConfigs(shimsDirStr)) {
+                printUnixPathInstructions(shimsDirStr);
+            }
+        }
+    }
+
+    private static boolean tryAddToShellConfigs(String shimsDirStr) {
+        var pathExport = "export PATH=\"" + shimsDirStr + ":$PATH\"";
+        var comment = "# Added by smithy-mcp";
+        var configFiles = List.of(".zshrc", ".bashrc", ".profile", ".bash_profile");
+
+        String addedTo = null;
+
+        for (var configFile : configFiles) {
+            var configPath = resolveFromHomeDir(configFile);
+
+            if (Files.exists(configPath) && Files.isWritable(configPath)) {
+                try {
+                    // Check if already present
+                    var lines = new ArrayList<>(Files.readAllLines(configPath, StandardCharsets.UTF_8));
+                    boolean alreadyPresent = lines.stream()
+                            .anyMatch(line -> line.contains(shimsDirStr)
+                                    && line.contains("PATH")
+                                    && !(line.trim().startsWith("#")));
+
+                    if (!alreadyPresent) {
+                        // Add the export statement
+                        lines.add("");
+                        lines.add(comment);
+                        lines.add(pathExport);
+
+                        Files.write(configPath,
+                                lines,
+                                StandardCharsets.UTF_8,
+                                StandardOpenOption.WRITE,
+                                StandardOpenOption.TRUNCATE_EXISTING);
+
+                        System.out.println("Added mcp-servers directory to PATH in " + configFile);
+                        addedTo = configFile;
+                    }
+                } catch (IOException e) {
+                    // Continue to next config file if this one fails
+                }
+            }
+        }
+
+        if (addedTo != null) {
+            System.out.println("Please restart your shell or run 'source ~/" + configFiles + "' to reload your PATH");
+            return true;
+        }
+        return false;
+    }
+
+    private static void printWindowsPathInstructions(String shimsDirStr) {
+        System.out.println("\nTo use the installed bundle as a command, add the mcp-servers directory to your PATH:");
+        System.out.println("  set PATH=" + shimsDirStr + ";%PATH%");
+        System.out.println("Or permanently add it through System Properties > Environment Variables");
+        System.out.println();
+    }
+
+    private static void printUnixPathInstructions(String shimsDirStr) {
+        System.out.println("\nTo use the installed bundle as a command, add the mcp-servers directory to your PATH:");
+        System.out.println("  export PATH=\"" + shimsDirStr + ":$PATH\"");
+        System.out.println("Add this line to your shell profile (~/.bashrc, ~/.zshrc, etc.) to make it permanent");
+        System.out.println();
+    }
 }

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

@@ -44,12 +44,22 @@ protected void execute(ExecutionContext context) throws IOException {
         for (var name : names) {
             var bundle = registry.getMcpBundle(name);
             ConfigUtils.addMcpBundle(config, name, bundle);
-            var command = "mcp-registry";
-            var args = List.of("start-server", name);
+
+            var command = name;
+            List<String> args = null;
+            boolean shouldCreateWrapper = true;
+
             if (bundle.getValue() instanceof GenericBundle genericBundle && genericBundle.isExecuteDirectly()) {
                 command = genericBundle.getRun().getExecutable();
                 args = genericBundle.getRun().getArgs();
+                shouldCreateWrapper = false;
+            }
+
+            if (shouldCreateWrapper) {
+                ConfigUtils.createWrapperScript(name);
+                ConfigUtils.ensureMcpServersDirInPath();
             }
+
             var newClientConfig = McpServerConfig.builder()
                     .command(command)
                     .args(args)
@@ -61,6 +71,7 @@ protected void execute(ExecutionContext context) throws IOException {
             ConfigUtils.addToClientConfigs(config, name, clients, newClientConfig);
 
             System.out.println("Successfully installed " + name);
+
             if (print) {
                 System.out.println("You can add the following to your MCP Servers config to use " + name);
                 System.out.println(newClientConfig);