@zhafron/opencode-kiro-auth 1.2.6 → 1.2.8

package/dist/plugin/request.js

@@ -2,10 +2,53 @@ import * as crypto from 'crypto';
 import * as os from 'os';
 import { KIRO_CONSTANTS } from '../constants.js';
 import { resolveKiroModel } from './models.js';
-import * as logger from './logger.js';
+function truncate(s, max) {
+    if (s.length <= max)
+        return s;
+    const half = Math.floor(max / 2);
+    return s.substring(0, half) + '\n... [TRUNCATED] ...\n' + s.substring(s.length - half);
+}
+function sanitizeHistory(history) {
+    const result = [];
+    for (let i = 0; i < history.length; i++) {
+        const m = history[i];
+        if (!m)
+            continue;
+        if (m.assistantResponseMessage?.toolUses) {
+            const next = history[i + 1];
+            if (next?.userInputMessage?.userInputMessageContext?.toolResults)
+                result.push(m);
+        }
+        else if (m.userInputMessage?.userInputMessageContext?.toolResults) {
+            const prev = result[result.length - 1];
+            if (prev?.assistantResponseMessage?.toolUses)
+                result.push(m);
+        }
+        else
+            result.push(m);
+    }
+    return result;
+}
+function findOriginalToolCall(msgs, toolUseId) {
+    for (const m of msgs) {
+        if (m.role === 'assistant') {
+            if (m.tool_calls) {
+                for (const tc of m.tool_calls)
+                    if (tc.id === toolUseId)
+                        return tc;
+            }
+            if (Array.isArray(m.content)) {
+                for (const p of m.content)
+                    if (p.type === 'tool_use' && p.id === toolUseId)
+                        return p;
+            }
+        }
+    }
+    return null;
+}
 export function transformToCodeWhisperer(url, body, model, auth, think = false, budget = 20000) {
     const req = typeof body === 'string' ? JSON.parse(body) : body;
-    const { messages, tools, system, conversationId } = req;
+    const { messages, tools, system } = req;
     const convId = crypto.randomUUID();
     if (!messages || messages.length === 0)
         throw new Error('No messages');
@@ -20,7 +63,7 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
     if (lastMsg && lastMsg.role === 'assistant' && getContentText(lastMsg) === '{')
         msgs.pop();
     const cwTools = tools ? convertToolsToCodeWhisperer(tools) : [];
-    const history = [];
+    let history = [];
     let firstUserIndex = -1;
     for (let i = 0; i < msgs.length; i++) {
         if (msgs[i].role === 'user') {
@@ -38,9 +81,8 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
                     ...m.content.filter((p) => p.type !== 'text')
                 ];
             }
-            else {
+            else
                 m.content = `${sys}\n\n${oldContent}`;
-            }
         }
         else {
             history.push({
@@ -65,7 +107,7 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
                         uim.content += p.text || '';
                     else if (p.type === 'tool_result')
                         trs.push({
-                            content: [{ text: getContentText(p.content || p) }],
+                            content: [{ text: truncate(getContentText(p.content || p), 250000) }],
                             status: 'success',
                             toolUseId: p.tool_use_id
                         });
@@ -83,9 +125,8 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
             if (trs.length)
                 uim.userInputMessageContext = { toolResults: deduplicateToolResults(trs) };
             const prev = history[history.length - 1];
-            if (prev && prev.userInputMessage) {
+            if (prev && prev.userInputMessage)
                 history.push({ assistantResponseMessage: { content: 'Continue' } });
-            }
             history.push({ userInputMessage: uim });
         }
         else if (m.role === 'tool') {
@@ -93,22 +134,21 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
             if (m.tool_results) {
                 for (const tr of m.tool_results)
                     trs.push({
-                        content: [{ text: getContentText(tr) }],
+                        content: [{ text: truncate(getContentText(tr), 250000) }],
                         status: 'success',
                         toolUseId: tr.tool_call_id
                     });
             }
             else {
                 trs.push({
-                    content: [{ text: getContentText(m) }],
+                    content: [{ text: truncate(getContentText(m), 250000) }],
                     status: 'success',
                     toolUseId: m.tool_call_id
                 });
             }
             const prev = history[history.length - 1];
-            if (prev && prev.userInputMessage) {
+            if (prev && prev.userInputMessage)
                 history.push({ assistantResponseMessage: { content: 'Continue' } });
-            }
             history.push({
                 userInputMessage: {
                     content: 'Tool results provided.',
@@ -132,9 +172,8 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
                         tus.push({ input: p.input, name: p.name, toolUseId: p.id });
                 }
             }
-            else {
+            else
                 arm.content = getContentText(m);
-            }
             if (m.tool_calls && Array.isArray(m.tool_calls)) {
                 for (const tc of m.tool_calls) {
                     tus.push({
@@ -155,6 +194,19 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
             history.push({ assistantResponseMessage: arm });
         }
     }
+    history = sanitizeHistory(history);
+    let historySize = JSON.stringify(history).length;
+    while (historySize > 850000 && history.length > 2) {
+        history.shift();
+        while (history.length > 0) {
+            const first = history[0];
+            if (first && first.userInputMessage)
+                break;
+            history.shift();
+        }
+        history = sanitizeHistory(history);
+        historySize = JSON.stringify(history).length;
+    }
     const curMsg = msgs[msgs.length - 1];
     if (!curMsg)
         throw new Error('Empty');
@@ -206,14 +258,14 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
             if (curMsg.tool_results) {
                 for (const tr of curMsg.tool_results)
                     curTrs.push({
-                        content: [{ text: getContentText(tr) }],
+                        content: [{ text: truncate(getContentText(tr), 250000) }],
                         status: 'success',
                         toolUseId: tr.tool_call_id
                     });
             }
             else {
                 curTrs.push({
-                    content: [{ text: getContentText(curMsg) }],
+                    content: [{ text: truncate(getContentText(curMsg), 250000) }],
                     status: 'success',
                     toolUseId: curMsg.tool_call_id
                 });
@@ -225,7 +277,7 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
                     curContent += p.text || '';
                 else if (p.type === 'tool_result')
                     curTrs.push({
-                        content: [{ text: getContentText(p.content || p) }],
+                        content: [{ text: truncate(getContentText(p.content || p), 250000) }],
                         status: 'success',
                         toolUseId: p.tool_use_id
                     });
@@ -254,17 +306,60 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
             }
         }
     };
-    if (history.length > 0) {
-        ;
-        request.conversationState.history = history;
+    const toolUsesInHistory = history.flatMap((h) => h.assistantResponseMessage?.toolUses || []);
+    const allToolUseIdsInHistory = new Set(toolUsesInHistory.map((tu) => tu.toolUseId));
+    const finalCurTrs = [];
+    const orphanedTrs = [];
+    for (const tr of curTrs) {
+        if (allToolUseIdsInHistory.has(tr.toolUseId))
+            finalCurTrs.push(tr);
+        else {
+            const originalCall = findOriginalToolCall(messages, tr.toolUseId);
+            if (originalCall) {
+                orphanedTrs.push({
+                    call: {
+                        name: originalCall.name || originalCall.function?.name || 'tool',
+                        toolUseId: tr.toolUseId,
+                        input: originalCall.input ||
+                            (originalCall.function?.arguments ? JSON.parse(originalCall.function.arguments) : {})
+                    },
+                    result: tr
+                });
+            }
+            else {
+                curContent += `\n\n[Output for tool call ${tr.toolUseId}]:\n${tr.content?.[0]?.text || ''}`;
+            }
+        }
     }
+    if (orphanedTrs.length > 0) {
+        const prev = history[history.length - 1];
+        if (prev && !prev.userInputMessage) {
+            history.push({
+                userInputMessage: {
+                    content: 'Running tools...',
+                    modelId: resolved,
+                    origin: KIRO_CONSTANTS.ORIGIN_AI_EDITOR
+                }
+            });
+        }
+        history.push({
+            assistantResponseMessage: {
+                content: 'I will execute the following tools.',
+                toolUses: orphanedTrs.map((o) => o.call)
+            }
+        });
+        finalCurTrs.push(...orphanedTrs.map((o) => o.result));
+    }
+    if (history.length > 0)
+        request.conversationState.history = history;
     const uim = request.conversationState.currentMessage.userInputMessage;
     if (uim) {
+        uim.content = curContent;
         if (curImgs.length)
             uim.images = curImgs;
         const ctx = {};
-        if (curTrs.length)
-            ctx.toolResults = deduplicateToolResults(curTrs);
+        if (finalCurTrs.length)
+            ctx.toolResults = deduplicateToolResults(finalCurTrs);
         if (cwTools.length)
             ctx.tools = cwTools;
         if (Object.keys(ctx).length)
@@ -277,17 +372,11 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
                 const existingToolNames = new Set(existingTools.map((t) => t.toolSpecification?.name).filter(Boolean));
                 const missingToolNames = Array.from(toolNamesInHistory).filter((name) => !existingToolNames.has(name));
                 if (missingToolNames.length > 0) {
-                    logger.log(`[Kiro] Adding ${missingToolNames.length} missing tool definitions: ${missingToolNames.join(', ')}`);
                     const placeholderTools = missingToolNames.map((name) => ({
                         toolSpecification: {
                             name,
                             description: 'Tool',
-                            inputSchema: {
-                                json: {
-                                    type: 'object',
-                                    properties: {}
-                                }
-                            }
+                            inputSchema: { json: { type: 'object', properties: {} } }
                         }
                     }));
                     if (!uim.userInputMessageContext)

package/dist/plugin/response.js

@@ -76,7 +76,7 @@ function parseEventStreamChunk(rawText) {
         };
     });
     if (contextUsagePercentage !== undefined) {
-        const totalTokens = Math.round((172500 * contextUsagePercentage) / 100);
+        const totalTokens = Math.round((200000 * contextUsagePercentage) / 100);
         outputTokens = estimateTokens(content);
         inputTokens = Math.max(0, totalTokens - outputTokens);
     }

package/dist/plugin/streaming.js

@@ -224,7 +224,7 @@ export async function* transformKiroStream(response, model, conversationId) {
         }
         outputTokens = estimateTokens(totalContent);
         if (contextUsagePercentage !== null && contextUsagePercentage > 0) {
-            const totalTokens = Math.round((172500 * contextUsagePercentage) / 100);
+            const totalTokens = Math.round((200000 * contextUsagePercentage) / 100);
             inputTokens = Math.max(0, totalTokens - outputTokens);
         }
         yield convertToOpenAI({

package/package.json

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