* refactored _build_audience helper so channel_type is handled consistently — maps ios/android/amazon/web → *_channel, falls back to generic channel when omitted/unrecognized

* gave channel_type a default: $.context.device.type and kept it a free string
* added a User-Agent header unit test
* added batch test for customEvents (was missing)
* dropped the BROWSER/serve.ts commit
* commented index.ts env-var defaults

Author: jumpingGrendel

packages/destination-actions/src/destinations/airship/customEvents/index.ts

@@ -25,9 +25,13 @@ const action: ActionDefinition<Settings, Payload> = {
     },
     channel_type: {
       label: 'Channel Type',
-      description: 'The Airship audience key for the channel type (e.g. android_channel, ios_channel, amazon_channel, web_channel). If omitted, the generic channel key is used and Airship will resolve the type, which may introduce a slight delay.',
+      description:
+        'The device type for the Channel ID (e.g. ios, android, amazon, web). Defaults to the device type from the event. If omitted or unrecognized, the generic channel key is used and Airship resolves the type, which may introduce a slight delay.',
       type: 'string',
-      required: false
+      required: false,
+      default: {
+        '@path': '$.context.device.type'
+      }
     },
     name: {
       label: 'Name',

packages/destination-actions/src/destinations/airship/index.ts

@@ -24,14 +24,14 @@ const destination: DestinationDefinition<Settings> = {
         label: 'Access Token',
         description: 'Create in the Airship Go dashboard in Settings->Partner Integrations->Segment',
         type: 'password',
-        default: process.env.DEFAULT_ACCESS_TOKEN,
+        // default: process.env.DEFAULT_ACCESS_TOKEN,
         required: true
       },
       app_key: {
         label: 'App Key',
         description: 'The App Key identifies the Airship Project to which API requests are made.',
         type: 'password',
-        default: process.env.DEFAULT_APP_KEY,
+        // default: process.env.DEFAULT_APP_KEY,
         required: true
       },
       endpoint: {

packages/destination-actions/src/destinations/airship/manageTags/index.ts

@@ -24,9 +24,13 @@ const action: ActionDefinition<Settings, Payload> = {
     },
     channel_type: {
       label: 'Channel Type',
-      description: 'The Airship audience key for the channel type (e.g. android_channel, ios_channel, amazon_channel). If omitted, the generic channel key is used and Airship will resolve the type, which may introduce a slight delay.',
+      description:
+        'The device type for the Channel ID (e.g. ios, android, amazon, web). Defaults to the device type from the event. If omitted or unrecognized, the generic channel key is used and Airship resolves the type, which may introduce a slight delay.',
       type: 'string',
-      required: false
+      required: false,
+      default: {
+        '@path': '$.context.device.type'
+      }
     },
     tags: {
       label: 'Tag Name',

packages/destination-actions/src/destinations/airship/setAttributes/index.ts

@@ -26,9 +26,13 @@ const action: ActionDefinition<Settings, Payload> = {
     },
     channel_type: {
       label: 'Channel Type',
-      description: 'The Airship audience key for the channel type (e.g. android_channel, ios_channel, amazon_channel, web_channel). If omitted, the generic channel key is used and Airship will resolve the type, which may introduce a slight delay.',
+      description:
+        'The device type for the Channel ID (e.g. ios, android, amazon, web). Defaults to the device type from the event. If omitted or unrecognized, the generic channel key is used and Airship resolves the type, which may introduce a slight delay.',
       type: 'string',
-      required: false
+      required: false,
+      default: {
+        '@path': '$.context.device.type'
+      }
     },
     occurred: {
       label: 'Occurred',

packages/destination-actions/src/destinations/airship/utilities.ts

@@ -232,9 +232,26 @@ export function map_endpoint(region: string) {
   }
 }
 
+function _channel_type_to_key(channel_type: string): string {
+  const map: Record<string, string> = {
+    ios: 'ios_channel',
+    android: 'android_channel',
+    amazon: 'amazon_channel',
+    web: 'web_channel'
+  }
+  return map[channel_type.toLowerCase()] ?? 'channel'
+}
+
+// Builds the audience identifier object used to target a user, shared across all actions.
+// - named_user_id -> { named_user_id }
+// - channel_id with channel_type -> platform-specific key, e.g. { ios_channel } (Airship resolves
+//   the channel directly)
+// - channel_id without channel_type -> generic { channel } (Airship resolves the type server-side)
+// Used as the `user` object for custom events and the `audience` object for attributes and tags.
 function _build_audience(payload: { named_user_id?: string; channel_id?: string; channel_type?: string }): object {
   if (payload.channel_id) {
-    return { [payload.channel_type ?? 'channel']: payload.channel_id }
+    const key = payload.channel_type ? _channel_type_to_key(payload.channel_type) : 'channel'
+    return { [key]: payload.channel_id }
   }
   if (payload.named_user_id) {
     return { named_user_id: payload.named_user_id }
@@ -433,6 +450,7 @@ function _extract_country_language(locale: string): string[] {
 
 export const _private = {
   _build_audience,
+  _channel_type_to_key,
   _build_custom_event_object,
   _build_attributes_object,
   _build_attribute,