diff --git a/packages/types/src/provider-settings.ts b/packages/types/src/provider-settings.ts
index 8434158541..97c37f7fc7 100644
--- a/packages/types/src/provider-settings.ts
+++ b/packages/types/src/provider-settings.ts
@@ -384,6 +384,7 @@ export type ZaiApiLine = z.infer<typeof zaiApiLineSchema>
 const zaiSchema = apiModelIdProviderModelSchema.extend({
 	zaiApiKey: z.string().optional(),
 	zaiApiLine: zaiApiLineSchema.optional(),
+	zaiEnableThinking: z.boolean().optional(),
 })
 
 const fireworksSchema = apiModelIdProviderModelSchema.extend({
diff --git a/src/api/providers/__tests__/zai.spec.ts b/src/api/providers/__tests__/zai.spec.ts
index 383394b703..dd6d10efa6 100644
--- a/src/api/providers/__tests__/zai.spec.ts
+++ b/src/api/providers/__tests__/zai.spec.ts
@@ -262,5 +262,97 @@ describe("ZAiHandler", () => {
 				undefined,
 			)
 		})
+
+		it("should include enable_thinking parameter when zaiEnableThinking is true", async () => {
+			const handlerWithThinking = new ZAiHandler({
+				zaiApiKey: "test-zai-api-key",
+				zaiApiLine: "international",
+				zaiEnableThinking: true,
+			})
+
+			mockCreate.mockImplementationOnce(() => {
+				return {
+					[Symbol.asyncIterator]: () => ({
+						async next() {
+							return { done: true }
+						},
+					}),
+				}
+			})
+
+			const systemPrompt = "Test system prompt"
+			const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Test message" }]
+
+			const messageGenerator = handlerWithThinking.createMessage(systemPrompt, messages)
+			await messageGenerator.next()
+
+			expect(mockCreate).toHaveBeenCalledWith(
+				expect.objectContaining({
+					enable_thinking: true,
+				}),
+				undefined,
+			)
+		})
+
+		it("should not include enable_thinking parameter when zaiEnableThinking is false", async () => {
+			const handlerWithoutThinking = new ZAiHandler({
+				zaiApiKey: "test-zai-api-key",
+				zaiApiLine: "international",
+				zaiEnableThinking: false,
+			})
+
+			mockCreate.mockImplementationOnce(() => {
+				return {
+					[Symbol.asyncIterator]: () => ({
+						async next() {
+							return { done: true }
+						},
+					}),
+				}
+			})
+
+			const systemPrompt = "Test system prompt"
+			const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Test message" }]
+
+			const messageGenerator = handlerWithoutThinking.createMessage(systemPrompt, messages)
+			await messageGenerator.next()
+
+			expect(mockCreate).toHaveBeenCalledWith(
+				expect.not.objectContaining({
+					enable_thinking: true,
+				}),
+				undefined,
+			)
+		})
+
+		it("should not include enable_thinking parameter when zaiEnableThinking is undefined", async () => {
+			const handlerDefault = new ZAiHandler({
+				zaiApiKey: "test-zai-api-key",
+				zaiApiLine: "international",
+			})
+
+			mockCreate.mockImplementationOnce(() => {
+				return {
+					[Symbol.asyncIterator]: () => ({
+						async next() {
+							return { done: true }
+						},
+					}),
+				}
+			})
+
+			const systemPrompt = "Test system prompt"
+			const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Test message" }]
+
+			const messageGenerator = handlerDefault.createMessage(systemPrompt, messages)
+			await messageGenerator.next()
+
+			expect(mockCreate).toHaveBeenCalledWith(
+				expect.not.objectContaining({
+					enable_thinking: true,
+				}),
+				undefined,
+			)
+		})
 	})
 })
diff --git a/src/api/providers/zai.ts b/src/api/providers/zai.ts
index ce5aab9dd9..45abb46d0c 100644
--- a/src/api/providers/zai.ts
+++ b/src/api/providers/zai.ts
@@ -8,8 +8,12 @@ import {
 	ZAI_DEFAULT_TEMPERATURE,
 	zaiApiLineConfigs,
 } from "@roo-code/types"
+import { Anthropic } from "@anthropic-ai/sdk"
+import OpenAI from "openai"
 
 import type { ApiHandlerOptions } from "../../shared/api"
+import type { ApiHandlerCreateMessageMetadata } from "../index"
+import { convertToOpenAiMessages } from "../transform/openai-format"
 
 import { BaseOpenAiCompatibleProvider } from "./base-openai-compatible-provider"
 
@@ -29,4 +33,43 @@ export class ZAiHandler extends BaseOpenAiCompatibleProvider<InternationalZAiMod
 			defaultTemperature: ZAI_DEFAULT_TEMPERATURE,
 		})
 	}
+
+	protected override createStream(
+		systemPrompt: string,
+		messages: Anthropic.Messages.MessageParam[],
+		metadata?: ApiHandlerCreateMessageMetadata,
+		requestOptions?: OpenAI.RequestOptions,
+	) {
+		const {
+			id: model,
+			info: { maxTokens: max_tokens },
+		} = this.getModel()
+
+		const temperature = this.options.modelTemperature ?? ZAI_DEFAULT_TEMPERATURE
+
+		// Build base parameters
+		const params: OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming = {
+			model,
+			max_tokens,
+			temperature,
+			messages: [{ role: "system", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
+			stream: true,
+			stream_options: { include_usage: true },
+		}
+
+		// Add thinking parameter for models that support it (GLM-4.6, etc.)
+		// Only add if explicitly enabled via the zaiEnableThinking setting
+		if (this.options.zaiEnableThinking === true) {
+			// Z AI uses a custom parameter for thinking mode
+			// This follows the pattern used by other providers with thinking support
+			;(params as any).enable_thinking = true
+		}
+
+		try {
+			return this.client.chat.completions.create(params, requestOptions)
+		} catch (error) {
+			const errorMessage = error instanceof Error ? error.message : String(error)
+			throw new Error(`Z AI completion error: ${errorMessage}`)
+		}
+	}
 }
diff --git a/webview-ui/src/components/settings/providers/ZAi.tsx b/webview-ui/src/components/settings/providers/ZAi.tsx
index c7f44510c1..9b883eb071 100644
--- a/webview-ui/src/components/settings/providers/ZAi.tsx
+++ b/webview-ui/src/components/settings/providers/ZAi.tsx
@@ -1,5 +1,5 @@
 import { useCallback } from "react"
-import { VSCodeTextField, VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react"
+import { VSCodeTextField, VSCodeDropdown, VSCodeOption, VSCodeCheckbox } from "@vscode/webview-ui-toolkit/react"
 
 import { zaiApiLineConfigs, zaiApiLineSchema, type ProviderSettings } from "@roo-code/types"
 
@@ -28,6 +28,13 @@ export const ZAi = ({ apiConfiguration, setApiConfigurationField }: ZAiProps) =>
 		[setApiConfigurationField],
 	)
 
+	const handleCheckboxChange = useCallback(
+		(field: keyof ProviderSettings) => () => {
+			setApiConfigurationField(field, !apiConfiguration?.[field])
+		},
+		[setApiConfigurationField, apiConfiguration],
+	)
+
 	return (
 		<>
 			<div>
@@ -73,6 +80,16 @@ export const ZAi = ({ apiConfiguration, setApiConfigurationField }: ZAiProps) =>
 					</VSCodeButtonLink>
 				)}
 			</div>
+			<div>
+				<VSCodeCheckbox
+					checked={apiConfiguration?.zaiEnableThinking || false}
+					onChange={handleCheckboxChange("zaiEnableThinking")}>
+					<label className="font-medium">{t("settings:providers.zaiEnableThinking")}</label>
+				</VSCodeCheckbox>
+				<div className="text-xs text-vscode-descriptionForeground mt-1 ml-6">
+					{t("settings:providers.zaiEnableThinkingDescription")}
+				</div>
+			</div>
 		</>
 	)
 }
diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json
index aa3199e8e8..ade692af3a 100644
--- a/webview-ui/src/i18n/locales/en/settings.json
+++ b/webview-ui/src/i18n/locales/en/settings.json
@@ -302,6 +302,8 @@
 		"getZaiApiKey": "Get Z AI API Key",
 		"zaiEntrypoint": "Z AI Entrypoint",
 		"zaiEntrypointDescription": "Please select the appropriate API entrypoint based on your location. If you are in China, choose open.bigmodel.cn. Otherwise, choose api.z.ai.",
+		"zaiEnableThinking": "Enable Thinking Mode",
+		"zaiEnableThinkingDescription": "Enable thinking/reasoning mode for models that support it (e.g., GLM-4.6, DeepSeek v3.2). This allows models to show their reasoning process before providing answers.",
 		"geminiApiKey": "Gemini API Key",
 		"getGroqApiKey": "Get Groq API Key",
 		"groqApiKey": "Groq API Key",