@zhafron/opencode-kiro-auth 1.6.0 → 1.6.1

package/dist/infrastructure/transformers/history-builder.d.ts

@@ -1,5 +1,6 @@
 import type { CodeWhispererMessage } from '../../plugin/types';
-export declare function buildHistory(msgs: any[], resolved: string, system: string | undefined, toolResultLimit: number): CodeWhispererMessage[];
+export declare function buildHistory(msgs: any[], resolved: string, toolResultLimit: number): CodeWhispererMessage[];
+export declare function injectSystemPrompt(history: CodeWhispererMessage[], system: string | undefined, resolved: string): CodeWhispererMessage[];
 export declare function truncateHistory(history: CodeWhispererMessage[], historyLimit: number): CodeWhispererMessage[];
 export declare function historyHasToolCalling(history: CodeWhispererMessage[]): boolean;
 export declare function extractToolNamesFromHistory(history: CodeWhispererMessage[]): Set<string>;

package/dist/infrastructure/transformers/history-builder.js

@@ -2,38 +2,8 @@ import { KIRO_CONSTANTS } from '../../constants.js';
 import { convertImagesToKiroFormat, extractAllImages, extractTextFromParts } from '../../plugin/image-handler.js';
 import { getContentText, sanitizeHistory, truncate } from './message-transformer.js';
 import { deduplicateToolResults } from './tool-transformer.js';
-export function buildHistory(msgs, resolved, system, toolResultLimit) {
+export function buildHistory(msgs, resolved, toolResultLimit) {
     let history = [];
-    let firstUserIndex = -1;
-    for (let i = 0; i < msgs.length; i++) {
-        if (msgs[i].role === 'user') {
-            firstUserIndex = i;
-            break;
-        }
-    }
-    if (system) {
-        if (firstUserIndex !== -1) {
-            const m = msgs[firstUserIndex];
-            const oldContent = getContentText(m);
-            if (Array.isArray(m.content)) {
-                m.content = [
-                    { type: 'text', text: `${system}\n\n${oldContent}` },
-                    ...m.content.filter((p) => p.type !== 'text')
-                ];
-            }
-            else
-                m.content = `${system}\n\n${oldContent}`;
-        }
-        else {
-            history.push({
-                userInputMessage: {
-                    content: system,
-                    modelId: resolved,
-                    origin: KIRO_CONSTANTS.ORIGIN_AI_EDITOR
-                }
-            });
-        }
-    }
     for (let i = 0; i < msgs.length - 1; i++) {
         const m = msgs[i];
         if (!m)
@@ -137,6 +107,25 @@ export function buildHistory(msgs, resolved, system, toolResultLimit) {
     }
     return history;
 }
+export function injectSystemPrompt(history, system, resolved) {
+    if (!system)
+        return history;
+    const firstUserMsg = history.find((h) => !!h.userInputMessage);
+    if (firstUserMsg && firstUserMsg.userInputMessage) {
+        const oldContent = firstUserMsg.userInputMessage.content || '';
+        firstUserMsg.userInputMessage.content = `${system}\n\n${oldContent}`;
+    }
+    else {
+        history.unshift({
+            userInputMessage: {
+                content: system,
+                modelId: resolved,
+                origin: KIRO_CONSTANTS.ORIGIN_AI_EDITOR
+            }
+        });
+    }
+    return history;
+}
 export function truncateHistory(history, historyLimit) {
     let sanitized = sanitizeHistory(history);
     let historySize = JSON.stringify(sanitized).length;

package/dist/plugin/request.js

@@ -1,7 +1,7 @@
 import * as crypto from 'crypto';
 import * as os from 'os';
 import { KIRO_CONSTANTS } from '../constants.js';
-import { buildHistory, extractToolNamesFromHistory, historyHasToolCalling, truncateHistory } from '../infrastructure/transformers/history-builder.js';
+import { buildHistory, extractToolNamesFromHistory, historyHasToolCalling, injectSystemPrompt, truncateHistory } from '../infrastructure/transformers/history-builder.js';
 import { findOriginalToolCall, getContentText, mergeAdjacentMessages, truncate } from '../infrastructure/transformers/message-transformer.js';
 import { convertToolsToCodeWhisperer, deduplicateToolResults } from '../infrastructure/transformers/tool-transformer.js';
 import { convertImagesToKiroFormat, extractAllImages, extractTextFromParts } from './image-handler.js';
@@ -13,20 +13,27 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
     if (!messages || messages.length === 0)
         throw new Error('No messages');
     const resolved = resolveKiroModel(model);
+    const systemMsgs = messages.filter((m) => m.role === 'system');
+    const otherMsgs = messages.filter((m) => m.role !== 'system');
     let sys = system || '';
+    if (systemMsgs.length > 0) {
+        const extractedSystem = systemMsgs.map((m) => getContentText(m)).join('\n\n');
+        sys = sys ? `${sys}\n\n${extractedSystem}` : extractedSystem;
+    }
     if (think) {
         const pfx = `<thinking_mode>enabled</thinking_mode><max_thinking_length>${budget}</max_thinking_length>`;
         sys = sys.includes('<thinking_mode>') ? sys : sys ? `${pfx}\n${sys}` : pfx;
     }
-    const msgs = mergeAdjacentMessages([...messages]);
+    const msgs = mergeAdjacentMessages([...otherMsgs]);
     const lastMsg = msgs[msgs.length - 1];
     if (lastMsg && lastMsg.role === 'assistant' && getContentText(lastMsg) === '{')
         msgs.pop();
     const cwTools = tools ? convertToolsToCodeWhisperer(tools) : [];
     const toolResultLimit = Math.floor(250000 * reductionFactor);
-    let history = buildHistory(msgs, resolved, sys, toolResultLimit);
+    let history = buildHistory(msgs, resolved, toolResultLimit);
     const historyLimit = Math.floor(850000 * reductionFactor);
     history = truncateHistory(history, historyLimit);
+    history = injectSystemPrompt(history, sys, resolved);
     const curMsg = msgs[msgs.length - 1];
     if (!curMsg)
         throw new Error('Empty');

package/package.json

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