Skip to content

Commit fdb1f35

Browse files
authored
Merge branch 'RooCodeInc:main' into main
2 parents 05ccf57 + b03d03d commit fdb1f35

Some content is hidden

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

80 files changed

+678
-221
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383
- Fix vscode-material-icons in the filer picker
384384
- Fix global settings export
385385
- Respect user-configured terminal integration timeout (thanks @KJ7LNW)
386-
- Contex condensing enhancements (thanks @SannidhyaSah)
386+
- Context condensing enhancements (thanks @SannidhyaSah)
387387

388388
## [3.18.1] - 2025-05-22
389389

@@ -895,7 +895,7 @@
895895

896896
## [3.10.1] - 2025-03-20
897897

898-
- Make the suggested responses optional to not break overriden system prompts
898+
- Make the suggested responses optional to not break overridden system prompts
899899

900900
## [3.10.0] - 2025-03-20
901901

apps/vscode-e2e/src/suite/tools/apply-diff.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ function validateInput(input) {
224224
},
225225
text: `Use apply_diff on the file ${testFile.name} to change "Hello World" to "Hello Universe". The file already exists with this content:
226226
${testFile.content}\nAssume the file exists and you can modify it directly.`,
227-
}) //Temporary meassure since list_files ignores all the files inside a tmp workspace
227+
}) //Temporary measure since list_files ignores all the files inside a tmp workspace
228228

229229
console.log("Task ID:", taskId)
230230
console.log("Test filename:", testFile.name)

apps/web-roo-code/src/app/evals/evals.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export function Evals({
203203
</ScatterChart>
204204
</ChartContainer>
205205
<div className="py-4 text-xs opacity-50">
206-
(Note: Very expensive models are exluded from the scatter plot.)
206+
(Note: Very expensive models are excluded from the scatter plot.)
207207
</div>
208208
</TableCaption>
209209
</Table>

packages/evals/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Start the evals service:
2929
docker compose -f packages/evals/docker-compose.yml --profile server --profile runner up --build --scale runner=0
3030
```
3131

32-
The initial build process can take a minute or two. Upon success you should see ouput indicating that a web service is running on [localhost:3000](http://localhost:3000/):
32+
The initial build process can take a minute or two. Upon success you should see output indicating that a web service is running on [localhost:3000](http://localhost:3000/):
3333
<img width="1182" alt="Screenshot 2025-06-05 at 12 05 38 PM" src="https://github.com/user-attachments/assets/34f25a59-1362-458c-aafa-25e13cdb2a7a" />
3434

3535
Additionally, you'll find in Docker Desktop that database and redis services are running:

packages/types/src/providers/mistral.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ export const mistralModels = {
1414
inputPrice: 2.0,
1515
outputPrice: 5.0,
1616
},
17+
"devstral-medium-latest": {
18+
maxTokens: 131_000,
19+
contextWindow: 131_000,
20+
supportsImages: true,
21+
supportsPromptCache: false,
22+
inputPrice: 0.4,
23+
outputPrice: 2.0,
24+
},
1725
"mistral-medium-latest": {
1826
maxTokens: 131_000,
1927
contextWindow: 131_000,

src/core/tools/readFileTool.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export function getReadFileToolDescription(blockName: string, blockParams: any):
3636
}
3737
} catch (error) {
3838
console.error("Failed to parse read_file args XML for description:", error)
39-
return `[${blockName} with unparseable args]`
39+
return `[${blockName} with unparsable args]`
4040
}
4141
} else if (blockParams.path) {
4242
// Fallback for legacy single-path usage

src/i18n/locales/ca/embeddings.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"failedToProcessBatchWithError": "No s'ha pogut processar el lot després de {{maxRetries}} intents: {{errorMessage}}"
2424
},
2525
"vectorStore": {
26-
"qdrantConnectionFailed": "No s'ha pogut connectar a la base de dades vectorial Qdrant. Assegura't que Qdrant estigui funcionant i sigui accessible a {{qdrantUrl}}. Error: {{errorMessage}}"
26+
"qdrantConnectionFailed": "No s'ha pogut connectar a la base de dades vectorial Qdrant. Assegura't que Qdrant estigui funcionant i sigui accessible a {{qdrantUrl}}. Error: {{errorMessage}}",
27+
"vectorDimensionMismatch": "No s'ha pogut actualitzar l'índex de vectors per al nou model. Prova d'esborrar l'índex i tornar a començar. Detalls: {{errorMessage}}"
2728
},
2829
"validation": {
2930
"authenticationFailed": "Ha fallat l'autenticació. Comproveu la vostra clau d'API a la configuració.",
@@ -36,7 +37,9 @@
3637
"invalidApiKey": "Clau d'API no vàlida. Comproveu la vostra configuració de clau d'API.",
3738
"invalidBaseUrl": "URL base no vàlida. Comproveu la vostra configuració d'URL.",
3839
"invalidModel": "Model no vàlid. Comproveu la vostra configuració de model.",
39-
"invalidResponse": "Resposta no vàlida del servei d'incrustació. Comproveu la vostra configuració."
40+
"invalidResponse": "Resposta no vàlida del servei d'incrustació. Comproveu la vostra configuració.",
41+
"apiKeyRequired": "Es requereix una clau d'API per a aquest incrustador",
42+
"baseUrlRequired": "Es requereix una URL base per a aquest incrustador"
4043
},
4144
"serviceFactory": {
4245
"openAiConfigMissing": "Falta la configuració d'OpenAI per crear l'embedder",

src/i18n/locales/de/embeddings.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"failedToProcessBatchWithError": "Verarbeitung des Batches nach {{maxRetries}} Versuchen fehlgeschlagen: {{errorMessage}}"
2424
},
2525
"vectorStore": {
26-
"qdrantConnectionFailed": "Verbindung zur Qdrant-Vektordatenbank fehlgeschlagen. Stelle sicher, dass Qdrant läuft und unter {{qdrantUrl}} erreichbar ist. Fehler: {{errorMessage}}"
26+
"qdrantConnectionFailed": "Verbindung zur Qdrant-Vektordatenbank fehlgeschlagen. Stelle sicher, dass Qdrant läuft und unter {{qdrantUrl}} erreichbar ist. Fehler: {{errorMessage}}",
27+
"vectorDimensionMismatch": "Aktualisierung des Vektorindex für neues Modell fehlgeschlagen. Bitte versuche, den Index zu löschen und von vorne zu beginnen. Details: {{errorMessage}}"
2728
},
2829
"validation": {
2930
"authenticationFailed": "Authentifizierung fehlgeschlagen. Bitte überprüfe deinen API-Schlüssel in den Einstellungen.",
@@ -36,7 +37,9 @@
3637
"invalidApiKey": "Ungültiger API-Schlüssel. Bitte überprüfe deine API-Schlüssel-Konfiguration.",
3738
"invalidBaseUrl": "Ungültige Basis-URL. Bitte überprüfe deine URL-Konfiguration.",
3839
"invalidModel": "Ungültiges Modell. Bitte überprüfe deine Modellkonfiguration.",
39-
"invalidResponse": "Ungültige Antwort vom Embedder-Dienst. Bitte überprüfe deine Konfiguration."
40+
"invalidResponse": "Ungültige Antwort vom Embedder-Dienst. Bitte überprüfe deine Konfiguration.",
41+
"apiKeyRequired": "API-Schlüssel ist für diesen Embedder erforderlich",
42+
"baseUrlRequired": "Basis-URL ist für diesen Embedder erforderlich"
4043
},
4144
"serviceFactory": {
4245
"openAiConfigMissing": "OpenAI-Konfiguration fehlt für die Erstellung des Embedders",

src/i18n/locales/en/embeddings.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"failedToProcessBatchWithError": "Failed to process batch after {{maxRetries}} attempts: {{errorMessage}}"
2424
},
2525
"vectorStore": {
26-
"qdrantConnectionFailed": "Failed to connect to Qdrant vector database. Please ensure Qdrant is running and accessible at {{qdrantUrl}}. Error: {{errorMessage}}"
26+
"qdrantConnectionFailed": "Failed to connect to Qdrant vector database. Please ensure Qdrant is running and accessible at {{qdrantUrl}}. Error: {{errorMessage}}",
27+
"vectorDimensionMismatch": "Failed to update vector index for new model. Please try clearing the index and starting again. Details: {{errorMessage}}"
2728
},
2829
"validation": {
2930
"authenticationFailed": "Authentication failed. Please check your API key in the settings.",
@@ -36,7 +37,9 @@
3637
"invalidApiKey": "Invalid API key. Please check your API key configuration.",
3738
"invalidBaseUrl": "Invalid base URL. Please check your URL configuration.",
3839
"invalidModel": "Invalid model. Please check your model configuration.",
39-
"invalidResponse": "Invalid response from embedder service. Please check your configuration."
40+
"invalidResponse": "Invalid response from embedder service. Please check your configuration.",
41+
"apiKeyRequired": "API key is required for this embedder",
42+
"baseUrlRequired": "Base URL is required for this embedder"
4043
},
4144
"serviceFactory": {
4245
"openAiConfigMissing": "OpenAI configuration missing for embedder creation",

src/i18n/locales/es/embeddings.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"failedToProcessBatchWithError": "Error al procesar lote después de {{maxRetries}} intentos: {{errorMessage}}"
2424
},
2525
"vectorStore": {
26-
"qdrantConnectionFailed": "Error al conectar con la base de datos vectorial Qdrant. Asegúrate de que Qdrant esté funcionando y sea accesible en {{qdrantUrl}}. Error: {{errorMessage}}"
26+
"qdrantConnectionFailed": "Error al conectar con la base de datos vectorial Qdrant. Asegúrate de que Qdrant esté funcionando y sea accesible en {{qdrantUrl}}. Error: {{errorMessage}}",
27+
"vectorDimensionMismatch": "No se pudo actualizar el índice de vectores para el nuevo modelo. Intenta borrar el índice y empezar de nuevo. Detalles: {{errorMessage}}"
2728
},
2829
"validation": {
2930
"authenticationFailed": "Error de autenticación. Comprueba tu clave de API en los ajustes.",
@@ -36,7 +37,9 @@
3637
"invalidApiKey": "Clave de API no válida. Comprueba la configuración de tu clave de API.",
3738
"invalidBaseUrl": "URL base no válida. Comprueba la configuración de tu URL.",
3839
"invalidModel": "Modelo no válido. Comprueba la configuración de tu modelo.",
39-
"invalidResponse": "Respuesta no válida del servicio de embedder. Comprueba tu configuración."
40+
"invalidResponse": "Respuesta no válida del servicio de embedder. Comprueba tu configuración.",
41+
"apiKeyRequired": "Se requiere una clave de API para este embedder",
42+
"baseUrlRequired": "Se requiere una URL base para este embedder"
4043
},
4144
"serviceFactory": {
4245
"openAiConfigMissing": "Falta la configuración de OpenAI para crear el incrustador",

0 commit comments

Comments
 (0)