fix(revenuecat): align tools with v1 docs

- Unwrap {value:{subscriber}} envelope across post-receipts, attributes, entitlements, and Google sub endpoints
- Trim entitlement output to documented fields (expires_date, grace_period_expires_date, product_identifier, purchase_date)
- Add subscriber output fields: last_seen, original_application_version, other_purchases, subscriber_attributes
- create_purchase: productId optional (Google-only required), add introductoryPrice, attributes, updated_at_ms; surface customer + subscriber
- update_subscriber_attributes: read response and surface subscriber
- defer_google_subscription: enforce XOR(extendByDays, expiryTimeMs) and 1-365 range
- get_customer: count active subs by expiry/refund instead of object-key length

Author: waleedlatif1

apps/docs/content/docs/en/tools/revenuecat.mdx

@@ -163,7 +163,6 @@ Return ONLY the numeric timestamp, no text.`,
       required: {
         field: 'operation',
         value: [
-          'create_purchase',
           'defer_google_subscription',
           'refund_google_subscription',
           'revoke_google_subscription',
@@ -218,6 +217,35 @@ Return ONLY the numeric timestamp, no text.`,
       },
       mode: 'advanced',
     },
+    {
+      id: 'introductoryPrice',
+      title: 'Introductory Price',
+      type: 'short-input',
+      placeholder: 'e.g., 0.99',
+      condition: {
+        field: 'operation',
+        value: 'create_purchase',
+      },
+      mode: 'advanced',
+    },
+    {
+      id: 'updatedAtMs',
+      title: 'Updated At (ms)',
+      type: 'short-input',
+      placeholder: 'Unix epoch ms used to resolve attribute conflicts',
+      condition: {
+        field: 'operation',
+        value: 'create_purchase',
+      },
+      mode: 'advanced',
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a Unix epoch timestamp in milliseconds based on the user's description.
+Used by RevenueCat to resolve attribute conflicts on a posted purchase.
+
+Return ONLY the numeric timestamp, no text.`,
+      },
+    },
     {
       id: 'isRestore',
       title: 'Is Restore',
@@ -263,7 +291,7 @@ Return ONLY the numeric timestamp, no text.`,
       placeholder: '{"$email": {"value": "user@example.com"}}',
       condition: {
         field: 'operation',
-        value: 'update_subscriber_attributes',
+        value: ['update_subscriber_attributes', 'create_purchase'],
       },
       required: {
         field: 'operation',
@@ -375,6 +403,12 @@ Return ONLY the numeric timestamp, no text.`,
         if (params.expiryTimeMs !== undefined && params.expiryTimeMs !== '') {
           next.expiryTimeMs = Number(params.expiryTimeMs)
         }
+        if (params.introductoryPrice !== undefined && params.introductoryPrice !== '') {
+          next.introductoryPrice = Number(params.introductoryPrice)
+        }
+        if (params.updatedAtMs !== undefined && params.updatedAtMs !== '') {
+          next.updatedAtMs = Number(params.updatedAtMs)
+        }
         return next
       },
     },
@@ -402,7 +436,16 @@ Return ONLY the numeric timestamp, no text.`,
       type: 'string',
       description: 'Payment mode (pay_as_you_go, pay_up_front, free_trial)',
     },
-    attributes: { type: 'string', description: 'JSON object of subscriber attributes' },
+    attributes: {
+      type: 'string',
+      description:
+        'JSON object of subscriber attributes (used by update_subscriber_attributes and create_purchase)',
+    },
+    introductoryPrice: { type: 'number', description: 'Introductory price for the purchase' },
+    updatedAtMs: {
+      type: 'number',
+      description: 'Unix epoch ms used by RevenueCat to resolve attribute conflicts',
+    },
     extendByDays: { type: 'number', description: 'Number of days to extend (1-365)' },
     expiryTimeMs: { type: 'number', description: 'Absolute new expiry time in ms since epoch' },
     endTimeMs: {
@@ -430,5 +473,9 @@ Return ONLY the numeric timestamp, no text.`,
     deleted: { type: 'boolean', description: 'Whether the subscriber was deleted' },
     app_user_id: { type: 'string', description: 'The app user ID' },
     updated: { type: 'boolean', description: 'Whether the attributes were updated' },
+    customer: {
+      type: 'json',
+      description: 'Customer object returned by create_purchase (when present in the response)',
+    },
   },
 }

apps/sim/blocks/blocks/revenuecat.ts

@@ -1,5 +1,11 @@
 import type { CreatePurchaseParams, CreatePurchaseResponse } from '@/tools/revenuecat/types'
-import { SUBSCRIBER_OUTPUT, throwIfRevenueCatError } from '@/tools/revenuecat/types'
+import {
+  extractCustomer,
+  extractSubscriber,
+  SUBSCRIBER_OUTPUT,
+  shapeSubscriber,
+  throwIfRevenueCatError,
+} from '@/tools/revenuecat/types'
 import type { ToolConfig } from '@/tools/types'
 
 export const revenuecatCreatePurchaseTool: ToolConfig<
@@ -29,45 +35,66 @@ export const revenuecatCreatePurchaseTool: ToolConfig<
       required: true,
       visibility: 'user-or-llm',
       description:
-        'The receipt token or purchase token from the store (App Store receipt, Google Play purchase token, or Stripe subscription ID)',
+        'For iOS, the base64-encoded receipt (or JWSTransaction for StoreKit2); for Android the purchase token; for Amazon the receipt; for Stripe the subscription ID or Checkout Session ID; for Roku the transaction ID; for Paddle the subscription ID or transaction ID',
     },
     productId: {
       type: 'string',
-      required: true,
+      required: false,
       visibility: 'user-or-llm',
-      description: 'The product identifier for the purchase',
+      description:
+        'Apple, Google, Amazon, Roku, or Paddle product identifier or SKU. Required for Google.',
     },
     price: {
       type: 'number',
       required: false,
       visibility: 'user-or-llm',
-      description: 'The price of the product in the currency specified',
+      description: 'Price of the product. Required if you provide a currency.',
     },
     currency: {
       type: 'string',
       required: false,
       visibility: 'user-or-llm',
-      description: 'ISO 4217 currency code (e.g., USD, EUR)',
+      description: 'ISO 4217 currency code (e.g., USD, EUR). Required if you provide a price.',
     },
     isRestore: {
       type: 'boolean',
       required: false,
       visibility: 'user-or-llm',
-      description: 'Whether this is a restore of a previous purchase (deprecated by RevenueCat)',
+      description: 'Deprecated. Triggers configured restore behavior for shared fetch tokens.',
     },
     presentedOfferingIdentifier: {
       type: 'string',
       required: false,
       visibility: 'user-or-llm',
       description:
-        'Identifier of the offering that was presented to the user when they made this purchase. Used by RevenueCat for offering-level analytics.',
+        'Identifier of the offering presented to the customer at the time of purchase. Attached to new transactions in this fetch token and exposed in ETL exports and webhooks.',
     },
     paymentMode: {
       type: 'string',
       required: false,
       visibility: 'user-or-llm',
       description:
-        'Payment mode for the purchase. One of: pay_as_you_go, pay_up_front, free_trial. Only applies to introductory pricing periods.',
+        'Payment mode for the introductory period. One of: pay_as_you_go, pay_up_front, free_trial. Defaults to free_trial when an introductory period is detected and no value is provided.',
+    },
+    introductoryPrice: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Introductory price paid (if any).',
+    },
+    attributes: {
+      type: 'json',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'JSON object of subscriber attributes to set alongside the purchase. Each key maps to {"value": string, "updated_at_ms": number}.',
+    },
+    updatedAtMs: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'UNIX epoch in milliseconds used to resolve attribute conflicts at the request level.',
     },
     platform: {
       type: 'string',
@@ -95,39 +122,46 @@ export const revenuecatCreatePurchaseTool: ToolConfig<
       const body: Record<string, unknown> = {
         app_user_id: params.appUserId,
         fetch_token: params.fetchToken,
-        product_id: params.productId,
       }
+      if (params.productId) body.product_id = params.productId
       if (params.price !== undefined) body.price = params.price
       if (params.currency) body.currency = params.currency
       if (params.isRestore !== undefined) body.is_restore = params.isRestore
       if (params.presentedOfferingIdentifier) {
         body.presented_offering_identifier = params.presentedOfferingIdentifier
       }
       if (params.paymentMode) body.payment_mode = params.paymentMode
+      if (params.introductoryPrice !== undefined) {
+        body.introductory_price = params.introductoryPrice
+      }
+      if (params.attributes !== undefined && params.attributes !== '') {
+        body.attributes =
+          typeof params.attributes === 'string' ? JSON.parse(params.attributes) : params.attributes
+      }
+      if (params.updatedAtMs !== undefined) body.updated_at_ms = params.updatedAtMs
       return body
     },
   },
 
   transformResponse: async (response) => {
     await throwIfRevenueCatError(response)
     const data = await response.json()
-    const subscriber = data.subscriber ?? {}
-
     return {
       success: true,
       output: {
-        subscriber: {
-          first_seen: subscriber.first_seen ?? '',
-          original_app_user_id: subscriber.original_app_user_id ?? '',
-          subscriptions: subscriber.subscriptions ?? {},
-          entitlements: subscriber.entitlements ?? {},
-          non_subscriptions: subscriber.non_subscriptions ?? {},
-        },
+        customer: extractCustomer(data),
+        subscriber: shapeSubscriber(extractSubscriber(data)),
       },
     }
   },
 
   outputs: {
+    customer: {
+      type: 'object',
+      description:
+        'Customer object returned at the top level of POST /v1/receipts (first_seen, last_seen, original_app_user_id, original_application_version, original_sdk_version, management_url, entitlements, original_purchase_date, request_date). Null when the response uses the `value`-wrapped envelope.',
+      optional: true,
+    },
     subscriber: {
       ...SUBSCRIBER_OUTPUT,
       description: 'The updated subscriber object after recording the purchase',

apps/sim/tools/revenuecat/create_purchase.ts

@@ -2,7 +2,12 @@ import type {
   DeferGoogleSubscriptionParams,
   DeferGoogleSubscriptionResponse,
 } from '@/tools/revenuecat/types'
-import { SUBSCRIBER_OUTPUT, throwIfRevenueCatError } from '@/tools/revenuecat/types'
+import {
+  extractSubscriber,
+  SUBSCRIBER_OUTPUT,
+  shapeSubscriber,
+  throwIfRevenueCatError,
+} from '@/tools/revenuecat/types'
 import type { ToolConfig } from '@/tools/types'
 
 export const revenuecatDeferGoogleSubscriptionTool: ToolConfig<
@@ -60,30 +65,36 @@ export const revenuecatDeferGoogleSubscriptionTool: ToolConfig<
       'Content-Type': 'application/json',
     }),
     body: (params) => {
-      if (params.extendByDays === undefined && params.expiryTimeMs === undefined) {
+      const hasExtend = params.extendByDays !== undefined
+      const hasExpiry = params.expiryTimeMs !== undefined
+      if (!hasExtend && !hasExpiry) {
         throw new Error('Provide either extendByDays or expiryTimeMs to defer a subscription')
       }
+      if (hasExtend && hasExpiry) {
+        throw new Error(
+          'Provide only one of extendByDays or expiryTimeMs — they cannot be used together'
+        )
+      }
       const body: Record<string, unknown> = {}
-      if (params.expiryTimeMs !== undefined) body.expiry_time_ms = params.expiryTimeMs
-      else if (params.extendByDays !== undefined) body.extend_by_days = params.extendByDays
+      if (hasExpiry) body.expiry_time_ms = params.expiryTimeMs
+      else if (hasExtend) {
+        const days = params.extendByDays as number
+        if (!Number.isFinite(days) || days < 1 || days > 365) {
+          throw new Error('extendByDays must be an integer between 1 and 365')
+        }
+        body.extend_by_days = days
+      }
       return body
     },
   },
 
   transformResponse: async (response) => {
     await throwIfRevenueCatError(response)
     const data = await response.json()
-    const subscriber = data.subscriber ?? {}
-
     return {
       success: true,
       output: {
-        subscriber: {
-          first_seen: subscriber.first_seen ?? '',
-          original_app_user_id: subscriber.original_app_user_id ?? '',
-          subscriptions: subscriber.subscriptions ?? {},
-          entitlements: subscriber.entitlements ?? {},
-        },
+        subscriber: shapeSubscriber(extractSubscriber(data)),
       },
     }
   },

apps/sim/tools/revenuecat/defer_google_subscription.ts

@@ -1,7 +1,9 @@
 import type { CustomerResponse, GetCustomerParams } from '@/tools/revenuecat/types'
 import {
+  extractSubscriber,
   METADATA_OUTPUT_PROPERTIES,
   SUBSCRIBER_OUTPUT,
+  shapeSubscriber,
   throwIfRevenueCatError,
 } from '@/tools/revenuecat/types'
 import type { ToolConfig } from '@/tools/types'
@@ -40,39 +42,47 @@ export const revenuecatGetCustomerTool: ToolConfig<GetCustomerParams, CustomerRe
   transformResponse: async (response) => {
     await throwIfRevenueCatError(response)
     const data = await response.json()
-    const subscriber = data.subscriber ?? {}
-    const entitlements = subscriber.entitlements ?? {}
-    const subscriptions = subscriber.subscriptions ?? {}
-    const requestDate: string | undefined = data.request_date
-
+    const subscriberRaw = extractSubscriber(data)
+    const subscriber = shapeSubscriber(subscriberRaw)
+    const requestDate = (data?.value?.request_date ?? data?.request_date) as string | undefined
     const now = requestDate ? new Date(requestDate).getTime() : Date.now()
-    const activeEntitlements = Object.values(entitlements).filter((e: unknown) => {
-      const ent = e as Record<string, unknown>
-      if (typeof ent.is_active === 'boolean') return ent.is_active
-      const expires = ent.expires_date as string | null | undefined
-      const grace = ent.grace_period_expires_date as string | null | undefined
+
+    const isActiveByDates = (
+      expires: string | null | undefined,
+      grace: string | null | undefined,
+      refundedAt?: string | null | undefined
+    ) => {
+      if (refundedAt) return false
       if (!expires) return true
       if (new Date(expires).getTime() > now) return true
       if (grace && new Date(grace).getTime() > now) return true
       return false
+    }
+
+    const activeEntitlements = Object.values(subscriber.entitlements).filter((e) => {
+      const ent = e as Record<string, unknown>
+      return isActiveByDates(
+        ent.expires_date as string | null | undefined,
+        ent.grace_period_expires_date as string | null | undefined
+      )
+    }).length
+
+    const activeSubscriptions = Object.values(subscriber.subscriptions).filter((s) => {
+      const sub = s as Record<string, unknown>
+      return isActiveByDates(
+        sub.expires_date as string | null | undefined,
+        sub.grace_period_expires_date as string | null | undefined,
+        sub.refunded_at as string | null | undefined
+      )
     }).length
-    const activeSubscriptions = Object.keys(subscriptions).length
 
     return {
       success: true,
       output: {
-        subscriber: {
-          first_seen: subscriber.first_seen ?? '',
-          original_app_user_id: subscriber.original_app_user_id ?? '',
-          original_purchase_date: subscriber.original_purchase_date ?? null,
-          management_url: subscriber.management_url ?? null,
-          subscriptions: subscriptions,
-          entitlements: entitlements,
-          non_subscriptions: subscriber.non_subscriptions ?? {},
-        },
+        subscriber,
         metadata: {
-          app_user_id: subscriber.original_app_user_id ?? '',
-          first_seen: subscriber.first_seen ?? '',
+          app_user_id: subscriber.original_app_user_id,
+          first_seen: subscriber.first_seen,
           active_entitlements: activeEntitlements,
           active_subscriptions: activeSubscriptions,
         },