Skip to content

Commit c03294e

Browse files
committed
Merge branch 'main' into ksze/neutralize-stderr-from-mcp-servers
2 parents 3bf6d11 + a649a53 commit c03294e

File tree

1,082 files changed

+140684
-38085
lines changed

Some content is hidden

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

1,082 files changed

+140684
-38085
lines changed

.changeset/five-pigs-talk.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+
Organize provider settings into separate components

.changeset/pretty-peaches-bake.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+
Split Cline.getEnvironmentDetails out into a standalone function

.clinerules

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

.env.sample

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
POSTHOG_API_KEY=key-goes-here

.eslintrc.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
}
1616
],
1717
"@typescript-eslint/semi": "off",
18+
"no-unused-vars": "off",
19+
"@typescript-eslint/no-unused-vars": ["error", { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" }],
1820
"eqeqeq": "warn",
1921
"no-throw-literal": "warn",
2022
"semi": "off"
2123
},
22-
"ignorePatterns": ["out", "dist", "**/*.d.ts"]
24+
"ignorePatterns": ["out", "dist", "**/*.d.ts", "!roo-code.d.ts"]
2325
}
Lines changed: 77 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,80 @@
11
name: Bug Report
2-
description: File a bug report
2+
description: Clearly report a bug with detailed repro steps
33
labels: ["bug"]
44
body:
5-
- type: input
6-
id: version
7-
attributes:
8-
label: Which version of the app are you using?
9-
description: Please specify the app version you're using (e.g. v3.3.1)
10-
validations:
11-
required: true
12-
- type: dropdown
13-
id: provider
14-
attributes:
15-
label: Which API Provider are you using?
16-
multiple: false
17-
options:
18-
- OpenRouter
19-
- Anthropic
20-
- Google Gemini
21-
- DeepSeek
22-
- OpenAI
23-
- OpenAI Compatible
24-
- GCP Vertex AI
25-
- AWS Bedrock
26-
- Glama
27-
- VS Code LM API
28-
- LM Studio
29-
- Ollama
30-
validations:
31-
required: true
32-
- type: input
33-
id: model
34-
attributes:
35-
label: Which Model are you using?
36-
description: Please specify the model you're using (e.g. Claude 3.7 Sonnet)
37-
validations:
38-
required: true
39-
- type: textarea
40-
id: what-happened
41-
attributes:
42-
label: What happened?
43-
description: Also tell us, what did you expect to happen?
44-
placeholder: Tell us what you see!
45-
validations:
46-
required: true
47-
- type: textarea
48-
id: steps
49-
attributes:
50-
label: Steps to reproduce
51-
description: How do you trigger this bug? Please walk us through it step by step.
52-
value: |
53-
1.
54-
2.
55-
3.
56-
validations:
57-
required: true
58-
- type: textarea
59-
id: logs
60-
attributes:
61-
label: Relevant API REQUEST output
62-
description: Please copy and paste any relevant output. This will be automatically formatted into code, so no need for backticks.
63-
render: shell
64-
- type: textarea
65-
id: additional-context
66-
attributes:
67-
label: Additional context
68-
description: Add any other context about the problem here, such as screenshots or related issues.
5+
- type: input
6+
id: version
7+
attributes:
8+
label: App Version
9+
description: Specify exactly which version you're using (e.g., v3.3.1)
10+
validations:
11+
required: true
12+
13+
- type: dropdown
14+
id: provider
15+
attributes:
16+
label: API Provider
17+
description: Choose the API provider involved
18+
multiple: false
19+
options:
20+
- OpenRouter
21+
- Anthropic
22+
- Google Gemini
23+
- DeepSeek
24+
- OpenAI
25+
- OpenAI Compatible
26+
- GCP Vertex AI
27+
- Amazon Bedrock
28+
- Requesty
29+
- Glama
30+
- VS Code LM API
31+
- LM Studio
32+
- Ollama
33+
validations:
34+
required: true
35+
36+
- type: input
37+
id: model
38+
attributes:
39+
label: Model Used
40+
description: Clearly specify the exact model (e.g., Claude 3.7 Sonnet)
41+
validations:
42+
required: true
43+
44+
- type: textarea
45+
id: what-happened
46+
attributes:
47+
label: Actual vs. Expected Behavior
48+
description: Clearly state what actually happened and what you expected instead.
49+
placeholder: Provide precise details of the issue here.
50+
validations:
51+
required: true
52+
53+
- type: textarea
54+
id: steps
55+
attributes:
56+
label: Detailed Steps to Reproduce
57+
description: |
58+
List the exact steps someone must follow to reproduce this bug:
59+
1. Starting conditions (software state, settings, environment)
60+
2. Precise actions taken (every click, selection, input)
61+
3. Clearly observe and report outcomes
62+
value: |
63+
1.
64+
2.
65+
3.
66+
validations:
67+
required: true
68+
69+
- type: textarea
70+
id: logs
71+
attributes:
72+
label: Relevant API Request Output
73+
description: Paste relevant API logs or outputs here (formatted automatically as code)
74+
render: shell
75+
76+
- type: textarea
77+
id: additional-context
78+
attributes:
79+
label: Additional Context
80+
description: Include extra details, screenshots, or related issues.

.github/workflows/changeset-release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
env:
1010
REPO_PATH: ${{ github.repository }}
1111
GIT_REF: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'main' }}
12+
NODE_VERSION: 20.18.1
1213

1314
jobs:
1415
# Job 1: Create version bump PR when changesets are merged to main
@@ -33,11 +34,11 @@ jobs:
3334
- name: Setup Node.js
3435
uses: actions/setup-node@v4
3536
with:
36-
node-version: 20
37+
node-version: ${{ env.NODE_VERSION }}
3738
cache: 'npm'
3839

3940
- name: Install Dependencies
40-
run: npm run install:ci
41+
run: npm run install:all
4142

4243
# Check if there are any new changesets to process
4344
- name: Check for changesets

.github/workflows/code-qa.yml

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
types: [opened, reopened, ready_for_review, synchronize]
99
branches: [main]
1010

11+
env:
12+
NODE_VERSION: 20.18.1
13+
1114
jobs:
1215
compile:
1316
runs-on: ubuntu-latest
@@ -17,17 +20,32 @@ jobs:
1720
- name: Setup Node.js
1821
uses: actions/setup-node@v4
1922
with:
20-
node-version: '18'
23+
node-version: ${{ env.NODE_VERSION }}
2124
cache: 'npm'
2225
- name: Install dependencies
23-
run: npm run install:ci
26+
run: npm run install:all
2427
- name: Compile
2528
run: npm run compile
2629
- name: Check types
2730
run: npm run check-types
2831
- name: Lint
2932
run: npm run lint
3033

34+
check-translations:
35+
runs-on: ubuntu-latest
36+
steps:
37+
- name: Checkout code
38+
uses: actions/checkout@v4
39+
- name: Setup Node.js
40+
uses: actions/setup-node@v4
41+
with:
42+
node-version: '18'
43+
cache: 'npm'
44+
- name: Install dependencies
45+
run: npm run install:all
46+
- name: Verify all translations are complete
47+
run: node scripts/find-missing-translations.js
48+
3149
knip:
3250
runs-on: ubuntu-latest
3351
steps:
@@ -39,27 +57,37 @@ jobs:
3957
node-version: '18'
4058
cache: 'npm'
4159
- name: Install dependencies
42-
run: npm run install:ci
60+
run: npm run install:all
4361
- name: Run knip checks
4462
run: npm run knip
4563

4664
test-extension:
47-
runs-on: ubuntu-latest
65+
runs-on: ${{ matrix.os }}
66+
strategy:
67+
matrix:
68+
os: [ubuntu-latest, windows-latest]
4869
steps:
4970
- name: Checkout code
5071
uses: actions/checkout@v4
5172
- name: Setup Node.js
5273
uses: actions/setup-node@v4
5374
with:
54-
node-version: '18'
75+
node-version: ${{ env.NODE_VERSION }}
5576
cache: 'npm'
5677
- name: Install dependencies
57-
run: npm run install:ci
58-
- name: Run unit tests
78+
run: npm run install:all
79+
- name: Compile (to build and copy WASM files)
80+
run: npm run compile
81+
- name: Run jest unit tests
5982
run: npx jest --silent
83+
- name: Run vitest unit tests
84+
run: npx vitest run --silent
6085

6186
test-webview:
62-
runs-on: ubuntu-latest
87+
runs-on: ${{ matrix.os }}
88+
strategy:
89+
matrix:
90+
os: [ubuntu-latest, windows-latest]
6391
steps:
6492
- name: Checkout code
6593
uses: actions/checkout@v4
@@ -69,7 +97,7 @@ jobs:
6997
node-version: '18'
7098
cache: 'npm'
7199
- name: Install dependencies
72-
run: npm run install:ci
100+
run: npm run install:all
73101
- name: Run unit tests
74102
working-directory: webview-ui
75103
run: npx jest --silent
@@ -106,13 +134,13 @@ jobs:
106134
- name: Setup Node.js
107135
uses: actions/setup-node@v4
108136
with:
109-
node-version: '18'
137+
node-version: ${{ env.NODE_VERSION }}
110138
cache: 'npm'
111139
- name: Install dependencies
112-
run: npm run install:ci
113-
- name: Create env.integration file
140+
run: npm run install:all
141+
- name: Create .env.local file
114142
working-directory: e2e
115-
run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.integration
143+
run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.local
116144
- name: Run integration tests
117145
working-directory: e2e
118146
run: xvfb-run -a npm run ci

0 commit comments

Comments
 (0)