@zapier/zapier-sdk 0.33.3 → 0.34.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @zapier/zapier-sdk
 
+## 0.34.0
+
+### Minor Changes
+
+- 3700f6a: Fix --json output
+
+## 0.33.4
+
+### Patch Changes
+
+- d9e0f1d: Fix user properties being overwritten by context merge in telemetry events
+
 ## 0.33.3
 
 ### Patch Changes

package/README.md

@@ -440,19 +440,19 @@ Get the available choices for a dynamic dropdown input field
 
 **Parameters:**
 
-| Name              | Type             | Required | Default | Possible Values                                                                                | Description                                            |
-| ----------------- | ---------------- | -------- | ------- | ---------------------------------------------------------------------------------------------- | ------------------------------------------------------ |
-| `options`         | `object`         | ✅       | —       | —                                                                                              |                                                        |
-| ↳ `appKey`        | `string`         | ✅       | —       | —                                                                                              | App key (e.g., 'SlackCLIAPI' or slug like 'github')    |
-| ↳ `actionType`    | `string`         | ✅       | —       | `read`, `read_bulk`, `write`, `run`, `search`, `search_or_write`, `search_and_write`, `filter` | Action type that matches the action's defined type     |
-| ↳ `actionKey`     | `string`         | ✅       | —       | —                                                                                              | Action key to execute                                  |
-| ↳ `inputFieldKey` | `string`         | ✅       | —       | —                                                                                              | Input field key to get choices for.                    |
-| ↳ `connectionId`  | `string, number` | ❌       | —       | —                                                                                              | Connection ID to use for this action                   |
-| ↳ `inputs`        | `object`         | ❌       | —       | —                                                                                              | Current input values that may affect available choices |
-| ↳ `page`          | `number`         | ❌       | —       | —                                                                                              | Page number for paginated results                      |
-| ↳ `pageSize`      | `number`         | ❌       | —       | —                                                                                              | Number of choices per page                             |
-| ↳ `maxItems`      | `number`         | ❌       | —       | —                                                                                              | Maximum total items to return across all pages         |
-| ↳ `cursor`        | `string`         | ❌       | —       | —                                                                                              | Cursor to start from                                   |
+| Name              | Type             | Required | Default | Possible Values                                                                                | Description                                                                                                                                |
+| ----------------- | ---------------- | -------- | ------- | ---------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
+| `options`         | `object`         | ✅       | —       | —                                                                                              |                                                                                                                                            |
+| ↳ `appKey`        | `string`         | ✅       | —       | —                                                                                              | App key (e.g., 'SlackCLIAPI' or slug like 'github')                                                                                        |
+| ↳ `actionType`    | `string`         | ✅       | —       | `read`, `read_bulk`, `write`, `run`, `search`, `search_or_write`, `search_and_write`, `filter` | Action type that matches the action's defined type                                                                                         |
+| ↳ `actionKey`     | `string`         | ✅       | —       | —                                                                                              | Action key to execute                                                                                                                      |
+| ↳ `inputFieldKey` | `string`         | ✅       | —       | —                                                                                              | Input field key to get choices for.                                                                                                        |
+| ↳ `connectionId`  | `string, number` | ❌       | —       | —                                                                                              | Connection ID to use when listing available field choices. Required if the action needs a connection to populate dynamic dropdown options. |
+| ↳ `inputs`        | `object`         | ❌       | —       | —                                                                                              | Current input values that may affect available choices                                                                                     |
+| ↳ `page`          | `number`         | ❌       | —       | —                                                                                              | Page number for paginated results                                                                                                          |
+| ↳ `pageSize`      | `number`         | ❌       | —       | —                                                                                              | Number of choices per page                                                                                                                 |
+| ↳ `maxItems`      | `number`         | ❌       | —       | —                                                                                              | Maximum total items to return across all pages                                                                                             |
+| ↳ `cursor`        | `string`         | ❌       | —       | —                                                                                              | Cursor to start from                                                                                                                       |
 
 **Returns:** `Promise<PaginatedResult<InputFieldChoiceItem>>`
 
@@ -497,17 +497,17 @@ Get the input fields required for a specific action
 
 **Parameters:**
 
-| Name             | Type             | Required | Default | Possible Values                                                                                | Description                                           |
-| ---------------- | ---------------- | -------- | ------- | ---------------------------------------------------------------------------------------------- | ----------------------------------------------------- |
-| `options`        | `object`         | ✅       | —       | —                                                                                              |                                                       |
-| ↳ `appKey`       | `string`         | ✅       | —       | —                                                                                              | App key (e.g., 'SlackCLIAPI' or slug like 'github')   |
-| ↳ `actionType`   | `string`         | ✅       | —       | `read`, `read_bulk`, `write`, `run`, `search`, `search_or_write`, `search_and_write`, `filter` | Action type that matches the action's defined type    |
-| ↳ `actionKey`    | `string`         | ✅       | —       | —                                                                                              | Action key to execute                                 |
-| ↳ `connectionId` | `string, number` | ❌       | —       | —                                                                                              | Connection ID to use for this action                  |
-| ↳ `inputs`       | `object`         | ❌       | —       | —                                                                                              | Current input values that may affect available fields |
-| ↳ `pageSize`     | `number`         | ❌       | —       | —                                                                                              | Number of input fields per page                       |
-| ↳ `maxItems`     | `number`         | ❌       | —       | —                                                                                              | Maximum total items to return across all pages        |
-| ↳ `cursor`       | `string`         | ❌       | —       | —                                                                                              | Cursor to start from                                  |
+| Name             | Type             | Required | Default | Possible Values                                                                                | Description                                                                                                              |
+| ---------------- | ---------------- | -------- | ------- | ---------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ |
+| `options`        | `object`         | ✅       | —       | —                                                                                              |                                                                                                                          |
+| ↳ `appKey`       | `string`         | ✅       | —       | —                                                                                              | App key (e.g., 'SlackCLIAPI' or slug like 'github')                                                                      |
+| ↳ `actionType`   | `string`         | ✅       | —       | `read`, `read_bulk`, `write`, `run`, `search`, `search_or_write`, `search_and_write`, `filter` | Action type that matches the action's defined type                                                                       |
+| ↳ `actionKey`    | `string`         | ✅       | —       | —                                                                                              | Action key to execute                                                                                                    |
+| ↳ `connectionId` | `string, number` | ❌       | —       | —                                                                                              | Connection ID to use when listing input fields. Required if the action needs a connection to determine available fields. |
+| ↳ `inputs`       | `object`         | ❌       | —       | —                                                                                              | Current input values that may affect available fields                                                                    |
+| ↳ `pageSize`     | `number`         | ❌       | —       | —                                                                                              | Number of input fields per page                                                                                          |
+| ↳ `maxItems`     | `number`         | ❌       | —       | —                                                                                              | Maximum total items to return across all pages                                                                           |
+| ↳ `cursor`       | `string`         | ❌       | —       | —                                                                                              | Cursor to start from                                                                                                     |
 
 **Returns:** `Promise<PaginatedResult<RootFieldItemItem>>`
 
@@ -548,18 +548,18 @@ Execute an action with the given inputs
 
 **Parameters:**
 
-| Name             | Type             | Required | Default | Possible Values                                                                                | Description                                                                  |
-| ---------------- | ---------------- | -------- | ------- | ---------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------- |
-| `options`        | `object`         | ✅       | —       | —                                                                                              |                                                                              |
-| ↳ `appKey`       | `string`         | ✅       | —       | —                                                                                              | App key (e.g., 'SlackCLIAPI' or slug like 'github')                          |
-| ↳ `actionType`   | `string`         | ✅       | —       | `read`, `read_bulk`, `write`, `run`, `search`, `search_or_write`, `search_and_write`, `filter` | Action type that matches the action's defined type                           |
-| ↳ `actionKey`    | `string`         | ✅       | —       | —                                                                                              | Action key to execute                                                        |
-| ↳ `connectionId` | `string, number` | ❌       | —       | —                                                                                              | Connection ID to use for this action                                         |
-| ↳ `inputs`       | `object`         | ❌       | —       | —                                                                                              | Input parameters for the action                                              |
-| ↳ `timeoutMs`    | `number`         | ❌       | —       | —                                                                                              | Maximum time to wait for action completion in milliseconds (default: 180000) |
-| ↳ `pageSize`     | `number`         | ❌       | —       | —                                                                                              | Number of results per page                                                   |
-| ↳ `maxItems`     | `number`         | ❌       | —       | —                                                                                              | Maximum total items to return across all pages                               |
-| ↳ `cursor`       | `string`         | ❌       | —       | —                                                                                              | Cursor to start from                                                         |
+| Name             | Type             | Required | Default | Possible Values                                                                                | Description                                                                                                                            |
+| ---------------- | ---------------- | -------- | ------- | ---------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
+| `options`        | `object`         | ✅       | —       | —                                                                                              |                                                                                                                                        |
+| ↳ `appKey`       | `string`         | ✅       | —       | —                                                                                              | App key (e.g., 'SlackCLIAPI' or slug like 'github')                                                                                    |
+| ↳ `actionType`   | `string`         | ✅       | —       | `read`, `read_bulk`, `write`, `run`, `search`, `search_or_write`, `search_and_write`, `filter` | Action type that matches the action's defined type                                                                                     |
+| ↳ `actionKey`    | `string`         | ✅       | —       | —                                                                                              | Action key to execute                                                                                                                  |
+| ↳ `connectionId` | `string, number` | ❌       | —       | —                                                                                              | Connection ID to use when running the action. Required if the action needs a connection to authenticate and interact with the service. |
+| ↳ `inputs`       | `object`         | ❌       | —       | —                                                                                              | Input parameters for the action                                                                                                        |
+| ↳ `timeoutMs`    | `number`         | ❌       | —       | —                                                                                              | Maximum time to wait for action completion in milliseconds (default: 180000)                                                           |
+| ↳ `pageSize`     | `number`         | ❌       | —       | —                                                                                              | Number of results per page                                                                                                             |
+| ↳ `maxItems`     | `number`         | ❌       | —       | —                                                                                              | Maximum total items to return across all pages                                                                                         |
+| ↳ `cursor`       | `string`         | ❌       | —       | —                                                                                              | Cursor to start from                                                                                                                   |
 
 **Returns:** `Promise<PaginatedResult<ActionResultItem>>`
 

package/dist/index.cjs

@@ -122,12 +122,14 @@ var ZapierApiError = class extends ZapierError {
   constructor(message, options = {}) {
     super(message, options);
     this.name = "ZapierApiError";
+    this.code = "ZAPIER_API_ERROR";
   }
 };
 var ZapierAppNotFoundError = class extends ZapierError {
   constructor(message, options = {}) {
     super(message, options);
     this.name = "ZapierAppNotFoundError";
+    this.code = "ZAPIER_APP_NOT_FOUND_ERROR";
     this.appKey = options.appKey;
   }
 };
@@ -135,6 +137,7 @@ var ZapierValidationError = class extends ZapierError {
   constructor(message, options = {}) {
     super(message, options);
     this.name = "ZapierValidationError";
+    this.code = "ZAPIER_VALIDATION_ERROR";
     this.details = options.details;
   }
 };
@@ -142,18 +145,21 @@ var ZapierUnknownError = class extends ZapierError {
   constructor(message, options = {}) {
     super(message, options);
     this.name = "ZapierUnknownError";
+    this.code = "ZAPIER_UNKNOWN_ERROR";
   }
 };
 var ZapierAuthenticationError = class extends ZapierError {
   constructor(message, options = {}) {
     super(message, options);
     this.name = "ZapierAuthenticationError";
+    this.code = "ZAPIER_AUTHENTICATION_ERROR";
   }
 };
 var ZapierResourceNotFoundError = class extends ZapierError {
   constructor(message, options = {}) {
     super(message, options);
     this.name = "ZapierResourceNotFoundError";
+    this.code = "ZAPIER_RESOURCE_NOT_FOUND_ERROR";
     this.resourceType = options.resourceType;
     this.resourceId = options.resourceId;
   }
@@ -162,6 +168,7 @@ var ZapierConfigurationError = class extends ZapierError {
   constructor(message, options = {}) {
     super(message, options);
     this.name = "ZapierConfigurationError";
+    this.code = "ZAPIER_CONFIGURATION_ERROR";
     this.configType = options.configType;
   }
 };
@@ -169,6 +176,7 @@ var ZapierBundleError = class extends ZapierError {
   constructor(message, options = {}) {
     super(message, options);
     this.name = "ZapierBundleError";
+    this.code = "ZAPIER_BUNDLE_ERROR";
     this.buildErrors = options.buildErrors;
   }
 };
@@ -176,6 +184,7 @@ var ZapierTimeoutError = class extends ZapierError {
   constructor(message, options = {}) {
     super(message, options);
     this.name = "ZapierTimeoutError";
+    this.code = "ZAPIER_TIMEOUT_ERROR";
     this.attempts = options.attempts;
     this.maxAttempts = options.maxAttempts;
   }
@@ -184,6 +193,7 @@ var ZapierActionError = class extends ZapierError {
   constructor(message, options = {}) {
     super(message, options);
     this.name = "ZapierActionError";
+    this.code = "ZAPIER_ACTION_ERROR";
     this.appKey = options.appKey;
     this.actionKey = options.actionKey;
   }
@@ -196,12 +206,14 @@ var ZapierNotFoundError = class extends ZapierError {
   constructor(message, options = {}) {
     super(message, options);
     this.name = "ZapierNotFoundError";
+    this.code = "ZAPIER_NOT_FOUND_ERROR";
   }
 };
 var ZapierRateLimitError = class extends ZapierError {
   constructor(message, options = {}) {
     super(message, options);
     this.name = "ZapierRateLimitError";
+    this.code = "ZAPIER_RATE_LIMIT_ERROR";
     this.rateLimit = options.rateLimit ?? {};
     this.retries = options.retries ?? 0;
   }
@@ -210,6 +222,7 @@ var ZapierRelayError = class extends ZapierError {
   constructor(message, options = {}) {
     super(message, options);
     this.name = "ZapierRelayError";
+    this.code = "ZAPIER_RELAY_ERROR";
   }
 };
 function formatErrorMessage(error) {
@@ -632,32 +645,63 @@ var fetchPlugin = ({ context }) => {
 };
 
 // src/utils/pagination-utils.ts
-var offsetCursorMarker = "$$offset$$";
-function splitOffsetCursor(cursor) {
-  if (!cursor) {
-    return [0, cursor];
+var CURSOR_VERSION = 1;
+var CURSOR_SOURCE = {
+  API: "api",
+  SDK: "sdk"
+};
+function encodeBase64(str) {
+  return btoa(
+    Array.from(
+      new TextEncoder().encode(str),
+      (b) => String.fromCharCode(b)
+    ).join("")
+  );
+}
+function decodeBase64(str) {
+  return new TextDecoder().decode(
+    Uint8Array.from(atob(str), (c) => c.charCodeAt(0))
+  );
+}
+function encodeApiCursor(cursor) {
+  const envelope = {
+    v: CURSOR_VERSION,
+    source: CURSOR_SOURCE.API,
+    cursor
+  };
+  return encodeBase64(JSON.stringify(envelope));
+}
+function encodeSdkCursor(offset, cursor) {
+  const envelope = {
+    v: CURSOR_VERSION,
+    source: CURSOR_SOURCE.SDK,
+    cursor,
+    offset
+  };
+  return encodeBase64(JSON.stringify(envelope));
+}
+function decodeIncomingCursor(incoming) {
+  if (!incoming) {
+    return { offset: 0, cursor: void 0 };
   }
   try {
-    const parsedCursor = JSON.parse(cursor);
-    if (!Array.isArray(parsedCursor)) {
-      return [0, cursor];
+    const decoded = decodeBase64(incoming);
+    const envelope = JSON.parse(decoded);
+    if (envelope.v !== CURSOR_VERSION) {
+      return { offset: 0, cursor: incoming };
     }
-    const [marker, offset, currentCursor] = parsedCursor;
-    if (marker !== offsetCursorMarker) {
-      return [0, cursor];
+    if (envelope.source === CURSOR_SOURCE.SDK) {
+      return { offset: envelope.offset ?? 0, cursor: envelope.cursor };
     }
-    if (typeof offset !== "number") {
-      return [0, cursor];
+    if (envelope.source === CURSOR_SOURCE.API) {
+      return { offset: 0, cursor: envelope.cursor };
     }
-    return [offset, currentCursor];
+    return { offset: 0, cursor: incoming };
   } catch {
-    return [0, cursor];
+    return { offset: 0, cursor: incoming };
   }
 }
-function createOffsetCursor(offset, currentCursor) {
-  return JSON.stringify([offsetCursorMarker, offset, currentCursor]);
-}
-async function* paginateMaxItems(pageFunction, pageOptions) {
+async function* paginateMaxItemsWithUnencodedCursor(pageFunction, pageOptions) {
   let cursor = pageOptions?.cursor;
   let totalItemsYielded = 0;
   const maxItems = pageOptions?.maxItems;
@@ -672,12 +716,11 @@ async function* paginateMaxItems(pageFunction, pageOptions) {
     if (maxItems !== void 0) {
       const remainingItems = maxItems - totalItemsYielded;
       if (page.data.length >= remainingItems) {
-        const yieldedPage = {
+        yield {
           ...page,
           data: page.data.slice(0, remainingItems),
           nextCursor: void 0
         };
-        yield yieldedPage;
         break;
       }
     }
@@ -688,16 +731,38 @@ async function* paginateMaxItems(pageFunction, pageOptions) {
 }
 async function* paginateBuffered(pageFunction, pageOptions) {
   const pageSize = pageOptions?.pageSize;
-  const [cursorOffset, currentCursor] = splitOffsetCursor(pageOptions?.cursor);
+  const { offset: cursorOffset, cursor: initialCursor } = decodeIncomingCursor(
+    pageOptions?.cursor
+  );
+  const requestedMaxItems = pageOptions?.maxItems;
   const options = {
     ...pageOptions || {},
-    cursor: currentCursor
+    cursor: initialCursor,
+    // SDK cursors can carry an offset into a raw backend page. Since maxItems
+    // is expected to be relative to the resumed position, we add that offset
+    // so raw pagination still yields enough items after offset slicing.
+    maxItems: requestedMaxItems !== void 0 && cursorOffset > 0 ? requestedMaxItems + cursorOffset : requestedMaxItems
   };
-  const iterator = paginateMaxItems(pageFunction, options);
+  if (!pageSize) {
+    for await (const page of paginateMaxItemsWithUnencodedCursor(
+      pageFunction,
+      options
+    )) {
+      yield {
+        ...page,
+        nextCursor: page.nextCursor ? encodeApiCursor(page.nextCursor) : void 0
+      };
+    }
+    return;
+  }
   let bufferedPages = [];
   let isFirstPage = true;
-  let cursor;
-  for await (let page of iterator) {
+  let rawCursor;
+  for await (let page of paginateMaxItemsWithUnencodedCursor(
+    pageFunction,
+    options
+  )) {
+    const nextRawCursor = page.nextCursor;
     if (isFirstPage) {
       isFirstPage = false;
       if (cursorOffset) {
@@ -707,18 +772,13 @@ async function* paginateBuffered(pageFunction, pageOptions) {
         };
       }
     }
-    if (!pageSize) {
-      yield page;
-      cursor = page.nextCursor;
-      continue;
-    }
     const bufferedLength = bufferedPages.reduce(
-      (acc, page2) => acc + page2.data.length,
+      (acc, p) => acc + p.data.length,
       0
     );
     if (bufferedLength + page.data.length < pageSize) {
       bufferedPages.push(page);
-      cursor = page.nextCursor;
+      rawCursor = nextRawCursor;
       continue;
     }
     const bufferedItems = bufferedPages.map((p) => p.data).flat();
@@ -729,28 +789,28 @@ async function* paginateBuffered(pageFunction, pageOptions) {
       yield {
         ...page,
         data: pageItems,
-        nextCursor: page.nextCursor
+        nextCursor: nextRawCursor ? encodeApiCursor(nextRawCursor) : void 0
       };
       bufferedPages = [];
-      cursor = page.nextCursor;
+      rawCursor = nextRawCursor;
       continue;
     }
     yield {
       ...page,
       data: pageItems,
-      nextCursor: createOffsetCursor(
+      nextCursor: encodeSdkCursor(
         page.data.length - remainingItems.length,
-        cursor
+        rawCursor
       )
     };
     while (remainingItems.length > pageSize) {
-      const pageItems2 = remainingItems.splice(0, pageSize);
+      const chunkItems = remainingItems.splice(0, pageSize);
       yield {
         ...page,
-        data: pageItems2,
-        nextCursor: createOffsetCursor(
+        data: chunkItems,
+        nextCursor: encodeSdkCursor(
           page.data.length - remainingItems.length,
-          cursor
+          rawCursor
         )
       };
     }
@@ -760,7 +820,7 @@ async function* paginateBuffered(pageFunction, pageOptions) {
         data: remainingItems
       }
     ];
-    cursor = page.nextCursor;
+    rawCursor = nextRawCursor;
   }
   if (bufferedPages.length > 0) {
     const lastBufferedPage = bufferedPages.slice(-1)[0];
@@ -1897,7 +1957,9 @@ var ListInputFieldsSchema = zod.z.object({
   appKey: AppKeyPropertySchema,
   actionType: ActionTypePropertySchema,
   actionKey: ActionKeyPropertySchema,
-  connectionId: ConnectionIdPropertySchema.nullable().optional(),
+  connectionId: ConnectionIdPropertySchema.nullable().optional().describe(
+    "Connection ID to use when listing input fields. Required if the action needs a connection to determine available fields."
+  ),
   /** @deprecated Use connectionId instead */
   authenticationId: AuthenticationIdPropertySchema.nullable().optional(),
   inputs: InputsPropertySchema.optional().describe(
@@ -2895,7 +2957,9 @@ var RunActionSchema = zod.z.object({
   appKey: AppKeyPropertySchema,
   actionType: ActionTypePropertySchema,
   actionKey: ActionKeyPropertySchema,
-  connectionId: ConnectionIdPropertySchema.nullable().optional(),
+  connectionId: ConnectionIdPropertySchema.nullable().optional().describe(
+    "Connection ID to use when running the action. Required if the action needs a connection to authenticate and interact with the service."
+  ),
   /** @deprecated Use connectionId instead */
   authenticationId: ConnectionIdPropertySchema.nullable().optional(),
   inputs: InputsPropertySchema.optional().describe(
@@ -4980,7 +5044,8 @@ var registryPlugin = ({ sdk, context }) => {
       confirm: meta.confirm ?? (meta.type === "delete" ? "delete" : void 0),
       deprecation: meta.deprecation,
       deprecatedParameters: meta.deprecatedParameters,
-      aliases: meta.aliases
+      aliases: meta.aliases,
+      supportsJsonOutput: meta.supportsJsonOutput ?? true
     };
   }).sort((a, b) => a.name.localeCompare(b.name));
   const knownCategories = Object.keys(categoryDefinitions);
@@ -5214,7 +5279,9 @@ var ListInputFieldChoicesSchema = zod.z.object({
   // Input field specification
   inputFieldKey: zod.z.string().min(1).describe("Input field key to get choices for."),
   // Common parameters
-  connectionId: ConnectionIdPropertySchema.nullable().optional(),
+  connectionId: ConnectionIdPropertySchema.nullable().optional().describe(
+    "Connection ID to use when listing available field choices. Required if the action needs a connection to populate dynamic dropdown options."
+  ),
   /** @deprecated Use connectionId instead */
   authenticationId: AuthenticationIdPropertySchema.nullable().optional(),
   inputs: InputsPropertySchema.optional().describe(
@@ -5513,7 +5580,7 @@ function getCpuTime() {
 }
 
 // src/plugins/eventEmission/builders.ts
-var SDK_VERSION = "0.33.3";
+var SDK_VERSION = "0.34.0";
 function createBaseEvent(context = {}) {
   return {
     event_id: generateEventId(),
@@ -5648,13 +5715,22 @@ async function emitWithTimeout(transport, subject, event) {
   } catch {
   }
 }
+function mergeUserContext(event, userContext) {
+  const merged = { ...event };
+  for (const [key, value] of Object.entries(userContext)) {
+    if (merged[key] == null) {
+      merged[key] = value;
+    }
+  }
+  return merged;
+}
 async function silentEmit(transport, subject, event, userContextPromise) {
   try {
     let enrichedEvent = event;
     if (userContextPromise) {
       try {
         const userContext = await userContextPromise;
-        enrichedEvent = Object.assign({}, event, userContext);
+        enrichedEvent = mergeUserContext(event, userContext);
       } catch {
       }
     }
@@ -5771,7 +5847,7 @@ var eventEmissionPlugin = ({ context }) => {
     };
     try {
       const userContext = await getUserContext;
-      return { ...baseEvent, ...userContext };
+      return mergeUserContext(baseEvent, userContext);
     } catch {
       return baseEvent;
     }
@@ -5824,7 +5900,7 @@ var eventEmissionPlugin = ({ context }) => {
         });
         try {
           const userContext = await getUserContext;
-          errorEvent = { ...errorEvent, ...userContext };
+          errorEvent = mergeUserContext(errorEvent, userContext);
         } catch {
         }
         await emitWithTimeout(
@@ -5852,7 +5928,7 @@ var eventEmissionPlugin = ({ context }) => {
         });
         try {
           const userContext = await getUserContext;
-          errorEvent = { ...errorEvent, ...userContext };
+          errorEvent = mergeUserContext(errorEvent, userContext);
         } catch {
         }
         await emitWithTimeout(
@@ -5874,7 +5950,7 @@ var eventEmissionPlugin = ({ context }) => {
         });
         try {
           const userContext = await getUserContext;
-          signalEvent = { ...signalEvent, ...userContext };
+          signalEvent = mergeUserContext(signalEvent, userContext);
         } catch {
         }
         await emitWithTimeout(
@@ -5908,7 +5984,7 @@ var eventEmissionPlugin = ({ context }) => {
     });
     try {
       const userContext = await getUserContext;
-      exitEvent = { ...exitEvent, ...userContext };
+      exitEvent = mergeUserContext(exitEvent, userContext);
     } catch {
     }
     await emitWithTimeout(