fix: repair @ mention context, dead state, and misc bugs

Author: will-lp1

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

@@ -5,21 +5,24 @@ import { myProvider } from '@/lib/ai/providers';
 export async function POST(request: Request) {
   const { messages, context, title, author, date } = await request.json();
 
-  const prompt = [
-    'You are a helpful AI assistant answering reader questions about the following article. Provide concise, accurate answers.',
+  const systemPrompt = [
+    'You are a helpful AI assistant answering reader questions about the following article. Provide concise, accurate answers based on the article content.',
     '',
     `Title: ${title}`,
     `Author: ${author}`,
     `Date: ${date}`,
     '',
+    'Article content:',
     context,
-    ...messages.map((m: any) => `${m.role}: ${m.content}`),
-    'assistant:'
   ].join('\n');
 
   const { fullStream } = streamText({
     model: myProvider.languageModel(DEFAULT_CHAT_MODEL),
-    prompt,
+    system: systemPrompt,
+    messages: messages.map((m: any) => ({
+      role: m.role,
+      content: m.content,
+    })),
     experimental_transform: smoothStream({ chunking: 'word' }),
   });
 
@@ -28,7 +31,7 @@ export async function POST(request: Request) {
       async start(controller) {
         for await (const delta of fullStream) {
           if (delta.type === 'text-delta') {
-            controller.enqueue(new TextEncoder().encode(delta.text));
+            controller.enqueue(new TextEncoder().encode(delta.textDelta));
           }
         }
         controller.close();

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

@@ -46,6 +46,7 @@ async function createEnhancedSystemPrompt({
   customInstructions,
   writingStyleSummary,
   applyStyle,
+  userId,
   availableTools = ['streamingDocument','updateDocument','webSearch'] as Array<'streamingDocument'|'updateDocument'|'webSearch'>,
 }: {
   selectedChatModel: string;
@@ -54,11 +55,11 @@ async function createEnhancedSystemPrompt({
   customInstructions?: string | null;
   writingStyleSummary?: string | null;
   applyStyle?: boolean;
+  userId: string;
   availableTools?: Array<'streamingDocument'|'updateDocument'|'webSearch'>;
 }) {
 
   let basePrompt = systemPrompt({ selectedChatModel, availableTools });
-  let contextAdded = false;
 
   if (customInstructions) {
     basePrompt = customInstructions + "\n\n" + basePrompt;
@@ -72,17 +73,17 @@ async function createEnhancedSystemPrompt({
   if (activeDocumentId) {
     try {
       const document = await getDocumentById({ id: activeDocumentId });
-      if (document) {
+      if (document && document.userId === userId) {
         const documentContext = `
 CURRENT DOCUMENT:
 Title: ${document.title}
 Content:
 ${document.content || '(Empty document)'}
 `;
         basePrompt += `\n\n${documentContext}`;
-        contextAdded = true;
       }
     } catch (error) {
+      console.error(`[Chat] Failed to load active document ${activeDocumentId}:`, error);
     }
   }
 
@@ -93,17 +94,17 @@ ${document.content || '(Empty document)'}
 
       try {
         const document = await getDocumentById({ id: mentionedId });
-        if (document) {
+        if (document && document.userId === userId) {
           const mentionedContext = `
 MENTIONED DOCUMENT:
 Title: ${document.title}
 Content:
 ${document.content || '(Empty document)'}
 `;
           basePrompt += `\n${mentionedContext}`;
-          contextAdded = true;
         }
       } catch (error) {
+        console.error(`[Chat] Failed to load mentioned document ${mentionedId}:`, error);
       }
     }
     basePrompt += `\n--- END MENTIONED DOCUMENTS ---`;
@@ -335,6 +336,7 @@ export async function POST(request: Request) {
       customInstructions,
       writingStyleSummary,
       applyStyle,
+      userId,
       availableTools: activeToolsList,
     });
 
@@ -386,7 +388,7 @@ export async function POST(request: Request) {
               chatId,
               userId,
               context: {
-                active: activeDocumentId || undefined,
+                active: validatedActiveDocumentId,
                 mentioned: mentionedDocumentIds,
               },
             });

apps/saru/components/chat/chat.tsx

@@ -243,20 +243,6 @@ export function Chat({
     };
   }, [chatId]);
 
-  useEffect(() => {
-    const handleChatIdChanged = (event: CustomEvent<{ oldChatId: string, newChatId: string }>) => {
-      const { oldChatId, newChatId } = event.detail;
-
-      if (oldChatId === chatId) {
-      }
-    };
-    
-    window.addEventListener('chat-id-changed', handleChatIdChanged as unknown as EventListener);
-    
-    return () => {
-      window.removeEventListener('chat-id-changed', handleChatIdChanged as unknown as EventListener);
-    };
-  }, [chatId]);
 
   useEffect(() => {
     const handleReset = () => {

apps/saru/components/chat/message.tsx

@@ -22,18 +22,10 @@ import { useDocument } from "@/hooks/use-document";
 function formatMessageWithMentions(content: string) {
   if (!content) return content;
 
-  const mentionRegex = /@([a-zA-Z0-9\s_-]+)/g;
-
-  const parts = content.split(mentionRegex);
-
-  if (parts.length <= 1) return content;
-
   const formattedContent = [];
-  let i = 0;
-
   let match;
   let lastIndex = 0;
-  const regex = new RegExp(mentionRegex);
+  const regex = /@([a-zA-Z0-9\s_-]+)/g;
 
   while ((match = regex.exec(content)) !== null) {
     if (match.index > lastIndex) {
@@ -84,7 +76,6 @@ const PurePreviewMessage = ({
   const { document } = useDocument();
   const dispatchedKeysRef = useRef<Set<string>>(new Set());
   const [mode, setMode] = useState<'view' | 'edit'>('view');
-  console.log("[PreviewMessage] Rendering message:", message);
 
   const reasoningPart = message.parts?.find(
     (part) => part.type === "reasoning"
@@ -97,8 +88,6 @@ const PurePreviewMessage = ({
   const toolParts =
     message.parts?.filter((part) => part.type?.startsWith("tool-")) || [];
 
-  console.log("[PreviewMessage] Tool parts found:", toolParts);
-
   return (
     <AnimatePresence>
       <motion.div

apps/saru/components/chat/multimodal-input.tsx

@@ -147,12 +147,10 @@ function PureMultimodalInput({
   const { width } = useWindowSize();
   const { document: currentDoc } = useDocument();
 
-  const [fileSuggestions, setFileSuggestions] = useState<DocumentSuggestion[]>([]);
-  const [isSuggestionLoading, setIsSuggestionLoading] = useState(false);
-  const [currentMentionValue, setCurrentMentionValue] = useState('');
 
   const [inputValue, setInputValue] = useState(input);
   const [markupValue, setMarkupValue] = useState('');
+  const [plainTextValue, setPlainTextValue] = useState('');
   const { writingStyleSummary, applyStyle } = useAiOptionsValue();
 
   const [localStorageInput, setLocalStorageInput] = useLocalStorage('input', '');
@@ -172,7 +170,7 @@ function PureMultimodalInput({
   }, [inputValue, markupValue, setInput, setLocalStorageInput, onMentionsChange]);
 
   const parseMentionsFromMarkup = (markup: string): MentionedDocument[] => {
-    const mentionRegex = /@\[([^)]+)\]\\((\\S+)\\)/g;
+    const mentionRegex = /@\[([^\]]+)\]\(([^)]+)\)/g;
     const mentions: MentionedDocument[] = [];
     let match;
     while ((match = mentionRegex.exec(markup)) !== null) {
@@ -188,7 +186,8 @@ function PureMultimodalInput({
     mentions: Array<{ id: string; display: string }>
   ) => {
     setInputValue(newValue);
-    setMarkupValue(newPlainTextValue);
+    setMarkupValue(newValue);
+    setPlainTextValue(newPlainTextValue);
   };
 
 
@@ -205,7 +204,7 @@ function PureMultimodalInput({
       contextData.mentionedDocumentIds = confirmedMentions.map(doc => doc.id);
     }
 
-    const parts: any[] = [{ type: 'text', text: inputValue }];
+    const parts: any[] = [{ type: 'text', text: plainTextValue || inputValue }];
 
     const requestBody = {
       chatId: chatId,
@@ -225,6 +224,7 @@ function PureMultimodalInput({
 
     setInputValue('');
     setMarkupValue('');
+    setPlainTextValue('');
     setInput('');
     onMentionsChange([]);
 
@@ -233,6 +233,7 @@ function PureMultimodalInput({
     }
   }, [
     inputValue,
+    plainTextValue,
     currentDoc.documentId,
     confirmedMentions,
     sendMessage,
@@ -246,27 +247,24 @@ function PureMultimodalInput({
     callback: (data: SuggestionDataItem[]) => void
   ) => {
     if (!query) {
-      setFileSuggestions([]);
       callback([]);
       return;
     }
-    setIsSuggestionLoading(true);
     fetch(`/api/search?query=${encodeURIComponent(query)}`)
-      .then(response => response.json())
+      .then(response => {
+        if (!response.ok) throw new Error(response.statusText);
+        return response.json();
+      })
       .then(data => {
         const suggestions = (data.results || []).map((doc: any) => ({
           id: doc.id,
           display: doc.title,
         }));
-        setFileSuggestions(suggestions);
         callback(suggestions);
       })
       .catch(error => {
         console.error('Error searching documents:', error);
         callback([]);
-      })
-      .finally(() => {
-        setIsSuggestionLoading(false);
       });
   };
 

apps/saru/components/suggestion-overlay-provider.tsx

@@ -144,7 +144,7 @@ export function SuggestionOverlayProvider({ children }: { children: ReactNode })
           const { from, to, empty } = state.selection;
 
           if (!empty) {
-            const text = state.doc.textBetween(from, to, ' \\n\\n ');
+            const text = state.doc.textBetween(from, to, ' \n\n ');
 
             let pos = { x: 100, y: 100 }; // Default position
             const domSelection = window.getSelection();