Skip to content

Commit 7b3bfca

Browse files
committed
Merge branch 'main' of github.com:NyxJae/Roo-Code into human-relay
2 parents 5d19c97 + c4d1d34 commit 7b3bfca

28 files changed

+1682
-2267
lines changed

CHANGELOG.md

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

3+
## [3.11.3] - 2025-03-31
4+
5+
- Revert mention changes in case they're causing performance issues/crashes
6+
7+
## [3.11.2] - 2025-03-31
8+
9+
- Fix bug in loading Requesty key balance
10+
- Fix bug with Bedrock inference profiles
11+
- Update the webview when changing settings via the API
12+
- Refactor webview messages code (thanks @diarmidmackenzie!)
13+
314
## [3.11.1] - 2025-03-30
415

516
- Relax provider profiles schema and add telemetry

package-lock.json

Lines changed: 4 additions & 3 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 whole dev team of AI agents in your editor.",
55
"publisher": "RooVeterinaryInc",
6-
"version": "3.11.1",
6+
"version": "3.11.3",
77
"icon": "assets/icons/icon.png",
88
"galleryBanner": {
99
"color": "#617A91",

src/api/providers/bedrock.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { logger } from "../../utils/logging"
3030
function validateBedrockArn(arn: string, region?: string) {
3131
// Validate ARN format
3232
const arnRegex =
33-
/^arn:aws:bedrock:([^:]+):(\d+):(foundation-model|provisioned-model|default-prompt-router|prompt-router|application-inference-profile)\/(.+)$/
33+
/^arn:aws:bedrock:([^:]+):(\d+):(foundation-model|provisioned-model|default-prompt-router|prompt-router|inference-profile|application-inference-profile)\/(.+)$/
3434
const match = arn.match(arnRegex)
3535

3636
if (!match) {

src/core/Cline.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2049,16 +2049,14 @@ export class Cline extends EventEmitter<ClineEvents> {
20492049
// 2. ToolResultBlockParam's content/context text arrays if it contains "<feedback>" (see formatToolDeniedFeedback, attemptCompletion, executeCommand, and consecutiveMistakeCount >= 3) or "<answer>" (see askFollowupQuestion), we place all user generated content in these tags so they can effectively be used as markers for when we should parse mentions)
20502050
Promise.all(
20512051
userContent.map(async (block) => {
2052-
const { osInfo } = (await this.providerRef.deref()?.getState()) || { osInfo: "unix" }
2053-
20542052
const shouldProcessMentions = (text: string) =>
20552053
text.includes("<task>") || text.includes("<feedback>")
20562054

20572055
if (block.type === "text") {
20582056
if (shouldProcessMentions(block.text)) {
20592057
return {
20602058
...block,
2061-
text: await parseMentions(block.text, this.cwd, this.urlContentFetcher, osInfo),
2059+
text: await parseMentions(block.text, this.cwd, this.urlContentFetcher),
20622060
}
20632061
}
20642062
return block
@@ -2067,12 +2065,7 @@ export class Cline extends EventEmitter<ClineEvents> {
20672065
if (shouldProcessMentions(block.content)) {
20682066
return {
20692067
...block,
2070-
content: await parseMentions(
2071-
block.content,
2072-
this.cwd,
2073-
this.urlContentFetcher,
2074-
osInfo,
2075-
),
2068+
content: await parseMentions(block.content, this.cwd, this.urlContentFetcher),
20762069
}
20772070
}
20782071
return block
@@ -2086,7 +2079,6 @@ export class Cline extends EventEmitter<ClineEvents> {
20862079
contentBlock.text,
20872080
this.cwd,
20882081
this.urlContentFetcher,
2089-
osInfo,
20902082
),
20912083
}
20922084
}

src/core/__tests__/Cline.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,6 @@ describe("Cline", () => {
941941
"<task>Text with @/some/path in task tags</task>",
942942
expect.any(String),
943943
expect.any(Object),
944-
expect.any(String),
945944
)
946945

947946
// Feedback tag content should be processed
@@ -952,7 +951,6 @@ describe("Cline", () => {
952951
"<feedback>Check @/some/path</feedback>",
953952
expect.any(String),
954953
expect.any(Object),
955-
expect.any(String),
956954
)
957955

958956
// Regular tool result should not be processed

0 commit comments

Comments
 (0)