Bugfix: Lingering error in image generation from image gen. models

oAI/Providers/OpenRouterModels.swift

@@ -160,6 +160,18 @@ struct OpenRouterChatResponse: Codable {
             let content: String?
             let toolCalls: [APIToolCall]?
             let images: [ImageOutput]?
+            // Images extracted from content[] blocks (e.g. GPT-5 Image response format)
+            let contentBlockImages: [ImageOutput]
+
+            private struct ContentBlock: Codable {
+                let type: String
+                let text: String?
+                let imageUrl: ImageOutput.ImageURL?
+                enum CodingKeys: String, CodingKey {
+                    case type, text
+                    case imageUrl = "image_url"
+                }
+            }
 
             enum CodingKeys: String, CodingKey {
                 case role
@@ -167,6 +179,27 @@ struct OpenRouterChatResponse: Codable {
                 case toolCalls = "tool_calls"
                 case images
             }
+
+            init(from decoder: Decoder) throws {
+                let c = try decoder.container(keyedBy: CodingKeys.self)
+                role = try c.decode(String.self, forKey: .role)
+                toolCalls = try c.decodeIfPresent([APIToolCall].self, forKey: .toolCalls)
+                images = try c.decodeIfPresent([ImageOutput].self, forKey: .images)
+                // content can be a plain String OR an array of content blocks
+                if let text = try? c.decodeIfPresent(String.self, forKey: .content) {
+                    content = text
+                    contentBlockImages = []
+                } else if let blocks = try? c.decodeIfPresent([ContentBlock].self, forKey: .content) {
+                    content = blocks.compactMap { $0.text }.joined().nonEmptyOrNil
+                    contentBlockImages = blocks.compactMap { block in
+                        guard block.type == "image_url", let url = block.imageUrl else { return nil }
+                        return ImageOutput(imageUrl: url)
+                    }
+                } else {
+                    content = nil
+                    contentBlockImages = []
+                }
+            }
         }
 
         enum CodingKeys: String, CodingKey {

oAI/Providers/OpenRouterProvider.swift

@@ -160,8 +160,17 @@ class OpenRouterProvider: AIProvider {
             throw ProviderError.unknown("HTTP \(httpResponse.statusCode)")
         }
 
+        // Debug: log raw response for image gen models
+        if request.imageGeneration, let rawStr = String(data: data, encoding: .utf8) {
+            Log.api.debug("Image gen raw response (first 3000 chars): \(rawStr.prefix(3000))")
+        }
+
         let apiResponse = try JSONDecoder().decode(OpenRouterChatResponse.self, from: data)
-        return try convertToChatResponse(apiResponse)
+        let chatResponse = try convertToChatResponse(apiResponse)
+        if request.imageGeneration {
+            Log.api.debug("Image gen decoded: content='\(chatResponse.content)', generatedImages=\(chatResponse.generatedImages?.count ?? 0)")
+        }
+        return chatResponse
     }
 
     // MARK: - Chat with raw tool messages
@@ -396,7 +405,10 @@ class OpenRouterProvider: AIProvider {
             ToolCallInfo(id: tc.id, type: tc.type, functionName: tc.function.name, arguments: tc.function.arguments)
         }
 
-        let images = choice.message.images.flatMap { decodeImageOutputs($0) }
+        let topLevelImages = choice.message.images.flatMap { decodeImageOutputs($0) } ?? []
+        let blockImages = decodeImageOutputs(choice.message.contentBlockImages) ?? []
+        let allImages = topLevelImages + blockImages
+        let images: [Data]? = allImages.isEmpty ? nil : allImages
 
         return ChatResponse(
             id: apiResponse.id,