Merge branch 'main' into default_to_concurrent_read

Author: mrubens

packages/evals/src/cli/runTask.ts

@@ -294,8 +294,8 @@ export const runTask = async ({ run, task, publish, logger }: RunTaskOptions) =>
 		data: {
 			configuration: {
 				...EVALS_SETTINGS,
-				...run.settings,
 				openRouterApiKey: process.env.OPENROUTER_API_KEY,
+				...run.settings, // Allow the provided settings to override `openRouterApiKey`.
 			},
 			text: prompt,
 			newTab: true,

packages/types/src/experiment.ts

@@ -17,10 +17,10 @@ export type ExperimentId = z.infer<typeof experimentIdsSchema>
  */
 
 export const experimentsSchema = z.object({
-	powerSteering: z.boolean(),
-	marketplace: z.boolean(),
-	disableCompletionCommand: z.boolean(),
-	multiFileApplyDiff: z.boolean(),
+	powerSteering: z.boolean().optional(),
+	disableCompletionCommand: z.boolean().optional(),
+	marketplace: z.boolean().optional(),
+	multiFileApplyDiff: z.boolean().optional(),
 })
 
 export type Experiments = z.infer<typeof experimentsSchema>

src/core/webview/webviewMessageHandler.ts

@@ -17,7 +17,8 @@ import { checkoutDiffPayloadSchema, checkoutRestorePayloadSchema, WebviewMessage
 import { checkExistKey } from "../../shared/checkExistApiConfig"
 import { experimentDefault } from "../../shared/experiments"
 import { Terminal } from "../../integrations/terminal/Terminal"
-import { openFile, openImage } from "../../integrations/misc/open-file"
+import { openFile } from "../../integrations/misc/open-file"
+import { openImage, saveImage } from "../../integrations/misc/image-handler"
 import { selectImages } from "../../integrations/misc/process-images"
 import { getTheme } from "../../integrations/theme/getTheme"
 import { discoverChromeHostUrl, tryChromeHostUrl } from "../../services/browser/browserDiscovery"
@@ -423,7 +424,10 @@ export const webviewMessageHandler = async (
 			provider.postMessageToWebview({ type: "vsCodeLmModels", vsCodeLmModels })
 			break
 		case "openImage":
-			openImage(message.text!)
+			openImage(message.text!, { values: message.values })
+			break
+		case "saveImage":
+			saveImage(message.dataUri!)
 			break
 		case "openFile":
 			openFile(message.text!, message.values as { create?: boolean; content?: string; line?: number })

src/i18n/locales/ca/common.json

@@ -28,6 +28,11 @@
 	},
 	"errors": {
 		"invalid_data_uri": "Format d'URI de dades no vàlid",
+		"error_copying_image": "Error copiant la imatge: {{errorMessage}}",
+		"error_saving_image": "Error desant la imatge: {{errorMessage}}",
+		"error_opening_image": "Error obrint la imatge: {{error}}",
+		"could_not_open_file": "No s'ha pogut obrir el fitxer: {{errorMessage}}",
+		"could_not_open_file_generic": "No s'ha pogut obrir el fitxer!",
 		"checkpoint_timeout": "S'ha esgotat el temps en intentar restaurar el punt de control.",
 		"checkpoint_failed": "Ha fallat la restauració del punt de control.",
 		"no_workspace": "Si us plau, obre primer una carpeta de projecte",
@@ -71,7 +76,9 @@
 		"custom_storage_path_set": "Ruta d'emmagatzematge personalitzada establerta: {{path}}",
 		"default_storage_path": "S'ha reprès l'ús de la ruta d'emmagatzematge predeterminada",
 		"settings_imported": "Configuració importada correctament.",
-		"share_link_copied": "Enllaç de compartició copiat al portapapers"
+		"share_link_copied": "Enllaç de compartició copiat al portapapers",
+		"image_copied_to_clipboard": "URI de dades de la imatge copiada al portapapers",
+		"image_saved": "Imatge desada a {{path}}"
 	},
 	"answers": {
 		"yes": "Sí",

src/i18n/locales/de/common.json

@@ -24,6 +24,11 @@
 	},
 	"errors": {
 		"invalid_data_uri": "Ungültiges Daten-URI-Format",
+		"error_copying_image": "Fehler beim Kopieren des Bildes: {{errorMessage}}",
+		"error_saving_image": "Fehler beim Speichern des Bildes: {{errorMessage}}",
+		"error_opening_image": "Fehler beim Öffnen des Bildes: {{error}}",
+		"could_not_open_file": "Datei konnte nicht geöffnet werden: {{errorMessage}}",
+		"could_not_open_file_generic": "Datei konnte nicht geöffnet werden!",
 		"checkpoint_timeout": "Zeitüberschreitung beim Versuch, den Checkpoint wiederherzustellen.",
 		"checkpoint_failed": "Fehler beim Wiederherstellen des Checkpoints.",
 		"no_workspace": "Bitte öffne zuerst einen Projektordner",
@@ -67,7 +72,9 @@
 		"custom_storage_path_set": "Benutzerdefinierter Speicherpfad festgelegt: {{path}}",
 		"default_storage_path": "Auf Standardspeicherpfad zurückgesetzt",
 		"settings_imported": "Einstellungen erfolgreich importiert.",
-		"share_link_copied": "Share-Link in die Zwischenablage kopiert"
+		"share_link_copied": "Share-Link in die Zwischenablage kopiert",
+		"image_copied_to_clipboard": "Bild-Daten-URI in die Zwischenablage kopiert",
+		"image_saved": "Bild gespeichert unter {{path}}"
 	},
 	"answers": {
 		"yes": "Ja",

src/i18n/locales/en/common.json

@@ -24,6 +24,11 @@
 	},
 	"errors": {
 		"invalid_data_uri": "Invalid data URI format",
+		"error_copying_image": "Error copying image: {{errorMessage}}",
+		"error_opening_image": "Error opening image: {{error}}",
+		"error_saving_image": "Error saving image: {{errorMessage}}",
+		"could_not_open_file": "Could not open file: {{errorMessage}}",
+		"could_not_open_file_generic": "Could not open file!",
 		"checkpoint_timeout": "Timed out when attempting to restore checkpoint.",
 		"checkpoint_failed": "Failed to restore checkpoint.",
 		"no_workspace": "Please open a project folder first",
@@ -67,7 +72,9 @@
 		"custom_storage_path_set": "Custom storage path set: {{path}}",
 		"default_storage_path": "Reverted to using default storage path",
 		"settings_imported": "Settings imported successfully.",
-		"share_link_copied": "Share link copied to clipboard"
+		"share_link_copied": "Share link copied to clipboard",
+		"image_copied_to_clipboard": "Image data URI copied to clipboard",
+		"image_saved": "Image saved to {{path}}"
 	},
 	"answers": {
 		"yes": "Yes",

src/i18n/locales/es/common.json

@@ -24,6 +24,11 @@
 	},
 	"errors": {
 		"invalid_data_uri": "Formato de URI de datos no válido",
+		"error_copying_image": "Error copiando la imagen: {{errorMessage}}",
+		"error_saving_image": "Error guardando la imagen: {{errorMessage}}",
+		"error_opening_image": "Error abriendo la imagen: {{error}}",
+		"could_not_open_file": "No se pudo abrir el archivo: {{errorMessage}}",
+		"could_not_open_file_generic": "¡No se pudo abrir el archivo!",
 		"checkpoint_timeout": "Se agotó el tiempo al intentar restaurar el punto de control.",
 		"checkpoint_failed": "Error al restaurar el punto de control.",
 		"no_workspace": "Por favor, abre primero una carpeta de proyecto",
@@ -67,7 +72,9 @@
 		"custom_storage_path_set": "Ruta de almacenamiento personalizada establecida: {{path}}",
 		"default_storage_path": "Se ha vuelto a usar la ruta de almacenamiento predeterminada",
 		"settings_imported": "Configuración importada correctamente.",
-		"share_link_copied": "Enlace de compartir copiado al portapapeles"
+		"share_link_copied": "Enlace de compartir copiado al portapapeles",
+		"image_copied_to_clipboard": "URI de datos de imagen copiada al portapapeles",
+		"image_saved": "Imagen guardada en {{path}}"
 	},
 	"answers": {
 		"yes": "Sí",

src/i18n/locales/fr/common.json

@@ -24,6 +24,11 @@
 	},
 	"errors": {
 		"invalid_data_uri": "Format d'URI de données invalide",
+		"error_copying_image": "Erreur lors de la copie de l'image : {{errorMessage}}",
+		"error_saving_image": "Erreur lors de l'enregistrement de l'image : {{errorMessage}}",
+		"error_opening_image": "Erreur lors de l'ouverture de l'image : {{error}}",
+		"could_not_open_file": "Impossible d'ouvrir le fichier : {{errorMessage}}",
+		"could_not_open_file_generic": "Impossible d'ouvrir le fichier !",
 		"checkpoint_timeout": "Expiration du délai lors de la tentative de rétablissement du checkpoint.",
 		"checkpoint_failed": "Échec du rétablissement du checkpoint.",
 		"no_workspace": "Veuillez d'abord ouvrir un espace de travail",
@@ -67,7 +72,9 @@
 		"custom_storage_path_set": "Chemin de stockage personnalisé défini : {{path}}",
 		"default_storage_path": "Retour au chemin de stockage par défaut",
 		"settings_imported": "Paramètres importés avec succès.",
-		"share_link_copied": "Lien de partage copié dans le presse-papiers"
+		"share_link_copied": "Lien de partage copié dans le presse-papiers",
+		"image_copied_to_clipboard": "URI de données d'image copiée dans le presse-papiers",
+		"image_saved": "Image enregistrée dans {{path}}"
 	},
 	"answers": {
 		"yes": "Oui",

src/i18n/locales/hi/common.json

@@ -24,6 +24,11 @@
 	},
 	"errors": {
 		"invalid_data_uri": "अमान्य डेटा URI फॉर्मेट",
+		"error_copying_image": "छवि कॉपी करने में त्रुटि: {{errorMessage}}",
+		"error_saving_image": "छवि सहेजने में त्रुटि: {{errorMessage}}",
+		"error_opening_image": "छवि खोलने में त्रुटि: {{error}}",
+		"could_not_open_file": "फ़ाइल नहीं खोली जा सकी: {{errorMessage}}",
+		"could_not_open_file_generic": "फ़ाइल नहीं खोली जा सकी!",
 		"checkpoint_timeout": "चेकपॉइंट को पुनर्स्थापित करने का प्रयास करते समय टाइमआउट हो गया।",
 		"checkpoint_failed": "चेकपॉइंट पुनर्स्थापित करने में विफल।",
 		"no_workspace": "कृपया पहले प्रोजेक्ट फ़ोल्डर खोलें",
@@ -66,8 +71,10 @@
 		"history_cleanup": "इतिहास से गायब फाइलों वाले {{count}} टास्क साफ किए गए।",
 		"custom_storage_path_set": "कस्टम स्टोरेज पाथ सेट किया गया: {{path}}",
 		"default_storage_path": "डिफ़ॉल्ट स्टोरेज पाथ का उपयोग पुनः शुरू किया गया",
-		"settings_imported": "सेटिंग्स सफलतापूर्वक इम्पोर्ट की गईं.",
-		"share_link_copied": "साझा लिंक क्लिपबोर्ड पर कॉपी किया गया"
+		"settings_imported": "सेटिंग्स सफलतापूर्वक इम्पोर्ट की गईं।",
+		"share_link_copied": "साझा लिंक क्लिपबोर्ड पर कॉपी किया गया",
+		"image_copied_to_clipboard": "छवि डेटा URI क्लिपबोर्ड में कॉपी की गई",
+		"image_saved": "छवि {{path}} में सहेजी गई"
 	},
 	"answers": {
 		"yes": "हां",

src/i18n/locales/it/common.json

@@ -24,6 +24,11 @@
 	},
 	"errors": {
 		"invalid_data_uri": "Formato URI dati non valido",
+		"error_copying_image": "Errore durante la copia dell'immagine: {{errorMessage}}",
+		"error_saving_image": "Errore durante il salvataggio dell'immagine: {{errorMessage}}",
+		"error_opening_image": "Errore durante l'apertura dell'immagine: {{error}}",
+		"could_not_open_file": "Impossibile aprire il file: {{errorMessage}}",
+		"could_not_open_file_generic": "Impossibile aprire il file!",
 		"checkpoint_timeout": "Timeout durante il tentativo di ripristinare il checkpoint.",
 		"checkpoint_failed": "Impossibile ripristinare il checkpoint.",
 		"no_workspace": "Per favore, apri prima una cartella di progetto",
@@ -67,7 +72,9 @@
 		"custom_storage_path_set": "Percorso di archiviazione personalizzato impostato: {{path}}",
 		"default_storage_path": "Tornato al percorso di archiviazione predefinito",
 		"settings_imported": "Impostazioni importate con successo.",
-		"share_link_copied": "Link di condivisione copiato negli appunti"
+		"share_link_copied": "Link di condivisione copiato negli appunti",
+		"image_copied_to_clipboard": "URI dati dell'immagine copiato negli appunti",
+		"image_saved": "Immagine salvata in {{path}}"
 	},
 	"answers": {
 		"yes": "Sì",