This commit is contained in:
parent
32a746181a
commit
23abe1a7bb
1 changed files with 15 additions and 1 deletions
|
|
@ -254,6 +254,20 @@ function convertMessages(messages, tools, model) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Merge consecutive user messages (Kiro requires alternating user/assistant)
|
||||||
|
const mergedHistory = [];
|
||||||
|
for (let i = 0; i < history.length; i++) {
|
||||||
|
const current = history[i];
|
||||||
|
if (current.userInputMessage &&
|
||||||
|
mergedHistory.length > 0 &&
|
||||||
|
mergedHistory[mergedHistory.length - 1].userInputMessage) {
|
||||||
|
const prev = mergedHistory[mergedHistory.length - 1];
|
||||||
|
prev.userInputMessage.content += "\n\n" + current.userInputMessage.content;
|
||||||
|
} else {
|
||||||
|
mergedHistory.push(current);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Inject tools into currentMessage AFTER cleanup
|
// Inject tools into currentMessage AFTER cleanup
|
||||||
if (firstHistoryTools && currentMessage?.userInputMessage &&
|
if (firstHistoryTools && currentMessage?.userInputMessage &&
|
||||||
!currentMessage.userInputMessage.userInputMessageContext?.tools) {
|
!currentMessage.userInputMessage.userInputMessageContext?.tools) {
|
||||||
|
|
@ -263,7 +277,7 @@ function convertMessages(messages, tools, model) {
|
||||||
currentMessage.userInputMessage.userInputMessageContext.tools = firstHistoryTools;
|
currentMessage.userInputMessage.userInputMessageContext.tools = firstHistoryTools;
|
||||||
}
|
}
|
||||||
|
|
||||||
return { history, currentMessage };
|
return { history: mergedHistory, currentMessage };
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue