-
- 
@@ -24,7 +26,6 @@ English • [Català](locales/ca/README.md) • [Deutsch](locales/de/README.md)
setSelectedTask(undefined)}>
-
-
-
)
}
diff --git a/evals/apps/web/src/app/runs/[id]/task-status.tsx b/evals/apps/web/src/app/runs/[id]/task-status.tsx
index 0c2ae4205d..2e0b28b419 100644
--- a/evals/apps/web/src/app/runs/[id]/task-status.tsx
+++ b/evals/apps/web/src/app/runs/[id]/task-status.tsx
@@ -4,16 +4,15 @@ import { type Task } from "@evals/db"
type TaskStatusProps = {
task: Task
+ running: boolean
}
-export const TaskStatus = ({ task }: TaskStatusProps) => {
+export const TaskStatus = ({ task, running }: TaskStatusProps) => {
return task.passed === false ? (
>(new Map())
@@ -68,6 +70,7 @@ export function NewRun() {
suite: "full",
exercises: [],
settings: undefined,
+ concurrency: CONCURRENCY_DEFAULT,
},
})
@@ -78,32 +81,30 @@ export function NewRun() {
formState: { isSubmitting },
} = form
- const [model, suite, settings] = watch(["model", "suite", "settings"])
+ const [model, suite, settings] = watch(["model", "suite", "settings", "concurrency"])
const onSubmit = useCallback(
- async ({ settings, ...data }: FormValues) => {
+ async (values: FormValues) => {
try {
- const openRouterModel = models.data?.find(({ id }) => id === data.model)
+ if (mode === "openrouter") {
+ const openRouterModel = models.data?.find(({ id }) => id === model)
- if (!openRouterModel) {
- throw new Error(`Model not found: ${data.model}`)
+ if (!openRouterModel) {
+ throw new Error("Model not found.")
+ }
+
+ const openRouterModelId = openRouterModel.id
+ const openRouterModelInfo = openRouterModel.modelInfo
+ values.settings = { ...(values.settings || {}), openRouterModelId, openRouterModelInfo }
}
- const { id } = await createRun({
- ...data,
- settings: {
- ...settings,
- openRouterModelId: openRouterModel.id,
- openRouterModelInfo: openRouterModel.modelInfo,
- },
- })
-
+ const { id } = await createRun(values)
router.push(`/runs/${id}`)
} catch (e) {
toast.error(e instanceof Error ? e.message : "An unknown error occurred.")
}
},
- [router, models.data],
+ [mode, model, models.data, router],
)
const onFilterModels = useCallback(
@@ -157,36 +158,59 @@ export function NewRun() {
.parse(JSON.parse(await file.text()))
const providerSettings = providerProfiles.apiConfigs[providerProfiles.currentApiConfigName] ?? {}
+ const {
+ apiProvider,
+ apiModelId,
+ openRouterModelId,
+ glamaModelId,
+ requestyModelId,
+ unboundModelId,
+ ollamaModelId,
+ lmStudioModelId,
+ openAiModelId,
+ } = providerSettings
- if (providerSettings.apiProvider === "openrouter" && providerSettings.openRouterModelId) {
- const {
- openRouterModelId,
- modelMaxTokens,
- modelMaxThinkingTokens,
- modelTemperature,
- includeMaxTokens,
- } = providerSettings
-
- const model = openRouterModelId
-
- const settings = {
- ...rooCodeDefaults,
- openRouterModelId,
- modelMaxTokens,
- modelMaxThinkingTokens,
- modelTemperature,
- includeMaxTokens,
- ...globalSettings,
- }
-
- setValue("model", model)
- setValue("settings", settings)
- } else {
- setValue("settings", globalSettings)
+ switch (apiProvider) {
+ case "anthropic":
+ case "bedrock":
+ case "deepseek":
+ case "gemini":
+ case "mistral":
+ case "openai-native":
+ case "vertex":
+ setValue("model", apiModelId ?? "")
+ break
+ case "openrouter":
+ setValue("model", openRouterModelId ?? "")
+ break
+ case "glama":
+ setValue("model", glamaModelId ?? "")
+ break
+ case "requesty":
+ setValue("model", requestyModelId ?? "")
+ break
+ case "unbound":
+ setValue("model", unboundModelId ?? "")
+ break
+ case "openai":
+ setValue("model", openAiModelId ?? "")
+ break
+ case "ollama":
+ setValue("model", ollamaModelId ?? "")
+ break
+ case "lmstudio":
+ setValue("model", lmStudioModelId ?? "")
+ break
+ default:
+ throw new Error(`Unsupported API provider: ${apiProvider}`)
}
+ setValue("settings", { ...rooCodeDefaults, ...providerSettings, ...globalSettings })
+ setMode("settings")
+
event.target.value = ""
} catch (e) {
+ console.error(e)
toast.error(e instanceof Error ? e.message : "An unknown error occurred.")
}
},
@@ -199,108 +223,96 @@ export function NewRun() {
Join the Roo Code Community
+Roo Code (prev. Roo Cline)
+
+ 
+
Connect with developers, contribute ideas, and stay ahead with the latest AI-powered coding tools.
@@ -24,7 +26,6 @@ English • [Català](locales/ca/README.md) • [Deutsch](locales/de/README.md)
-
@@ -48,15 +49,13 @@ Check out the [CHANGELOG](CHANGELOG.md) for detailed updates and fixes.
---
-## 🎉 Roo Code 3.11 Released
+## 🎉 Roo Code 3.12 Released
-Roo Code 3.11 brings significant performance improvements and new features!
+Roo Code 3.12 brings new features and improvements based on your feedback!
-- Fast Edits - Edits now apply way faster. Less waiting, more coding.
-- API Key Balances - View your OpenRouter and Requesty balances in settings.
-- Project-Level MCP Config - Now you can configure it per project/workspace.
-- Improved Gemini Support - Smarter retries, fixed escaping, added to Vertex provider.
-- Import/Export Settings - Easily back up or share your config across setups.
+- **Grok Support** - Added the xAI provider and Grok reasoning effort options on OpenRouter.
+- **Diff Editing Improvements** - Per-profile configuration and better string normalization for fewer errors.
+- **Checkpoint Enhancements** - Faster and more reliable checkpoints.
---
@@ -182,27 +181,29 @@ Thanks to all our contributors who have helped make Roo Code better!
-| 
mrubens |
saoudrizwan |
cte |
samhvw8 |
daniel-lxs |
a8trejo | -| :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -|
ColemanRoo |
stea9499 |
joemanley201 |
System233 |
hannesrudolph |
jquanton | -|
nissa-seru |
NyxJae |
MuriloFP |
punkpeye |
d-oit |
monotykamary | -|
Smartsheet-JB-Brown |
feifei325 |
vigneshsubbiah16 |
lloydchang |
KJ7LNW |
cannuri | -|
Szpadel |
wkordalski |
lupuletic |
qdaxb |
Premshay |
psv2522 | -|
olweraltuve |
diarmidmackenzie |
RaySinner |
aheizi |
afshawnlotfi |
pugazhendhi-m | -|
PeterDaveHello |
pdecat |
kyle-apex |
emshvac |
aitoroses |
dtrugman | -|
p12tic |
sammcj |
Lunchb0ne |
heyseth |
StevenTCramer |
upamune | -|
arthurauffray |
eonghk |
teddyOOXX |
vincentsong |
yongjer |
yt3trees | -|
anton-otee |
benzntech |
GitlyHallows |
gtaylor |
jcbdev |
Chenjiayuan195 | -|
mdp |
napter |
philfung |
kohii |
kinandan |
jwcraig | -|
shoopapa |
im47cn |
dqroid |
dairui1 |
bannzai |
axmo | -|
ashktn |
Yoshino-Yukitaro |
vladstudio |
AMHesch |
lightrabbit |
olup | -|
moqimoqidea |
mosleyit |
oprstchn |
philipnext |
refactorthis |
samir-nimbly | -|
shaybc |
shohei-ihaya |
student20880 |
cdlliuy |
PretzelVector |
nevermorec | -|
adamwlarson |
alarno |
andreastempsch |
Atlogit |
bramburn |
chadgauth | -|
dleen |
dbasclpy |
snoyiatk |
linegel |
celestial-vault |
franekp | -|
DeXtroTip |
hesara |
eltociear |
Jdo300 |
libertyteeth |
mamertofabian | -|
marvijo-code |
kvokka |
nbihan-mediware |
Sarke |
01Rian |
samsilveira | -|
maekawataiki |
tgfjt |
thomasjeung | | | | +|
mrubens |
saoudrizwan |
cte |
samhvw8 |
daniel-lxs |
a8trejo | +| :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +|
ColemanRoo |
stea9499 |
joemanley201 |
System233 |
hannesrudolph |
nissa-seru | +|
jquanton |
KJ7LNW |
NyxJae |
MuriloFP |
d-oit |
punkpeye | +|
monotykamary |
Smartsheet-JB-Brown |
feifei325 |
wkordalski |
cannuri |
lloydchang | +|
vigneshsubbiah16 |
Szpadel |
lupuletic |
qdaxb |
Premshay |
psv2522 | +|
diarmidmackenzie |
olweraltuve |
RaySinner |
aheizi |
afshawnlotfi |
pugazhendhi-m | +|
PeterDaveHello |
pdecat |
kyle-apex |
emshvac |
Lunchb0ne |
arthurauffray | +|
zhangtony239 |
upamune |
StevenTCramer |
sammcj |
p12tic |
gtaylor | +|
dtrugman |
aitoroses |
yt3trees |
franekp |
yongjer |
vincentsong | +|
vagadiya |
teddyOOXX |
eonghk |
taisukeoe |
heyseth |
ross | +|
philfung |
nbihan-mediware |
napter |
mdp |
SplittyDev |
Chenjiayuan195 | +|
jcbdev |
GitlyHallows |
bramburn |
anton-otee |
benzntech |
shoopapa | +|
jwcraig |
kinandan |
kohii |
lightrabbit |
olup |
mecab | +|
im47cn |
dqroid |
dairui1 |
bannzai |
axmo |
ashktn | +|
amittell |
Yoshino-Yukitaro |
moqimoqidea |
mosleyit |
nobu007 |
oprstchn | +|
philipnext |
pokutuna |
refactorthis |
ronyblum |
samir-nimbly |
shaybc | +|
shohei-ihaya |
student20880 |
cdlliuy |
PretzelVector |
nevermorec |
AMHesch | +|
adamwlarson |
alarno |
axkirillov |
andreastempsch |
atlasgong |
Atlogit | +|
bogdan0083 |
chadgauth |
dleen |
dbasclpy |
snoyiatk |
linegel | +|
celestial-vault |
DeXtroTip |
hesara |
eltociear |
Jdo300 |
shtse8 | +|
libertyteeth |
mamertofabian |
marvijo-code |
kvokka |
Sarke |
01Rian | +|
sachasayan |
samsilveira |
maekawataiki |
tgfjt |
tmsjngx0 |
vladstudio | diff --git a/assets/docs/demo.gif b/assets/docs/demo.gif index 35eb8d0bbe..c45e64bc31 100644 --- a/assets/docs/demo.gif +++ b/assets/docs/demo.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d426d600fa80e9ac237cbad6b3f7f47a4aa2005d5218184e6b9565a8ee46d1ba -size 19108207 +oid sha256:a27ab29e2b5cf8ae65efd35222d456de4b9b1956b159705f9ead3d19426fabae +size 7456839 diff --git a/cline_docs/bedrock/bedrock-cache-strategy-documentation.md b/cline_docs/bedrock/bedrock-cache-strategy-documentation.md index a18321f476..09d67fd996 100644 --- a/cline_docs/bedrock/bedrock-cache-strategy-documentation.md +++ b/cline_docs/bedrock/bedrock-cache-strategy-documentation.md @@ -1,6 +1,6 @@ # Cache Strategy Documentation -This document provides an overview of the cache strategy implementation for AWS Bedrock in the Roo-Code project, including class relationships and sequence diagrams. +This document provides an overview of the cache strategy implementation for Amazon Bedrock in the Roo-Code project, including class relationships and sequence diagrams. ## Class Relationship Diagram @@ -89,7 +89,7 @@ sequenceDiagram participant Client as Client Code participant Bedrock as AwsBedrockHandler participant Strategy as MultiPointStrategy - participant AWS as AWS Bedrock Service + participant AWS as Amazon Bedrock Service Client->>Bedrock: createMessage(systemPrompt, messages) Note over Bedrock: Generate conversationId to track cache points @@ -143,7 +143,7 @@ sequenceDiagram ### Cache Strategy -The cache strategy system is designed to optimize the placement of cache points in AWS Bedrock API requests. Cache points allow the service to reuse previously processed parts of the prompt, reducing token usage and improving response times. +The cache strategy system is designed to optimize the placement of cache points in Amazon Bedrock API requests. Cache points allow the service to reuse previously processed parts of the prompt, reducing token usage and improving response times. - **MultiPointStrategy**: Upon first MR of Bedrock caching, this strategy is used for all cache point placement scenarios. It distributes cache points throughout the conversation to maximize caching efficiency, whether the model supports one or multiple cache points. @@ -180,14 +180,14 @@ The simplified approach ensures that: The examples in this document reflect this optimized implementation. -### Integration with AWS Bedrock +### Integration with Amazon Bedrock The AwsBedrockHandler class integrates with the cache strategies by: 1. Determining if the model supports prompt caching 2. Creating the appropriate strategy based on model capabilities 3. Applying the strategy to format messages with optimal cache points -4. Sending the formatted request to AWS Bedrock +4. Sending the formatted request to Amazon Bedrock 5. Processing and returning the response ## Usage Considerations diff --git a/cline_docs/bedrock/model-identification.md b/cline_docs/bedrock/model-identification.md index 602c2e6fe1..7d778b186a 100644 --- a/cline_docs/bedrock/model-identification.md +++ b/cline_docs/bedrock/model-identification.md @@ -1,6 +1,6 @@ # Bedrock Model Identification -This document explains how model information is identified and managed in the AWS Bedrock provider implementation (`bedrock.ts`). It focuses on the sequence of operations that determine the `costModelConfig` property, which is crucial for token counting, pricing, and other features. +This document explains how model information is identified and managed in the Amazon Bedrock provider implementation (`bedrock.ts`). It focuses on the sequence of operations that determine the `costModelConfig` property, which is crucial for token counting, pricing, and other features. ## Model Identification Flow diff --git a/cline_docs/settings.md b/cline_docs/settings.md index f4b0682602..cc04bd9848 100644 --- a/cline_docs/settings.md +++ b/cline_docs/settings.md @@ -1,12 +1,20 @@ ## For All Settings -1. Add the setting to ExtensionMessage.ts: +1. Add the setting to schema definitions: - - Add the setting to the ExtensionState interface - - Make it required if it has a default value, optional if it can be undefined - - Example: `preferredLanguage: string` + - Add the item to `globalSettingsSchema` in `schemas/index.ts` + - Add the item to `globalSettingsRecord` in `schemas/index.ts` + - Example: `terminalCommandDelay: z.number().optional(),` -2. Add test coverage: +2. Add the setting to type definitions: + + - Add the item to `exports/types.ts` + - Add the item to `exports/roo-code.d.ts` + - Add the setting to `shared/ExtensionMessage.ts` + - Add the setting to the WebviewMessage type in `shared/WebviewMessage.ts` + - Example: `terminalCommandDelay?: number | undefined` + +3. Add test coverage: - Add the setting to mockState in ClineProvider.test.ts - Add test cases for setting persistence and state updates - Ensure all tests pass before submitting changes @@ -64,12 +72,35 @@ ``` 5. Add the setting to handleSubmit in SettingsView.tsx: - - Add a vscode.postMessage call to send the setting's value when clicking Done + + - Add a vscode.postMessage call to send the setting's value when clicking Save + - This step is critical for persistence - without it, the setting will not be saved when the user clicks Save - Example: ```typescript vscode.postMessage({ type: "multisearchDiffEnabled", bool: multisearchDiffEnabled }) ``` +6. Style Considerations: + - Use the VSCodeCheckbox component from @vscode/webview-ui-toolkit/react instead of HTML input elements + - Wrap each checkbox in a div element for proper spacing + - Use a span with className="font-medium" for the checkbox label inside the VSCodeCheckbox component + - Place the description in a separate div with className="text-vscode-descriptionForeground text-sm mt-1" + - Maintain consistent spacing between configuration options + - Example: + ```typescript +({
+ // existing settings...
+ newSetting: false, // Default value for the new setting
+ })
+ ```
+
+ 2. **State Loading in ClineProvider**:
+
+ - Add the setting to the getState method to load it from storage
+ - Example:
+ ```typescript
+ return {
+ // existing settings...
+ newSetting: stateValues.newSetting ?? false,
+ }
+ ```
+
+ 3. **State Initialization in resolveWebviewView**:
+
+ - Add the setting to the initialization in resolveWebviewView
+ - Example:
+ ```typescript
+ this.getState().then(
+ ({
+ // existing settings...
+ newSetting,
+ }) => {
+ // Initialize the setting with its stored value or default
+ FeatureClass.setNewSetting(newSetting ?? false)
+ },
+ )
+ ```
+
+ 4. **State Transmission to Webview**:
+
+ - Add the setting to the getStateToPostToWebview method
+ - Example:
+ ```typescript
+ return {
+ // existing settings...
+ newSetting: newSetting ?? false,
+ }
+ ```
+
+ 5. **Setter Method in ExtensionStateContext**:
+ - Add the setter method to the contextValue object
+ - Example:
+ ```typescript
+ const contextValue: ExtensionStateContextType = {
+ // existing properties and methods...
+ setNewSetting: (value) => setState((prevState) => ({ ...prevState, newSetting: value })),
+ }
+ ```
+
+11. **Debugging Settings Persistence Issues**
+
+ If a setting is not persisting across reload, check the following:
+
+ 1. **Complete Chain of Persistence**:
+
+ - Verify that the setting is added to all required locations:
+ - globalSettingsSchema and globalSettingsRecord in schemas/index.ts
+ - Initial state in ExtensionStateContextProvider
+ - getState method in ClineProvider.ts
+ - getStateToPostToWebview method in ClineProvider.ts
+ - resolveWebviewView method in ClineProvider.ts (if feature-specific)
+ - A break in any part of this chain can prevent persistence
+
+ 2. **Default Values Consistency**:
+
+ - Ensure default values are consistent across all locations
+ - Inconsistent defaults can cause unexpected behavior
+
+ 3. **Message Handling**:
+
+ - Confirm the webviewMessageHandler.ts has a case for the setting
+ - Verify the message type matches what's sent from the UI
+
+ 4. **UI Integration**:
+
+ - Check that the setting is included in the handleSubmit function in SettingsView.tsx
+ - Ensure the UI component correctly updates the state
+
+ 5. **Type Definitions**:
+
+ - Verify the setting is properly typed in all relevant interfaces
+ - Check for typos in property names across different files
+
+ 6. **Storage Mechanism**:
+ - For complex settings, ensure proper serialization/deserialization
+ - Check that the setting is being correctly stored in VSCode's globalState
+
+ These checks help identify and resolve common issues with settings persistence.
+
+12. **Advanced Troubleshooting: The Complete Settings Persistence Chain**
+
+Settings persistence requires a complete chain of state management across multiple components. Understanding this chain is critical for both humans and AI to effectively troubleshoot persistence issues:
+
+1. **Schema Definition (Entry Point)**:
+
+ - Settings must be properly defined in `globalSettingsSchema` and `globalSettingsRecord`
+ - Enum values should use proper zod schemas: `z.enum(["value1", "value2"])`
+ - Example:
+
+ ```typescript
+ // In schemas/index.ts
+ export const globalSettingsSchema = z.object({
+ // Existing settings...
+ commandRiskLevel: z.enum(["readOnly", "reversibleChanges", "complexChanges"]).optional(),
+ })
+
+ const globalSettingsRecord: GlobalSettingsRecord = {
+ // Existing settings...
+ commandRiskLevel: undefined,
+ }
+ ```
+
+2. **UI Component (User Interaction)**:
+
+ - Must use consistent components (Select vs. select) with other similar settings
+ - Must use `setCachedStateField` for state updates, not direct state setting
+ - Must generate the correct message type through `vscode.postMessage`
+ - Example:
+ ```tsx
+ // In a settings component
+
+ ```
+
+3. **Message Handler (State Saving)**:
+
+ - Must use correct message type in `webviewMessageHandler.ts`
+ - Must use `updateGlobalState` with properly typed values
+ - Must call `postStateToWebview` after updates
+ - Example:
+ ```typescript
+ // In webviewMessageHandler.ts
+ case "commandRiskLevel":
+ await updateGlobalState(
+ "commandRiskLevel",
+ (message.text ?? "readOnly") as "readOnly" | "reversibleChanges" | "complexChanges"
+ )
+ await provider.postStateToWebview()
+ break
+ ```
+
+4. **State Retrieval (Reading State)**:
+
+ - In `getState`, state must be properly retrieved from stateValues
+ - In `getStateToPostToWebview`, the setting must be in the destructured parameters
+ - The setting must be included in the return value
+ - Use `contextProxy.getGlobalState` for direct access when needed
+ - Example:
+
+ ```typescript
+ // In ClineProvider.ts getStateToPostToWebview
+ const {
+ // Other state properties...
+ commandRiskLevel,
+ } = await this.getState()
+
+ return {
+ // Other state properties...
+ commandRiskLevel: commandRiskLevel ?? "readOnly",
+ }
+ ```
+
+5. **Debugging Strategies**:
+
+ - **Follow the State Flow**: Watch the setting's value at each step in the chain
+ - **Type Safety**: Ensure the same type is used throughout the chain
+ - **Component Consistency**: Use the same pattern as other working settings
+ - **Check Return Values**: Ensure the setting is included in all return objects
+ - **State vs. Configuration**: Understand when to use state vs. VSCode configuration
+
+6. **Common Pitfalls**:
+ - **Type Mismatch**: Using string where an enum is expected
+ - **Chain Breaks**: Missing the setting in return objects
+ - **UI Inconsistency**: Using different component patterns
+ - **DefaultValue Issues**: Inconsistent default values across components
+ - **Missing Schema**: Not adding to schema or record definitions
+
+Remember: A break at ANY point in this chain can cause persistence failures. When troubleshooting, systematically check each link in the chain to identify where the issue occurs.
diff --git a/e2e/package.json b/e2e/package.json
index d6a2c7af00..aec42f93f1 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"scripts": {
- "lint": "eslint src --ext ts",
+ "lint": "eslint src/**/*.ts",
"check-types": "tsc --noEmit",
"test": "npm run build && npx dotenvx run -f .env.local -- node ./out/runTest.js",
"ci": "npm run vscode-test && npm run test",
diff --git a/evals/.tool-versions b/evals/.tool-versions
index 3ab87ada55..18277f9311 100644
--- a/evals/.tool-versions
+++ b/evals/.tool-versions
@@ -1,4 +1,4 @@
-nodejs v20.18.1
python 3.13.2
golang 1.24.2
rust 1.85.1
+nodejs 20.18.1
diff --git a/evals/apps/cli/package.json b/evals/apps/cli/package.json
index 3e7da0266e..bcd88d5c8b 100644
--- a/evals/apps/cli/package.json
+++ b/evals/apps/cli/package.json
@@ -3,7 +3,7 @@
"private": true,
"type": "module",
"scripts": {
- "lint": "eslint src --ext ts --max-warnings=0",
+ "lint": "eslint src/**/*.ts --max-warnings=0",
"check-types": "tsc --noEmit",
"format": "prettier --write src",
"dev": "dotenvx run -f ../../.env -- tsx src/index.ts"
@@ -16,10 +16,12 @@
"execa": "^9.5.2",
"gluegun": "^5.1.2",
"p-map": "^7.0.3",
- "p-wait-for": "^5.0.2"
+ "p-wait-for": "^5.0.2",
+ "ps-tree": "^1.2.0"
},
"devDependencies": {
"@evals/eslint-config": "workspace:^",
- "@evals/typescript-config": "workspace:^"
+ "@evals/typescript-config": "workspace:^",
+ "@types/ps-tree": "^1.1.6"
}
}
diff --git a/evals/apps/cli/src/index.ts b/evals/apps/cli/src/index.ts
index 78a9ad6437..61c0a019f6 100644
--- a/evals/apps/cli/src/index.ts
+++ b/evals/apps/cli/src/index.ts
@@ -6,6 +6,7 @@ import pMap from "p-map"
import pWaitFor from "p-wait-for"
import { execa, parseCommandString } from "execa"
import { build, filesystem, GluegunPrompt, GluegunToolbox } from "gluegun"
+import psTree from "ps-tree"
import {
type ExerciseLanguage,
@@ -15,6 +16,7 @@ import {
IpcMessageType,
TaskCommandName,
rooCodeDefaults,
+ EvalEventName,
} from "@evals/types"
import {
type Run,
@@ -33,12 +35,12 @@ import { IpcServer, IpcClient } from "@evals/ipc"
import { __dirname, extensionDevelopmentPath, exercisesPath } from "./paths.js"
import { getExercises } from "./exercises.js"
-type TaskResult = { success: boolean; retry: boolean }
+type TaskResult = { success: boolean }
type TaskPromise = Promise
-const MAX_CONCURRENCY = 20
-const TASK_TIMEOUT = 10 * 60 * 1_000
-const UNIT_TEST_TIMEOUT = 60 * 1_000
+const TASK_START_DELAY = 10 * 1_000
+const TASK_TIMEOUT = 5 * 60 * 1_000
+const UNIT_TEST_TIMEOUT = 2 * 60 * 1_000
const testCommands: Record = {
go: { commands: ["go test"] }, // timeout 15s bash -c "cd '$dir' && go test > /dev/null 2>&1"
@@ -70,7 +72,7 @@ const run = async (toolbox: GluegunToolbox) => {
run = await createRun({
model: rooCodeDefaults.openRouterModelId!,
pid: process.pid,
- socketPath: path.resolve(os.tmpdir(), `roo-code-evals-${crypto.randomUUID()}.sock`),
+ socketPath: path.resolve(os.tmpdir(), `roo-code-evals-${crypto.randomUUID().slice(0, 8)}.sock`),
})
if (language === "all") {
@@ -78,12 +80,14 @@ const run = async (toolbox: GluegunToolbox) => {
const exercises = getExercises()[language as ExerciseLanguage]
await pMap(exercises, (exercise) => createTask({ runId: run.id, language, exercise }), {
- concurrency: 10,
+ concurrency: run.concurrency,
})
}
} else if (exercise === "all") {
const exercises = getExercises()[language as ExerciseLanguage]
- await pMap(exercises, (exercise) => createTask({ runId: run.id, language, exercise }), { concurrency: 10 })
+ await pMap(exercises, (exercise) => createTask({ runId: run.id, language, exercise }), {
+ concurrency: run.concurrency,
+ })
} else {
language = language || (await askLanguage(prompt))
exercise = exercise || (await askExercise(prompt, language))
@@ -97,11 +101,11 @@ const run = async (toolbox: GluegunToolbox) => {
throw new Error("No tasks found.")
}
- console.log(await execa({ cwd: exercisesPath })`git config user.name "Roo Code"`)
- console.log(await execa({ cwd: exercisesPath })`git config user.email "support@roocode.com"`)
- console.log(await execa({ cwd: exercisesPath })`git checkout -f`)
- console.log(await execa({ cwd: exercisesPath })`git clean -fd`)
- console.log(await execa({ cwd: exercisesPath })`git checkout -b runs/${run.id} main`)
+ await execa({ cwd: exercisesPath })`git config user.name "Roo Code"`
+ await execa({ cwd: exercisesPath })`git config user.email "support@roocode.com"`
+ await execa({ cwd: exercisesPath })`git checkout -f`
+ await execa({ cwd: exercisesPath })`git clean -fd`
+ await execa({ cwd: exercisesPath })`git checkout -b runs/${run.id}-${crypto.randomUUID().slice(0, 8)} main`
fs.writeFileSync(
path.resolve(exercisesPath, "settings.json"),
@@ -113,23 +117,25 @@ const run = async (toolbox: GluegunToolbox) => {
const runningPromises: TaskPromise[] = []
- // Retries aren't implemented yet, but the return values are set up to
- // support them.
- const processTask = async (task: Task) => {
+ const processTask = async (task: Task, delay = 0) => {
if (task.finishedAt === null) {
- const { retry } = await runExercise({ run, task, server })
-
- if (retry) {
- return { success: false, retry: true }
- }
+ await new Promise((resolve) => setTimeout(resolve, delay))
+ await runExercise({ run, task, server })
}
if (task.passed === null) {
const passed = await runUnitTest({ task })
await updateTask(task.id, { passed })
- return { success: passed, retry: false }
+
+ server.broadcast({
+ type: IpcMessageType.TaskEvent,
+ origin: IpcOrigin.Server,
+ data: { eventName: passed ? EvalEventName.Pass : EvalEventName.Fail, taskId: task.id },
+ })
+
+ return { success: passed }
} else {
- return { success: task.passed, retry: false }
+ return { success: task.passed }
}
}
@@ -141,12 +147,16 @@ const run = async (toolbox: GluegunToolbox) => {
}
}
+ let delay = TASK_START_DELAY
+
for (const task of tasks) {
- const promise = processTask(task)
+ const promise = processTask(task, delay)
+ delay = delay + TASK_START_DELAY
runningPromises.push(promise)
promise.then(() => processTaskResult(task, promise))
- if (runningPromises.length > MAX_CONCURRENCY) {
+ if (runningPromises.length >= run.concurrency) {
+ delay = 0
await Promise.race(runningPromises)
}
}
@@ -154,10 +164,10 @@ const run = async (toolbox: GluegunToolbox) => {
await Promise.all(runningPromises)
const result = await finishRun(run.id)
- console.log("[cli#run]", result)
+ console.log(`${Date.now()} [cli#run]`, result)
- console.log(await execa({ cwd: exercisesPath })`git add .`)
- console.log(await execa({ cwd: exercisesPath })`git commit -m ${`Run #${run.id}`} --no-verify`)
+ await execa({ cwd: exercisesPath })`git add .`
+ await execa({ cwd: exercisesPath })`git commit -m ${`Run #${run.id}`} --no-verify`
}
const runExercise = async ({ run, task, server }: { run: Run; task: Task; server: IpcServer }): TaskPromise => {
@@ -172,9 +182,7 @@ const runExercise = async ({ run, task, server }: { run: Run; task: Task; server
// Don't await execa and store result as subprocess.
// subprocess.stdout.pipe(process.stdout)
- // Sleep for a random amount of time before opening a new VSCode window.
- await new Promise((resolve) => setTimeout(resolve, 1_000 + Math.random() * MAX_CONCURRENCY * 1_000))
- console.log(`Opening new VS Code window at ${workspacePath}`)
+ console.log(`${Date.now()} [cli#runExercise] Opening new VS Code window at ${workspacePath}`)
await execa({
env: {
@@ -184,17 +192,17 @@ const runExercise = async ({ run, task, server }: { run: Run; task: Task; server
})`code --disable-workspace-trust -n ${workspacePath}`
// Give VSCode some time to spawn before connecting to its unix socket.
- await new Promise((resolve) => setTimeout(resolve, 1_000 + Math.random() * 4_000))
- console.log(`Connecting to ${taskSocketPath}`)
+ await new Promise((resolve) => setTimeout(resolve, 3_000))
+ console.log(`${Date.now()} [cli#runExercise] Connecting to ${taskSocketPath}`)
const client = new IpcClient(taskSocketPath)
try {
await pWaitFor(() => client.isReady, { interval: 250, timeout: 5_000 })
// eslint-disable-next-line @typescript-eslint/no-unused-vars
} catch (error) {
- console.log(`[cli#runExercise | ${language} / ${exercise}] unable to connect`)
+ console.log(`${Date.now()} [cli#runExercise | ${language} / ${exercise}] unable to connect`)
client.disconnect()
- return { success: false, retry: false }
+ return { success: false }
}
let taskStartedAt = Date.now()
@@ -203,25 +211,28 @@ const runExercise = async ({ run, task, server }: { run: Run; task: Task; server
let rooTaskId: string | undefined
let isClientDisconnected = false
- const ignoreEvents: RooCodeEventName[] = [
- RooCodeEventName.Message,
- RooCodeEventName.TaskTokenUsageUpdated,
- RooCodeEventName.TaskAskResponded,
- ]
+ const ignoreEvents: Record<"broadcast" | "log", (RooCodeEventName | EvalEventName)[]> = {
+ broadcast: [RooCodeEventName.Message],
+ log: [RooCodeEventName.Message, RooCodeEventName.TaskTokenUsageUpdated, RooCodeEventName.TaskAskResponded],
+ }
client.on(IpcMessageType.TaskEvent, async (taskEvent) => {
const { eventName, payload } = taskEvent
- server.broadcast({
- type: IpcMessageType.TaskEvent,
- origin: IpcOrigin.Server,
- relayClientId: client.clientId!,
- data: { ...taskEvent, taskId: task.id },
- })
+ if (!ignoreEvents.broadcast.includes(eventName)) {
+ server.broadcast({
+ type: IpcMessageType.TaskEvent,
+ origin: IpcOrigin.Server,
+ relayClientId: client.clientId!,
+ data: { ...taskEvent, taskId: task.id },
+ })
+ }
- if (!ignoreEvents.includes(eventName)) {
- console.log(`[cli#runExercise | ${language} / ${exercise}] taskEvent -> ${eventName}`)
- console.log(payload)
+ if (!ignoreEvents.log.includes(eventName)) {
+ console.log(
+ `${Date.now()} [cli#runExercise | ${language} / ${exercise}] taskEvent -> ${eventName}`,
+ payload,
+ )
}
if (eventName === RooCodeEventName.TaskStarted) {
@@ -271,11 +282,11 @@ const runExercise = async ({ run, task, server }: { run: Run; task: Task; server
})
client.on(IpcMessageType.Disconnect, async () => {
- console.log(`[cli#runExercise | ${language} / ${exercise}] disconnect`)
+ console.log(`${Date.now()} [cli#runExercise | ${language} / ${exercise}] disconnect`)
isClientDisconnected = true
})
- console.log(`[cli#runExercise | ${language} / ${exercise}] starting task`)
+ console.log(`${Date.now()} [cli#runExercise | ${language} / ${exercise}] starting task`)
client.sendMessage({
type: IpcMessageType.TaskCommand,
@@ -299,7 +310,7 @@ const runExercise = async ({ run, task, server }: { run: Run; task: Task; server
await pWaitFor(() => !!taskFinishedAt || isClientDisconnected, { interval: 1_000, timeout: TASK_TIMEOUT })
// eslint-disable-next-line @typescript-eslint/no-unused-vars
} catch (error) {
- console.log(`[cli#runExercise | ${language} / ${exercise}] time limit reached`)
+ console.log(`${Date.now()} [cli#runExercise | ${language} / ${exercise}] time limit reached`)
// Cancel the task.
if (rooTaskId && !isClientDisconnected) {
@@ -310,11 +321,10 @@ const runExercise = async ({ run, task, server }: { run: Run; task: Task; server
data: { commandName: TaskCommandName.CancelTask, data: rooTaskId },
})
- // Give the server some time to cancel the task.
+ // Allow some time for the task to cancel.
await new Promise((resolve) => setTimeout(resolve, 5_000))
}
- // TODO: Notify clients that the task timed out.
await updateTask(task.id, { finishedAt: new Date() })
}
@@ -326,12 +336,15 @@ const runExercise = async ({ run, task, server }: { run: Run; task: Task; server
clientId: client.clientId!,
data: { commandName: TaskCommandName.CloseTask, data: rooTaskId },
})
+
+ // Allow some time for the window to close.
+ await new Promise((resolve) => setTimeout(resolve, 2_000))
}
client.disconnect()
}
- return { success: !!taskFinishedAt, retry: false }
+ return { success: !!taskFinishedAt }
}
const runUnitTest = async ({ task }: { task: Task }) => {
@@ -343,17 +356,73 @@ const runUnitTest = async ({ task }: { task: Task }) => {
let passed = true
for (const command of commands) {
- const timeout = cmd.timeout ?? UNIT_TEST_TIMEOUT
-
try {
- const result = await execa({ cwd, shell: true, reject: false, timeout })`${command}`
+ console.log(
+ `${Date.now()} [cli#runUnitTest | ${task.language} / ${task.exercise}] running "${command.join(" ")}"`,
+ )
+
+ const subprocess = execa({ cwd, shell: true, reject: false })`${command}`
+
+ const timeout = setTimeout(async () => {
+ const descendants = await new Promise((resolve, reject) => {
+ psTree(subprocess.pid!, (err, children) => {
+ if (err) {
+ reject(err)
+ }
+
+ resolve(children.map((p) => parseInt(p.PID)))
+ })
+ })
+
+ console.log(
+ `${Date.now()} [cli#runUnitTest | ${task.language} / ${task.exercise}] "${command.join(" ")}": unit tests timed out, killing ${subprocess.pid} + ${JSON.stringify(descendants)}`,
+ )
+
+ if (descendants.length > 0) {
+ for (const descendant of descendants) {
+ try {
+ console.log(
+ `${Date.now()} [cli#runUnitTest | ${task.language} / ${task.exercise}] killing ${descendant}`,
+ )
+
+ await execa`kill -9 ${descendant}`
+ } catch (error) {
+ console.error(
+ `${Date.now()} [cli#runUnitTest | ${task.language} / ${task.exercise}] Error killing descendant processes:`,
+ error,
+ )
+ }
+ }
+ }
+
+ console.log(
+ `${Date.now()} [cli#runUnitTest | ${task.language} / ${task.exercise}] killing ${subprocess.pid}`,
+ )
+
+ try {
+ await execa`kill -9 ${subprocess.pid!}`
+ } catch (error) {
+ console.error(
+ `${Date.now()} [cli#runUnitTest | ${task.language} / ${task.exercise}] Error killing process:`,
+ error,
+ )
+ }
+ }, UNIT_TEST_TIMEOUT)
+
+ const result = await subprocess
+
+ console.log(
+ `${Date.now()} [cli#runUnitTest | ${task.language} / ${task.exercise}] "${command.join(" ")}" result -> ${JSON.stringify(result)}`,
+ )
+
+ clearTimeout(timeout)
if (result.failed) {
passed = false
break
}
} catch (error) {
- console.log("[cli#runUnitTest]", error)
+ console.log(`${Date.now()} [cli#runUnitTest | ${task.language} / ${task.exercise}]`, error)
passed = false
break
}
diff --git a/evals/apps/web/package.json b/evals/apps/web/package.json
index 40fc916d3e..d52770bbb5 100644
--- a/evals/apps/web/package.json
+++ b/evals/apps/web/package.json
@@ -14,12 +14,15 @@
"@evals/ipc": "workspace:^",
"@evals/types": "workspace:^",
"@hookform/resolvers": "^4.1.3",
+ "@radix-ui/react-alert-dialog": "^1.1.7",
"@radix-ui/react-dialog": "^1.1.6",
+ "@radix-ui/react-dropdown-menu": "^2.1.7",
"@radix-ui/react-label": "^2.1.2",
"@radix-ui/react-popover": "^1.1.6",
"@radix-ui/react-scroll-area": "^1.2.3",
"@radix-ui/react-select": "^2.1.6",
"@radix-ui/react-separator": "^1.1.2",
+ "@radix-ui/react-slider": "^1.2.4",
"@radix-ui/react-slot": "^1.1.2",
"@radix-ui/react-tabs": "^1.1.3",
"@radix-ui/react-tooltip": "^1.1.8",
diff --git a/evals/apps/web/src/app/home.tsx b/evals/apps/web/src/app/home.tsx
index c85c69897f..6ba4a34ede 100644
--- a/evals/apps/web/src/app/home.tsx
+++ b/evals/apps/web/src/app/home.tsx
@@ -1,19 +1,54 @@
"use client"
-import { useMemo } from "react"
+import { useCallback, useState, useRef } from "react"
import { useRouter } from "next/navigation"
import Link from "next/link"
-import { ChevronRight, Rocket } from "lucide-react"
+import { Ellipsis, Rocket } from "lucide-react"
import type { Run, TaskMetrics } from "@evals/db"
+import { deleteRun } from "@/lib/server/runs"
import { formatCurrency, formatDuration, formatTokens } from "@/lib"
-import { Button, Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui"
+import {
+ Button,
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+ AlertDialog,
+ AlertDialogAction,
+ AlertDialogCancel,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogHeader,
+ AlertDialogTitle,
+} from "@/components/ui"
export function Home({ runs }: { runs: (Run & { taskMetrics: TaskMetrics | null })[] }) {
const router = useRouter()
- const visibleRuns = useMemo(() => runs.filter((run) => run.taskMetrics !== null), [runs])
+ const [deleteRunId, setDeleteRunId] = useState()
+ const continueRef = useRef(null)
+
+ const onConfirmDelete = useCallback(async () => {
+ if (!deleteRunId) {
+ return
+ }
+
+ try {
+ await deleteRun(deleteRunId)
+ setDeleteRunId(undefined)
+ } catch (error) {
+ console.error(error)
+ }
+ }, [deleteRunId])
return (
<>
@@ -31,27 +66,47 @@ export function Home({ runs }: { runs: (Run & { taskMetrics: TaskMetrics | null
- {visibleRuns.length ? (
- visibleRuns.map(({ taskMetrics, ...run }) => (
+ {runs.length ? (
+ runs.map(({ taskMetrics, ...run }) => (
{run.model}
{run.passed}
{run.failed}
- {((run.passed / (run.passed + run.failed)) * 100).toFixed(1)}%
-
- {formatCurrency(taskMetrics!.cost)}
- {formatDuration(taskMetrics!.duration)}
-
+ {taskMetrics && (
+
+ {taskMetrics && formatCurrency(taskMetrics.cost)}
+ {taskMetrics && formatDuration(taskMetrics.duration)}
+
+
+
+
+
+ View Tasks
+
+ {
+ setDeleteRunId(run.id)
+ setTimeout(() => continueRef.current?.focus(), 0)
+ }}>
+ Delete
+
+
+
))
@@ -74,6 +129,20 @@ export function Home({ runs }: { runs: (Run & { taskMetrics: TaskMetrics | null
onClick={() => router.push("/runs/new")}>
setDeleteRunId(undefined)}>
+
+
+ Are you sure?
+ This action cannot be undone.
+
+
+ Cancel
+
+ Continue
+
+
+
+
)
}
diff --git a/evals/apps/web/src/app/runs/[id]/run.tsx b/evals/apps/web/src/app/runs/[id]/run.tsx
index f9e1ac9f62..84749fc916 100644
--- a/evals/apps/web/src/app/runs/[id]/run.tsx
+++ b/evals/apps/web/src/app/runs/[id]/run.tsx
@@ -1,33 +1,44 @@
"use client"
-import { useState, useRef } from "react"
-import { LoaderCircle, SquareTerminal } from "lucide-react"
+import { useMemo } from "react"
+import { LoaderCircle } from "lucide-react"
import * as db from "@evals/db"
import { formatCurrency, formatDuration, formatTokens } from "@/lib"
import { useRunStatus } from "@/hooks/use-run-status"
-import {
- Drawer,
- DrawerContent,
- DrawerHeader,
- DrawerTitle,
- ScrollArea,
- Table,
- TableBody,
- TableCell,
- TableHead,
- TableHeader,
- TableRow,
-} from "@/components/ui"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui"
import { TaskStatus } from "./task-status"
import { ConnectionStatus } from "./connection-status"
+type TaskMetrics = Pick
+
export function Run({ run }: { run: db.Run }) {
- const { tasks, status, output, outputCounts } = useRunStatus(run)
- const scrollAreaRef = useRef(null)
- const [selectedTask, setSelectedTask] = useState()
+ const { tasks, status, tokenUsage, usageUpdatedAt } = useRunStatus(run)
+
+ const taskMetrics: Record = useMemo(() => {
+ const metrics: Record = {}
+
+ tasks?.forEach((task) => {
+ const usage = tokenUsage.get(task.id)
+
+ if (task.finishedAt && task.taskMetrics) {
+ metrics[task.id] = task.taskMetrics
+ } else if (usage) {
+ metrics[task.id] = {
+ tokensIn: usage.totalTokensIn,
+ tokensOut: usage.totalTokensOut,
+ tokensContext: usage.contextTokens,
+ duration: usage.duration ?? 0,
+ cost: usage.totalCost,
+ }
+ }
+ })
+
+ return metrics
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [tasks, tokenUsage, usageUpdatedAt])
return (
<>
@@ -57,38 +68,33 @@ export function Run({ run }: { run: db.Run }) {
- {task.taskMetrics ? (
+ {taskMetrics[task.id] ? (
<>
- {formatTokens(task.taskMetrics.tokensContext)}
+ {formatTokens(taskMetrics[task.id]!.tokensContext)}
- {formatDuration(task.taskMetrics.duration)}
+ {taskMetrics[task.id]!.duration
+ ? formatDuration(taskMetrics[task.id]!.duration)
+ : "-"}
- {formatCurrency(task.taskMetrics.cost)}
+ {formatCurrency(taskMetrics[task.id]!.cost)}
) : (
@@ -100,27 +106,6 @@ export function Run({ run }: { run: db.Run }) {
)}
- Roo Code (prev. Roo Cline)
@@ -48,15 +49,13 @@ Check out the [CHANGELOG](CHANGELOG.md) for detailed updates and fixes.
---
-## 🎉 Roo Code 3.11 Released
+## 🎉 Roo Code 3.12 Released
-Roo Code 3.11 brings significant performance improvements and new features!
+Roo Code 3.12 brings new features and improvements based on your feedback!
-- Fast Edits - Edits now apply way faster. Less waiting, more coding.
-- API Key Balances - View your OpenRouter and Requesty balances in settings.
-- Project-Level MCP Config - Now you can configure it per project/workspace.
-- Improved Gemini Support - Smarter retries, fixed escaping, added to Vertex provider.
-- Import/Export Settings - Easily back up or share your config across setups.
+- **Grok Support** - Added the xAI provider and Grok reasoning effort options on OpenRouter.
+- **Diff Editing Improvements** - Per-profile configuration and better string normalization for fewer errors.
+- **Checkpoint Enhancements** - Faster and more reliable checkpoints.
---
@@ -182,27 +181,29 @@ Thanks to all our contributors who have helped make Roo Code better!
-| mrubens |
saoudrizwan |
cte |
samhvw8 |
daniel-lxs |
a8trejo | -| :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -|
ColemanRoo |
stea9499 |
joemanley201 |
System233 |
hannesrudolph |
jquanton | -|
nissa-seru |
NyxJae |
MuriloFP |
punkpeye |
d-oit |
monotykamary | -|
Smartsheet-JB-Brown |
feifei325 |
vigneshsubbiah16 |
lloydchang |
KJ7LNW |
cannuri | -|
Szpadel |
wkordalski |
lupuletic |
qdaxb |
Premshay |
psv2522 | -|
olweraltuve |
diarmidmackenzie |
RaySinner |
aheizi |
afshawnlotfi |
pugazhendhi-m | -|
PeterDaveHello |
pdecat |
kyle-apex |
emshvac |
aitoroses |
dtrugman | -|
p12tic |
sammcj |
Lunchb0ne |
heyseth |
StevenTCramer |
upamune | -|
arthurauffray |
eonghk |
teddyOOXX |
vincentsong |
yongjer |
yt3trees | -|
anton-otee |
benzntech |
GitlyHallows |
gtaylor |
jcbdev |
Chenjiayuan195 | -|
mdp |
napter |
philfung |
kohii |
kinandan |
jwcraig | -|
shoopapa |
im47cn |
dqroid |
dairui1 |
bannzai |
axmo | -|
ashktn |
Yoshino-Yukitaro |
vladstudio |
AMHesch |
lightrabbit |
olup | -|
moqimoqidea |
mosleyit |
oprstchn |
philipnext |
refactorthis |
samir-nimbly | -|
shaybc |
shohei-ihaya |
student20880 |
cdlliuy |
PretzelVector |
nevermorec | -|
adamwlarson |
alarno |
andreastempsch |
Atlogit |
bramburn |
chadgauth | -|
dleen |
dbasclpy |
snoyiatk |
linegel |
celestial-vault |
franekp | -|
DeXtroTip |
hesara |
eltociear |
Jdo300 |
libertyteeth |
mamertofabian | -|
marvijo-code |
kvokka |
nbihan-mediware |
Sarke |
01Rian |
samsilveira | -|
maekawataiki |
tgfjt |
thomasjeung | | | | +|
mrubens |
saoudrizwan |
cte |
samhvw8 |
daniel-lxs |
a8trejo | +| :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +|
ColemanRoo |
stea9499 |
joemanley201 |
System233 |
hannesrudolph |
nissa-seru | +|
jquanton |
KJ7LNW |
NyxJae |
MuriloFP |
d-oit |
punkpeye | +|
monotykamary |
Smartsheet-JB-Brown |
feifei325 |
wkordalski |
cannuri |
lloydchang | +|
vigneshsubbiah16 |
Szpadel |
lupuletic |
qdaxb |
Premshay |
psv2522 | +|
diarmidmackenzie |
olweraltuve |
RaySinner |
aheizi |
afshawnlotfi |
pugazhendhi-m | +|
PeterDaveHello |
pdecat |
kyle-apex |
emshvac |
Lunchb0ne |
arthurauffray | +|
zhangtony239 |
upamune |
StevenTCramer |
sammcj |
p12tic |
gtaylor | +|
dtrugman |
aitoroses |
yt3trees |
franekp |
yongjer |
vincentsong | +|
vagadiya |
teddyOOXX |
eonghk |
taisukeoe |
heyseth |
ross | +|
philfung |
nbihan-mediware |
napter |
mdp |
SplittyDev |
Chenjiayuan195 | +|
jcbdev |
GitlyHallows |
bramburn |
anton-otee |
benzntech |
shoopapa | +|
jwcraig |
kinandan |
kohii |
lightrabbit |
olup |
mecab | +|
im47cn |
dqroid |
dairui1 |
bannzai |
axmo |
ashktn | +|
amittell |
Yoshino-Yukitaro |
moqimoqidea |
mosleyit |
nobu007 |
oprstchn | +|
philipnext |
pokutuna |
refactorthis |
ronyblum |
samir-nimbly |
shaybc | +|
shohei-ihaya |
student20880 |
cdlliuy |
PretzelVector |
nevermorec |
AMHesch | +|
adamwlarson |
alarno |
axkirillov |
andreastempsch |
atlasgong |
Atlogit | +|
bogdan0083 |
chadgauth |
dleen |
dbasclpy |
snoyiatk |
linegel | +|
celestial-vault |
DeXtroTip |
hesara |
eltociear |
Jdo300 |
shtse8 | +|
libertyteeth |
mamertofabian |
marvijo-code |
kvokka |
Sarke |
01Rian | +|
sachasayan |
samsilveira |
maekawataiki |
tgfjt |
tmsjngx0 |
vladstudio | diff --git a/assets/docs/demo.gif b/assets/docs/demo.gif index 35eb8d0bbe..c45e64bc31 100644 --- a/assets/docs/demo.gif +++ b/assets/docs/demo.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d426d600fa80e9ac237cbad6b3f7f47a4aa2005d5218184e6b9565a8ee46d1ba -size 19108207 +oid sha256:a27ab29e2b5cf8ae65efd35222d456de4b9b1956b159705f9ead3d19426fabae +size 7456839 diff --git a/cline_docs/bedrock/bedrock-cache-strategy-documentation.md b/cline_docs/bedrock/bedrock-cache-strategy-documentation.md index a18321f476..09d67fd996 100644 --- a/cline_docs/bedrock/bedrock-cache-strategy-documentation.md +++ b/cline_docs/bedrock/bedrock-cache-strategy-documentation.md @@ -1,6 +1,6 @@ # Cache Strategy Documentation -This document provides an overview of the cache strategy implementation for AWS Bedrock in the Roo-Code project, including class relationships and sequence diagrams. +This document provides an overview of the cache strategy implementation for Amazon Bedrock in the Roo-Code project, including class relationships and sequence diagrams. ## Class Relationship Diagram @@ -89,7 +89,7 @@ sequenceDiagram participant Client as Client Code participant Bedrock as AwsBedrockHandler participant Strategy as MultiPointStrategy - participant AWS as AWS Bedrock Service + participant AWS as Amazon Bedrock Service Client->>Bedrock: createMessage(systemPrompt, messages) Note over Bedrock: Generate conversationId to track cache points @@ -143,7 +143,7 @@ sequenceDiagram ### Cache Strategy -The cache strategy system is designed to optimize the placement of cache points in AWS Bedrock API requests. Cache points allow the service to reuse previously processed parts of the prompt, reducing token usage and improving response times. +The cache strategy system is designed to optimize the placement of cache points in Amazon Bedrock API requests. Cache points allow the service to reuse previously processed parts of the prompt, reducing token usage and improving response times. - **MultiPointStrategy**: Upon first MR of Bedrock caching, this strategy is used for all cache point placement scenarios. It distributes cache points throughout the conversation to maximize caching efficiency, whether the model supports one or multiple cache points. @@ -180,14 +180,14 @@ The simplified approach ensures that: The examples in this document reflect this optimized implementation. -### Integration with AWS Bedrock +### Integration with Amazon Bedrock The AwsBedrockHandler class integrates with the cache strategies by: 1. Determining if the model supports prompt caching 2. Creating the appropriate strategy based on model capabilities 3. Applying the strategy to format messages with optimal cache points -4. Sending the formatted request to AWS Bedrock +4. Sending the formatted request to Amazon Bedrock 5. Processing and returning the response ## Usage Considerations diff --git a/cline_docs/bedrock/model-identification.md b/cline_docs/bedrock/model-identification.md index 602c2e6fe1..7d778b186a 100644 --- a/cline_docs/bedrock/model-identification.md +++ b/cline_docs/bedrock/model-identification.md @@ -1,6 +1,6 @@ # Bedrock Model Identification -This document explains how model information is identified and managed in the AWS Bedrock provider implementation (`bedrock.ts`). It focuses on the sequence of operations that determine the `costModelConfig` property, which is crucial for token counting, pricing, and other features. +This document explains how model information is identified and managed in the Amazon Bedrock provider implementation (`bedrock.ts`). It focuses on the sequence of operations that determine the `costModelConfig` property, which is crucial for token counting, pricing, and other features. ## Model Identification Flow diff --git a/cline_docs/settings.md b/cline_docs/settings.md index f4b0682602..cc04bd9848 100644 --- a/cline_docs/settings.md +++ b/cline_docs/settings.md @@ -1,12 +1,20 @@ ## For All Settings -1. Add the setting to ExtensionMessage.ts: +1. Add the setting to schema definitions: - - Add the setting to the ExtensionState interface - - Make it required if it has a default value, optional if it can be undefined - - Example: `preferredLanguage: string` + - Add the item to `globalSettingsSchema` in `schemas/index.ts` + - Add the item to `globalSettingsRecord` in `schemas/index.ts` + - Example: `terminalCommandDelay: z.number().optional(),` -2. Add test coverage: +2. Add the setting to type definitions: + + - Add the item to `exports/types.ts` + - Add the item to `exports/roo-code.d.ts` + - Add the setting to `shared/ExtensionMessage.ts` + - Add the setting to the WebviewMessage type in `shared/WebviewMessage.ts` + - Example: `terminalCommandDelay?: number | undefined` + +3. Add test coverage: - Add the setting to mockState in ClineProvider.test.ts - Add test cases for setting persistence and state updates - Ensure all tests pass before submitting changes @@ -64,12 +72,35 @@ ``` 5. Add the setting to handleSubmit in SettingsView.tsx: - - Add a vscode.postMessage call to send the setting's value when clicking Done + + - Add a vscode.postMessage call to send the setting's value when clicking Save + - This step is critical for persistence - without it, the setting will not be saved when the user clicks Save - Example: ```typescript vscode.postMessage({ type: "multisearchDiffEnabled", bool: multisearchDiffEnabled }) ``` +6. Style Considerations: + - Use the VSCodeCheckbox component from @vscode/webview-ui-toolkit/react instead of HTML input elements + - Wrap each checkbox in a div element for proper spacing + - Use a span with className="font-medium" for the checkbox label inside the VSCodeCheckbox component + - Place the description in a separate div with className="text-vscode-descriptionForeground text-sm mt-1" + - Maintain consistent spacing between configuration options + - Example: + ```typescript +
+ setCachedStateField("terminalPowershellCounter", e.target.checked)}
+ data-testid="terminal-powershell-counter-checkbox">
+ {t("settings:terminal.powershellCounter.label")}
+
+
+ ```
+
## For Select/Dropdown Settings
1. Add the message type to WebviewMessage.ts:
@@ -98,6 +129,7 @@
- Add the setting to the return value in getState with a default value
- Add the setting to the destructured variables in getStateToPostToWebview
- Add the setting to the return value in getStateToPostToWebview
+ - This step is critical for UI display - without it, the setting will not be displayed in the UI
- Add a case in setWebviewMessageListener to handle the setting's message type
- Example:
```typescript
@@ -146,3 +178,266 @@ These steps ensure that:
- The setting's value is properly synchronized between the webview and extension
- The setting has a proper UI representation in the settings view
- Test coverage is maintained for the new setting
+
+## Adding a New Configuration Item: Summary of Required Changes
+
+To add a new configuration item to the system, the following changes are necessary:
+
+1. **Feature-Specific Class** (if applicable)
+
+ - For settings that affect specific features (e.g., Terminal, Browser, etc.)
+ - Add a static property to store the value
+ - Add getter/setter methods to access and modify the value
+
+2. **Schema Definition**
+
+ - Add the item to globalSettingsSchema in schemas/index.ts
+ - Add the item to globalSettingsRecord in schemas/index.ts
+
+3. **Type Definitions**
+
+ - Add the item to exports/types.ts
+ - Add the item to exports/roo-code.d.ts
+ - Add the item to shared/ExtensionMessage.ts
+ - Add the item to shared/WebviewMessage.ts
+
+4. **UI Component**
+
+ - Create or update a component in webview-ui/src/components/settings/
+ - Add appropriate slider/input controls with min/max/step values
+ - Ensure the props are passed correctly to the component in SettingsView.tsx
+ - Update the component's props interface to include the new settings
+
+5. **Translations**
+
+ - Add label and description in webview-ui/src/i18n/locales/en/settings.json
+ - Update all other languages
+ - If any language content is changed, synchronize all other languages with that change
+ - Translations must be performed within "translation" mode so change modes for that purpose
+
+6. **State Management**
+
+ - Add the item to the destructuring in SettingsView.tsx
+ - Add the item to the handleSubmit function in SettingsView.tsx
+ - Add the item to getStateToPostToWebview in ClineProvider.ts
+ - Add the item to getState in ClineProvider.ts with appropriate default values
+ - Add the item to the initialization in resolveWebviewView in ClineProvider.ts
+
+7. **Message Handling**
+
+ - Add a case for the item in webviewMessageHandler.ts
+
+8. **Implementation-Specific Logic**
+
+ - Implement any feature-specific behavior triggered by the setting
+ - Examples:
+ - Environment variables for terminal settings
+ - API configuration changes for provider settings
+ - UI behavior modifications for display settings
+
+9. **Testing**
+
+ - Add test cases for the new settings in appropriate test files
+ - Verify settings persistence and state updates
+
+10. **Ensuring Settings Persistence Across Reload**
+
+ To ensure settings persist across application reload, several key components must be properly configured:
+
+ 1. **Initial State in ExtensionStateContextProvider**:
+
+ - Add the setting to the initial state in the useState call
+ - Example:
+ ```typescript
+ const [state, setState] = useState
+ {t("settings:terminal.powershellCounter.description")}
+
+
-
+ {run.passed + run.failed > 0 && (
+ {((run.passed / (run.passed + run.failed)) * 100).toFixed(1)}%
+ )}
{formatTokens(taskMetrics!.tokensIn)}
/
- {formatTokens(taskMetrics!.tokensOut)}
-
+
+ )}
+ {formatTokens(taskMetrics.tokensIn)}
/
+ {formatTokens(taskMetrics.tokensOut)}
+
-
{task.language}/{task.exercise}
- {(outputCounts[task.id] ?? 0) > 0 && (
- setSelectedTask(task)}>
-
- )}
- {outputCounts[task.id]}
-
-
-
{formatTokens(task.taskMetrics.tokensIn)}
/
- {formatTokens(task.taskMetrics.tokensOut)}
+ {formatTokens(taskMetrics[task.id]!.tokensIn)}
/
+ {formatTokens(taskMetrics[task.id]!.tokensOut)}
-
-
- {selectedTask?.language}/{selectedTask?.exercise}
-
-
-
-
- {selectedTask && (
-
-
- )}
-
-
-
- Tags
- {output.get(selectedTask.id)?.map((line, i) =>{line}
)}
-