Skip to content

Commit e38d9ec

Browse files
author
Roo Code
committed
Merge remote-tracking branch 'origin/main' into mrubens-patch-4
2 parents 7193313 + dc46334 commit e38d9ec

File tree

20 files changed

+576
-59
lines changed

20 files changed

+576
-59
lines changed

.changeset/cyan-insects-marry.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/dirty-coins-exist.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/red-badgers-matter.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/spicy-pugs-guess.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"roo-cline": patch
3+
---
4+
5+
Support Volcano Ark platform through OpenAI compatible

.changeset/stupid-masks-pay.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"roo-cline": patch
3+
---
4+
5+
Fix jumpiness while entering API config by updating on blur instead of input

.changeset/violet-rockets-fetch.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Roo Code Changelog
22

3+
## [3.3.15]
4+
5+
- Improvements to MCP initialization and server restarts (thanks @MuriloFP and @hannesrudolph!)
6+
- Add a copy button to the recent tasks (thanks @hannesrudolph!)
7+
- Improve the user experience for adding a new API profile
8+
- Another significant fix to API profile switching on the settings screen
9+
- Opt-in experimental version of checkpoints in the advanced settings
10+
311
## [3.3.14]
412

513
- Should have skipped floor 13 like an elevator. This fixes the broken 3.3.13 release by reverting some changes to the deployment scripts.

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "Roo Code (prev. Roo Cline)",
44
"description": "A VS Code plugin that enhances coding with AI-powered automation, multi-model support, and experimental features.",
55
"publisher": "RooVeterinaryInc",
6-
"version": "3.3.14",
6+
"version": "3.3.15",
77
"icon": "assets/icons/rocket.png",
88
"galleryBanner": {
99
"color": "#617A91",

src/api/providers/openai.ts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
import { ApiHandler, SingleCompletionHandler } from "../index"
1111
import { convertToOpenAiMessages } from "../transform/openai-format"
1212
import { convertToR1Format } from "../transform/r1-format"
13+
import { convertToSimpleMessages } from "../transform/simple-format"
1314
import { ApiStream } from "../transform/stream"
1415

1516
export class OpenAiHandler implements ApiHandler, SingleCompletionHandler {
@@ -46,21 +47,31 @@ export class OpenAiHandler implements ApiHandler, SingleCompletionHandler {
4647

4748
async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
4849
const modelInfo = this.getModel().info
50+
const modelUrl = this.options.openAiBaseUrl ?? ""
4951
const modelId = this.options.openAiModelId ?? ""
5052

5153
const deepseekReasoner = modelId.includes("deepseek-reasoner")
54+
const ark = modelUrl.includes(".volces.com")
5255

5356
if (this.options.openAiStreamingEnabled ?? true) {
5457
const systemMessage: OpenAI.Chat.ChatCompletionSystemMessageParam = {
5558
role: "system",
5659
content: systemPrompt,
5760
}
61+
62+
let convertedMessages
63+
if (deepseekReasoner) {
64+
convertedMessages = convertToR1Format([{ role: "user", content: systemPrompt }, ...messages])
65+
} else if (ark) {
66+
convertedMessages = [systemMessage, ...convertToSimpleMessages(messages)]
67+
} else {
68+
convertedMessages = [systemMessage, ...convertToOpenAiMessages(messages)]
69+
}
70+
5871
const requestOptions: OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming = {
5972
model: modelId,
6073
temperature: 0,
61-
messages: deepseekReasoner
62-
? convertToR1Format([{ role: "user", content: systemPrompt }, ...messages])
63-
: [systemMessage, ...convertToOpenAiMessages(messages)],
74+
messages: convertedMessages,
6475
stream: true as const,
6576
stream_options: { include_usage: true },
6677
}

0 commit comments

Comments
 (0)