update templates & sandbox

Author: Gerome-Elassaad

.gitignore

@@ -19,6 +19,7 @@ yarn-error.log*
 # env files
 .env*
 .env.local
+.env
 
 # vercel
 .vercel

app/api/chat/route.ts

@@ -4,7 +4,8 @@ import { getModelClient } from "@/lib/models"
 import { toEnhancedPrompt } from "@/lib/enhanced-prompt"
 import ratelimit from "@/lib/ratelimit"
 import { fragmentSchema as schema } from "@/lib/schema"
-import type { TemplatesDataObject } from "@/lib/templates"
+import type { TemplatesDataObject, TemplateId } from "@/lib/templates" // Import TemplateId
+import templatesDataFromFile from "@/lib/templates" // Import the actual templates data
 import { ProjectAnalyzer, type ProjectStructure } from "@/lib/project-analyzer"
 import { streamObject, type LanguageModel, type CoreMessage } from "ai"
 import { logError, generateRequestId, validateRequestData } from "@/lib/debug"
@@ -46,7 +47,7 @@ export async function POST(req: Request) {
       messages,
       userID,
       teamID,
-      template,
+      selectedTemplateId, // Changed from 'template' to 'selectedTemplateId'
       model,
       config,
       uploadedFiles,
@@ -55,7 +56,7 @@ export async function POST(req: Request) {
       messages: CoreMessage[]
       userID: string
       teamID: string
-      template: TemplatesDataObject
+      selectedTemplateId: TemplateId // Type is now TemplateId (string)
       model: LLMModel
       config: LLMModelConfig
       uploadedFiles?: File[]
@@ -167,10 +168,12 @@ export async function POST(req: Request) {
     try {
       if (projectStructure && userPrompt) {
         console.log(`[Chat API ${requestId}] Generating enhanced prompt with project context`)
-        systemPrompt = toEnhancedPrompt(template, userPrompt, projectStructure)
+        // Pass the full templatesDataFromFile to toEnhancedPrompt
+        systemPrompt = toEnhancedPrompt(templatesDataFromFile, userPrompt, projectStructure)
       } else {
         console.log(`[Chat API ${requestId}] Using standard prompt generation`)
-        systemPrompt = generateFallbackPrompt(template)
+        // Pass the full templatesDataFromFile to generateFallbackPrompt
+        systemPrompt = generateFallbackPrompt(templatesDataFromFile)
       }
 
       console.log(`[Chat API ${requestId}] System prompt generated`)
@@ -302,21 +305,21 @@ export async function POST(req: Request) {
   }
 }
 
-// Fallback prompt generation function
 function generateFallbackPrompt(template: TemplatesDataObject): string {
-  const validTemplates = Object.entries(template)
-    .filter(([_, t]) => typeof t === 'object' && t !== null && 'instructions' in t && 'lib' in t)
-    .map(([id, t], index) => {
-      // Now t is known to be an object with at least instructions and lib
-      const templateObject = t as { instructions: string; file?: string | null; lib: string[]; port?: number | null };
-      return `${index + 1}. ${id}: "${templateObject.instructions}". File: ${templateObject.file || 'none'}. Dependencies: ${templateObject.lib.join(', ')}. Port: ${templateObject.port || 'none'}.`;
-    });
-
   return `You are an expert software engineer with deep knowledge of modern web development, programming languages, frameworks, and best practices.
 
 Generate production-ready code based on the user's requirements using the following templates:
 
-${validTemplates.join('\n')}
+${Object.entries(template).map(([id, t], index) => {
+  const instructions = "instructions" in t
+    ? t.instructions
+    : (t.files as any).instructions;
+  const port = "port" in t
+    ? t.port
+    : (t.files as any).port;
+  const fileNames = Object.keys(t.files).join(', ');
+  return `${index + 1}. ${id}: "${instructions}". Files: ${fileNames || 'none'}. Dependencies: ${t.lib.join(', ')}. Port: ${port ?? 'none'}.`;
+}).join('\n')}
 
 IMPORTANT GUIDELINES:
 - Write clean, maintainable, and well-documented code

app/api/figma/analyze/route.ts

@@ -2,7 +2,7 @@ import { type NextRequest, NextResponse } from "next/server"
 import { FigmaIntegration } from "@/lib/figma-integration"
 
 export async function POST(request: NextRequest) {
-  const requestId = `figma_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`
+  const requestId = `figma_${crypto.randomUUID()}`
   console.log(`[Figma Analysis API ${requestId}] Processing request`)
 
   try {
@@ -149,4 +149,4 @@ export async function POST(request: NextRequest) {
       { status: statusCode }
     )
   }
-}
+}

app/api/github/auth/route.ts

@@ -3,7 +3,7 @@ import { createServerClient, type CookieOptions } from "@supabase/ssr"
 import { cookies } from "next/headers"
 
 export async function POST(request: NextRequest) {
-  const requestId = `github_auth_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`
+  const requestId = `github_auth_${crypto.randomUUID()}`
 
   try {
     const { code } = await request.json()
@@ -103,4 +103,4 @@ export async function POST(request: NextRequest) {
       { status: 500 }
     )
   }
-}
+}

app/api/github/import/route.ts

@@ -5,7 +5,7 @@ import { GitHubIntegration } from "@/lib/github-integration"
 import { ProjectAnalyzer } from "@/lib/project-analyzer"
 
 export async function POST(request: NextRequest) {
-  const requestId = `github_import_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`
+  const requestId = `github_import_${crypto.randomUUID()}`
 
   try {
     const { owner, repo, maxFiles = 50 } = await request.json()
@@ -132,4 +132,4 @@ export async function POST(request: NextRequest) {
       { status: statusCode }
     )
   }
-}
+}

app/api/github/repositories/route.ts

@@ -4,7 +4,7 @@ import { cookies } from "next/headers"
 import { GitHubIntegration } from "@/lib/github-integration"
 
 export async function GET(request: NextRequest) {
-  const requestId = `github_repos_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`
+  const requestId = `github_repos_${crypto.randomUUID()}`
 
   try {
     const cookieStore = await cookies()
@@ -13,26 +13,22 @@ export async function GET(request: NextRequest) {
       process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
       {
         cookies: {
-          async get(name: string) {
-
-            const store = cookieStore; 
-            return store.get(name)?.value
+          get(name: string) {
+            return cookieStore.get(name)?.value
           },
-          async set(name: string, value: string, options: CookieOptions) {
+          set(name: string, value: string, options: CookieOptions) {
             try {
-              const store = await cookieStore;
-              store.set({ name, value, ...options })
+              cookieStore.set(name, value, options)
             } catch (error) {
               // The `set` method was called from a Server Component.
               // This can be ignored if you have middleware refreshing
               // user sessions.
               // console.warn(`Failed to set cookie '${name}' from Server Component:`, error);
             }
           },
-          async remove(name: string, options: CookieOptions) {
+          remove(name: string, options: CookieOptions) {
             try {
-              const store = await cookieStore;
-              store.set({ name, value: '', ...options })
+              cookieStore.set({ name, value: '', ...options })
             } catch (error) {
               // The `delete` method was called from a Server Component.
               // This can be ignored if you have middleware refreshing

app/api/health/route.ts

@@ -2,7 +2,7 @@ import { healthMonitor } from "@/lib/api-health"
 import { apiClient } from "@/lib/api-client"
 
 export async function GET() {
-  const requestId = `health_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`
+  const requestId = `health_${crypto.randomUUID()}`
 
   try {
     console.log(`[Health API ${requestId}] Performing health check`)
@@ -98,4 +98,4 @@ export async function GET() {
       },
     )
   }
-}
+}