@chrryai/chrry 1.5.41 → 1.5.43

package/dist/index.js

@@ -773,7 +773,7 @@ var init_siteConfig = __esm({
       favicon: "focus",
       mode: "focus",
       slug: "focus",
-      version: "26.10.46",
+      version: "26.10.47",
       storeSlug: "blossom",
       name: "Focus",
       domain: "focus.chrry.ai",
@@ -2093,7 +2093,7 @@ var init_utils = __esm({
     };
     isFirefox = typeof navigator !== "undefined" && navigator?.userAgent?.includes("Firefox");
     config = getSiteConfig(getClientHostname());
-    VERSION = config.version || "1.5.41";
+    VERSION = config.version || "1.5.43";
     getSlugFromPathname = (path) => {
       return getAppAndStoreSlugs(path, {
         defaultAppSlug: config.slug,
@@ -23341,7 +23341,6 @@ function AuthProvider({
   const API_PORT2 = process.env.API_PORT || "3001";
   const isTestingDevice2 = false;
   const chrryUrl = CHRRY_URL;
-  console.log(`\u{1F680} ~ AuthProvider ~ chrryUrl:`, chrryUrl);
   const [deviceId, setDeviceId] = useCookieOrLocalStorage(
     "deviceId",
     session2?.deviceId
@@ -23595,17 +23594,15 @@ function AuthProvider({
     sessionData?.app?.store?.apps || []
   );
   const getAppSlug = (targetApp, defaultSlug = "/") => {
-    const localeMatch = locales.find(
-      (loc) => pathname === `/${loc}` || pathname.startsWith(`/${loc}/`)
-    );
+    const localeMatch = locales.find((loc) => {
+      return pathname === `/${loc}` || pathname.startsWith(`/${loc}/`);
+    });
     const localePrefix = localeMatch ? `/${localeMatch}` : "";
     let computedSlug = defaultSlug;
     if (targetApp) {
       if (targetApp.id === baseApp?.id) {
         computedSlug = defaultSlug;
-      } else if (baseApp?.id === chrry?.id && targetApp.id === chrry?.id) {
-        computedSlug = defaultSlug;
-      } else if (targetApp.id === chrry?.id || baseApp?.store?.apps.some((app2) => app2.id === targetApp.id)) {
+      } else if (targetApp.id === app?.id && baseApp?.store?.apps.some((app2) => app2.id === targetApp.id)) {
         computedSlug = `/${targetApp.slug}`;
       } else {
         computedSlug = `/${targetApp.store?.slug}/${targetApp.slug}`;
@@ -23625,14 +23622,11 @@ function AuthProvider({
     }
     return computedSlug || defaultSlug;
   };
-  const baseApp = storeApps.concat(session2?.app?.store?.apps || []).find((item) => {
+  const baseApp = storeApps.find((item) => {
     if (!item) return false;
     if (siteConfig.slug === item.slug && item.store?.slug === siteConfig.storeSlug) {
       return true;
     }
-    if (item.id !== item.store?.appId) return false;
-    if (!item?.store?.domain) return false;
-    return getAlterNativeDomains(item.store).includes(chrryUrl) || item.store.domain === chrryUrl;
   });
   const [threadId, setThreadId] = (0, import_react19.useState)(getThreadId(pathname));
   const [app, setAppInternal] = (0, import_react19.useState)(session2?.app || baseApp);
@@ -23727,28 +23721,17 @@ function AuthProvider({
   const [hasNotifications, setHasNotifications] = (0, import_react19.useState)(
     false
   );
-  const getSlugFromPathname2 = (path) => {
+  const lasProcessedSession = (0, import_react19.useRef)(void 0);
+  const findAppByPathname = (path, apps2) => {
     if (path === "/") return void 0;
     const { appSlug, storeSlug } = getAppAndStoreSlugs(path, {
       defaultAppSlug: baseApp?.slug || siteConfig.slug,
-      defaultStoreSlug: baseApp?.store?.slug || siteConfig.storeSlug,
-      excludedRoutes: excludedSlugRoutes,
-      locales
+      defaultStoreSlug: baseApp?.store?.slug || siteConfig.storeSlug
     });
-    console.log(`\u{1F680} ~ getSlugFromPathname ~ appSlug:`, appSlug, storeSlug);
-    if (!appSlug) {
-      return void 0;
-    }
     const matchedApp = storeApps?.find(
-      (item) => item.slug === appSlug && (!baseApp ? true : !baseApp?.store?.apps?.some((a) => a.id === item.id) ? item.store?.slug === storeSlug : true)
+      (item) => item.slug === appSlug && (hasStoreApps(baseApp) ? baseApp?.store?.apps?.find((app2) => app2.slug === appSlug) || item.store?.slug === storeSlug : true)
     );
-    return matchedApp?.slug;
-  };
-  const lasProcessedSession = (0, import_react19.useRef)(void 0);
-  const findAppByPathname = (path, apps2) => {
-    const slugFromPath = getSlugFromPathname2(path);
-    if (!slugFromPath) return void 0;
-    return apps2.find((app2) => app2.slug === slugFromPath);
+    return matchedApp;
   };
   const [lastAppId, setLastAppId] = useLocalStorage2(
     "lastAppId",
@@ -23757,11 +23740,13 @@ function AuthProvider({
   const [newApp, setNewApp] = (0, import_react19.useState)(void 0);
   const mergeApps = (0, import_react19.useCallback)((newApps) => {
     setAllApps((prevApps) => {
-      console.log(`\u{1F680} ~ AuthProvider ~ prevApps:`, prevApps);
       const existingAppsMap = new Map(prevApps.map((app2) => [app2.id, app2]));
-      newApps.forEach((app2) => {
-        if (!existingAppsMap.has(app2.id) || !existingAppsMap.get(app2.id)?.store?.apps.length || !existingAppsMap.get(app2.id)?.store?.app) {
-          existingAppsMap.set(app2.id, app2);
+      newApps.forEach((newApp2) => {
+        const existingApp = existingAppsMap.get(newApp2.id);
+        if (hasStoreApps(newApp2) && !hasStoreApps(existingApp)) {
+          existingAppsMap.set(newApp2.id, newApp2);
+        } else {
+          existingAppsMap.set(newApp2.id, newApp2);
         }
       });
       return Array.from(existingAppsMap.values());
@@ -23798,23 +23783,24 @@ function AuthProvider({
     try {
       if (!token || !appId) return;
       const app2 = await getApp({ token, appId, chrryUrl });
-      if (loadingAppId) {
-        setLoadingAppId(void 0);
-      }
-      const apps2 = app2.store?.apps;
-      apps2 && mergeApps(apps2);
-      return apps2;
+      return app2.store?.apps;
     } catch (error2) {
       import_react_hot_toast.default.error("Something went wrong");
     }
   });
+  (0, import_react19.useEffect)(() => {
+    if (storeAppsSwr) {
+      mergeApps(storeAppsSwr);
+      setLoadingAppId(void 0);
+    }
+  }, [storeAppsSwr]);
   const hasStoreApps = (item) => {
     if (!item || !storeApps.length) return false;
     const app2 = storeApps?.find((app3) => {
       return app3.id === item?.id;
     });
     return Boolean(
-      app2?.store?.apps.length && storeApps?.find(
+      app2?.store?.app && app2?.store?.apps.length && storeApps?.find(
         (app3) => app3.store?.appId && app3.id === item?.store?.appId
       )
     );
@@ -23834,10 +23820,18 @@ function AuthProvider({
     setShowFocus(canShowFocus);
   }, [canShowFocus]);
   const [store, setStore] = (0, import_react19.useState)(app?.store);
-  const base = storeApps.find(
-    (a) => a.store?.appId === a.id && a.store.id === app?.store?.id
+  const storeAppInternal = app?.store?.apps.find(
+    (item) => app?.store?.appId && item.id === app?.store?.appId
   );
-  const apps = app?.store?.id ? storeApps.filter((a) => base?.store?.apps.some((b) => b.id === a.id)) : storeApps;
+  const [storeApp, setStoreApp] = (0, import_react19.useState)(
+    storeAppInternal
+  );
+  (0, import_react19.useEffect)(() => {
+    setStoreApp(storeAppInternal);
+  }, [storeAppInternal]);
+  const apps = storeApps.filter((item) => {
+    return app?.store?.app?.store?.apps?.some((app2) => app2.id === item.id);
+  });
   const userBaseApp = storeApps?.find(
     (app2) => user?.userName && app2.store?.slug === user?.userName
   );
@@ -23846,15 +23840,6 @@ function AuthProvider({
     (app2) => guest?.id && app2.store?.slug === guest?.id
   );
   const guestBaseStore = guestBaseApp?.store;
-  const storeAppInternal = app?.store?.apps.find(
-    (item) => item.id === app?.store?.appId
-  );
-  const [storeApp, setStoreApp] = (0, import_react19.useState)(
-    storeAppInternal
-  );
-  (0, import_react19.useEffect)(() => {
-    storeAppInternal && setStoreApp(storeAppInternal);
-  }, [storeAppInternal]);
   const [slugState, setSlugState] = (0, import_react19.useState)(
     app && getAppSlug(app) || void 0
   );
@@ -23985,7 +23970,7 @@ function AuthProvider({
   );
   const setApp = (0, import_react19.useCallback)(
     (item) => {
-      ;
+      if (!item) return;
       (item?.id !== baseApp?.id || !isExtension2) && setLastAppId(item?.id);
       setAppInternal((prevApp) => {
         const newApp2 = item ? {
@@ -24027,7 +24012,7 @@ function AuthProvider({
     }
     if (!matchedApp) {
       matchedApp = findAppByPathname(pathname, storeApps) || baseApp;
-      console.log("\u{1F6E3}\uFE0F Using pathname app:", matchedApp?.slug);
+      console.log("\u{1F6E3}\uFE0F Using pathname app:", matchedApp?.slug, pathname);
     }
     console.log("\u{1F50D} App detection:", {
       pathname,
@@ -24429,7 +24414,7 @@ function DataProvider({ children, ...rest }) {
   const [instructions, setInstructions] = (0, import_react21.useState)([]);
   const [affiliateStats, setAffiliateStats] = (0, import_react21.useState)(null);
   const [loadingAffiliateStats, setLoadingAffiliateStats] = (0, import_react21.useState)(false);
-  const VERSION4 = "1.5.41";
+  const VERSION4 = "1.5.43";
   const [weather, setWeather] = useLocalStorage2("weather", user?.weather || guest?.weather || void 0);
   const {
     API_URL: API_URL2,
@@ -24596,26 +24581,6 @@ function DataProvider({ children, ...rest }) {
     ];
     return fahrenheitCountries.includes(country) ? "F" : "C";
   }
-  const swrConfig = {
-    onError: (error2) => {
-      if (error2?.status === 429) {
-        const errorKey = `rate_limit_${Date.now()}`;
-        const lastShown = localStorage.getItem("last_rate_limit_toast");
-        const now2 = Date.now();
-        if (!lastShown || now2 - parseInt(lastShown) > 3e4) {
-          toast_default.error(
-            "Rate limit exceeded. Please wait a moment before trying again."
-          );
-          localStorage.setItem("last_rate_limit_toast", now2.toString());
-        }
-      }
-    },
-    onErrorRetry: (error2, revalidate, { retryCount }) => {
-      if (error2?.status === 429) return;
-      if (retryCount >= 3) return;
-      setTimeout(() => revalidate({ retryCount }), 5e3);
-    }
-  };
   (0, import_react21.useEffect)(() => {
     if (error) captureException(error);
   }, [error]);
@@ -26912,6 +26877,7 @@ function ChatProvider({
     value && setDebateAgent(null);
   };
   const setSelectedAgent = (agent) => {
+    if (selectedAgent?.name === agent?.name) return;
     if (agent === null) {
       setAgentName("");
       setSelectedAgentInternal(null);
@@ -36115,7 +36081,7 @@ function App({
         ...styles4.appsGrid.style
       }
     },
-    /* @__PURE__ */ import_react55.default.createElement(Div, { style: { ...styles4.apps.style } }, appsState.filter((item) => item.id !== popcorn2?.id).slice(0, 5)?.map((item, index) => {
+    /* @__PURE__ */ import_react55.default.createElement(Div, { style: { ...styles4.apps.style } }, appsState.slice(0, 5)?.map((item, index) => {
       const showAtlasHere = index === 1 && app?.id === chrry?.id;
       const showFocusHere = focus2 && !showAtlasHere && index === 1;
       const showPacmanHere = app?.store?.id !== popcorn2?.store?.id && index === 2;
@@ -36194,9 +36160,7 @@ function App({
               size: 24
             }
           ) : /* @__PURE__ */ import_react55.default.createElement(Loading, { size: 24 })
-        ), showPacmanHere ? popcorn2 && store && store?.appId !== popcorn2?.id && store?.apps?.some(
-          (app2) => app2.id === popcorn2.id
-        ) ? /* @__PURE__ */ import_react55.default.createElement(
+        ), showPacmanHere ? popcorn2 && store && store?.appId !== popcorn2?.id && store?.apps?.some((app2) => app2.id === popcorn2.id) ? /* @__PURE__ */ import_react55.default.createElement(
           Anchor,
           {
             preventDefault: true,
@@ -36239,9 +36203,7 @@ function App({
               height: 26
             }
           )
-        ) : null, slug && index === appsState.findIndex(
-          (a) => getAppSlug(a) === slug
-        ) ? /* @__PURE__ */ import_react55.default.createElement(import_react55.default.Fragment, null, /* @__PURE__ */ import_react55.default.createElement(StoreApp, { key: "vex" })) : item.id !== app?.id && /* @__PURE__ */ import_react55.default.createElement(
+        ) : null, slug && getAppSlug(item) === slug ? /* @__PURE__ */ import_react55.default.createElement(import_react55.default.Fragment, null, /* @__PURE__ */ import_react55.default.createElement(StoreApp, { key: "vex" })) : item.id !== app?.id && /* @__PURE__ */ import_react55.default.createElement(
           Anchor,
           {
             preventDefault: true,
@@ -41219,6 +41181,7 @@ function Menu({
     goToThreads
   } = useNavigationContext();
   const { app } = useApp();
+  app && console.log("ssskacsnckjfnckjjdfc kjf c", getAppSlug(app, ""));
   const { viewPortHeight, isStandalone: isStandalone2 } = usePlatform();
   const [loadingThreadId, setLoadingThreadId] = (0, import_react62.useState)(null);
   (0, import_react62.useEffect)(() => {
@@ -41451,7 +41414,7 @@ function Menu({
         /* @__PURE__ */ import_react62.default.createElement(
           Anchor,
           {
-            href: isStandalone2 ? void 0 : `${app ? getAppSlug(app, "") : ""}/threads`,
+            href: `${app ? getAppSlug(app, "") : ""}/threads`,
             onClick: (e) => {
               track({
                 name: "threads-click-menu"
@@ -41727,33 +41690,40 @@ function Menu({
               )
             ))
           ), !threads?.totalCount && /* @__PURE__ */ import_react62.default.createElement(import_react62.default.Fragment, null, /* @__PURE__ */ import_react62.default.createElement(Div, { style: styles4.noThreadsContainer.style }, t5("Nothing here yet"))), threads?.threads.length ? (() => {
-            const url = `/threads${collaborationStatus ? `?collaborationStatus=${collaborationStatus}` : ""}`;
-            return /* @__PURE__ */ import_react62.default.createElement(Div, { style: styles4.loadMoreButtonContainer.style }, /* @__PURE__ */ import_react62.default.createElement(
-              Anchor,
+            const url = `${app ? getAppSlug(app, "") : ""}/threads${collaborationStatus ? `?collaborationStatus=${collaborationStatus}` : ""}`;
+            return /* @__PURE__ */ import_react62.default.createElement(
+              Div,
               {
-                href: url,
-                "data-testid": "load-more-threads-menu",
-                onClick: (e) => {
-                  addHapticFeedback();
-                  track({
-                    name: "load-more-threads-menu"
-                  });
-                  if (e.metaKey || e.ctrlKey) {
-                    return;
-                  }
-                  e.preventDefault();
-                  isSmallDevice ? toggleMenu() : null;
-                  collaborationStatus ? goToThreads({
-                    collaborationStatus
-                  }) : goToThreads();
-                },
-                className: "button transparent small",
-                style: styles4.loadMoreButton.style
+                suppressHydrationWarning: true,
+                style: styles4.loadMoreButtonContainer.style
               },
-              /* @__PURE__ */ import_react62.default.createElement(icons_exports.LoaderCircle, { size: 14 }),
-              " ",
-              t5("Load more")
-            ));
+              /* @__PURE__ */ import_react62.default.createElement(
+                Anchor,
+                {
+                  href: url,
+                  "data-testid": "load-more-threads-menu",
+                  onClick: (e) => {
+                    addHapticFeedback();
+                    track({
+                      name: "load-more-threads-menu"
+                    });
+                    if (e.metaKey || e.ctrlKey) {
+                      return;
+                    }
+                    e.preventDefault();
+                    isSmallDevice ? toggleMenu() : null;
+                    collaborationStatus ? goToThreads({
+                      collaborationStatus
+                    }) : goToThreads();
+                  },
+                  className: "button transparent small",
+                  style: styles4.loadMoreButton.style
+                },
+                /* @__PURE__ */ import_react62.default.createElement(icons_exports.LoaderCircle, { size: 14 }),
+                " ",
+                t5("Load more")
+              )
+            );
           })() : null, !threads?.threads?.length || threads?.threads?.length < 2 ? /* @__PURE__ */ import_react62.default.createElement(EmptyStateTips, { style: { marginTop: 15 } }) : null)
         )
       )
@@ -81952,7 +81922,7 @@ function AppProviders({
       setTimeout(() => revalidate({ retryCount }), 5e3);
     }
   };
-  return /* @__PURE__ */ import_react118.default.createElement(import_swr10.SWRConfig, { key: cacheReady ? "persistent" : "memory", value: swrConfig }, /* @__PURE__ */ import_react118.default.createElement(
+  return /* @__PURE__ */ import_react118.default.createElement(import_swr10.SWRConfig, { value: swrConfig }, /* @__PURE__ */ import_react118.default.createElement(
     PlatformProvider,
     {
       viewPortWidth,