diff --git a/output/schema/schema.json b/output/schema/schema.json
index afa9cf1439..c2d816bea1 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -33001,7 +33001,7 @@
           }
         }
       ],
-      "specLocation": "_types/Geo.ts#L135-L140"
+      "specLocation": "_types/Geo.ts#L138-L143"
     },
     {
       "kind": "enum",
@@ -34139,7 +34139,7 @@
         "name": "GeoBounds",
         "namespace": "_types"
       },
-      "specLocation": "_types/Geo.ts#L116-L129",
+      "specLocation": "_types/Geo.ts#L119-L132",
       "type": {
         "items": [
           {
@@ -34331,7 +34331,7 @@
           }
         }
       ],
-      "specLocation": "_types/Geo.ts#L112-L114"
+      "specLocation": "_types/Geo.ts#L115-L117"
     },
     {
       "codegenNames": [
@@ -34365,6 +34365,22 @@
         "kind": "union_of"
       }
     },
+    {
+      "description": "A map hex cell (H3) reference",
+      "kind": "type_alias",
+      "name": {
+        "name": "GeoHexCell",
+        "namespace": "_types"
+      },
+      "specLocation": "_types/Geo.ts#L86-L87",
+      "type": {
+        "kind": "instance_of",
+        "type": {
+          "name": "string",
+          "namespace": "_builtins"
+        }
+      }
+    },
     {
       "description": "A GeoJson GeoLine.",
       "kind": "interface",
@@ -34419,7 +34435,7 @@
         "name": "GeoLocation",
         "namespace": "_types"
       },
-      "specLocation": "_types/Geo.ts#L91-L105",
+      "specLocation": "_types/Geo.ts#L94-L108",
       "type": {
         "items": [
           {
@@ -35534,7 +35550,7 @@
           }
         }
       ],
-      "specLocation": "_types/Geo.ts#L107-L110"
+      "specLocation": "_types/Geo.ts#L110-L113"
     },
     {
       "kind": "enum",
@@ -38932,7 +38948,7 @@
           }
         }
       ],
-      "specLocation": "_types/Geo.ts#L142-L145"
+      "specLocation": "_types/Geo.ts#L145-L148"
     },
     {
       "kind": "interface",
@@ -38964,7 +38980,7 @@
           }
         }
       ],
-      "specLocation": "_types/Geo.ts#L147-L150"
+      "specLocation": "_types/Geo.ts#L150-L153"
     },
     {
       "kind": "interface",
@@ -39420,7 +39436,7 @@
           }
         }
       ],
-      "specLocation": "_types/Geo.ts#L131-L133"
+      "specLocation": "_types/Geo.ts#L134-L136"
     },
     {
       "kind": "interface",
@@ -39662,7 +39678,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L557-L559",
+      "specLocation": "_types/aggregations/Aggregate.ts#L572-L574",
       "variantName": "adjacency_matrix"
     },
     {
@@ -39731,7 +39747,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L561-L563"
+      "specLocation": "_types/aggregations/Aggregate.ts#L576-L578"
     },
     {
       "kind": "type_alias",
@@ -39739,7 +39755,7 @@
         "name": "Aggregate",
         "namespace": "_types.aggregations"
       },
-      "specLocation": "_types/aggregations/Aggregate.ts#L31-L114",
+      "specLocation": "_types/aggregations/Aggregate.ts#L38-L122",
       "type": {
         "items": [
           {
@@ -40057,6 +40073,13 @@
               "namespace": "_types.aggregations"
             }
           },
+          {
+            "kind": "instance_of",
+            "type": {
+              "name": "GeoHexGridAggregate",
+              "namespace": "_types.aggregations"
+            }
+          },
           {
             "kind": "instance_of",
             "type": {
@@ -40238,7 +40261,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L125-L127"
+      "specLocation": "_types/aggregations/Aggregate.ts#L133-L135"
     },
     {
       "kind": "type_alias",
@@ -41345,7 +41368,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L151-L155"
+      "specLocation": "_types/aggregations/Aggregate.ts#L159-L163"
     },
     {
       "inherits": {
@@ -41381,7 +41404,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L347-L351",
+      "specLocation": "_types/aggregations/Aggregate.ts#L355-L359",
       "variantName": "auto_date_histogram"
     },
     {
@@ -41549,7 +41572,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L200-L201",
+      "specLocation": "_types/aggregations/Aggregate.ts#L208-L209",
       "variantName": "avg"
     },
     {
@@ -41720,7 +41743,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L682-L698",
+      "specLocation": "_types/aggregations/Aggregate.ts#L697-L713",
       "variantName": "box_plot"
     },
     {
@@ -41978,7 +42001,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L224-L227",
+      "specLocation": "_types/aggregations/Aggregate.ts#L232-L235",
       "variantName": "bucket_metric_value"
     },
     {
@@ -42142,7 +42165,7 @@
         "name": "Buckets",
         "namespace": "_types.aggregations"
       },
-      "specLocation": "_types/aggregations/Aggregate.ts#L307-L316",
+      "specLocation": "_types/aggregations/Aggregate.ts#L315-L324",
       "type": {
         "items": [
           {
@@ -42314,7 +42337,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L129-L132",
+      "specLocation": "_types/aggregations/Aggregate.ts#L137-L140",
       "variantName": "cardinality"
     },
     {
@@ -42614,7 +42637,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L752-L753",
+      "specLocation": "_types/aggregations/Aggregate.ts#L767-L768",
       "variantName": "children"
     },
     {
@@ -42678,7 +42701,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L602-L607",
+      "specLocation": "_types/aggregations/Aggregate.ts#L617-L622",
       "variantName": "composite"
     },
     {
@@ -42852,7 +42875,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L609-L611"
+      "specLocation": "_types/aggregations/Aggregate.ts#L624-L626"
     },
     {
       "description": "Result of the `cumulative_cardinality` aggregation",
@@ -42891,7 +42914,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L723-L731",
+      "specLocation": "_types/aggregations/Aggregate.ts#L738-L746",
       "variantName": "simple_long_value"
     },
     {
@@ -42995,7 +43018,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L339-L340",
+      "specLocation": "_types/aggregations/Aggregate.ts#L347-L348",
       "variantName": "date_histogram"
     },
     {
@@ -43256,7 +43279,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L342-L345"
+      "specLocation": "_types/aggregations/Aggregate.ts#L350-L353"
     },
     {
       "description": "Result of a `date_range` aggregation. Same format as a for a `range` aggregation: `from` and `to`\nin `buckets` are milliseconds since the Epoch, represented as a floating point number.",
@@ -43272,7 +43295,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L527-L532",
+      "specLocation": "_types/aggregations/Aggregate.ts#L542-L547",
       "variantName": "date_range"
     },
     {
@@ -43439,7 +43462,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L218-L222",
+      "specLocation": "_types/aggregations/Aggregate.ts#L226-L230",
       "variantName": "derivative"
     },
     {
@@ -43551,7 +43574,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L402-L407",
+      "specLocation": "_types/aggregations/Aggregate.ts#L410-L415",
       "variantName": "dterms"
     },
     {
@@ -43593,7 +43616,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L409-L412"
+      "specLocation": "_types/aggregations/Aggregate.ts#L417-L420"
     },
     {
       "kind": "interface",
@@ -43941,7 +43964,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L269-L287",
+      "specLocation": "_types/aggregations/Aggregate.ts#L277-L295",
       "variantName": "extended_stats"
     },
     {
@@ -43984,7 +44007,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L289-L290",
+      "specLocation": "_types/aggregations/Aggregate.ts#L297-L298",
       "variantName": "extended_stats_bucket"
     },
     {
@@ -44062,7 +44085,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L486-L487",
+      "specLocation": "_types/aggregations/Aggregate.ts#L494-L495",
       "variantName": "filter"
     },
     {
@@ -44087,7 +44110,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L552-L553",
+      "specLocation": "_types/aggregations/Aggregate.ts#L567-L568",
       "variantName": "filters"
     },
     {
@@ -44175,7 +44198,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L555-L555"
+      "specLocation": "_types/aggregations/Aggregate.ts#L570-L570"
     },
     {
       "inherits": {
@@ -44278,7 +44301,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L294-L297",
+      "specLocation": "_types/aggregations/Aggregate.ts#L302-L305",
       "variantName": "geo_bounds"
     },
     {
@@ -44344,7 +44367,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L299-L303",
+      "specLocation": "_types/aggregations/Aggregate.ts#L307-L311",
       "variantName": "geo_centroid"
     },
     {
@@ -44399,7 +44422,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L534-L538",
+      "specLocation": "_types/aggregations/Aggregate.ts#L549-L553",
       "variantName": "geo_distance"
     },
     {
@@ -44498,7 +44521,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L497-L499",
+      "specLocation": "_types/aggregations/Aggregate.ts#L505-L507",
       "variantName": "geohash_grid"
     },
     {
@@ -44600,7 +44623,62 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L501-L503"
+      "specLocation": "_types/aggregations/Aggregate.ts#L509-L511"
+    },
+    {
+      "inherits": {
+        "generics": [
+          {
+            "kind": "instance_of",
+            "type": {
+              "name": "GeoHexGridBucket",
+              "namespace": "_types.aggregations"
+            }
+          }
+        ],
+        "type": {
+          "name": "MultiBucketAggregateBase",
+          "namespace": "_types.aggregations"
+        }
+      },
+      "kind": "interface",
+      "name": {
+        "name": "GeoHexGridAggregate",
+        "namespace": "_types.aggregations"
+      },
+      "properties": [],
+      "specLocation": "_types/aggregations/Aggregate.ts#L521-L522",
+      "variantName": "geohex_grid"
+    },
+    {
+      "attachedBehaviors": [
+        "AdditionalProperties"
+      ],
+      "inherits": {
+        "type": {
+          "name": "MultiBucketBase",
+          "namespace": "_types.aggregations"
+        }
+      },
+      "kind": "interface",
+      "name": {
+        "name": "GeoHexGridBucket",
+        "namespace": "_types.aggregations"
+      },
+      "properties": [
+        {
+          "name": "key",
+          "required": true,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "GeoHexCell",
+              "namespace": "_types"
+            }
+          }
+        }
+      ],
+      "specLocation": "_types/aggregations/Aggregate.ts#L524-L526"
     },
     {
       "inherits": {
@@ -44645,7 +44723,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L760-L767",
+      "specLocation": "_types/aggregations/Aggregate.ts#L775-L782",
       "variantName": "geo_line"
     },
     {
@@ -44777,7 +44855,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L505-L507",
+      "specLocation": "_types/aggregations/Aggregate.ts#L513-L515",
       "variantName": "geotile_grid"
     },
     {
@@ -44879,7 +44957,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L509-L511"
+      "specLocation": "_types/aggregations/Aggregate.ts#L517-L519"
     },
     {
       "inherits": {
@@ -44975,7 +45053,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L483-L484",
+      "specLocation": "_types/aggregations/Aggregate.ts#L491-L492",
       "variantName": "global"
     },
     {
@@ -45048,7 +45126,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L160-L161",
+      "specLocation": "_types/aggregations/Aggregate.ts#L168-L169",
       "variantName": "hdr_percentile_ranks"
     },
     {
@@ -45064,7 +45142,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L157-L158",
+      "specLocation": "_types/aggregations/Aggregate.ts#L165-L166",
       "variantName": "hdr_percentiles"
     },
     {
@@ -45089,7 +45167,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L331-L332",
+      "specLocation": "_types/aggregations/Aggregate.ts#L339-L340",
       "variantName": "histogram"
     },
     {
@@ -45286,7 +45364,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L334-L337"
+      "specLocation": "_types/aggregations/Aggregate.ts#L342-L345"
     },
     {
       "kind": "interface",
@@ -45571,7 +45649,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L635-L646",
+      "specLocation": "_types/aggregations/Aggregate.ts#L650-L661",
       "variantName": "inference"
     },
     {
@@ -45642,7 +45720,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L660-L663"
+      "specLocation": "_types/aggregations/Aggregate.ts#L675-L678"
     },
     {
       "kind": "interface",
@@ -45725,7 +45803,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L654-L658"
+      "specLocation": "_types/aggregations/Aggregate.ts#L669-L673"
     },
     {
       "kind": "interface",
@@ -45768,7 +45846,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L648-L652"
+      "specLocation": "_types/aggregations/Aggregate.ts#L663-L667"
     },
     {
       "inherits": {
@@ -45792,7 +45870,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L613-L614",
+      "specLocation": "_types/aggregations/Aggregate.ts#L628-L629",
       "variantName": "ip_prefix"
     },
     {
@@ -45947,7 +46025,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L616-L621"
+      "specLocation": "_types/aggregations/Aggregate.ts#L631-L636"
     },
     {
       "inherits": {
@@ -45971,7 +46049,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L540-L542",
+      "specLocation": "_types/aggregations/Aggregate.ts#L555-L557",
       "variantName": "ip_range"
     },
     {
@@ -46132,7 +46210,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L544-L548"
+      "specLocation": "_types/aggregations/Aggregate.ts#L559-L563"
     },
     {
       "kind": "type_alias",
@@ -46140,7 +46218,7 @@
         "name": "KeyedPercentiles",
         "namespace": "_types.aggregations"
       },
-      "specLocation": "_types/aggregations/Aggregate.ts#L149-L149",
+      "specLocation": "_types/aggregations/Aggregate.ts#L157-L157",
       "type": {
         "key": {
           "kind": "instance_of",
@@ -46237,7 +46315,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L422-L427",
+      "specLocation": "_types/aggregations/Aggregate.ts#L430-L435",
       "variantName": "lrareterms"
     },
     {
@@ -46279,7 +46357,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L429-L432"
+      "specLocation": "_types/aggregations/Aggregate.ts#L437-L440"
     },
     {
       "description": "Result of a `terms` aggregation when the field is some kind of whole number like a integer, long, or a date.",
@@ -46304,7 +46382,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L390-L395",
+      "specLocation": "_types/aggregations/Aggregate.ts#L398-L403",
       "variantName": "lterms"
     },
     {
@@ -46346,7 +46424,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L397-L400"
+      "specLocation": "_types/aggregations/Aggregate.ts#L405-L408"
     },
     {
       "inherits": {
@@ -46436,7 +46514,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L733-L737",
+      "specLocation": "_types/aggregations/Aggregate.ts#L748-L752",
       "variantName": "matrix_stats"
     },
     {
@@ -46584,7 +46662,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L739-L748"
+      "specLocation": "_types/aggregations/Aggregate.ts#L754-L763"
     },
     {
       "inherits": {
@@ -46599,7 +46677,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L191-L192",
+      "specLocation": "_types/aggregations/Aggregate.ts#L199-L200",
       "variantName": "max"
     },
     {
@@ -46645,7 +46723,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L185-L186",
+      "specLocation": "_types/aggregations/Aggregate.ts#L193-L194",
       "variantName": "median_absolute_deviation"
     },
     {
@@ -46731,7 +46809,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L188-L189",
+      "specLocation": "_types/aggregations/Aggregate.ts#L196-L197",
       "variantName": "min"
     },
     {
@@ -46849,7 +46927,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L474-L475",
+      "specLocation": "_types/aggregations/Aggregate.ts#L482-L483",
       "variantName": "missing"
     },
     {
@@ -47148,7 +47226,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L318-L320"
+      "specLocation": "_types/aggregations/Aggregate.ts#L326-L328"
     },
     {
       "attachedBehaviors": [
@@ -47197,7 +47275,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L322-L329"
+      "specLocation": "_types/aggregations/Aggregate.ts#L330-L337"
     },
     {
       "kind": "interface",
@@ -47242,7 +47320,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L452-L454",
+      "specLocation": "_types/aggregations/Aggregate.ts#L460-L462",
       "variantName": "multi_terms"
     },
     {
@@ -47405,7 +47483,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L456-L460"
+      "specLocation": "_types/aggregations/Aggregate.ts#L464-L468"
     },
     {
       "kind": "interface",
@@ -47455,7 +47533,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L477-L478",
+      "specLocation": "_types/aggregations/Aggregate.ts#L485-L486",
       "variantName": "nested"
     },
     {
@@ -47557,7 +47635,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L755-L756",
+      "specLocation": "_types/aggregations/Aggregate.ts#L770-L771",
       "variantName": "parent"
     },
     {
@@ -47681,7 +47759,7 @@
         "name": "Percentiles",
         "namespace": "_types.aggregations"
       },
-      "specLocation": "_types/aggregations/Aggregate.ts#L141-L142",
+      "specLocation": "_types/aggregations/Aggregate.ts#L149-L150",
       "type": {
         "items": [
           {
@@ -47730,7 +47808,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L137-L139"
+      "specLocation": "_types/aggregations/Aggregate.ts#L145-L147"
     },
     {
       "inherits": {
@@ -47808,7 +47886,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L169-L170",
+      "specLocation": "_types/aggregations/Aggregate.ts#L177-L178",
       "variantName": "percentiles_bucket"
     },
     {
@@ -47901,7 +47979,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L515-L516",
+      "specLocation": "_types/aggregations/Aggregate.ts#L530-L531",
       "variantName": "range"
     },
     {
@@ -48062,7 +48140,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L518-L525"
+      "specLocation": "_types/aggregations/Aggregate.ts#L533-L540"
     },
     {
       "inherits": {
@@ -48193,7 +48271,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L717-L721",
+      "specLocation": "_types/aggregations/Aggregate.ts#L732-L736",
       "variantName": "rate"
     },
     {
@@ -48266,7 +48344,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L480-L481",
+      "specLocation": "_types/aggregations/Aggregate.ts#L488-L489",
       "variantName": "reverse_nested"
     },
     {
@@ -48312,7 +48390,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L489-L490",
+      "specLocation": "_types/aggregations/Aggregate.ts#L497-L498",
       "variantName": "sampler"
     },
     {
@@ -48403,7 +48481,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L625-L628",
+      "specLocation": "_types/aggregations/Aggregate.ts#L640-L643",
       "variantName": "scripted_metric"
     },
     {
@@ -48533,7 +48611,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L572-L574",
+      "specLocation": "_types/aggregations/Aggregate.ts#L587-L589",
       "variantName": "siglterms"
     },
     {
@@ -48575,7 +48653,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L581-L584"
+      "specLocation": "_types/aggregations/Aggregate.ts#L596-L599"
     },
     {
       "inherits": {
@@ -48599,7 +48677,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L586-L588",
+      "specLocation": "_types/aggregations/Aggregate.ts#L601-L603",
       "variantName": "sigsterms"
     },
     {
@@ -48630,7 +48708,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L590-L592"
+      "specLocation": "_types/aggregations/Aggregate.ts#L605-L607"
     },
     {
       "generics": [
@@ -48683,7 +48761,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L565-L570"
+      "specLocation": "_types/aggregations/Aggregate.ts#L580-L585"
     },
     {
       "inherits": {
@@ -48905,7 +48983,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L576-L579"
+      "specLocation": "_types/aggregations/Aggregate.ts#L591-L594"
     },
     {
       "inherits": {
@@ -49173,7 +49251,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L215-L216",
+      "specLocation": "_types/aggregations/Aggregate.ts#L223-L224",
       "variantName": "simple_value"
     },
     {
@@ -49229,7 +49307,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L464-L472"
+      "specLocation": "_types/aggregations/Aggregate.ts#L472-L480"
     },
     {
       "inherits": {
@@ -49280,7 +49358,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L174-L183"
+      "specLocation": "_types/aggregations/Aggregate.ts#L182-L191"
     },
     {
       "kind": "interface",
@@ -49428,7 +49506,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L251-L258"
+      "specLocation": "_types/aggregations/Aggregate.ts#L259-L266"
     },
     {
       "kind": "interface",
@@ -49504,7 +49582,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L260-L267"
+      "specLocation": "_types/aggregations/Aggregate.ts#L268-L275"
     },
     {
       "description": "Statistics aggregation result. `min`, `max` and `avg` are missing if there were no values to process\n(`count` is zero).",
@@ -49656,7 +49734,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L231-L246",
+      "specLocation": "_types/aggregations/Aggregate.ts#L239-L254",
       "variantName": "stats"
     },
     {
@@ -49687,7 +49765,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L248-L249",
+      "specLocation": "_types/aggregations/Aggregate.ts#L256-L257",
       "variantName": "stats_bucket"
     },
     {
@@ -49728,7 +49806,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L434-L438",
+      "specLocation": "_types/aggregations/Aggregate.ts#L442-L446",
       "variantName": "srareterms"
     },
     {
@@ -49759,7 +49837,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L440-L442"
+      "specLocation": "_types/aggregations/Aggregate.ts#L448-L450"
     },
     {
       "inherits": {
@@ -49945,7 +50023,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L669-L680",
+      "specLocation": "_types/aggregations/Aggregate.ts#L684-L695",
       "variantName": "string_stats"
     },
     {
@@ -49998,7 +50076,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L375-L380",
+      "specLocation": "_types/aggregations/Aggregate.ts#L383-L388",
       "variantName": "sterms"
     },
     {
@@ -50029,7 +50107,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L386-L388"
+      "specLocation": "_types/aggregations/Aggregate.ts#L394-L396"
     },
     {
       "description": "Sum aggregation result. `value` is always present and is zero if there were no values to process.",
@@ -50045,7 +50123,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L194-L198",
+      "specLocation": "_types/aggregations/Aggregate.ts#L202-L206",
       "variantName": "sum"
     },
     {
@@ -50112,7 +50190,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L166-L167",
+      "specLocation": "_types/aggregations/Aggregate.ts#L174-L175",
       "variantName": "tdigest_percentile_ranks"
     },
     {
@@ -50128,7 +50206,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L163-L164",
+      "specLocation": "_types/aggregations/Aggregate.ts#L171-L172",
       "variantName": "tdigest_percentiles"
     },
     {
@@ -50179,7 +50257,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L711-L715",
+      "specLocation": "_types/aggregations/Aggregate.ts#L726-L730",
       "variantName": "t_test"
     },
     {
@@ -50301,7 +50379,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L368-L373"
+      "specLocation": "_types/aggregations/Aggregate.ts#L376-L381"
     },
     {
       "inherits": {
@@ -50561,7 +50639,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L382-L384"
+      "specLocation": "_types/aggregations/Aggregate.ts#L390-L392"
     },
     {
       "codegenNames": [
@@ -50744,7 +50822,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L630-L633",
+      "specLocation": "_types/aggregations/Aggregate.ts#L645-L648",
       "variantName": "top_hits"
     },
     {
@@ -50974,7 +51052,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L705-L709"
+      "specLocation": "_types/aggregations/Aggregate.ts#L720-L724"
     },
     {
       "inherits": {
@@ -51004,7 +51082,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L700-L703",
+      "specLocation": "_types/aggregations/Aggregate.ts#L715-L718",
       "variantName": "top_metrics"
     },
     {
@@ -51115,7 +51193,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L444-L450",
+      "specLocation": "_types/aggregations/Aggregate.ts#L452-L458",
       "variantName": "umrareterms"
     },
     {
@@ -51134,7 +51212,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L492-L493",
+      "specLocation": "_types/aggregations/Aggregate.ts#L500-L501",
       "variantName": "unmapped_sampler"
     },
     {
@@ -51160,7 +51238,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L594-L600",
+      "specLocation": "_types/aggregations/Aggregate.ts#L609-L615",
       "variantName": "umsigterms"
     },
     {
@@ -51186,7 +51264,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L414-L420",
+      "specLocation": "_types/aggregations/Aggregate.ts#L422-L428",
       "variantName": "umterms"
     },
     {
@@ -51203,7 +51281,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L209-L213",
+      "specLocation": "_types/aggregations/Aggregate.ts#L217-L221",
       "variantName": "value_count"
     },
     {
@@ -51283,7 +51361,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L353-L355",
+      "specLocation": "_types/aggregations/Aggregate.ts#L361-L363",
       "variantName": "variable_width_histogram"
     },
     {
@@ -51423,7 +51501,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L357-L364"
+      "specLocation": "_types/aggregations/Aggregate.ts#L365-L372"
     },
     {
       "inherits": {
@@ -51542,7 +51620,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L203-L207",
+      "specLocation": "_types/aggregations/Aggregate.ts#L211-L215",
       "variantName": "weighted_avg"
     },
     {
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index 4c68a66944..742f02807d 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -2036,6 +2036,8 @@ export interface GeoHashLocation {
 
 export type GeoHashPrecision = number | string
 
+export type GeoHexCell = string
+
 export interface GeoLine {
   type: string
   coordinates: double[][]
@@ -2599,7 +2601,7 @@ export interface AggregationsAdjacencyMatrixBucketKeys extends AggregationsMulti
 export type AggregationsAdjacencyMatrixBucket = AggregationsAdjacencyMatrixBucketKeys
   & { [property: string]: AggregationsAggregate | string | long }
 
-export type AggregationsAggregate = AggregationsCardinalityAggregate | AggregationsHdrPercentilesAggregate | AggregationsHdrPercentileRanksAggregate | AggregationsTDigestPercentilesAggregate | AggregationsTDigestPercentileRanksAggregate | AggregationsPercentilesBucketAggregate | AggregationsMedianAbsoluteDeviationAggregate | AggregationsMinAggregate | AggregationsMaxAggregate | AggregationsSumAggregate | AggregationsAvgAggregate | AggregationsWeightedAvgAggregate | AggregationsValueCountAggregate | AggregationsSimpleValueAggregate | AggregationsDerivativeAggregate | AggregationsBucketMetricValueAggregate | AggregationsStatsAggregate | AggregationsStatsBucketAggregate | AggregationsExtendedStatsAggregate | AggregationsExtendedStatsBucketAggregate | AggregationsGeoBoundsAggregate | AggregationsGeoCentroidAggregate | AggregationsHistogramAggregate | AggregationsDateHistogramAggregate | AggregationsAutoDateHistogramAggregate | AggregationsVariableWidthHistogramAggregate | AggregationsStringTermsAggregate | AggregationsLongTermsAggregate | AggregationsDoubleTermsAggregate | AggregationsUnmappedTermsAggregate | AggregationsLongRareTermsAggregate | AggregationsStringRareTermsAggregate | AggregationsUnmappedRareTermsAggregate | AggregationsMultiTermsAggregate | AggregationsMissingAggregate | AggregationsNestedAggregate | AggregationsReverseNestedAggregate | AggregationsGlobalAggregate | AggregationsFilterAggregate | AggregationsChildrenAggregate | AggregationsParentAggregate | AggregationsSamplerAggregate | AggregationsUnmappedSamplerAggregate | AggregationsGeoHashGridAggregate | AggregationsGeoTileGridAggregate | AggregationsRangeAggregate | AggregationsDateRangeAggregate | AggregationsGeoDistanceAggregate | AggregationsIpRangeAggregate | AggregationsIpPrefixAggregate | AggregationsFiltersAggregate | AggregationsAdjacencyMatrixAggregate | AggregationsSignificantLongTermsAggregate | AggregationsSignificantStringTermsAggregate | AggregationsUnmappedSignificantTermsAggregate | AggregationsCompositeAggregate | AggregationsScriptedMetricAggregate | AggregationsTopHitsAggregate | AggregationsInferenceAggregate | AggregationsStringStatsAggregate | AggregationsBoxPlotAggregate | AggregationsTopMetricsAggregate | AggregationsTTestAggregate | AggregationsRateAggregate | AggregationsCumulativeCardinalityAggregate | AggregationsMatrixStatsAggregate | AggregationsGeoLineAggregate
+export type AggregationsAggregate = AggregationsCardinalityAggregate | AggregationsHdrPercentilesAggregate | AggregationsHdrPercentileRanksAggregate | AggregationsTDigestPercentilesAggregate | AggregationsTDigestPercentileRanksAggregate | AggregationsPercentilesBucketAggregate | AggregationsMedianAbsoluteDeviationAggregate | AggregationsMinAggregate | AggregationsMaxAggregate | AggregationsSumAggregate | AggregationsAvgAggregate | AggregationsWeightedAvgAggregate | AggregationsValueCountAggregate | AggregationsSimpleValueAggregate | AggregationsDerivativeAggregate | AggregationsBucketMetricValueAggregate | AggregationsStatsAggregate | AggregationsStatsBucketAggregate | AggregationsExtendedStatsAggregate | AggregationsExtendedStatsBucketAggregate | AggregationsGeoBoundsAggregate | AggregationsGeoCentroidAggregate | AggregationsHistogramAggregate | AggregationsDateHistogramAggregate | AggregationsAutoDateHistogramAggregate | AggregationsVariableWidthHistogramAggregate | AggregationsStringTermsAggregate | AggregationsLongTermsAggregate | AggregationsDoubleTermsAggregate | AggregationsUnmappedTermsAggregate | AggregationsLongRareTermsAggregate | AggregationsStringRareTermsAggregate | AggregationsUnmappedRareTermsAggregate | AggregationsMultiTermsAggregate | AggregationsMissingAggregate | AggregationsNestedAggregate | AggregationsReverseNestedAggregate | AggregationsGlobalAggregate | AggregationsFilterAggregate | AggregationsChildrenAggregate | AggregationsParentAggregate | AggregationsSamplerAggregate | AggregationsUnmappedSamplerAggregate | AggregationsGeoHashGridAggregate | AggregationsGeoTileGridAggregate | AggregationsGeoHexGridAggregate | AggregationsRangeAggregate | AggregationsDateRangeAggregate | AggregationsGeoDistanceAggregate | AggregationsIpRangeAggregate | AggregationsIpPrefixAggregate | AggregationsFiltersAggregate | AggregationsAdjacencyMatrixAggregate | AggregationsSignificantLongTermsAggregate | AggregationsSignificantStringTermsAggregate | AggregationsUnmappedSignificantTermsAggregate | AggregationsCompositeAggregate | AggregationsScriptedMetricAggregate | AggregationsTopHitsAggregate | AggregationsInferenceAggregate | AggregationsStringStatsAggregate | AggregationsBoxPlotAggregate | AggregationsTopMetricsAggregate | AggregationsTTestAggregate | AggregationsRateAggregate | AggregationsCumulativeCardinalityAggregate | AggregationsMatrixStatsAggregate | AggregationsGeoLineAggregate
 
 export interface AggregationsAggregateBase {
   meta?: Metadata
@@ -3082,6 +3084,15 @@ export interface AggregationsGeoHashGridBucketKeys extends AggregationsMultiBuck
 export type AggregationsGeoHashGridBucket = AggregationsGeoHashGridBucketKeys
   & { [property: string]: AggregationsAggregate | GeoHash | long }
 
+export interface AggregationsGeoHexGridAggregate extends AggregationsMultiBucketAggregateBase<AggregationsGeoHexGridBucket> {
+}
+
+export interface AggregationsGeoHexGridBucketKeys extends AggregationsMultiBucketBase {
+  key: GeoHexCell
+}
+export type AggregationsGeoHexGridBucket = AggregationsGeoHexGridBucketKeys
+  & { [property: string]: AggregationsAggregate | GeoHexCell | long }
+
 export interface AggregationsGeoLineAggregate extends AggregationsAggregateBase {
   type: string
   geometry: GeoLine
diff --git a/specification/_types/Geo.ts b/specification/_types/Geo.ts
index 4ae000cd34..6bf523ef51 100644
--- a/specification/_types/Geo.ts
+++ b/specification/_types/Geo.ts
@@ -83,6 +83,9 @@ export type GeoHash = string
 /** A map tile reference, represented as `{zoom}/{x}/{y}` */
 export type GeoTile = string
 
+/** A map hex cell (H3) reference */
+export type GeoHexCell = string
+
 export class LatLon {
   lat: double
   lon: double
diff --git a/specification/_types/aggregations/Aggregate.ts b/specification/_types/aggregations/Aggregate.ts
index 96aa9b99e7..8a57755bd0 100644
--- a/specification/_types/aggregations/Aggregate.ts
+++ b/specification/_types/aggregations/Aggregate.ts
@@ -22,7 +22,14 @@ import { AdditionalProperties, AdditionalProperty } from '@spec_utils/behaviors'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { AggregateName, Field, FieldValue, Metadata } from '@_types/common'
-import { GeoBounds, GeoHash, GeoLine, GeoLocation, GeoTile } from '@_types/Geo'
+import {
+  GeoBounds,
+  GeoHash,
+  GeoHexCell,
+  GeoLine,
+  GeoLocation,
+  GeoTile
+} from '@_types/Geo'
 import { double, integer, long } from '@_types/Numeric'
 import { DurationLarge, EpochTime, UnitMillis } from '@_types/Time'
 import { Void } from '@spec_utils/VoidValue'
@@ -86,6 +93,7 @@ export type Aggregate =
   // Geo grid
   | GeoHashGridAggregate
   | GeoTileGridAggregate
+  | GeoHexGridAggregate
   // Range
   | RangeAggregate
   | DateRangeAggregate
@@ -510,6 +518,13 @@ export class GeoTileGridBucket extends MultiBucketBase {
   key: GeoTile
 }
 
+/** @variant name=geohex_grid */
+export class GeoHexGridAggregate extends MultiBucketAggregateBase<GeoHexGridBucket> {}
+
+export class GeoHexGridBucket extends MultiBucketBase {
+  key: GeoHexCell
+}
+
 //----- Ranges
 
 /** @variant name=range */