Skip to content

Commit 1ad74a4

Browse files
authored
Merge branch 'RooCodeInc:main' into main
2 parents c5d2bf4 + 72d06f5 commit 1ad74a4

File tree

6 files changed

+231
-37
lines changed

6 files changed

+231
-37
lines changed

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ body:
77
value: |
88
**Thank you for proposing a detailed feature for Roo Code!**
99
10-
This template is for submitting specific, actionable proposals that you or others intend to implement after discussion and approval. It's a key part of our [Issue-First Approach](../../CONTRIBUTING.md).
10+
This template is for submitting specific, actionable proposals that you or others intend to implement after discussion and approval. It's a key part of our [Issue-First Approach](https://github.com/RooCodeInc/Roo-Code/blob/main/CONTRIBUTING.md).
1111
1212
- **For general ideas or less defined suggestions**, please use [GitHub Discussions](https://github.com/RooCodeInc/Roo-Code/discussions/categories/feature-requests?discussions_q=is%3Aopen+category%3A%22Feature+Requests%22+sort%3Atop) first.
1313
- **Before submitting**, please search existing [GitHub Issues](https://github.com/RooCodeInc/Roo-Code/issues) and [Discussions](https://github.com/RooCodeInc/Roo-Code/discussions) to avoid duplicates.

evals/pnpm-lock.yaml

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-lock.yaml

Lines changed: 30 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

renovate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": ["config:recommended"]
3+
"extends": ["config:recommended"],
4+
"forkProcessing": "enabled"
45
}

webview-ui/src/components/settings/ConcurrentFileReadsExperiment.tsx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,16 @@ export const ConcurrentFileReadsExperiment = ({
1818
const { t } = useAppTranslation()
1919

2020
const handleChange = (value: boolean) => {
21-
// Set to 1 if disabling to reset the setting
22-
if (!value) onMaxConcurrentFileReadsChange(1)
2321
onEnabledChange(value)
22+
// Set to 1 if disabling to reset the setting
23+
if (!value) {
24+
onMaxConcurrentFileReadsChange(1)
25+
} else {
26+
// When enabling, ensure we have a valid value > 1
27+
if (!maxConcurrentFileReads || maxConcurrentFileReads <= 1) {
28+
onMaxConcurrentFileReadsChange(15)
29+
}
30+
}
2431
}
2532

2633
return (
@@ -48,15 +55,11 @@ export const ConcurrentFileReadsExperiment = ({
4855
min={2}
4956
max={100}
5057
step={1}
51-
value={[
52-
maxConcurrentFileReads && maxConcurrentFileReads > 1 ? maxConcurrentFileReads : 15,
53-
]}
58+
value={[Math.max(2, maxConcurrentFileReads)]}
5459
onValueChange={([value]) => onMaxConcurrentFileReadsChange(value)}
5560
data-testid="max-concurrent-file-reads-slider"
5661
/>
57-
<span className="w-10 text-sm">
58-
{maxConcurrentFileReads && maxConcurrentFileReads > 1 ? maxConcurrentFileReads : 15}
59-
</span>
62+
<span className="w-10 text-sm">{Math.max(2, maxConcurrentFileReads)}</span>
6063
</div>
6164
</div>
6265
</div>

0 commit comments

Comments
 (0)