Adding diffs

package-lock.json

@@ -15,7 +15,7 @@
 				"@aws-sdk/client-bedrock-runtime": "^3.758.0",
 				"@bufbuild/protobuf": "^2.2.5",
 				"@google-cloud/vertexai": "^1.9.3",
-				"@google/genai": "^0.13.0",
+				"@google/genai": "1.0.0",
 				"@grpc/grpc-js": "^1.9.15",
 				"@grpc/reflection": "^1.0.4",
 				"@mistralai/mistralai": "^1.5.0",
@@ -5295,9 +5295,9 @@
 			}
 		},
 		"node_modules/@google/genai": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@google/genai/-/genai-0.13.0.tgz",
-			"integrity": "sha512-eaEncWt875H7046T04mOpxpHJUM+jLIljEf+5QctRyOeChylE/nhpwm1bZWTRWoOu/t46R9r+PmgsJFhTpE7tQ==",
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@google/genai/-/genai-1.0.0.tgz",
+			"integrity": "sha512-IQiL8UlPblGDrMhTuiHZbfMDVx0KY3eYkmB5Ro9wwyXovYCFIhL5ZC7LP42FjFUj0eWUa4Auo8Ixqf2dqx9JjA==",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"google-auth-library": "^9.14.2",
@@ -5307,6 +5307,9 @@
 			},
 			"engines": {
 				"node": ">=18.0.0"
+			},
+			"peerDependencies": {
+				"@modelcontextprotocol/sdk": "^1.11.0"
 			}
 		},
 		"node_modules/@grpc/grpc-js": {
@@ -7600,13 +7603,15 @@
 			"license": "BSD-2-Clause"
 		},
 		"node_modules/@modelcontextprotocol/sdk": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.1.tgz",
-			"integrity": "sha512-9LfmxKTb1v+vUS1/emSk1f5ePmTLkb9Le9AxOB5T0XM59EUumwcS45z05h7aiZx3GI0Bl7mjb3FMEglYj+acuQ==",
+			"version": "1.11.4",
+			"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.4.tgz",
+			"integrity": "sha512-OTbhe5slIjiOtLxXhKalkKGhIQrwvhgCDs/C2r8kcBTy5HR/g43aDQU0l7r8O0VGbJPTNJvDc7ZdQMdQDJXmbw==",
+			"license": "MIT",
 			"dependencies": {
+				"ajv": "^8.17.1",
 				"content-type": "^1.0.5",
 				"cors": "^2.8.5",
-				"cross-spawn": "^7.0.3",
+				"cross-spawn": "^7.0.5",
 				"eventsource": "^3.0.2",
 				"express": "^5.0.1",
 				"express-rate-limit": "^7.5.0",
@@ -7619,6 +7624,28 @@
 				"node": ">=18"
 			}
 		},
+		"node_modules/@modelcontextprotocol/sdk/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/@modelcontextprotocol/sdk/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"license": "MIT"
+		},
 		"node_modules/@nodelib/fs.scandir": {
 			"version": "2.1.5",
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -15365,7 +15392,6 @@
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
 			"integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
-			"dev": true,
 			"funding": [
 				{
 					"type": "github",
@@ -21468,6 +21494,7 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz",
 			"integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=16.20.0"
 			}
@@ -22497,7 +22524,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
 			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -29923,9 +29949,9 @@
 			}
 		},
 		"@google/genai": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@google/genai/-/genai-0.13.0.tgz",
-			"integrity": "sha512-eaEncWt875H7046T04mOpxpHJUM+jLIljEf+5QctRyOeChylE/nhpwm1bZWTRWoOu/t46R9r+PmgsJFhTpE7tQ==",
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@google/genai/-/genai-1.0.0.tgz",
+			"integrity": "sha512-IQiL8UlPblGDrMhTuiHZbfMDVx0KY3eYkmB5Ro9wwyXovYCFIhL5ZC7LP42FjFUj0eWUa4Auo8Ixqf2dqx9JjA==",
 			"requires": {
 				"google-auth-library": "^9.14.2",
 				"ws": "^8.18.0",
@@ -31508,13 +31534,14 @@
 			"integrity": "sha512-Y28PR25bHXUg88kCV7nivXrP2Nj2RueZ3/l/jdx6J9f8J4nsEGcgX0Qe6lt7Pa+J79+kPiJU3LguR6O/6zrLOw=="
 		},
 		"@modelcontextprotocol/sdk": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.1.tgz",
-			"integrity": "sha512-9LfmxKTb1v+vUS1/emSk1f5ePmTLkb9Le9AxOB5T0XM59EUumwcS45z05h7aiZx3GI0Bl7mjb3FMEglYj+acuQ==",
+			"version": "1.11.4",
+			"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.4.tgz",
+			"integrity": "sha512-OTbhe5slIjiOtLxXhKalkKGhIQrwvhgCDs/C2r8kcBTy5HR/g43aDQU0l7r8O0VGbJPTNJvDc7ZdQMdQDJXmbw==",
 			"requires": {
+				"ajv": "^8.17.1",
 				"content-type": "^1.0.5",
 				"cors": "^2.8.5",
-				"cross-spawn": "^7.0.3",
+				"cross-spawn": "^7.0.5",
 				"eventsource": "^3.0.2",
 				"express": "^5.0.1",
 				"express-rate-limit": "^7.5.0",
@@ -31522,6 +31549,24 @@
 				"raw-body": "^3.0.0",
 				"zod": "^3.23.8",
 				"zod-to-json-schema": "^3.24.1"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "8.17.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+					"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+					"requires": {
+						"fast-deep-equal": "^3.1.3",
+						"fast-uri": "^3.0.1",
+						"json-schema-traverse": "^1.0.0",
+						"require-from-string": "^2.0.2"
+					}
+				},
+				"json-schema-traverse": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+				}
 			}
 		},
 		"@nodelib/fs.scandir": {
@@ -37129,8 +37174,7 @@
 		"fast-uri": {
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
-			"integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
-			"dev": true
+			"integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw=="
 		},
 		"fast-xml-parser": {
 			"version": "4.4.1",
@@ -41994,8 +42038,7 @@
 		"require-from-string": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-			"dev": true
+			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
 		},
 		"require-in-the-middle": {
 			"version": "7.5.2",

package.json

@@ -350,7 +350,7 @@
 		"@aws-sdk/client-bedrock-runtime": "^3.758.0",
 		"@bufbuild/protobuf": "^2.2.5",
 		"@google-cloud/vertexai": "^1.9.3",
-		"@google/genai": "^0.13.0",
+		"@google/genai": "1.0.0",
 		"@grpc/grpc-js": "^1.9.15",
 		"@grpc/reflection": "^1.0.4",
 		"@mistralai/mistralai": "^1.5.0",

src/api/providers/gemini.ts

@@ -99,9 +99,14 @@ export class GeminiHandler implements ApiHandler {
 		if (info.thinkingConfig?.outputPrice !== undefined && maxBudget > 0) {
 			requestConfig.thinkingConfig = {
 				thinkingBudget: thinkingBudget,
+				includeThoughts: true,
+			}
+		}
+		if (this.options.geminiEnableThoughts) {
+			requestConfig.thinkingConfig = {
+				includeThoughts: true,
 			}
 		}
-
 		// Generate content using the configured parameters
 		const sdkCallStartTime = Date.now()
 		let sdkFirstChunkTime: number | undefined
@@ -112,7 +117,6 @@ export class GeminiHandler implements ApiHandler {
 		let outputTokens = 0
 		let cacheReadTokens = 0
 		let lastUsageMetadata: GenerateContentResponseUsageMetadata | undefined
-
 		try {
 			const result = await this.client.models.generateContentStream({
 				model: modelId,
@@ -130,13 +134,36 @@ export class GeminiHandler implements ApiHandler {
 					isFirstSdkChunk = false
 				}
 
+				const candidateForThoughts = chunk?.candidates?.[0]
+				const partsForThoughts = candidateForThoughts?.content?.parts
+				let thoughts = "" // Initialize as empty string
+
+				if (partsForThoughts) {
+					// This ensures partsForThoughts is a Part[] array
+					for (const part of partsForThoughts) {
+						if (part.thought && part.text) {
+							// Ensure part.text exists
+							// Handle the thought part
+							thoughts += part.text + "\n" // Append thought and a newline
+						}
+					}
+				}
+
+				if (thoughts.trim() !== "") {
+					console.info("Yielding thoughts as reasoning:", thoughts.trim())
+					yield {
+						type: "reasoning",
+						reasoning: thoughts.trim(),
+					}
+					thoughts = "" // Reset thoughts after yielding
+				}
+
 				if (chunk.text) {
 					yield {
 						type: "text",
 						text: chunk.text,
 					}
 				}
-
 				if (chunk.usageMetadata) {
 					lastUsageMetadata = chunk.usageMetadata
 					promptTokens = lastUsageMetadata.promptTokenCount ?? promptTokens

src/shared/api.ts

@@ -88,6 +88,7 @@ export interface ApiHandlerOptions {
 	xaiApiKey?: string
 	thinkingBudgetTokens?: number
 	reasoningEffort?: string
+	geminiEnableThoughts?: boolean
 	sambanovaApiKey?: string
 	requestTimeoutMs?: number
 	onRetryAttempt?: (attempt: number, maxRetries: number, delay: number, error: any) => void

webview-ui/src/components/settings/ApiOptions.tsx

@@ -403,6 +403,18 @@ const ApiOptions = ({
 						/>
 					)}
 
+					<VSCodeCheckbox
+						checked={!!apiConfiguration?.geminiEnableThoughts}
+						onChange={(e: any) => {
+							setApiConfiguration({
+								...apiConfiguration,
+								geminiEnableThoughts: (e.target as HTMLInputElement).checked,
+							} as ApiConfiguration)
+						}}
+						style={{ display: "block", marginTop: "5px" }}>
+						Enable thoughts
+					</VSCodeCheckbox>
+
 					<p
 						style={{
 							fontSize: "12px",
@@ -1002,6 +1014,18 @@ const ApiOptions = ({
 						/>
 					)}
 
+					<VSCodeCheckbox
+						checked={!!apiConfiguration?.geminiEnableThoughts}
+						onChange={(e: any) => {
+							setApiConfiguration({
+								...apiConfiguration,
+								geminiEnableThoughts: (e.target as HTMLInputElement).checked,
+							} as ApiConfiguration)
+						}}
+						style={{ display: "block", marginTop: "5px" }}>
+						Enable thoughts
+					</VSCodeCheckbox>
+
 					<p
 						style={{
 							fontSize: "12px",
@@ -1021,14 +1045,16 @@ const ApiOptions = ({
 						)}
 					</p>
 
-					{/* Add Thinking Budget Slider specifically for gemini-2.5-flash-preview-04-17 */}
-					{selectedProvider === "gemini" && selectedModelId === "gemini-2.5-flash-preview-04-17" && (
-						<ThinkingBudgetSlider
-							apiConfiguration={apiConfiguration}
-							setApiConfiguration={setApiConfiguration}
-							maxBudget={selectedModelInfo.thinkingConfig?.maxBudget}
-						/>
-					)}
+					{/* Add Thinking Budget Slider specifically for gemini-2.5-flash-preview models */}
+					{selectedProvider === "gemini" &&
+						(selectedModelId === "gemini-2.5-flash-preview-04-17" ||
+							selectedModelId === "gemini-2.5-flash-preview-05-20") && (
+							<ThinkingBudgetSlider
+								apiConfiguration={apiConfiguration}
+								setApiConfiguration={setApiConfiguration}
+								maxBudget={selectedModelInfo.thinkingConfig?.maxBudget}
+							/>
+						)}
 				</div>
 			)}