Add pagination to list

Author: adwsingh

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

@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.stream.Stream;
 import software.amazon.smithy.java.aws.servicebundle.bundler.AwsServiceBundler;
 import software.amazon.smithy.mcp.bundle.api.Registry;
 import software.amazon.smithy.mcp.bundle.api.model.Bundle;
@@ -51,8 +52,8 @@ public String name() {
     }
 
     @Override
-    public List<RegistryEntry> listMcpBundles() {
-        return availableMcpBundles;
+    public Stream<RegistryEntry> listMcpBundles() {
+        return availableMcpBundles.stream();
     }
 
     @Override

gradle/libs.versions.toml

@@ -16,6 +16,7 @@ osdetector = "1.7.3"
 accp = "2.4.1" # Amazon Corretto Crypto Provider
 jreleaser = "1.19.0"
 picocli = "4.7.7"
+jline = "3.30.4"
 graalvm-native = "0.11.0"
 shadow = "8.3.8"
 
@@ -46,6 +47,8 @@ netty-all = {module = "io.netty:netty-all", version.ref = "netty"}
 # CLI related dependencies
 picocli = { module = "info.picocli:picocli", version.ref = "picocli" }
 picocli-codegen = { module = "info.picocli:picocli-codegen", version.ref = "picocli" }
+jline-terminal = { module = "org.jline:jline-terminal", version.ref = "jline" }
+jline-reader = { module = "org.jline:jline-reader", version.ref = "jline" }
 
 # Test dependencies
 junit-bom = { module = "org.junit:junit-bom", version.ref = "junit5" }

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

@@ -5,7 +5,7 @@
 
 package software.amazon.smithy.mcp.bundle.api;
 
-import java.util.List;
+import java.util.stream.Stream;
 import software.amazon.smithy.mcp.bundle.api.model.Bundle;
 import software.amazon.smithy.mcp.bundle.api.model.BundleMetadata;
 
@@ -39,7 +39,7 @@ public BundleMetadata getBundleMetadata() {
 
     String name();
 
-    List<RegistryEntry> listMcpBundles();
+    Stream<RegistryEntry> listMcpBundles();
 
     Bundle getMcpBundle(String id);
 

mcp/mcp-cli/build.gradle.kts

@@ -20,6 +20,8 @@ dependencies {
     implementation(project(":codecs:json-codec", configuration = "shadow"))
     implementation(libs.picocli)
     annotationProcessor(libs.picocli.codegen)
+    implementation(libs.jline.terminal)
+    implementation(libs.jline.reader)
     api(project(":mcp:mcp-cli-api"))
     api(project(":mcp:mcp-schemas"))
     implementation(libs.smithy.utils)

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

@@ -7,13 +7,17 @@
 
 import static picocli.CommandLine.Command;
 
+import java.util.Map;
+import org.jline.terminal.Terminal;
+import org.jline.terminal.TerminalBuilder;
 import picocli.CommandLine;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Spec;
 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.java.mcp.cli.model.GenericToolBundleConfig;
+import software.amazon.smithy.java.mcp.cli.model.McpBundleConfig;
 import software.amazon.smithy.java.mcp.cli.model.SmithyModeledBundleConfig;
 import software.amazon.smithy.mcp.bundle.api.Registry;
 
@@ -38,25 +42,7 @@ protected void execute(ExecutionContext context) {
                 .string("@|bold,underline Registry MCP Servers:|@"));
         System.out.println();
 
-        // Display registry bundles
-        for (Registry.RegistryEntry entry : registry.listMcpBundles()) {
-            var bundle = entry.getBundleMetadata();
-            var installedBundle = installedBundles.get(bundle.getId());
-            //If there is a local bundle with the same name, prefer that.
-            boolean isInstalled = installedBundle != null;
-            boolean hasLocalOverride = isInstalled && switch (installedBundle.getValue()) {
-                case SmithyModeledBundleConfig config -> config.isLocal();
-                case GenericToolBundleConfig config -> config.isLocal();
-                default -> false;
-            };
-            String tag = null;
-            if (hasLocalOverride) {
-                tag = "locally-overriden";
-            } else if (isInstalled) {
-                tag = "installed";
-            }
-            printBundleInfo(commandLine, bundle.getId(), bundle.getName(), bundle.getDescription(), tag);
-        }
+        displayRegistryBundlesPaginated(registry, installedBundles, commandLine);
 
         var localBundles = context.config()
                 .getToolBundles()
@@ -97,6 +83,46 @@ protected String registryToUse(Config config) {
         return registryName;
     }
 
+    private void displayRegistryBundlesPaginated(
+            Registry registry,
+            Map<String, McpBundleConfig> installedBundles,
+            CommandLine commandLine
+    ) {
+        var registryIterator = registry.listMcpBundles().iterator();
+        int displayedCount = 0;
+        final int pageSize = 10;
+
+        while (registryIterator.hasNext()) {
+            if (displayedCount > 0 && displayedCount % pageSize == 0) {
+                System.out.println("Press down arrow for more...");
+                if (!waitForDownArrow()) {
+                    break;
+                }
+            }
+
+            var entry = registryIterator.next();
+            var bundle = entry.getBundleMetadata();
+            var installedBundle = installedBundles.get(bundle.getId());
+
+            boolean isInstalled = installedBundle != null;
+            boolean hasLocalOverride = isInstalled && switch (installedBundle.getValue()) {
+                case SmithyModeledBundleConfig config -> config.isLocal();
+                case GenericToolBundleConfig config -> config.isLocal();
+                default -> false;
+            };
+
+            String tag = null;
+            if (hasLocalOverride) {
+                tag = "locally-overriden";
+            } else if (isInstalled) {
+                tag = "installed";
+            }
+
+            printBundleInfo(commandLine, bundle.getId(), bundle.getName(), bundle.getDescription(), tag);
+            displayedCount++;
+        }
+    }
+
     private void printBundleInfo(
             CommandLine commandLine,
             String bundleId,
@@ -116,4 +142,24 @@ private void printBundleInfo(
         System.out.println(description);
         System.out.println();
     }
+
+    private boolean waitForDownArrow() {
+        try (Terminal terminal = TerminalBuilder.builder()
+                .system(true)
+                .build()) {
+            terminal.enterRawMode();
+            int ch = terminal.reader().read();
+
+            if (ch == 27) {
+                int bracket = terminal.reader().read();
+                if (bracket == 91) {
+                    int arrow = terminal.reader().read();
+                    return arrow == 66;
+                }
+            }
+            return false;
+        } catch (Exception e) {
+            return false;
+        }
+    }
 }