feat: add Ollama API key support for Turbo mode

packages/types/src/global-settings.ts

@@ -174,6 +174,7 @@ export const SECRET_STATE_KEYS = [
 	"awsSecretKey",
 	"awsSessionToken",
 	"openAiApiKey",
+	"ollamaApiKey",
 	"geminiApiKey",
 	"openAiNativeApiKey",
 	"cerebrasApiKey",

packages/types/src/provider-settings.ts

@@ -186,6 +186,7 @@ const openAiSchema = baseProviderSettingsSchema.extend({
 const ollamaSchema = baseProviderSettingsSchema.extend({
 	ollamaModelId: z.string().optional(),
 	ollamaBaseUrl: z.string().optional(),
+	ollamaApiKey: z.string().optional(),
 })
 
 const vsCodeLmSchema = baseProviderSettingsSchema.extend({

src/api/providers/__tests__/ollama.spec.ts

@@ -92,6 +92,17 @@ describe("OllamaHandler", () => {
 			})
 			expect(handlerWithoutUrl).toBeInstanceOf(OllamaHandler)
 		})
+
+		it("should use API key when provided", () => {
+			const handlerWithApiKey = new OllamaHandler({
+				apiModelId: "llama2",
+				ollamaModelId: "llama2",
+				ollamaBaseUrl: "https://ollama.com",
+				ollamaApiKey: "test-api-key",
+			})
+			expect(handlerWithApiKey).toBeInstanceOf(OllamaHandler)
+			// The API key will be used in the Authorization header
+		})
 	})
 
 	describe("createMessage", () => {

src/api/providers/native-ollama.ts

@@ -1,5 +1,5 @@
 import { Anthropic } from "@anthropic-ai/sdk"
-import { Message, Ollama } from "ollama"
+import { Message, Ollama, type Config as OllamaOptions } from "ollama"
 import { ModelInfo, openAiModelInfoSaneDefaults, DEEP_SEEK_DEFAULT_TEMPERATURE } from "@roo-code/types"
 import { ApiStream } from "../transform/stream"
 import { BaseProvider } from "./base-provider"
@@ -140,10 +140,19 @@ export class NativeOllamaHandler extends BaseProvider implements SingleCompletio
 	private ensureClient(): Ollama {
 		if (!this.client) {
 			try {
-				this.client = new Ollama({
+				const clientOptions: OllamaOptions = {
 					host: this.options.ollamaBaseUrl || "http://localhost:11434",
 					// Note: The ollama npm package handles timeouts internally
-				})
+				}
+
+				// Add API key if provided (for Ollama cloud or authenticated instances)
+				if (this.options.ollamaApiKey) {
+					clientOptions.headers = {
+						Authorization: `Bearer ${this.options.ollamaApiKey}`,
+					}
+				}
+
+				this.client = new Ollama(clientOptions)
 			} catch (error: any) {
 				throw new Error(`Error creating Ollama client: ${error.message}`)
 			}

src/api/providers/ollama.ts

@@ -25,10 +25,20 @@ export class OllamaHandler extends BaseProvider implements SingleCompletionHandl
 		super()
 		this.options = options
 
+		// Use the API key if provided (for Ollama cloud or authenticated instances)
+		// Otherwise use "ollama" as a placeholder for local instances
+		const apiKey = this.options.ollamaApiKey || "ollama"
+
+		const headers: Record<string, string> = {}
+		if (this.options.ollamaApiKey) {
+			headers["Authorization"] = `Bearer ${this.options.ollamaApiKey}`
+		}
+
 		this.client = new OpenAI({
 			baseURL: (this.options.ollamaBaseUrl || "http://localhost:11434") + "/v1",
-			apiKey: "ollama",
+			apiKey: apiKey,
 			timeout: getApiRequestTimeout(),
+			defaultHeaders: headers,
 		})
 	}
 

webview-ui/src/components/settings/providers/Ollama.tsx

@@ -86,6 +86,19 @@ export const Ollama = ({ apiConfiguration, setApiConfigurationField }: OllamaPro
 				className="w-full">
 				<label className="block font-medium mb-1">{t("settings:providers.ollama.baseUrl")}</label>
 			</VSCodeTextField>
+			{apiConfiguration?.ollamaBaseUrl && (
+				<VSCodeTextField
+					value={apiConfiguration?.ollamaApiKey || ""}
+					type="password"
+					onInput={handleInputChange("ollamaApiKey")}
+					placeholder={t("settings:placeholders.apiKey")}
+					className="w-full">
+					<label className="block font-medium mb-1">{t("settings:providers.ollama.apiKey")}</label>
+					<div className="text-xs text-vscode-descriptionForeground mt-1">
+						{t("settings:providers.ollama.apiKeyHelp")}
+					</div>
+				</VSCodeTextField>
+			)}
 			<VSCodeTextField
 				value={apiConfiguration?.ollamaModelId || ""}
 				onInput={handleInputChange("ollamaModelId")}

webview-ui/src/i18n/locales/en/settings.json

@@ -367,6 +367,8 @@
 		"ollama": {
 			"baseUrl": "Base URL (optional)",
 			"modelId": "Model ID",
+			"apiKey": "Ollama API Key",
+			"apiKeyHelp": "Optional API key for authenticated Ollama instances or cloud services. Leave empty for local installations.",
 			"description": "Ollama allows you to run models locally on your computer. For instructions on how to get started, see their quickstart guide.",
 			"warning": "Note: Roo Code uses complex prompts and works best with Claude models. Less capable models may not work as expected."
 		},