fix(google-analytics): correct metadata schema and null-safe optional params

- DimensionMetadata has no dataType field; split dimension/metric metadata
  shapes and expose category, plus expression on metrics
- Treat null pageSize/limit/offset as omitted so they are not serialized
- Bound provider error body reads and surface pagination truncation
- Keep the property scope on report canvas cards

Author: waleedlatif1

apps/docs/content/docs/en/integrations/google_analytics.mdx

@@ -207,14 +207,16 @@ List the dimensions and metrics available for reporting on a Google Analytics 4
 |   ↳ `apiName` | string | Name used in report requests |
 |   ↳ `uiName` | string | Name shown in the GA4 UI |
 |   ↳ `description` | string | What the dimension measures |
-|   ↳ `type` | string | Value data type |
+|   ↳ `category` | string | Grouping the dimension belongs to, e.g. Page / Screen |
 |   ↳ `customDefinition` | boolean | Whether this is a property-specific custom dimension |
 |   ↳ `deprecatedApiNames` | array | Still-accepted deprecated names |
 | `metrics` | array | Metrics available for reporting |
 |   ↳ `apiName` | string | Name used in report requests |
 |   ↳ `uiName` | string | Name shown in the GA4 UI |
 |   ↳ `description` | string | What the metric measures |
-|   ↳ `type` | string | Value data type |
+|   ↳ `type` | string | Metric value type |
+|   ↳ `expression` | string | Formula for a derived metric |
+|   ↳ `category` | string | Grouping the metric belongs to, e.g. Session |
 |   ↳ `customDefinition` | boolean | Whether this is a property-specific custom metric |
 |   ↳ `deprecatedApiNames` | array | Still-accepted deprecated names |
 | `totalDimensions` | number | Number of dimensions returned |

apps/sim/app/api/tools/google_analytics/accounts/route.ts

@@ -4,6 +4,7 @@ import { googleAnalyticsAccountsSelectorContract } from '@/lib/api/contracts/sel
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { authorizeCredentialUse } from '@/lib/auth/credential-access'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { readResponseTextWithLimit } from '@/lib/core/utils/stream-limits'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import {
   refreshAccessTokenIfNeeded,
@@ -16,6 +17,9 @@ const logger = createLogger('GoogleAnalyticsAccountsAPI')
 
 export const dynamic = 'force-dynamic'
 
+/** Provider error bodies are echoed into logs and the response, so cap what we read. */
+const MAX_ERROR_BODY_BYTES = 32 * 1024
+
 const MAX_ACCOUNT_PAGES = 10
 const ACCOUNT_PAGE_SIZE = 200
 
@@ -84,7 +88,7 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       )
     }
 
-    const { items } = await drainGooglePagedList<AnalyticsAccount, AccountsResponse>({
+    const { items, truncated } = await drainGooglePagedList<AnalyticsAccount, AccountsResponse>({
       buildUrl: (pageToken) => {
         const url = new URL('https://analyticsadmin.googleapis.com/v1beta/accounts')
         url.searchParams.set('pageSize', String(ACCOUNT_PAGE_SIZE))
@@ -98,7 +102,20 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
             'Content-Type': 'application/json',
           },
         }),
-      parseError: (response) => response.json().catch(() => ({})),
+      parseError: async (response) => {
+        try {
+          return JSON.parse(
+            await readResponseTextWithLimit(response, {
+              maxBytes: MAX_ERROR_BODY_BYTES,
+              label: 'Google Analytics accounts error',
+            })
+          )
+        } catch {
+          // An oversized or unparseable provider error must not be materialized into
+          // the log and the response body; the status alone is still actionable.
+          return { error: `Provider returned status ${response.status}` }
+        }
+      },
       getItems: (body) => body.accounts,
       getNextPageToken: (body) => body.nextPageToken,
       maxPages: MAX_ACCOUNT_PAGES,
@@ -109,7 +126,13 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       account.name ? [{ name: account.name, displayName: account.displayName }] : []
     )
 
-    return NextResponse.json({ accounts })
+    if (truncated) {
+      logger.warn('Hit the Google Analytics pagination cap; the accounts picker is incomplete', {
+        returned: accounts.length,
+      })
+    }
+
+    return NextResponse.json({ accounts, truncated })
   } catch (error) {
     if (error instanceof GooglePageError) {
       logger.error('Failed to fetch Google Analytics accounts', {

apps/sim/app/api/tools/google_analytics/properties/route.ts

@@ -4,6 +4,7 @@ import { googleAnalyticsPropertiesSelectorContract } from '@/lib/api/contracts/s
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { authorizeCredentialUse } from '@/lib/auth/credential-access'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { readResponseTextWithLimit } from '@/lib/core/utils/stream-limits'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import {
   refreshAccessTokenIfNeeded,
@@ -16,6 +17,9 @@ const logger = createLogger('GoogleAnalyticsPropertiesAPI')
 
 export const dynamic = 'force-dynamic'
 
+/** Provider error bodies are echoed into logs and the response, so cap what we read. */
+const MAX_ERROR_BODY_BYTES = 32 * 1024
+
 const MAX_ACCOUNT_SUMMARY_PAGES = 10
 const ACCOUNT_SUMMARY_PAGE_SIZE = 200
 
@@ -86,7 +90,10 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       )
     }
 
-    const { items } = await drainGooglePagedList<AccountSummary, AccountSummariesResponse>({
+    const { items, truncated } = await drainGooglePagedList<
+      AccountSummary,
+      AccountSummariesResponse
+    >({
       buildUrl: (pageToken) => {
         const url = new URL('https://analyticsadmin.googleapis.com/v1beta/accountSummaries')
         url.searchParams.set('pageSize', String(ACCOUNT_SUMMARY_PAGE_SIZE))
@@ -100,7 +107,20 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
             'Content-Type': 'application/json',
           },
         }),
-      parseError: (response) => response.json().catch(() => ({})),
+      parseError: async (response) => {
+        try {
+          return JSON.parse(
+            await readResponseTextWithLimit(response, {
+              maxBytes: MAX_ERROR_BODY_BYTES,
+              label: 'Google Analytics account summaries error',
+            })
+          )
+        } catch {
+          // An oversized or unparseable provider error must not be materialized into
+          // the log and the response body; the status alone is still actionable.
+          return { error: `Provider returned status ${response.status}` }
+        }
+      },
       getItems: (body) => body.accountSummaries,
       getNextPageToken: (body) => body.nextPageToken,
       maxPages: MAX_ACCOUNT_SUMMARY_PAGES,
@@ -121,7 +141,13 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       )
     )
 
-    return NextResponse.json({ properties })
+    if (truncated) {
+      logger.warn('Hit the Google Analytics pagination cap; the properties picker is incomplete', {
+        returned: properties.length,
+      })
+    }
+
+    return NextResponse.json({ properties, truncated })
   } catch (error) {
     if (error instanceof GooglePageError) {
       logger.error('Failed to fetch Google Analytics properties', {

apps/sim/blocks/blocks/google_analytics.ts

@@ -68,28 +68,28 @@ export const GoogleAnalyticsBlock: BlockConfig = {
         run_report: [
           { text: 'Report', field: 'metrics', core: true },
           { text: 'by', field: 'dimensions' },
-          { text: 'for property', field: PROPERTY_FIELD },
+          { text: 'for property', field: PROPERTY_FIELD, core: true },
           { text: 'from', field: 'startDate', core: true },
           { text: 'to', field: 'endDate', core: true },
         ],
         run_realtime_report: [
           { text: 'Report realtime', field: 'metrics', core: true },
           { text: 'by', field: 'dimensions' },
-          { text: 'for property', field: PROPERTY_FIELD },
+          { text: 'for property', field: PROPERTY_FIELD, core: true },
         ],
         run_pivot_report: [
           { text: 'Pivot', field: 'metrics', core: true },
           { text: 'by', field: 'dimensions' },
-          { text: 'for property', field: PROPERTY_FIELD },
+          { text: 'for property', field: PROPERTY_FIELD, core: true },
         ],
         check_compatibility: [
           { text: 'Check compatibility of', field: 'metrics', core: true },
           { text: 'with', field: 'dimensions' },
-          { text: 'on property', field: PROPERTY_FIELD },
+          { text: 'on property', field: PROPERTY_FIELD, core: true },
         ],
         get_metadata: [
           'List available dimensions and metrics',
-          { text: 'for property', field: PROPERTY_FIELD },
+          { text: 'for property', field: PROPERTY_FIELD, core: true },
         ],
         list_accounts: ['List all accessible Analytics accounts'],
         list_account_summaries: ['List all accounts and their properties'],

apps/sim/lib/api/contracts/selectors/google-analytics.ts

@@ -27,13 +27,13 @@ export const googleAnalyticsPropertiesBodySchema = credentialWorkflowImpersonate
 export const googleAnalyticsAccountsSelectorContract = definePostSelector(
   '/api/tools/google_analytics/accounts',
   googleAnalyticsAccountsBodySchema,
-  z.object({ accounts: z.array(googleAnalyticsAccountSchema) })
+  z.object({ accounts: z.array(googleAnalyticsAccountSchema), truncated: z.boolean() })
 )
 
 export const googleAnalyticsPropertiesSelectorContract = definePostSelector(
   '/api/tools/google_analytics/properties',
   googleAnalyticsPropertiesBodySchema,
-  z.object({ properties: z.array(googleAnalyticsPropertySchema) })
+  z.object({ properties: z.array(googleAnalyticsPropertySchema), truncated: z.boolean() })
 )
 
 export type GoogleAnalyticsAccountsSelectorBody = ContractBodyInput<

apps/sim/tools/generated/tool-outputs.ts

@@ -1,8 +1,9 @@
 import {
   extractGoogleApiError,
+  type GoogleAnalyticsDimensionMetadata,
   type GoogleAnalyticsGetMetadataParams,
   type GoogleAnalyticsGetMetadataResponse,
-  type GoogleAnalyticsMetadataField,
+  type GoogleAnalyticsMetricMetadata,
   normalizePropertyName,
   toBooleanParam,
 } from '@/tools/google_analytics/types'
@@ -12,27 +13,39 @@ interface RawMetadataField {
   apiName?: string
   uiName?: string
   description?: string
-  type?: string
-  dataType?: string
+  category?: string
   customDefinition?: boolean
   deprecatedApiNames?: string[]
 }
 
-/**
- * Normalizes a DimensionMetadata or MetricMetadata entry. Dimensions expose their
- * value type as `dataType`, metrics as `type`; both land on a single `type` field.
- */
-function toMetadataField(raw: RawMetadataField): GoogleAnalyticsMetadataField {
+interface RawMetricMetadata extends RawMetadataField {
+  type?: string
+  expression?: string
+}
+
+function toBaseField(raw: RawMetadataField) {
   return {
     apiName: raw.apiName ?? '',
     uiName: raw.uiName ?? null,
     description: raw.description ?? null,
-    type: raw.type ?? raw.dataType ?? null,
+    category: raw.category ?? null,
     customDefinition: raw.customDefinition ?? false,
     deprecatedApiNames: raw.deprecatedApiNames ?? [],
   }
 }
 
+function toDimensionMetadata(raw: RawMetadataField): GoogleAnalyticsDimensionMetadata {
+  return toBaseField(raw)
+}
+
+function toMetricMetadata(raw: RawMetricMetadata): GoogleAnalyticsMetricMetadata {
+  return {
+    ...toBaseField(raw),
+    type: raw.type ?? null,
+    expression: raw.expression ?? null,
+  }
+}
+
 export const googleAnalyticsGetMetadataTool: ToolConfig<
   GoogleAnalyticsGetMetadataParams,
   GoogleAnalyticsGetMetadataResponse
@@ -102,14 +115,14 @@ export const googleAnalyticsGetMetadataTool: ToolConfig<
       }
     }
 
-    let dimensions = (data.dimensions ?? []).map(toMetadataField)
-    let metrics = (data.metrics ?? []).map(toMetadataField)
+    let dimensions: GoogleAnalyticsDimensionMetadata[] = (data.dimensions ?? []).map(
+      toDimensionMetadata
+    )
+    let metrics: GoogleAnalyticsMetricMetadata[] = (data.metrics ?? []).map(toMetricMetadata)
 
     if (toBooleanParam(params?.customOnly)) {
-      dimensions = dimensions.filter(
-        (field: GoogleAnalyticsMetadataField) => field.customDefinition
-      )
-      metrics = metrics.filter((field: GoogleAnalyticsMetadataField) => field.customDefinition)
+      dimensions = dimensions.filter((field) => field.customDefinition)
+      metrics = metrics.filter((field) => field.customDefinition)
     }
 
     return {
@@ -144,7 +157,11 @@ export const googleAnalyticsGetMetadataTool: ToolConfig<
             description: 'What the dimension measures',
             nullable: true,
           },
-          type: { type: 'string', description: 'Value data type', nullable: true },
+          category: {
+            type: 'string',
+            description: 'Grouping the dimension belongs to, e.g. Page / Screen',
+            nullable: true,
+          },
           customDefinition: {
             type: 'boolean',
             description: 'Whether this is a property-specific custom dimension',
@@ -167,7 +184,17 @@ export const googleAnalyticsGetMetadataTool: ToolConfig<
           apiName: { type: 'string', description: 'Name used in report requests' },
           uiName: { type: 'string', description: 'Name shown in the GA4 UI', nullable: true },
           description: { type: 'string', description: 'What the metric measures', nullable: true },
-          type: { type: 'string', description: 'Value data type', nullable: true },
+          type: { type: 'string', description: 'Metric value type', nullable: true },
+          expression: {
+            type: 'string',
+            description: 'Formula for a derived metric',
+            nullable: true,
+          },
+          category: {
+            type: 'string',
+            description: 'Grouping the metric belongs to, e.g. Session',
+            nullable: true,
+          },
           customDefinition: {
             type: 'boolean',
             description: 'Whether this is a property-specific custom metric',

apps/sim/tools/google_analytics/get_metadata.ts

@@ -4,6 +4,7 @@ import {
   type GoogleAnalyticsListAccountSummariesParams,
   type GoogleAnalyticsListAccountSummariesResponse,
   type GoogleAnalyticsPropertySummary,
+  toOptionalNumberParam,
 } from '@/tools/google_analytics/types'
 import type { ToolConfig } from '@/tools/types'
 
@@ -46,7 +47,8 @@ export const googleAnalyticsListAccountSummariesTool: ToolConfig<
   request: {
     url: (params) => {
       const query = new URLSearchParams()
-      if (params.pageSize !== undefined) query.set('pageSize', String(params.pageSize))
+      const pageSize = toOptionalNumberParam(params.pageSize)
+      if (pageSize !== undefined) query.set('pageSize', String(pageSize))
       if (params.pageToken) query.set('pageToken', params.pageToken)
       const suffix = query.toString()
       return `https://analyticsadmin.googleapis.com/v1beta/accountSummaries${suffix ? `?${suffix}` : ''}`

apps/sim/tools/google_analytics/list_account_summaries.ts

@@ -4,6 +4,7 @@ import {
   type GoogleAnalyticsListAccountsParams,
   type GoogleAnalyticsListAccountsResponse,
   toBooleanParam,
+  toOptionalNumberParam,
 } from '@/tools/google_analytics/types'
 import type { ToolConfig } from '@/tools/types'
 
@@ -51,7 +52,8 @@ export const googleAnalyticsListAccountsTool: ToolConfig<
   request: {
     url: (params) => {
       const query = new URLSearchParams()
-      if (params.pageSize !== undefined) query.set('pageSize', String(params.pageSize))
+      const pageSize = toOptionalNumberParam(params.pageSize)
+      if (pageSize !== undefined) query.set('pageSize', String(pageSize))
       if (params.pageToken) query.set('pageToken', params.pageToken)
       const showDeleted = toBooleanParam(params.showDeleted)
       if (showDeleted !== undefined) query.set('showDeleted', String(showDeleted))

apps/sim/tools/google_analytics/list_accounts.ts

@@ -4,6 +4,7 @@ import {
   type GoogleAnalyticsListDataStreamsParams,
   type GoogleAnalyticsListDataStreamsResponse,
   normalizePropertyName,
+  toOptionalNumberParam,
 } from '@/tools/google_analytics/types'
 import type { ToolConfig } from '@/tools/types'
 
@@ -86,7 +87,8 @@ export const googleAnalyticsListDataStreamsTool: ToolConfig<
   request: {
     url: (params) => {
       const query = new URLSearchParams()
-      if (params.pageSize !== undefined) query.set('pageSize', String(params.pageSize))
+      const pageSize = toOptionalNumberParam(params.pageSize)
+      if (pageSize !== undefined) query.set('pageSize', String(pageSize))
       if (params.pageToken) query.set('pageToken', params.pageToken)
       const suffix = query.toString()
       return `https://analyticsadmin.googleapis.com/v1beta/${normalizePropertyName(params.propertyId)}/dataStreams${suffix ? `?${suffix}` : ''}`