Skip to content

Commit 38e60a4

Browse files
authored
Merge branch 'RooCodeInc:main' into feature/condensing-enhancements
2 parents 16bd72a + 45e2263 commit 38e60a4

Some content is hidden

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

52 files changed

+871
-559
lines changed

.changeset/cold-donuts-clean.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 changelog generation

.changeset/quick-years-grow.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 changeset npm script

.changeset/soft-apples-hear.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+
v3.18.1 again

.changeset/v3.18.1.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"roo-cline": patch
3+
---
4+
5+
- Add support for Claude Sonnet 4 and Claude Opus 4 models with thinking variants (thanks @shariqriazz!)
6+
- Fix README gif display in all localized versions
7+
- Switch codebase to a monorepo and create an automated "nightly" build
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
"""
2+
This script updates a specific version's release notes section in CHANGELOG.md with new content
3+
or reformats existing content.
4+
5+
The script:
6+
1. Takes a version number, changelog path, and optionally new content as input from environment variables
7+
2. Finds the section in the changelog for the specified version
8+
3. Either:
9+
a) Replaces the content with new content if provided, or
10+
b) Reformats existing content by:
11+
- Removing the first two lines of the changeset format
12+
- Ensuring version numbers are wrapped in square brackets
13+
4. Writes the updated changelog back to the file
14+
15+
Environment Variables:
16+
CHANGELOG_PATH: Path to the changelog file (defaults to 'CHANGELOG.md')
17+
VERSION: The version number to update/format
18+
PREV_VERSION: The previous version number (used to locate section boundaries)
19+
NEW_CONTENT: Optional new content to insert for this version
20+
"""
21+
22+
#!/usr/bin/env python3
23+
24+
import os
25+
26+
CHANGELOG_PATH = os.environ.get("CHANGELOG_PATH", "CHANGELOG.md")
27+
VERSION = os.environ["VERSION"]
28+
PREV_VERSION = os.environ.get("PREV_VERSION", "")
29+
NEW_CONTENT = os.environ.get("NEW_CONTENT", "")
30+
31+
32+
def overwrite_changelog_section(changelog_text: str, new_content: str):
33+
# Find the section for the specified version
34+
version_pattern = f"## {VERSION}\n"
35+
prev_version_pattern = f"## [{PREV_VERSION}]\n"
36+
print(f"latest version: {VERSION}")
37+
print(f"prev_version: {PREV_VERSION}")
38+
39+
notes_start_index = changelog_text.find(version_pattern) + len(version_pattern)
40+
notes_end_index = (
41+
changelog_text.find(prev_version_pattern, notes_start_index)
42+
if PREV_VERSION and prev_version_pattern in changelog_text
43+
else len(changelog_text)
44+
)
45+
46+
if new_content:
47+
return (
48+
changelog_text[:notes_start_index]
49+
+ f"{new_content}\n"
50+
+ changelog_text[notes_end_index:]
51+
)
52+
else:
53+
changeset_lines = changelog_text[notes_start_index:notes_end_index].split("\n")
54+
# Remove the first two lines from the regular changeset format, ex: \n### Patch Changes
55+
parsed_lines = "\n".join(changeset_lines[2:])
56+
updated_changelog = (
57+
changelog_text[:notes_start_index]
58+
+ parsed_lines
59+
+ changelog_text[notes_end_index:]
60+
)
61+
updated_changelog = updated_changelog.replace(
62+
f"## {VERSION}", f"## [{VERSION}]"
63+
)
64+
return updated_changelog
65+
66+
67+
with open(CHANGELOG_PATH, "r") as f:
68+
changelog_content = f.read()
69+
70+
new_changelog = overwrite_changelog_section(changelog_content, NEW_CONTENT)
71+
print(
72+
"----------------------------------------------------------------------------------"
73+
)
74+
print(new_changelog)
75+
print(
76+
"----------------------------------------------------------------------------------"
77+
)
78+
# Write back to CHANGELOG.md
79+
with open(CHANGELOG_PATH, "w") as f:
80+
f.write(new_changelog)
81+
82+
print(f"{CHANGELOG_PATH} updated successfully!")

.github/workflows/changeset-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
with:
6161
commit: "changeset version bump"
6262
title: "Changeset version bump"
63-
version: pnpm --filter roo-cline version-packages # This performs the changeset version bump
63+
version: pnpm changeset:version # This performs the changeset version bump
6464
env:
6565
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6666

.github/workflows/code-qa.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ jobs:
159159
- name: Install dependencies
160160
run: pnpm install
161161
- name: Create .env.local file
162-
working-directory: e2e
162+
working-directory: apps/vscode-e2e
163163
run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.local
164164
- name: Run integration tests
165-
working-directory: e2e
165+
working-directory: apps/vscode-e2e
166166
run: xvfb-run -a pnpm test:ci

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,7 @@ Join us at https://www.reddit.com/r/RooCode to share your custom modes and be pa
11161116

11171117
## [2.2.16]
11181118

1119-
- Incorporate Premshay's [PR](https://github.com/RooCodeInc/Roo-Cline/pull/60) to add support for Amazon Nova and Meta Llama Models via Bedrock (3, 3.1, 3.2) and unified Bedrock calls using BedrockClient and Bedrock Runtime API
1119+
- Incorporate Premshay's [PR](https://github.com/RooCodeInc/Roo-Code/pull/60) to add support for Amazon Nova and Meta Llama Models via Bedrock (3, 3.1, 3.2) and unified Bedrock calls using BedrockClient and Bedrock Runtime API
11201120

11211121
## [2.2.14 - 2.2.15]
11221122

@@ -1188,7 +1188,7 @@ Join us at https://www.reddit.com/r/RooCode to share your custom modes and be pa
11881188

11891189
## [2.1.15]
11901190

1191-
- Incorporate dbasclpy's [PR](https://github.com/RooCodeInc/Roo-Cline/pull/54) to add support for gemini-exp-1206
1191+
- Incorporate dbasclpy's [PR](https://github.com/RooCodeInc/Roo-Code/pull/54) to add support for gemini-exp-1206
11921192
- Make it clear that diff editing is very experimental
11931193

11941194
## [2.1.14]
@@ -1198,15 +1198,15 @@ Join us at https://www.reddit.com/r/RooCode to share your custom modes and be pa
11981198

11991199
## [2.1.13]
12001200

1201-
- Fix https://github.com/RooCodeInc/Roo-Cline/issues/50 where sound effects were not respecting settings
1201+
- Fix https://github.com/RooCodeInc/Roo-Code/issues/50 where sound effects were not respecting settings
12021202

12031203
## [2.1.12]
12041204

12051205
- Incorporate JoziGila's [PR](https://github.com/cline/cline/pull/158) to add support for editing through diffs
12061206

12071207
## [2.1.11]
12081208

1209-
- Incorporate lloydchang's [PR](https://github.com/RooCodeInc/Roo-Cline/pull/42) to add support for OpenRouter compression
1209+
- Incorporate lloydchang's [PR](https://github.com/RooCodeInc/Roo-Code/pull/42) to add support for OpenRouter compression
12101210

12111211
## [2.1.10]
12121212

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ English • [Català](locales/ca/README.md) • [Deutsch](locales/de/README.md)
1414
<div align="center">
1515
<h1>Roo Code (prev. Roo Cline)</h1>
1616
<p align="center">
17-
<img src="https://media.githubusercontent.com/media/RooCodeInc/Roo-Code/main/assets/docs/demo.gif" width="100%" />
17+
<img src="https://media.githubusercontent.com/media/RooCodeInc/Roo-Code/main/src/assets/docs/demo.gif" width="100%" />
1818
</p>
1919
<p>Connect with developers, contribute ideas, and stay ahead with the latest AI-powered coding tools.</p>
2020

File renamed without changes.

0 commit comments

Comments
 (0)