Update Dockerfile

Dockerfile

@@ -1,19 +1,16 @@
-FROM node:20-alpine
-USER root
+FROM registry.hf.space/enzostvs-deepsite:cpu-bbc7882
+# FROM node:22
 
-USER 1000
-WORKDIR /usr/src/app
-# Copy package.json and package-lock.json to the container
-COPY --chown=1000 package.json package-lock.json ./
+# USER 1000
+# WORKDIR /usr/src/app
 
-# Copy the rest of the application files to the container
-COPY --chown=1000 . .
+# # Copy the rest of the application files to the container
+# COPY --chown=1000 . .
 
-RUN npm install
-RUN npm run build
+# RUN npm ci && npm run build
 
-# Expose the application port (assuming your app runs on port 3000)
-EXPOSE 3000
+# # Expose the application port (assuming your app runs on port 3000)
+# EXPOSE 3000
 
-# Start the application
-CMD ["npm", "start"]
+# # Start the application
+# CMD ["npm", "start"]

app/api/ask/route.ts

@@ -285,11 +285,35 @@ export async function PUT(request: NextRequest) {
     return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
   };
 
+  const normalizeHtml = (html: string): string => {
+    return html
+      // Normalize whitespace within tags
+      .replace(/\s+/g, ' ')
+      // Remove spaces before closing >
+      .replace(/\s+>/g, '>')
+      // Remove spaces before />
+      .replace(/\s+\/>/g, '/>')
+      // Normalize spaces around = in attributes
+      .replace(/\s*=\s*/g, '=')
+      // Normalize quotes (convert single to double)
+      .replace(/='([^']*)'/g, '="$1"')
+      // Remove trailing spaces in opening/closing tags
+      .replace(/<([^>]*?)\s+>/g, '<$1>')
+      // Normalize self-closing tags
+      .replace(/\/\s*>/g, '/>')
+      .trim();
+  };
+
   const createFlexibleHtmlRegex = (searchBlock: string) => {
-    let searchRegex = escapeRegExp(searchBlock)
-      .replace(/\s+/g, '\\s*')
+    // Normalize both the search block for comparison
+    const normalizedSearch = normalizeHtml(searchBlock);
+    
+    // Escape regex special characters
+    let searchRegex = escapeRegExp(normalizedSearch)
+      // Make whitespace flexible (but only between elements, not within tags)
       .replace(/>\s*</g, '>\\s*<')
-      .replace(/\s*>/g, '\\s*>');
+      // Make line breaks and spaces around content flexible
+      .replace(/>\s*([^<]+)\s*</g, '>\\s*$1\\s*<');
     
     return new RegExp(searchRegex, 'g');
   };
@@ -300,41 +324,9 @@ export async function PUT(request: NextRequest) {
     const systemPrompt = FOLLOW_UP_SYSTEM_PROMPT + (isNew ? PROMPT_FOR_PROJECT_NAME : "");
     const userContext = "You are modifying the HTML file based on the user's request.";
     
-    const getRelevantPages = (pages: Page[], prompt: string, maxPages: number = 2): Page[] => {
-      if (pages.length <= maxPages) return pages;
-      
-      const indexPage = pages.find(p => p.path === '/' || p.path === '/index' || p.path === 'index');
-      const otherPages = pages.filter(p => p !== indexPage);
-      
-      if (selectedElementHtml) {
-        const elementKeywords = selectedElementHtml.toLowerCase().match(/class=["']([^"']*)["']|id=["']([^"']*)["']/g) || [];
-        const relevantPages = otherPages.filter(page => {
-          const pageContent = page.html.toLowerCase();
-          return elementKeywords.some((keyword: string) => pageContent.includes(keyword.toLowerCase()));
-        });
-        
-        return indexPage ? [indexPage, ...relevantPages.slice(0, maxPages - 1)] : relevantPages.slice(0, maxPages);
-      }
-      
-      const keywords = prompt.toLowerCase().split(/\s+/).filter(word => word.length > 3);
-      const scoredPages = otherPages.map(page => {
-        const pageContent = (page.path + ' ' + page.html).toLowerCase();
-        const score = keywords.reduce((acc, keyword) => {
-          return acc + (pageContent.includes(keyword) ? 1 : 0);
-        }, 0);
-        return { page, score };
-      });
-      
-      const topPages = scoredPages
-        .sort((a, b) => b.score - a.score)
-        .slice(0, maxPages - (indexPage ? 1 : 0))
-        .map(item => item.page);
-      
-      return indexPage ? [indexPage, ...topPages] : topPages;
-    };
-
-    const relevantPages = getRelevantPages(pages || [], prompt);
-    const pagesContext = relevantPages
+    // Send all pages without filtering
+    const allPages = pages || [];
+    const pagesContext = allPages
       .map((p: Page) => `- ${p.path}\n${p.html}`)
       .join("\n\n");
     
@@ -342,7 +334,7 @@ export async function PUT(request: NextRequest) {
       selectedElementHtml
         ? `\n\nYou have to update ONLY the following element, NOTHING ELSE: \n\n\`\`\`html\n${selectedElementHtml}\n\`\`\` Could be in multiple pages, if so, update all the pages.`
         : ""
-    }. Current pages (${relevantPages.length}/${pages?.length || 0} shown): ${pagesContext}. ${files?.length > 0 ? `Available images: ${files?.map((f: string) => f).join(', ')}.` : ""}`;
+    }. Current pages (${allPages.length} total): ${pagesContext}. ${files?.length > 0 ? `Available images: ${files?.map((f: string) => f).join(', ')}.` : ""}`;
     
     const estimatedInputTokens = estimateInputTokens(systemPrompt, prompt, userContext + assistantContext);
     const dynamicMaxTokens = calculateMaxTokens(selectedProvider, estimatedInputTokens, false);
@@ -450,17 +442,49 @@ export async function PUT(request: NextRequest) {
               updatedLines.push([1, replaceBlock.split("\n").length]);
             } else {
               const regex = createFlexibleHtmlRegex(searchBlock);
-              const match = regex.exec(pageHtml);
+              
+              // Normalize the pageHtml for matching
+              const normalizedPageHtml = normalizeHtml(pageHtml);
+              const match = regex.exec(normalizedPageHtml);
               
               if (match) {
-                const matchedText = match[0];
-                const beforeText = pageHtml.substring(0, match.index);
-                const startLineNumber = beforeText.split("\n").length;
-                const replaceLines = replaceBlock.split("\n").length;
-                const endLineNumber = startLineNumber + replaceLines - 1;
-
-                updatedLines.push([startLineNumber, endLineNumber]);
-                pageHtml = pageHtml.replace(matchedText, replaceBlock);
+                // Find the original match in the non-normalized HTML
+                const normalizedSearch = normalizeHtml(searchBlock);
+                const originalMatchIndex = pageHtml.indexOf(searchBlock);
+                
+                if (originalMatchIndex !== -1) {
+                  const beforeText = pageHtml.substring(0, originalMatchIndex);
+                  const startLineNumber = beforeText.split("\n").length;
+                  const replaceLines = replaceBlock.split("\n").length;
+                  const endLineNumber = startLineNumber + replaceLines - 1;
+
+                  updatedLines.push([startLineNumber, endLineNumber]);
+                  pageHtml = pageHtml.replace(searchBlock, replaceBlock);
+                } else {
+                  // Fallback: try to find similar pattern in the original HTML
+                  const flexibleRegex = new RegExp(
+                    escapeRegExp(searchBlock)
+                      .replace(/\s+/g, '\\s+')
+                      .replace(/\s*=\s*/g, '\\s*=\\s*')
+                      .replace(/'\s*([^']*)\s*'/g, "'\\s*$1\\s*'")
+                      .replace(/"\s*([^"]*)\s*"/g, '"\\s*$1\\s*"')
+                      .replace(/\s*>/g, '\\s*>')
+                      .replace(/\s*\/>/g, '\\s*/>'),
+                    'g'
+                  );
+                  
+                  const flexibleMatch = flexibleRegex.exec(pageHtml);
+                  if (flexibleMatch) {
+                    const matchedText = flexibleMatch[0];
+                    const beforeText = pageHtml.substring(0, flexibleMatch.index);
+                    const startLineNumber = beforeText.split("\n").length;
+                    const replaceLines = replaceBlock.split("\n").length;
+                    const endLineNumber = startLineNumber + replaceLines - 1;
+
+                    updatedLines.push([startLineNumber, endLineNumber]);
+                    pageHtml = pageHtml.replace(matchedText, replaceBlock);
+                  }
+                }
               }
             }
 
@@ -539,17 +563,54 @@ export async function PUT(request: NextRequest) {
             updatedLines.push([1, replaceBlock.split("\n").length]);
           } else {
             const regex = createFlexibleHtmlRegex(searchBlock);
-            const match = regex.exec(newHtml);
+            
+            // Get the main page HTML (first page or index page)
+            const mainPage = updatedPages.find(p => p.path === '/' || p.path === '/index' || p.path === 'index') || updatedPages[0];
+            if (!mainPage) continue;
+            
+            newHtml = mainPage.html;
+            
+            // Normalize the newHtml for matching  
+            const normalizedNewHtml = normalizeHtml(newHtml);
+            const match = regex.exec(normalizedNewHtml);
             
             if (match) {
-              const matchedText = match[0];
-              const beforeText = newHtml.substring(0, match.index);
-              const startLineNumber = beforeText.split("\n").length;
-              const replaceLines = replaceBlock.split("\n").length;
-              const endLineNumber = startLineNumber + replaceLines - 1;
-
-              updatedLines.push([startLineNumber, endLineNumber]);
-              newHtml = newHtml.replace(matchedText, replaceBlock);
+              // Find the original match in the non-normalized HTML
+              const originalMatchIndex = newHtml.indexOf(searchBlock);
+              
+              if (originalMatchIndex !== -1) {
+                const beforeText = newHtml.substring(0, originalMatchIndex);
+                const startLineNumber = beforeText.split("\n").length;
+                const replaceLines = replaceBlock.split("\n").length;
+                const endLineNumber = startLineNumber + replaceLines - 1;
+
+                updatedLines.push([startLineNumber, endLineNumber]);
+                newHtml = newHtml.replace(searchBlock, replaceBlock);
+              } else {
+                // Fallback: try to find similar pattern in the original HTML
+                const flexibleRegex = new RegExp(
+                  escapeRegExp(searchBlock)
+                    .replace(/\s+/g, '\\s+')
+                    .replace(/\s*=\s*/g, '\\s*=\\s*')
+                    .replace(/'\s*([^']*)\s*'/g, "'\\s*$1\\s*'")
+                    .replace(/"\s*([^"]*)\s*"/g, '"\\s*$1\\s*"')
+                    .replace(/\s*>/g, '\\s*>')
+                    .replace(/\s*\/>/g, '\\s*/>'),
+                  'g'
+                );
+                
+                const flexibleMatch = flexibleRegex.exec(newHtml);
+                if (flexibleMatch) {
+                  const matchedText = flexibleMatch[0];
+                  const beforeText = newHtml.substring(0, flexibleMatch.index);
+                  const startLineNumber = beforeText.split("\n").length;
+                  const replaceLines = replaceBlock.split("\n").length;
+                  const endLineNumber = startLineNumber + replaceLines - 1;
+
+                  updatedLines.push([startLineNumber, endLineNumber]);
+                  newHtml = newHtml.replace(matchedText, replaceBlock);
+                }
+              }
             }
           }
 
@@ -598,7 +659,6 @@ pinned: false
 tags:
   - deepsite-v3
 ---
-
 # Welcome to your new DeepSite project!
 This project was created with [DeepSite](https://deepsite.hf.co).
       `;
@@ -652,5 +712,4 @@ This project was created with [DeepSite](https://deepsite.hf.co).
       { status: 500 }
     );
   }
-}
-
+}

hooks/useAi.ts

@@ -10,7 +10,6 @@ import { api } from "@/lib/api";
 import { useRouter } from "next/navigation";
 import { useUser } from "./useUser";
 import { LivePreviewRef } from "@/components/editor/live-preview";
-import { isTheSameHtml } from "@/lib/compare-html-diff";
 
 export const useAi = (onScrollToBottom?: () => void, livePreviewRef?: React.RefObject<LivePreviewRef | null>) => {
   const client = useQueryClient();
@@ -199,15 +198,10 @@ export const useAi = (onScrollToBottom?: () => void, livePreviewRef?: React.RefO
             }
             
             const newPages = formatPages(contentResponse);
-            let projectName = contentResponse.match(/<<<<<<< PROJECT_NAME_START ([\s\S]*?) >>>>>>> PROJECT_NAME_END/)?.[1]?.trim();
-            if (!projectName) {
-              projectName = prompt.substring(0, 40).replace(/[^a-zA-Z0-9]/g, "-").slice(0, 40);
-            }
+            const projectName = contentResponse.match(/<<<<<<< PROJECT_NAME_START ([\s\S]*?) >>>>>>> PROJECT_NAME_END/)?.[1]?.trim();
             setPages(newPages);
-            setLastSavedPages([...newPages]);
-            if (newPages.length > 0 && !isTheSameHtml(newPages[0].html)) {
-              createNewProject(prompt, newPages, projectName, isLoggedIn);
-            }
+            setLastSavedPages([...newPages]); // Mark initial pages as saved
+            createNewProject(prompt, newPages, projectName, isLoggedIn);
             setPrompts([...prompts, prompt]);
 
             return { success: true, pages: newPages };