@btst/stack 2.12.2 → 3.0.0-rc.2

package/dist/packages/stack/src/plugins/ai-chat/client/hooks/chat-hooks.mjs

@@ -1,191 +1,72 @@
 "use client";
-import { createApiClient } from '@btst/stack/plugins/client';
-import { useQuery, useSuspenseQuery, useQueryClient, useMutation } from '@tanstack/react-query';
-import { createAiChatQueryKeys } from '../../../../../../../plugins/ai-chat/query-keys.mjs';
-import { usePluginOverrides } from '@btst/stack/context';
+import { useTranslate, usePluginOverrides } from '@btst/stack/context';
+import { aiChat } from './ai-chat-resource.mjs';
 
-const SHARED_QUERY_CONFIG = {
-  retry: false,
-  refetchOnWindowFocus: false,
-  refetchOnMount: false,
-  refetchOnReconnect: false,
-  staleTime: 1e3 * 60 * 5,
-  // 5 minutes
-  gcTime: 1e3 * 60 * 10
-  // 10 minutes
-};
 function useConversations(options = {}) {
-  const { apiBaseURL, apiBasePath, headers } = usePluginOverrides("ai-chat");
-  const client = createApiClient({
-    baseURL: apiBaseURL,
-    basePath: apiBasePath
-  });
-  const { enabled = true } = options;
-  const queries = createAiChatQueryKeys(client, headers);
-  const listQuery = queries.conversations.list();
-  const { data, isLoading, error, refetch } = useQuery({
-    ...listQuery,
-    ...SHARED_QUERY_CONFIG,
-    enabled: enabled && !!client
+  const query = aiChat.conversations.list.use([], {
+    enabled: options.enabled ?? true
   });
   return {
-    conversations: data ?? [],
-    isLoading,
-    error,
-    refetch
+    conversations: query.data ?? [],
+    isLoading: query.isLoading,
+    error: query.error,
+    refetch: query.refetch
   };
 }
 function useSuspenseConversations() {
-  const { apiBaseURL, apiBasePath, headers } = usePluginOverrides("ai-chat");
-  const client = createApiClient({
-    baseURL: apiBaseURL,
-    basePath: apiBasePath
-  });
-  const queries = createAiChatQueryKeys(client, headers);
-  const listQuery = queries.conversations.list();
-  const { data, refetch, error, isFetching } = useSuspenseQuery({
-    ...listQuery,
-    ...SHARED_QUERY_CONFIG
-  });
-  if (error && !isFetching) {
-    throw error;
-  }
+  const query = aiChat.conversations.list.useSuspense([]);
   return {
-    conversations: data ?? [],
-    refetch
+    conversations: query.data ?? [],
+    refetch: query.refetch
   };
 }
 function useConversation(id, options = {}) {
-  const { apiBaseURL, apiBasePath, headers } = usePluginOverrides("ai-chat");
-  const client = createApiClient({
-    baseURL: apiBaseURL,
-    basePath: apiBasePath
-  });
-  const { enabled = true } = options;
-  const queries = createAiChatQueryKeys(client, headers);
-  const detailQuery = queries.conversations.detail(id ?? "");
-  const { data, isLoading, error, refetch } = useQuery({
-    ...detailQuery,
-    ...SHARED_QUERY_CONFIG,
-    enabled: enabled && !!client && !!id
+  const query = aiChat.conversations.detail.use([id ?? ""], {
+    enabled: (options.enabled ?? true) && !!id
   });
   return {
-    conversation: data || null,
-    isLoading,
-    error,
-    refetch
+    conversation: query.data ?? null,
+    isLoading: query.isLoading,
+    error: query.error,
+    refetch: query.refetch
   };
 }
 function useSuspenseConversation(id) {
-  const { apiBaseURL, apiBasePath, headers } = usePluginOverrides("ai-chat");
-  const client = createApiClient({
-    baseURL: apiBaseURL,
-    basePath: apiBasePath
-  });
-  const queries = createAiChatQueryKeys(client, headers);
-  const detailQuery = queries.conversations.detail(id);
-  const { data, refetch, error, isFetching } = useSuspenseQuery({
-    ...detailQuery,
-    ...SHARED_QUERY_CONFIG
-  });
-  if (error && !isFetching) {
-    throw error;
-  }
+  const query = aiChat.conversations.detail.useSuspense([id]);
   return {
-    conversation: data || null,
-    refetch
+    conversation: query.data ?? null,
+    refetch: query.refetch
   };
 }
 function useCreateConversation() {
-  const { refresh, apiBaseURL, apiBasePath } = usePluginOverrides("ai-chat");
-  const client = createApiClient({
-    baseURL: apiBaseURL,
-    basePath: apiBasePath
-  });
-  const queryClient = useQueryClient();
-  const queries = createAiChatQueryKeys(client);
-  return useMutation({
-    mutationKey: [...queries.conversations._def, "create"],
-    mutationFn: async (data) => {
-      const response = await client("@post/chat/conversations", {
-        method: "POST",
-        body: data
-      });
-      return response.data;
-    },
-    onSuccess: async (created) => {
-      await queryClient.invalidateQueries({
-        queryKey: queries.conversations.list().queryKey
-      });
-      if (refresh) {
-        await refresh();
-      }
-    }
-  });
+  return aiChat.conversations.create.use();
 }
 function useRenameConversation() {
-  const { refresh, apiBaseURL, apiBasePath } = usePluginOverrides("ai-chat");
-  const client = createApiClient({
-    baseURL: apiBaseURL,
-    basePath: apiBasePath
-  });
-  const queryClient = useQueryClient();
-  const queries = createAiChatQueryKeys(client);
-  return useMutation({
-    mutationKey: [...queries.conversations._def, "rename"],
-    mutationFn: async ({ id, title }) => {
-      const response = await client("@put/chat/conversations/:id", {
-        method: "PUT",
-        params: { id },
-        body: { title }
-      });
-      return response.data;
-    },
-    onSuccess: async (updated) => {
-      if (updated?.id) {
-        queryClient.setQueryData(
-          queries.conversations.detail(updated.id).queryKey,
-          (old) => old ? { ...old, ...updated } : null
-        );
-      }
-      await queryClient.invalidateQueries({
-        queryKey: queries.conversations.list().queryKey
-      });
-      if (refresh) {
-        await refresh();
-      }
-    }
-  });
+  return aiChat.conversations.rename.use();
 }
 function useDeleteConversation() {
-  const { refresh, apiBaseURL, apiBasePath } = usePluginOverrides("ai-chat");
-  const client = createApiClient({
-    baseURL: apiBaseURL,
-    basePath: apiBasePath
-  });
-  const queryClient = useQueryClient();
-  const queries = createAiChatQueryKeys(client);
-  return useMutation({
-    mutationKey: [...queries.conversations._def, "delete"],
-    mutationFn: async ({ id }) => {
-      const response = await client("@delete/chat/conversations/:id", {
-        method: "DELETE",
-        params: { id }
-      });
-      return response.data;
-    },
-    onSuccess: async (_, { id }) => {
-      queryClient.removeQueries({
-        queryKey: queries.conversations.detail(id).queryKey
-      });
-      await queryClient.invalidateQueries({
-        queryKey: queries.conversations.list().queryKey
-      });
-      if (refresh) {
-        await refresh();
+  return aiChat.conversations.delete.use();
+}
+function useRenameConversationForm(options) {
+  const t = useTranslate();
+  const { localization } = usePluginOverrides("ai-chat");
+  return aiChat.conversations.useForm({
+    action: "edit",
+    updateMutation: "rename",
+    record: options.conversation,
+    defaults: (conversation) => ({ title: conversation?.title ?? "" }),
+    toUpdateVars: (values, conversation) => {
+      if (!conversation) {
+        throw new Error(
+          t("aiChat.errors.missingConversation", "Conversation is required")
+        );
       }
-    }
+      return { id: conversation.id, title: values.title.trim() };
+    },
+    successMessage: localization?.CONVERSATION_RENAME_SUCCESS ?? t("aiChat.toasts.renameSuccess", "Conversation renamed"),
+    errorMessage: () => localization?.CONVERSATION_RENAME_FAILURE ?? t("aiChat.toasts.renameFailure", "Failed to rename conversation"),
+    onSuccess: options.onSuccess
   });
 }
 
-export { useConversation, useConversations, useCreateConversation, useDeleteConversation, useRenameConversation, useSuspenseConversation, useSuspenseConversations };
+export { useConversation, useConversations, useCreateConversation, useDeleteConversation, useRenameConversation, useRenameConversationForm, useSuspenseConversation, useSuspenseConversations };

package/dist/packages/stack/src/plugins/ai-chat/client/localization/index.cjs

@@ -1,63 +1,36 @@
+"use client";
 'use strict';
 
-const AI_CHAT_LOCALIZATION = {
-  // Chat interface
-  CHAT_PLACEHOLDER: "Type a message...",
-  CHAT_SEND_BUTTON: "Send",
-  CHAT_EMPTY_STATE: "Start a conversation...",
-  CHAT_LOADING: "Thinking...",
-  CHAT_ERROR: "Something went wrong. Please try again.",
-  CHAT_RETRY: "Retry",
-  // Page errors
-  CHAT_GENERIC_ERROR_TITLE: "Something went wrong",
-  CHAT_GENERIC_ERROR_MESSAGE: "An error occurred while loading the chat. Please try again.",
-  CHAT_PAGE_NOT_FOUND_TITLE: "Chat not found",
-  CHAT_PAGE_NOT_FOUND_DESCRIPTION: "The conversation you're looking for doesn't exist or has been deleted.",
-  // Sidebar
-  SIDEBAR_TITLE: "Conversations",
-  SIDEBAR_NEW_CHAT: "New chat",
-  SIDEBAR_NO_CONVERSATIONS: "No conversations yet",
-  SIDEBAR_SEARCH_PLACEHOLDER: "Search conversations...",
-  // Conversation actions
-  CONVERSATION_RENAME: "Rename",
-  CONVERSATION_RENAME_PLACEHOLDER: "Enter conversation name",
-  CONVERSATION_RENAME_SAVE: "Save",
-  CONVERSATION_RENAME_CANCEL: "Cancel",
-  CONVERSATION_DELETE: "Delete",
-  CONVERSATION_DELETE_CONFIRM_TITLE: "Delete conversation",
-  CONVERSATION_DELETE_CONFIRM_DESCRIPTION: "Are you sure you want to delete this conversation? This action cannot be undone.",
-  CONVERSATION_DELETE_CONFIRM_BUTTON: "Delete",
-  CONVERSATION_DELETE_CANCEL: "Cancel",
-  // Image upload (legacy)
-  IMAGE_UPLOAD_BUTTON: "Attach image",
-  IMAGE_UPLOAD_UPLOADING: "Uploading...",
-  IMAGE_UPLOAD_ERROR_NOT_IMAGE: "Please select an image file",
-  IMAGE_UPLOAD_ERROR_TOO_LARGE: "Image must be less than 4MB",
-  IMAGE_UPLOAD_SUCCESS: "Image uploaded",
-  IMAGE_UPLOAD_FAILURE: "Failed to upload image",
-  // File upload
-  FILE_UPLOAD_BUTTON: "Attach file",
-  FILE_UPLOAD_ERROR_TOO_LARGE: "File must be less than 10MB",
-  FILE_UPLOAD_SUCCESS: "File attached",
-  FILE_UPLOAD_FAILURE: "Failed to attach file",
-  // Timestamps
-  TIME_JUST_NOW: "Just now",
-  TIME_MINUTES_AGO: "{count} minutes ago",
-  TIME_HOURS_AGO: "{count} hours ago",
-  TIME_YESTERDAY: "Yesterday",
-  TIME_DAYS_AGO: "{count} days ago",
-  // Message actions
-  MESSAGE_COPY: "Copy message",
-  MESSAGE_COPIED: "Copied!",
-  MESSAGE_RETRY: "Retry",
-  MESSAGE_EDIT: "Edit message",
-  MESSAGE_SAVE: "Save",
-  MESSAGE_CANCEL: "Cancel",
-  // Accessibility
-  A11Y_USER_MESSAGE: "Your message",
-  A11Y_ASSISTANT_MESSAGE: "AI response",
-  A11Y_COPY_CODE: "Copy code",
-  A11Y_CODE_COPIED: "Code copied"
-};
+const React = require('react');
+const context = require('@btst/stack/context');
 
-exports.AI_CHAT_LOCALIZATION = AI_CHAT_LOCALIZATION;
+function formatLocalized(template, values) {
+  return template.replace(/\{(\w+)\}/g, (match, key) => {
+    return values[key]?.toString() ?? match;
+  });
+}
+function resolveAiChatString(t, localization, legacyKey, key, defaultValue, params) {
+  const legacyValue = localization?.[legacyKey];
+  if (legacyValue !== void 0) {
+    return params ? formatLocalized(legacyValue, params) : legacyValue;
+  }
+  return t(key, defaultValue, params);
+}
+function useAiChatTranslation(localization) {
+  const t = context.useTranslate();
+  return React.useCallback(
+    (legacyKey, key, defaultValue, params) => resolveAiChatString(
+      t,
+      localization,
+      legacyKey,
+      key,
+      defaultValue,
+      params
+    ),
+    [t, localization]
+  );
+}
+
+exports.formatLocalized = formatLocalized;
+exports.resolveAiChatString = resolveAiChatString;
+exports.useAiChatTranslation = useAiChatTranslation;

package/dist/packages/stack/src/plugins/ai-chat/client/localization/index.mjs

@@ -1,61 +1,32 @@
-const AI_CHAT_LOCALIZATION = {
-  // Chat interface
-  CHAT_PLACEHOLDER: "Type a message...",
-  CHAT_SEND_BUTTON: "Send",
-  CHAT_EMPTY_STATE: "Start a conversation...",
-  CHAT_LOADING: "Thinking...",
-  CHAT_ERROR: "Something went wrong. Please try again.",
-  CHAT_RETRY: "Retry",
-  // Page errors
-  CHAT_GENERIC_ERROR_TITLE: "Something went wrong",
-  CHAT_GENERIC_ERROR_MESSAGE: "An error occurred while loading the chat. Please try again.",
-  CHAT_PAGE_NOT_FOUND_TITLE: "Chat not found",
-  CHAT_PAGE_NOT_FOUND_DESCRIPTION: "The conversation you're looking for doesn't exist or has been deleted.",
-  // Sidebar
-  SIDEBAR_TITLE: "Conversations",
-  SIDEBAR_NEW_CHAT: "New chat",
-  SIDEBAR_NO_CONVERSATIONS: "No conversations yet",
-  SIDEBAR_SEARCH_PLACEHOLDER: "Search conversations...",
-  // Conversation actions
-  CONVERSATION_RENAME: "Rename",
-  CONVERSATION_RENAME_PLACEHOLDER: "Enter conversation name",
-  CONVERSATION_RENAME_SAVE: "Save",
-  CONVERSATION_RENAME_CANCEL: "Cancel",
-  CONVERSATION_DELETE: "Delete",
-  CONVERSATION_DELETE_CONFIRM_TITLE: "Delete conversation",
-  CONVERSATION_DELETE_CONFIRM_DESCRIPTION: "Are you sure you want to delete this conversation? This action cannot be undone.",
-  CONVERSATION_DELETE_CONFIRM_BUTTON: "Delete",
-  CONVERSATION_DELETE_CANCEL: "Cancel",
-  // Image upload (legacy)
-  IMAGE_UPLOAD_BUTTON: "Attach image",
-  IMAGE_UPLOAD_UPLOADING: "Uploading...",
-  IMAGE_UPLOAD_ERROR_NOT_IMAGE: "Please select an image file",
-  IMAGE_UPLOAD_ERROR_TOO_LARGE: "Image must be less than 4MB",
-  IMAGE_UPLOAD_SUCCESS: "Image uploaded",
-  IMAGE_UPLOAD_FAILURE: "Failed to upload image",
-  // File upload
-  FILE_UPLOAD_BUTTON: "Attach file",
-  FILE_UPLOAD_ERROR_TOO_LARGE: "File must be less than 10MB",
-  FILE_UPLOAD_SUCCESS: "File attached",
-  FILE_UPLOAD_FAILURE: "Failed to attach file",
-  // Timestamps
-  TIME_JUST_NOW: "Just now",
-  TIME_MINUTES_AGO: "{count} minutes ago",
-  TIME_HOURS_AGO: "{count} hours ago",
-  TIME_YESTERDAY: "Yesterday",
-  TIME_DAYS_AGO: "{count} days ago",
-  // Message actions
-  MESSAGE_COPY: "Copy message",
-  MESSAGE_COPIED: "Copied!",
-  MESSAGE_RETRY: "Retry",
-  MESSAGE_EDIT: "Edit message",
-  MESSAGE_SAVE: "Save",
-  MESSAGE_CANCEL: "Cancel",
-  // Accessibility
-  A11Y_USER_MESSAGE: "Your message",
-  A11Y_ASSISTANT_MESSAGE: "AI response",
-  A11Y_COPY_CODE: "Copy code",
-  A11Y_CODE_COPIED: "Code copied"
-};
+"use client";
+import { useCallback } from 'react';
+import { useTranslate } from '@btst/stack/context';
 
-export { AI_CHAT_LOCALIZATION };
+function formatLocalized(template, values) {
+  return template.replace(/\{(\w+)\}/g, (match, key) => {
+    return values[key]?.toString() ?? match;
+  });
+}
+function resolveAiChatString(t, localization, legacyKey, key, defaultValue, params) {
+  const legacyValue = localization?.[legacyKey];
+  if (legacyValue !== void 0) {
+    return params ? formatLocalized(legacyValue, params) : legacyValue;
+  }
+  return t(key, defaultValue, params);
+}
+function useAiChatTranslation(localization) {
+  const t = useTranslate();
+  return useCallback(
+    (legacyKey, key, defaultValue, params) => resolveAiChatString(
+      t,
+      localization,
+      legacyKey,
+      key,
+      defaultValue,
+      params
+    ),
+    [t, localization]
+  );
+}
+
+export { formatLocalized, resolveAiChatString, useAiChatTranslation };

package/dist/packages/stack/src/plugins/ai-chat/client/plugin.cjs

@@ -4,7 +4,7 @@ const jsxRuntime = require('react/jsx-runtime');
 const client = require('@btst/stack/plugins/client');
 const yar = require('@btst/yar');
 const plugins_aiChat_queryKeys = require('../../../../../../plugins/ai-chat/query-keys.cjs');
-const chatLayout = require('./components/chat-layout.cjs');
+const chatPage = require('./components/pages/chat-page.cjs');
 
 function createConversationsLoader(config) {
   return async () => {
@@ -20,28 +20,22 @@ function createConversationsLoader(config) {
         apiBasePath,
         headers
       };
+      const client$1 = client.createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = plugins_aiChat_queryKeys.createAiChatQueryKeys(client$1, headers);
+      const listQuery = queries.conversations.list();
       try {
         if (hooks?.beforeLoadConversations) {
-          await client.runClientHookWithShim(
-            () => hooks.beforeLoadConversations(context),
-            "Load prevented by beforeLoadConversations hook"
-          );
+          await hooks.beforeLoadConversations(context);
         }
-        const client$1 = client.createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = plugins_aiChat_queryKeys.createAiChatQueryKeys(client$1, headers);
-        const listQuery = queries.conversations.list();
         await queryClient.prefetchQuery(listQuery);
         if (hooks?.afterLoadConversations) {
           const conversations = queryClient.getQueryData(
             listQuery.queryKey
           ) || null;
-          await client.runClientHookWithShim(
-            () => hooks.afterLoadConversations(conversations, context),
-            "Load prevented by afterLoadConversations hook"
-          );
+          await hooks.afterLoadConversations(conversations, context);
         }
         const queryState = queryClient.getQueryState(listQuery.queryKey);
         if (queryState?.error && hooks?.onLoadError) {
@@ -49,6 +43,20 @@ function createConversationsLoader(config) {
           await hooks.onLoadError(error, context);
         }
       } catch (error) {
+        if (client.isConnectionError(error)) {
+          console.warn(
+            "[btst/ai-chat] route.loader() failed \u2014 no server running at build time. AI Chat conversation history does not support SSG."
+          );
+        } else {
+          const errToStore = client.createSanitizedSSRLoaderError();
+          await queryClient.prefetchQuery({
+            queryKey: listQuery.queryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            retry: false
+          });
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }
@@ -68,30 +76,24 @@ function createConversationLoader(id, config) {
         apiBasePath,
         headers
       };
+      const client$1 = client.createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = plugins_aiChat_queryKeys.createAiChatQueryKeys(client$1, headers);
+      const conversationQuery = queries.conversations.detail(id);
+      const listQuery = queries.conversations.list();
       try {
         if (hooks?.beforeLoadConversation) {
-          await client.runClientHookWithShim(
-            () => hooks.beforeLoadConversation(id, context),
-            "Load prevented by beforeLoadConversation hook"
-          );
+          await hooks.beforeLoadConversation(id, context);
         }
-        const client$1 = client.createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = plugins_aiChat_queryKeys.createAiChatQueryKeys(client$1, headers);
-        const conversationQuery = queries.conversations.detail(id);
-        const listQuery = queries.conversations.list();
         await Promise.all([
           queryClient.prefetchQuery(conversationQuery),
           queryClient.prefetchQuery(listQuery)
         ]);
         if (hooks?.afterLoadConversation) {
           const conversation = queryClient.getQueryData(conversationQuery.queryKey) || null;
-          await client.runClientHookWithShim(
-            () => hooks.afterLoadConversation(conversation, id, context),
-            "Load prevented by afterLoadConversation hook"
-          );
+          await hooks.afterLoadConversation(conversation, id, context);
         }
         const queryState = queryClient.getQueryState(
           conversationQuery.queryKey
@@ -101,6 +103,29 @@ function createConversationLoader(id, config) {
           await hooks.onLoadError(error, context);
         }
       } catch (error) {
+        if (client.isConnectionError(error)) {
+          console.warn(
+            "[btst/ai-chat] route.loader() failed \u2014 no server running at build time. AI Chat conversations do not support SSG."
+          );
+        } else {
+          const errToStore = client.createSanitizedSSRLoaderError();
+          await Promise.all([
+            queryClient.prefetchQuery({
+              queryKey: conversationQuery.queryKey,
+              queryFn: () => {
+                throw errToStore;
+              },
+              retry: false
+            }),
+            queryClient.prefetchQuery({
+              queryKey: listQuery.queryKey,
+              queryFn: () => {
+                throw errToStore;
+              },
+              retry: false
+            })
+          ]);
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }
@@ -177,62 +202,39 @@ const aiChatClientPlugin = (config) => {
   if (isPublicMode) {
     return client.defineClientPlugin({
       name: "ai-chat",
-      routes: () => ({
-        // Chat home - simple chat interface without history
-        chat: yar.createRoute("/chat", () => {
-          const CustomChat = config.pageComponents?.chat;
-          return {
-            PageComponent: CustomChat ?? (() => /* @__PURE__ */ jsxRuntime.jsx(
-              chatLayout.ChatLayout,
-              {
-                apiBaseURL: config.apiBaseURL,
-                apiBasePath: config.apiBasePath,
-                showSidebar: false
-              }
-            )),
+      routes: () => yar.defineRoutes(
+        {
+          // Chat home - simple chat interface without history
+          chat: yar.defineRoute("/chat", {
+            page: () => /* @__PURE__ */ jsxRuntime.jsx(chatPage.ChatPageComponent, {}),
             loader: createConversationsLoader(config),
             meta: createChatHomeMeta(config)
-          };
-        })
-      }),
+          })
+        },
+        { pages: config.pageComponents }
+      ),
       sitemap: async () => []
     });
   }
   return client.defineClientPlugin({
     name: "ai-chat",
-    routes: () => ({
-      // Chat home - new conversation or list
-      chat: yar.createRoute("/chat", () => {
-        const CustomChat = config.pageComponents?.chat;
-        return {
-          PageComponent: CustomChat ?? (() => /* @__PURE__ */ jsxRuntime.jsx(
-            chatLayout.ChatLayout,
-            {
-              apiBaseURL: config.apiBaseURL,
-              apiBasePath: config.apiBasePath
-            }
-          )),
+    routes: () => yar.defineRoutes(
+      {
+        // Chat home - new conversation or list
+        chat: yar.defineRoute("/chat", {
+          page: () => /* @__PURE__ */ jsxRuntime.jsx(chatPage.ChatPageComponent, {}),
           loader: createConversationsLoader(config),
           meta: createChatHomeMeta(config)
-        };
-      }),
-      // Existing conversation
-      chatConversation: yar.createRoute("/chat/:id", ({ params }) => {
-        const CustomConversation = config.pageComponents?.chatConversation;
-        return {
-          PageComponent: CustomConversation ? () => /* @__PURE__ */ jsxRuntime.jsx(CustomConversation, { conversationId: params.id }) : () => /* @__PURE__ */ jsxRuntime.jsx(
-            chatLayout.ChatLayout,
-            {
-              apiBaseURL: config.apiBaseURL,
-              apiBasePath: config.apiBasePath,
-              conversationId: params.id
-            }
-          ),
-          loader: createConversationLoader(params.id, config),
-          meta: createConversationMeta(params.id, config)
-        };
-      })
-    }),
+        }),
+        // Existing conversation
+        chatConversation: yar.defineRoute("/chat/:id", {
+          page: ({ params }) => /* @__PURE__ */ jsxRuntime.jsx(chatPage.ChatPageComponent, { conversationId: params.id }),
+          loader: ({ params }) => createConversationLoader(params.id, config)(),
+          meta: ({ params }) => createConversationMeta(params.id, config)()
+        })
+      },
+      { pages: config.pageComponents }
+    ),
     // Chat pages typically shouldn't be in sitemap, but we provide the option
     sitemap: async () => {
       return [];