zgsm-ai
diff --git a/‎packages/build/src/__tests__/index.test.ts‎
Lines changed: 2 additions & 2 deletions b/‎packages/build/src/__tests__/index.test.ts‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎packages/types/src/global-settings.ts‎
Lines changed: 1 addition & 0 deletions b/‎packages/types/src/global-settings.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎packages/types/src/message.ts‎
Lines changed: 1 addition & 0 deletions b/‎packages/types/src/message.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎packages/types/src/provider-settings.ts‎
Lines changed: 1 addition & 0 deletions b/‎packages/types/src/provider-settings.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎packages/types/src/vscode.ts‎
Lines changed: 1 addition & 1 deletion b/‎packages/types/src/vscode.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/activate/registerCommands.ts‎
Lines changed: 3 additions & 3 deletions b/‎src/activate/registerCommands.ts‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/api/providers/__tests__/ollama.spec.ts‎
Lines changed: 11 additions & 0 deletions b/‎src/api/providers/__tests__/ollama.spec.ts‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎src/api/providers/native-ollama.ts‎
Lines changed: 12 additions & 3 deletions b/‎src/api/providers/native-ollama.ts‎
Lines changed: 12 additions & 3 deletions
diff --git a/‎src/api/providers/ollama.ts‎
Lines changed: 11 additions & 1 deletion b/‎src/api/providers/ollama.ts‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎src/core/tools/generateImageTool.ts‎
Lines changed: 9 additions & 4 deletions b/‎src/core/tools/generateImageTool.ts‎
Lines changed: 9 additions & 4 deletions
@@ -68,7 +68,7 @@ describe("generatePackageJson", () => {
 								when: "activeWebviewPanelId == zgsm.TabPanelProvider",
 							},
 							{
-								command: "zgsm.accountButtonClicked",
+								command: "zgsm.cloudButtonClicked",
 								group: "navigation@6",
 								when: "activeWebviewPanelId == zgsm.TabPanelProvider",
 							},
@@ -181,7 +181,7 @@ describe("generatePackageJson", () => {
 							when: "activeWebviewPanelId == roo-code-nightly.TabPanelProvider",
 						},
 						{
-							command: "roo-code-nightly.accountButtonClicked",
+							command: "roo-code-nightly.cloudButtonClicked",
 							group: "navigation@6",
 							when: "activeWebviewPanelId == roo-code-nightly.TabPanelProvider",
 						},
 
@@ -185,6 +185,7 @@ export const SECRET_STATE_KEYS = [
 	"awsSecretKey",
 	"awsSessionToken",
 	"openAiApiKey",
+	"ollamaApiKey",
 	"geminiApiKey",
 	"openAiNativeApiKey",
 	"cerebrasApiKey",
 
@@ -146,6 +146,7 @@ export const clineSays = [
 	"api_req_retry_delayed",
 	"api_req_deleted",
 	"text",
+	"image",
 	"reasoning",
 	"completion_result",
 	"user_feedback",
 
@@ -202,6 +202,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({
 
@@ -47,7 +47,7 @@ export const commandIds = [
 	"historyButtonClicked",
 	"marketplaceButtonClicked",
 	"popoutButtonClicked",
-	"accountButtonClicked",
+	"cloudButtonClicked",
 	"settingsButtonClicked",
 
 	"openInNewTab",
 
@@ -87,16 +87,16 @@ export const registerCommands = (options: RegisterCommandOptions) => {
 
 const getCommandsMap = ({ context, outputChannel, provider }: RegisterCommandOptions): Record<CommandId, any> => ({
 	activationCompleted: () => {},
-	accountButtonClicked: () => {
+	cloudButtonClicked: () => {
 		const visibleProvider = getVisibleProviderOrLog(outputChannel)
 
 		if (!visibleProvider) {
 			return
 		}
 
-		TelemetryService.instance.captureTitleButtonClicked("account")
+		TelemetryService.instance.captureTitleButtonClicked("cloud")
 
-		visibleProvider.postMessageToWebview({ type: "action", action: "accountButtonClicked" })
+		visibleProvider.postMessageToWebview({ type: "action", action: "cloudButtonClicked" })
 	},
 	plusButtonClicked: async () => {
 		const visibleProvider = getVisibleProviderOrLog(outputChannel)
 
@@ -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", () => {
 
@@ -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}`)
 			}
 
@@ -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,
 		})
 	}
 
 
@@ -8,7 +8,6 @@ import { fileExistsAtPath } from "../../utils/fs"
 import { getReadablePath } from "../../utils/path"
 import { isPathOutsideWorkspace } from "../../utils/pathUtils"
 import { EXPERIMENT_IDS, experiments } from "../../shared/experiments"
-import { safeWriteJson } from "../../utils/safeWriteJson"
 import { OpenRouterHandler } from "../../api/providers/openrouter"
 
 // Hardcoded list of image generation models for now
@@ -237,12 +236,18 @@ export async function generateImageTool(
 
 			cline.didEditFile = true
 
-			// Display the generated image in the chat using a text message with the image
-			await cline.say("text", getReadablePath(cline.cwd, finalPath), [result.imageData])
-
 			// Record successful tool usage
 			cline.recordToolUsage("generate_image")
 
+			// Get the webview URI for the image
+			const provider = cline.providerRef.deref()
+			const fullImagePath = path.join(cline.cwd, finalPath)
+
+			// Convert to webview URI if provider is available
+			const imageUri = provider?.convertToWebviewUri?.(fullImagePath) ?? vscode.Uri.file(fullImagePath).toString()
+
+			// Send the image with the webview URI
+			await cline.say("image", JSON.stringify({ imageUri, imagePath: fullImagePath }))
 			pushToolResult(formatResponse.toolResult(getReadablePath(cline.cwd, finalPath)))
 
 			return