Merge pull request #107 from will-lp1/ai-sdk-v5

feat: better error and document ID handling

Author: will-lp1

apps/saru/app/api/chat/route.ts

@@ -189,7 +189,7 @@ export async function POST(request: Request) {
       trailingMessageId,
     }: ChatRequestBody = await request.json();
 
-    const activeDocumentId: ActiveDocumentId = requestData?.activeDocumentId ?? null;
+    const activeDocumentId: ActiveDocumentId = requestData?.activeDocumentId ?? undefined;
     const mentionedDocumentIds = requestData?.mentionedDocumentIds ?? undefined;
     const customInstructions = aiOptions?.customInstructions ?? null;
     const suggestionLength = aiOptions?.suggestionLength ?? 'medium';
@@ -249,7 +249,12 @@ export async function POST(request: Request) {
     }
 
     if (trailingMessageId) {
-      await deleteMessagesAfterMessageId({ chatId, messageId: trailingMessageId });
+      const anchorMessage = await getMessageById({ id: trailingMessageId });
+      if (anchorMessage && anchorMessage.chatId === chatId) {
+        await deleteMessagesAfterMessageId({ chatId, messageId: trailingMessageId });
+      } else {
+        console.warn(`Invalid trailingMessageId ${trailingMessageId} for chat ${chatId}`);
+      }
     }
 
     const toolSession = session;
@@ -258,7 +263,7 @@ export async function POST(request: Request) {
     }
 
 
-    let validatedActiveDocumentId: string | null = null;
+    let validatedActiveDocumentId: string | undefined = undefined;
     let activeDoc: Document | null = null;
     if (activeDocumentId && uuidRegex.test(activeDocumentId)) {
         try {
@@ -278,8 +283,7 @@ export async function POST(request: Request) {
     const activeDocumentContent = activeDoc?.content ?? '';
     const isActiveDocumentEmpty = activeDocumentContent.trim().length === 0;
 
-    if (!validatedActiveDocumentId) {
-      // No active document - only allow streaming document for new content generation
+    if (validatedActiveDocumentId === undefined) {
       availableTools.streamingDocument = streamingDocument({ session: toolSession });
       activeToolsList.push('streamingDocument');
     } else {
@@ -305,7 +309,7 @@ export async function POST(request: Request) {
 
     const dynamicSystemPrompt = await createEnhancedSystemPrompt({
       selectedChatModel,
-      activeDocumentId,
+      activeDocumentId: validatedActiveDocumentId,
       mentionedDocumentIds,
       customInstructions,
       writingStyleSummary,
@@ -320,7 +324,7 @@ export async function POST(request: Request) {
           toolsWithStream.streamingDocument = streamingDocument({
             session: toolSession,
             dataStream,
-            documentId: validatedActiveDocumentId ?? undefined,
+            documentId: validatedActiveDocumentId,
           });
         }
 
@@ -341,7 +345,7 @@ export async function POST(request: Request) {
       onFinish: async ({ messages: allMessages }) => {
         if (userId) {
           try {
-            const assistant = allMessages.find((m) => m.role === 'assistant') ?? allMessages[allMessages.length - 1];
+            const assistant = allMessages.findLast((m) => m.role === 'assistant') ?? allMessages[allMessages.length - 1];
             if (assistant) {
               const dbMessage = convertUIMessageToDBFormat(assistant, chatId);
               await saveMessages({ messages: [dbMessage] });

apps/saru/components/chat/chat.tsx

@@ -138,23 +138,29 @@ export function Chat({
         });
         window.dispatchEvent(finishEvent);
       }
-    } catch {}
+    } catch (error) {
+      console.error('Error processing chat data payload:', error);
+    }
   },
   onError: (err) => {
     console.error('Chat Error:', err);
   },
   });
 
   useEffect(() => {
-    let timer: NodeJS.Timeout;
+    let timerId: number | undefined;
+
     if (status === 'submitted' || status === 'streaming') {
-      timer = setTimeout(() => scrollToBottom(), 50);
-    }
-    else if (messages.length > 0) {
-      timer = setTimeout(() => scrollToBottom(), 100);
+      timerId = window.setTimeout(() => scrollToBottom(), 50);
+    } else if (messages.length > 0) {
+      timerId = window.setTimeout(() => scrollToBottom(), 100);
     }
 
-    return () => timer && clearTimeout(timer);
+    return () => {
+      if (timerId !== undefined) {
+        window.clearTimeout(timerId);
+      }
+    };
   }, [status, messages.length, scrollToBottom]);
 
 
@@ -272,7 +278,7 @@ export function Chat({
       const activeDocumentId =
         document.documentId && document.documentId !== 'init'
           ? document.documentId
-          : null;
+          : undefined;
 
       const incoming = body ?? {};
       const incomingData =
@@ -340,7 +346,7 @@ export function Chat({
       activeDocumentId:
         document.documentId && document.documentId !== 'init'
           ? document.documentId
-          : null,
+          : undefined,
     };
 
     if (confirmedMentions.length > 0) {

apps/saru/lib/utils.ts

@@ -90,7 +90,7 @@ export function convertUIMessageToDBFormat(
     id: message.id || generateUUID(),
     chatId,
     role: message.role,
-    content: { parts }, 
+    content: { parts },
     createdAt: new Date().toISOString(),
   };
 }
@@ -106,8 +106,9 @@ export function getDocumentTimestampByIndex(
   documents: Document[],
   index: number,
 ) {
-  if (!documents) { return new Date(); }
-  if (index > documents.length) { return new Date(); }
+  if (!documents || index < 0 || index >= documents.length) {
+    return new Date();
+  }
 
   return documents[index].createdAt;
 }

apps/saru/types/chat.ts

@@ -4,7 +4,7 @@ import type { updateDocument } from "@/lib/ai/tools/update-document";
 import type { streamingDocument } from "@/lib/ai/tools/document-streaming";
 import type { webSearch } from "@/lib/ai/tools/web-search";
 
-export type ActiveDocumentId = string | null;
+export type ActiveDocumentId = string | undefined;
 
 export interface ChatContextPayload {
   activeDocumentId?: ActiveDocumentId;