@javargasm/pi-kiro 0.4.8 → 0.4.9

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 0.4.9
+
+### Patch Changes
+
+- 8a547ef: fix: sanitize history to prevent Bedrock TOOL_DUPLICATE and TOOL_USE_RESULT_MISMATCH errors
+
+  Added `sanitizeHistory` defense-in-depth pass that runs after `collapseAgenticLoops`:
+
+  - Deduplicates toolUseIds within each assistant message (prevents TOOL_DUPLICATE)
+  - Removes orphan toolUses without matching toolResults (prevents TOOL_USE_RESULT_MISMATCH)
+  - Removes orphan toolResults without matching toolUses
+
+  These errors surfaced during retry loops where the same assistant message
+  with tool calls could be re-injected into the history.
+
+- refactor: define `TestCase` type in smoke-live test to fix `TS2304` compilation error
 ## 0.4.8
 
 ### Patch Changes

package/dist/core.js

@@ -2566,7 +2566,38 @@ Tool results provided.`;
       });
     }
   }
-  return { history: collapseAgenticLoops(history), systemPrepended, currentMsgStartIdx };
+  return { history: sanitizeHistory(collapseAgenticLoops(history)), systemPrepended, currentMsgStartIdx };
+}
+function sanitizeHistory(history) {
+  for (let i = 0;i < history.length; i++) {
+    const entry = history[i];
+    const arm = entry?.assistantResponseMessage;
+    if (!arm?.toolUses || arm.toolUses.length === 0)
+      continue;
+    const seen = new Set;
+    arm.toolUses = arm.toolUses.filter((tu) => {
+      if (seen.has(tu.toolUseId))
+        return false;
+      seen.add(tu.toolUseId);
+      return true;
+    });
+    const next = i + 1 < history.length ? history[i + 1] : undefined;
+    const toolResults = next?.userInputMessage?.userInputMessageContext?.toolResults;
+    if (!toolResults) {
+      delete arm.toolUses;
+      continue;
+    }
+    const resultIdSet = new Set(toolResults.map((tr) => tr.toolUseId));
+    const useIdSet = new Set(arm.toolUses.map((tu) => tu.toolUseId));
+    arm.toolUses = arm.toolUses.filter((tu) => resultIdSet.has(tu.toolUseId));
+    if (arm.toolUses.length === 0)
+      delete arm.toolUses;
+    const ctx = next.userInputMessage.userInputMessageContext;
+    ctx.toolResults = toolResults.filter((tr) => useIdSet.has(tr.toolUseId));
+    if (ctx.toolResults.length === 0)
+      delete ctx.toolResults;
+  }
+  return history;
 }
 function collapseAgenticLoops(history) {
   if (history.length < 4)

package/dist/extension.js

@@ -2570,7 +2570,38 @@ Tool results provided.`;
       });
     }
   }
-  return { history: collapseAgenticLoops(history), systemPrepended, currentMsgStartIdx };
+  return { history: sanitizeHistory(collapseAgenticLoops(history)), systemPrepended, currentMsgStartIdx };
+}
+function sanitizeHistory(history) {
+  for (let i = 0;i < history.length; i++) {
+    const entry = history[i];
+    const arm = entry?.assistantResponseMessage;
+    if (!arm?.toolUses || arm.toolUses.length === 0)
+      continue;
+    const seen = new Set;
+    arm.toolUses = arm.toolUses.filter((tu) => {
+      if (seen.has(tu.toolUseId))
+        return false;
+      seen.add(tu.toolUseId);
+      return true;
+    });
+    const next = i + 1 < history.length ? history[i + 1] : undefined;
+    const toolResults = next?.userInputMessage?.userInputMessageContext?.toolResults;
+    if (!toolResults) {
+      delete arm.toolUses;
+      continue;
+    }
+    const resultIdSet = new Set(toolResults.map((tr) => tr.toolUseId));
+    const useIdSet = new Set(arm.toolUses.map((tu) => tu.toolUseId));
+    arm.toolUses = arm.toolUses.filter((tu) => resultIdSet.has(tu.toolUseId));
+    if (arm.toolUses.length === 0)
+      delete arm.toolUses;
+    const ctx = next.userInputMessage.userInputMessageContext;
+    ctx.toolResults = toolResults.filter((tr) => useIdSet.has(tr.toolUseId));
+    if (ctx.toolResults.length === 0)
+      delete ctx.toolResults;
+  }
+  return history;
 }
 function collapseAgenticLoops(history) {
   if (history.length < 4)

package/dist/transform.d.ts

@@ -107,6 +107,24 @@ export declare function buildHistory(messages: Message[], _modelId: string, syst
     systemPrepended: boolean;
     currentMsgStartIdx: number;
 };
+/**
+ * Sanitize the Kiro history to prevent Bedrock validation errors:
+ *
+ * 1. **TOOL_DUPLICATE**: Deduplicate toolUseIds within each assistant
+ *    message — keep the first occurrence, drop subsequent ones.
+ *
+ * 2. **TOOL_USE_RESULT_MISMATCH**: Every ASST with toolUses must be
+ *    followed by a USER with toolResults whose IDs match. Remove
+ *    orphan toolUses that have no matching toolResult in the next
+ *    message, and remove orphan toolResults whose toolUse doesn't
+ *    exist in the preceding assistant.
+ *
+ * This runs as a defensive last pass — upstream logic (buildHistory,
+ * stream.ts current-turn assembly) should produce correct output, but
+ * edge cases in retry / cross-provider handoff can violate the
+ * invariants Bedrock enforces.
+ */
+export declare function sanitizeHistory(history: KiroHistoryEntry[]): KiroHistoryEntry[];
 /**
  * Collapse consecutive tool-use loops in history. When the agent calls
  * tools N times in sequence (ASST(toolUses) → USER(toolResults) pairs),

package/dist/transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@javargasm/pi-kiro",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "description": "Kiro provider for the pi coding agent: AWS Builder ID / IAM Identity Center login and the CodeWhisperer streaming API, exposing the Kiro Claude model family.",
   "type": "module",
   "license": "MIT",