migrate plan/act state to workspace storage

src/core/controller/index.ts

@@ -114,7 +114,7 @@ export class Controller {
 		try {
 			await storeSecret(this.context, "clineApiKey", undefined)
 			await updateGlobalState(this.context, "userInfo", undefined)
-			await updateGlobalState(this.context, "apiProvider", "openrouter")
+			await updateWorkspaceState(this.context, "apiProvider", "openrouter")
 			await this.postStateToWebview()
 			vscode.window.showInformationMessage("Successfully logged out of Cline")
 		} catch (error) {
@@ -297,9 +297,9 @@ export class Controller {
 
 		if (shouldSwitchModel) {
 			// Save the last model used in this mode
-			await updateGlobalState(this.context, "previousModeApiProvider", apiConfiguration.apiProvider)
-			await updateGlobalState(this.context, "previousModeThinkingBudgetTokens", apiConfiguration.thinkingBudgetTokens)
-			await updateGlobalState(this.context, "previousModeReasoningEffort", apiConfiguration.reasoningEffort)
+			await updateWorkspaceState(this.context, "previousModeApiProvider", apiConfiguration.apiProvider)
+			await updateWorkspaceState(this.context, "previousModeThinkingBudgetTokens", apiConfiguration.thinkingBudgetTokens)
+			await updateWorkspaceState(this.context, "previousModeReasoningEffort", apiConfiguration.reasoningEffort)
 			switch (apiConfiguration.apiProvider) {
 				case "anthropic":
 				case "vertex":
@@ -309,16 +309,16 @@ export class Controller {
 				case "qwen":
 				case "deepseek":
 				case "xai":
-					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.apiModelId)
+					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.apiModelId)
 					break
 				case "bedrock":
-					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.apiModelId)
-					await updateGlobalState(
+					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.apiModelId)
+					await updateWorkspaceState(
 						this.context,
 						"previousModeAwsBedrockCustomSelected",
 						apiConfiguration.awsBedrockCustomSelected,
 					)
-					await updateGlobalState(
+					await updateWorkspaceState(
 						this.context,
 						"previousModeAwsBedrockCustomModelBaseId",
 						apiConfiguration.awsBedrockCustomModelBaseId,
@@ -326,34 +326,34 @@ export class Controller {
 					break
 				case "openrouter":
 				case "cline":
-					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.openRouterModelId)
-					await updateGlobalState(this.context, "previousModeModelInfo", apiConfiguration.openRouterModelInfo)
+					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.openRouterModelId)
+					await updateWorkspaceState(this.context, "previousModeModelInfo", apiConfiguration.openRouterModelInfo)
 					break
 				case "vscode-lm":
 					// Important we don't set modelId to this, as it's an object not string (webview expects model id to be a string)
-					await updateGlobalState(
+					await updateWorkspaceState(
 						this.context,
 						"previousModeVsCodeLmModelSelector",
 						apiConfiguration.vsCodeLmModelSelector,
 					)
 					break
 				case "openai":
-					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.openAiModelId)
-					await updateGlobalState(this.context, "previousModeModelInfo", apiConfiguration.openAiModelInfo)
+					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.openAiModelId)
+					await updateWorkspaceState(this.context, "previousModeModelInfo", apiConfiguration.openAiModelInfo)
 					break
 				case "ollama":
-					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.ollamaModelId)
+					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.ollamaModelId)
 					break
 				case "lmstudio":
-					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.lmStudioModelId)
+					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.lmStudioModelId)
 					break
 				case "litellm":
-					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.liteLlmModelId)
-					await updateGlobalState(this.context, "previousModeModelInfo", apiConfiguration.liteLlmModelInfo)
+					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.liteLlmModelId)
+					await updateWorkspaceState(this.context, "previousModeModelInfo", apiConfiguration.liteLlmModelInfo)
 					break
 				case "requesty":
-					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.requestyModelId)
-					await updateGlobalState(this.context, "previousModeModelInfo", apiConfiguration.requestyModelInfo)
+					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.requestyModelId)
+					await updateWorkspaceState(this.context, "previousModeModelInfo", apiConfiguration.requestyModelInfo)
 					break
 			}
 
@@ -365,9 +365,9 @@ export class Controller {
 				newReasoningEffort ||
 				newVsCodeLmModelSelector
 			) {
-				await updateGlobalState(this.context, "apiProvider", newApiProvider)
-				await updateGlobalState(this.context, "thinkingBudgetTokens", newThinkingBudgetTokens)
-				await updateGlobalState(this.context, "reasoningEffort", newReasoningEffort)
+				await updateWorkspaceState(this.context, "apiProvider", newApiProvider)
+				await updateWorkspaceState(this.context, "thinkingBudgetTokens", newThinkingBudgetTokens)
+				await updateWorkspaceState(this.context, "reasoningEffort", newReasoningEffort)
 				switch (newApiProvider) {
 					case "anthropic":
 					case "vertex":
@@ -377,38 +377,38 @@ export class Controller {
 					case "qwen":
 					case "deepseek":
 					case "xai":
-						await updateGlobalState(this.context, "apiModelId", newModelId)
+						await updateWorkspaceState(this.context, "apiModelId", newModelId)
 						break
 					case "bedrock":
-						await updateGlobalState(this.context, "apiModelId", newModelId)
-						await updateGlobalState(this.context, "awsBedrockCustomSelected", newAwsBedrockCustomSelected)
-						await updateGlobalState(this.context, "awsBedrockCustomModelBaseId", newAwsBedrockCustomModelBaseId)
+						await updateWorkspaceState(this.context, "apiModelId", newModelId)
+						await updateWorkspaceState(this.context, "awsBedrockCustomSelected", newAwsBedrockCustomSelected)
+						await updateWorkspaceState(this.context, "awsBedrockCustomModelBaseId", newAwsBedrockCustomModelBaseId)
 						break
 					case "openrouter":
 					case "cline":
-						await updateGlobalState(this.context, "openRouterModelId", newModelId)
-						await updateGlobalState(this.context, "openRouterModelInfo", newModelInfo)
+						await updateWorkspaceState(this.context, "openRouterModelId", newModelId)
+						await updateWorkspaceState(this.context, "openRouterModelInfo", newModelInfo)
 						break
 					case "vscode-lm":
-						await updateGlobalState(this.context, "vsCodeLmModelSelector", newVsCodeLmModelSelector)
+						await updateWorkspaceState(this.context, "vsCodeLmModelSelector", newVsCodeLmModelSelector)
 						break
 					case "openai":
-						await updateGlobalState(this.context, "openAiModelId", newModelId)
-						await updateGlobalState(this.context, "openAiModelInfo", newModelInfo)
+						await updateWorkspaceState(this.context, "openAiModelId", newModelId)
+						await updateWorkspaceState(this.context, "openAiModelInfo", newModelInfo)
 						break
 					case "ollama":
-						await updateGlobalState(this.context, "ollamaModelId", newModelId)
+						await updateWorkspaceState(this.context, "ollamaModelId", newModelId)
 						break
 					case "lmstudio":
-						await updateGlobalState(this.context, "lmStudioModelId", newModelId)
+						await updateWorkspaceState(this.context, "lmStudioModelId", newModelId)
 						break
 					case "litellm":
-						await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.liteLlmModelId)
-						await updateGlobalState(this.context, "previousModeModelInfo", apiConfiguration.liteLlmModelInfo)
+						await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.liteLlmModelId)
+						await updateWorkspaceState(this.context, "previousModeModelInfo", apiConfiguration.liteLlmModelInfo)
 						break
 					case "requesty":
-						await updateGlobalState(this.context, "requestyModelId", newModelId)
-						await updateGlobalState(this.context, "requestyModelInfo", newModelInfo)
+						await updateWorkspaceState(this.context, "requestyModelId", newModelId)
+						await updateWorkspaceState(this.context, "requestyModelInfo", newModelInfo)
 						break
 				}
 
@@ -419,7 +419,7 @@ export class Controller {
 			}
 		}
 
-		await updateGlobalState(this.context, "chatSettings", chatSettings)
+		await updateWorkspaceState(this.context, "chatSettings", chatSettings)
 		await this.postStateToWebview()
 
 		if (this.task) {
@@ -510,7 +510,7 @@ export class Controller {
 			await sendAuthCallbackEvent(customToken)
 
 			const clineProvider: ApiProvider = "cline"
-			await updateGlobalState(this.context, "apiProvider", clineProvider)
+			await updateWorkspaceState(this.context, "apiProvider", clineProvider)
 
 			// Update API configuration with the new provider and API key
 			const { apiConfiguration } = await getAllExtensionState(this.context)
@@ -669,7 +669,7 @@ export class Controller {
 		}
 
 		const openrouter: ApiProvider = "openrouter"
-		await updateGlobalState(this.context, "apiProvider", openrouter)
+		await updateWorkspaceState(this.context, "apiProvider", openrouter)
 		await storeSecret(this.context, "openRouterApiKey", apiKey)
 		await this.postStateToWebview()
 		if (this.task) {

src/core/controller/ui/initializeWebview.ts

@@ -1,7 +1,7 @@
 import type { Controller } from "../index"
 import { EmptyRequest, Empty } from "@shared/proto/common"
 import { handleModelsServiceRequest } from "../models"
-import { getAllExtensionState, getGlobalState, updateGlobalState } from "../../storage/state"
+import { getAllExtensionState, getGlobalState, updateWorkspaceState } from "../../storage/state"
 import { sendOpenRouterModelsEvent } from "../models/subscribeToOpenRouterModels"
 import { sendMcpMarketplaceCatalogEvent } from "../mcp/subscribeToMcpMarketplaceCatalog"
 import { telemetryService } from "@/services/posthog/telemetry/TelemetryService"
@@ -32,7 +32,7 @@ export async function initializeWebview(controller: Controller, request: EmptyRe
 				// Update model info in state (this needs to be done here since we don't want to update state while settings is open, and we may refresh models there)
 				const { apiConfiguration } = await getAllExtensionState(controller.context)
 				if (apiConfiguration.openRouterModelId && response.models[apiConfiguration.openRouterModelId]) {
-					await updateGlobalState(
+					await updateWorkspaceState(
 						controller.context,
 						"openRouterModelInfo",
 						response.models[apiConfiguration.openRouterModelId],

src/core/storage/state-keys.ts

@@ -24,16 +24,12 @@ export type SecretKey =
 	| "cerebrasApiKey"
 
 export type GlobalStateKey =
-	| "apiProvider"
-	| "apiModelId"
 	| "awsRegion"
 	| "awsUseCrossRegionInference"
 	| "awsBedrockUsePromptCache"
 	| "awsBedrockEndpoint"
 	| "awsProfile"
 	| "awsUseProfile"
-	| "awsBedrockCustomSelected"
-	| "awsBedrockCustomModelBaseId"
 	| "vertexProjectId"
 	| "vertexRegion"
 	| "lastShownAnnouncementId"
@@ -43,7 +39,6 @@ export type GlobalStateKey =
 	| "openAiModelId"
 	| "openAiModelInfo"
 	| "openAiHeaders"
-	| "ollamaModelId"
 	| "ollamaBaseUrl"
 	| "ollamaApiOptionsCtxNum"
 	| "lmStudioModelId"
@@ -51,40 +46,20 @@ export type GlobalStateKey =
 	| "anthropicBaseUrl"
 	| "geminiBaseUrl"
 	| "azureApiVersion"
-	| "openRouterModelId"
-	| "openRouterModelInfo"
 	| "openRouterProviderSorting"
 	| "autoApprovalSettings"
 	| "globalClineRulesToggles"
 	| "globalWorkflowToggles"
 	| "browserSettings"
-	| "chatSettings"
-	| "vsCodeLmModelSelector"
 	| "userInfo"
-	| "previousModeApiProvider"
-	| "previousModeModelId"
-	| "previousModeThinkingBudgetTokens"
-	| "previousModeReasoningEffort"
-	| "previousModeVsCodeLmModelSelector"
-	| "previousModeAwsBedrockCustomSelected"
-	| "previousModeAwsBedrockCustomModelBaseId"
-	| "previousModeModelInfo"
 	| "liteLlmBaseUrl"
-	| "liteLlmModelId"
-	| "liteLlmModelInfo"
 	| "liteLlmUsePromptCache"
-	| "fireworksModelId"
 	| "fireworksModelMaxCompletionTokens"
 	| "fireworksModelMaxTokens"
 	| "qwenApiLine"
-	| "requestyModelId"
-	| "requestyModelInfo"
-	| "togetherModelId"
 	| "mcpMarketplaceCatalog"
 	| "telemetrySetting"
 	| "asksageApiUrl"
-	| "thinkingBudgetTokens"
-	| "reasoningEffort"
 	| "planActSeparateModelsSetting"
 	| "enableCheckpointsSetting"
 	| "mcpMarketplaceEnabled"
@@ -95,4 +70,35 @@ export type GlobalStateKey =
 	| "terminalReuseEnabled"
 	| "isNewUser"
 
-export type LocalStateKey = "localClineRulesToggles"
+export type LocalStateKey =
+	| "localClineRulesToggles"
+	| "chatSettings"
+	// Current active model configuration (per workspace)
+	| "apiProvider"
+	| "apiModelId"
+	| "thinkingBudgetTokens"
+	| "reasoningEffort"
+	| "vsCodeLmModelSelector"
+	| "awsBedrockCustomSelected"
+	| "awsBedrockCustomModelBaseId"
+	| "openRouterModelId"
+	| "openRouterModelInfo"
+	| "openAiModelId"
+	| "openAiModelInfo"
+	| "ollamaModelId"
+	| "lmStudioModelId"
+	| "liteLlmModelId"
+	| "liteLlmModelInfo"
+	| "requestyModelId"
+	| "requestyModelInfo"
+	| "togetherModelId"
+	| "fireworksModelId"
+	// Previous mode saved configurations (per workspace)
+	| "previousModeApiProvider"
+	| "previousModeModelId"
+	| "previousModeModelInfo"
+	| "previousModeVsCodeLmModelSelector"
+	| "previousModeThinkingBudgetTokens"
+	| "previousModeReasoningEffort"
+	| "previousModeAwsBedrockCustomSelected"
+	| "previousModeAwsBedrockCustomModelBaseId"

src/core/storage/state.ts

@@ -51,6 +51,57 @@ export async function getWorkspaceState(context: vscode.ExtensionContext, key: s
 	return await context.workspaceState.get(key)
 }
 
+export async function migratePlanActGlobalToWorkspaceStorage(context: vscode.ExtensionContext) {
+	// Keys that were migrated from global storage to workspace storage
+	const keysToMigrate = [
+		// Core settings
+		"apiProvider",
+		"apiModelId",
+		"thinkingBudgetTokens",
+		"reasoningEffort",
+		"chatSettings",
+		"vsCodeLmModelSelector",
+
+		// Provider-specific model keys
+		"awsBedrockCustomSelected",
+		"awsBedrockCustomModelBaseId",
+		"openRouterModelId",
+		"openRouterModelInfo",
+		"openAiModelId",
+		"openAiModelInfo",
+		"ollamaModelId",
+		"lmStudioModelId",
+		"liteLlmModelId",
+		"liteLlmModelInfo",
+		"requestyModelId",
+		"requestyModelInfo",
+		"togetherModelId",
+		"fireworksModelId",
+
+		// Previous mode settings
+		"previousModeApiProvider",
+		"previousModeModelId",
+		"previousModeModelInfo",
+		"previousModeVsCodeLmModelSelector",
+		"previousModeThinkingBudgetTokens",
+		"previousModeReasoningEffort",
+		"previousModeAwsBedrockCustomSelected",
+		"previousModeAwsBedrockCustomModelBaseId",
+	]
+
+	for (const key of keysToMigrate) {
+		const globalValue = await getGlobalState(context, key as GlobalStateKey)
+		if (globalValue !== undefined) {
+			const workspaceValue = await getWorkspaceState(context, key)
+			if (workspaceValue === undefined) {
+				await updateWorkspaceState(context, key, globalValue)
+			}
+			// Delete from global storage regardless of whether we copied it
+			await updateGlobalState(context, key as GlobalStateKey, undefined)
+		}
+	}
+}
+
 async function migrateMcpMarketplaceEnableSetting(mcpMarketplaceEnabledRaw: boolean | undefined): Promise<boolean> {
 	const config = vscode.workspace.getConfiguration("cline")
 	const mcpMarketplaceEnabled = config.get<boolean>("mcpMarketplace.enabled")
@@ -77,8 +128,6 @@ async function migrateEnableCheckpointsSetting(enableCheckpointsSettingRaw: bool
 export async function getAllExtensionState(context: vscode.ExtensionContext) {
 	const [
 		isNewUser,
-		storedApiProvider,
-		apiModelId,
 		apiKey,
 		openRouterApiKey,
 		clineApiKey,
@@ -91,19 +140,13 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		awsBedrockEndpoint,
 		awsProfile,
 		awsUseProfile,
-		awsBedrockCustomSelected,
-		awsBedrockCustomModelBaseId,
 		vertexProjectId,
 		vertexRegion,
 		openAiBaseUrl,
 		openAiApiKey,
-		openAiModelId,
-		openAiModelInfo,
 		openAiHeaders,
-		ollamaModelId,
 		ollamaBaseUrl,
 		ollamaApiOptionsCtxNum,
-		lmStudioModelId,
 		lmStudioBaseUrl,
 		anthropicBaseUrl,
 		geminiApiKey,
@@ -111,49 +154,29 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		openAiNativeApiKey,
 		deepSeekApiKey,
 		requestyApiKey,
-		requestyModelId,
-		requestyModelInfo,
 		togetherApiKey,
-		togetherModelId,
 		qwenApiKey,
 		doubaoApiKey,
 		mistralApiKey,
 		azureApiVersion,
-		openRouterModelId,
-		openRouterModelInfo,
 		openRouterProviderSorting,
 		lastShownAnnouncementId,
 		customInstructions,
 		taskHistory,
 		autoApprovalSettings,
 		browserSettings,
-		chatSettings,
-		vsCodeLmModelSelector,
 		liteLlmBaseUrl,
-		liteLlmModelId,
-		liteLlmModelInfo,
 		liteLlmUsePromptCache,
 		fireworksApiKey,
-		fireworksModelId,
 		fireworksModelMaxCompletionTokens,
 		fireworksModelMaxTokens,
 		userInfo,
-		previousModeApiProvider,
-		previousModeModelId,
-		previousModeModelInfo,
-		previousModeVsCodeLmModelSelector,
-		previousModeThinkingBudgetTokens,
-		previousModeReasoningEffort,
-		previousModeAwsBedrockCustomSelected,
-		previousModeAwsBedrockCustomModelBaseId,
 		qwenApiLine,
 		liteLlmApiKey,
 		telemetrySetting,
 		asksageApiKey,
 		asksageApiUrl,
 		xaiApiKey,
-		thinkingBudgetTokens,
-		reasoningEffort,
 		sambanovaApiKey,
 		cerebrasApiKey,
 		nebiusApiKey,
@@ -169,8 +192,6 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		terminalReuseEnabled,
 	] = await Promise.all([
 		getGlobalState(context, "isNewUser") as Promise<boolean | undefined>,
-		getGlobalState(context, "apiProvider") as Promise<ApiProvider | undefined>,
-		getGlobalState(context, "apiModelId") as Promise<string | undefined>,
 		getSecret(context, "apiKey") as Promise<string | undefined>,
 		getSecret(context, "openRouterApiKey") as Promise<string | undefined>,
 		getSecret(context, "clineApiKey") as Promise<string | undefined>,
@@ -183,19 +204,13 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		getGlobalState(context, "awsBedrockEndpoint") as Promise<string | undefined>,
 		getGlobalState(context, "awsProfile") as Promise<string | undefined>,
 		getGlobalState(context, "awsUseProfile") as Promise<boolean | undefined>,
-		getGlobalState(context, "awsBedrockCustomSelected") as Promise<boolean | undefined>,
-		getGlobalState(context, "awsBedrockCustomModelBaseId") as Promise<BedrockModelId | undefined>,
 		getGlobalState(context, "vertexProjectId") as Promise<string | undefined>,
 		getGlobalState(context, "vertexRegion") as Promise<string | undefined>,
 		getGlobalState(context, "openAiBaseUrl") as Promise<string | undefined>,
 		getSecret(context, "openAiApiKey") as Promise<string | undefined>,
-		getGlobalState(context, "openAiModelId") as Promise<string | undefined>,
-		getGlobalState(context, "openAiModelInfo") as Promise<ModelInfo | undefined>,
 		getGlobalState(context, "openAiHeaders") as Promise<Record<string, string> | undefined>,
-		getGlobalState(context, "ollamaModelId") as Promise<string | undefined>,
 		getGlobalState(context, "ollamaBaseUrl") as Promise<string | undefined>,
 		getGlobalState(context, "ollamaApiOptionsCtxNum") as Promise<string | undefined>,
-		getGlobalState(context, "lmStudioModelId") as Promise<string | undefined>,
 		getGlobalState(context, "lmStudioBaseUrl") as Promise<string | undefined>,
 		getGlobalState(context, "anthropicBaseUrl") as Promise<string | undefined>,
 		getSecret(context, "geminiApiKey") as Promise<string | undefined>,
@@ -203,49 +218,29 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		getSecret(context, "openAiNativeApiKey") as Promise<string | undefined>,
 		getSecret(context, "deepSeekApiKey") as Promise<string | undefined>,
 		getSecret(context, "requestyApiKey") as Promise<string | undefined>,
-		getGlobalState(context, "requestyModelId") as Promise<string | undefined>,
-		getGlobalState(context, "requestyModelInfo") as Promise<ModelInfo | undefined>,
 		getSecret(context, "togetherApiKey") as Promise<string | undefined>,
-		getGlobalState(context, "togetherModelId") as Promise<string | undefined>,
 		getSecret(context, "qwenApiKey") as Promise<string | undefined>,
 		getSecret(context, "doubaoApiKey") as Promise<string | undefined>,
 		getSecret(context, "mistralApiKey") as Promise<string | undefined>,
 		getGlobalState(context, "azureApiVersion") as Promise<string | undefined>,
-		getGlobalState(context, "openRouterModelId") as Promise<string | undefined>,
-		getGlobalState(context, "openRouterModelInfo") as Promise<ModelInfo | undefined>,
 		getGlobalState(context, "openRouterProviderSorting") as Promise<string | undefined>,
 		getGlobalState(context, "lastShownAnnouncementId") as Promise<string | undefined>,
 		getGlobalState(context, "customInstructions") as Promise<string | undefined>,
 		getGlobalState(context, "taskHistory") as Promise<HistoryItem[] | undefined>,
 		getGlobalState(context, "autoApprovalSettings") as Promise<AutoApprovalSettings | undefined>,
 		getGlobalState(context, "browserSettings") as Promise<BrowserSettings | undefined>,
-		getGlobalState(context, "chatSettings") as Promise<ChatSettings | undefined>,
-		getGlobalState(context, "vsCodeLmModelSelector") as Promise<vscode.LanguageModelChatSelector | undefined>,
 		getGlobalState(context, "liteLlmBaseUrl") as Promise<string | undefined>,
-		getGlobalState(context, "liteLlmModelId") as Promise<string | undefined>,
-		getGlobalState(context, "liteLlmModelInfo") as Promise<ModelInfo | undefined>,
 		getGlobalState(context, "liteLlmUsePromptCache") as Promise<boolean | undefined>,
 		getSecret(context, "fireworksApiKey") as Promise<string | undefined>,
-		getGlobalState(context, "fireworksModelId") as Promise<string | undefined>,
 		getGlobalState(context, "fireworksModelMaxCompletionTokens") as Promise<number | undefined>,
 		getGlobalState(context, "fireworksModelMaxTokens") as Promise<number | undefined>,
 		getGlobalState(context, "userInfo") as Promise<UserInfo | undefined>,
-		getGlobalState(context, "previousModeApiProvider") as Promise<ApiProvider | undefined>,
-		getGlobalState(context, "previousModeModelId") as Promise<string | undefined>,
-		getGlobalState(context, "previousModeModelInfo") as Promise<ModelInfo | undefined>,
-		getGlobalState(context, "previousModeVsCodeLmModelSelector") as Promise<vscode.LanguageModelChatSelector | undefined>,
-		getGlobalState(context, "previousModeThinkingBudgetTokens") as Promise<number | undefined>,
-		getGlobalState(context, "previousModeReasoningEffort") as Promise<string | undefined>,
-		getGlobalState(context, "previousModeAwsBedrockCustomSelected") as Promise<boolean | undefined>,
-		getGlobalState(context, "previousModeAwsBedrockCustomModelBaseId") as Promise<BedrockModelId | undefined>,
 		getGlobalState(context, "qwenApiLine") as Promise<string | undefined>,
 		getSecret(context, "liteLlmApiKey") as Promise<string | undefined>,
 		getGlobalState(context, "telemetrySetting") as Promise<TelemetrySetting | undefined>,
 		getSecret(context, "asksageApiKey") as Promise<string | undefined>,
 		getGlobalState(context, "asksageApiUrl") as Promise<string | undefined>,
 		getSecret(context, "xaiApiKey") as Promise<string | undefined>,
-		getGlobalState(context, "thinkingBudgetTokens") as Promise<number | undefined>,
-		getGlobalState(context, "reasoningEffort") as Promise<string | undefined>,
 		getSecret(context, "sambanovaApiKey") as Promise<string | undefined>,
 		getSecret(context, "cerebrasApiKey") as Promise<string | undefined>,
 		getSecret(context, "nebiusApiKey") as Promise<string | undefined>,
@@ -261,6 +256,68 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		getGlobalState(context, "terminalReuseEnabled") as Promise<boolean | undefined>,
 	])
 
+	const localClineRulesToggles = (await getWorkspaceState(context, "localClineRulesToggles")) as ClineRulesToggles
+
+	const [
+		chatSettings,
+		storedApiProvider,
+		apiModelId,
+		thinkingBudgetTokens,
+		reasoningEffort,
+		vsCodeLmModelSelector,
+		awsBedrockCustomSelected,
+		awsBedrockCustomModelBaseId,
+		openRouterModelId,
+		openRouterModelInfo,
+		openAiModelId,
+		openAiModelInfo,
+		ollamaModelId,
+		lmStudioModelId,
+		liteLlmModelId,
+		liteLlmModelInfo,
+		requestyModelId,
+		requestyModelInfo,
+		togetherModelId,
+		fireworksModelId,
+		previousModeApiProvider,
+		previousModeModelId,
+		previousModeModelInfo,
+		previousModeVsCodeLmModelSelector,
+		previousModeThinkingBudgetTokens,
+		previousModeReasoningEffort,
+		previousModeAwsBedrockCustomSelected,
+		previousModeAwsBedrockCustomModelBaseId,
+	] = await Promise.all([
+		getWorkspaceState(context, "chatSettings") as Promise<ChatSettings | undefined>,
+		getWorkspaceState(context, "apiProvider") as Promise<ApiProvider | undefined>,
+		getWorkspaceState(context, "apiModelId") as Promise<string | undefined>,
+		getWorkspaceState(context, "thinkingBudgetTokens") as Promise<number | undefined>,
+		getWorkspaceState(context, "reasoningEffort") as Promise<string | undefined>,
+		getWorkspaceState(context, "vsCodeLmModelSelector") as Promise<vscode.LanguageModelChatSelector | undefined>,
+		getWorkspaceState(context, "awsBedrockCustomSelected") as Promise<boolean | undefined>,
+		getWorkspaceState(context, "awsBedrockCustomModelBaseId") as Promise<BedrockModelId | undefined>,
+		getWorkspaceState(context, "openRouterModelId") as Promise<string | undefined>,
+		getWorkspaceState(context, "openRouterModelInfo") as Promise<ModelInfo | undefined>,
+		getWorkspaceState(context, "openAiModelId") as Promise<string | undefined>,
+		getWorkspaceState(context, "openAiModelInfo") as Promise<ModelInfo | undefined>,
+		getWorkspaceState(context, "ollamaModelId") as Promise<string | undefined>,
+		getWorkspaceState(context, "lmStudioModelId") as Promise<string | undefined>,
+		getWorkspaceState(context, "liteLlmModelId") as Promise<string | undefined>,
+		getWorkspaceState(context, "liteLlmModelInfo") as Promise<ModelInfo | undefined>,
+		getWorkspaceState(context, "requestyModelId") as Promise<string | undefined>,
+		getWorkspaceState(context, "requestyModelInfo") as Promise<ModelInfo | undefined>,
+		getWorkspaceState(context, "togetherModelId") as Promise<string | undefined>,
+		getWorkspaceState(context, "fireworksModelId") as Promise<string | undefined>,
+		getWorkspaceState(context, "previousModeApiProvider") as Promise<ApiProvider | undefined>,
+		getWorkspaceState(context, "previousModeModelId") as Promise<string | undefined>,
+		getWorkspaceState(context, "previousModeModelInfo") as Promise<ModelInfo | undefined>,
+		getWorkspaceState(context, "previousModeVsCodeLmModelSelector") as Promise<vscode.LanguageModelChatSelector | undefined>,
+		getWorkspaceState(context, "previousModeThinkingBudgetTokens") as Promise<number | undefined>,
+		getWorkspaceState(context, "previousModeReasoningEffort") as Promise<string | undefined>,
+		getWorkspaceState(context, "previousModeAwsBedrockCustomSelected") as Promise<boolean | undefined>,
+		getWorkspaceState(context, "previousModeAwsBedrockCustomModelBaseId") as Promise<BedrockModelId | undefined>,
+	])
+
 	let apiProvider: ApiProvider
 	if (storedApiProvider) {
 		apiProvider = storedApiProvider
@@ -275,8 +332,6 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		}
 	}
 
-	const localClineRulesToggles = (await getWorkspaceState(context, "localClineRulesToggles")) as ClineRulesToggles
-
 	const mcpMarketplaceEnabled = await migrateMcpMarketplaceEnableSetting(mcpMarketplaceEnabledRaw)
 	const enableCheckpointsSetting = await migrateEnableCheckpointsSetting(enableCheckpointsSettingRaw)
 	const mcpResponsesCollapsed = mcpResponsesCollapsedRaw ?? false
@@ -463,37 +518,68 @@ export async function updateApiConfiguration(context: vscode.ExtensionContext, a
 		cerebrasApiKey,
 		nebiusApiKey,
 		favoritedModelIds,
+		fireworksApiKey,
+		fireworksModelId,
+		fireworksModelMaxCompletionTokens,
+		fireworksModelMaxTokens,
 	} = apiConfiguration
-	await updateGlobalState(context, "apiProvider", apiProvider)
-	await updateGlobalState(context, "apiModelId", apiModelId)
-	await storeSecret(context, "apiKey", apiKey)
-	await storeSecret(context, "openRouterApiKey", openRouterApiKey)
-	await storeSecret(context, "awsAccessKey", awsAccessKey)
-	await storeSecret(context, "awsSecretKey", awsSecretKey)
-	await storeSecret(context, "awsSessionToken", awsSessionToken)
+	// Workspace state updates
+	await updateWorkspaceState(context, "apiProvider", apiProvider)
+	await updateWorkspaceState(context, "apiModelId", apiModelId)
+	await updateWorkspaceState(context, "thinkingBudgetTokens", thinkingBudgetTokens)
+	await updateWorkspaceState(context, "reasoningEffort", reasoningEffort)
+	await updateWorkspaceState(context, "vsCodeLmModelSelector", vsCodeLmModelSelector)
+	await updateWorkspaceState(context, "awsBedrockCustomSelected", awsBedrockCustomSelected)
+	await updateWorkspaceState(context, "awsBedrockCustomModelBaseId", awsBedrockCustomModelBaseId)
+	await updateWorkspaceState(context, "openRouterModelId", openRouterModelId)
+	await updateWorkspaceState(context, "openRouterModelInfo", openRouterModelInfo)
+	await updateWorkspaceState(context, "openAiModelId", openAiModelId)
+	await updateWorkspaceState(context, "openAiModelInfo", openAiModelInfo)
+	await updateWorkspaceState(context, "ollamaModelId", ollamaModelId)
+	await updateWorkspaceState(context, "lmStudioModelId", lmStudioModelId)
+	await updateWorkspaceState(context, "liteLlmModelId", liteLlmModelId)
+	await updateWorkspaceState(context, "liteLlmModelInfo", liteLlmModelInfo)
+	await updateWorkspaceState(context, "requestyModelId", requestyModelId)
+	await updateWorkspaceState(context, "requestyModelInfo", requestyModelInfo)
+	await updateWorkspaceState(context, "togetherModelId", togetherModelId)
+	await updateWorkspaceState(context, "fireworksModelId", fireworksModelId)
+
+	// Global state updates
 	await updateGlobalState(context, "awsRegion", awsRegion)
 	await updateGlobalState(context, "awsUseCrossRegionInference", awsUseCrossRegionInference)
 	await updateGlobalState(context, "awsBedrockUsePromptCache", awsBedrockUsePromptCache)
 	await updateGlobalState(context, "awsBedrockEndpoint", awsBedrockEndpoint)
 	await updateGlobalState(context, "awsProfile", awsProfile)
 	await updateGlobalState(context, "awsUseProfile", awsUseProfile)
-	await updateGlobalState(context, "awsBedrockCustomSelected", awsBedrockCustomSelected)
-	await updateGlobalState(context, "awsBedrockCustomModelBaseId", awsBedrockCustomModelBaseId)
 	await updateGlobalState(context, "vertexProjectId", vertexProjectId)
 	await updateGlobalState(context, "vertexRegion", vertexRegion)
 	await updateGlobalState(context, "openAiBaseUrl", openAiBaseUrl)
-	await storeSecret(context, "openAiApiKey", openAiApiKey)
-	await updateGlobalState(context, "openAiModelId", openAiModelId)
-	await updateGlobalState(context, "openAiModelInfo", openAiModelInfo)
 	await updateGlobalState(context, "openAiHeaders", openAiHeaders || {})
-	await updateGlobalState(context, "ollamaModelId", ollamaModelId)
 	await updateGlobalState(context, "ollamaBaseUrl", ollamaBaseUrl)
 	await updateGlobalState(context, "ollamaApiOptionsCtxNum", ollamaApiOptionsCtxNum)
-	await updateGlobalState(context, "lmStudioModelId", lmStudioModelId)
 	await updateGlobalState(context, "lmStudioBaseUrl", lmStudioBaseUrl)
 	await updateGlobalState(context, "anthropicBaseUrl", anthropicBaseUrl)
-	await storeSecret(context, "geminiApiKey", geminiApiKey)
 	await updateGlobalState(context, "geminiBaseUrl", geminiBaseUrl)
+	await updateGlobalState(context, "azureApiVersion", azureApiVersion)
+	await updateGlobalState(context, "openRouterProviderSorting", openRouterProviderSorting)
+	await updateGlobalState(context, "liteLlmBaseUrl", liteLlmBaseUrl)
+	await updateGlobalState(context, "liteLlmUsePromptCache", liteLlmUsePromptCache)
+	await updateGlobalState(context, "qwenApiLine", qwenApiLine)
+	await updateGlobalState(context, "asksageApiUrl", asksageApiUrl)
+	await updateGlobalState(context, "favoritedModelIds", favoritedModelIds)
+	await updateGlobalState(context, "requestTimeoutMs", apiConfiguration.requestTimeoutMs)
+	await updateGlobalState(context, "fireworksModelMaxCompletionTokens", fireworksModelMaxCompletionTokens)
+	await updateGlobalState(context, "fireworksModelMaxTokens", fireworksModelMaxTokens)
+
+	// Secret updates
+	await storeSecret(context, "apiKey", apiKey)
+	await storeSecret(context, "openRouterApiKey", openRouterApiKey)
+	await storeSecret(context, "clineApiKey", clineApiKey)
+	await storeSecret(context, "awsAccessKey", awsAccessKey)
+	await storeSecret(context, "awsSecretKey", awsSecretKey)
+	await storeSecret(context, "awsSessionToken", awsSessionToken)
+	await storeSecret(context, "openAiApiKey", openAiApiKey)
+	await storeSecret(context, "geminiApiKey", geminiApiKey)
 	await storeSecret(context, "openAiNativeApiKey", openAiNativeApiKey)
 	await storeSecret(context, "deepSeekApiKey", deepSeekApiKey)
 	await storeSecret(context, "requestyApiKey", requestyApiKey)
@@ -502,30 +588,12 @@ export async function updateApiConfiguration(context: vscode.ExtensionContext, a
 	await storeSecret(context, "doubaoApiKey", doubaoApiKey)
 	await storeSecret(context, "mistralApiKey", mistralApiKey)
 	await storeSecret(context, "liteLlmApiKey", liteLlmApiKey)
-	await storeSecret(context, "xaiApiKey", xaiApiKey)
-	await updateGlobalState(context, "azureApiVersion", azureApiVersion)
-	await updateGlobalState(context, "openRouterModelId", openRouterModelId)
-	await updateGlobalState(context, "openRouterModelInfo", openRouterModelInfo)
-	await updateGlobalState(context, "openRouterProviderSorting", openRouterProviderSorting)
-	await updateGlobalState(context, "vsCodeLmModelSelector", vsCodeLmModelSelector)
-	await updateGlobalState(context, "liteLlmBaseUrl", liteLlmBaseUrl)
-	await updateGlobalState(context, "liteLlmModelId", liteLlmModelId)
-	await updateGlobalState(context, "liteLlmModelInfo", liteLlmModelInfo)
-	await updateGlobalState(context, "liteLlmUsePromptCache", liteLlmUsePromptCache)
-	await updateGlobalState(context, "qwenApiLine", qwenApiLine)
-	await updateGlobalState(context, "requestyModelId", requestyModelId)
-	await updateGlobalState(context, "requestyModelInfo", requestyModelInfo)
-	await updateGlobalState(context, "togetherModelId", togetherModelId)
+	await storeSecret(context, "fireworksApiKey", fireworksApiKey)
 	await storeSecret(context, "asksageApiKey", asksageApiKey)
-	await updateGlobalState(context, "asksageApiUrl", asksageApiUrl)
-	await updateGlobalState(context, "thinkingBudgetTokens", thinkingBudgetTokens)
-	await updateGlobalState(context, "reasoningEffort", reasoningEffort)
-	await storeSecret(context, "clineApiKey", clineApiKey)
+	await storeSecret(context, "xaiApiKey", xaiApiKey)
 	await storeSecret(context, "sambanovaApiKey", sambanovaApiKey)
 	await storeSecret(context, "cerebrasApiKey", cerebrasApiKey)
 	await storeSecret(context, "nebiusApiKey", nebiusApiKey)
-	await updateGlobalState(context, "favoritedModelIds", favoritedModelIds)
-	await updateGlobalState(context, "requestTimeoutMs", apiConfiguration.requestTimeoutMs)
 }
 
 export async function resetExtensionState(context: vscode.ExtensionContext) {

src/core/task/index.ts

@@ -105,7 +105,7 @@ import {
 	getLocalCursorRules,
 } from "@core/context/instructions/user-instructions/external-rules"
 import { refreshWorkflowToggles } from "../context/instructions/user-instructions/workflows"
-import { getGlobalState } from "@core/storage/state"
+import { getWorkspaceState } from "@core/storage/state"
 import { parseSlashCommands } from "@core/slash-commands"
 import WorkspaceTracker from "@integrations/workspace/WorkspaceTracker"
 import { McpHub } from "@services/mcp/McpHub"
@@ -3730,7 +3730,7 @@ export class Task {
 								const clineVersion =
 									vscode.extensions.getExtension("saoudrizwan.claude-dev")?.packageJSON.version || "Unknown"
 								const systemInfo = `VSCode: ${vscode.version}, Node.js: ${process.version}, Architecture: ${os.arch()}`
-								const providerAndModel = `${(await getGlobalState(this.getContext(), "apiProvider")) as string} / ${this.api.getModel().id}`
+								const providerAndModel = `${(await getWorkspaceState(this.getContext(), "apiProvider")) as string} / ${this.api.getModel().id}`
 
 								// Ask user for confirmation
 								const bugReportData = JSON.stringify({
@@ -4244,7 +4244,7 @@ export class Task {
 		}
 
 		// Used to know what models were used in the task if user wants to export metadata for error reporting purposes
-		const currentProviderId = (await getGlobalState(this.getContext(), "apiProvider")) as string
+		const currentProviderId = (await getWorkspaceState(this.getContext(), "apiProvider")) as string
 		if (currentProviderId && this.api.getModel().id) {
 			try {
 				await this.modelContextTracker.recordModelUsage(currentProviderId, this.api.getModel().id, this.chatSettings.mode)

src/extension.ts

@@ -22,6 +22,7 @@ import { WebviewProviderType as WebviewProviderTypeEnum } from "@shared/proto/ui
 import { WebviewProviderType } from "./shared/webview/types"
 import { sendHistoryButtonClickedEvent } from "./core/controller/ui/subscribeToHistoryButtonClicked"
 import { sendAccountButtonClickedEvent } from "./core/controller/ui/subscribeToAccountButtonClicked"
+import { migratePlanActGlobalToWorkspaceStorage } from "./core/storage/state"
 
 /*
 Built using https://github.com/microsoft/vscode-webview-ui-toolkit
@@ -44,6 +45,9 @@ export async function activate(context: vscode.ExtensionContext) {
 	Logger.initialize(outputChannel)
 	Logger.log("Cline extension activated")
 
+	// Migrate global storage values to workspace storage (one-time cleanup)
+	await migratePlanActGlobalToWorkspaceStorage(context)
+
 	// Version checking for autoupdate notification
 	const currentVersion = context.extension.packageJSON.version
 	const previousVersion = context.globalState.get<string>("clineVersion")

src/services/test/TestServer.ts

@@ -13,7 +13,13 @@ import {
 	getFileChanges,
 	calculateToolSuccessRate,
 } from "./GitHelper"
-import { updateGlobalState, getAllExtensionState, updateApiConfiguration, storeSecret } from "@core/storage/state"
+import {
+	updateGlobalState,
+	getAllExtensionState,
+	updateApiConfiguration,
+	storeSecret,
+	updateWorkspaceState,
+} from "@core/storage/state"
 import { ClineAsk, ExtensionMessage } from "@shared/ExtensionMessage"
 import { ApiProvider } from "@shared/api"
 import { HistoryItem } from "@shared/HistoryItem"
@@ -272,7 +278,7 @@ export function createTestServer(webviewProvider?: WebviewProvider): http.Server
 						await updateApiConfiguration(visibleWebview.controller.context, updatedConfig)
 
 						// Update global state to use cline provider
-						await updateGlobalState(visibleWebview.controller.context, "apiProvider", "cline" as ApiProvider)
+						await updateWorkspaceState(visibleWebview.controller.context, "apiProvider", "cline" as ApiProvider)
 
 						// Post state to webview to reflect changes
 						await visibleWebview.controller.postStateToWebview()