@chrryai/chrry 1.6.31 → 1.6.44

package/dist/index.d.mts

@@ -1574,7 +1574,7 @@ declare const getApps: ({ API_URL, token, chrryUrl, appId, }: {
 declare const getApp: ({ API_URL, token, appId, chrryUrl, }: {
     API_URL?: string;
     token: string;
-    appId: string;
+    appId?: string;
     chrryUrl?: string;
 }) => Promise<appWithStore>;
 declare const getTranslations: ({ API_URL, token, locale, }?: {

package/dist/index.d.ts

@@ -1574,7 +1574,7 @@ declare const getApps: ({ API_URL, token, chrryUrl, appId, }: {
 declare const getApp: ({ API_URL, token, appId, chrryUrl, }: {
     API_URL?: string;
     token: string;
-    appId: string;
+    appId?: string;
     chrryUrl?: string;
 }) => Promise<appWithStore>;
 declare const getTranslations: ({ API_URL, token, locale, }?: {

package/dist/index.js

@@ -502,9 +502,6 @@ function detectSiteModeDomain(hostname2, mode) {
   if (!host) {
     return defaultMode;
   }
-  const matchesDomain = (host2, domain) => {
-    return host2 === domain || host2.endsWith(`.${domain}`);
-  };
   console.log(`\u{1F50D} Detecting mode for host: "${host}"`);
   if (matchesDomain(host, "books.chrry.ai")) {
     return "zarathustra";
@@ -576,7 +573,7 @@ function getSiteConfig(hostnameOrMode) {
       hostname2 = hostnameOrMode;
     }
   }
-  if (hostname2?.includes("e2e.chrry.ai")) {
+  if (hostname2 && matchesDomain(hostname2, "e2e.chrry.ai")) {
     return e2eVex;
   }
   const mode = detectSiteMode(hostname2);
@@ -612,7 +609,7 @@ function getSiteConfig(hostnameOrMode) {
   }
   return vex;
 }
-var import_meta, chrryDev, chrryAI, focus, atlas, istanbul, amsterdam, tokyo, newYork, popcorn, zarathustra, vex, e2eVex, whiteLabels;
+var import_meta, chrryDev, chrryAI, focus, atlas, istanbul, amsterdam, tokyo, newYork, popcorn, zarathustra, vex, e2eVex, matchesDomain, whiteLabels;
 var init_siteConfig = __esm({
   "utils/siteConfig.ts"() {
     "use strict";
@@ -782,7 +779,7 @@ var init_siteConfig = __esm({
       isStoreApp: false,
       mode: "focus",
       slug: "focus",
-      version: "26.10.57",
+      version: "26.10.59",
       storeSlug: "blossom",
       name: "Focus",
       domain: "focus.chrry.ai",
@@ -1325,6 +1322,9 @@ var init_siteConfig = __esm({
       domain: "e2e.chrry.ai"
       // store: "https://e2e.chrry.ai",
     };
+    matchesDomain = (host, domain) => {
+      return host === domain || host.endsWith(`.${domain}`);
+    };
     whiteLabels = [
       chrryDev,
       chrryAI,
@@ -1393,9 +1393,6 @@ function getAppAndStoreSlugs(path, {
     storeSlug: (storeSlug && !reservedRoutes.has(storeSlug) ? storeSlug : void 0) || defaultStoreSlug
   };
 }
-function getThreadId2(pathname) {
-  return getThreadId(pathname);
-}
 var baseProtectedRoutes, protectedRoutes, excludedSlugRoutes;
 var init_url = __esm({
   "utils/url.ts"() {
@@ -2306,14 +2303,20 @@ var init_lib = __esm({
       chrryUrl
     }) => {
       const params = new URLSearchParams();
-      chrryUrl && params.append("chrryUrl", chrryUrl);
-      const response = await fetch(`${API_URL2}/apps/${appId}`, {
+      if (chrryUrl) params.append("chrryUrl", chrryUrl);
+      if (appId) params.append("appId", appId);
+      const url = `${API_URL2}/apps${params.toString() ? `?${params.toString()}` : ""}`;
+      const response = await fetch(url, {
         headers: {
           Authorization: `Bearer ${token}`,
-          "x-app-id": appId,
           ...chrryUrl ? { "x-chrry-url": chrryUrl } : {}
         }
       });
+      if (!response.ok) {
+        throw new Error(
+          `Failed to fetch app: ${response.status} ${response.statusText}`
+        );
+      }
       const data = await response.json();
       return data;
     };
@@ -3108,7 +3111,7 @@ var init_utils = __esm({
     };
     isFirefox = typeof navigator !== "undefined" && navigator?.userAgent?.includes("Firefox");
     config = getSiteConfig(getClientHostname());
-    VERSION = config.version || "1.6.31";
+    VERSION = config.version || "1.6.44";
     getSlugFromPathname = (path) => {
       return getAppAndStoreSlugs(path, {
         defaultAppSlug: config.slug,
@@ -6124,9 +6127,13 @@ function useNavigation() {
         newSearchParams.set(key, String(value));
       });
       const newUrl = `${pathname}?${newSearchParams.toString()}`;
-      nextRouter?.push(newUrl);
+      if (nextRouter) {
+        nextRouter.push(newUrl);
+      } else {
+        clientRouter2.push(newUrl);
+      }
     },
-    [nextRouter, pathname, searchParams]
+    [nextRouter, clientRouter2, pathname, searchParams]
   );
   const removeParams = (0, import_react17.useCallback)(
     (keys) => {
@@ -6134,9 +6141,13 @@ function useNavigation() {
       const keysArray = Array.isArray(keys) ? keys : [keys];
       keysArray.forEach((key) => newSearchParams.delete(key));
       const newUrl = `${pathname}?${newSearchParams.toString()}`;
-      nextRouter?.push(newUrl);
+      if (nextRouter) {
+        nextRouter.push(newUrl);
+      } else {
+        clientRouter2.push(newUrl);
+      }
     },
-    [nextRouter, pathname, searchParams]
+    [nextRouter, clientRouter2, pathname, searchParams]
   );
   const setParams = (0, import_react17.useCallback)(
     (params) => {
@@ -6145,9 +6156,13 @@ function useNavigation() {
         newSearchParams.set(key, String(value));
       });
       const newUrl = `${pathname}?${newSearchParams.toString()}`;
-      nextRouter?.push(newUrl);
+      if (nextRouter) {
+        nextRouter.push(newUrl);
+      } else {
+        clientRouter2.push(newUrl);
+      }
     },
-    [nextRouter, pathname]
+    [nextRouter, clientRouter2, pathname]
   );
   return (0, import_react17.useMemo)(
     () => ({
@@ -23584,7 +23599,7 @@ function AuthProvider({
   };
   const [threads, setThreads] = (0, import_react20.useState)(props.threads);
   const isCI2 = process.env.NEXT_PUBLIC_CI === "true";
-  const siteConfig = getSiteConfig();
+  const siteConfig = getSiteConfig(CHRRY_URL);
   const chrryUrl = CHRRY_URL;
   const [deviceId, setDeviceId] = useCookieOrLocalStorage(
     "deviceId",
@@ -23748,7 +23763,7 @@ function AuthProvider({
         }
         const sessionResult = result;
         console.log("\u{1F4E6} Session API Response - Apps:", {
-          app: sessionResult.app.name,
+          app: sessionResult.app?.name,
           totalApps: sessionResult.app?.store?.apps?.length || 0,
           apps: sessionResult.app?.store?.apps?.map((a) => ({
             slug: a.slug,
@@ -23852,7 +23867,15 @@ function AuthProvider({
     }
   });
   const [threadId, setThreadId] = (0, import_react20.useState)(getThreadId(pathname));
-  const [app, setAppInternal] = (0, import_react20.useState)(session2?.app || baseApp);
+  (0, import_react20.useEffect)(() => {
+    const id = getThreadId(pathname);
+    if (id) {
+      setThreadId(id);
+    } else {
+      setThreadId(void 0);
+    }
+  }, [pathname]);
+  const [app, setAppInternal] = (0, import_react20.useState)(props.app || session2?.app || baseApp);
   (0, import_react20.useEffect)(() => {
     const signInParam = searchParams.get("signIn");
     const currentPart = signInParam;
@@ -23867,7 +23890,7 @@ function AuthProvider({
     props: props2 = {}
   }) => {
     if (!user && !guest) return;
-    if (user?.role === "admin") return;
+    if (!isE2E && user?.role === "admin") return;
     trackEvent({
       name,
       url,
@@ -24617,7 +24640,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.6.31";
+  const VERSION4 = "1.6.44";
   const [weather, setWeather] = useLocalStorage2("weather", user?.weather || guest?.weather || void 0);
   const {
     API_URL: API_URL2,
@@ -26041,11 +26064,19 @@ var init_useWebSocket = __esm({
           return;
         }
         this.isConnecting = true;
+        const connectionTimeout = setTimeout(() => {
+          if (this.isConnecting) {
+            console.log("\u23F0 Connection timeout, resetting isConnecting flag");
+            this.isConnecting = false;
+            this.ws?.close();
+          }
+        }, 1e4);
         if (this.ws && this.currentUrl !== targetUrl) {
           console.log("\u{1F680} Closing existing WebSocket for reconnection");
           await this.close();
         }
         if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+          clearTimeout(connectionTimeout);
           this.isConnecting = false;
           return;
         }
@@ -26055,6 +26086,7 @@ var init_useWebSocket = __esm({
           this.ws = new WebSocket(targetUrl);
           this.ws.onopen = () => {
             console.log("\u2705 WebSocket opened successfully");
+            clearTimeout(connectionTimeout);
             this.isConnecting = false;
             this.connectionState = "connected";
             this.reconnectAttempts = 0;
@@ -26082,6 +26114,7 @@ var init_useWebSocket = __esm({
           };
           this.ws.onclose = (event) => {
             console.log("\u{1F50C} WebSocket closed", event.code, event.reason);
+            clearTimeout(connectionTimeout);
             this.ws = null;
             this.isConnecting = false;
             this.connectionState = "disconnected";
@@ -26100,18 +26133,30 @@ var init_useWebSocket = __esm({
           this.ws.onerror = this.handleError.bind(this);
         } catch (error) {
           console.error("Failed to create WebSocket:", error);
+          clearTimeout(connectionTimeout);
           this.isConnecting = false;
           this.connectionState = "disconnected";
           this.reconnect();
         }
       }
       reconnect() {
+        this.isConnecting = false;
         this.handleReconnecting();
         if (this.reconnectAttempts < this.maxReconnectAttempts) {
-          setTimeout(() => {
+          this.reconnectAttempts++;
+          const delay = Math.min(
+            this.reconnectInterval * this.reconnectAttempts,
+            3e4
+          );
+          console.log(
+            `\u{1F504} Reconnecting in ${delay}ms (attempt ${this.reconnectAttempts}/${this.maxReconnectAttempts})`
+          );
+          this.reconnectTimeout = setTimeout(() => {
             this.connect();
-            this.reconnectAttempts++;
-          }, this.reconnectInterval);
+          }, delay);
+        } else {
+          console.error("\u274C Max reconnection attempts reached");
+          this.connectionLostCallbacks.forEach((cb) => cb());
         }
       }
       pongTimeout = null;
@@ -26253,6 +26298,7 @@ var init_useWebSocket = __esm({
     }) => {
       const isOnline = useOnlineStatus2();
       const wsManager = WebSocketManager.getInstance();
+      console.log(`\u{1F680} ~ wsManager:`, wsManager);
       const connectionStateRef = (0, import_react28.useRef)("disconnected");
       const [connected, setConnected] = (0, import_react28.useState)(false);
       (0, import_react28.useEffect)(() => {
@@ -26519,19 +26565,19 @@ function ChatProvider({
       return;
     }
   }, [loading, storeApps, loadingApp]);
+  console.log("threaddssdsdsd", threadId);
   const setIsNewChat = (value, to = app?.slug ? getAppSlug2(app) : "/") => {
     if (value) {
       setCollaborationStep(0);
       setThread(void 0);
       setProfile(void 0);
-      refetchThreads();
-      setThreadId(void 0);
       setMessages([]);
-      router.push(to);
       setStatus(null);
       isIncognito && setWasIncognito(true);
       setCollaborationStatus(null);
       setIsChatFloating(false);
+      router.push(to);
+      refetchThreads();
     }
     setIsNewChatInternal(value);
   };
@@ -26726,15 +26772,6 @@ function ChatProvider({
       };
     }
   }, [user, guest, threadId, connected]);
-  (0, import_react29.useEffect)(() => {
-    const id = getThreadId2(pathname);
-    if (id) {
-      setThreadId(id);
-      setShouldFetchThread(true);
-    } else {
-      setIsChatFloating(false);
-    }
-  }, [pathname]);
   const [creditsLeft, setCreditsLeft] = (0, import_react29.useState)(void 0);
   (0, import_react29.useEffect)(() => {
     if (user?.creditsLeft || guest?.creditsLeft) {
@@ -26846,10 +26883,11 @@ function ChatProvider({
     );
     setIsWebSearchEnabledInternal(agent?.capabilities?.webSearch || false);
   };
-  const [selectedAgent, setSelectedAgentInternal] = useLocalStorage2(
-    "selectedAgent",
-    aiAgents.find((a) => app?.defaultModel && a.name === app?.defaultModel) || favouriteAgent
-  );
+  const defaultAgent = aiAgents.find((a) => app?.defaultModel && a.name === app?.defaultModel) || favouriteAgent;
+  const [selectedAgent, setSelectedAgentInternal] = useLocalStorage2("selectedAgent", defaultAgent);
+  (0, import_react29.useEffect)(() => {
+    !selectedAgent && setSelectedAgent(defaultAgent);
+  }, [defaultAgent, selectedAgent]);
   const setIsWebSearchEnabled = (value) => {
     value ? setSelectedAgent(perplexityAgent) : void 0;
     setIsWebSearchEnabledInternal(value);
@@ -27006,6 +27044,8 @@ function ChatProvider({
         isLoadingMore,
         setIsLoadingMore,
         isLoading,
+        shouldFetchThread,
+        setShouldFetchThread,
         refetchThread: async () => {
           setShouldFetchThread(true);
           shouldFetchThread && await mutate();
@@ -27096,7 +27136,6 @@ var init_ChatProvider = __esm({
     init_DataProvider();
     init_utils();
     init_hasThreadNotification();
-    init_url();
     init_platform();
     init_AppProvider();
     init_getHourlyLimit();
@@ -27137,7 +27176,8 @@ function NavigationProvider({ children }) {
     isVisitor,
     setIsVisitor,
     refetchThreads,
-    userNameByUrl
+    userNameByUrl,
+    setShouldFetchThread
   } = useChat();
   const goToCalendar = () => {
     const url = threadId ? `/calendar?threadId=${threadId}` : "/calendar";
@@ -30198,6 +30238,7 @@ function Modal({
       if (params) {
         const urlParams = new URLSearchParams(params.split("?")[1] || "");
         const paramToRemove = Array.from(urlParams.entries())[0]?.[0];
+        console.log(`\u{1F680} ~ useEffect ~ paramToRemove:`, paramToRemove);
         if (paramToRemove) {
           removeParams([paramToRemove]);
         }
@@ -37528,73 +37569,6 @@ function Chat({
       }
     });
   };
-  const getPossibleApp = async (text3) => {
-    console.log(`\u{1F680} Analyzing text:`, text3);
-    if (text3.length < 10) return null;
-    try {
-      if (window.ai?.languageModel) {
-        try {
-          console.log("\u{1F916} Using Chrome AI...");
-          const session2 = await window.ai.languageModel.create({
-            temperature: 0.3,
-            topK: 1
-          });
-          const prompt = `Analyze this text and return ONLY the app name that matches best:
-"${text3}"
-
-Apps:
-${apps.map((app2) => `- ${app2.name}: ${app2.description || ""}`).join("\n")}
-
-Return ONLY ONE WORD: ${apps.map((a) => a.name).join(", ")}, or "none"`;
-          const result = await session2.prompt(prompt);
-          console.log(`\u{1F916} Chrome AI result:`, result);
-          const slug2 = result.trim().toLowerCase();
-          const matchedApp = apps.find((app2) => app2.name.toLowerCase() === slug2);
-          if (matchedApp) {
-            console.log(`\u2705 Chrome AI detected: ${matchedApp.name}`);
-            return matchedApp;
-          }
-        } catch (aiError) {
-          console.log("\u26A0\uFE0F Chrome AI failed, using fallback:", aiError);
-        }
-      }
-      console.log("\u{1F50D} Using keyword detection...");
-      const lowerText = text3.toLowerCase();
-      const appPatterns = {
-        atlas: t5("app_keywords_atlas").split(","),
-        bloom: t5("app_keywords_bloom").split(","),
-        peach: t5("app_keywords_peach").split(","),
-        vault: t5("app_keywords_vault").split(",")
-      };
-      const scores = {};
-      for (const [slug2, keywords] of Object.entries(appPatterns)) {
-        let score = 0;
-        for (const keyword of keywords) {
-          if (lowerText.includes(keyword)) {
-            score += keyword.split(" ").length;
-          }
-        }
-        if (score > 0) {
-          scores[slug2] = score;
-        }
-      }
-      console.log(`\u{1F3AF} App scores:`, scores);
-      const bestMatch = Object.entries(scores).sort(([, a], [, b]) => b - a)[0];
-      if (bestMatch) {
-        const [slug2, score] = bestMatch;
-        const matchedApp = apps.find((app2) => app2.name.toLowerCase() === slug2);
-        if (matchedApp) {
-          console.log(`\u2705 Detected app: ${matchedApp.name} (score: ${score})`);
-          return matchedApp;
-        }
-      }
-      console.log(`\u274C No app detected`);
-      return null;
-    } catch (error) {
-      console.error("Error detecting app:", error);
-      return null;
-    }
-  };
   const setInput = (value) => {
     inputRef.current = value;
     setInputInternal(value);
@@ -38639,7 +38613,7 @@ Return ONLY ONE WORD: ${apps.map((a) => a.name).join(", ")}, or "none"`;
   const handleStopStreaming = async () => {
     addHapticFeedback();
     isPlayingSillyPopCluster.current = false;
-    apiFetch(`${API_URL2}/ai`, {
+    await apiFetch(`${API_URL2}/ai`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -49471,7 +49445,8 @@ function FocusButton2({
     storeApps,
     focus: focus2,
     setShowFocus,
-    showFocus
+    showFocus,
+    loadingApp
   } = useAuth();
   const { searchParams, addParams, push, removeParams } = useNavigation();
   const hasHydrated = useHasHydrated();
@@ -49515,7 +49490,12 @@ function FocusButton2({
   const [isDeletingTask, setIsDeletingTask] = (0, import_react85.useState)(false);
   const isMovingItemRef = (0, import_react85.useRef)(false);
   const { isDark, setTheme: setThemeInContext } = useTheme2();
-  const { setPlaceHolderText, placeHolderText, setShouldFocus } = useChat();
+  const {
+    setPlaceHolderText,
+    placeHolderText,
+    setShouldFocus,
+    setIsNewAppChat
+  } = useChat();
   const adjustIntervalRef = (0, import_react85.useRef)(null);
   const secondsUpButtonRef = (0, import_react85.useRef)(null);
   const secondsDownButtonRef = (0, import_react85.useRef)(null);
@@ -50123,21 +50103,30 @@ function FocusButton2({
       /* @__PURE__ */ import_react85.default.createElement(icons_exports.AlarmClockCheck, { width: 16, height: 16 }),
       t5("New task")
     ), focus2 && /* @__PURE__ */ import_react85.default.createElement(
-      Anchor,
+      Span,
       {
-        className: "button inverted",
+        className: `${loadingApp?.id === focus2?.id ? "glow" : ""}`,
         style: {
-          ...utilities.button.style,
-          ...utilities.inverted.style,
-          ...utilities.small.style
-        },
-        onClick: () => {
-          setShowFocus(false);
-          app?.id === focus2?.id ? setShowFocus(false) : push(getAppSlug2(focus2));
+          "--glow-color": COLORS[focus2.themeColor]
         }
       },
-      /* @__PURE__ */ import_react85.default.createElement(ImageComponent, { size: 20, app: focus2 }),
-      focus2.name
+      /* @__PURE__ */ import_react85.default.createElement(
+        Anchor,
+        {
+          className: `button inverted`,
+          style: {
+            ...utilities.button.style,
+            ...utilities.inverted.style,
+            ...utilities.small.style
+          },
+          onClick: () => {
+            setShowFocus(false);
+            app?.id === focus2?.id ? setShowFocus(false) : setIsNewAppChat(focus2);
+          }
+        },
+        loadingApp?.id !== focus2?.id ? /* @__PURE__ */ import_react85.default.createElement(ImageComponent, { size: 20, app: focus2 }) : /* @__PURE__ */ import_react85.default.createElement(Loading, { size: 20 }),
+        focus2.name
+      )
     ))), tasks?.tasks?.length ? /* @__PURE__ */ import_react85.default.createElement(import_react85.default.Fragment, null, /* @__PURE__ */ import_react85.default.createElement(
       DraggableList,
       {
@@ -50360,6 +50349,7 @@ var init_FocusButton = __esm({
     init_SwipeableTimeControl();
     init_providers();
     init_platform();
+    init_ThemeContext();
     init_Image();
     init_A();
     init_StylesContext();
@@ -82002,11 +81992,6 @@ var init_Hey = __esm({
         const ssrPrefixes = ["/blog"];
         const isSSRRoute = lastPathSegment && ssrRoutes.includes(lastPathSegment) || ssrPrefixes.some((prefix) => pathname.startsWith(prefix));
         const pathWithoutLocale = pathname.replace(/^\/[a-z]{2}\//, "/").slice(1).split("?")[0];
-        (0, import_react114.useEffect)(() => {
-          if (pathnameLocal && isExtension2 && pathnameLocal !== "/") {
-            router.push(pathnameLocal);
-          }
-        }, [pathnameLocal, isExtension2]);
         const isChrry = app && app.slug === "chrry";
         const isStorePage = storeApps?.find(
           (app2) => app2.store?.slug === pathWithoutLocale
@@ -82292,6 +82277,7 @@ var init_swrCacheProvider = __esm({
 function AppProviders({
   children,
   session: session2,
+  app,
   onSetLanguage,
   apiKey,
   signInContext,
@@ -82346,6 +82332,7 @@ function AppProviders({
         locale: locale5,
         error,
         apiKey,
+        app,
         threads,
         onSetLanguage,
         signInContext,