ns-omp-provider-kiro 0.3.4 → 0.3.7

package/dist/index.js

@@ -2336,17 +2336,19 @@ ${text.substring(text.length - half)}`;
 }
 var KIRO_TOOL_USE_ID_PATTERN = /^[a-zA-Z0-9_.:-]{1,64}$/;
 function toKiroToolUseId(toolUseId) {
-  if (KIRO_TOOL_USE_ID_PATTERN.test(toolUseId))
-    return toolUseId;
-  const digest = createHash2("sha256").update(toolUseId).digest("base64url").slice(0, 32);
+  const id = typeof toolUseId === "string" ? toolUseId : String(toolUseId);
+  if (KIRO_TOOL_USE_ID_PATTERN.test(id))
+    return id;
+  const digest = createHash2("sha256").update(id).digest("base64url").slice(0, 32);
   return `pi_${digest}`;
 }
 var KIRO_TOOL_NAME_PATTERN = /^[a-zA-Z0-9_-]{1,64}$/;
 function toKiroToolName(name) {
-  if (KIRO_TOOL_NAME_PATTERN.test(name))
-    return name;
-  const clean = name.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 55);
-  const digest = createHash2("sha256").update(name).digest("base64url").slice(0, 8);
+  const str2 = typeof name === "string" ? name : String(name);
+  if (KIRO_TOOL_NAME_PATTERN.test(str2))
+    return str2;
+  const clean = str2.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 55);
+  const digest = createHash2("sha256").update(str2).digest("base64url").slice(0, 8);
   return `${clean || "tool"}_${digest}`;
 }
 function kiroToolNameAliases(tools) {
@@ -2404,17 +2406,66 @@ function toKiroInputSchema(parameters) {
   }
   return { type: "object", properties: {} };
 }
+function toKiroToolDescription(description) {
+  if (typeof description === "string")
+    return description === "" ? {} : { description };
+  return description == null ? {} : { description: String(description) };
+}
 function convertToolsToKiro(tools) {
   return tools.map((tool) => ({
     toolSpecification: {
       name: toKiroToolName(tool.name),
-      description: tool.description,
+      ...toKiroToolDescription(tool.description),
       inputSchema: { json: toKiroInputSchema(tool.parameters) }
     }
   }));
 }
+var KIRO_IMAGE_FORMAT_ALIASES = {
+  png: "png",
+  "x-png": "png",
+  jpeg: "jpeg",
+  jpg: "jpeg",
+  pjpeg: "jpeg",
+  gif: "gif",
+  webp: "webp"
+};
+function toKiroImageFormat(mimeType) {
+  const subtype = mimeType.trim().toLowerCase().split("/").pop()?.split(";")[0]?.trim() ?? "";
+  return KIRO_IMAGE_FORMAT_ALIASES[subtype];
+}
+function toKiroImageBytes(data) {
+  const trimmed = data.trim();
+  const marker = "base64,";
+  if (!trimmed.startsWith("data:") || !trimmed.includes(marker))
+    return trimmed;
+  return trimmed.slice(trimmed.indexOf(marker) + marker.length);
+}
 function convertImagesToKiro(images) {
-  return images.map((img) => ({ format: img.mimeType.split("/")[1] || "png", source: { bytes: img.data } }));
+  const out = [];
+  for (const img of images) {
+    const format = toKiroImageFormat(img.mimeType);
+    const bytes = toKiroImageBytes(img.data);
+    if (!format || !bytes)
+      continue;
+    out.push({ format, source: { bytes } });
+  }
+  return out;
+}
+function toKiroToolInput(input) {
+  if (isPlainObject(input))
+    return input;
+  if (typeof input === "string") {
+    try {
+      const parsed = JSON.parse(input);
+      if (isPlainObject(parsed))
+        return parsed;
+    } catch {
+    }
+  }
+  return {};
+}
+function isPlainObject(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function toolResultOf(msg) {
   return {
@@ -2446,12 +2497,12 @@ function buildHistory(messages, modelId, systemPrompt) {
 ${content}`;
         systemPrepended = true;
       }
-      const images = extractImages(msg);
+      const images = convertImagesToKiro(extractImages(msg));
       const uim = {
         content: sanitizeSurrogates(content),
         modelId,
         origin: "KIRO_CLI",
-        ...images.length > 0 ? { images: convertImagesToKiro(images) } : {}
+        ...images.length > 0 ? { images } : {}
       };
       const prevUim = history[history.length - 1]?.userInputMessage;
       if (prevUim) {
@@ -2477,7 +2528,7 @@ ${uim.content}` : prevUim.content || uim.content;
           armToolUses.push({
             name: toKiroToolName(block.name),
             toolUseId: toKiroToolUseId(block.id),
-            input: block.arguments
+            input: toKiroToolInput(block.arguments)
           });
           armHadBlocks = true;
         }
@@ -2502,8 +2553,9 @@ ${uim.content}` : prevUim.content || uim.content;
       i = j - 1;
       const prevTr = history[history.length - 1]?.userInputMessage;
       if (prevTr) {
-        if (trImages.length > 0)
-          prevTr.images = [...prevTr.images || [], ...convertImagesToKiro(trImages)];
+        const images = convertImagesToKiro(trImages);
+        if (images.length > 0)
+          prevTr.images = [...prevTr.images || [], ...images];
         if (!prevTr.userInputMessageContext)
           prevTr.userInputMessageContext = {};
         prevTr.userInputMessageContext.toolResults = [
@@ -2511,6 +2563,7 @@ ${uim.content}` : prevUim.content || uim.content;
           ...toolResults
         ];
       } else {
+        const images = convertImagesToKiro(trImages);
         history.push({
           userInputMessage: {
             // Empty by design: `toolResults` is this turn's payload. See
@@ -2518,7 +2571,7 @@ ${uim.content}` : prevUim.content || uim.content;
             content: "",
             modelId,
             origin: "KIRO_CLI",
-            ...trImages.length > 0 ? { images: convertImagesToKiro(trImages) } : {},
+            ...images.length > 0 ? { images } : {},
             userInputMessageContext: { toolResults }
           }
         });
@@ -3071,7 +3124,7 @@ function buildKiroRequest(params) {
         armToolUses.push({
           name: toKiroToolName(block.name),
           toolUseId: toKiroToolUseId(block.id),
-          input: block.arguments
+          input: toKiroToolInput(block.arguments)
         });
       }
     }
@@ -3100,8 +3153,9 @@ ${armContent}` : prevArm.content || armContent;
       currentToolResults.push(toolResultOf2(m));
       toolResultImages.push(...extractImages(m));
     }
-    if (toolResultImages.length > 0)
-      currentImages = convertImagesToKiro(toolResultImages);
+    const convertedToolImages = convertImagesToKiro(toolResultImages);
+    if (convertedToolImages.length > 0)
+      currentImages = convertedToolImages;
     currentContent = "";
   } else if (firstMsg?.role === "toolResult") {
     const toolResultImages = [];
@@ -3111,8 +3165,9 @@ ${armContent}` : prevArm.content || armContent;
       currentToolResults.push(toolResultOf2(m));
       toolResultImages.push(...extractImages(m));
     }
-    if (toolResultImages.length > 0)
-      currentImages = convertImagesToKiro(toolResultImages);
+    const convertedToolImages = convertImagesToKiro(toolResultImages);
+    if (convertedToolImages.length > 0)
+      currentImages = convertedToolImages;
     currentContent = "";
   } else if (firstMsg?.role === "user") {
     currentContent = getContentText(firstMsg);
@@ -3138,9 +3193,9 @@ ${currentContent}`;
       uimc.tools = finalTools;
   }
   if (firstMsg?.role === "user") {
-    const imgs = extractImages(firstMsg);
+    const imgs = convertImagesToKiro(extractImages(firstMsg));
     if (imgs.length > 0)
-      currentImages = convertImagesToKiro(imgs);
+      currentImages = imgs;
   }
   if (currentContent === "" && currentToolResults.length === 0)
     currentContent = EMPTY_CONTENT_PLACEHOLDER;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ns-omp-provider-kiro",
-  "version": "0.3.4",
+  "version": "0.3.7",
   "description": "OMP (oh-my-pi) provider plugin: adds Kiro (AWS CodeWhisperer/Q) models via your kiro-cli login",
   "type": "module",
   "main": "./dist/index.js",
@@ -37,7 +37,7 @@
     "README.md"
   ],
   "dependencies": {
-    "ns-kiro-core": "0.3.4"
+    "ns-kiro-core": "0.3.7"
   },
   "peerDependencies": {
     "@oh-my-pi/pi-ai": ">=18.2.0",