scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-08-28 05:27:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(zai): merge environment_details into tool result instead of system message (#10289)

Browse source
This commit is contained in:
Hannes Rudolph 2025-12-22 20:20:29 -07:00 • committed by GitHub
parent f21ec127b1
commit eeaf33ce4e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/api/providers/zai.ts
View file

@ -89,8 +89,8 @@ export class ZAiHandler extends BaseOpenAiCompatibleProvider<string> {
const temperature = this.options.modelTemperature ?? this.defaultTemperature
// Use Z.ai format to preserve reasoning_content and convert post-tool text to system messages
const convertedMessages = convertToZAiFormat(messages, { convertToolResultTextToSystem: true })
// Use Z.ai format to preserve reasoning_content and merge post-tool text into tool messages
const convertedMessages = convertToZAiFormat(messages, { mergeToolResultText: true })
const params: ZAiChatCompletionParams = {
model,

35
src/api/transform/zai-format.ts
View file

@ -24,19 +24,19 @@ export type ZAiAssistantMessage = AssistantMessage & {
*
* Key differences from standard OpenAI format:
* - Preserves reasoning_content on assistant messages for interleaved thinking
* - Text content after tool_results (like environment_details) is converted to system messages
* instead of user messages, preventing reasoning_content from being dropped
* - Text content after tool_results (like environment_details) is merged into the last tool message
* to avoid creating user messages that would cause reasoning_content to be dropped
*
* @param messages Array of Anthropic messages
* @param options Optional configuration for message conversion
* @param options.convertToolResultTextToSystem If true, convert text content after tool_results
* to system messages instead of user messages.
* This preserves reasoning_content continuity.
* @param options.mergeToolResultText If true, merge text content after tool_results into the last
* tool message instead of creating a separate user message.
* This is critical for Z.ai's interleaved thinking mode.
* @returns Array of OpenAI messages optimized for Z.ai's thinking mode
*/
export function convertToZAiFormat(
messages: AnthropicMessage[],
options?: { convertToolResultTextToSystem?: boolean },
options?: { mergeToolResultText?: boolean },
): Message[] {
const result: Message[] = []
@ -96,19 +96,20 @@ export function convertToZAiFormat(
// Handle text/image content after tool results
if (textParts.length > 0 || imageParts.length > 0) {
// For Z.ai interleaved thinking: when convertToolResultTextToSystem is enabled and we have
// tool results followed by text (like environment_details), convert to system message
// instead of user message to avoid dropping reasoning_content.
const shouldConvertToSystem =
options?.convertToolResultTextToSystem && toolResults.length > 0 && imageParts.length === 0
// For Z.ai interleaved thinking: when mergeToolResultText is enabled and we have
// tool results followed by text, merge the text into the last tool message to avoid
// creating a user message that would cause reasoning_content to be dropped.
// This is critical because Z.ai drops all reasoning_content when it sees a user message.
const shouldMergeIntoToolMessage =
options?.mergeToolResultText && toolResults.length > 0 && imageParts.length === 0
if (shouldConvertToSystem) {
// Convert text content to system message
const systemMessage: SystemMessage = {
role: "system",
content: textParts.join("\n"),
if (shouldMergeIntoToolMessage) {
// Merge text content into the last tool message
const lastToolMessage = result[result.length - 1] as ToolMessage
if (lastToolMessage?.role === "tool") {
const additionalText = textParts.join("\n")
lastToolMessage.content = `${lastToolMessage.content}\n\n${additionalText}`
}
result.push(systemMessage)
} else {
// Standard behavior: add user message with text/image content
let content: UserMessage["content"]