Merge pull request #207 from docker/surface-more-server-info-on-ls

update the output of "docker mcp server ls" to surface more details

Author: austin5456

cmd/docker-mcp/catalog/show.go

@@ -11,10 +11,10 @@ import (
 
 	"github.com/docker/cli/cli/command"
 	"github.com/mikefarah/yq/v4/pkg/yqlib"
-	"github.com/moby/term"
 	"gopkg.in/yaml.v3"
 
 	"github.com/docker/mcp-gateway/cmd/docker-mcp/hints"
+	"github.com/docker/mcp-gateway/pkg/terminal"
 	"github.com/docker/mcp-gateway/pkg/yq"
 )
 
@@ -119,7 +119,7 @@ func Show(ctx context.Context, dockerCli command.Cli, name string, format Format
 	}
 	keys := getSortedKeys(registry.Registry)
 
-	termWidth := getTerminalWidth()
+	termWidth := terminal.GetWidth()
 	wrapWidth := termWidth - 10
 	if wrapWidth < 40 {
 		wrapWidth = 40
@@ -178,15 +178,6 @@ func isURL(fileOrURL string) bool {
 	return strings.HasPrefix(fileOrURL, "http://") || strings.HasPrefix(fileOrURL, "https://")
 }
 
-func getTerminalWidth() int {
-	fd, _ := term.GetFdInfo(os.Stdout)
-	ws, err := term.GetWinsize(fd)
-	if err != nil {
-		return 80
-	}
-	return int(ws.Width)
-}
-
 func wrapText(text string, width int, indent string) string {
 	words := strings.Fields(text)
 	if len(words) == 0 {

cmd/docker-mcp/commands/server.go

@@ -14,6 +14,7 @@ import (
 	"github.com/docker/mcp-gateway/pkg/config"
 	"github.com/docker/mcp-gateway/pkg/docker"
 	"github.com/docker/mcp-gateway/pkg/oci"
+	"github.com/docker/mcp-gateway/pkg/terminal"
 )
 
 func serverCommand(docker docker.Client, dockerCli command.Cli) *cobra.Command {
@@ -29,7 +30,7 @@ func serverCommand(docker docker.Client, dockerCli command.Cli) *cobra.Command {
 		Short:   "List enabled servers",
 		Args:    cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			list, err := server.List(cmd.Context(), docker)
+			list, err := server.List(cmd.Context(), docker, outputJSON)
 			if err != nil {
 				return err
 			}
@@ -43,8 +44,51 @@ func serverCommand(docker docker.Client, dockerCli command.Cli) *cobra.Command {
 			} else if len(list) == 0 {
 				fmt.Fprintln(cmd.OutOrStdout(), "No server is enabled")
 			} else {
-				fmt.Fprintln(cmd.OutOrStdout(), strings.Join(list, ", "))
+				// Format: $ docker mcp server ls
+				// MCP Servers (7 enabled)
+				//
+				// NAME SECRETS CONFIG DESCRIPTION
+				// atlassian ✓ done ✓ done Confluence and Jira tools
+
+				enabledCount := len(list)
+				fmt.Fprintf(cmd.OutOrStdout(), "\nMCP Servers (%d enabled)\n\n", enabledCount)
+
+				// Calculate column widths based on terminal size
+				termWidth := terminal.GetWidthFrom(cmd.OutOrStdout())
+				colWidths := calculateColumnWidths(termWidth)
+
+				// Calculate total table width (sum of columns + spaces between columns)
+				totalWidth := colWidths.name + colWidths.oauth + colWidths.secrets + colWidths.config + colWidths.description + 4 // 4 spaces between columns
+
+				// Print table headers
+				fmt.Fprintf(cmd.OutOrStdout(), "%-*s %-*s %-*s %-*s %-*s\n",
+					colWidths.name, "NAME",
+					colWidths.oauth, "OAUTH",
+					colWidths.secrets, "SECRETS",
+					colWidths.config, "CONFIG",
+					colWidths.description, "DESCRIPTION")
+				fmt.Fprintln(cmd.OutOrStdout(), strings.Repeat("-", totalWidth))
+
+				// Print entries
+				for _, entry := range list {
+					// Determine secrets, config, and OAuth display strings
+					secretsText := entry.Secrets.DisplayString()
+					configText := entry.Config.DisplayString()
+					oauthText := entry.OAuth.DisplayString()
+
+					// Truncate description to fit within the available column width
+					description := truncateString(entry.Description, colWidths.description)
+
+					fmt.Fprintf(cmd.OutOrStdout(), "%-*s %-*s %-*s %-*s %-*s\n",
+						colWidths.name, truncateString(entry.Name, colWidths.name),
+						colWidths.oauth, oauthText,
+						colWidths.secrets, secretsText,
+						colWidths.config, configText,
+						colWidths.description, description)
+				}
+
 				if hints.Enabled(dockerCli) {
+					fmt.Fprintln(cmd.OutOrStdout(), "")
 					hints.TipCyan.Fprint(cmd.OutOrStdout(), "Tip: To use these servers, connect to a client (IE: claude/cursor) with ")
 					hints.TipCyanBoldItalic.Fprintln(cmd.OutOrStdout(), "docker mcp client connect <client-name>")
 					fmt.Fprintln(cmd.OutOrStdout(), "")
@@ -146,3 +190,58 @@ func serverCommand(docker docker.Client, dockerCli command.Cli) *cobra.Command {
 
 	return cmd
 }
+
+type columnWidths struct {
+	name        int
+	oauth       int
+	secrets     int
+	config      int
+	description int
+}
+
+func calculateColumnWidths(termWidth int) columnWidths {
+	// Minimum widths for each column
+	minWidths := columnWidths{
+		name:        15,
+		oauth:       10,
+		secrets:     10,
+		config:      10,
+		description: 20,
+	}
+
+	// Calculate minimum total width needed
+	minTotal := minWidths.name + minWidths.oauth + minWidths.secrets + minWidths.config + minWidths.description + 4 // 4 spaces
+
+	// If terminal is too narrow, use minimum widths
+	if termWidth < minTotal+20 {
+		return minWidths
+	}
+
+	// Available space after minimums and spacing
+	available := termWidth - minTotal
+
+	// Allocate extra space: 50% to description, 25% to name, 25% split between oauth/secrets/config
+	result := columnWidths{
+		name:        minWidths.name + available/4,
+		oauth:       minWidths.oauth + available/12,
+		secrets:     minWidths.secrets + available/12,
+		config:      minWidths.config + available/12,
+		description: minWidths.description + available/2,
+	}
+
+	return result
+}
+
+func truncateString(s string, maxWidth int) string {
+	if maxWidth <= 0 {
+		return ""
+	}
+	runes := []rune(s)
+	if len(runes) <= maxWidth {
+		return s
+	}
+	if maxWidth > 3 {
+		return string(runes[:maxWidth-3]) + "..."
+	}
+	return string(runes[:maxWidth])
+}