@zhafron/opencode-kiro-auth 1.4.5 → 1.4.6

package/dist/plugin/image-handler.d.ts

@@ -0,0 +1,14 @@
+interface UnifiedImage {
+    mediaType: string;
+    data: string;
+}
+interface KiroImage {
+    format: string;
+    source: {
+        bytes: string;
+    };
+}
+export declare function extractAllImages(content: any): UnifiedImage[];
+export declare function convertImagesToKiroFormat(images: UnifiedImage[]): KiroImage[];
+export declare function extractTextFromParts(parts: any[]): string;
+export {};

package/dist/plugin/image-handler.js

@@ -0,0 +1,64 @@
+function extractImagesFromAnthropicFormat(content) {
+    const images = [];
+    for (const item of content) {
+        if (item.type === 'image' && item.source?.type === 'base64') {
+            images.push({
+                mediaType: item.source.media_type || 'image/jpeg',
+                data: item.source.data
+            });
+        }
+    }
+    return images;
+}
+function extractImagesFromOpenAI(content) {
+    const images = [];
+    for (const item of content) {
+        if (item.type === 'image_url' && item.image_url?.url) {
+            const url = item.image_url.url;
+            if (url.startsWith('data:')) {
+                try {
+                    const [header, data] = url.split(',', 2);
+                    if (!data)
+                        continue;
+                    const mediaType = header.split(';')[0].replace('data:', '');
+                    images.push({
+                        mediaType: mediaType || 'image/jpeg',
+                        data: data
+                    });
+                }
+                catch (e) {
+                    continue;
+                }
+            }
+        }
+    }
+    return images;
+}
+export function extractAllImages(content) {
+    if (!Array.isArray(content))
+        return [];
+    return [...extractImagesFromAnthropicFormat(content), ...extractImagesFromOpenAI(content)];
+}
+export function convertImagesToKiroFormat(images) {
+    return images.map((img) => {
+        const format = img.mediaType.split('/')[1] || 'png';
+        return {
+            format,
+            source: {
+                bytes: img.data
+            }
+        };
+    });
+}
+export function extractTextFromParts(parts) {
+    const textParts = [];
+    for (const part of parts) {
+        if (part.text && typeof part.text === 'string') {
+            textParts.push(part.text);
+        }
+        else if (part.type === 'text' && part.text) {
+            textParts.push(part.text);
+        }
+    }
+    return textParts.join('');
+}

package/dist/plugin/request.js

@@ -1,6 +1,7 @@
 import * as crypto from 'crypto';
 import * as os from 'os';
 import { KIRO_CONSTANTS } from '../constants.js';
+import { convertImagesToKiroFormat, extractAllImages, extractTextFromParts } from './image-handler.js';
 import { resolveKiroModel } from './models.js';
 function truncate(s, max) {
     if (s.length <= max)
@@ -112,28 +113,26 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
             continue;
         if (m.role === 'user') {
             const uim = { content: '', modelId: resolved, origin: KIRO_CONSTANTS.ORIGIN_AI_EDITOR };
-            const trs = [], imgs = [];
+            const trs = [];
             if (Array.isArray(m.content)) {
+                uim.content = extractTextFromParts(m.content);
                 for (const p of m.content) {
-                    if (p.type === 'text')
-                        uim.content += p.text || '';
-                    else if (p.type === 'tool_result')
+                    if (p.type === 'tool_result') {
                         trs.push({
                             content: [{ text: truncate(getContentText(p.content || p), toolResultLimit) }],
                             status: 'success',
                             toolUseId: p.tool_use_id
                         });
-                    else if (p.type === 'image' && p.source)
-                        imgs.push({
-                            format: p.source.media_type?.split('/')[1] || 'png',
-                            source: { bytes: p.source.data }
-                        });
+                    }
+                }
+                const unifiedImages = extractAllImages(m.content);
+                if (unifiedImages.length > 0) {
+                    uim.images = convertImagesToKiroFormat(unifiedImages);
                 }
             }
-            else
+            else {
                 uim.content = getContentText(m);
-            if (imgs.length)
-                uim.images = imgs;
+            }
             if (trs.length)
                 uim.userInputMessageContext = { toolResults: deduplicateToolResults(trs) };
             const prev = history[history.length - 1];
@@ -227,7 +226,8 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
     if (!curMsg)
         throw new Error('Empty');
     let curContent = '';
-    const curTrs = [], curImgs = [];
+    const curTrs = [];
+    const curImgs = [];
     if (curMsg.role === 'assistant') {
         const arm = { content: '' };
         let th = '';
@@ -290,20 +290,19 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
             }
         }
         else if (Array.isArray(curMsg.content)) {
+            curContent = extractTextFromParts(curMsg.content);
             for (const p of curMsg.content) {
-                if (p.type === 'text')
-                    curContent += p.text || '';
-                else if (p.type === 'tool_result')
+                if (p.type === 'tool_result') {
                     curTrs.push({
                         content: [{ text: truncate(getContentText(p.content || p), toolResultLimit) }],
                         status: 'success',
                         toolUseId: p.tool_use_id
                     });
-                else if (p.type === 'image' && p.source)
-                    curImgs.push({
-                        format: p.source.media_type?.split('/')[1] || 'png',
-                        source: { bytes: p.source.data }
-                    });
+                }
+            }
+            const unifiedImages = extractAllImages(curMsg.content);
+            if (unifiedImages.length > 0) {
+                curImgs.push(...convertImagesToKiroFormat(unifiedImages));
             }
         }
         else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhafron/opencode-kiro-auth",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "OpenCode plugin for AWS Kiro (CodeWhisperer) providing access to Claude models",
   "type": "module",
   "main": "dist/index.js",