@@ -1,10 +1,10 @@
 import { NextRequest, NextResponse } from 'next/server'
-import { db } from '@/lib/db'
+import { db, saveProjectMessages } from '@/lib/db'
 import { xBotReplies, projects } from '@react-native-vibe-code/database'
 import { eq } from 'drizzle-orm'
 import { handleClaudeCodeGeneration } from '@/lib/claude-code-handler'
-import { blobUrlsToBase64 } from '@/lib/x-bot/extract-images'
 import { getAuthClient } from '@/lib/x-bot/process-mention'
+import type { UIMessage } from 'ai'
 
 export const maxDuration = 300 // 5 minutes
 
@@ -71,40 +71,73 @@ export async function POST(request: NextRequest) {
       .set({ generationStatus: 'generating' })
       .where(eq(xBotReplies.tweetId, tweetId))
 
-    // Convert blob URLs to base64 for AI
-    let images: string[] = []
-    if (imageUrls && imageUrls.length > 0) {
-      console.log(`[X-Bot Generate] Converting ${imageUrls.length} images to base64`)
-      images = await blobUrlsToBase64(imageUrls)
-    }
+    // Build imageAttachments from blob URLs so they flow through to the executor
+    // (the executor downloads images via --image-urls, base64 `images` field is not used)
+    const imageAttachments = (imageUrls && imageUrls.length > 0)
+      ? imageUrls.map((url, i) => ({
+          url,
+          contentType: 'image/png',
+          name: `tweet-image-${i + 1}.png`,
+          size: 0,
+        }))
+      : undefined
 
     // Build the prompt
-    const prompt = buildPrompt(appDescription, images.length > 0)
+    const prompt = buildPrompt(appDescription, !!imageAttachments)
 
     // Track generation result
     let generationSucceeded = false
     let generationError: string | null = null
+    let fullContent = ''
 
     // Call the Claude Code handler
     await handleClaudeCodeGeneration(
       {
         projectId,
         userID: userId,
         userMessage: prompt,
-        images,
+        imageAttachments,
         isFirstMessage: true,
         sandboxId,
         messageId: `xbot-${tweetId}`,
       },
       {
         onMessage: (message) => {
-          // Log progress (we can't stream to Twitter, so just log)
+          // Accumulate content for saving to DB
+          fullContent += message + '\n'
           console.log(`[X-Bot Generate] Progress: ${message.substring(0, 100)}...`)
         },
         onComplete: async (result) => {
           console.log(`[X-Bot Generate] Generation complete for tweet ${tweetId}`)
           generationSucceeded = true
 
+          // Add summary to content
+          if (result.summary) {
+            fullContent += `\n\n✅ ${result.summary}`
+          }
+
+          // Save messages to DB so chat panel shows history
+          try {
+            const userMessage: UIMessage = {
+              id: `xbot-${tweetId}`,
+              role: 'user',
+              content: appDescription,
+              createdAt: new Date(),
+              parts: [{ type: 'text', text: appDescription }],
+            }
+            const assistantMessage: UIMessage = {
+              id: `xbot-${tweetId}-response`,
+              role: 'assistant',
+              content: fullContent,
+              createdAt: new Date(),
+              parts: [{ type: 'text', text: fullContent }],
+            }
+            await saveProjectMessages(projectId, userId, [userMessage, assistantMessage] as any)
+            console.log(`[X-Bot Generate] Messages saved to DB for project ${projectId}`)
+          } catch (saveError) {
+            console.error(`[X-Bot Generate] Failed to save messages to DB:`, saveError)
+          }
+
           // Update xBotReplies with completion
           await db
             .update(xBotReplies)
@@ -130,6 +163,30 @@ export async function POST(request: NextRequest) {
           generationError = error
           generationSucceeded = false
 
+          // Save partial content + error to DB so user sees what happened
+          if (fullContent) {
+            try {
+              const userMessage: UIMessage = {
+                id: `xbot-${tweetId}`,
+                role: 'user',
+                content: appDescription,
+                createdAt: new Date(),
+                parts: [{ type: 'text', text: appDescription }],
+              }
+              const assistantMessage: UIMessage = {
+                id: `xbot-${tweetId}-response`,
+                role: 'assistant',
+                content: fullContent + `\n\n❌ Error: ${error}`,
+                createdAt: new Date(),
+                parts: [{ type: 'text', text: fullContent + `\n\n❌ Error: ${error}` }],
+              }
+              await saveProjectMessages(projectId, userId, [userMessage, assistantMessage] as any)
+              console.log(`[X-Bot Generate] Partial messages saved to DB for project ${projectId}`)
+            } catch (saveError) {
+              console.error(`[X-Bot Generate] Failed to save partial messages:`, saveError)
+            }
+          }
+
           // Update xBotReplies with failure
           await db
             .update(xBotReplies)
 
@@ -15,7 +15,10 @@ interface ReplyRequest {
 
 /**
  * Build the final reply text within Twitter's 280 character limit.
- * Includes app title, brief description, edit link, and remix link.
+ * Format:
+ *   Your app "title" is ready:
+ *   Edit your app: URL
+ *   Remix it: URL
  */
 function buildReplyText(
   title: string,
@@ -27,26 +30,8 @@ function buildReplyText(
   const editUrl = `${baseUrl}/p/${projectId}`
   const remixUrl = `${baseUrl}/p/${projectId}/remix`
 
-  const links = `\nEdit your app: ${editUrl}\nRemix it: ${remixUrl}`
-  const header = `Your app "${title}" is ready!`
-
-  // Calculate remaining space for description
-  // 280 char limit, account for header + links + newlines
-  const fixedLength = header.length + links.length + 2 // 2 for newlines between sections
-  const maxDescLength = 280 - fixedLength
-
-  if (!appDescription || maxDescLength <= 0) {
-    const text = `${header}${links}`
-    return text.length <= 280 ? text : text.substring(0, 280)
-  }
-
-  const desc =
-    appDescription.length > maxDescLength
-      ? appDescription.substring(0, maxDescLength - 3) + '...'
-      : appDescription
-
-  const text = `${header}\n\n${desc}${links}`
-  return text.length <= 280 ? text : `${header}${links}`
+  const text = `Your app "${title}" is ready:\nEdit your app: ${editUrl}\nRemix it: ${remixUrl}`
+  return text.length <= 280 ? text : text.substring(0, 280)
 }
 
 export async function POST(request: NextRequest) {