Skip to content

An AI-powered search engine with a generative UI

fix: ensure messages start with user role in truncateMessages

Yoshiki Miura6d3ca8b5e91d
diff --git a/lib/utils/context-window.ts b/lib/utils/context-window.ts
index 6809f98d..bedc8ca0 100644
--- a/lib/utils/context-window.ts
+++ b/lib/utils/context-window.ts
@@ -23,28 +23,28 @@ export function getMaxAllowedTokens(modelId: string): number {
export function truncateMessages(
messages: CoreMessage[],
- maxTokens: number,
- preserveSystemMessage = true
+ maxTokens: number
): CoreMessage[] {
let totalTokens = 0
- const truncatedMessages: CoreMessage[] = []
+ const tempMessages: CoreMessage[] = []
- if (preserveSystemMessage && messages.length > 0) {
- truncatedMessages.push(messages[0])
- totalTokens += messages[0].content?.length || 0
- }
-
- for (let i = messages.length - 1; i >= (preserveSystemMessage ? 1 : 0); i--) {
+ for (let i = messages.length - 1; i >= 0; i--) {
const message = messages[i]
const messageTokens = message.content?.length || 0
if (totalTokens + messageTokens <= maxTokens) {
- truncatedMessages.unshift(message)
+ tempMessages.push(message)
totalTokens += messageTokens
} else {
break
}
}
- return truncatedMessages
+ const orderedMessages = tempMessages.reverse()
+
+ while (orderedMessages.length > 0 && orderedMessages[0].role !== 'user') {
+ orderedMessages.shift()
+ }
+
+ return orderedMessages
}