Skip to content

Commit 2ccab14

Browse files
committed
Merge remote-tracking branch 'origin/main' into temperature_control
2 parents f8f5714 + d8274ac commit 2ccab14

Some content is hidden

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

46 files changed

+3266
-178
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.

.clinerules

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@
1010
- Prefer fixing the underlying issue over disabling the lint rule
1111
- Document any approved lint rule disabling with a comment explaining the reason
1212

13+
3. Logging Guidelines:
14+
- Always instrument code changes using the logger exported from `src\utils\logging\index.ts`.
15+
- This will facilitate efficient debugging without impacting production (as the logger no-ops outside of a test environment.)
16+
- Logs can be found in `logs\app.log`
17+
- Logfile is overwritten on each run to keep it to a manageable volume.
18+
19+
1320
# Adding a New Setting
1421

15-
To add a new setting that persists its state, follow the steps in cline_docs/settings.md
22+
To add a new setting that persists its state, follow the steps in cline_docs/settings.md

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,9 @@ docs/_site/
2222

2323
# Dotenv
2424
.env.integration
25+
26+
#Local lint config
27+
.eslintrc.local.json
28+
29+
#Logging
30+
logs

CHANGELOG.md

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

3+
## [3.3.17]
4+
5+
- Fix the restore checkpoint popover
6+
- Unset git config that was previously set incorrectly by the checkpoints feature
7+
8+
## [3.3.16]
9+
10+
- Support Volcano Ark platform through the OpenAI-compatible provider
11+
- Fix jumpiness while entering API config by updating on blur instead of input
12+
- Add tooltips on checkpoint actions and fix an issue where checkpoints were overwriting existing git name/email settings - thanks for the feedback!
13+
14+
## [3.3.15]
15+
16+
- Improvements to MCP initialization and server restarts (thanks @MuriloFP and @hannesrudolph!)
17+
- Add a copy button to the recent tasks (thanks @hannesrudolph!)
18+
- Improve the user experience for adding a new API profile
19+
- Another significant fix to API profile switching on the settings screen
20+
- Opt-in experimental version of checkpoints in the advanced settings
21+
322
## [3.3.14]
423

524
- 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: 145 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 2 deletions
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.17",
77
"icon": "assets/icons/rocket.png",
88
"galleryBanner": {
99
"color": "#617A91",
@@ -272,6 +272,7 @@
272272
"compile:integration": "tsc -p tsconfig.integration.json",
273273
"install:all": "npm install && cd webview-ui && npm install",
274274
"lint": "eslint src --ext ts && npm run lint --prefix webview-ui",
275+
"lint-fix": "eslint src --ext ts --fix && npm run lint-fix --prefix webview-ui",
275276
"package": "npm run build:webview && npm run check-types && npm run lint && node esbuild.js --production",
276277
"pretest": "npm run compile && npm run compile:integration",
277278
"dev": "cd webview-ui && npm run dev",
@@ -283,7 +284,7 @@
283284
"publish": "npm run build && changeset publish && npm install --package-lock-only",
284285
"version-packages": "changeset version && npm install --package-lock-only",
285286
"vscode:prepublish": "npm run package",
286-
"vsix": "mkdir -p bin && npx vsce package --out bin",
287+
"vsix": "rimraf bin && mkdirp bin && npx vsce package --out bin",
287288
"watch": "npm-run-all -p watch:*",
288289
"watch:esbuild": "node esbuild.js --watch",
289290
"watch:tsc": "tsc --noEmit --watch --project tsconfig.json",
@@ -350,6 +351,8 @@
350351
"@vscode/test-cli": "^0.0.9",
351352
"@vscode/test-electron": "^2.4.0",
352353
"esbuild": "^0.24.0",
354+
"mkdirp": "^3.0.1",
355+
"rimraf": "^6.0.1",
353356
"eslint": "^8.57.0",
354357
"husky": "^9.1.7",
355358
"jest": "^29.7.0",

src/api/providers/__tests__/unbound.test.ts

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,15 @@ describe("UnboundHandler", () => {
7373
mockOptions = {
7474
apiModelId: "anthropic/claude-3-5-sonnet-20241022",
7575
unboundApiKey: "test-api-key",
76+
unboundModelId: "anthropic/claude-3-5-sonnet-20241022",
77+
unboundModelInfo: {
78+
description: "Anthropic's Claude 3 Sonnet model",
79+
maxTokens: 8192,
80+
contextWindow: 200000,
81+
supportsPromptCache: true,
82+
inputPrice: 0.01,
83+
outputPrice: 0.02,
84+
},
7685
}
7786
handler = new UnboundHandler(mockOptions)
7887
mockCreate.mockClear()
@@ -205,6 +214,15 @@ describe("UnboundHandler", () => {
205214
const nonAnthropicOptions = {
206215
apiModelId: "openai/gpt-4o",
207216
unboundApiKey: "test-key",
217+
unboundModelId: "openai/gpt-4o",
218+
unboundModelInfo: {
219+
description: "OpenAI's GPT-4",
220+
maxTokens: undefined,
221+
contextWindow: 128000,
222+
supportsPromptCache: true,
223+
inputPrice: 0.01,
224+
outputPrice: 0.03,
225+
},
208226
}
209227
const nonAnthropicHandler = new UnboundHandler(nonAnthropicOptions)
210228

@@ -230,10 +248,11 @@ describe("UnboundHandler", () => {
230248
it("should return default model when invalid model provided", () => {
231249
const handlerWithInvalidModel = new UnboundHandler({
232250
...mockOptions,
233-
apiModelId: "invalid/model",
251+
unboundModelId: "invalid/model",
252+
unboundModelInfo: undefined,
234253
})
235254
const modelInfo = handlerWithInvalidModel.getModel()
236-
expect(modelInfo.id).toBe("openai/gpt-4o") // Default model
255+
expect(modelInfo.id).toBe("anthropic/claude-3-5-sonnet-20241022") // Default model
237256
expect(modelInfo.info).toBeDefined()
238257
})
239258
})

0 commit comments

Comments
 (0)