Merge branch 'RooCodeInc:main' into add-custom-model-name-embeding-index

Author: DanielusG

.changeset/thick-streets-give.md

@@ -0,0 +1,5 @@
+---
+"roo-cline": minor
+---
+
+Update `xaiModels` and `xaiDefaultModelId` in `src/shared/api.ts`

src/integrations/editor/DiffViewProvider.ts

@@ -278,7 +278,7 @@ export class DiffViewProvider {
 				updatedDocument.positionAt(updatedDocument.getText().length),
 			)
 
-			edit.replace(updatedDocument.uri, fullRange, this.originalContent ?? "")
+			edit.replace(updatedDocument.uri, fullRange, this.stripAllBOMs(this.originalContent ?? ""))
 
 			// Apply the edit and save, since contents shouldnt have changed
 			// this won't show in local history unless of course the user made

src/shared/api.ts

@@ -1264,7 +1264,7 @@ export const litellmDefaultModelInfo: ModelInfo = {
 // xAI
 // https://docs.x.ai/docs/api-reference
 export type XAIModelId = keyof typeof xaiModels
-export const xaiDefaultModelId: XAIModelId = "grok-3-beta"
+export const xaiDefaultModelId: XAIModelId = "grok-3"
 export const xaiModels = {
 	"grok-3-beta": {
 		maxTokens: 8192,
@@ -1304,6 +1304,44 @@ export const xaiModels = {
 		description: "xAI's Grok-3 mini fast beta model with 131K context window",
 		supportsReasoningEffort: true,
 	},
+	"grok-3": {
+		maxTokens: 8192,
+		contextWindow: 131072,
+		supportsImages: false,
+		supportsPromptCache: false,
+		inputPrice: 3.0,
+		outputPrice: 15.0,
+		description: "xAI's Grok-3 model with 131K context window",
+	},
+	"grok-3-fast": {
+		maxTokens: 8192,
+		contextWindow: 131072,
+		supportsImages: false,
+		supportsPromptCache: false,
+		inputPrice: 5.0,
+		outputPrice: 25.0,
+		description: "xAI's Grok-3 fast model with 131K context window",
+	},
+	"grok-3-mini": {
+		maxTokens: 8192,
+		contextWindow: 131072,
+		supportsImages: false,
+		supportsPromptCache: false,
+		inputPrice: 0.3,
+		outputPrice: 0.5,
+		description: "xAI's Grok-3 mini model with 131K context window",
+		supportsReasoningEffort: true,
+	},
+	"grok-3-mini-fast": {
+		maxTokens: 8192,
+		contextWindow: 131072,
+		supportsImages: false,
+		supportsPromptCache: false,
+		inputPrice: 0.6,
+		outputPrice: 4.0,
+		description: "xAI's Grok-3 mini fast model with 131K context window",
+		supportsReasoningEffort: true,
+	},
 	"grok-2-latest": {
 		maxTokens: 8192,
 		contextWindow: 131072,

webview-ui/src/components/chat/ChatView.tsx

@@ -1195,8 +1195,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 				// This is copied from `handlePrimaryButtonClick`, which we used
 				// to call from `autoApprove`. I'm not sure how many of these
 				// things are actually needed.
-				setInputValue("")
-				setSelectedImages([])
 				setSendingDisabled(true)
 				setClineAsk(undefined)
 				setEnableButtons(false)