Merge pull request #211 from docker/add-mcp-workingset-servers

Add server search feature to workingsets

Author: bobbyhouse

cmd/docker-mcp/commands/workingset.go

@@ -21,6 +21,7 @@ func workingSetCommand() *cobra.Command {
 	cmd.AddCommand(importWorkingSetCommand())
 	cmd.AddCommand(showWorkingSetCommand())
 	cmd.AddCommand(listWorkingSetsCommand())
+	cmd.AddCommand(serversCommand())
 	cmd.AddCommand(pushWorkingSetCommand())
 	cmd.AddCommand(pullWorkingSetCommand())
 	cmd.AddCommand(createWorkingSetCommand())
@@ -199,3 +200,55 @@ func removeWorkingSetCommand() *cobra.Command {
 		},
 	}
 }
+
+func serversCommand() *cobra.Command {
+	var opts struct {
+		WorkingSetID string
+		Filter       string
+		Format       string
+	}
+
+	cmd := &cobra.Command{
+		Use:   "servers",
+		Short: "List servers across working sets",
+		Long: `List all servers grouped by working set.
+
+Use --filter to search for servers matching a query (case-insensitive substring matching on image names or source URLs).
+Use --workingset to show servers only from a specific working set.`,
+		Example: `  # List all servers across all working sets
+  docker mcp workingset servers
+
+  # Filter servers by name
+  docker mcp workingset servers --filter github
+
+  # Show servers from a specific working set
+  docker mcp workingset servers --workingset my-dev-env
+
+  # Combine filter and working set
+  docker mcp workingset servers --workingset my-dev-env --filter slack
+
+  # Output in JSON format
+  docker mcp workingset servers --format json`,
+		Args: cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			supported := slices.Contains(workingset.SupportedFormats(), opts.Format)
+			if !supported {
+				return fmt.Errorf("unsupported format: %s", opts.Format)
+			}
+
+			dao, err := db.New()
+			if err != nil {
+				return err
+			}
+
+			return workingset.Servers(cmd.Context(), dao, opts.Filter, opts.WorkingSetID, workingset.OutputFormat(opts.Format))
+		},
+	}
+
+	flags := cmd.Flags()
+	flags.StringVarP(&opts.WorkingSetID, "workingset", "w", "", "Show servers only from specified working set")
+	flags.StringVar(&opts.Filter, "filter", "", "Filter servers by image name or source URL")
+	flags.StringVar(&opts.Format, "format", string(workingset.OutputFormatHumanReadable), fmt.Sprintf("Supported: %s.", strings.Join(workingset.SupportedFormats(), ", ")))
+
+	return cmd
+}

pkg/db/workingset.go

@@ -14,6 +14,7 @@ type WorkingSetDAO interface {
 	CreateWorkingSet(ctx context.Context, workingSet WorkingSet) error
 	UpdateWorkingSet(ctx context.Context, workingSet WorkingSet) error
 	RemoveWorkingSet(ctx context.Context, id string) error
+	SearchWorkingSets(ctx context.Context, query string, workingSetID string) ([]WorkingSet, error)
 }
 
 type ServerList []Server
@@ -134,3 +135,26 @@ func (d *dao) ListWorkingSets(ctx context.Context) ([]WorkingSet, error) {
 	}
 	return workingSets, nil
 }
+
+func (d *dao) SearchWorkingSets(ctx context.Context, query string, workingSetID string) ([]WorkingSet, error) {
+	sqlQuery := `
+		SELECT id, name, servers, secrets
+		FROM working_set
+		WHERE ($1 = '' OR id = $1)
+		  AND ($2 = '' OR EXISTS (
+			SELECT 1
+			FROM json_each(servers)
+			WHERE LOWER(json_extract(value, '$.image')) LIKE '%' || LOWER($2) || '%'
+			   OR LOWER(json_extract(value, '$.source')) LIKE '%' || LOWER($2) || '%'
+		  ))
+		ORDER BY id
+	`
+	args := []any{workingSetID, query}
+
+	var workingSets []WorkingSet
+	err := d.db.SelectContext(ctx, &workingSets, sqlQuery, args...)
+	if err != nil {
+		return nil, err
+	}
+	return workingSets, nil
+}