Skip to content

Commit b8e519c

Browse files
committed
Merge branch 'main' into cte/deep-research
2 parents d6769d1 + 998beee commit b8e519c

File tree

27 files changed

+1005
-470
lines changed

27 files changed

+1005
-470
lines changed

.changeset/clever-news-arrive.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+
Disable writing in ask mode

.changeset/orange-geese-provide.md

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

.clinerules

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
- Logs can be found in `logs\app.log`
1717
- Logfile is overwritten on each run to keep it to a manageable volume.
1818

19+
4. Styling Guidelines:
20+
- Use Tailwind CSS classes instead of inline style objects for new markup
21+
- VSCode CSS variables must be added to webview-ui/src/index.css before using them in Tailwind classes
22+
- Example: `<div className="text-md text-vscode-descriptionForeground mb-2" />` instead of style objects
23+
1924

2025
# Adding a New Setting
2126

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.19]
4+
5+
- Fix a bug where aborting in the middle of file writes would not revert the write
6+
- Honor the VS Code theme for dialog backgrounds
7+
- Make it possible to clear out the default custom instructions for built-in modes
8+
- Add a help button that links to our new documentation site (which we would love help from the community to improve!)
9+
- Switch checkpoints logic to use a shadow git repository to work around issues with hot reloads and polluting existing repositories (thanks Cline for the inspiration!)
10+
311
## [3.3.18]
412

513
- Add a per-API-configuration model temperature setting (thanks @joemanley201!)

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: 13 additions & 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.18",
6+
"version": "3.3.19",
77
"icon": "assets/icons/rocket.png",
88
"galleryBanner": {
99
"color": "#617A91",
@@ -104,6 +104,11 @@
104104
"title": "Settings",
105105
"icon": "$(settings-gear)"
106106
},
107+
{
108+
"command": "roo-cline.helpButtonClicked",
109+
"title": "Documentation",
110+
"icon": "$(question)"
111+
},
107112
{
108113
"command": "roo-cline.openInNewTab",
109114
"title": "Open In New Tab",
@@ -235,6 +240,11 @@
235240
"command": "roo-cline.settingsButtonClicked",
236241
"group": "navigation@7",
237242
"when": "view == roo-cline.SidebarProvider"
243+
},
244+
{
245+
"command": "roo-cline.helpButtonClicked",
246+
"group": "navigation@8",
247+
"when": "view == roo-cline.SidebarProvider"
238248
}
239249
]
240250
},
@@ -282,7 +292,9 @@
282292
"compile:integration": "tsc -p tsconfig.integration.json",
283293
"install:all": "npm install && cd webview-ui && npm install",
284294
"lint": "eslint src --ext ts && npm run lint --prefix webview-ui",
295+
"lint-local": "eslint -c .eslintrc.local.json src --ext ts && npm run lint --prefix webview-ui",
285296
"lint-fix": "eslint src --ext ts --fix && npm run lint-fix --prefix webview-ui",
297+
"lint-fix-local": "eslint -c .eslintrc.local.json src --ext ts --fix && npm run lint-fix --prefix webview-ui",
286298
"package": "npm run build:webview && npm run check-types && npm run lint && node esbuild.js --production",
287299
"pretest": "npm run compile && npm run compile:integration",
288300
"dev": "cd webview-ui && npm run dev",

src/activate/registerCommands.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ const getCommandsMap = ({ context, outputChannel, provider }: RegisterCommandOpt
3939
"roo-cline.settingsButtonClicked": () => {
4040
provider.postMessageToWebview({ type: "action", action: "settingsButtonClicked" })
4141
},
42+
"roo-cline.helpButtonClicked": () => {
43+
vscode.env.openExternal(vscode.Uri.parse("https://docs.roocode.com"))
44+
},
4245
"roo-cline.openInNewTab": () => openClineInNewTab({ context, outputChannel }),
4346
})
4447

src/core/Cline.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3112,11 +3112,14 @@ export class Cline {
31123112
}
31133113

31143114
details += "\n\n# VSCode Open Tabs"
3115+
const { maxOpenTabsContext } = (await this.providerRef.deref()?.getState()) ?? {}
3116+
const maxTabs = maxOpenTabsContext ?? 20
31153117
const openTabs = vscode.window.tabGroups.all
31163118
.flatMap((group) => group.tabs)
31173119
.map((tab) => (tab.input as vscode.TabInputText)?.uri?.fsPath)
31183120
.filter(Boolean)
31193121
.map((absolutePath) => path.relative(cwd, absolutePath).toPosix())
3122+
.slice(0, maxTabs)
31203123
.join("\n")
31213124
if (openTabs) {
31223125
details += `\n${openTabs}`

src/core/__tests__/Cline.test.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ describe("Cline", () => {
475475
// Mock abort state
476476
Object.defineProperty(cline, "abort", {
477477
get: () => false,
478+
set: () => {},
478479
configurable: true,
479480
})
480481

@@ -603,10 +604,12 @@ describe("Cline", () => {
603604
// Mock abort state for both instances
604605
Object.defineProperty(clineWithImages, "abort", {
605606
get: () => false,
607+
set: () => {},
606608
configurable: true,
607609
})
608610
Object.defineProperty(clineWithoutImages, "abort", {
609611
get: () => false,
612+
set: () => {},
610613
configurable: true,
611614
})
612615

0 commit comments

Comments
 (0)