feat: add strict tool message ordering setting for OpenAI Compatible providers #10598

roomote · 2026-01-10T05:42:10Z

Related GitHub Issue

Description

This PR attempts to address Issue #10540. Feedback and guidance are welcome.

This PR adds a new setting openAiStrictToolMessageOrdering for OpenAI Compatible providers that fixes the "Unexpected role 'user' after role 'tool'" error occurring with NVIDIA NIM, OpenRouter, and other strict OpenAI-compatible APIs.

Implementation approach (Option 1 from issue analysis):

Added a new boolean setting openAiStrictToolMessageOrdering to the provider settings schema
When enabled, passes mergeToolResultText: true to convertToOpenAiMessages(), which merges text content (like environment_details) into the last tool message instead of creating a separate user message
Added a UI checkbox in the OpenAI Compatible provider settings with a helpful description

Files modified:

packages/types/src/provider-settings.ts - Added the new setting to openAiSchema
src/api/providers/openai.ts - Use the setting when calling convertToOpenAiMessages()
webview-ui/src/components/settings/providers/OpenAICompatible.tsx - Added UI checkbox
webview-ui/src/i18n/locales/en/settings.json - Added translation keys

Test Procedure

Configure OpenAI Compatible provider with NVIDIA NIM or similar strict API
Enable the "Strict tool message ordering" checkbox in settings
Verify that tool calls work without the "user after tool" error
Tests: cd src && npx vitest run api/transform/__tests__/openai-format.spec.ts (all 24 tests pass)
Type checks pass for both src and webview-ui packages

Pre-Submission Checklist

Issue Linked: This PR is linked to an approved GitHub Issue (see "Related GitHub Issue" above).
Scope: My changes are focused on the linked issue (one major feature/fix per PR).
Self-Review: I have performed a thorough self-review of my code.
Testing: New and/or updated tests have been added to cover my changes (if applicable).
Documentation Impact: I have considered if my changes require documentation updates (see "Documentation Updates" section below).
Contribution Guidelines: I have read and agree to the Contributor Guidelines.

Documentation Updates

No documentation updates are required.

Additional Notes

This implementation uses the same approach already proven by DeepSeek (for thinking models), Z.ai provider, and MiniMax. The codebase already had the mergeToolResultText option in convertToOpenAiMessages() - this PR simply exposes it as a user-facing setting for OpenAI Compatible providers.

Important

Adds openAiStrictToolMessageOrdering setting for strict message ordering in OpenAI Compatible providers, preventing specific errors and updating UI and tests.

Behavior:
- Adds openAiStrictToolMessageOrdering setting to handle strict message ordering for OpenAI Compatible providers, preventing "Unexpected role 'user' after role 'tool'" errors.
- When enabled, merges text content into the last tool message using mergeToolResultText in convertToOpenAiMessages().
UI:
- Adds a checkbox for openAiStrictToolMessageOrdering in OpenAICompatible.tsx with description in settings.json.
Files Modified:
- provider-settings.ts: Adds new setting to openAiSchema.
- openai.ts: Implements setting in message conversion logic.
- openai-format.spec.ts: Adds tests for mergeToolResultText behavior.
Tests:
- Ensures tool calls work without "user after tool" error when setting is enabled.
- Tests added for merging text into tool messages and handling images separately.

^{This description was created by}^{for 3661e54. You can customize this summary. It will automatically update as commits are pushed.}

…providers Adds a new setting `openAiStrictToolMessageOrdering` to OpenAI Compatible providers that enables merging text content after tool results into the last tool message. This fixes "Unexpected role user after role tool" errors with NVIDIA NIM, OpenRouter, and other strict OpenAI-compatible APIs. When enabled, environment_details and other text content that follows tool_result messages are merged into the last tool message instead of being sent as a separate user message. Fixes #10540

roomote · 2026-01-10T05:43:17Z

Rooviewer See task on Roo Cloud

All issues have been resolved. The latest commit adds comprehensive regression tests for multi-turn conversation support with the mergeToolResultText option.

settings.json: Duplicate translation keys - nested format entries added but old flat format entries at lines 539-541 were not removed, causing translation lookup to fail

Previous reviews

8065da4: Review #1

c13260f: Review #2

809602f: Review #3

4111aa6: Review #4

db06166: Review #5

_{Mention @roomote in a comment to request specific changes to this pull request or fix all unresolved issues.}

…providers Adds a new setting `openAiStrictToolMessageOrdering` for OpenAI-compatible providers that, when enabled, merges text content after tool results into the last tool message instead of creating a separate user message. This fixes the "Unexpected role user after role tool" error that occurs with providers like NVIDIA NIM and Devstral that enforce strict message ordering rules. Fixes #10540

roomote · 2026-01-10T05:53:44Z

webview-ui/src/i18n/locales/en/settings.json

+		"openAiStrictToolMessageOrdering": {
+			"label": "Strict tool message ordering",
+			"description": "Enable for providers like NVIDIA NIM and Devstral that require strict message ordering. When enabled, text content after tool results is merged into the last tool message instead of creating a separate user message."
+		},


This addition creates duplicate keys in the JSON file. There are older flat format entries at lines 539-541 ("openAiStrictToolMessageOrdering": "Strict tool message ordering" and "openAiStrictToolMessageOrderingDescription": "...") that were not removed. Since JSON parsers typically use the last value for duplicate keys, the flat format at line 539 will take precedence, causing t("settings:providers.openAiStrictToolMessageOrdering.label") to return undefined. Remove the old flat format entries at lines 539-541.

_{Fix it with Roo Code or mention @roomote and request a fix.}

bngfavored · 2026-01-10T06:59:09Z

@roomote I found after running the branch locally that if "Enable R1 model parameters" is enabled at the same time it will still produce the 400 error. Why would that happen?

roomote · 2026-01-10T07:01:16Z

Fixaroo See task on Roo Cloud

Fixed the issue where "Strict tool message ordering" was not applied when "Enable R1 model parameters" was also enabled. The mergeToolResultText option is now passed to convertToR1Format() in both streaming and non-streaming code paths.

_{View commit | Revert commit}

…e is enabled When both "Enable R1 model parameters" and "Strict tool message ordering" are enabled, the mergeToolResultText option was not being passed to convertToR1Format, causing the 400 error to still occur. This fix ensures the strictToolMessageOrdering setting is respected in both the streaming and non-streaming code paths when using R1 format.

roomote · 2026-01-10T07:29:37Z

Fixaroo See task on Roo Cloud

Removed duplicate translation keys in settings.json. All local checks passed.

_{View commit | Revert commit}

bngfavored · 2026-01-10T08:08:39Z

@roomote After more testing, if I have the option checked and an image is added to the chat it does not merge the text. So when handling images it needs to take that into account to merge the text.

roomote · 2026-01-10T08:10:27Z

Fixaroo See task on Roo Cloud

Fixed the reported issue. Text content is now merged into the last tool message even when images are present. All local checks passed.

_{View commit | Revert commit}

When mergeToolResultText is enabled and both text and images are present after tool results, the text content is now merged into the last tool message while images are sent as a separate user message. This fixes the issue where strict tool message ordering would not work when images were added to the chat, causing "Unexpected role user after role tool" errors on providers like NVIDIA NIM.

bngfavored · 2026-01-10T08:24:22Z

@roomote The fix works for the first message but after the first response the text content is NOT merged into the last tool message.

roomote · 2026-01-10T08:26:12Z

Fixaroo See task on Roo Cloud

I investigated the reported issue and added multi-turn conversation tests to verify the mergeToolResultText behavior.

Findings: All 27 tests pass, including new tests that specifically verify text is merged into tool messages for ALL tool_result messages in a conversation (not just the first one). The convertToOpenAiMessages function works correctly for multi-turn scenarios.

If the issue persists, please verify:

You're using the "OpenAI Compatible" provider (not OpenRouter or other providers)
The "Strict tool message ordering" checkbox is enabled in settings
The provider type is set to "openai" (the setting is only available for this provider type)

_{View commit | Revert commit}

Add regression tests to verify that the mergeToolResultText option works correctly for ALL tool_result messages in a conversation, not just the first one. Tests added: - Multi-turn conversation with multiple tool calls - Verification that no user messages appear after tool messages when mergeToolResultText is enabled All 27 tests pass.

github-project-automation bot added this to Roo Code Roadmap and Roo Code Roadmap Jan 10, 2026

github-project-automation bot moved this to Triage in Roo Code Roadmap Jan 10, 2026

github-project-automation bot moved this to New in Roo Code Roadmap Jan 10, 2026

roomote bot mentioned this pull request Jan 10, 2026

[BUG] Code mode does not work with devstral2 123b 2512 (NVIDIA NIM provider) #10540

Open

hannesrudolph added the Issue/PR - Triage New issue. Needs quick review to confirm validity and assign labels. label Jan 10, 2026

roomote bot commented Jan 10, 2026

View reviewed changes

fix: remove duplicate translation keys in settings.json

c13260f

This was referenced Jan 12, 2026

[BUG] openrouter:mistralai/devstral-2512 -> "completion error" #10618

Open

fix: add mergeToolResultText for Mistral/Devstral models in OpenRouter #10630

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: add strict tool message ordering setting for OpenAI Compatible providers #10598

feat: add strict tool message ordering setting for OpenAI Compatible providers #10598

roomote bot commented Jan 10, 2026 •

edited by ellipsis-dev bot

Loading

Uh oh!

roomote bot commented Jan 10, 2026 •

edited

Loading

Uh oh!

roomote bot Jan 10, 2026

Uh oh!

bngfavored commented Jan 10, 2026

Uh oh!

roomote bot commented Jan 10, 2026 •

edited

Loading

Uh oh!

roomote bot commented Jan 10, 2026 •

edited

Loading

Uh oh!

bngfavored commented Jan 10, 2026

Uh oh!

roomote bot commented Jan 10, 2026 •

edited

Loading

Uh oh!

bngfavored commented Jan 10, 2026

Uh oh!

roomote bot commented Jan 10, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

feat: add strict tool message ordering setting for OpenAI Compatible providers #10598

Are you sure you want to change the base?

feat: add strict tool message ordering setting for OpenAI Compatible providers #10598

Conversation

roomote bot commented Jan 10, 2026 • edited by ellipsis-dev bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Related GitHub Issue

Description

Test Procedure

Pre-Submission Checklist

Documentation Updates

Additional Notes

Uh oh!

roomote bot commented Jan 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

roomote bot Jan 10, 2026

Choose a reason for hiding this comment

Uh oh!

bngfavored commented Jan 10, 2026

Uh oh!

roomote bot commented Jan 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

roomote bot commented Jan 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bngfavored commented Jan 10, 2026

Uh oh!

roomote bot commented Jan 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bngfavored commented Jan 10, 2026

Uh oh!

roomote bot commented Jan 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

roomote bot commented Jan 10, 2026 •

edited by ellipsis-dev bot

Loading

roomote bot commented Jan 10, 2026 •

edited

Loading

roomote bot commented Jan 10, 2026 •

edited

Loading

roomote bot commented Jan 10, 2026 •

edited

Loading

roomote bot commented Jan 10, 2026 •

edited

Loading

roomote bot commented Jan 10, 2026 •

edited

Loading