@envive-ai/react-hooks 0.1.4 → 0.1.6

package/src/application/models/colorsConfig.ts

@@ -1,22 +1,22 @@
 enum ColorNames {
-  TextPrimary = 'text-primary',
-  TextSecondary = 'text-secondary',
-  TextAccent = 'text-accent',
-  TextLink = 'text-link',
-  TextLight = 'text-light',
-  BackgroundPrimary = 'background-primary',
-  BackgroundSecondary = 'background-secondary',
-  BackgroundSecondaryDark = 'background-secondary-dark',
-  BackgroundTertiary = 'background-tertiary',
-  BackgroundDark = 'background-dark',
-  BackgroundLight = 'background-light',
-  BackgroundSaturated = 'background-saturated',
-  BorderLight = 'border-light',
-  BorderMedium = 'border-medium',
-  BorderDark = 'border-dark',
-  BorderOutline = 'border-outline',
-  AccentPrimary = 'accent-primary',
-  AccentSecondary = 'accent-secondary',
+  TextPrimary = "text-primary",
+  TextSecondary = "text-secondary",
+  TextAccent = "text-accent",
+  TextLink = "text-link",
+  TextLight = "text-light",
+  BackgroundPrimary = "background-primary",
+  BackgroundSecondary = "background-secondary",
+  BackgroundSecondaryDark = "background-secondary-dark",
+  BackgroundTertiary = "background-tertiary",
+  BackgroundDark = "background-dark",
+  BackgroundLight = "background-light",
+  BackgroundSaturated = "background-saturated",
+  BorderLight = "border-light",
+  BorderMedium = "border-medium",
+  BorderDark = "border-dark",
+  BorderOutline = "border-outline",
+  AccentPrimary = "accent-primary",
+  AccentSecondary = "accent-secondary",
 }
 
 type ColorMapping = {

package/src/application/models/frontendConfig.ts

@@ -3,12 +3,12 @@ import {
   WidgetMountingConfig,
   WidgetConfig,
   OrgUIConfig,
-} from 'src/contexts/types';
+} from "src/contexts/types";
 
 export interface FrontendConfig {
-  merchantOverrideCss?: string;
+  merchant_override_css?: string;
   pageVariants?: PageVariantConfig[];
   mountingConfigs?: Record<string, WidgetMountingConfig>;
   widgetConfigs?: Record<string, WidgetConfig>;
-  uiConfigs?: Omit<OrgUIConfig, 'merchantOverrideCss'>;
+  uiConfigs?: Omit<OrgUIConfig, "merchantOverrideCss">;
 }

package/src/application/models/graphql/queries/getMerchantColorsQuery.ts

@@ -1,4 +1,4 @@
-import { configVersion } from 'src/adapters/spiffy/commerce/graphql';
+import { configVersion } from "src/types/config-versions";
 
 const getMerchantColorsQuery = () => `
   query ($version: "${configVersion()}") {

package/src/application/models/graphql/queries/getMerchantFrontendConfigQuery.ts

@@ -1,4 +1,4 @@
-import { configVersion } from 'src/adapters/spiffy/commerce/graphql';
+import { configVersion } from "src/types/config-versions";
 
 const getMerchantFrontendConfigQuery = () => `
   query ($version: "${configVersion()}") {

package/src/application/models/index.ts

@@ -5,8 +5,6 @@ export * from "./clientDetails";
 export * from "./colorsConfig";
 export * from "./conversationalSearchIds";
 export * from "./dataLayer";
-export * from "./domMutationContinuation";
-export * from "./domObservationStrategy";
 export * from "./events";
 export * from "./featureGates";
 export * from "./frontendConfig";

package/src/application/models/localStorageEventListener.ts

@@ -1,4 +1,4 @@
-type LocalStorageEventListener = {
+export type LocalStorageEventListener = {
   storageKey: string;
   listener: (event: StorageEvent) => void;
-}
+};

package/src/application/models/supportedOrgs.ts

@@ -15,7 +15,7 @@ export type BasicOrgInfoType = {
 };
 
 export const getOrgInfo = async (
-  orgShortName: string
+  orgShortName?: string
 ): Promise<BasicOrgInfoType> => {
   switch (orgShortName) {
     case OrgShortName.Bandolier:

package/src/application/models/utils/snakeToCamelTransformer.ts

@@ -4,7 +4,7 @@
  */
 
 // List of acronyms that should be preserved as uppercase in camelCase and lowercase in snake_case
-const PRESERVED_ACRONYMS = ['PLP', 'PDP', 'SVG'];
+const PRESERVED_ACRONYMS = ["PLP", "PDP", "SVG"];
 
 /**
  * Converts a snake_case string to camelCase
@@ -14,11 +14,11 @@ const toCamelCase = (str: string): string => {
   // Pre-process: convert all words that match the PRESERVED_ACRONYMS regex to uppercase
   let processedStr = str;
   for (const acronym of PRESERVED_ACRONYMS) {
-    const regex = new RegExp(`_${acronym}_?`, 'gi');
+    const regex = new RegExp(`_${acronym}_?`, "gi");
 
     if (processedStr.match(regex)) {
       processedStr = processedStr.replace(regex, (v) =>
-        v.endsWith('_') ? `${acronym}_` : `${acronym}`,
+        v.endsWith("_") ? `${acronym}_` : `${acronym}`
       );
     }
   }
@@ -32,10 +32,10 @@ const toCamelCase = (str: string): string => {
  */
 const toSnakeCase = (str: string) =>
   str
-    .replace(/([A-Z])(?=[a-z])/g, '_$1')
-    .replace(/([a-z])([A-Z])/g, '$1_$2')
+    .replace(/([A-Z])(?=[a-z])/g, "_$1")
+    .replace(/([a-z])([A-Z])/g, "$1_$2")
     .toLowerCase()
-    .replace(/^_/, '');
+    .replace(/^_/, "");
 
 /**
  * Recursively transforms all object keys from snake_case to camelCase
@@ -49,7 +49,7 @@ export const transformSnakeToCamel = (obj: unknown): unknown => {
     return obj.map((val) => transformSnakeToCamel(val));
   }
 
-  if (typeof obj === 'object') {
+  if (typeof obj === "object") {
     const result: Record<string, unknown> = {};
 
     for (const [key, value] of Object.entries(obj)) {
@@ -75,7 +75,7 @@ export const transformCamelToSnake = (obj: unknown): unknown => {
     return obj.map(transformCamelToSnake);
   }
 
-  if (typeof obj === 'object') {
+  if (typeof obj === "object") {
     const result: Record<string, unknown> = {};
 
     for (const [key, value] of Object.entries(obj)) {

package/src/application/models/validators/validateGraphQLColorsConfig.ts

@@ -7,25 +7,4 @@ export const validateGraphQLColorsConfig = (
   if (!isGraphQLColorsConfig(data)) {
     return undefined;
   }
-
-  return {
-    [ColorNames.TextPrimary]: "#000000",
-    [ColorNames.TextSecondary]: "#666666",
-    [ColorNames.TextAccent]: "#808080",
-    [ColorNames.TextLink]: "#4D4D4D",
-    [ColorNames.TextLight]: "#FFFFFF",
-    [ColorNames.BackgroundPrimary]: "#999999",
-    [ColorNames.BackgroundSecondary]: "#F2F2F2",
-    [ColorNames.BackgroundSecondaryDark]: "#E5E5E5",
-    [ColorNames.BackgroundTertiary]: "#E5E5E5",
-    [ColorNames.BackgroundDark]: "#000000",
-    [ColorNames.BackgroundLight]: "#FFFFFF",
-    [ColorNames.BackgroundSaturated]: "#CCCCCC",
-    [ColorNames.BorderLight]: "#E5E5E5",
-    [ColorNames.BorderMedium]: "#B2B2B2",
-    [ColorNames.BorderDark]: "#4D4D4D",
-    [ColorNames.BorderOutline]: "#4D4D4D",
-    [ColorNames.AccentPrimary]: "#999999",
-    [ColorNames.AccentSecondary]: "#B2B2B2",
-  };
 };

package/src/application/models/validators/validateGraphQLFrontendConfig.ts

@@ -6,8 +6,8 @@ import {
   PageVariantTestType,
   WidgetMountingConfig,
 } from 'src/contexts/types';
-import { DOMInsertionType } from 'src/application/service/domMutations/domInsertionService';
-import { GridInsertionType } from 'src/application/service/domMutations/GridInsertionService';
+import { DOMInsertionType } from 'src/merchants/domInsertion';
+import { GridInsertionType } from 'src/merchants/gridInsertion';
 import Logger from 'src/application/logging/logger';
 
 // Helper function to validate and transform PageVariantQueryData to PageVariantConfig

package/src/application/utils/analyticsUtils.ts

@@ -1,13 +1,19 @@
-import Logger from 'src/application/logging/logger';
-import { AmplitudeAdapter, SpiffyMetricsEventName } from 'src/adapters/amplitude';
+import Logger from "src/application/logging/logger";
 import {
   isLegacyUAEcommerceEvent,
   isGA4EcommerceEvent,
   isBaseEcommerceEvent,
   BaseEcommerceEvent,
-} from 'src/application/models';
+} from "src/application/models";
+import { SpiffyMetricsEventName } from "src/contexts/amplitudeContext";
 
-const NORMALIZED_ADD_TO_CART_EVENT_NAMES = ['addtocart', 'addedtocart'];
+declare global {
+  interface Window {
+    dataLayer: any[];
+  }
+}
+
+const NORMALIZED_ADD_TO_CART_EVENT_NAMES = ["addtocart", "addedtocart"];
 const CHECK_DATA_LAYER_INTERVAL_MS = 500;
 const CHECK_DATA_LAYER_MAX_ATTEMPTS = 10;
 
@@ -19,8 +25,10 @@ const CHECK_DATA_LAYER_MAX_ATTEMPTS = 10;
  * @returns True if the event is an add_to_cart event, false otherwise.
  */
 const isAddToCartEvent = (event: string): boolean => {
-  const normalizedEvent = event.replace(/[-_]/g, '').toLowerCase();
-  return NORMALIZED_ADD_TO_CART_EVENT_NAMES.some((name) => normalizedEvent.includes(name));
+  const normalizedEvent = event.replace(/[-_]/g, "").toLowerCase();
+  return NORMALIZED_ADD_TO_CART_EVENT_NAMES.some((name) =>
+    normalizedEvent.includes(name)
+  );
 };
 
 /**
@@ -28,7 +36,13 @@ const isAddToCartEvent = (event: string): boolean => {
  *
  * @param event The event to track.
  */
-const handleAddToCartEvent = (event: BaseEcommerceEvent) => {
+const handleAddToCartEvent = (
+  event: BaseEcommerceEvent,
+  track: (
+    eventName: SpiffyMetricsEventName,
+    eventProps?: Record<string, unknown>
+  ) => void
+) => {
   let eventProps: Record<string, unknown>;
 
   if (isLegacyUAEcommerceEvent(event)) {
@@ -40,7 +54,7 @@ const handleAddToCartEvent = (event: BaseEcommerceEvent) => {
         quantity: product.quantity,
       })),
       currency: event.ecommerce.add.currencyCode,
-      event_format_version: 'legacy_universal_analytics',
+      event_format_version: "legacy_universal_analytics",
     };
   } else if (isGA4EcommerceEvent(event)) {
     eventProps = {
@@ -51,17 +65,16 @@ const handleAddToCartEvent = (event: BaseEcommerceEvent) => {
         quantity: item.quantity,
       })),
       currency: event.ecommerce.currency,
-      event_format_version: 'google_analytics_4',
+      event_format_version: "google_analytics_4",
     };
   } else {
     eventProps = {
       event_properties: { ...event },
-      event_format_version: 'unknown',
+      event_format_version: "unknown",
     };
   }
 
-  AmplitudeAdapter.trackEvent({
-    eventName: SpiffyMetricsEventName.AddToCartClicked,
+  track(SpiffyMetricsEventName.AddToCartClicked, {
     eventProps,
   });
 };
@@ -70,18 +83,23 @@ const handleAddToCartEvent = (event: BaseEcommerceEvent) => {
  * Wraps the window.dataLayer.push method to intercept add_to_cart events and send them to Amplitude.
  * This function runs on an interval until the dataLayer is available.
  */
-export const initDataLayerWrapper = () => {
+export const initDataLayerWrapper = (
+  track: (
+    eventName: SpiffyMetricsEventName,
+    eventProps?: Record<string, unknown>
+  ) => void
+) => {
   let attempts = 0;
 
   // currently, our bundle is always loaded after GTM has initialized GA/dataLayer
   // we'll need this check here if/when we load spiffy before/outside of GTM
   const checkAndInitialize = () => {
-    if (!window.dataLayer || !window.dataLayer.push) {
+    if (!window.dataLayer || !(window.dataLayer as any).push) {
       attempts += 1;
 
       if (attempts >= CHECK_DATA_LAYER_MAX_ATTEMPTS) {
         Logger.logDebug(
-          `[spiffy-ai] dataLayer not available after ${CHECK_DATA_LAYER_MAX_ATTEMPTS} attempts`,
+          `[spiffy-ai] dataLayer not available after ${CHECK_DATA_LAYER_MAX_ATTEMPTS} attempts`
         );
         return;
       }
@@ -90,21 +108,34 @@ export const initDataLayerWrapper = () => {
       return;
     }
 
-    Logger.logDebug('[spiffy-ai] dataLayer is available, wrapping push function...');
+    Logger.logDebug(
+      "[spiffy-ai] dataLayer is available, wrapping push function..."
+    );
     const originalPush = window.dataLayer.push;
-    window.dataLayer.push = (args: unknown) => {
-      if (isBaseEcommerceEvent(args) && isAddToCartEvent(args.event)) {
-        handleAddToCartEvent(args);
+    window.dataLayer.push = (...args: unknown[]) => {
+      if (
+        isBaseEcommerceEvent(args[0]) &&
+        isAddToCartEvent((args[0] as any).event)
+      ) {
+        handleAddToCartEvent(args[0] as BaseEcommerceEvent, track);
       }
 
       // IMPORTANT: call the original push method so that the event is still logged to GA
-      originalPush.apply(window.dataLayer, [args]);
+      return originalPush.apply(window.dataLayer, args);
     };
   };
 
   checkAndInitialize();
 };
 
-export const initAmplitude = () => {
-  AmplitudeAdapter.getSingletonInstanceOf();
+export const initAmplitude = (
+  track: (
+    eventName: SpiffyMetricsEventName,
+    eventProps?: Record<string, unknown>
+  ) => void
+) => {
+  // This function might not be needed anymore if Amplitude is initialized via context.
+  // For now, we'll keep it and pass the track function.
+  // If it's truly redundant, it can be removed later.
+  track(SpiffyMetricsEventName.BundleLoaded); // Example usage, adjust as needed
 };

package/src/application/utils/cdnUtils.ts

@@ -0,0 +1,11 @@
+import { getAtomStore } from "src/atoms/atomStore/atomStore";
+import { cdnUrlAtom } from "src/atoms/envive/enviveConfig";
+
+export const getCdnAssetURL = (
+  assetName: string,
+  orgShortName: string
+): string => {
+  const atomStore = getAtomStore();
+  const cdnUrl = atomStore.get(cdnUrlAtom) || "https://cdn.spiffy.ai/other";
+  return `${cdnUrl}/assets/${orgShortName}/${assetName}`;
+};

package/src/atoms/amplitude/amplitudeTrackEventAtom.ts

@@ -0,0 +1,15 @@
+import { atom } from "jotai";
+import { SpiffyMetricsEventName } from "src/contexts/amplitudeContext";
+
+interface TrackEventParams {
+  eventName: SpiffyMetricsEventName;
+  eventProps?: Record<string, unknown>;
+  eventGroups?: Record<string, unknown>;
+  alsoSendToGoogleAnalytics?: boolean;
+}
+
+// This atom will hold the trackEvent function from the Amplitude context.
+// It needs to be initialized by a React component that has access to the useAmplitude hook.
+export const amplitudeTrackEventAtom = atom<
+  ((params: TrackEventParams) => Promise<void>) | null
+>(null);

package/src/atoms/app/index.ts

@@ -5,9 +5,8 @@ import {
 import { atom } from "jotai";
 import { atomWithStorage } from "jotai/utils";
 import { VariantInfo } from "src/application/models";
-import { UserIdentityService } from "src/application/service/userIdentityService";
+import { UserIdentityContextType } from "src/contexts/userIdentityContext";
 import { variantInfoAtom } from "src/atoms/app/variant";
-import { orgIdAtom, orgShortNameAtom } from "src/atoms/org/org";
 import { v4 as uuid } from "uuid";
 import { contextSourceAtom } from "../envive/enviveConfig";
 
@@ -33,16 +32,20 @@ export const userIdAtom = atom(
       return maybeUserId;
     }
 
-    return UserIdentityService.getUserIdOrDefault();
+    return get(userIdentityAtom)?.getUserIdOrDefault() ?? "";
   },
   (_, set, value: string | undefined) => {
     set(internalUserIdAtom, value);
   }
 );
+
+export const userIdentityAtom = atom<UserIdentityContextType | undefined>(
+  undefined
+);
+
 export const appSourceAtom = atom<ContextSourceEnum>(
   (get): ContextSourceEnum => get(contextSourceAtom) ?? ContextSourceEnum.App
 );
-export const envAtom = atom<ContextEnvEnum>(ContextEnvEnum.Dev);
 export const chatIdAtom = atomWithStorage<string>(
   "v1-spiffy-chat-session-id",
   uuid(),
@@ -51,16 +54,3 @@ export const chatIdAtom = atomWithStorage<string>(
     getOnInit: true,
   }
 );
-
-export const appDetailsAtom = atom(
-  (get): AppDetails => ({
-    orgId: get(orgIdAtom) ?? "",
-    // TODO: orgShortName should be available when this atom is created
-    orgShortName: get(orgShortNameAtom) ?? "spiffy-ai",
-    chatId: get(chatIdAtom),
-    userId: get(userIdAtom),
-    source: get(appSourceAtom),
-    env: get(envAtom),
-    variantInfo: get(variantInfoAtom),
-  })
-);

package/src/atoms/app/variant.ts

@@ -14,7 +14,7 @@ import {
   OrgShortName,
 } from "src/application/models";
 import { sessionStorageUtil } from "src/atoms/atomStore/atomStore";
-import { featureFlagServiceAtom, orgShortNameAtom } from "src/atoms/org/org";
+import { enviveConfigAtom } from "src/atoms/envive/enviveConfig";
 
 export interface SupportedEvent
   extends Pick<
@@ -149,6 +149,14 @@ const internalStorageSupportedEventAtom = atomWithStorage<string | undefined>(
 );
 const internalSupportedEventAtom = atom<SupportedEvent | undefined>(undefined);
 
+const featureFlagServiceAtom = atom((get) => {
+  const config = get(enviveConfigAtom);
+  const featureOverrides = config?.featureOverrides;
+  return {
+    isFeatureGateEnabled: (gate: string) => featureOverrides?.[gate] || false,
+  };
+});
+
 export const supportedEventAtom = atom(
   (get): SupportedEvent | undefined => {
     const maybeSupportedEvent = get(internalStorageSupportedEventAtom);
@@ -170,7 +178,8 @@ export const supportedEventAtom = atom(
     const featureFlagService = get(featureFlagServiceAtom);
     const maybeSupportedEvent = get(internalSupportedEventAtom);
     const variantCategory = maybeSupportedEvent?.category;
-    const shortName = get(orgShortNameAtom);
+    const config = get(enviveConfigAtom);
+    const orgShortName = config?.orgShortName;
 
     // TODO: clean up this logic & the feature gate when we've fully rolled out
     if (
@@ -180,8 +189,8 @@ export const supportedEventAtom = atom(
       ) &&
       variantCategory &&
       variantCategory !== SupportedEventProductCategory.Shapewear &&
-      (shortName === OrgShortName.Spanx ||
-        shortName === OrgShortName.SpanxStaging)
+      (orgShortName === OrgShortName.Spanx ||
+        orgShortName === OrgShortName.SpanxStaging)
     ) {
       const modifiedSupportedEvent = {
         supported: false,

package/src/atoms/chat/chatState.ts

@@ -1,12 +1,19 @@
-import { UserEventCategory } from '@spiffy-ai/commerce-api-client/dist/models/UserEventCategory';
-import { atom } from 'jotai';
-import { AmplitudeAdapter, SpiffyMetricsEventName } from 'src/adapters/amplitude';
-import { FormSubmittedAttributes, Message, Suggestion, UserEvent } from 'src/application/models';
-import { ChatElementDisplayLocation } from 'src/application/models/chatElementDisplayLocation';
-import { SpiffyEventName } from 'src/application/models/events';
+import { UserEventCategory } from "@spiffy-ai/commerce-api-client/dist/models/UserEventCategory";
+import { atom } from "jotai";
+import { SpiffyMetricsEventName } from "src/contexts/amplitudeContext";
+import {
+  FormSubmittedAttributes,
+  Message,
+  Suggestion,
+  UserEvent,
+} from "src/application/models";
+import { ChatElementDisplayLocation } from "src/application/models/chatElementDisplayLocation";
+import { SpiffyEventName } from "src/application/models/events";
 
 export const userHasRepliedAtom = atom<boolean>(false);
-export const replyEventCategoryAtom = atom<UserEventCategory>(UserEventCategory.AppLoaded);
+export const replyEventCategoryAtom = atom<UserEventCategory>(
+  UserEventCategory.AppLoaded
+);
 export const userQueryAtom = atom<string>();
 export const suggestionAtom = atom<Suggestion | undefined>(undefined);
 export const askQuestionBtnClickedAtom = atom<boolean>(false);
@@ -20,25 +27,28 @@ export const requestFailureAtom = atom<boolean>(false);
 export const formSubmitAtom = atom<FormSubmittedAttributes>();
 export const chatOnToggleAtom = atom(
   null,
-  (get, set, triggerLocation?: ChatElementDisplayLocation) => {
+  (
+    get,
+    set,
+    triggerLocation?: ChatElementDisplayLocation,
+    track?: (
+      eventName: SpiffyMetricsEventName,
+      eventProps?: Record<string, unknown>
+    ) => void
+  ) => {
     const isOpen = get(chatIsOpenAtom);
     set(chatIsOpenAtom, !isOpen);
 
     if (!isOpen) {
       window.dispatchEvent(new CustomEvent(SpiffyEventName.WidgetOpen));
-      AmplitudeAdapter.trackEvent({
-        eventName: SpiffyMetricsEventName.ChatComponentExpanded,
-        eventProps: {
-          message_metadata: {
-            trigger_location: triggerLocation,
-          },
+      track?.(SpiffyMetricsEventName.ChatComponentExpanded, {
+        message_metadata: {
+          trigger_location: triggerLocation,
         },
       });
     } else {
       window.dispatchEvent(new CustomEvent(SpiffyEventName.WidgetClose));
-      AmplitudeAdapter.trackEvent({
-        eventName: SpiffyMetricsEventName.ChatComponentCollapsed,
-      });
+      track?.(SpiffyMetricsEventName.ChatComponentCollapsed);
     }
-  },
+  }
 );

package/src/atoms/chat/messageQueue.ts

@@ -6,8 +6,13 @@ import {
   UserEvent,
 } from "src/application/models";
 import { getAtomStore } from "src/atoms/atomStore/atomStore";
-import { appDetailsAtom } from "src/atoms/app";
-import { featureFlagServiceAtom } from "src/atoms/org/org";
+import { userIdAtom, chatIdAtom } from "src/atoms/app";
+import {
+  orgShortNameAtom,
+  contextSourceAtom,
+  envAtom,
+} from "src/atoms/envive/enviveConfig";
+import { orgIdAtom, featureFlagServiceAtom } from "src/atoms/org/graphqlConfig";
 
 const internalUserEventQueueAtom = atom<UserEvent[]>([]);
 
@@ -61,6 +66,12 @@ export const userQueueEventCountAtom = atom(
   (get) => get(userEventQueueAtom).length
 );
 
+import {
+  ContextSourceEnum,
+  ContextEnvEnum,
+} from "@spiffy-ai/commerce-api-client"; // Import necessary enums
+// import type { Context } from "@spiffy-ai/commerce-api-client/dist/models/Context"; // Import Context type
+
 export const createResponsePayload = ({
   userEvents,
   generationParams,
@@ -69,14 +80,34 @@ export const createResponsePayload = ({
   generationParams?: GenerationParams;
 }): NextMessageRequest => {
   const atomStore = getAtomStore();
-  const context = atomStore.get(appDetailsAtom);
+  const orgShortName = atomStore.get(orgShortNameAtom);
+  const orgId = atomStore.get(orgIdAtom);
+  const userId = atomStore.get(userIdAtom);
+  const chatId = atomStore.get(chatIdAtom);
+  const source = atomStore.get(contextSourceAtom);
+  const env = atomStore.get(envAtom);
+
   const featureFlagService = atomStore.get(featureFlagServiceAtom);
-  const featureFlags = featureFlagService?.getFeatureFlags() || {};
+
+  const context = {
+    userId: userId ?? "",
+    org_id: orgId ?? "",
+    org_short_name: orgShortName ?? "",
+    chat_id: chatId ?? "",
+    source: source ?? ContextSourceEnum.App,
+    env: (env as ContextEnvEnum) ?? ContextEnvEnum.Dev,
+  };
+
+  const featureFlags =
+    featureFlagService?.featureFlagService?.getFeatureFlags() || {};
+
   return {
     id: uuid(),
     context,
     userEvents,
-    featureFlags,
+    featureFlags: Object.fromEntries(
+      Object.entries(featureFlags).filter(([, isEnabled]) => isEnabled)
+    ), // Convert back to Record<string, boolean>
     generationParams,
   };
 };