Skip to content

Commit de366cb

Browse files
authored
Merge branch 'main' into context-management
2 parents d9a1ef6 + 8b072ad commit de366cb

File tree

81 files changed

+2871
-2263
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+2871
-2263
lines changed

.changeset/curly-frogs-pull.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+
Use gemini provider when using Gemini on vertex ai

.changeset/five-pumpkins-carry.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+
Overhaul CodeBlock rendering

.changeset/odd-ligers-press.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"roo-cline": minor
3+
---
4+
5+
Add Reasoning Effort setting for OpenAI Compatible provider

e2e/src/suite/subtasks.test.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,17 @@ suite("Roo Code Subtasks", () => {
1717
}
1818
})
1919

20-
await api.setConfiguration({
21-
mode: "ask",
22-
alwaysAllowModeSwitch: true,
23-
alwaysAllowSubtasks: true,
24-
autoApprovalEnabled: true,
25-
enableCheckpoints: false,
26-
})
27-
2820
const childPrompt = "You are a calculator. Respond only with numbers. What is the square root of 9?"
2921

3022
// Start a parent task that will create a subtask.
3123
const parentTaskId = await api.startNewTask({
24+
configuration: {
25+
mode: "ask",
26+
alwaysAllowModeSwitch: true,
27+
alwaysAllowSubtasks: true,
28+
autoApprovalEnabled: true,
29+
enableCheckpoints: false,
30+
},
3231
text:
3332
"You are the parent task. " +
3433
`Create a subtask by using the new_task tool with the message '${childPrompt}'.` +

evals/packages/types/src/roo-code.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,6 @@ export const clineAsks = [
706706
"mistake_limit_reached",
707707
"browser_action_launch",
708708
"use_mcp_server",
709-
"finishTask",
710709
] as const
711710

712711
export const clineAskSchema = z.enum(clineAsks)
@@ -716,7 +715,6 @@ export type ClineAsk = z.infer<typeof clineAskSchema>
716715
// ClineSay
717716

718717
export const clineSays = [
719-
"task",
720718
"error",
721719
"api_req_started",
722720
"api_req_finished",
@@ -729,15 +727,12 @@ export const clineSays = [
729727
"user_feedback",
730728
"user_feedback_diff",
731729
"command_output",
732-
"tool",
733730
"shell_integration_warning",
734731
"browser_action",
735732
"browser_action_result",
736-
"command",
737733
"mcp_server_request_started",
738734
"mcp_server_response",
739-
"new_task_started",
740-
"new_task",
735+
"subtask_result",
741736
"checkpoint_saved",
742737
"rooignore_error",
743738
"diff_error",

package-lock.json

Lines changed: 11 additions & 13 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
@@ -404,7 +404,6 @@
404404
"@anthropic-ai/sdk": "^0.37.0",
405405
"@anthropic-ai/vertex-sdk": "^0.7.0",
406406
"@aws-sdk/client-bedrock-runtime": "^3.779.0",
407-
"@google-cloud/vertexai": "^1.9.3",
408407
"@google/genai": "^0.9.0",
409408
"@mistralai/mistralai": "^1.3.6",
410409
"@modelcontextprotocol/sdk": "^1.7.0",
@@ -469,6 +468,7 @@
469468
"@types/jest": "^29.5.14",
470469
"@types/mocha": "^10.0.10",
471470
"@types/node": "20.x",
471+
"@types/node-cache": "^4.1.3",
472472
"@types/node-ipc": "^9.2.3",
473473
"@types/string-similarity": "^4.0.2",
474474
"@typescript-eslint/eslint-plugin": "^7.14.1",

src/api/index.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { AnthropicHandler } from "./providers/anthropic"
88
import { AwsBedrockHandler } from "./providers/bedrock"
99
import { OpenRouterHandler } from "./providers/openrouter"
1010
import { VertexHandler } from "./providers/vertex"
11+
import { AnthropicVertexHandler } from "./providers/anthropic-vertex"
1112
import { OpenAiHandler } from "./providers/openai"
1213
import { OllamaHandler } from "./providers/ollama"
1314
import { LmStudioHandler } from "./providers/lmstudio"
@@ -45,6 +46,7 @@ export interface ApiHandler {
4546

4647
export function buildApiHandler(configuration: ApiConfiguration): ApiHandler {
4748
const { apiProvider, ...options } = configuration
49+
4850
switch (apiProvider) {
4951
case "anthropic":
5052
return new AnthropicHandler(options)
@@ -55,7 +57,11 @@ export function buildApiHandler(configuration: ApiConfiguration): ApiHandler {
5557
case "bedrock":
5658
return new AwsBedrockHandler(options)
5759
case "vertex":
58-
return new VertexHandler(options)
60+
if (options.apiModelId?.startsWith("claude")) {
61+
return new AnthropicVertexHandler(options)
62+
} else {
63+
return new VertexHandler(options)
64+
}
5965
case "openai":
6066
return new OpenAiHandler(options)
6167
case "ollama":

0 commit comments

Comments
 (0)