Fix remaining Roo-Code merge conflicts

Author: SFARPak

Roo-Code/apps/web-evals/src/app/runs/new/new-run.tsx

@@ -66,10 +66,7 @@ export function NewRun() {
 	const modelSearchValueRef = useRef("")
 
 	const models = useOpenRouterModels()
-	const exercises = useQuery({
-		queryKey: ["getExercises"],
-		queryFn: () => getExercises(),
-	})
+	const exercises = useQuery({ queryKey: ["getExercises"], queryFn: () => getExercises() })
 
 	const form = useForm<CreateRun>({
 		resolver: zodResolver(createRunSchema),
@@ -97,14 +94,7 @@ export function NewRun() {
 		async (values: CreateRun) => {
 			try {
 				if (mode === "openrouter") {
-<<<<<<< HEAD
-					values.settings = {
-						...(values.settings || {}),
-						openRouterModelId: model,
-					}
-=======
 					values.settings = { ...values.settings, openRouterModelId: model }
->>>>>>> release/v0.0.5
 				}
 
 				const { id } = await createRun(values)
@@ -169,11 +159,7 @@ export function NewRun() {
 				const providerSettings = providerProfiles.apiConfigs[providerProfiles.currentApiConfigName] ?? {}
 
 				setValue("model", getModelId(providerSettings) ?? "")
-				setValue("settings", {
-					...EVALS_SETTINGS,
-					...providerSettings,
-					...globalSettings,
-				})
+				setValue("settings", { ...EVALS_SETTINGS, ...providerSettings, ...globalSettings })
 				setMode("settings")
 
 				event.target.value = ""
@@ -299,12 +285,7 @@ export function NewRun() {
 								</Tabs>
 								{suite === "partial" && (
 									<MultiSelect
-										options={
-											exercises.data?.map((path) => ({
-												value: path,
-												label: path,
-											})) || []
-										}
+										options={exercises.data?.map((path) => ({ value: path, label: path })) || []}
 										onValueChange={(value) => setValue("exercises", value)}
 										placeholder="Select"
 										variant="inverted"

Roo-Code/packages/telemetry/src/BaseTelemetryClient.ts

@@ -51,14 +51,7 @@ export abstract class BaseTelemetryClient implements TelemetryClient {
 
 		// Merge provider properties with event-specific properties.
 		// Event properties take precedence in case of conflicts.
-<<<<<<< HEAD
-		const mergedProperties = {
-			...providerProperties,
-			...(event.properties || {}),
-		}
-=======
 		const mergedProperties = { ...providerProperties, ...event.properties }
->>>>>>> release/v0.0.5
 
 		// Filter out properties that shouldn't be captured by this client
 		return Object.fromEntries(Object.entries(mergedProperties).filter(([key]) => this.isPropertyCapturable(key)))

Roo-Code/src/core/task/Task.ts

@@ -574,10 +574,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 	// API Messages
 
 	private async getSavedApiConversationHistory(): Promise<ApiMessage[]> {
-		return readApiMessages({
-			taskId: this.taskId,
-			globalStoragePath: this.globalStoragePath,
-		})
+		return readApiMessages({ taskId: this.taskId, globalStoragePath: this.globalStoragePath })
 	}
 
 	private async addToApiConversationHistory(message: Anthropic.MessageParam) {
@@ -607,10 +604,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 	// Cline Messages
 
 	private async getSavedClineMessages(): Promise<ClineMessage[]> {
-		return readTaskMessages({
-			taskId: this.taskId,
-			globalStoragePath: this.globalStoragePath,
-		})
+		return readTaskMessages({ taskId: this.taskId, globalStoragePath: this.globalStoragePath })
 	}
 
 	private async addToClineMessages(message: ClineMessage) {
@@ -650,10 +644,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 
 	private async updateClineMessage(message: ClineMessage) {
 		const provider = this.providerRef.deref()
-		await provider?.postMessageToWebview({
-			type: "messageUpdated",
-			clineMessage: message,
-		})
+		await provider?.postMessageToWebview({ type: "messageUpdated", clineMessage: message })
 		this.emit(RooCodeEventName.Message, { action: "updated", message })
 
 		const shouldCaptureMessage = message.partial !== true && CloudService.isEnabled()
@@ -755,14 +746,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 					// state.
 					askTs = Date.now()
 					this.lastMessageTs = askTs
-					await this.addToClineMessages({
-						ts: askTs,
-						type: "ask",
-						ask: type,
-						text,
-						partial,
-						isProtected,
-					})
+					await this.addToClineMessages({ ts: askTs, type: "ask", ask: type, text, partial, isProtected })
 					throw new Error("Current ask promise was ignored (#2)")
 				}
 			} else {
@@ -799,13 +783,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 					this.askResponseImages = undefined
 					askTs = Date.now()
 					this.lastMessageTs = askTs
-					await this.addToClineMessages({
-						ts: askTs,
-						type: "ask",
-						ask: type,
-						text,
-						isProtected,
-					})
+					await this.addToClineMessages({ ts: askTs, type: "ask", ask: type, text, isProtected })
 				}
 			}
 		} else {
@@ -815,13 +793,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 			this.askResponseImages = undefined
 			askTs = Date.now()
 			this.lastMessageTs = askTs
-			await this.addToClineMessages({
-				ts: askTs,
-				type: "ask",
-				ask: type,
-				text,
-				isProtected,
-			})
+			await this.addToClineMessages({ ts: askTs, type: "ask", ask: type, text, isProtected })
 		}
 
 		// The state is mutable if the message is complete and the task will
@@ -900,11 +872,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 			throw new Error("Current ask promise was ignored")
 		}
 
-		const result = {
-			response: this.askResponse!,
-			text: this.askResponseText,
-			images: this.askResponseImages,
-		}
+		const result = { response: this.askResponse!, text: this.askResponseText, images: this.askResponseImages }
 		this.askResponse = undefined
 		this.askResponseText = undefined
 		this.askResponseImages = undefined
@@ -994,12 +962,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 
 				this.emit(RooCodeEventName.TaskUserMessage, this.taskId)
 
-				provider.postMessageToWebview({
-					type: "invoke",
-					invoke: "sendMessage",
-					text,
-					images,
-				})
+				provider.postMessageToWebview({ type: "invoke", invoke: "sendMessage", text, images })
 			} else {
 				console.error("[Task#submitUserMessage] Provider reference lost")
 			}
@@ -1077,12 +1040,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		// Set flag to skip previous_response_id on the next API call after manual condense
 		this.skipPrevResponseIdOnce = true
 
-		const contextCondense: ContextCondense = {
-			summary,
-			cost,
-			newContextTokens,
-			prevContextTokens,
-		}
+		const contextCondense: ContextCondense = { summary, cost, newContextTokens, prevContextTokens }
 		await this.say(
 			"condense_context",
 			undefined /* text */,
@@ -1660,9 +1618,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 			throw new Error("Provider not available")
 		}
 
-		const newTask = await provider.createTask(message, undefined, this, {
-			initialTodos,
-		})
+		const newTask = await provider.createTask(message, undefined, this, { initialTodos })
 
 		if (newTask) {
 			this.isPaused = true // Pause parent.
@@ -1787,15 +1743,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 
 				if (response === "messageResponse") {
 					currentUserContent.push(
-<<<<<<< HEAD
-						...[
-							{
-								type: "text" as const,
-								text: formatResponse.tooManyMistakes(text),
-							},
-=======
 						{ type: "text" as const, text: formatResponse.tooManyMistakes(text) },
->>>>>>> release/v0.0.5
 							...formatResponse.imageBlocks(images),
 					)
 
@@ -1875,10 +1823,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 			// results.
 			const finalUserContent = [...parsedUserContent, { type: "text" as const, text: environmentDetails }]
 
-			await this.addToApiConversationHistory({
-				role: "user",
-				content: finalUserContent,
-			})
+			await this.addToApiConversationHistory({ role: "user", content: finalUserContent })
 			TelemetryService.instance.captureConversationMessage(this.taskId, "user")
 
 			// Since we sent off a placeholder api_req_started message to update the
@@ -2347,10 +2292,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 					const didToolUse = this.assistantMessageContent.some((block) => block.type === "tool_use")
 
 					if (!didToolUse) {
-						this.userMessageContent.push({
-							type: "text",
-							text: formatResponse.noToolsUsed(),
-						})
+						this.userMessageContent.push({ type: "text", text: formatResponse.noToolsUsed() })
 						this.consecutiveMistakeCount++
 					}
 
@@ -2530,12 +2472,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 
 		if (truncateResult.summary) {
 			const { summary, cost, prevContextTokens, newContextTokens = 0 } = truncateResult
-			const contextCondense: ContextCondense = {
-				summary,
-				cost,
-				newContextTokens,
-				prevContextTokens,
-			}
+			const contextCondense: ContextCondense = { summary, cost, newContextTokens, prevContextTokens }
 			await this.say(
 				"condense_context",
 				undefined /* text */,
@@ -2656,12 +2593,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 				this.skipPrevResponseIdOnce = true
 
 				const { summary, cost, prevContextTokens, newContextTokens = 0 } = truncateResult
-				const contextCondense: ContextCondense = {
-					summary,
-					cost,
-					newContextTokens,
-					prevContextTokens,
-				}
+				const contextCondense: ContextCondense = { summary, cost, newContextTokens, prevContextTokens }
 				await this.say(
 					"condense_context",
 					undefined /* text */,
@@ -2901,9 +2833,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 			if (!modelId || !modelId.startsWith("gpt-5")) return
 
 			// Check if the API handler has a getLastResponseId method (OpenAiNativeHandler specific)
-			const handler = this.api as ApiHandler & {
-				getLastResponseId?: () => string | undefined
-			}
+			const handler = this.api as ApiHandler & { getLastResponseId?: () => string | undefined }
 			const lastResponseId = handler.getLastResponseId?.()
 			const idx = findLastIndex(
 				this.clineMessages,