Update chatStream.js

server/chatStream.js

@@ -123,17 +123,35 @@ export async function streamChat(ws, {
   const client       = makeClient(accessToken, clientId);
   const enabledTools = buildToolList(tools);
 
+  // Normalize userMessage: convert array content to string or keep as-is for image support
+  let normalizedUserMessage = userMessage;
+  if (Array.isArray(userMessage)) {
+    // If it has images, keep the array format for OpenAI to process images
+    // Otherwise extract text
+    const hasImages = userMessage.some(item => item.type === 'image_url');
+    if (hasImages) {
+      normalizedUserMessage = userMessage;
+    } else {
+      normalizedUserMessage = userMessage.filter(b => b.type === "text").map(b => b.text).join("\n") || "";
+    }
+  }
+
+  // Build messages array: only include user message if it's provided
   const messages = [
     { role: "system", content: SYSTEM_PROMPT },
     ...history.map(normalizeMessage).filter(Boolean),
-    { role: "user", content: userMessage },
   ];
+  
+  // Add user message only if content was provided (not for edit-only requests)
+  if (userMessage !== undefined && userMessage !== null && userMessage !== '') {
+    messages.push({ role: "user", content: normalizedUserMessage });
+  }
 
   // Validate messages before API call
   for (let i = 0; i < messages.length; i++) {
     const msg = messages[i];
     if (msg.role !== "assistant" || !msg.tool_calls) {
-      if (typeof msg.content !== "string") {
+      if (typeof msg.content !== "string" && !Array.isArray(msg.content)) {
         console.error(`Message ${i} has invalid content:`, msg);
         throw new Error(`Message ${i} missing or invalid content property`);
       }
@@ -158,10 +176,17 @@ export async function streamChat(ws, {
       const followUpMessages = [
         { role: "system",    content: SYSTEM_PROMPT },
         ...history.map(normalizeMessage).filter(Boolean),
-        { role: "user",      content: userMessage },
+      ];
+      
+      // Include user message in follow-up only if it was in the original request
+      if (userMessage !== undefined && userMessage !== null && userMessage !== '') {
+        followUpMessages.push({ role: "user", content: normalizedUserMessage });
+      }
+      
+      followUpMessages.push(
         { role: "assistant", content: assistantText || "", tool_calls: toolCalls },
         ...toolResults,
-      ];
+      );
 
       const followUpStream = await client.chat.completions.create({
         model:  model || "lightning",
@@ -195,6 +220,12 @@ function normalizeMessage(msg) {
     return { role: "assistant", content: "", tool_calls: msg.tool_calls };
   }
   if (Array.isArray(msg.content)) {
+    // If the array contains images, preserve the full array format
+    const hasImages = msg.content.some(item => item.type === 'image_url');
+    if (hasImages) {
+      return { role: msg.role, content: msg.content };
+    }
+    // Otherwise extract text only
     const textOnly = msg.content
       .filter(b => b.type === "text")
       .map(b => b.text)