Bring back the image support

Author: radare

src/repl/llm/llamacpp.go

@@ -88,7 +88,7 @@ func (p *LlamaCppProvider) SendMessage(messages []Message, stream bool, images [
 	}
 
 	request := map[string]interface{}{
-		"messages": buildRequestMessages(messages, images),
+		"messages": mergeImagesIntoLastUser(messages, images),
 	}
 	if effectiveModel != "" {
 		request["model"] = effectiveModel
@@ -355,3 +355,51 @@ func parseLlamaCppModels(body []byte) []Model {
 	}}
 }
 
+// mergeImagesIntoLastUser returns a JSON-ready messages slice that matches
+// the standard OpenAI vision format: image blocks live inside the same user
+// turn as the prompt text. The last user message's content is replaced with
+// a combined [text, image_url...] block array; if no user message exists yet
+// a new one is appended. Shared by all OpenAI-compatible providers (OpenAI,
+// llama.cpp, ...) that accept structured content blocks for images.
+func mergeImagesIntoLastUser(messages []Message, images []string) []interface{} {
+	out := make([]interface{}, 0, len(messages)+1)
+	for _, m := range messages {
+		out = append(out, m)
+	}
+	if len(images) == 0 {
+		return out
+	}
+
+	blocks := make([]ContentBlock, 0, len(images)+1)
+	for _, uri := range images {
+		blocks = append(blocks, ContentBlock{
+			Type: "image_url",
+			ImageURL: &struct {
+				URL string `json:"url"`
+			}{URL: uri},
+		})
+	}
+
+	for i := len(out) - 1; i >= 0; i-- {
+		msg, ok := out[i].(Message)
+		if !ok || msg.Role != "user" {
+			continue
+		}
+		combined := blocks
+		if strings.TrimSpace(msg.Content) != "" {
+			combined = append([]ContentBlock{{Type: "text", Text: msg.Content}}, blocks...)
+		}
+		out[i] = map[string]interface{}{
+			"role":    "user",
+			"content": combined,
+		}
+		return out
+	}
+
+	out = append(out, map[string]interface{}{
+		"role":    "user",
+		"content": blocks,
+	})
+	return out
+}
+

src/repl/llm/openai.go

@@ -333,34 +333,6 @@ func (p *OpenAIProvider) ListModels(ctx context.Context) ([]Model, error) {
 	// nothing more to do; parsing helper already returned results or an error
 }
 
-// buildRequestMessages returns a JSON-ready slice of chat messages. Regular
-// messages are forwarded as-is (their Content is a plain string). When image
-// URIs are supplied, a user message carrying the OpenAI-style content blocks
-// is prepended — that payload is assembled locally as a map so the public
-// Message type can keep a flat string content.
-func buildRequestMessages(messages []Message, images []string) []interface{} {
-	out := make([]interface{}, 0, len(messages)+1)
-	if len(images) > 0 {
-		blocks := make([]ContentBlock, 0, len(images))
-		for _, uri := range images {
-			blocks = append(blocks, ContentBlock{
-				Type: "image_url",
-				ImageURL: &struct {
-					URL string `json:"url"`
-				}{URL: uri},
-			})
-		}
-		out = append(out, map[string]interface{}{
-			"role":    "user",
-			"content": blocks,
-		})
-	}
-	for _, m := range messages {
-		out = append(out, m)
-	}
-	return out
-}
-
 func (p *OpenAIProvider) SendMessage(messages []Message, stream bool, images []string, tools []OpenAITool) (string, error) {
 	provider := strings.ToLower(p.config.PROVIDER)
 
@@ -386,7 +358,7 @@ func (p *OpenAIProvider) SendMessage(messages []Message, stream bool, images []s
 	}
 	request := map[string]interface{}{
 		"model":    effectiveModel,
-		"messages": buildRequestMessages(messages, images),
+		"messages": mergeImagesIntoLastUser(messages, images),
 	}
 
 	// Add tools if provided