ns-omp-provider-kiro 0.3.5 → 0.3.8

package/dist/index.js

@@ -2420,8 +2420,52 @@ function convertToolsToKiro(tools) {
     }
   }));
 }
+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 {
@@ -2453,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) {
@@ -2484,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;
         }
@@ -2509,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 = [
@@ -2518,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
@@ -2525,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 }
           }
         });
@@ -3078,7 +3124,7 @@ function buildKiroRequest(params) {
         armToolUses.push({
           name: toKiroToolName(block.name),
           toolUseId: toKiroToolUseId(block.id),
-          input: block.arguments
+          input: toKiroToolInput(block.arguments)
         });
       }
     }
@@ -3107,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 = [];
@@ -3118,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);
@@ -3145,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;
@@ -3518,12 +3566,177 @@ function countTokens(text) {
   return getEncoder().encode(text).length;
 }
 
+// ../kiro-core/dist/tool-name-aliases.js
+var TOOL_NAME_ALIASES = {
+  // read
+  read_file: "read",
+  readfile: "read",
+  fs_read: "read",
+  view_file: "read",
+  // write
+  write_file: "write",
+  writefile: "write",
+  fs_write: "write",
+  create_file: "write",
+  // edit
+  edit_file: "edit",
+  editfile: "edit",
+  str_replace: "edit",
+  str_replace_editor: "edit",
+  str_replace_based_edit_tool: "edit",
+  apply_patch: "edit",
+  // ls
+  list_directory: "ls",
+  list_dir: "ls",
+  list_files: "ls",
+  // find
+  find_files: "find",
+  file_search: "find"
+};
+function normalizeKiroToolName(name, declared) {
+  if (!declared || declared.size === 0 || declared.has(name))
+    return name;
+  const alias = TOOL_NAME_ALIASES[name.toLowerCase()];
+  return alias !== void 0 && declared.has(alias) ? alias : name;
+}
+
+// ../kiro-core/dist/tool-use-parser.js
+var TAG_NAMES = ["tool_use", "tool_call", "function_call", "tool"];
+var FENCE2 = "```";
+function nextTagBlock(text, from) {
+  let best = null;
+  for (const name of TAG_NAMES) {
+    const open = `<${name}>`;
+    const close = `</${name}>`;
+    const openStart = text.indexOf(open, from);
+    if (openStart < 0)
+      continue;
+    if (best && openStart >= best.openStart)
+      continue;
+    const bodyStart = openStart + open.length;
+    const closeIdx = text.indexOf(close, bodyStart);
+    if (closeIdx < 0)
+      continue;
+    best = { openStart, bodyStart, closeIdx, closeEnd: closeIdx + close.length };
+  }
+  return best;
+}
+function fencedRanges2(text) {
+  const ranges = [];
+  let searchFrom = 0;
+  while (true) {
+    const open = text.indexOf(FENCE2, searchFrom);
+    if (open < 0)
+      break;
+    const close = text.indexOf(FENCE2, open + FENCE2.length);
+    if (close < 0) {
+      ranges.push({ start: open, end: text.length });
+      break;
+    }
+    ranges.push({ start: open, end: close + FENCE2.length });
+    searchFrom = close + FENCE2.length;
+  }
+  return ranges;
+}
+function normalizeOne(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value))
+    return null;
+  const record = value;
+  const rawName = record.tool_name ?? record.name;
+  if (typeof rawName !== "string" || rawName.length === 0)
+    return null;
+  const rawArgs = record.tool_input ?? record.input ?? record.arguments;
+  if (rawArgs === void 0) {
+    return { name: rawName, arguments: {} };
+  }
+  if (typeof rawArgs !== "object" || rawArgs === null || Array.isArray(rawArgs))
+    return null;
+  return { name: rawName, arguments: rawArgs };
+}
+function extractDescriptors(value) {
+  if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+    const record = value;
+    const wrapped = record.tool_calls ?? record.calls;
+    if (Array.isArray(wrapped)) {
+      const out = [];
+      for (const entry of wrapped) {
+        const one = normalizeOne(entry);
+        if (one === null)
+          return [];
+        out.push(one);
+      }
+      return out;
+    }
+  }
+  const single = normalizeOne(value);
+  return single ? [single] : [];
+}
+function parseToolUseCalls(text) {
+  const toolCalls = [];
+  const removals = [];
+  const fences = fencedRanges2(text);
+  let cursor = 0;
+  while (cursor < text.length) {
+    const hit = nextTagBlock(text, cursor);
+    if (hit === null)
+      break;
+    const { openStart, bodyStart, closeIdx, closeEnd } = hit;
+    const containingFence = fences.find((range) => openStart >= range.start && openStart < range.end);
+    if (containingFence) {
+      cursor = containingFence.end;
+      continue;
+    }
+    const braceStart = text.indexOf("{", bodyStart);
+    if (braceStart < 0 || braceStart > closeIdx) {
+      cursor = closeEnd;
+      continue;
+    }
+    const braceEnd = findJsonEnd(text, braceStart);
+    if (braceEnd < 0 || braceEnd > closeIdx) {
+      cursor = closeEnd;
+      continue;
+    }
+    const beforeJson = text.substring(bodyStart, braceStart).trim();
+    const afterJson = text.substring(braceEnd + 1, closeIdx).trim();
+    if (beforeJson.length > 0 || afterJson.length > 0) {
+      cursor = closeEnd;
+      continue;
+    }
+    let descriptors = [];
+    try {
+      descriptors = extractDescriptors(JSON.parse(text.substring(braceStart, braceEnd + 1)));
+    } catch {
+      descriptors = [];
+    }
+    if (descriptors.length === 0) {
+      cursor = closeEnd;
+      continue;
+    }
+    for (const descriptor of descriptors) {
+      toolCalls.push({
+        toolUseId: crypto.randomUUID(),
+        name: descriptor.name,
+        arguments: descriptor.arguments
+      });
+    }
+    removals.push({ start: openStart, end: closeEnd });
+    cursor = closeEnd;
+  }
+  let cleanedText = text;
+  for (let i = removals.length - 1; i >= 0; i--) {
+    const { start, end } = removals[i];
+    cleanedText = cleanedText.substring(0, start) + cleanedText.substring(end);
+  }
+  return { toolCalls, cleanedText };
+}
+
 // ../kiro-core/dist/response-assembler.js
 var ECHO_NOISE_PATTERN = /^\s*(continue|\.+)\s*$/i;
 var KiroResponseAssembler = class {
   model;
   thinkingEnabled;
   toolNameAliases;
+  declaredToolNames;
   pending = [];
   blocks = new KiroBlockBuffer((event) => this.pending.push(event));
   usage = {
@@ -3533,7 +3746,6 @@ var KiroResponseAssembler = class {
     cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 }
   };
   totalContent = "";
-  lastContentData = "";
   usageEvent = null;
   meteringEvent = null;
   receivedContextUsage = false;
@@ -3546,18 +3758,19 @@ var KiroResponseAssembler = class {
   droppedToolCalls = [];
   currentToolCall = null;
   stopReason = "stop";
-  constructor(model, thinkingEnabled, toolNameAliases) {
+  constructor(model, thinkingEnabled, toolNameAliases, declaredToolNames) {
     this.model = model;
     this.thinkingEnabled = thinkingEnabled;
     this.toolNameAliases = toolNameAliases;
+    this.declaredToolNames = declaredToolNames;
   }
+  /** Wire name -> the name the host registered, then alias repair. */
   originalToolName(name) {
-    return this.toolNameAliases?.get(name) ?? name;
+    return normalizeKiroToolName(this.toolNameAliases?.get(name) ?? name, this.declaredToolNames);
   }
   /** Clear per-attempt state. Only block indexes are kept. */
   beginAttempt() {
     this.totalContent = "";
-    this.lastContentData = "";
     this.usageEvent = null;
     this.meteringEvent = null;
     this.receivedContextUsage = false;
@@ -3613,10 +3826,9 @@ var KiroResponseAssembler = class {
         break;
       }
       case "content": {
-        this.endNativeThinking();
-        if (event.data === this.lastContentData)
+        if (event.data === "")
           break;
-        this.lastContentData = event.data;
+        this.endNativeThinking();
         this.totalContent += event.data;
         if (this.thinkingParser) {
           this.thinkingParser.processChunk(event.data);
@@ -3655,6 +3867,14 @@ var KiroResponseAssembler = class {
       }
       case "usage": {
         this.usageEvent = { ...this.usageEvent ?? {}, ...event.data };
+        const pct = event.data.contextUsagePercentage;
+        if (pct !== void 0) {
+          if (this.usageEvent.inputTokens === void 0) {
+            this.usage.input = Math.round(pct / 100 * this.model.contextWindow);
+          }
+          this.usage.contextPercent = pct;
+          this.receivedContextUsage = true;
+        }
         if (debugEnabled())
           debugLog("response.usageRaw", payload);
         break;
@@ -3688,7 +3908,18 @@ var KiroResponseAssembler = class {
     this.stripEchoNoise();
     const responseText = this.textBlockIndex === null ? "" : this.blocks.getText(this.textBlockIndex);
     const hasText2 = responseText.length > 0;
-    this.stopReason = !this.receivedContextUsage && this.emittedToolCalls === 0 ? "length" : this.emittedToolCalls > 0 ? "toolUse" : "stop";
+    const wireStopReason = this.usageEvent?.rawStopReason;
+    switch (wireStopReason) {
+      case "MAX_TOKENS":
+        this.stopReason = "length";
+        break;
+      case "END_TURN":
+      case "TOOL_USE":
+        this.stopReason = this.emittedToolCalls > 0 ? "toolUse" : "stop";
+        break;
+      default:
+        this.stopReason = !this.receivedContextUsage && this.emittedToolCalls === 0 ? "length" : this.emittedToolCalls > 0 ? "toolUse" : "stop";
+    }
     return {
       responseText,
       hasText: hasText2,
@@ -3697,7 +3928,9 @@ var KiroResponseAssembler = class {
       isEchoLoop: hasText2 && !this.sawAnyToolCalls && ECHO_NOISE_PATTERN.test(responseText),
       isEmpty: !hasText2 && !this.sawAnyToolCalls,
       stopReason: this.stopReason,
-      droppedToolCalls: this.droppedToolCalls
+      droppedToolCalls: this.droppedToolCalls,
+      ...wireStopReason !== void 0 ? { wireStopReason } : {},
+      ...this.usageEvent?.stopDetails !== void 0 ? { wireStopDetails: this.usageEvent.stopDetails } : {}
     };
   }
   /** Drop an echo the caller decided not to retry, so it is not read as a continuation signal. */
@@ -3781,10 +4014,14 @@ var KiroResponseAssembler = class {
   }
   /**
    * Extract text-dialect tool calls from content when no native tool calls
-   * arrived. Two dialects are recovered at this seam:
+   * arrived. Three dialects are recovered at this seam:
    *   1. Kiro's own `[Called name with args: {...}]` bracket form.
    *   2. Anthropic's `<invoke name="..."><parameter .../></invoke>` XML form,
    *      which opus-class models emit as plain text at high context.
+   *   3. A JSON descriptor wrapped in `<tool_use>`, `<tool_call>`,
+   *      `<function_call>` or `<tool>` tags (upstream #163), spelled
+   *      `tool_name`/`tool_input`, `name`/`input` or `name`/`arguments`,
+   *      or wrapped in a `{"tool_calls": [...]}` array.
    * Without this, the turn ends `stop` with zero tool calls — the agent loop
    * sees a finished answer and an unattended session stalls with no error
    * recorded anywhere.
@@ -3811,6 +4048,11 @@ var KiroResponseAssembler = class {
       text = invokeResult.cleanedText;
       recovered.push(...invokeResult.toolCalls);
     }
+    const toolUseResult = parseToolUseCalls(text);
+    if (toolUseResult.toolCalls.length > 0) {
+      text = toolUseResult.cleanedText;
+      recovered.push(...toolUseResult.toolCalls);
+    }
     if (recovered.length === 0)
       return;
     this.blocks.setText(this.textBlockIndex, text);
@@ -4861,6 +5103,16 @@ function describeReturnedContent(kinds) {
 }
 var skipProfileResolutionForTests = false;
 var TEST_PROFILE_ARN = "arn:aws:codewhisperer:us-east-1:000000000000:profile/test";
+function throwOnTerminalWireStop(wireStopReason, stopDetails) {
+  switch (wireStopReason) {
+    case "MODEL_CONTEXT_WINDOW_EXCEEDED":
+      throw new Error("Kiro API error: context_length_exceeded (MODEL_CONTEXT_WINDOW_EXCEEDED)");
+    case "CONTENT_FILTERED":
+      throw new Error(`Kiro content filtered: ${clampForDiagnostic(redactSensitiveText(JSON.stringify(stopDetails ?? {})))}`);
+    case "PAUSE_TURN":
+      throw new Error("Kiro paused the turn (PAUSE_TURN); automatic continuation is not supported");
+  }
+}
 async function* streamKiro(request) {
   const { model, signal } = request;
   const initialAccessToken = request.accessToken;
@@ -4919,7 +5171,7 @@ async function* streamKiro(request) {
     systemPrompt = `<thinking_mode>enabled</thinking_mode><max_thinking_length>${budget}</max_thinking_length>${systemPrompt ? `
 ${systemPrompt}` : ""}`;
   }
-  const assembler = new KiroResponseAssembler(model, thinkingEnabled, kiroToolNameAliases(request.tools));
+  const assembler = new KiroResponseAssembler(model, thinkingEnabled, kiroToolNameAliases(request.tools), new Set((request.tools ?? []).map((tool) => String(tool.name))));
   const usageTracking = request.usageTracking ?? KIRO_USAGE_TRACKING_DISABLED;
   let retryCount = 0;
   const maxRetries = 3;
@@ -5103,6 +5355,7 @@ ${systemPrompt}` : ""}`;
       throw new Error(`Kiro API error: ${outcome.firstTokenTimedOut ? "first token" : "idle"} timeout after max retries`);
     }
     const summary = assembler.endTurn();
+    throwOnTerminalWireStop(summary.wireStopReason, summary.wireStopDetails);
     yield* assembler.takeEvents();
     const degenerate = summary.isEmpty || summary.isEchoLoop;
     if (summary.isEchoLoop)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ns-omp-provider-kiro",
-  "version": "0.3.5",
+  "version": "0.3.8",
   "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.5"
+    "ns-kiro-core": "0.3.8"
   },
   "peerDependencies": {
     "@oh-my-pi/pi-ai": ">=18.2.0",