fix(amplitude): validate retention brackets, require formula param, add segmentation 2nd group-by

- Retention now validates retentionBrackets as a JSON array and requires it when retentionMode is "bracket", matching the block UI's requirement
- Event Segmentation now throws if metric is "formula" but no formula is provided, matching the block UI's requirement
- Event Segmentation now supports a documented second group-by property via groupBy2/g2
- Corrected Get Active Users' group-by copy — Amplitude's docs don't document a second-property syntax for /api/2/users the way they do for segmentation's g2, so the field no longer overpromises "max two"

Author: waleedlatif1

apps/sim/blocks/blocks/amplitude.ts

@@ -498,6 +498,14 @@ export const AmplitudeBlock: BlockConfig = {
       condition: { field: 'operation', value: 'event_segmentation' },
       mode: 'advanced',
     },
+    {
+      id: 'segmentationGroupBy2',
+      title: 'Group By (2nd Property)',
+      type: 'short-input',
+      placeholder: 'Second property name (prefix custom with "gp:")',
+      condition: { field: 'operation', value: 'event_segmentation' },
+      mode: 'advanced',
+    },
     {
       id: 'segmentationLimit',
       title: 'Limit',
@@ -605,7 +613,7 @@ export const AmplitudeBlock: BlockConfig = {
       id: 'activeUsersGroupBy',
       title: 'Group By',
       type: 'short-input',
-      placeholder: 'Property name (max two)',
+      placeholder: 'Property name',
       condition: { field: 'operation', value: 'get_active_users' },
       mode: 'advanced',
     },
@@ -966,6 +974,7 @@ export const AmplitudeBlock: BlockConfig = {
             if (params.segmentationMetric) result.metric = params.segmentationMetric
             if (params.segmentationInterval) result.interval = params.segmentationInterval
             if (params.segmentationGroupBy) result.groupBy = params.segmentationGroupBy
+            if (params.segmentationGroupBy2) result.groupBy2 = params.segmentationGroupBy2
             if (params.segmentationLimit) result.limit = params.segmentationLimit
             if (params.segmentationFilters) result.filters = params.segmentationFilters
             if (params.segmentationFormula) result.formula = params.segmentationFormula
@@ -1049,6 +1058,10 @@ export const AmplitudeBlock: BlockConfig = {
     dataResidency: { type: 'string', description: 'Data residency region: "us" or "eu"' },
     segmentationFilters: { type: 'string', description: 'Event segmentation filters JSON' },
     segmentationFormula: { type: 'string', description: 'Event segmentation formula expression' },
+    segmentationGroupBy2: {
+      type: 'string',
+      description: 'Event segmentation second group-by property',
+    },
     segmentationSegment: {
       type: 'string',
       description: 'Event segmentation segment definition JSON',

apps/sim/tools/amplitude/event_segmentation.ts

@@ -65,6 +65,12 @@ export const eventSegmentationTool: ToolConfig<
       visibility: 'user-or-llm',
       description: 'Property name to group by (prefix custom user properties with "gp:")',
     },
+    groupBy2: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Second property name to group by (prefix custom user properties with "gp:")',
+    },
     limit: {
       type: 'string',
       required: false,
@@ -118,12 +124,19 @@ export const eventSegmentationTool: ToolConfig<
         event.filters = parsedFilters
       }
 
+      if (params.metric === 'formula' && !params.formula) {
+        throw new Error(
+          'Amplitude Event Segmentation: "formula" is required when metric is "formula"'
+        )
+      }
+
       url.searchParams.set('e', JSON.stringify(event))
       url.searchParams.set('start', params.start)
       url.searchParams.set('end', params.end)
       if (params.metric) url.searchParams.set('m', params.metric)
       if (params.interval) url.searchParams.set('i', params.interval)
       if (params.groupBy) url.searchParams.set('g', params.groupBy)
+      if (params.groupBy2) url.searchParams.set('g2', params.groupBy2)
       if (params.limit) url.searchParams.set('limit', params.limit)
       if (params.formula) url.searchParams.set('formula', params.formula)
       if (params.segment) url.searchParams.set('s', params.segment)

apps/sim/tools/amplitude/get_active_users.ts

@@ -55,7 +55,7 @@ export const getActiveUsersTool: ToolConfig<
       type: 'string',
       required: false,
       visibility: 'user-or-llm',
-      description: 'Property name to group by (max two)',
+      description: 'Property name to group by',
     },
     segment: {
       type: 'string',

apps/sim/tools/amplitude/retention.ts

@@ -110,7 +110,27 @@ export const retentionTool: ToolConfig<AmplitudeRetentionParams, AmplitudeRetent
       url.searchParams.set('start', params.start)
       url.searchParams.set('end', params.end)
       if (params.retentionMode) url.searchParams.set('rm', params.retentionMode)
-      if (params.retentionBrackets) url.searchParams.set('rb', params.retentionBrackets)
+
+      if (params.retentionMode === 'bracket') {
+        if (!params.retentionBrackets) {
+          throw new Error(
+            'Amplitude Retention: "retentionBrackets" is required when Retention Mode is "bracket"'
+          )
+        }
+        let parsedBrackets: unknown
+        try {
+          parsedBrackets = JSON.parse(params.retentionBrackets)
+        } catch {
+          parsedBrackets = undefined
+        }
+        if (!Array.isArray(parsedBrackets)) {
+          throw new Error(
+            'Amplitude Retention: "retentionBrackets" must be a valid JSON array of day ranges, e.g. [[0,4]]'
+          )
+        }
+        url.searchParams.set('rb', JSON.stringify(parsedBrackets))
+      }
+
       if (params.interval) url.searchParams.set('i', params.interval)
       if (params.groupBy) url.searchParams.set('g', params.groupBy)
       if (params.segment) url.searchParams.set('s', params.segment)

apps/sim/tools/amplitude/types.ts

@@ -168,6 +168,7 @@ export interface AmplitudeEventSegmentationParams extends AmplitudeBasicAuthPara
   metric?: string
   interval?: string
   groupBy?: string
+  groupBy2?: string
   limit?: string
   /** JSON array of filter objects applied to the event (subprop_type, subprop_key, subprop_op, subprop_value). */
   filters?: string
@@ -194,7 +195,7 @@ export interface AmplitudeGetActiveUsersParams extends AmplitudeBasicAuthParams
   end: string
   metric?: string
   interval?: string
-  /** Property to group by (up to two). */
+  /** Property to group by. */
   groupBy?: string
   /** JSON segment definition(s) applied to the query. */
   segment?: string