Merge remote-tracking branch 'origin/refactor-mcp' into refactor-mcp

# Conflicts:
#	src/core/webview/webviewMessageHandler.ts
#	webview-ui/src/components/settings/constants.ts

Author: aheizi

src/core/Cline.ts

@@ -35,7 +35,6 @@ import { HistoryItem } from "../shared/HistoryItem"
 import { ClineAskResponse } from "../shared/WebviewMessage"
 import { defaultModeSlug, getModeBySlug } from "../shared/modes"
 import { ToolParamName, ToolResponse, DiffStrategy } from "../shared/tools"
-import { getTaskDirectoryPath } from "../shared/storagePathManager"
 
 // services
 import { UrlContentFetcher } from "../services/browser/UrlContentFetcher"
@@ -296,16 +295,6 @@ export class Cline extends EventEmitter<ClineEvents> {
 
 	// API Messages
 
-	private async ensureTaskDirectoryExists(): Promise<string> {
-		const globalStoragePath = this.providerRef.deref()?.context.globalStorageUri.fsPath
-		if (!globalStoragePath) {
-			throw new Error("Global storage uri is invalid")
-		}
-
-		// Use storagePathManager to retrieve the task storage directory
-		return getTaskDirectoryPath(globalStoragePath, this.taskId)
-	}
-
 	private async getSavedApiConversationHistory(): Promise<Anthropic.MessageParam[]> {
 		return readApiMessages({ taskId: this.taskId, globalStoragePath: this.globalStoragePath })
 	}

src/core/__tests__/Cline.test.ts

@@ -26,7 +26,6 @@ jest.mock("../ignore/RooIgnoreController")
 
 // Mock storagePathManager to prevent dynamic import issues
 jest.mock("../../shared/storagePathManager", () => ({
-	__esModule: true,
 	getTaskDirectoryPath: jest
 		.fn()
 		.mockImplementation((globalStoragePath, taskId) => Promise.resolve(`${globalStoragePath}/tasks/${taskId}`)),

webview-ui/src/components/settings/constants.ts

@@ -1,5 +1,5 @@
 import {
-	ProviderName,
+	ApiProvider,
 	ModelInfo,
 	anthropicModels,
 	bedrockModels,
@@ -17,7 +17,7 @@ export { REASONING_MODELS, PROMPT_CACHING_MODELS } from "@roo/shared/api"
 
 export { AWS_REGIONS } from "@roo/shared/aws_regions"
 
-export const MODELS_BY_PROVIDER: Partial<Record<ProviderName, Record<string, ModelInfo>>> = {
+export const MODELS_BY_PROVIDER: Partial<Record<ApiProvider, Record<string, ModelInfo>>> = {
 	anthropic: anthropicModels,
 	bedrock: bedrockModels,
 	deepseek: deepSeekModels,
@@ -47,7 +47,7 @@ export const PROVIDERS = [
 	{ value: "unbound", label: "Unbound" },
 	{ value: "requesty", label: "Requesty" },
 	{ value: "human-relay", label: "Human Relay" },
-	{ value: "xai", label: "xAI (Grok)" },
+	{ value: "xai", label: "xAI" },
 	{ value: "groq", label: "Groq" },
 	{ value: "chutes", label: "Chutes AI" },
 ].sort((a, b) => a.label.localeCompare(b.label))