fix: 修复 OpenAI Langfuse 类型检查

Author: XavierWangHX

src/services/api/openai/index.ts

@@ -5,6 +5,7 @@ import type {
   StreamEvent,
   SystemAPIErrorMessage,
   AssistantMessage,
+  UserMessage,
 } from '../../../types/message.js'
 import type { AgentId } from '../../../types/ids.js'
 import type { Tools } from '../../../Tool.js'
@@ -56,11 +57,11 @@ import {
  * ToolSearchTool to load their full schemas.
  */
 function prependDeferredToolListIfNeeded(
-  messages: Message[],
+  messages: (AssistantMessage | UserMessage)[],
   tools: Tools,
   deferredToolNames: Set<string>,
   useToolSearch: boolean,
-): Message[] {
+): (AssistantMessage | UserMessage)[] {
   if (!useToolSearch || isDeferredToolsDeltaEnabled()) return messages
 
   const deferredToolList = tools
@@ -80,6 +81,10 @@ function prependDeferredToolListIfNeeded(
   ]
 }
 
+function isOpenAIConvertibleMessage(msg: Message): msg is AssistantMessage | UserMessage {
+  return msg.type === 'assistant' || msg.type === 'user'
+}
+
 /**
  * Assemble the final AssistantMessage (and optional max_tokens error) from
  * accumulated stream state. Extracted to avoid duplication between the
@@ -212,8 +217,9 @@ export async function* queryModelOpenAI(
 
     // 8. Convert messages and tools to OpenAI format
     const enableThinking = isOpenAIThinkingEnabled(openaiModel)
+    const openAIConvertibleMessages = messagesForAPI.filter(isOpenAIConvertibleMessage)
     const messagesWithDeferredToolList = prependDeferredToolListIfNeeded(
-      messagesForAPI,
+      openAIConvertibleMessages,
       tools,
       deferredToolNames,
       useToolSearch,

src/services/langfuse/convert.ts

@@ -10,7 +10,7 @@
  *   - tool_result blocks → separate { role: 'tool' } messages
  */
 
-import type { Message, AssistantMessage, UserMessage } from 'src/types/message.js'
+import type { AssistantMessage } from 'src/types/message.js'
 
 type LangfuseContentPart =
   | { type: 'text'; text: string }
@@ -42,11 +42,6 @@ function isLangfuseRole(value: unknown): value is LangfuseChatMessage['role'] {
   }
 }
 
-type LangfuseInputMessage =
-  | UserMessage
-  | AssistantMessage
-  | LangfuseChatMessage
-
 function isRecord(value: unknown): value is Record<string, unknown> {
   return value !== null && typeof value === 'object' && !Array.isArray(value)
 }
@@ -175,15 +170,15 @@ function collapseContent(parts: LangfuseContentPart[]): string | LangfuseContent
   return parts
 }
 
-function toRole(msg: Message): 'user' | 'assistant' | 'system' {
+function toRoleFromWrappedMessage(msg: Record<string, unknown>): 'user' | 'assistant' | 'system' {
   if (msg.type === 'assistant') return 'assistant'
   if (msg.type === 'system') return 'system'
   return 'user'
 }
 
 /** Convert internal or OpenAI-style messages → Langfuse input format */
 export function convertMessagesToLangfuse(
-  messages: LangfuseInputMessage[],
+  messages: readonly unknown[],
   systemPrompt?: readonly string[],
 ): LangfuseChatMessage[] {
   const result: LangfuseChatMessage[] = []
@@ -193,11 +188,12 @@ export function convertMessagesToLangfuse(
     }
   }
   for (const msg of messages) {
-    const isWrappedMessage = 'message' in msg
-    const inner = isWrappedMessage ? msg.message : msg
-    if (!inner) continue
+    if (!isRecord(msg)) continue
+    const wrappedMessage = msg.message
+    const isWrappedMessage = isRecord(wrappedMessage)
+    const inner = isWrappedMessage ? wrappedMessage : msg
     const role =
-      isLangfuseRole(inner.role) ? inner.role : isWrappedMessage ? toRole(msg) : 'user'
+      isLangfuseRole(inner.role) ? inner.role : isWrappedMessage ? toRoleFromWrappedMessage(msg) : 'user'
     const rawContent = inner.content
     if (typeof rawContent === 'string' || !Array.isArray(rawContent)) {
       const toolCalls = getToolCalls(inner.tool_calls)