do not split message into two parts

Author: charleslien

common/src/util/messages.ts

@@ -50,7 +50,11 @@ export function withoutCacheControl<
 >(obj: T): T {
   const wrapper = cloneDeep(obj)
 
-  for (const provider of ['anthropic', 'openrouter', 'openaiCompatible'] as const) {
+  for (const provider of [
+    'anthropic',
+    'openrouter',
+    'openaiCompatible',
+  ] as const) {
     if (has(wrapper.providerOptions?.[provider]?.cache_control, 'type')) {
       delete wrapper.providerOptions?.[provider]?.cache_control?.type
     }
@@ -305,14 +309,7 @@ export function convertCbToModelMessages({
 
         prevMessage.content = [
           ...contentBlock.slice(0, lastContentIndex),
-          {
-            ...lastContentPart,
-            text: lastContentPart.text.slice(0, 1),
-          },
-          withCacheControl({
-            ...lastContentPart,
-            text: lastContentPart.text.slice(1),
-          }),
+          withCacheControl(lastContentPart),
           ...contentBlock.slice(lastContentIndex + 1),
         ] as typeof contentBlock
 

packages/internal/src/openai-compatible/chat/convert-to-openai-compatible-chat-messages.ts

@@ -26,15 +26,6 @@ export function convertToOpenAICompatibleChatMessages(
       }
 
       case 'user': {
-        if (content.length === 1 && content[0].type === 'text') {
-          messages.push({
-            role: 'user',
-            content: content[0].text,
-            ...getOpenAIMetadata(content[0]),
-          })
-          break
-        }
-
         messages.push({
           role: 'user',
           content: content.map((part) => {

packages/internal/src/openrouter-ai-sdk/chat/convert-to-openrouter-chat-messages.ts

@@ -47,27 +47,6 @@ export function convertToOpenRouterChatMessages(
       }
 
       case 'user': {
-        if (content.length === 1 && content[0]?.type === 'text') {
-          const cacheControl =
-            getCacheControl(providerOptions) ??
-            getCacheControl(content[0].providerOptions)
-          const contentWithCacheControl: string | ChatCompletionContentPart[] =
-            cacheControl
-              ? [
-                  {
-                    type: 'text',
-                    text: content[0].text,
-                    cache_control: cacheControl,
-                  },
-                ]
-              : content[0].text
-          messages.push({
-            role: 'user',
-            content: contentWithCacheControl,
-          })
-          break
-        }
-
         // Get message level cache control
         const messageCacheControl = getCacheControl(providerOptions)
         const contentParts: ChatCompletionContentPart[] = content.map(

sdk/src/impl/llm.ts

@@ -1,9 +1,5 @@
 import path from 'path'
 
-import {
-  OpenAICompatibleChatLanguageModel,
-  VERSION,
-} from '@ai-sdk/openai-compatible'
 import {
   checkLiveUserInput,
   getLiveUserInputIds,
@@ -14,6 +10,10 @@ import { getErrorObject } from '@codebuff/common/util/error'
 import { convertCbToModelMessages } from '@codebuff/common/util/messages'
 import { isExplicitlyDefinedModel } from '@codebuff/common/util/model-utils'
 import { StopSequenceHandler } from '@codebuff/common/util/stop-sequence'
+import {
+  OpenAICompatibleChatLanguageModel,
+  VERSION,
+} from '@codebuff/internal/openai-compatible/index'
 import { streamText, APICallError, generateText, generateObject } from 'ai'
 
 import { WEBSITE_URL } from '../constants'