Skip to content

Commit e0dfa43

Browse files
committed
Merge branch 'main' into seed
2 parents f97c3ff + 27cf18c commit e0dfa43

File tree

269 files changed

+15150
-13558
lines changed

Some content is hidden

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

269 files changed

+15150
-13558
lines changed

.changeset/brave-pigs-judge.md

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

.changeset/dark-swans-marry.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+
Add a 'when to use' section to mode definitions

.changeset/lovely-moles-end.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+
Switch to the new Roo message parser

.changeset/twelve-ants-scream.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+
Requesty: Fix token usage counts

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@ body:
55
- type: markdown
66
attributes:
77
value: |
8-
**Thank you for taking the time to fill out this bug report!**
8+
**Thanks for your report!** Please check existing issues first:
9+
👉 https://github.com/RooVetGit/Roo-Code/issues
910
10-
Please ensure this bug hasn't been reported already by searching existing [GitHub Issues](https://github.com/RooVetGit/Roo-Code/issues).
1111
- type: input
1212
id: version
1313
attributes:
1414
label: App Version
15-
description: Specify exactly which version you're using (e.g., v3.3.1)
15+
description: What version of Roo Code are you using? (e.g., v3.3.1)
1616
validations:
1717
required: true
1818

1919
- type: dropdown
2020
id: provider
2121
attributes:
2222
label: API Provider
23-
description: Choose the API provider involved
24-
multiple: false
2523
options:
2624
- Anthropic
2725
- AWS Bedrock
2826
- Chutes AI
2927
- DeepSeek
3028
- Glama
3129
- Google Gemini
30+
- Google Vertex AI
3231
- Groq
3332
- Human Relay Provider
33+
- LiteLLM
3434
- LM Studio
3535
- Mistral AI
3636
- Ollama
@@ -49,44 +49,38 @@ body:
4949
id: model
5050
attributes:
5151
label: Model Used
52-
description: Clearly specify the exact model (e.g., Claude 3.7 Sonnet). If not applicable, enter N/A.
53-
validations:
54-
required: true
55-
56-
- type: textarea
57-
id: what-happened
58-
attributes:
59-
label: Actual vs. Expected Behavior
60-
description: Clearly state what actually happened and what you expected instead.
61-
placeholder: Provide precise details of the issue here.
52+
description: Exact model name (e.g., Claude 3.7 Sonnet). Use N/A if irrelevant.
6253
validations:
6354
required: true
6455

6556
- type: textarea
6657
id: steps
6758
attributes:
68-
label: Detailed Steps to Reproduce
59+
label: 🔁 Steps to Reproduce
6960
description: |
70-
List the exact steps someone must follow to reproduce this bug:
71-
1. Starting conditions (software state, settings, environment)
72-
2. Precise actions taken (every click, selection, input)
73-
3. Clearly observe and report outcomes
74-
value: |
75-
1.
76-
2.
77-
3.
61+
Help us see what you saw. Give clear, numbered steps:
62+
63+
1. Setup (OS, extension version, settings)
64+
2. Exact actions (clicks, input, files, commands)
65+
3. What happened after each step
66+
67+
Think like you're writing a recipe. Without this, we can't reproduce the issue.
7868
validations:
7969
required: true
8070

8171
- type: textarea
82-
id: logs
72+
id: what-happened
8373
attributes:
84-
label: Relevant API Request Output or Error Logs
85-
description: Paste relevant API logs, console outputs, or error messages here (formatted automatically as code).
86-
render: shell
74+
label: 💥 Outcome Summary (Optional)
75+
description: |
76+
Recap what went wrong in one or two lines. Use this if the bug is weird, unexpected, or needs extra context.
77+
78+
Example: "Expected code to run, but got an empty response and no error."
79+
placeholder: Expected ___, but got ___.
8780

8881
- type: textarea
89-
id: additional-context
82+
id: logs
9083
attributes:
91-
label: Additional Context
92-
description: Include extra details, screenshots, or related issues.
84+
label: 📄 Relevant Logs or Errors
85+
description: Paste API logs, terminal output, or errors here. Use triple backticks (```) for code formatting.
86+
render: shell

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Thank you for contributing to Roo Code!
33
44
Before submitting your PR, please ensure:
55
- It's linked to an approved GitHub Issue.
6-
- You've reviewed our [Contributing Guidelines](../../CONTRIBUTING.md).
6+
- You've reviewed our [Contributing Guidelines](../CONTRIBUTING.md).
77
-->
88

99
### Related GitHub Issue
@@ -61,7 +61,7 @@ Detail the steps to test your changes. This helps reviewers verify your work.
6161
- [ ] **Branch Hygiene**: My branch is up-to-date (rebased) with the `main` branch.
6262
- [ ] **Documentation Impact**: I have considered if my changes require documentation updates (see "Documentation Updates" section below).
6363
- [ ] **Changeset**: A changeset has been created using `npm run changeset` if this PR includes user-facing changes or dependency updates.
64-
- [ ] **Contribution Guidelines**: I have read and agree to the [Contributor Guidelines](../../CONTRIBUTING.md).
64+
- [ ] **Contribution Guidelines**: I have read and agree to the [Contributor Guidelines](../CONTRIBUTING.md).
6565

6666
### Screenshots / Videos
6767

.github/workflows/update-contributors.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
pull-requests: write # Needed for creating PRs
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818

1919
- name: Setup Node.js
20-
uses: actions/setup-node@v3
20+
uses: actions/setup-node@v4
2121
with:
2222
node-version: '18'
2323
cache: 'npm'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ out
44
out-*
55
node_modules
66
coverage/
7+
mock/
78

89
.DS_Store
910

.roo/rules/rules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616

1717
# Adding a New Setting
1818

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

.vscode/tasks.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,17 @@
4141
"type": "npm",
4242
"script": "watch:esbuild",
4343
"group": "build",
44-
"problemMatcher": "$esbuild-watch",
44+
"problemMatcher": {
45+
"owner": "esbuild",
46+
"pattern": {
47+
"regexp": "^$"
48+
},
49+
"background": {
50+
"activeOnStart": true,
51+
"beginsPattern": "\\[watch\\] build started",
52+
"endsPattern": "\\[watch\\] build finished"
53+
}
54+
},
4555
"isBackground": true,
4656
"presentation": {
4757
"group": "watch",

0 commit comments

Comments
 (0)