diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index aee91c77ee7..a7a46ecb7f2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -82,7 +82,6 @@ body:
         - DeepSeek
         - Featherless AI
         - Fireworks AI
-        - Glama
         - Google Gemini
         - Google Vertex AI
         - Groq
diff --git a/.roo/roomotes.yml b/.roo/roomotes.yml
index 33f6b3bd57c..0ea30b93af7 100644
--- a/.roo/roomotes.yml
+++ b/.roo/roomotes.yml
@@ -1,25 +1,6 @@
 version: "1.0"
 
 commands:
-    - name: Pull latest changes
-      run: git pull
-      timeout: 60
-      execution_phase: task_run
     - name: Install dependencies
       run: pnpm install
       timeout: 60
-      execution_phase: task_run
-
-github_events:
-    - event: issues.opened
-      action:
-          name: github.issue.fix
-    - event: issue_comment.created
-      action:
-          name: github.issue.comment.respond
-    - event: pull_request.opened
-      action:
-          name: github.pr.review
-    - event: pull_request_review_comment.created
-      action:
-          name: github.pr.comment.respond
diff --git a/apps/web-roo-code/src/app/terms/terms.md b/apps/web-roo-code/src/app/terms/terms.md
index 1880c6184ec..e5589909417 100644
--- a/apps/web-roo-code/src/app/terms/terms.md
+++ b/apps/web-roo-code/src/app/terms/terms.md
@@ -70,7 +70,7 @@ Customer may access and use the Service solely for its internal business purpose
 
 ## 6. Privacy & Data
 
-Roo Code's Privacy Notice ([https://roocode.com/privacy](https://roocode.com/privacy)) explains how Roo Code collects and handles personal information. If Customer requires a DPA, email [support@roocode.com](mailto:support@roocode.com).
+Roo Code's Privacy Notice ([https://roocode.com/privacy](https://roocode.com/privacy)) explains how Roo Code collects and handles personal information. If Customer requires a DPA, email [zgsm@sangfor.com.cn](mailto:zgsm@sangfor.com.cn).
 
 ## 7. Warranty Disclaimer
 
@@ -98,4 +98,4 @@ The caps in Section 2 apply to all claims under the Agreement, whether in contra
 
 **Roo Code, Inc.**  
 98 Graceland Dr, San Rafael, CA 94901 USA  
-Email: [support@roocode.com](mailto:support@roocode.com)
+Email: [zgsm@sangfor.com.cn](mailto:zgsm@sangfor.com.cn)
diff --git a/apps/web-roo-code/src/components/chromes/footer.tsx b/apps/web-roo-code/src/components/chromes/footer.tsx
index 91ce39e715e..18a96190e7a 100644
--- a/apps/web-roo-code/src/components/chromes/footer.tsx
+++ b/apps/web-roo-code/src/components/chromes/footer.tsx
@@ -225,7 +225,7 @@ export function Footer() {
 								<ul className="mt-6 space-y-4">
 									<li>
 										<a
-											href="mailto:support@roocode.com"
+											href="mailto:zgsm@sangfor.com.cn"
 											className="text-sm leading-6 text-muted-foreground transition-colors hover:text-foreground">
 											Contact
 										</a>
diff --git a/locales/es/CODE_OF_CONDUCT.md b/locales/es/CODE_OF_CONDUCT.md
index 149fbdb779f..62ddca4b06c 100644
--- a/locales/es/CODE_OF_CONDUCT.md
+++ b/locales/es/CODE_OF_CONDUCT.md
@@ -67,7 +67,7 @@ definida y aclarada aún más por los mantenedores del proyecto.
 ## Aplicación
 
 Los casos de comportamiento abusivo, acosador o de otro modo inaceptable pueden ser
-reportados contactando al equipo del proyecto en support@roocode.com. Todas las quejas
+reportados contactando al equipo del proyecto en zgsm@sangfor.com.cn. Todas las quejas
 serán revisadas e investigadas y resultarán en una respuesta que
 se considera necesaria y apropiada a las circunstancias. El equipo del proyecto está
 obligado a mantener la confidencialidad con respecto al informante de un incidente.
diff --git a/packages/cloud/src/TelemetryClient.ts b/packages/cloud/src/TelemetryClient.ts
index f4b05feed53..f8e8640323a 100644
--- a/packages/cloud/src/TelemetryClient.ts
+++ b/packages/cloud/src/TelemetryClient.ts
@@ -69,9 +69,7 @@ abstract class BaseTelemetryClient implements TelemetryClient {
 
 	public abstract capture(event: TelemetryEvent): Promise<void>
 
-	public captureException(_error: Error, _additionalProperties?: Record<string, unknown>): void {
-		// No-op - exception capture is only supported by PostHog
-	}
+	public async captureException(_error: Error, _additionalProperties?: Record<string, unknown>): Promise<void> {}
 
 	public setProvider(provider: TelemetryPropertiesProvider): void {
 		this.providerRef = new WeakRef(provider)
diff --git a/packages/evals/src/cli/utils.ts b/packages/evals/src/cli/utils.ts
index e2794658840..0bea2ac54c5 100644
--- a/packages/evals/src/cli/utils.ts
+++ b/packages/evals/src/cli/utils.ts
@@ -20,7 +20,7 @@ export const isDockerContainer = () => {
 
 export const resetEvalsRepo = async ({ run, cwd }: { run: Run; cwd: string }) => {
 	await execa({ cwd })`git config user.name "CoStrict"`
-	await execa({ cwd })`git config user.email "support@roocode.com"`
+	await execa({ cwd })`git config user.email "zgsm@sangfor.com.cn"`
 	await execa({ cwd })`git checkout -f`
 	await execa({ cwd })`git clean -fd`
 	await execa({ cwd })`git checkout -b runs/${run.id}-${crypto.randomUUID().slice(0, 8)} main`
diff --git a/packages/telemetry/src/BaseTelemetryClient.ts b/packages/telemetry/src/BaseTelemetryClient.ts
index 5f59e1643b7..ea9c1917c47 100644
--- a/packages/telemetry/src/BaseTelemetryClient.ts
+++ b/packages/telemetry/src/BaseTelemetryClient.ts
@@ -59,7 +59,7 @@ export abstract class BaseTelemetryClient implements TelemetryClient {
 
 	public abstract capture(event: TelemetryEvent): Promise<void>
 
-	public abstract captureException(error: Error, additionalProperties?: Record<string, unknown>): void
+	public abstract captureException(error: Error, additionalProperties?: Record<string, unknown>): Promise<void>
 
 	public setProvider(provider: TelemetryPropertiesProvider): void {
 		this.providerRef = new WeakRef(provider)
diff --git a/packages/telemetry/src/PostHogTelemetryClient.ts b/packages/telemetry/src/PostHogTelemetryClient.ts
index 32283de1e10..96f1b1373be 100644
--- a/packages/telemetry/src/PostHogTelemetryClient.ts
+++ b/packages/telemetry/src/PostHogTelemetryClient.ts
@@ -2,7 +2,16 @@ import { getClientId } from "./../../../src/utils/getClientId"
 import { PostHog } from "posthog-node"
 import * as vscode from "vscode"
 
-import { TelemetryEventName, type TelemetryEvent } from "@roo-code/types"
+import {
+	type TelemetryProperties,
+	type TelemetryEvent,
+	TelemetryEventName,
+	getErrorStatusCode,
+	getErrorMessage,
+	shouldReportApiErrorToTelemetry,
+	isApiProviderError,
+	extractApiProviderErrorProperties,
+} from "@roo-code/types"
 
 import { BaseTelemetryClient } from "./BaseTelemetryClient"
 
@@ -62,7 +71,10 @@ export class PostHogTelemetryClient extends BaseTelemetryClient {
 		})
 	}
 
-	public override captureException(error: Error, additionalProperties?: Record<string, unknown>): void {
+	public override async captureException(
+		error: Error,
+		additionalProperties?: Record<string, unknown>,
+	): Promise<void> {
 		if (!this.isTelemetryEnabled()) {
 			if (this.debug) {
 				console.info(`[PostHogTelemetryClient#captureException] Skipping exception: ${error.message}`)
@@ -71,11 +83,51 @@ export class PostHogTelemetryClient extends BaseTelemetryClient {
 			return
 		}
 
+		// Extract error status code and message for filtering.
+		const errorCode = getErrorStatusCode(error)
+		const errorMessage = getErrorMessage(error) ?? error.message
+
+		// Filter out expected errors (e.g., 402 billing, 429 rate limits)
+		if (!shouldReportApiErrorToTelemetry(errorCode, errorMessage)) {
+			if (this.debug) {
+				console.info(
+					`[PostHogTelemetryClient#captureException] Filtering out expected error: ${errorCode} - ${errorMessage}`,
+				)
+			}
+			return
+		}
+
 		if (this.debug) {
 			console.info(`[PostHogTelemetryClient#captureException] ${error.message}`)
 		}
 
-		this.client.captureException(error, this.distinctId, additionalProperties)
+		// Auto-extract properties from ApiProviderError and merge with additionalProperties.
+		// Explicit additionalProperties take precedence over auto-extracted properties.
+		let mergedProperties = additionalProperties
+
+		if (isApiProviderError(error)) {
+			const extractedProperties = extractApiProviderErrorProperties(error)
+			mergedProperties = { ...extractedProperties, ...additionalProperties }
+		}
+
+		// Override the error message with the extracted error message.
+		error.message = errorMessage
+
+		const provider = this.providerRef?.deref()
+		let telemetryProperties: TelemetryProperties | undefined = undefined
+
+		if (provider) {
+			try {
+				telemetryProperties = await provider.getTelemetryProperties()
+			} catch (_error) {
+				// Ignore.
+			}
+		}
+
+		this.client.captureException(error, this.distinctId, {
+			...mergedProperties,
+			$app_version: telemetryProperties?.appVersion,
+		})
 	}
 
 	/**
diff --git a/packages/telemetry/src/__tests__/PostHogTelemetryClient.test.ts b/packages/telemetry/src/__tests__/PostHogTelemetryClient.test.ts
index fab57287e9f..b15c023e851 100644
--- a/packages/telemetry/src/__tests__/PostHogTelemetryClient.test.ts
+++ b/packages/telemetry/src/__tests__/PostHogTelemetryClient.test.ts
@@ -1,11 +1,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-// npx vitest run src/__tests__/PostHogTelemetryClient.test.ts
+// pnpm --filter @roo-code/telemetry test src/__tests__/PostHogTelemetryClient.test.ts
 
 import * as vscode from "vscode"
 import { PostHog } from "posthog-node"
 
-import { type TelemetryPropertiesProvider, TelemetryEventName } from "@roo-code/types"
+import { type TelemetryPropertiesProvider, TelemetryEventName, ApiProviderError } from "@roo-code/types"
 
 import { PostHogTelemetryClient } from "../PostHogTelemetryClient"
 
@@ -43,6 +43,7 @@ describe("PostHogTelemetryClient", () => {
 
 		mockPostHogClient = {
 			capture: vi.fn(),
+			captureException: vi.fn(),
 			optIn: vi.fn(),
 			optOut: vi.fn(),
 			shutdown: vi.fn().mockResolvedValue(undefined),
@@ -377,6 +378,60 @@ describe("PostHogTelemetryClient", () => {
 		})
 	})
 
+	describe("captureException", () => {
+		it("should not capture exceptions when telemetry is disabled", async () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(false)
+
+			const error = new Error("Test error")
+			await client.captureException(error)
+
+			expect(mockPostHogClient.captureException).not.toHaveBeenCalled()
+		})
+
+		it("should capture exceptions with app version from provider", async () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			const mockProvider: TelemetryPropertiesProvider = {
+				getTelemetryProperties: vi.fn().mockResolvedValue({
+					appVersion: "1.0.0",
+					vscodeVersion: "1.60.0",
+					platform: "darwin",
+					editorName: "vscode",
+					language: "en",
+					mode: "code",
+				}),
+			}
+
+			client.setProvider(mockProvider)
+
+			const error = new Error("Test error")
+			await client.captureException(error, { customProp: "value" })
+
+			expect(mockPostHogClient.captureException).toHaveBeenCalledWith(
+				error,
+				"test-client-id",
+				expect.objectContaining({
+					customProp: "value",
+					$app_version: "1.0.0",
+				}),
+			)
+		})
+
+		it("should capture exceptions with undefined app version when no provider is set", async () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			const error = new Error("Test error")
+			await client.captureException(error)
+
+			expect(mockPostHogClient.captureException).toHaveBeenCalledWith(error, "test-client-id", {
+				$app_version: undefined,
+			})
+		})
+	})
+
 	describe("shutdown", () => {
 		it("should call shutdown on the PostHog client", async () => {
 			const client = new PostHogTelemetryClient()
@@ -384,4 +439,202 @@ describe("PostHogTelemetryClient", () => {
 			expect(mockPostHogClient.shutdown).toHaveBeenCalled()
 		})
 	})
+
+	describe("captureException error filtering", () => {
+		it("should filter out 429 rate limit errors (via status property)", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			// Create an error with status property (like OpenAI SDK errors)
+			const error = Object.assign(new Error("Rate limit exceeded"), { status: 429 })
+			client.captureException(error)
+
+			// Should NOT capture 429 errors
+			expect(mockPostHogClient.captureException).not.toHaveBeenCalled()
+		})
+
+		it("should filter out 402 billing errors (via status property)", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			// Create an error with status 402 (Payment Required)
+			const error = Object.assign(new Error("Payment required"), { status: 402 })
+			client.captureException(error)
+
+			// Should NOT capture 402 errors
+			expect(mockPostHogClient.captureException).not.toHaveBeenCalled()
+		})
+
+		it("should filter out errors with '429' in message", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			const error = new Error("429 Rate limit exceeded: free-models-per-day")
+			client.captureException(error)
+
+			// Should NOT capture errors with 429 in message
+			expect(mockPostHogClient.captureException).not.toHaveBeenCalled()
+		})
+
+		it("should filter out errors containing 'rate limit' (case insensitive)", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			const error = new Error("Request failed due to Rate Limit")
+			client.captureException(error)
+
+			// Should NOT capture rate limit errors
+			expect(mockPostHogClient.captureException).not.toHaveBeenCalled()
+		})
+
+		it("should capture non-rate-limit errors", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			const error = new Error("Internal server error")
+			client.captureException(error)
+
+			expect(mockPostHogClient.captureException).toHaveBeenCalledWith(error, "test-client-id", {
+				$app_version: undefined,
+			})
+		})
+
+		it("should capture errors with non-429 status codes", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			const error = Object.assign(new Error("Internal server error"), { status: 500 })
+			client.captureException(error)
+
+			expect(mockPostHogClient.captureException).toHaveBeenCalledWith(error, "test-client-id", {
+				$app_version: undefined,
+			})
+		})
+
+		it("should use nested error message from OpenAI SDK error structure for filtering", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			// Create an error with nested metadata (like OpenRouter upstream errors)
+			const error = Object.assign(new Error("Request failed"), {
+				status: 429,
+				error: {
+					message: "Error details",
+					metadata: { raw: "Rate limit exceeded: free-models-per-day" },
+				},
+			})
+			client.captureException(error)
+
+			// Should NOT capture - the nested metadata.raw contains rate limit message
+			expect(mockPostHogClient.captureException).not.toHaveBeenCalled()
+		})
+
+		it("should capture errors with nested metadata and override error.message with extracted message", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			// Create an OpenAI SDK-like error with nested metadata (non-rate-limit error)
+			const error = Object.assign(new Error("Generic request failed"), {
+				status: 500,
+				error: {
+					message: "Nested error message",
+					metadata: { raw: "Upstream provider error: model overloaded" },
+				},
+			})
+
+			client.captureException(error)
+
+			// The implementation overrides error.message with the extracted message from getErrorMessage
+			expect(error.message).toBe("Upstream provider error: model overloaded")
+			expect(mockPostHogClient.captureException).toHaveBeenCalledWith(error, "test-client-id", {
+				$app_version: undefined,
+			})
+		})
+
+		it("should capture errors with nested error.message and override error.message with extracted message", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			// Create an OpenAI SDK-like error with nested message but no metadata.raw
+			const error = Object.assign(new Error("Generic request failed"), {
+				status: 500,
+				error: {
+					message: "Upstream provider: connection timeout",
+				},
+			})
+
+			client.captureException(error)
+
+			// The implementation overrides error.message with the extracted message from getErrorMessage
+			expect(error.message).toBe("Upstream provider: connection timeout")
+			expect(mockPostHogClient.captureException).toHaveBeenCalledWith(error, "test-client-id", {
+				$app_version: undefined,
+			})
+		})
+
+		it("should use primary message when no nested error structure exists", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			// Create an OpenAI SDK-like error without nested error object
+			const error = Object.assign(new Error("Primary error message"), {
+				status: 500,
+			})
+
+			client.captureException(error)
+
+			// Verify error message remains the primary message
+			expect(error.message).toBe("Primary error message")
+			expect(mockPostHogClient.captureException).toHaveBeenCalledWith(error, "test-client-id", {
+				$app_version: undefined,
+			})
+		})
+
+		it("should capture ApiProviderError and auto-extract properties", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			const error = new ApiProviderError("Test error", "OpenRouter", "gpt-4", "createMessage", 500)
+			client.captureException(error)
+
+			// The implementation auto-extracts properties from ApiProviderError
+			expect(mockPostHogClient.captureException).toHaveBeenCalledWith(error, "test-client-id", {
+				provider: "OpenRouter",
+				modelId: "gpt-4",
+				operation: "createMessage",
+				errorCode: 500,
+				$app_version: undefined,
+			})
+		})
+
+		it("should capture ApiProviderError with additionalProperties merged with auto-extracted properties", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			const error = new ApiProviderError("Test error", "OpenRouter", "gpt-4", "createMessage")
+			client.captureException(error, { customProperty: "value" })
+
+			// additionalProperties take precedence over auto-extracted properties
+			expect(mockPostHogClient.captureException).toHaveBeenCalledWith(error, "test-client-id", {
+				provider: "OpenRouter",
+				modelId: "gpt-4",
+				operation: "createMessage",
+				customProperty: "value",
+				$app_version: undefined,
+			})
+		})
+
+		it("should capture regular errors with additionalProperties", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			const error = new Error("Regular error")
+			client.captureException(error, { customProperty: "value" })
+
+			expect(mockPostHogClient.captureException).toHaveBeenCalledWith(error, "test-client-id", {
+				customProperty: "value",
+				$app_version: undefined,
+			})
+		})
+	})
 })
diff --git a/packages/telemetry/src/costrictTelemetry/telemetryClient.ts b/packages/telemetry/src/costrictTelemetry/telemetryClient.ts
index 685443b5c9d..2eeb6263ed9 100644
--- a/packages/telemetry/src/costrictTelemetry/telemetryClient.ts
+++ b/packages/telemetry/src/costrictTelemetry/telemetryClient.ts
@@ -182,7 +182,7 @@ export class CostrictTelemetryClient extends BaseTelemetryClient {
 		}
 	}
 
-	public captureException(_error: Error, _additionalProperties?: Record<string, unknown>): void {
+	public async captureException(_error: Error, _additionalProperties?: Record<string, unknown>): Promise<void> {
 		// todo - exception capture
 	}
 }
diff --git a/packages/types/npm/package.metadata.json b/packages/types/npm/package.metadata.json
index 3355d19decb..2e662585366 100644
--- a/packages/types/npm/package.metadata.json
+++ b/packages/types/npm/package.metadata.json
@@ -1,6 +1,6 @@
 {
 	"name": "@roo-code/types",
-	"version": "1.89.0",
+	"version": "1.90.0",
 	"description": "TypeScript type definitions for Roo Code.",
 	"publishConfig": {
 		"access": "public",
diff --git a/packages/types/src/__tests__/telemetry.test.ts b/packages/types/src/__tests__/telemetry.test.ts
new file mode 100644
index 00000000000..5cf58b04d1c
--- /dev/null
+++ b/packages/types/src/__tests__/telemetry.test.ts
@@ -0,0 +1,260 @@
+// pnpm --filter @roo-code/types test src/__tests__/telemetry.test.ts
+
+import {
+	getErrorStatusCode,
+	getErrorMessage,
+	shouldReportApiErrorToTelemetry,
+	EXPECTED_API_ERROR_CODES,
+	ApiProviderError,
+	isApiProviderError,
+	extractApiProviderErrorProperties,
+} from "../telemetry.js"
+
+describe("telemetry error utilities", () => {
+	describe("getErrorStatusCode", () => {
+		it("should return undefined for non-object errors", () => {
+			expect(getErrorStatusCode(null)).toBeUndefined()
+			expect(getErrorStatusCode(undefined)).toBeUndefined()
+			expect(getErrorStatusCode("error string")).toBeUndefined()
+			expect(getErrorStatusCode(42)).toBeUndefined()
+		})
+
+		it("should return undefined for objects without status property", () => {
+			expect(getErrorStatusCode({})).toBeUndefined()
+			expect(getErrorStatusCode({ message: "error" })).toBeUndefined()
+			expect(getErrorStatusCode({ code: 500 })).toBeUndefined()
+		})
+
+		it("should return undefined for objects with non-numeric status", () => {
+			expect(getErrorStatusCode({ status: "500" })).toBeUndefined()
+			expect(getErrorStatusCode({ status: null })).toBeUndefined()
+			expect(getErrorStatusCode({ status: undefined })).toBeUndefined()
+		})
+
+		it("should return status for OpenAI SDK-like errors", () => {
+			const error = { status: 429, message: "Rate limit exceeded" }
+			expect(getErrorStatusCode(error)).toBe(429)
+		})
+
+		it("should return status for errors with additional properties", () => {
+			const error = {
+				status: 500,
+				code: "internal_error",
+				message: "Internal server error",
+				error: { message: "Upstream error" },
+			}
+			expect(getErrorStatusCode(error)).toBe(500)
+		})
+	})
+
+	describe("getErrorMessage", () => {
+		it("should return undefined for non-OpenAI SDK errors", () => {
+			expect(getErrorMessage(null)).toBeUndefined()
+			expect(getErrorMessage(undefined)).toBeUndefined()
+			expect(getErrorMessage({ message: "error" })).toBeUndefined()
+		})
+
+		it("should return the primary message for simple OpenAI SDK errors", () => {
+			const error = { status: 400, message: "Bad request" }
+			expect(getErrorMessage(error)).toBe("Bad request")
+		})
+
+		it("should prioritize nested error.message over primary message", () => {
+			const error = {
+				status: 500,
+				message: "Request failed",
+				error: { message: "Upstream provider error" },
+			}
+			expect(getErrorMessage(error)).toBe("Upstream provider error")
+		})
+
+		it("should prioritize metadata.raw over other messages", () => {
+			const error = {
+				status: 429,
+				message: "Request failed",
+				error: {
+					message: "Error details",
+					metadata: { raw: "Rate limit exceeded: free-models-per-day" },
+				},
+			}
+			expect(getErrorMessage(error)).toBe("Rate limit exceeded: free-models-per-day")
+		})
+
+		it("should fallback to nested error.message when metadata.raw is undefined", () => {
+			const error = {
+				status: 400,
+				message: "Request failed",
+				error: {
+					message: "Detailed error message",
+					metadata: {},
+				},
+			}
+			expect(getErrorMessage(error)).toBe("Detailed error message")
+		})
+
+		it("should fallback to primary message when no nested messages exist", () => {
+			const error = {
+				status: 403,
+				message: "Forbidden",
+				error: {},
+			}
+			expect(getErrorMessage(error)).toBe("Forbidden")
+		})
+	})
+
+	describe("shouldReportApiErrorToTelemetry", () => {
+		it("should return false for expected error codes", () => {
+			for (const code of EXPECTED_API_ERROR_CODES) {
+				expect(shouldReportApiErrorToTelemetry(code)).toBe(false)
+			}
+		})
+
+		it("should return false for 402 billing errors", () => {
+			expect(shouldReportApiErrorToTelemetry(402)).toBe(false)
+			expect(shouldReportApiErrorToTelemetry(402, "Payment required")).toBe(false)
+		})
+
+		it("should return false for 429 rate limit errors", () => {
+			expect(shouldReportApiErrorToTelemetry(429)).toBe(false)
+			expect(shouldReportApiErrorToTelemetry(429, "Rate limit exceeded")).toBe(false)
+		})
+
+		it("should return false for messages starting with 429", () => {
+			expect(shouldReportApiErrorToTelemetry(undefined, "429 Rate limit exceeded")).toBe(false)
+			expect(shouldReportApiErrorToTelemetry(undefined, "429: Too many requests")).toBe(false)
+		})
+
+		it("should return false for messages containing 'rate limit' (case insensitive)", () => {
+			expect(shouldReportApiErrorToTelemetry(undefined, "Rate limit exceeded")).toBe(false)
+			expect(shouldReportApiErrorToTelemetry(undefined, "RATE LIMIT error")).toBe(false)
+			expect(shouldReportApiErrorToTelemetry(undefined, "Request failed due to rate limit")).toBe(false)
+		})
+
+		it("should return true for non-rate-limit errors", () => {
+			expect(shouldReportApiErrorToTelemetry(500)).toBe(true)
+			expect(shouldReportApiErrorToTelemetry(400, "Bad request")).toBe(true)
+			expect(shouldReportApiErrorToTelemetry(401, "Unauthorized")).toBe(true)
+		})
+
+		it("should return true when no error code or message is provided", () => {
+			expect(shouldReportApiErrorToTelemetry()).toBe(true)
+			expect(shouldReportApiErrorToTelemetry(undefined, undefined)).toBe(true)
+		})
+
+		it("should return true for regular error messages without rate limit keywords", () => {
+			expect(shouldReportApiErrorToTelemetry(undefined, "Internal server error")).toBe(true)
+			expect(shouldReportApiErrorToTelemetry(undefined, "Connection timeout")).toBe(true)
+		})
+	})
+
+	describe("EXPECTED_API_ERROR_CODES", () => {
+		it("should contain 402 (payment required)", () => {
+			expect(EXPECTED_API_ERROR_CODES.has(402)).toBe(true)
+		})
+
+		it("should contain 429 (rate limit)", () => {
+			expect(EXPECTED_API_ERROR_CODES.has(429)).toBe(true)
+		})
+	})
+
+	describe("ApiProviderError", () => {
+		it("should create an error with correct properties", () => {
+			const error = new ApiProviderError("Test error", "OpenRouter", "gpt-4", "createMessage", 500)
+
+			expect(error.message).toBe("Test error")
+			expect(error.name).toBe("ApiProviderError")
+			expect(error.provider).toBe("OpenRouter")
+			expect(error.modelId).toBe("gpt-4")
+			expect(error.operation).toBe("createMessage")
+			expect(error.errorCode).toBe(500)
+		})
+
+		it("should work without optional errorCode", () => {
+			const error = new ApiProviderError("Test error", "OpenRouter", "gpt-4", "createMessage")
+
+			expect(error.message).toBe("Test error")
+			expect(error.provider).toBe("OpenRouter")
+			expect(error.modelId).toBe("gpt-4")
+			expect(error.operation).toBe("createMessage")
+			expect(error.errorCode).toBeUndefined()
+		})
+
+		it("should be an instance of Error", () => {
+			const error = new ApiProviderError("Test error", "OpenRouter", "gpt-4", "createMessage")
+			expect(error).toBeInstanceOf(Error)
+		})
+	})
+
+	describe("isApiProviderError", () => {
+		it("should return true for ApiProviderError instances", () => {
+			const error = new ApiProviderError("Test error", "OpenRouter", "gpt-4", "createMessage")
+			expect(isApiProviderError(error)).toBe(true)
+		})
+
+		it("should return true for ApiProviderError with errorCode", () => {
+			const error = new ApiProviderError("Test error", "OpenRouter", "gpt-4", "createMessage", 429)
+			expect(isApiProviderError(error)).toBe(true)
+		})
+
+		it("should return false for regular Error instances", () => {
+			const error = new Error("Test error")
+			expect(isApiProviderError(error)).toBe(false)
+		})
+
+		it("should return false for null and undefined", () => {
+			expect(isApiProviderError(null)).toBe(false)
+			expect(isApiProviderError(undefined)).toBe(false)
+		})
+
+		it("should return false for non-error objects", () => {
+			expect(isApiProviderError({})).toBe(false)
+			expect(isApiProviderError({ provider: "test", modelId: "test", operation: "test" })).toBe(false)
+		})
+
+		it("should return false for Error with wrong name", () => {
+			const error = new Error("Test error")
+			error.name = "CustomError"
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			;(error as any).provider = "OpenRouter"
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			;(error as any).modelId = "gpt-4"
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			;(error as any).operation = "createMessage"
+			expect(isApiProviderError(error)).toBe(false)
+		})
+	})
+
+	describe("extractApiProviderErrorProperties", () => {
+		it("should extract all properties from ApiProviderError", () => {
+			const error = new ApiProviderError("Test error", "OpenRouter", "gpt-4", "createMessage", 500)
+			const properties = extractApiProviderErrorProperties(error)
+
+			expect(properties).toEqual({
+				provider: "OpenRouter",
+				modelId: "gpt-4",
+				operation: "createMessage",
+				errorCode: 500,
+			})
+		})
+
+		it("should not include errorCode when undefined", () => {
+			const error = new ApiProviderError("Test error", "OpenRouter", "gpt-4", "createMessage")
+			const properties = extractApiProviderErrorProperties(error)
+
+			expect(properties).toEqual({
+				provider: "OpenRouter",
+				modelId: "gpt-4",
+				operation: "createMessage",
+			})
+			expect(properties).not.toHaveProperty("errorCode")
+		})
+
+		it("should include errorCode when it is 0", () => {
+			const error = new ApiProviderError("Test error", "OpenRouter", "gpt-4", "createMessage", 0)
+			const properties = extractApiProviderErrorProperties(error)
+
+			// errorCode of 0 is falsy but !== undefined, so it should be included
+			expect(properties).toHaveProperty("errorCode", 0)
+		})
+	})
+})
diff --git a/packages/types/src/global-settings.ts b/packages/types/src/global-settings.ts
index a738c660b56..fb9658b863b 100644
--- a/packages/types/src/global-settings.ts
+++ b/packages/types/src/global-settings.ts
@@ -198,6 +198,13 @@ export const globalSettingsSchema = z.object({
 	includeTaskHistoryInEnhance: z.boolean().optional(),
 	historyPreviewCollapsed: z.boolean().optional(),
 	reasoningBlockCollapsed: z.boolean().optional(),
+	/**
+	 * Controls the keyboard behavior for sending messages in the chat input.
+	 * - "send": Enter sends message, Shift+Enter creates newline (default)
+	 * - "newline": Enter creates newline, Shift+Enter/Ctrl+Enter sends message
+	 * @default "send"
+	 */
+	enterBehavior: z.enum(["send", "newline"]).optional(),
 	profileThresholds: z.record(z.string(), z.number()).optional(),
 	hasOpenedModeSelector: z.boolean().optional(),
 	lastModeExportPath: z.string().optional(),
@@ -227,7 +234,6 @@ export const SECRET_STATE_KEYS = [
 	"zgsmRefreshToken",
 	// zgsm
 	"apiKey",
-	"glamaApiKey",
 	"openRouterApiKey",
 	"awsAccessKey",
 	"awsApiKey",
diff --git a/packages/types/src/provider-settings.ts b/packages/types/src/provider-settings.ts
index 9ce0699b7e7..57648e49017 100644
--- a/packages/types/src/provider-settings.ts
+++ b/packages/types/src/provider-settings.ts
@@ -49,7 +49,6 @@ export const dynamicProviders = [
 	"io-intelligence",
 	"requesty",
 	"unbound",
-	"glama",
 	// "roo",
 	"chutes",
 ] as const
@@ -221,11 +220,6 @@ const claudeCodeSchema = apiModelIdProviderModelSchema.extend({
 	claudeCodeMaxOutputTokens: z.number().int().min(1).max(200000).optional(),
 })
 
-const glamaSchema = baseProviderSettingsSchema.extend({
-	glamaModelId: z.string().optional(),
-	glamaApiKey: z.string().optional(),
-})
-
 const openRouterSchema = baseProviderSettingsSchema.extend({
 	openRouterApiKey: z.string().optional(),
 	openRouterModelId: z.string().optional(),
@@ -406,7 +400,7 @@ const sambaNovaSchema = apiModelIdProviderModelSchema.extend({
 	sambaNovaApiKey: z.string().optional(),
 })
 
-export const zaiApiLineSchema = z.enum(["international_coding", "china_coding"])
+export const zaiApiLineSchema = z.enum(["international_coding", "china_coding", "international_api", "china_api"])
 
 export type ZaiApiLine = z.infer<typeof zaiApiLineSchema>
 
@@ -453,7 +447,6 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv
 	zgsmSchema.merge(z.object({ apiProvider: z.literal("zgsm") })),
 	anthropicSchema.merge(z.object({ apiProvider: z.literal("anthropic") })),
 	claudeCodeSchema.merge(z.object({ apiProvider: z.literal("claude-code") })),
-	glamaSchema.merge(z.object({ apiProvider: z.literal("glama") })),
 	openRouterSchema.merge(z.object({ apiProvider: z.literal("openrouter") })),
 	bedrockSchema.merge(z.object({ apiProvider: z.literal("bedrock") })),
 	vertexSchema.merge(z.object({ apiProvider: z.literal("vertex") })),
@@ -497,7 +490,6 @@ export const providerSettingsSchema = z.object({
 	...zgsmSchema.shape,
 	...anthropicSchema.shape,
 	...claudeCodeSchema.shape,
-	...glamaSchema.shape,
 	...openRouterSchema.shape,
 	...bedrockSchema.shape,
 	...vertexSchema.shape,
@@ -564,7 +556,6 @@ export const PROVIDER_SETTINGS_KEYS = providerSettingsSchema.keyof().options
 export const modelIdKeys = [
 	"zgsmModelId",
 	"apiModelId",
-	"glamaModelId",
 	"openRouterModelId",
 	"openAiModelId",
 	"ollamaModelId",
@@ -599,7 +590,6 @@ export const modelIdKeysByProvider: Record<TypicalProvider, ModelIdKey> = {
 	zgsm: "zgsmModelId",
 	anthropic: "apiModelId",
 	"claude-code": "apiModelId",
-	glama: "glamaModelId",
 	openrouter: "openRouterModelId",
 	bedrock: "apiModelId",
 	vertex: "apiModelId",
@@ -771,7 +761,6 @@ export const MODELS_BY_PROVIDER: Record<
 	baseten: { id: "baseten", label: "Baseten", models: Object.keys(basetenModels) },
 
 	// Dynamic providers; models pulled from remote APIs.
-	glama: { id: "glama", label: "Glama", models: [] },
 	huggingface: { id: "huggingface", label: "Hugging Face", models: [] },
 	litellm: { id: "litellm", label: "LiteLLM", models: [] },
 	openrouter: { id: "openrouter", label: "OpenRouter", models: [] },
diff --git a/packages/types/src/providers/glama.ts b/packages/types/src/providers/glama.ts
deleted file mode 100644
index 98aedc831b7..00000000000
--- a/packages/types/src/providers/glama.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { ModelInfo } from "../model.js"
-
-// https://glama.ai/models
-export const glamaDefaultModelId = "anthropic/claude-3-7-sonnet"
-
-export const glamaDefaultModelInfo: ModelInfo = {
-	maxTokens: 8192,
-	contextWindow: 200_000,
-	supportsImages: true,
-	supportsPromptCache: true,
-	inputPrice: 3.0,
-	outputPrice: 15.0,
-	cacheWritesPrice: 3.75,
-	cacheReadsPrice: 0.3,
-	description:
-		"Claude 3.7 Sonnet is an advanced large language model with improved reasoning, coding, and problem-solving capabilities. It introduces a hybrid reasoning approach, allowing users to choose between rapid responses and extended, step-by-step processing for complex tasks. The model demonstrates notable improvements in coding, particularly in front-end development and full-stack updates, and excels in agentic workflows, where it can autonomously navigate multi-step processes. Claude 3.7 Sonnet maintains performance parity with its predecessor in standard mode while offering an extended reasoning mode for enhanced accuracy in math, coding, and instruction-following tasks. Read more at the [blog post here](https://www.anthropic.com/news/claude-3-7-sonnet)",
-}
-
-export const GLAMA_DEFAULT_TEMPERATURE = 0
diff --git a/packages/types/src/providers/index.ts b/packages/types/src/providers/index.ts
index 323a0a0500c..2dec123aa04 100644
--- a/packages/types/src/providers/index.ts
+++ b/packages/types/src/providers/index.ts
@@ -10,7 +10,6 @@ export * from "./featherless.js"
 export * from "./fireworks.js"
 export * from "./gemini.js"
 export * from "./gemini-cli.js"
-export * from "./glama.js"
 export * from "./groq.js"
 export * from "./huggingface.js"
 export * from "./io-intelligence.js"
@@ -47,7 +46,6 @@ import { doubaoDefaultModelId } from "./doubao.js"
 import { featherlessDefaultModelId } from "./featherless.js"
 import { fireworksDefaultModelId } from "./fireworks.js"
 import { geminiDefaultModelId } from "./gemini.js"
-import { glamaDefaultModelId } from "./glama.js"
 import { groqDefaultModelId } from "./groq.js"
 import { ioIntelligenceDefaultModelId } from "./io-intelligence.js"
 import { litellmDefaultModelId } from "./lite-llm.js"
@@ -87,8 +85,6 @@ export function getProviderDefaultModelId(
 			return openRouterDefaultModelId
 		case "requesty":
 			return requestyDefaultModelId
-		case "glama":
-			return glamaDefaultModelId
 		case "unbound":
 			return unboundDefaultModelId
 		case "litellm":
diff --git a/packages/types/src/providers/openai.ts b/packages/types/src/providers/openai.ts
index 722b57677cc..264c5aa40f5 100644
--- a/packages/types/src/providers/openai.ts
+++ b/packages/types/src/providers/openai.ts
@@ -3,7 +3,7 @@ import type { ModelInfo } from "../model.js"
 // https://openai.com/api/pricing/
 export type OpenAiNativeModelId = keyof typeof openAiNativeModels
 
-export const openAiNativeDefaultModelId: OpenAiNativeModelId = "gpt-5.1"
+export const openAiNativeDefaultModelId: OpenAiNativeModelId = "gpt-5.1-codex-max"
 
 export const openAiNativeModels = {
 	"gpt-5.1-codex-max": {
@@ -16,7 +16,7 @@ export const openAiNativeModels = {
 		supportsPromptCache: true,
 		promptCacheRetention: "24h",
 		supportsReasoningEffort: ["low", "medium", "high", "xhigh"],
-		reasoningEffort: "medium",
+		reasoningEffort: "xhigh",
 		inputPrice: 1.25,
 		outputPrice: 10.0,
 		cacheReadsPrice: 0.125,
@@ -25,6 +25,41 @@ export const openAiNativeModels = {
 		description:
 			"GPT-5.1 Codex Max: Our most intelligent coding model optimized for long-horizon, agentic coding tasks",
 	},
+	"gpt-5.2": {
+		maxTokens: 128000,
+		contextWindow: 400000,
+		supportsNativeTools: true,
+		includedTools: ["apply_patch"],
+		excludedTools: ["apply_diff", "write_to_file"],
+		supportsImages: true,
+		supportsPromptCache: true,
+		promptCacheRetention: "24h",
+		supportsReasoningEffort: ["none", "low", "medium", "high", "xhigh"],
+		reasoningEffort: "medium",
+		inputPrice: 1.75,
+		outputPrice: 14.0,
+		cacheReadsPrice: 0.175,
+		supportsVerbosity: true,
+		supportsTemperature: false,
+		tiers: [
+			{ name: "flex", contextWindow: 400000, inputPrice: 0.875, outputPrice: 7.0, cacheReadsPrice: 0.0875 },
+			{ name: "priority", contextWindow: 400000, inputPrice: 3.5, outputPrice: 28.0, cacheReadsPrice: 0.35 },
+		],
+		description: "GPT-5.2: Our flagship model for coding and agentic tasks across industries",
+	},
+	"gpt-5.2-chat-latest": {
+		maxTokens: 16_384,
+		contextWindow: 128_000,
+		supportsNativeTools: true,
+		includedTools: ["apply_patch"],
+		excludedTools: ["apply_diff", "write_to_file"],
+		supportsImages: true,
+		supportsPromptCache: true,
+		inputPrice: 1.75,
+		outputPrice: 14.0,
+		cacheReadsPrice: 0.175,
+		description: "GPT-5.2 Chat: Optimized for conversational AI and chat use cases",
+	},
 	"gpt-5.1": {
 		maxTokens: 128000,
 		contextWindow: 400000,
diff --git a/packages/types/src/providers/zai.ts b/packages/types/src/providers/zai.ts
index e21fcc698bf..3eae002f17d 100644
--- a/packages/types/src/providers/zai.ts
+++ b/packages/types/src/providers/zai.ts
@@ -212,13 +212,23 @@ export const ZAI_DEFAULT_TEMPERATURE = 0.6
 
 export const zaiApiLineConfigs = {
 	international_coding: {
-		name: "International",
+		name: "International Coding",
 		baseUrl: "https://api.z.ai/api/coding/paas/v4",
 		isChina: false,
 	},
 	china_coding: {
-		name: "China",
+		name: "China Coding",
 		baseUrl: "https://open.bigmodel.cn/api/coding/paas/v4",
 		isChina: true,
 	},
+	international_api: {
+		name: "International API",
+		baseUrl: "https://api.z.ai/api/paas/v4",
+		isChina: false,
+	},
+	china_api: {
+		name: "China API",
+		baseUrl: "https://open.bigmodel.cn/api/paas/v4",
+		isChina: true,
+	},
 } satisfies Record<ZaiApiLine, { name: string; baseUrl: string; isChina: boolean }>
diff --git a/packages/types/src/telemetry.ts b/packages/types/src/telemetry.ts
index ab51eec19d5..46a8abba429 100644
--- a/packages/types/src/telemetry.ts
+++ b/packages/types/src/telemetry.ts
@@ -267,7 +267,7 @@ export interface TelemetryClient {
 
 	setProvider(provider: TelemetryPropertiesProvider): void
 	capture(options: TelemetryEvent): Promise<void>
-	captureException(error: Error, additionalProperties?: Record<string, unknown>): void
+	captureException(error: Error, additionalProperties?: Record<string, unknown>): Promise<void>
 	updateTelemetryState(isOptedIn: boolean): void
 	isTelemetryEnabled(): boolean
 	shutdown(): Promise<void>
@@ -278,18 +278,106 @@ export interface TelemetryClient {
  * These are normal/expected errors that users can't do much about.
  */
 export const EXPECTED_API_ERROR_CODES = new Set([
+	402, // Payment required - billing issues
 	429, // Rate limit - expected when hitting API limits
 ])
 
+/**
+ * Patterns in error messages that indicate expected errors (rate limits, etc.)
+ * These are checked when no numeric error code is available.
+ */
+const EXPECTED_ERROR_MESSAGE_PATTERNS = [
+	/^429\b/, // Message starts with "429"
+	/rate limit/i, // Contains "rate limit" (case insensitive)
+]
+
+/**
+ * Interface representing the error structure from OpenAI SDK.
+ * OpenAI SDK errors (APIError, AuthenticationError, RateLimitError, etc.)
+ * have a numeric `status` property and may contain nested error metadata.
+ *
+ * @see https://github.com/openai/openai-node/blob/master/src/error.ts
+ */
+interface OpenAISdkError {
+	/** HTTP status code of the error response */
+	status: number
+	/** Optional error code (may be numeric or string) */
+	code?: number | string
+	/** Primary error message */
+	message: string
+	/** Nested error object containing additional details from the API response */
+	error?: {
+		message?: string
+		metadata?: {
+			/** Raw error message from upstream provider (e.g., OpenRouter upstream errors) */
+			raw?: string
+		}
+	}
+}
+
+/**
+ * Type guard to check if an error object is an OpenAI SDK error.
+ * OpenAI SDK errors (APIError and subclasses) have: status, code, message properties.
+ */
+function isOpenAISdkError(error: unknown): error is OpenAISdkError {
+	return (
+		typeof error === "object" &&
+		error !== null &&
+		"status" in error &&
+		typeof (error as OpenAISdkError).status === "number"
+	)
+}
+
+/**
+ * Extracts the HTTP status code from an error object.
+ * Supports OpenAI SDK errors that have a status property.
+ * @param error - The error to extract status from
+ * @returns The status code if available, undefined otherwise
+ */
+export function getErrorStatusCode(error: unknown): number | undefined {
+	if (isOpenAISdkError(error)) {
+		return error.status
+	}
+	return undefined
+}
+
+/**
+ * Extracts the most descriptive error message from an OpenAI SDK error.
+ * Prioritizes nested metadata (upstream provider errors) over the standard message.
+ * @param error - The error to extract message from
+ * @returns The best available error message, or undefined if not an OpenAI SDK error
+ */
+export function getErrorMessage(error: unknown): string | undefined {
+	if (isOpenAISdkError(error)) {
+		// Prioritize nested metadata which may contain upstream provider details
+		return error.error?.metadata?.raw || error.error?.message || error.message
+	}
+	return undefined
+}
+
 /**
  * Helper to check if an API error should be reported to telemetry.
- * Filters out expected errors like rate limits.
+ * Filters out expected errors like rate limits by checking both error codes and messages.
  * @param errorCode - The HTTP error code (if available)
+ * @param errorMessage - The error message (if available)
  * @returns true if the error should be reported, false if it should be filtered out
  */
-export function shouldReportApiErrorToTelemetry(errorCode?: number): boolean {
-	if (errorCode === undefined) return true
-	return !EXPECTED_API_ERROR_CODES.has(errorCode)
+export function shouldReportApiErrorToTelemetry(errorCode?: number, errorMessage?: string): boolean {
+	// Check numeric error code
+	if (errorCode !== undefined && EXPECTED_API_ERROR_CODES.has(errorCode)) {
+		return false
+	}
+
+	// Check error message for expected patterns (e.g., "429 Rate limit exceeded")
+	if (errorMessage) {
+		for (const pattern of EXPECTED_ERROR_MESSAGE_PATTERNS) {
+			if (pattern.test(errorMessage)) {
+				return false
+			}
+		}
+	}
+
+	return true
 }
 
 /**
@@ -308,3 +396,30 @@ export class ApiProviderError extends Error {
 		this.name = "ApiProviderError"
 	}
 }
+
+/**
+ * Type guard to check if an error is an ApiProviderError.
+ * Used by telemetry to automatically extract structured properties.
+ */
+export function isApiProviderError(error: unknown): error is ApiProviderError {
+	return (
+		error instanceof Error &&
+		error.name === "ApiProviderError" &&
+		"provider" in error &&
+		"modelId" in error &&
+		"operation" in error
+	)
+}
+
+/**
+ * Extracts properties from an ApiProviderError for telemetry.
+ * Returns the structured properties that can be merged with additionalProperties.
+ */
+export function extractApiProviderErrorProperties(error: ApiProviderError): Record<string, unknown> {
+	return {
+		provider: error.provider,
+		modelId: error.modelId,
+		operation: error.operation,
+		...(error.errorCode !== undefined && { errorCode: error.errorCode }),
+	}
+}
diff --git a/packages/types/src/tool.ts b/packages/types/src/tool.ts
index 3486c6b0542..6bb4a30a993 100644
--- a/packages/types/src/tool.ts
+++ b/packages/types/src/tool.ts
@@ -24,7 +24,6 @@ export const toolNames = [
 	"apply_patch",
 	"search_files",
 	"list_files",
-	"list_code_definition_names",
 	"browser_action",
 	"use_mcp_tool",
 	"access_mcp_resource",
diff --git a/releases/3.36.4-release.png b/releases/3.36.4-release.png
new file mode 100644
index 00000000000..914765bfb8d
Binary files /dev/null and b/releases/3.36.4-release.png differ
diff --git a/src/activate/handleUri.ts b/src/activate/handleUri.ts
index 75345e3f314..c29b66e21af 100644
--- a/src/activate/handleUri.ts
+++ b/src/activate/handleUri.ts
@@ -14,13 +14,6 @@ export const handleUri = async (uri: vscode.Uri) => {
 	}
 
 	switch (path) {
-		case "/glama": {
-			const code = query.get("code")
-			if (code) {
-				await visibleProvider.handleGlamaCallback(code)
-			}
-			break
-		}
 		case "/openrouter": {
 			const code = query.get("code")
 			if (code) {
diff --git a/src/api/index.ts b/src/api/index.ts
index 5df0ab22d26..8d9daded7b0 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -6,7 +6,6 @@ import type { ProviderSettings, ModelInfo, ToolProtocol } from "@roo-code/types"
 import { ApiStream } from "./transform/stream"
 
 import {
-	GlamaHandler,
 	AnthropicHandler,
 	AwsBedrockHandler,
 	CerebrasHandler,
@@ -133,8 +132,6 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 			return new AnthropicHandler(options)
 		case "claude-code":
 			return new ClaudeCodeHandler(options)
-		case "glama":
-			return new GlamaHandler(options)
 		case "openrouter":
 			return new OpenRouterHandler(options)
 		case "bedrock":
diff --git a/src/api/providers/__tests__/glama.spec.ts b/src/api/providers/__tests__/glama.spec.ts
deleted file mode 100644
index 2c60d442a1c..00000000000
--- a/src/api/providers/__tests__/glama.spec.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-// npx vitest run src/api/providers/__tests__/glama.spec.ts
-
-import { Anthropic } from "@anthropic-ai/sdk"
-
-import { GlamaHandler } from "../glama"
-import { ApiHandlerOptions } from "../../../shared/api"
-
-// Mock dependencies
-vitest.mock("../fetchers/modelCache", () => ({
-	getModels: vitest.fn().mockImplementation(() => {
-		return Promise.resolve({
-			"anthropic/claude-3-7-sonnet": {
-				maxTokens: 8192,
-				contextWindow: 200000,
-				supportsImages: true,
-				supportsPromptCache: true,
-				inputPrice: 3,
-				outputPrice: 15,
-				cacheWritesPrice: 3.75,
-				cacheReadsPrice: 0.3,
-				description: "Claude 3.7 Sonnet",
-				thinking: false,
-			},
-			"openai/gpt-4o": {
-				maxTokens: 4096,
-				contextWindow: 128000,
-				supportsImages: true,
-				supportsPromptCache: false,
-				inputPrice: 5,
-				outputPrice: 15,
-				description: "GPT-4o",
-			},
-		})
-	}),
-}))
-
-// Mock OpenAI client
-const mockCreate = vitest.fn()
-const mockWithResponse = vitest.fn()
-
-vitest.mock("openai", () => {
-	return {
-		__esModule: true,
-		default: vitest.fn().mockImplementation(() => ({
-			chat: {
-				completions: {
-					create: (...args: any[]) => {
-						const stream = {
-							[Symbol.asyncIterator]: async function* () {
-								yield {
-									choices: [{ delta: { content: "Test response" }, index: 0 }],
-									usage: null,
-								}
-								yield {
-									choices: [{ delta: {}, index: 0 }],
-									usage: { prompt_tokens: 10, completion_tokens: 5, total_tokens: 15 },
-								}
-							},
-						}
-
-						const result = mockCreate(...args)
-
-						if (args[0].stream) {
-							mockWithResponse.mockReturnValue(
-								Promise.resolve({
-									data: stream,
-									response: {
-										headers: {
-											get: (name: string) =>
-												name === "x-completion-request-id" ? "test-request-id" : null,
-										},
-									},
-								}),
-							)
-							result.withResponse = mockWithResponse
-						}
-
-						return result
-					},
-				},
-			},
-		})),
-	}
-})
-
-describe("GlamaHandler", () => {
-	let handler: GlamaHandler
-	let mockOptions: ApiHandlerOptions
-
-	beforeEach(() => {
-		mockOptions = {
-			glamaApiKey: "test-api-key",
-			glamaModelId: "anthropic/claude-3-7-sonnet",
-		}
-
-		handler = new GlamaHandler(mockOptions)
-		mockCreate.mockClear()
-		mockWithResponse.mockClear()
-
-		// Default mock implementation for non-streaming responses
-		mockCreate.mockResolvedValue({
-			id: "test-completion",
-			choices: [
-				{
-					message: { role: "assistant", content: "Test response" },
-					finish_reason: "stop",
-					index: 0,
-				},
-			],
-			usage: {
-				prompt_tokens: 10,
-				completion_tokens: 5,
-				total_tokens: 15,
-			},
-		})
-	})
-
-	describe("constructor", () => {
-		it("should initialize with provided options", () => {
-			expect(handler).toBeInstanceOf(GlamaHandler)
-			expect(handler.getModel().id).toBe(mockOptions.glamaModelId)
-		})
-	})
-
-	describe("createMessage", () => {
-		const systemPrompt = "You are a helpful assistant."
-		const messages: Anthropic.Messages.MessageParam[] = [
-			{
-				role: "user",
-				content: "Hello!",
-			},
-		]
-
-		it("should handle streaming responses", async () => {
-			const stream = handler.createMessage(systemPrompt, messages)
-			const chunks: any[] = []
-
-			for await (const chunk of stream) {
-				chunks.push(chunk)
-			}
-
-			expect(chunks.length).toBe(1)
-			expect(chunks[0]).toEqual({ type: "text", text: "Test response" })
-		})
-
-		it("should handle API errors", async () => {
-			mockCreate.mockImplementationOnce(() => {
-				throw new Error("API Error")
-			})
-
-			const stream = handler.createMessage(systemPrompt, messages)
-			const chunks = []
-
-			try {
-				for await (const chunk of stream) {
-					chunks.push(chunk)
-				}
-				expect.fail("Expected error to be thrown")
-			} catch (error) {
-				expect(error).toBeInstanceOf(Error)
-				expect(error.message).toBe("API Error")
-			}
-		})
-	})
-
-	describe("completePrompt", () => {
-		it("should complete prompt successfully", async () => {
-			const result = await handler.completePrompt("Test prompt")
-			expect(result).toBe("Test response")
-			expect(mockCreate).toHaveBeenCalledWith(
-				expect.objectContaining({
-					model: mockOptions.glamaModelId,
-					messages: [{ role: "user", content: "Test prompt" }],
-					temperature: 0,
-					max_tokens: 8192,
-				}),
-				{ signal: undefined },
-			)
-		})
-
-		it("should handle API errors", async () => {
-			mockCreate.mockRejectedValueOnce(new Error("API Error"))
-			await expect(handler.completePrompt("Test prompt")).rejects.toThrow("Glama completion error: API Error")
-		})
-
-		it("should handle empty response", async () => {
-			mockCreate.mockResolvedValueOnce({
-				choices: [{ message: { content: "" } }],
-			})
-			const result = await handler.completePrompt("Test prompt")
-			expect(result).toBe("")
-		})
-
-		it("should not set max_tokens for non-Anthropic models", async () => {
-			// Reset mock to clear any previous calls
-			mockCreate.mockClear()
-
-			const nonAnthropicOptions = {
-				glamaApiKey: "test-key",
-				glamaModelId: "openai/gpt-4o",
-			}
-
-			const nonAnthropicHandler = new GlamaHandler(nonAnthropicOptions)
-
-			await nonAnthropicHandler.completePrompt("Test prompt")
-			expect(mockCreate).toHaveBeenCalledWith(
-				expect.objectContaining({
-					model: "openai/gpt-4o",
-					messages: [{ role: "user", content: "Test prompt" }],
-					temperature: 0,
-				}),
-				{ signal: undefined },
-			)
-			expect(mockCreate.mock.calls[0][0]).not.toHaveProperty("max_tokens")
-		})
-	})
-
-	describe("fetchModel", () => {
-		it("should return model info", async () => {
-			const modelInfo = await handler.fetchModel()
-			expect(modelInfo.id).toBe(mockOptions.glamaModelId)
-			expect(modelInfo.info).toBeDefined()
-			expect(modelInfo.info.maxTokens).toBe(8192)
-			expect(modelInfo.info.contextWindow).toBe(200_000)
-		})
-
-		it("should return default model when invalid model provided", async () => {
-			const handlerWithInvalidModel = new GlamaHandler({ ...mockOptions, glamaModelId: "invalid/model" })
-			const modelInfo = await handlerWithInvalidModel.fetchModel()
-			expect(modelInfo.id).toBe("anthropic/claude-3-7-sonnet")
-			expect(modelInfo.info).toBeDefined()
-		})
-	})
-})
diff --git a/src/api/providers/__tests__/openai-native.spec.ts b/src/api/providers/__tests__/openai-native.spec.ts
index 0482b8893b8..3196316f639 100644
--- a/src/api/providers/__tests__/openai-native.spec.ts
+++ b/src/api/providers/__tests__/openai-native.spec.ts
@@ -205,7 +205,7 @@ describe("OpenAiNativeHandler", () => {
 				openAiNativeApiKey: "test-api-key",
 			})
 			const modelInfo = handlerWithoutModel.getModel()
-			expect(modelInfo.id).toBe("gpt-5.1") // Default model
+			expect(modelInfo.id).toBe("gpt-5.1-codex-max") // Default model
 			expect(modelInfo.info).toBeDefined()
 		})
 	})
diff --git a/src/api/providers/__tests__/openrouter.spec.ts b/src/api/providers/__tests__/openrouter.spec.ts
index 3ed2336319a..b96f3aa435e 100644
--- a/src/api/providers/__tests__/openrouter.spec.ts
+++ b/src/api/providers/__tests__/openrouter.spec.ts
@@ -1,4 +1,4 @@
-// npx vitest run src/api/providers/__tests__/openrouter.spec.ts
+// pnpm --filter roo-cline test api/providers/__tests__/openrouter.spec.ts
 
 // Mock vscode first to avoid import errors
 vitest.mock("vscode", () => ({
@@ -37,9 +37,7 @@ import OpenAI from "openai"
 import { OpenRouterHandler } from "../openrouter"
 import { ApiHandlerOptions } from "../../../shared/api"
 import { Package } from "../../../shared/package"
-import { ApiProviderError } from "@roo-code/types"
 
-// Mock dependencies
 vitest.mock("openai")
 vitest.mock("delay", () => ({ default: vitest.fn(() => Promise.resolve()) }))
 vitest.mock("os", () => ({
@@ -53,6 +51,7 @@ vitest.mock("path", () => ({
 }))
 // Mock TelemetryService
 const mockCaptureException = vitest.fn()
+
 vitest.mock("@roo-code/telemetry", () => ({
 	TelemetryService: {
 		instance: {
@@ -60,6 +59,7 @@ vitest.mock("@roo-code/telemetry", () => ({
 		},
 	},
 }))
+
 vitest.mock("../fetchers/modelCache", () => ({
 	getModels: vitest.fn().mockImplementation(() => {
 		return Promise.resolve({
@@ -330,13 +330,16 @@ describe("OpenRouterHandler", () => {
 			const generator = handler.createMessage("test", [])
 			await expect(generator.next()).rejects.toThrow("OpenRouter API Error 500: API Error")
 
-			// Verify telemetry was captured
-			expect(mockCaptureException).toHaveBeenCalledWith(expect.any(ApiProviderError), {
-				provider: "OpenRouter",
-				modelId: mockOptions.openRouterModelId,
-				operation: "createMessage",
-				errorCode: 500,
-			})
+			expect(mockCaptureException).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: "API Error",
+					provider: "OpenRouter",
+					modelId: mockOptions.openRouterModelId,
+					operation: "createMessage",
+					errorCode: 500,
+					status: 500,
+				}),
+			)
 		})
 
 		it("captures telemetry when createMessage throws an exception", async () => {
@@ -349,15 +352,82 @@ describe("OpenRouterHandler", () => {
 			const generator = handler.createMessage("test", [])
 			await expect(generator.next()).rejects.toThrow()
 
-			// Verify telemetry was captured
-			expect(mockCaptureException).toHaveBeenCalledWith(expect.any(ApiProviderError), {
-				provider: "OpenRouter",
-				modelId: mockOptions.openRouterModelId,
-				operation: "createMessage",
-			})
+			expect(mockCaptureException).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: "Connection failed",
+					provider: "OpenRouter",
+					modelId: mockOptions.openRouterModelId,
+					operation: "createMessage",
+				}),
+			)
+		})
+
+		it("passes SDK exceptions with status 429 to telemetry (filtering happens in PostHogTelemetryClient)", async () => {
+			const handler = new OpenRouterHandler(mockOptions)
+			const error = new Error("Rate limit exceeded: free-models-per-day") as any
+			error.status = 429
+
+			const mockCreate = vitest.fn().mockRejectedValue(error)
+			;(OpenAI as any).prototype.chat = {
+				completions: { create: mockCreate },
+			} as any
+
+			const generator = handler.createMessage("test", [])
+			await expect(generator.next()).rejects.toThrow("Rate limit exceeded")
+
+			expect(mockCaptureException).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: "Rate limit exceeded: free-models-per-day",
+					provider: "OpenRouter",
+					modelId: mockOptions.openRouterModelId,
+					operation: "createMessage",
+				}),
+			)
 		})
 
-		it("does NOT capture telemetry for 429 rate limit errors", async () => {
+		it("passes SDK exceptions with 429 in message to telemetry (filtering happens in PostHogTelemetryClient)", async () => {
+			const handler = new OpenRouterHandler(mockOptions)
+			const error = new Error("429 Rate limit exceeded: free-models-per-day")
+			const mockCreate = vitest.fn().mockRejectedValue(error)
+			;(OpenAI as any).prototype.chat = {
+				completions: { create: mockCreate },
+			} as any
+
+			const generator = handler.createMessage("test", [])
+			await expect(generator.next()).rejects.toThrow("429 Rate limit exceeded")
+
+			expect(mockCaptureException).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: "429 Rate limit exceeded: free-models-per-day",
+					provider: "OpenRouter",
+					modelId: mockOptions.openRouterModelId,
+					operation: "createMessage",
+				}),
+			)
+		})
+
+		it("passes SDK exceptions containing 'rate limit' to telemetry (filtering happens in PostHogTelemetryClient)", async () => {
+			const handler = new OpenRouterHandler(mockOptions)
+			const error = new Error("Request failed due to rate limit")
+			const mockCreate = vitest.fn().mockRejectedValue(error)
+			;(OpenAI as any).prototype.chat = {
+				completions: { create: mockCreate },
+			} as any
+
+			const generator = handler.createMessage("test", [])
+			await expect(generator.next()).rejects.toThrow("rate limit")
+
+			expect(mockCaptureException).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: "Request failed due to rate limit",
+					provider: "OpenRouter",
+					modelId: mockOptions.openRouterModelId,
+					operation: "createMessage",
+				}),
+			)
+		})
+
+		it("passes 429 rate limit errors from stream to telemetry (filtering happens in PostHogTelemetryClient)", async () => {
 			const handler = new OpenRouterHandler(mockOptions)
 			const mockStream = {
 				async *[Symbol.asyncIterator]() {
@@ -373,8 +443,16 @@ describe("OpenRouterHandler", () => {
 			const generator = handler.createMessage("test", [])
 			await expect(generator.next()).rejects.toThrow("OpenRouter API Error 429: Rate limit exceeded")
 
-			// Verify telemetry was NOT captured for 429 errors
-			expect(mockCaptureException).not.toHaveBeenCalled()
+			expect(mockCaptureException).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: "Rate limit exceeded",
+					provider: "OpenRouter",
+					modelId: mockOptions.openRouterModelId,
+					operation: "createMessage",
+					errorCode: 429,
+					status: 429,
+				}),
+			)
 		})
 
 		it("yields tool_call_end events when finish_reason is tool_calls", async () => {
@@ -494,32 +572,104 @@ describe("OpenRouterHandler", () => {
 			await expect(handler.completePrompt("test prompt")).rejects.toThrow("OpenRouter API Error 500: API Error")
 
 			// Verify telemetry was captured
-			expect(mockCaptureException).toHaveBeenCalledWith(expect.any(ApiProviderError), {
-				provider: "OpenRouter",
-				modelId: mockOptions.openRouterModelId,
-				operation: "completePrompt",
-				errorCode: 500,
-			})
+			expect(mockCaptureException).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: "API Error",
+					provider: "OpenRouter",
+					modelId: mockOptions.openRouterModelId,
+					operation: "completePrompt",
+					errorCode: 500,
+					status: 500,
+				}),
+			)
 		})
 
 		it("handles unexpected errors and captures telemetry", async () => {
 			const handler = new OpenRouterHandler(mockOptions)
-			const mockCreate = vitest.fn().mockRejectedValue(new Error("Unexpected error"))
+			const error = new Error("Unexpected error")
+			const mockCreate = vitest.fn().mockRejectedValue(error)
 			;(OpenAI as any).prototype.chat = {
 				completions: { create: mockCreate },
 			} as any
 
 			await expect(handler.completePrompt("test prompt")).rejects.toThrow("Unexpected error")
 
-			// Verify telemetry was captured
-			expect(mockCaptureException).toHaveBeenCalledWith(expect.any(ApiProviderError), {
-				provider: "OpenRouter",
-				modelId: mockOptions.openRouterModelId,
-				operation: "completePrompt",
-			})
+			// Verify telemetry was captured (filtering now happens inside PostHogTelemetryClient)
+			expect(mockCaptureException).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: "Unexpected error",
+					provider: "OpenRouter",
+					modelId: mockOptions.openRouterModelId,
+					operation: "completePrompt",
+				}),
+			)
+		})
+
+		it("passes SDK exceptions with status 429 to telemetry (filtering happens in PostHogTelemetryClient)", async () => {
+			const handler = new OpenRouterHandler(mockOptions)
+			const error = new Error("Rate limit exceeded: free-models-per-day") as any
+			error.status = 429
+			const mockCreate = vitest.fn().mockRejectedValue(error)
+			;(OpenAI as any).prototype.chat = {
+				completions: { create: mockCreate },
+			} as any
+
+			await expect(handler.completePrompt("test prompt")).rejects.toThrow("Rate limit exceeded")
+
+			// captureException is called, but PostHogTelemetryClient filters out 429 errors internally
+			expect(mockCaptureException).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: "Rate limit exceeded: free-models-per-day",
+					provider: "OpenRouter",
+					modelId: mockOptions.openRouterModelId,
+					operation: "completePrompt",
+				}),
+			)
+		})
+
+		it("passes SDK exceptions with 429 in message to telemetry (filtering happens in PostHogTelemetryClient)", async () => {
+			const handler = new OpenRouterHandler(mockOptions)
+			const error = new Error("429 Rate limit exceeded: free-models-per-day")
+			const mockCreate = vitest.fn().mockRejectedValue(error)
+			;(OpenAI as any).prototype.chat = {
+				completions: { create: mockCreate },
+			} as any
+
+			await expect(handler.completePrompt("test prompt")).rejects.toThrow("429 Rate limit exceeded")
+
+			// captureException is called, but PostHogTelemetryClient filters out 429 errors internally
+			expect(mockCaptureException).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: "429 Rate limit exceeded: free-models-per-day",
+					provider: "OpenRouter",
+					modelId: mockOptions.openRouterModelId,
+					operation: "completePrompt",
+				}),
+			)
 		})
 
-		it("does NOT capture telemetry for 429 rate limit errors", async () => {
+		it("passes SDK exceptions containing 'rate limit' to telemetry (filtering happens in PostHogTelemetryClient)", async () => {
+			const handler = new OpenRouterHandler(mockOptions)
+			const error = new Error("Request failed due to rate limit")
+			const mockCreate = vitest.fn().mockRejectedValue(error)
+			;(OpenAI as any).prototype.chat = {
+				completions: { create: mockCreate },
+			} as any
+
+			await expect(handler.completePrompt("test prompt")).rejects.toThrow("rate limit")
+
+			// captureException is called, but PostHogTelemetryClient filters out rate limit errors internally
+			expect(mockCaptureException).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: "Request failed due to rate limit",
+					provider: "OpenRouter",
+					modelId: mockOptions.openRouterModelId,
+					operation: "completePrompt",
+				}),
+			)
+		})
+
+		it("passes 429 rate limit errors from response to telemetry (filtering happens in PostHogTelemetryClient)", async () => {
 			const handler = new OpenRouterHandler(mockOptions)
 			const mockError = {
 				error: {
@@ -537,8 +687,17 @@ describe("OpenRouterHandler", () => {
 				"OpenRouter API Error 429: Rate limit exceeded",
 			)
 
-			// Verify telemetry was NOT captured for 429 errors
-			expect(mockCaptureException).not.toHaveBeenCalled()
+			// captureException is called, but PostHogTelemetryClient filters out 429 errors internally
+			expect(mockCaptureException).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: "Rate limit exceeded",
+					provider: "OpenRouter",
+					modelId: mockOptions.openRouterModelId,
+					operation: "completePrompt",
+					errorCode: 429,
+					status: 429,
+				}),
+			)
 		})
 	})
 })
diff --git a/src/api/providers/__tests__/zai.spec.ts b/src/api/providers/__tests__/zai.spec.ts
index 72f6d5436eb..707abee09f6 100644
--- a/src/api/providers/__tests__/zai.spec.ts
+++ b/src/api/providers/__tests__/zai.spec.ts
@@ -163,6 +163,84 @@ describe("ZAiHandler", () => {
 		})
 	})
 
+	describe("International API", () => {
+		beforeEach(() => {
+			handler = new ZAiHandler({ zaiApiKey: "test-zai-api-key", zaiApiLine: "international_api" })
+		})
+
+		it("should use the correct international API base URL", () => {
+			new ZAiHandler({ zaiApiKey: "test-zai-api-key", zaiApiLine: "international_api" })
+			expect(OpenAI).toHaveBeenCalledWith(
+				expect.objectContaining({
+					baseURL: "https://api.z.ai/api/paas/v4",
+				}),
+			)
+		})
+
+		it("should use the provided API key for international API", () => {
+			const zaiApiKey = "test-zai-api-key"
+			new ZAiHandler({ zaiApiKey, zaiApiLine: "international_api" })
+			expect(OpenAI).toHaveBeenCalledWith(expect.objectContaining({ apiKey: zaiApiKey }))
+		})
+
+		it("should return international default model when no model is specified", () => {
+			const model = handler.getModel()
+			expect(model.id).toBe(internationalZAiDefaultModelId)
+			expect(model.info).toEqual(internationalZAiModels[internationalZAiDefaultModelId])
+		})
+
+		it("should return specified international model when valid model is provided", () => {
+			const testModelId: InternationalZAiModelId = "glm-4.5-air"
+			const handlerWithModel = new ZAiHandler({
+				apiModelId: testModelId,
+				zaiApiKey: "test-zai-api-key",
+				zaiApiLine: "international_api",
+			})
+			const model = handlerWithModel.getModel()
+			expect(model.id).toBe(testModelId)
+			expect(model.info).toEqual(internationalZAiModels[testModelId])
+		})
+	})
+
+	describe("China API", () => {
+		beforeEach(() => {
+			handler = new ZAiHandler({ zaiApiKey: "test-zai-api-key", zaiApiLine: "china_api" })
+		})
+
+		it("should use the correct China API base URL", () => {
+			new ZAiHandler({ zaiApiKey: "test-zai-api-key", zaiApiLine: "china_api" })
+			expect(OpenAI).toHaveBeenCalledWith(
+				expect.objectContaining({
+					baseURL: "https://open.bigmodel.cn/api/paas/v4",
+				}),
+			)
+		})
+
+		it("should use the provided API key for China API", () => {
+			const zaiApiKey = "test-zai-api-key"
+			new ZAiHandler({ zaiApiKey, zaiApiLine: "china_api" })
+			expect(OpenAI).toHaveBeenCalledWith(expect.objectContaining({ apiKey: zaiApiKey }))
+		})
+
+		it("should return China default model when no model is specified", () => {
+			const model = handler.getModel()
+			expect(model.id).toBe(mainlandZAiDefaultModelId)
+			expect(model.info).toEqual(mainlandZAiModels[mainlandZAiDefaultModelId])
+		})
+
+		it("should return specified China model when valid model is provided", () => {
+			const testModelId: MainlandZAiModelId = "glm-4.5-air"
+			const handlerWithModel = new ZAiHandler({
+				apiModelId: testModelId,
+				zaiApiKey: "test-zai-api-key",
+				zaiApiLine: "china_api",
+			})
+			const model = handlerWithModel.getModel()
+			expect(model.id).toBe(testModelId)
+			expect(model.info).toEqual(mainlandZAiModels[testModelId])
+		})
+	})
+
 	describe("Default behavior", () => {
 		it("should default to international when no zaiApiLine is specified", () => {
 			const handlerDefault = new ZAiHandler({ zaiApiKey: "test-zai-api-key" })
diff --git a/src/api/providers/fetchers/__tests__/modelCache.spec.ts b/src/api/providers/fetchers/__tests__/modelCache.spec.ts
index 3d3abdd6657..bc2dd8d4b5a 100644
--- a/src/api/providers/fetchers/__tests__/modelCache.spec.ts
+++ b/src/api/providers/fetchers/__tests__/modelCache.spec.ts
@@ -41,7 +41,6 @@ vi.mock("fs", () => ({
 vi.mock("../litellm")
 vi.mock("../openrouter")
 vi.mock("../requesty")
-vi.mock("../glama")
 vi.mock("../unbound")
 vi.mock("../io-intelligence")
 
@@ -64,14 +63,12 @@ import { getModels, getModelsFromCache } from "../modelCache"
 import { getLiteLLMModels } from "../litellm"
 import { getOpenRouterModels } from "../openrouter"
 import { getRequestyModels } from "../requesty"
-import { getGlamaModels } from "../glama"
 import { getUnboundModels } from "../unbound"
 import { getIOIntelligenceModels } from "../io-intelligence"
 
 const mockGetLiteLLMModels = getLiteLLMModels as Mock<typeof getLiteLLMModels>
 const mockGetOpenRouterModels = getOpenRouterModels as Mock<typeof getOpenRouterModels>
 const mockGetRequestyModels = getRequestyModels as Mock<typeof getRequestyModels>
-const mockGetGlamaModels = getGlamaModels as Mock<typeof getGlamaModels>
 const mockGetUnboundModels = getUnboundModels as Mock<typeof getUnboundModels>
 const mockGetIOIntelligenceModels = getIOIntelligenceModels as Mock<typeof getIOIntelligenceModels>
 
@@ -139,23 +136,6 @@ describe("getModels with new GetModelsOptions", () => {
 		expect(result).toEqual(mockModels)
 	})
 
-	it("calls getGlamaModels for glama provider", async () => {
-		const mockModels = {
-			"glama/model": {
-				maxTokens: 4096,
-				contextWindow: 8192,
-				supportsPromptCache: false,
-				description: "Glama model",
-			},
-		}
-		mockGetGlamaModels.mockResolvedValue(mockModels)
-
-		const result = await getModels({ provider: "glama" })
-
-		expect(mockGetGlamaModels).toHaveBeenCalled()
-		expect(result).toEqual(mockModels)
-	})
-
 	it("calls getUnboundModels with optional API key", async () => {
 		const mockModels = {
 			"unbound/model": {
@@ -302,7 +282,7 @@ describe("getModelsFromCache disk fallback", () => {
 
 		const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {})
 
-		const result = getModelsFromCache("glama")
+		const result = getModelsFromCache("openrouter")
 
 		expect(result).toBeUndefined()
 		expect(consoleErrorSpy).toHaveBeenCalled()
diff --git a/src/api/providers/fetchers/__tests__/versionedSettings.spec.ts b/src/api/providers/fetchers/__tests__/versionedSettings.spec.ts
index 029f92b3017..9422c012678 100644
--- a/src/api/providers/fetchers/__tests__/versionedSettings.spec.ts
+++ b/src/api/providers/fetchers/__tests__/versionedSettings.spec.ts
@@ -5,6 +5,7 @@ import {
 	resolveVersionedSettings,
 	type VersionedSettings,
 } from "../versionedSettings"
+import { Package } from "../../../../shared/package"
 
 describe("versionedSettings", () => {
 	describe("compareSemver", () => {
@@ -113,6 +114,23 @@ describe("versionedSettings", () => {
 			const result = findHighestMatchingVersion(versionedSettings, "3.36.4")
 			expect(result).toBeUndefined()
 		})
+
+		it("should treat nightly builds (by package name) as always eligible and pick highest version", () => {
+			const versionedSettings: VersionedSettings = {
+				"3.36.3": { feature: "v3" },
+				"2.0.0": { feature: "v2" },
+			}
+
+			const originalName = Package.name
+			;(Package as { name: string }).name = "roo-code-nightly"
+
+			try {
+				const result = findHighestMatchingVersion(versionedSettings, "1.0.0")
+				expect(result).toBe("3.36.3")
+			} finally {
+				;(Package as { name: string }).name = originalName
+			}
+		})
 	})
 
 	describe("resolveVersionedSettings", () => {
diff --git a/src/api/providers/fetchers/chutes.ts b/src/api/providers/fetchers/chutes.ts
index 89bb5130159..d5334aa59bc 100644
--- a/src/api/providers/fetchers/chutes.ts
+++ b/src/api/providers/fetchers/chutes.ts
@@ -40,7 +40,6 @@ export async function getChutesModels(apiKey?: string): Promise<Record<string, M
 				const contextWindow = m.context_length
 
 				if (!contextWindow) {
-					console.error(`Context length is required for Chutes model: ${m.id}`)
 					continue
 				}
 
diff --git a/src/api/providers/fetchers/glama.ts b/src/api/providers/fetchers/glama.ts
deleted file mode 100644
index c134e44e404..00000000000
--- a/src/api/providers/fetchers/glama.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import axios from "axios"
-
-import type { ModelInfo } from "@roo-code/types"
-
-import { parseApiPrice } from "../../../shared/cost"
-
-export async function getGlamaModels(): Promise<Record<string, ModelInfo>> {
-	const models: Record<string, ModelInfo> = {}
-
-	try {
-		const response = await axios.get("https://glama.ai/api/gateway/v1/models")
-		const rawModels = response.data
-
-		for (const rawModel of rawModels) {
-			const modelInfo: ModelInfo = {
-				maxTokens: rawModel.maxTokensOutput,
-				contextWindow: rawModel.maxTokensInput,
-				supportsImages: rawModel.capabilities?.includes("input:image"),
-				supportsPromptCache: rawModel.capabilities?.includes("caching"),
-				inputPrice: parseApiPrice(rawModel.pricePerToken?.input),
-				outputPrice: parseApiPrice(rawModel.pricePerToken?.output),
-				description: undefined,
-				cacheWritesPrice: parseApiPrice(rawModel.pricePerToken?.cacheWrite),
-				cacheReadsPrice: parseApiPrice(rawModel.pricePerToken?.cacheRead),
-			}
-
-			switch (rawModel.id) {
-				case rawModel.id.startsWith("anthropic/"):
-					modelInfo.maxTokens = 8192
-					break
-				default:
-					break
-			}
-
-			models[rawModel.id] = modelInfo
-		}
-	} catch (error) {
-		console.warn(`Error fetching Glama models: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`)
-	}
-
-	return models
-}
diff --git a/src/api/providers/fetchers/modelCache.ts b/src/api/providers/fetchers/modelCache.ts
index debdeba43c7..eddd25c4a10 100644
--- a/src/api/providers/fetchers/modelCache.ts
+++ b/src/api/providers/fetchers/modelCache.ts
@@ -20,7 +20,6 @@ import { getOpenRouterModels } from "./openrouter"
 import { getVercelAiGatewayModels } from "./vercel-ai-gateway"
 import { getRequestyModels } from "./requesty"
 import { getZgsmModels } from "./zgsm"
-import { getGlamaModels } from "./glama"
 import { getUnboundModels } from "./unbound"
 import { getLiteLLMModels } from "./litellm"
 import { GetModelsOptions } from "../../../shared/api"
@@ -95,9 +94,6 @@ async function fetchModelsFromProvider(options: GetModelsOptions): Promise<Model
 			// Requesty models endpoint requires an API key for per-user custom policies.
 			models = await getRequestyModels(options.baseUrl, options.apiKey)
 			break
-		case "glama":
-			models = await getGlamaModels()
-			break
 		case "unbound":
 			// Unbound models endpoint requires an API key to fetch application specific models.
 			models = await getUnboundModels(options.apiKey)
@@ -277,7 +273,6 @@ export async function initializeModelCacheRefresh(): Promise<void> {
 		// Providers that work without API keys
 		const publicProviders: Array<{ provider: RouterName; options: GetModelsOptions }> = [
 			{ provider: "openrouter", options: { provider: "openrouter" } },
-			{ provider: "glama", options: { provider: "glama" } },
 			{ provider: "vercel-ai-gateway", options: { provider: "vercel-ai-gateway" } },
 			{ provider: "chutes", options: { provider: "chutes" } },
 		]
diff --git a/src/api/providers/fetchers/versionedSettings.ts b/src/api/providers/fetchers/versionedSettings.ts
index 50ec0b89732..d644c683d35 100644
--- a/src/api/providers/fetchers/versionedSettings.ts
+++ b/src/api/providers/fetchers/versionedSettings.ts
@@ -2,6 +2,10 @@ import cmp from "semver-compare"
 
 import { Package } from "../../../shared/package"
 
+function isNightlyBuild(): boolean {
+	return Package.name.toLowerCase().includes("nightly")
+}
+
 /**
  * Type for versioned settings where the version is the key.
  * Each version key maps to a settings object that should be used
@@ -68,6 +72,16 @@ export function findHighestMatchingVersion(
 ): string | undefined {
 	const versions = Object.keys(versionedSettings)
 
+	if (versions.length === 0) {
+		return undefined
+	}
+
+	// Nightly builds should always pick the highest available versioned settings
+	if (isNightlyBuild()) {
+		versions.sort((a, b) => compareSemver(b, a))
+		return versions[0]
+	}
+
 	// Filter to versions that are <= currentVersion
 	const matchingVersions = versions.filter((version) => meetsMinimumVersion(version, currentVersion))
 
diff --git a/src/api/providers/gemini.ts b/src/api/providers/gemini.ts
index a5d70345906..31842396cb0 100644
--- a/src/api/providers/gemini.ts
+++ b/src/api/providers/gemini.ts
@@ -199,13 +199,17 @@ export class GeminiHandler extends BaseProvider implements SingleCompletionHandl
 			let lastUsageMetadata: GenerateContentResponseUsageMetadata | undefined
 			let pendingGroundingMetadata: GroundingMetadata | undefined
 			let finalResponse: { responseId?: string } | undefined
+			let finishReason: string | undefined
 
 			let toolCallCounter = 0
+			let hasContent = false
+			let hasReasoning = false
 
 			for await (const chunk of result) {
 				// Track the final structured response (per SDK pattern: candidate.finishReason)
 				if (chunk.candidates && chunk.candidates[0]?.finishReason) {
 					finalResponse = chunk as { responseId?: string }
+					finishReason = chunk.candidates[0].finishReason
 				}
 				// Process candidates and their parts to separate thoughts from content
 				if (chunk.candidates && chunk.candidates.length > 0) {
@@ -233,9 +237,11 @@ export class GeminiHandler extends BaseProvider implements SingleCompletionHandl
 							if (part.thought) {
 								// This is a thinking/reasoning part
 								if (part.text) {
+									hasReasoning = true
 									yield { type: "reasoning", text: part.text }
 								}
 							} else if (part.functionCall) {
+								hasContent = true
 								// Gemini sends complete function calls in a single chunk
 								// Emit as partial chunks for consistent handling with NativeToolCallParser
 								const callId = `${part.functionCall.name}-${toolCallCounter}`
@@ -263,6 +269,7 @@ export class GeminiHandler extends BaseProvider implements SingleCompletionHandl
 							} else {
 								// This is regular content
 								if (part.text) {
+									hasContent = true
 									yield { type: "text", text: part.text }
 								}
 							}
@@ -272,6 +279,7 @@ export class GeminiHandler extends BaseProvider implements SingleCompletionHandl
 
 				// Fallback to the original text property if no candidates structure
 				else if (chunk.text) {
+					hasContent = true
 					yield { type: "text", text: chunk.text }
 				}
 
@@ -280,6 +288,21 @@ export class GeminiHandler extends BaseProvider implements SingleCompletionHandl
 				}
 			}
 
+			// If we had reasoning but no content, emit a placeholder text to prevent "Empty assistant response" errors.
+			// This typically happens when the model hits max output tokens while reasoning.
+			if (hasReasoning && !hasContent) {
+				let message = t("common:errors.gemini.thinking_complete_no_output")
+				if (finishReason === "MAX_TOKENS") {
+					message = t("common:errors.gemini.thinking_complete_truncated")
+				} else if (finishReason === "SAFETY") {
+					message = t("common:errors.gemini.thinking_complete_safety")
+				} else if (finishReason === "RECITATION") {
+					message = t("common:errors.gemini.thinking_complete_recitation")
+				}
+
+				yield { type: "text", text: message }
+			}
+
 			if (finalResponse?.responseId) {
 				// Capture responseId so Task.addToApiConversationHistory can store it
 				// alongside the assistant message in api_history.json.
diff --git a/src/api/providers/glama.ts b/src/api/providers/glama.ts
deleted file mode 100644
index f298b38a0fc..00000000000
--- a/src/api/providers/glama.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import axios from "axios"
-import OpenAI from "openai"
-
-import { glamaDefaultModelId, glamaDefaultModelInfo, GLAMA_DEFAULT_TEMPERATURE } from "@roo-code/types"
-
-import { Package } from "../../shared/package"
-import { ApiHandlerOptions } from "../../shared/api"
-
-import { ApiStream } from "../transform/stream"
-import { convertToOpenAiMessages } from "../transform/openai-format"
-import { addCacheBreakpoints } from "../transform/caching/anthropic"
-
-import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index"
-import { RouterProvider } from "./router-provider"
-
-const DEFAULT_HEADERS = {
-	"X-Glama-Metadata": JSON.stringify({
-		labels: [{ key: "app", value: `vscode.${Package.publisher}.${Package.name}` }],
-	}),
-}
-
-export class GlamaHandler extends RouterProvider implements SingleCompletionHandler {
-	constructor(options: ApiHandlerOptions) {
-		super({
-			options,
-			name: "glama",
-			baseURL: "https://glama.ai/api/gateway/openai/v1",
-			apiKey: options.glamaApiKey,
-			modelId: options.glamaModelId,
-			defaultModelId: glamaDefaultModelId,
-			defaultModelInfo: glamaDefaultModelInfo,
-		})
-	}
-
-	override async *createMessage(
-		systemPrompt: string,
-		messages: Anthropic.Messages.MessageParam[],
-		metadata?: ApiHandlerCreateMessageMetadata,
-	): ApiStream {
-		const { id: modelId, info } = await this.fetchModel()
-
-		const openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
-			{ role: "system", content: systemPrompt },
-			...convertToOpenAiMessages(messages),
-		]
-
-		if (modelId.startsWith("anthropic/claude-3")) {
-			addCacheBreakpoints(systemPrompt, openAiMessages)
-		}
-
-		// Required by Anthropic; other providers default to max tokens allowed.
-		let maxTokens: number | undefined
-
-		if (modelId.startsWith("anthropic/")) {
-			maxTokens = info.maxTokens ?? undefined
-		}
-
-		const requestOptions: OpenAI.Chat.ChatCompletionCreateParams = {
-			model: modelId,
-			max_tokens: maxTokens,
-			messages: openAiMessages,
-			stream: true,
-		}
-
-		if (this.supportsTemperature(modelId)) {
-			requestOptions.temperature = this.options.modelTemperature ?? GLAMA_DEFAULT_TEMPERATURE
-		}
-
-		const { data: completion, response } = await this.client.chat.completions
-			.create(requestOptions, { headers: DEFAULT_HEADERS })
-			.withResponse()
-
-		const completionRequestId = response.headers.get("x-completion-request-id")
-
-		for await (const chunk of completion) {
-			const delta = chunk.choices[0]?.delta
-
-			if (delta?.content) {
-				yield { type: "text", text: delta.content }
-			}
-		}
-
-		try {
-			let attempt = 0
-
-			const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
-
-			while (attempt++ < 10) {
-				// In case of an interrupted request, we need to wait for the upstream API to finish processing the request
-				// before we can fetch information about the token usage and cost.
-				const response = await axios.get(
-					`https://glama.ai/api/gateway/v1/completion-requests/${completionRequestId}`,
-					{ headers: { Authorization: `Bearer ${this.options.glamaApiKey}` } },
-				)
-
-				const completionRequest = response.data
-
-				if (completionRequest.tokenUsage && completionRequest.totalCostUsd) {
-					yield {
-						type: "usage",
-						cacheWriteTokens: completionRequest.tokenUsage.cacheCreationInputTokens,
-						cacheReadTokens: completionRequest.tokenUsage.cacheReadInputTokens,
-						inputTokens: completionRequest.tokenUsage.promptTokens,
-						outputTokens: completionRequest.tokenUsage.completionTokens,
-						totalCost: parseFloat(completionRequest.totalCostUsd),
-					}
-
-					break
-				}
-
-				await delay(200)
-			}
-		} catch (error) {
-			console.error("Error fetching Glama completion details", error)
-		}
-	}
-
-	async completePrompt(prompt: string, systemPrompt?: string, metadata?: any): Promise<string> {
-		const { id: modelId, info } = await this.fetchModel()
-
-		try {
-			const requestOptions: OpenAI.Chat.Completions.ChatCompletionCreateParamsNonStreaming = {
-				model: modelId,
-				messages: [{ role: "user", content: prompt }],
-			}
-
-			if (this.supportsTemperature(modelId)) {
-				requestOptions.temperature = this.options.modelTemperature ?? GLAMA_DEFAULT_TEMPERATURE
-			}
-
-			if (modelId.startsWith("anthropic/")) {
-				requestOptions.max_tokens = info.maxTokens
-			}
-
-			const response = await this.client.chat.completions.create(requestOptions, { signal: metadata?.signal })
-			return response.choices[0]?.message.content || ""
-		} catch (error) {
-			if (error instanceof Error) {
-				throw new Error(`Glama completion error: ${error.message}`)
-			}
-
-			throw error
-		}
-	}
-}
diff --git a/src/api/providers/index.ts b/src/api/providers/index.ts
index ddb3bb00792..17b702d49bb 100644
--- a/src/api/providers/index.ts
+++ b/src/api/providers/index.ts
@@ -10,7 +10,6 @@ export { MoonshotHandler } from "./moonshot"
 export { FakeAIHandler } from "./fake-ai"
 export { GeminiHandler } from "./gemini"
 export { GeminiCliHandler } from "./gemini-cli"
-export { GlamaHandler } from "./glama"
 export { GroqHandler } from "./groq"
 export { HuggingFaceHandler } from "./huggingface"
 export { HumanRelayHandler } from "./human-relay"
diff --git a/src/api/providers/openrouter.ts b/src/api/providers/openrouter.ts
index 8cb5b9f7af7..063f23c210d 100644
--- a/src/api/providers/openrouter.ts
+++ b/src/api/providers/openrouter.ts
@@ -7,7 +7,6 @@ import {
 	OPENROUTER_DEFAULT_PROVIDER_NAME,
 	OPEN_ROUTER_PROMPT_CACHING_MODELS,
 	DEEP_SEEK_DEFAULT_TEMPERATURE,
-	shouldReportApiErrorToTelemetry,
 	ApiProviderError,
 } from "@roo-code/types"
 import { TelemetryService } from "@roo-code/telemetry"
@@ -236,8 +235,8 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
 					modelId,
 					"createMessage",
 				),
-				{ provider: this.providerName, modelId, operation: "createMessage" },
 			)
+
 			throw handleOpenAIError(error, this.providerName)
 		}
 
@@ -262,8 +261,9 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
 			if ("error" in chunk) {
 				const error = chunk.error as { message?: string; code?: number }
 				console.error(`OpenRouter API Error: ${error?.code} - ${error?.message}`)
-				if (shouldReportApiErrorToTelemetry(error?.code)) {
-					TelemetryService.instance.captureException(
+
+				TelemetryService.instance.captureException(
+					Object.assign(
 						new ApiProviderError(
 							error?.message ?? "Unknown error",
 							this.providerName,
@@ -271,9 +271,10 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
 							"createMessage",
 							error?.code,
 						),
-						{ provider: this.providerName, modelId, operation: "createMessage", errorCode: error?.code },
-					)
-				}
+						{ status: error?.code },
+					),
+				)
+
 				throw new Error(`OpenRouter API Error ${error?.code}: ${error?.message}`)
 			}
 
@@ -465,6 +466,7 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
 			: undefined
 
 		let response
+
 		try {
 			response = await this.client.chat.completions.create(completionParams, {
 				...requestOptions,
@@ -478,15 +480,17 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
 					modelId,
 					"completePrompt",
 				),
-				{ provider: this.providerName, modelId, operation: "completePrompt" },
 			)
+
 			throw handleOpenAIError(error, this.providerName)
 		}
 
 		if ("error" in response) {
 			const error = response.error as { message?: string; code?: number }
-			if (shouldReportApiErrorToTelemetry(error?.code)) {
-				TelemetryService.instance.captureException(
+			console.error(`OpenRouter API Error: ${error?.code} - ${error?.message}`)
+
+			TelemetryService.instance.captureException(
+				Object.assign(
 					new ApiProviderError(
 						error?.message ?? "Unknown error",
 						this.providerName,
@@ -494,9 +498,10 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
 						"completePrompt",
 						error?.code,
 					),
-					{ provider: this.providerName, modelId, operation: "completePrompt", errorCode: error?.code },
-				)
-			}
+					{ status: error?.code },
+				),
+			)
+
 			throw new Error(`OpenRouter API Error ${error?.code}: ${error?.message}`)
 		}
 
diff --git a/src/api/transform/gemini-format.ts b/src/api/transform/gemini-format.ts
index f9d855dda93..bc4dc4aa54a 100644
--- a/src/api/transform/gemini-format.ts
+++ b/src/api/transform/gemini-format.ts
@@ -14,6 +14,11 @@ type ReasoningContentBlock = {
 type ExtendedContentBlockParam = Anthropic.ContentBlockParam | ThoughtSignatureContentBlock | ReasoningContentBlock
 type ExtendedAnthropicContent = string | ExtendedContentBlockParam[]
 
+// Extension type to safely add thoughtSignature to Part
+type PartWithThoughtSignature = Part & {
+	thoughtSignature?: string
+}
+
 function isThoughtSignatureContentBlock(block: ExtendedContentBlockParam): block is ThoughtSignatureContentBlock {
 	return block.type === "thoughtSignature"
 }
@@ -47,16 +52,11 @@ export function convertAnthropicContentToGemini(
 		return [{ text: content }]
 	}
 
-	return content.flatMap((block): Part | Part[] => {
+	const parts = content.flatMap((block): Part | Part[] => {
 		// Handle thoughtSignature blocks first
 		if (isThoughtSignatureContentBlock(block)) {
-			if (includeThoughtSignatures && typeof block.thoughtSignature === "string") {
-				// The Google GenAI SDK currently exposes thoughtSignature as an
-				// extension field on Part; model it structurally without widening
-				// the upstream type.
-				return { thoughtSignature: block.thoughtSignature } as Part
-			}
-			// Explicitly omit thoughtSignature when not including it.
+			// We process thought signatures globally and attach them to the relevant parts
+			// or create a placeholder part if no other content exists.
 			return []
 		}
 
@@ -135,6 +135,25 @@ export function convertAnthropicContentToGemini(
 				return []
 		}
 	})
+
+	// Post-processing: Ensure thought signature is attached if required
+	if (includeThoughtSignatures && activeThoughtSignature) {
+		const hasSignature = parts.some((p) => "thoughtSignature" in p)
+
+		if (!hasSignature) {
+			if (parts.length > 0) {
+				// Attach to the first part (usually text)
+				// We use the intersection type to allow adding the property safely
+				;(parts[0] as PartWithThoughtSignature).thoughtSignature = activeThoughtSignature
+			} else {
+				// Create a placeholder part if no other content exists
+				const placeholder: PartWithThoughtSignature = { text: "", thoughtSignature: activeThoughtSignature }
+				parts.push(placeholder)
+			}
+		}
+	}
+
+	return parts
 }
 
 export function convertAnthropicMessageToGemini(
diff --git a/src/core/assistant-message/NativeToolCallParser.ts b/src/core/assistant-message/NativeToolCallParser.ts
index 374e9f5f918..9de8d7a8573 100644
--- a/src/core/assistant-message/NativeToolCallParser.ts
+++ b/src/core/assistant-message/NativeToolCallParser.ts
@@ -157,7 +157,6 @@ export class NativeToolCallParser {
 					id: tracked.id,
 				})
 			}
-			this.rawChunkTracker.clear()
 		}
 
 		return events
@@ -439,14 +438,6 @@ export class NativeToolCallParser {
 				}
 				break
 
-			case "list_code_definition_names":
-				if (partialArgs.path !== undefined) {
-					nativeArgs = {
-						path: partialArgs.path,
-					}
-				}
-				break
-
 			case "run_slash_command":
 				if (partialArgs.command !== undefined) {
 					nativeArgs = {
@@ -679,14 +670,6 @@ export class NativeToolCallParser {
 					}
 					break
 
-				case "list_code_definition_names":
-					if (args.path !== undefined) {
-						nativeArgs = {
-							path: args.path,
-						} as NativeArgsFor<TName>
-					}
-					break
-
 				case "run_slash_command":
 					if (args.command !== undefined) {
 						nativeArgs = {
diff --git a/src/core/assistant-message/presentAssistantMessage.ts b/src/core/assistant-message/presentAssistantMessage.ts
index 50407bee132..76e693572b3 100644
--- a/src/core/assistant-message/presentAssistantMessage.ts
+++ b/src/core/assistant-message/presentAssistantMessage.ts
@@ -21,7 +21,6 @@ import { applyDiffTool } from "../tools/MultiApplyDiffTool"
 import { searchAndReplaceTool } from "../tools/SearchAndReplaceTool"
 import { searchReplaceTool } from "../tools/SearchReplaceTool"
 import { applyPatchTool } from "../tools/ApplyPatchTool"
-import { listCodeDefinitionNamesTool } from "../tools/ListCodeDefinitionNamesTool"
 import { searchFilesTool } from "../tools/SearchFilesTool"
 import { browserActionTool } from "../tools/BrowserActionTool"
 import { executeCommandTool } from "../tools/ExecuteCommandTool"
@@ -401,8 +400,6 @@ export async function presentAssistantMessage(cline: Task) {
 						return `[${block.name}]`
 					case "list_files":
 						return `[${block.name} for '${block.params.path}']`
-					case "list_code_definition_names":
-						return `[${block.name} for '${block.params.path}']`
 					case "browser_action":
 						return `[${block.name} for '${fixBrowserLaunchAction(block.params)}']`
 					case "use_mcp_tool":
@@ -939,15 +936,6 @@ export async function presentAssistantMessage(cline: Task) {
 				// 		toolProtocol,
 				// 	})
 				// 	break
-				case "list_code_definition_names":
-					await listCodeDefinitionNamesTool.handle(cline, block as ToolUse<"list_code_definition_names">, {
-						askApproval,
-						handleError,
-						pushToolResult,
-						removeClosingTag,
-						toolProtocol,
-					})
-					break
 				case "search_files":
 					await searchFilesTool.handle(cline, block as ToolUse<"search_files">, {
 						askApproval,
diff --git a/src/core/auto-approval/tools.ts b/src/core/auto-approval/tools.ts
index a6c76c7173c..4e27a217a95 100644
--- a/src/core/auto-approval/tools.ts
+++ b/src/core/auto-approval/tools.ts
@@ -10,7 +10,6 @@ export function isReadOnlyToolAction(tool: ClineSayTool): boolean {
 		"listFiles",
 		"listFilesTopLevel",
 		"listFilesRecursive",
-		"listCodeDefinitionNames",
 		"searchFiles",
 		"codebaseSearch",
 		"runSlashCommand",
diff --git a/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/architect-mode-prompt.snap b/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/architect-mode-prompt.snap
index 7c2683bc9f2..262eff4ba45 100644
--- a/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/architect-mode-prompt.snap
+++ b/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/architect-mode-prompt.snap
@@ -26,6 +26,85 @@ Always use the actual tool name as the XML tag name for proper parsing and execu
 
 # Tools
 
+## ask_multiple_choice
+Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
+
+Use this tool when:
+- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
+- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
+- You want to collect multiple related decisions in a single interaction.
+
+CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
+
+Parameters:
+- title: (optional) A brief title for the decision group.
+- questions: (REQUIRED) An array of question objects (at least 1).
+  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
+  - prompt: (REQUIRED) The text question to display to the user.
+  - options: (REQUIRED) An array of option objects (at least 2).
+    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
+    - label: (REQUIRED) The user-facing display text.
+  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
+
+Usage:
+<ask_multiple_choice>
+  <title>Decision Title</title>
+  <questions>
+    <question>
+      <id>question_slug</id>
+      <prompt>Question text?</prompt>
+      <options>
+        <option>
+          <id>option_slug_1</id>
+          <label>Option 1 Label</label>
+        </option>
+        <option>
+          <id>option_slug_2</id>
+          <label>Option 2 Label</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
+Example:
+<ask_multiple_choice>
+  <title>Project Setup</title>
+  <questions>
+    <question>
+      <id>framework</id>
+      <prompt>Which framework would you like to use?</prompt>
+      <options>
+        <option>
+          <id>react</id>
+          <label>React</label>
+        </option>
+        <option>
+          <id>vue</id>
+          <label>Vue.js</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+    <question>
+      <id>features</id>
+      <prompt>Select additional features:</prompt>
+      <options>
+        <option>
+          <id>typescript</id>
+          <label>TypeScript</label>
+        </option>
+        <option>
+          <id>linting</id>
+          <label>ESLint + Prettier</label>
+        </option>
+      </options>
+      <allow_multiple>true</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
 ## read_file
 Description: Request to read the contents of one or more files. The tool outputs line-numbered content (e.g. "1 | const x = 1") for easy reference when creating diffs or discussing code. Supports text extraction from PDF and DOCX files, but may not handle other binary files properly.
 
@@ -149,106 +228,6 @@ Example: Requesting to list all files in the current directory
 <recursive>false</recursive>
 </list_files>
 
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory /test/path) to analyze. When given a directory, it lists definitions from all top-level source files.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>
-
-Examples:
-
-1. List definitions from a specific file:
-<list_code_definition_names>
-<path>src/main.ts</path>
-</list_code_definition_names>
-
-2. List definitions from all files in a directory:
-<list_code_definition_names>
-<path>src/</path>
-</list_code_definition_names>
-
-## ask_multiple_choice
-Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
-
-Use this tool when:
-- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
-- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
-- You want to collect multiple related decisions in a single interaction.
-
-CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
-
-Parameters:
-- title: (optional) A brief title for the decision group.
-- questions: (REQUIRED) An array of question objects (at least 1).
-  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
-  - prompt: (REQUIRED) The text question to display to the user.
-  - options: (REQUIRED) An array of option objects (at least 2).
-    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
-    - label: (REQUIRED) The user-facing display text.
-  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
-
-Usage:
-<ask_multiple_choice>
-  <title>Decision Title</title>
-  <questions>
-    <question>
-      <id>question_slug</id>
-      <prompt>Question text?</prompt>
-      <options>
-        <option>
-          <id>option_slug_1</id>
-          <label>Option 1 Label</label>
-        </option>
-        <option>
-          <id>option_slug_2</id>
-          <label>Option 2 Label</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
-Example:
-<ask_multiple_choice>
-  <title>Project Setup</title>
-  <questions>
-    <question>
-      <id>framework</id>
-      <prompt>Which framework would you like to use?</prompt>
-      <options>
-        <option>
-          <id>react</id>
-          <label>React</label>
-        </option>
-        <option>
-          <id>vue</id>
-          <label>Vue.js</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-    <question>
-      <id>features</id>
-      <prompt>Select additional features:</prompt>
-      <options>
-        <option>
-          <id>typescript</id>
-          <label>TypeScript</label>
-        </option>
-        <option>
-          <id>linting</id>
-          <label>ESLint + Prettier</label>
-        </option>
-      </options>
-      <allow_multiple>true</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
 ## write_to_file
 Description: Request to write content to a file. This tool is primarily used for **creating new files** or for scenarios where a **complete rewrite of an existing file is intentionally required**. If the file exists, it will be overwritten. If it doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
 
diff --git a/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/ask-mode-prompt.snap b/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/ask-mode-prompt.snap
index e2416196604..a2d2fd2f9f2 100644
--- a/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/ask-mode-prompt.snap
+++ b/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/ask-mode-prompt.snap
@@ -26,6 +26,85 @@ Always use the actual tool name as the XML tag name for proper parsing and execu
 
 # Tools
 
+## ask_multiple_choice
+Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
+
+Use this tool when:
+- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
+- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
+- You want to collect multiple related decisions in a single interaction.
+
+CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
+
+Parameters:
+- title: (optional) A brief title for the decision group.
+- questions: (REQUIRED) An array of question objects (at least 1).
+  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
+  - prompt: (REQUIRED) The text question to display to the user.
+  - options: (REQUIRED) An array of option objects (at least 2).
+    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
+    - label: (REQUIRED) The user-facing display text.
+  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
+
+Usage:
+<ask_multiple_choice>
+  <title>Decision Title</title>
+  <questions>
+    <question>
+      <id>question_slug</id>
+      <prompt>Question text?</prompt>
+      <options>
+        <option>
+          <id>option_slug_1</id>
+          <label>Option 1 Label</label>
+        </option>
+        <option>
+          <id>option_slug_2</id>
+          <label>Option 2 Label</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
+Example:
+<ask_multiple_choice>
+  <title>Project Setup</title>
+  <questions>
+    <question>
+      <id>framework</id>
+      <prompt>Which framework would you like to use?</prompt>
+      <options>
+        <option>
+          <id>react</id>
+          <label>React</label>
+        </option>
+        <option>
+          <id>vue</id>
+          <label>Vue.js</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+    <question>
+      <id>features</id>
+      <prompt>Select additional features:</prompt>
+      <options>
+        <option>
+          <id>typescript</id>
+          <label>TypeScript</label>
+        </option>
+        <option>
+          <id>linting</id>
+          <label>ESLint + Prettier</label>
+        </option>
+      </options>
+      <allow_multiple>true</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
 ## read_file
 Description: Request to read the contents of one or more files. The tool outputs line-numbered content (e.g. "1 | const x = 1") for easy reference when creating diffs or discussing code. Supports text extraction from PDF and DOCX files, but may not handle other binary files properly.
 
@@ -149,106 +228,6 @@ Example: Requesting to list all files in the current directory
 <recursive>false</recursive>
 </list_files>
 
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory /test/path) to analyze. When given a directory, it lists definitions from all top-level source files.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>
-
-Examples:
-
-1. List definitions from a specific file:
-<list_code_definition_names>
-<path>src/main.ts</path>
-</list_code_definition_names>
-
-2. List definitions from all files in a directory:
-<list_code_definition_names>
-<path>src/</path>
-</list_code_definition_names>
-
-## ask_multiple_choice
-Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
-
-Use this tool when:
-- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
-- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
-- You want to collect multiple related decisions in a single interaction.
-
-CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
-
-Parameters:
-- title: (optional) A brief title for the decision group.
-- questions: (REQUIRED) An array of question objects (at least 1).
-  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
-  - prompt: (REQUIRED) The text question to display to the user.
-  - options: (REQUIRED) An array of option objects (at least 2).
-    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
-    - label: (REQUIRED) The user-facing display text.
-  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
-
-Usage:
-<ask_multiple_choice>
-  <title>Decision Title</title>
-  <questions>
-    <question>
-      <id>question_slug</id>
-      <prompt>Question text?</prompt>
-      <options>
-        <option>
-          <id>option_slug_1</id>
-          <label>Option 1 Label</label>
-        </option>
-        <option>
-          <id>option_slug_2</id>
-          <label>Option 2 Label</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
-Example:
-<ask_multiple_choice>
-  <title>Project Setup</title>
-  <questions>
-    <question>
-      <id>framework</id>
-      <prompt>Which framework would you like to use?</prompt>
-      <options>
-        <option>
-          <id>react</id>
-          <label>React</label>
-        </option>
-        <option>
-          <id>vue</id>
-          <label>Vue.js</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-    <question>
-      <id>features</id>
-      <prompt>Select additional features:</prompt>
-      <options>
-        <option>
-          <id>typescript</id>
-          <label>TypeScript</label>
-        </option>
-        <option>
-          <id>linting</id>
-          <label>ESLint + Prettier</label>
-        </option>
-      </options>
-      <allow_multiple>true</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
 ## ask_followup_question
 Description: Ask the user a question to gather additional information needed to complete the task. Use when you need clarification or more details to proceed effectively.
 
diff --git a/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-disabled.snap b/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-disabled.snap
index 4d6bf511d2c..00a4d5e4709 100644
--- a/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-disabled.snap
+++ b/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-disabled.snap
@@ -26,6 +26,85 @@ Always use the actual tool name as the XML tag name for proper parsing and execu
 
 # Tools
 
+## ask_multiple_choice
+Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
+
+Use this tool when:
+- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
+- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
+- You want to collect multiple related decisions in a single interaction.
+
+CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
+
+Parameters:
+- title: (optional) A brief title for the decision group.
+- questions: (REQUIRED) An array of question objects (at least 1).
+  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
+  - prompt: (REQUIRED) The text question to display to the user.
+  - options: (REQUIRED) An array of option objects (at least 2).
+    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
+    - label: (REQUIRED) The user-facing display text.
+  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
+
+Usage:
+<ask_multiple_choice>
+  <title>Decision Title</title>
+  <questions>
+    <question>
+      <id>question_slug</id>
+      <prompt>Question text?</prompt>
+      <options>
+        <option>
+          <id>option_slug_1</id>
+          <label>Option 1 Label</label>
+        </option>
+        <option>
+          <id>option_slug_2</id>
+          <label>Option 2 Label</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
+Example:
+<ask_multiple_choice>
+  <title>Project Setup</title>
+  <questions>
+    <question>
+      <id>framework</id>
+      <prompt>Which framework would you like to use?</prompt>
+      <options>
+        <option>
+          <id>react</id>
+          <label>React</label>
+        </option>
+        <option>
+          <id>vue</id>
+          <label>Vue.js</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+    <question>
+      <id>features</id>
+      <prompt>Select additional features:</prompt>
+      <options>
+        <option>
+          <id>typescript</id>
+          <label>TypeScript</label>
+        </option>
+        <option>
+          <id>linting</id>
+          <label>ESLint + Prettier</label>
+        </option>
+      </options>
+      <allow_multiple>true</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
 ## read_file
 Description: Request to read the contents of one or more files. The tool outputs line-numbered content (e.g. "1 | const x = 1") for easy reference when creating diffs or discussing code. Supports text extraction from PDF and DOCX files, but may not handle other binary files properly.
 
@@ -148,106 +227,6 @@ Example: Requesting to list all files in the current directory
 <recursive>false</recursive>
 </list_files>
 
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory /test/path) to analyze. When given a directory, it lists definitions from all top-level source files.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>
-
-Examples:
-
-1. List definitions from a specific file:
-<list_code_definition_names>
-<path>src/main.ts</path>
-</list_code_definition_names>
-
-2. List definitions from all files in a directory:
-<list_code_definition_names>
-<path>src/</path>
-</list_code_definition_names>
-
-## ask_multiple_choice
-Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
-
-Use this tool when:
-- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
-- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
-- You want to collect multiple related decisions in a single interaction.
-
-CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
-
-Parameters:
-- title: (optional) A brief title for the decision group.
-- questions: (REQUIRED) An array of question objects (at least 1).
-  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
-  - prompt: (REQUIRED) The text question to display to the user.
-  - options: (REQUIRED) An array of option objects (at least 2).
-    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
-    - label: (REQUIRED) The user-facing display text.
-  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
-
-Usage:
-<ask_multiple_choice>
-  <title>Decision Title</title>
-  <questions>
-    <question>
-      <id>question_slug</id>
-      <prompt>Question text?</prompt>
-      <options>
-        <option>
-          <id>option_slug_1</id>
-          <label>Option 1 Label</label>
-        </option>
-        <option>
-          <id>option_slug_2</id>
-          <label>Option 2 Label</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
-Example:
-<ask_multiple_choice>
-  <title>Project Setup</title>
-  <questions>
-    <question>
-      <id>framework</id>
-      <prompt>Which framework would you like to use?</prompt>
-      <options>
-        <option>
-          <id>react</id>
-          <label>React</label>
-        </option>
-        <option>
-          <id>vue</id>
-          <label>Vue.js</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-    <question>
-      <id>features</id>
-      <prompt>Select additional features:</prompt>
-      <options>
-        <option>
-          <id>typescript</id>
-          <label>TypeScript</label>
-        </option>
-        <option>
-          <id>linting</id>
-          <label>ESLint + Prettier</label>
-        </option>
-      </options>
-      <allow_multiple>true</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
 ## write_to_file
 Description: Request to write content to a file. This tool is primarily used for **creating new files** or for scenarios where a **complete rewrite of an existing file is intentionally required**. If the file exists, it will be overwritten. If it doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
 
diff --git a/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-enabled.snap b/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-enabled.snap
index 08732dc1612..9341bac39b4 100644
--- a/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-enabled.snap
+++ b/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-enabled.snap
@@ -26,6 +26,85 @@ Always use the actual tool name as the XML tag name for proper parsing and execu
 
 # Tools
 
+## ask_multiple_choice
+Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
+
+Use this tool when:
+- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
+- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
+- You want to collect multiple related decisions in a single interaction.
+
+CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
+
+Parameters:
+- title: (optional) A brief title for the decision group.
+- questions: (REQUIRED) An array of question objects (at least 1).
+  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
+  - prompt: (REQUIRED) The text question to display to the user.
+  - options: (REQUIRED) An array of option objects (at least 2).
+    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
+    - label: (REQUIRED) The user-facing display text.
+  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
+
+Usage:
+<ask_multiple_choice>
+  <title>Decision Title</title>
+  <questions>
+    <question>
+      <id>question_slug</id>
+      <prompt>Question text?</prompt>
+      <options>
+        <option>
+          <id>option_slug_1</id>
+          <label>Option 1 Label</label>
+        </option>
+        <option>
+          <id>option_slug_2</id>
+          <label>Option 2 Label</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
+Example:
+<ask_multiple_choice>
+  <title>Project Setup</title>
+  <questions>
+    <question>
+      <id>framework</id>
+      <prompt>Which framework would you like to use?</prompt>
+      <options>
+        <option>
+          <id>react</id>
+          <label>React</label>
+        </option>
+        <option>
+          <id>vue</id>
+          <label>Vue.js</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+    <question>
+      <id>features</id>
+      <prompt>Select additional features:</prompt>
+      <options>
+        <option>
+          <id>typescript</id>
+          <label>TypeScript</label>
+        </option>
+        <option>
+          <id>linting</id>
+          <label>ESLint + Prettier</label>
+        </option>
+      </options>
+      <allow_multiple>true</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
 ## read_file
 Description: Request to read the contents of one or more files. The tool outputs line-numbered content (e.g. "1 | const x = 1") for easy reference when creating diffs or discussing code. Supports text extraction from PDF and DOCX files, but may not handle other binary files properly.
 
@@ -149,106 +228,6 @@ Example: Requesting to list all files in the current directory
 <recursive>false</recursive>
 </list_files>
 
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory /test/path) to analyze. When given a directory, it lists definitions from all top-level source files.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>
-
-Examples:
-
-1. List definitions from a specific file:
-<list_code_definition_names>
-<path>src/main.ts</path>
-</list_code_definition_names>
-
-2. List definitions from all files in a directory:
-<list_code_definition_names>
-<path>src/</path>
-</list_code_definition_names>
-
-## ask_multiple_choice
-Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
-
-Use this tool when:
-- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
-- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
-- You want to collect multiple related decisions in a single interaction.
-
-CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
-
-Parameters:
-- title: (optional) A brief title for the decision group.
-- questions: (REQUIRED) An array of question objects (at least 1).
-  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
-  - prompt: (REQUIRED) The text question to display to the user.
-  - options: (REQUIRED) An array of option objects (at least 2).
-    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
-    - label: (REQUIRED) The user-facing display text.
-  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
-
-Usage:
-<ask_multiple_choice>
-  <title>Decision Title</title>
-  <questions>
-    <question>
-      <id>question_slug</id>
-      <prompt>Question text?</prompt>
-      <options>
-        <option>
-          <id>option_slug_1</id>
-          <label>Option 1 Label</label>
-        </option>
-        <option>
-          <id>option_slug_2</id>
-          <label>Option 2 Label</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
-Example:
-<ask_multiple_choice>
-  <title>Project Setup</title>
-  <questions>
-    <question>
-      <id>framework</id>
-      <prompt>Which framework would you like to use?</prompt>
-      <options>
-        <option>
-          <id>react</id>
-          <label>React</label>
-        </option>
-        <option>
-          <id>vue</id>
-          <label>Vue.js</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-    <question>
-      <id>features</id>
-      <prompt>Select additional features:</prompt>
-      <options>
-        <option>
-          <id>typescript</id>
-          <label>TypeScript</label>
-        </option>
-        <option>
-          <id>linting</id>
-          <label>ESLint + Prettier</label>
-        </option>
-      </options>
-      <allow_multiple>true</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
 ## write_to_file
 Description: Request to write content to a file. This tool is primarily used for **creating new files** or for scenarios where a **complete rewrite of an existing file is intentionally required**. If the file exists, it will be overwritten. If it doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
 
diff --git a/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/partial-reads-enabled.snap b/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/partial-reads-enabled.snap
index e69338e1e3e..b60921ba1da 100644
--- a/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/partial-reads-enabled.snap
+++ b/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/partial-reads-enabled.snap
@@ -26,6 +26,85 @@ Always use the actual tool name as the XML tag name for proper parsing and execu
 
 # Tools
 
+## ask_multiple_choice
+Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
+
+Use this tool when:
+- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
+- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
+- You want to collect multiple related decisions in a single interaction.
+
+CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
+
+Parameters:
+- title: (optional) A brief title for the decision group.
+- questions: (REQUIRED) An array of question objects (at least 1).
+  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
+  - prompt: (REQUIRED) The text question to display to the user.
+  - options: (REQUIRED) An array of option objects (at least 2).
+    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
+    - label: (REQUIRED) The user-facing display text.
+  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
+
+Usage:
+<ask_multiple_choice>
+  <title>Decision Title</title>
+  <questions>
+    <question>
+      <id>question_slug</id>
+      <prompt>Question text?</prompt>
+      <options>
+        <option>
+          <id>option_slug_1</id>
+          <label>Option 1 Label</label>
+        </option>
+        <option>
+          <id>option_slug_2</id>
+          <label>Option 2 Label</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
+Example:
+<ask_multiple_choice>
+  <title>Project Setup</title>
+  <questions>
+    <question>
+      <id>framework</id>
+      <prompt>Which framework would you like to use?</prompt>
+      <options>
+        <option>
+          <id>react</id>
+          <label>React</label>
+        </option>
+        <option>
+          <id>vue</id>
+          <label>Vue.js</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+    <question>
+      <id>features</id>
+      <prompt>Select additional features:</prompt>
+      <options>
+        <option>
+          <id>typescript</id>
+          <label>TypeScript</label>
+        </option>
+        <option>
+          <id>linting</id>
+          <label>ESLint + Prettier</label>
+        </option>
+      </options>
+      <allow_multiple>true</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
 ## read_file
 Description: Request to read the contents of one or more files. The tool outputs line-numbered content (e.g. "1 | const x = 1") for easy reference when creating diffs or discussing code. Use line ranges to efficiently read specific portions of large files. Supports text extraction from PDF and DOCX files, but may not handle other binary files properly.
 
@@ -154,106 +233,6 @@ Example: Requesting to list all files in the current directory
 <recursive>false</recursive>
 </list_files>
 
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory /test/path) to analyze. When given a directory, it lists definitions from all top-level source files.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>
-
-Examples:
-
-1. List definitions from a specific file:
-<list_code_definition_names>
-<path>src/main.ts</path>
-</list_code_definition_names>
-
-2. List definitions from all files in a directory:
-<list_code_definition_names>
-<path>src/</path>
-</list_code_definition_names>
-
-## ask_multiple_choice
-Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
-
-Use this tool when:
-- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
-- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
-- You want to collect multiple related decisions in a single interaction.
-
-CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
-
-Parameters:
-- title: (optional) A brief title for the decision group.
-- questions: (REQUIRED) An array of question objects (at least 1).
-  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
-  - prompt: (REQUIRED) The text question to display to the user.
-  - options: (REQUIRED) An array of option objects (at least 2).
-    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
-    - label: (REQUIRED) The user-facing display text.
-  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
-
-Usage:
-<ask_multiple_choice>
-  <title>Decision Title</title>
-  <questions>
-    <question>
-      <id>question_slug</id>
-      <prompt>Question text?</prompt>
-      <options>
-        <option>
-          <id>option_slug_1</id>
-          <label>Option 1 Label</label>
-        </option>
-        <option>
-          <id>option_slug_2</id>
-          <label>Option 2 Label</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
-Example:
-<ask_multiple_choice>
-  <title>Project Setup</title>
-  <questions>
-    <question>
-      <id>framework</id>
-      <prompt>Which framework would you like to use?</prompt>
-      <options>
-        <option>
-          <id>react</id>
-          <label>React</label>
-        </option>
-        <option>
-          <id>vue</id>
-          <label>Vue.js</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-    <question>
-      <id>features</id>
-      <prompt>Select additional features:</prompt>
-      <options>
-        <option>
-          <id>typescript</id>
-          <label>TypeScript</label>
-        </option>
-        <option>
-          <id>linting</id>
-          <label>ESLint + Prettier</label>
-        </option>
-      </options>
-      <allow_multiple>true</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
 ## write_to_file
 Description: Request to write content to a file. This tool is primarily used for **creating new files** or for scenarios where a **complete rewrite of an existing file is intentionally required**. If the file exists, it will be overwritten. If it doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
 
diff --git a/src/core/prompts/__tests__/__snapshots__/system-prompt/consistent-system-prompt.snap b/src/core/prompts/__tests__/__snapshots__/system-prompt/consistent-system-prompt.snap
index 577550ca842..a70df32b0cd 100644
--- a/src/core/prompts/__tests__/__snapshots__/system-prompt/consistent-system-prompt.snap
+++ b/src/core/prompts/__tests__/__snapshots__/system-prompt/consistent-system-prompt.snap
@@ -26,6 +26,85 @@ Always use the actual tool name as the XML tag name for proper parsing and execu
 
 # Tools
 
+## ask_multiple_choice
+Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
+
+Use this tool when:
+- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
+- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
+- You want to collect multiple related decisions in a single interaction.
+
+CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
+
+Parameters:
+- title: (optional) A brief title for the decision group.
+- questions: (REQUIRED) An array of question objects (at least 1).
+  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
+  - prompt: (REQUIRED) The text question to display to the user.
+  - options: (REQUIRED) An array of option objects (at least 2).
+    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
+    - label: (REQUIRED) The user-facing display text.
+  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
+
+Usage:
+<ask_multiple_choice>
+  <title>Decision Title</title>
+  <questions>
+    <question>
+      <id>question_slug</id>
+      <prompt>Question text?</prompt>
+      <options>
+        <option>
+          <id>option_slug_1</id>
+          <label>Option 1 Label</label>
+        </option>
+        <option>
+          <id>option_slug_2</id>
+          <label>Option 2 Label</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
+Example:
+<ask_multiple_choice>
+  <title>Project Setup</title>
+  <questions>
+    <question>
+      <id>framework</id>
+      <prompt>Which framework would you like to use?</prompt>
+      <options>
+        <option>
+          <id>react</id>
+          <label>React</label>
+        </option>
+        <option>
+          <id>vue</id>
+          <label>Vue.js</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+    <question>
+      <id>features</id>
+      <prompt>Select additional features:</prompt>
+      <options>
+        <option>
+          <id>typescript</id>
+          <label>TypeScript</label>
+        </option>
+        <option>
+          <id>linting</id>
+          <label>ESLint + Prettier</label>
+        </option>
+      </options>
+      <allow_multiple>true</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
 ## read_file
 Description: Request to read the contents of one or more files. The tool outputs line-numbered content (e.g. "1 | const x = 1") for easy reference when creating diffs or discussing code. Supports text extraction from PDF and DOCX files, but may not handle other binary files properly.
 
@@ -149,106 +228,6 @@ Example: Requesting to list all files in the current directory
 <recursive>false</recursive>
 </list_files>
 
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory /test/path) to analyze. When given a directory, it lists definitions from all top-level source files.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>
-
-Examples:
-
-1. List definitions from a specific file:
-<list_code_definition_names>
-<path>src/main.ts</path>
-</list_code_definition_names>
-
-2. List definitions from all files in a directory:
-<list_code_definition_names>
-<path>src/</path>
-</list_code_definition_names>
-
-## ask_multiple_choice
-Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
-
-Use this tool when:
-- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
-- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
-- You want to collect multiple related decisions in a single interaction.
-
-CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
-
-Parameters:
-- title: (optional) A brief title for the decision group.
-- questions: (REQUIRED) An array of question objects (at least 1).
-  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
-  - prompt: (REQUIRED) The text question to display to the user.
-  - options: (REQUIRED) An array of option objects (at least 2).
-    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
-    - label: (REQUIRED) The user-facing display text.
-  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
-
-Usage:
-<ask_multiple_choice>
-  <title>Decision Title</title>
-  <questions>
-    <question>
-      <id>question_slug</id>
-      <prompt>Question text?</prompt>
-      <options>
-        <option>
-          <id>option_slug_1</id>
-          <label>Option 1 Label</label>
-        </option>
-        <option>
-          <id>option_slug_2</id>
-          <label>Option 2 Label</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
-Example:
-<ask_multiple_choice>
-  <title>Project Setup</title>
-  <questions>
-    <question>
-      <id>framework</id>
-      <prompt>Which framework would you like to use?</prompt>
-      <options>
-        <option>
-          <id>react</id>
-          <label>React</label>
-        </option>
-        <option>
-          <id>vue</id>
-          <label>Vue.js</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-    <question>
-      <id>features</id>
-      <prompt>Select additional features:</prompt>
-      <options>
-        <option>
-          <id>typescript</id>
-          <label>TypeScript</label>
-        </option>
-        <option>
-          <id>linting</id>
-          <label>ESLint + Prettier</label>
-        </option>
-      </options>
-      <allow_multiple>true</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
 ## write_to_file
 Description: Request to write content to a file. This tool is primarily used for **creating new files** or for scenarios where a **complete rewrite of an existing file is intentionally required**. If the file exists, it will be overwritten. If it doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
 
diff --git a/src/core/prompts/__tests__/__snapshots__/system-prompt/with-computer-use-support.snap b/src/core/prompts/__tests__/__snapshots__/system-prompt/with-computer-use-support.snap
index 12f27715037..fa633df96d0 100644
--- a/src/core/prompts/__tests__/__snapshots__/system-prompt/with-computer-use-support.snap
+++ b/src/core/prompts/__tests__/__snapshots__/system-prompt/with-computer-use-support.snap
@@ -26,6 +26,85 @@ Always use the actual tool name as the XML tag name for proper parsing and execu
 
 # Tools
 
+## ask_multiple_choice
+Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
+
+Use this tool when:
+- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
+- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
+- You want to collect multiple related decisions in a single interaction.
+
+CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
+
+Parameters:
+- title: (optional) A brief title for the decision group.
+- questions: (REQUIRED) An array of question objects (at least 1).
+  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
+  - prompt: (REQUIRED) The text question to display to the user.
+  - options: (REQUIRED) An array of option objects (at least 2).
+    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
+    - label: (REQUIRED) The user-facing display text.
+  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
+
+Usage:
+<ask_multiple_choice>
+  <title>Decision Title</title>
+  <questions>
+    <question>
+      <id>question_slug</id>
+      <prompt>Question text?</prompt>
+      <options>
+        <option>
+          <id>option_slug_1</id>
+          <label>Option 1 Label</label>
+        </option>
+        <option>
+          <id>option_slug_2</id>
+          <label>Option 2 Label</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
+Example:
+<ask_multiple_choice>
+  <title>Project Setup</title>
+  <questions>
+    <question>
+      <id>framework</id>
+      <prompt>Which framework would you like to use?</prompt>
+      <options>
+        <option>
+          <id>react</id>
+          <label>React</label>
+        </option>
+        <option>
+          <id>vue</id>
+          <label>Vue.js</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+    <question>
+      <id>features</id>
+      <prompt>Select additional features:</prompt>
+      <options>
+        <option>
+          <id>typescript</id>
+          <label>TypeScript</label>
+        </option>
+        <option>
+          <id>linting</id>
+          <label>ESLint + Prettier</label>
+        </option>
+      </options>
+      <allow_multiple>true</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
 ## read_file
 Description: Request to read the contents of one or more files. The tool outputs line-numbered content (e.g. "1 | const x = 1") for easy reference when creating diffs or discussing code. Supports text extraction from PDF and DOCX files, but may not handle other binary files properly.
 
@@ -149,106 +228,6 @@ Example: Requesting to list all files in the current directory
 <recursive>false</recursive>
 </list_files>
 
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory /test/path) to analyze. When given a directory, it lists definitions from all top-level source files.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>
-
-Examples:
-
-1. List definitions from a specific file:
-<list_code_definition_names>
-<path>src/main.ts</path>
-</list_code_definition_names>
-
-2. List definitions from all files in a directory:
-<list_code_definition_names>
-<path>src/</path>
-</list_code_definition_names>
-
-## ask_multiple_choice
-Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
-
-Use this tool when:
-- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
-- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
-- You want to collect multiple related decisions in a single interaction.
-
-CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
-
-Parameters:
-- title: (optional) A brief title for the decision group.
-- questions: (REQUIRED) An array of question objects (at least 1).
-  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
-  - prompt: (REQUIRED) The text question to display to the user.
-  - options: (REQUIRED) An array of option objects (at least 2).
-    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
-    - label: (REQUIRED) The user-facing display text.
-  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
-
-Usage:
-<ask_multiple_choice>
-  <title>Decision Title</title>
-  <questions>
-    <question>
-      <id>question_slug</id>
-      <prompt>Question text?</prompt>
-      <options>
-        <option>
-          <id>option_slug_1</id>
-          <label>Option 1 Label</label>
-        </option>
-        <option>
-          <id>option_slug_2</id>
-          <label>Option 2 Label</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
-Example:
-<ask_multiple_choice>
-  <title>Project Setup</title>
-  <questions>
-    <question>
-      <id>framework</id>
-      <prompt>Which framework would you like to use?</prompt>
-      <options>
-        <option>
-          <id>react</id>
-          <label>React</label>
-        </option>
-        <option>
-          <id>vue</id>
-          <label>Vue.js</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-    <question>
-      <id>features</id>
-      <prompt>Select additional features:</prompt>
-      <options>
-        <option>
-          <id>typescript</id>
-          <label>TypeScript</label>
-        </option>
-        <option>
-          <id>linting</id>
-          <label>ESLint + Prettier</label>
-        </option>
-      </options>
-      <allow_multiple>true</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
 ## write_to_file
 Description: Request to write content to a file. This tool is primarily used for **creating new files** or for scenarios where a **complete rewrite of an existing file is intentionally required**. If the file exists, it will be overwritten. If it doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
 
diff --git a/src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-false.snap b/src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-false.snap
index 577550ca842..a70df32b0cd 100644
--- a/src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-false.snap
+++ b/src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-false.snap
@@ -26,6 +26,85 @@ Always use the actual tool name as the XML tag name for proper parsing and execu
 
 # Tools
 
+## ask_multiple_choice
+Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
+
+Use this tool when:
+- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
+- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
+- You want to collect multiple related decisions in a single interaction.
+
+CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
+
+Parameters:
+- title: (optional) A brief title for the decision group.
+- questions: (REQUIRED) An array of question objects (at least 1).
+  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
+  - prompt: (REQUIRED) The text question to display to the user.
+  - options: (REQUIRED) An array of option objects (at least 2).
+    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
+    - label: (REQUIRED) The user-facing display text.
+  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
+
+Usage:
+<ask_multiple_choice>
+  <title>Decision Title</title>
+  <questions>
+    <question>
+      <id>question_slug</id>
+      <prompt>Question text?</prompt>
+      <options>
+        <option>
+          <id>option_slug_1</id>
+          <label>Option 1 Label</label>
+        </option>
+        <option>
+          <id>option_slug_2</id>
+          <label>Option 2 Label</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
+Example:
+<ask_multiple_choice>
+  <title>Project Setup</title>
+  <questions>
+    <question>
+      <id>framework</id>
+      <prompt>Which framework would you like to use?</prompt>
+      <options>
+        <option>
+          <id>react</id>
+          <label>React</label>
+        </option>
+        <option>
+          <id>vue</id>
+          <label>Vue.js</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+    <question>
+      <id>features</id>
+      <prompt>Select additional features:</prompt>
+      <options>
+        <option>
+          <id>typescript</id>
+          <label>TypeScript</label>
+        </option>
+        <option>
+          <id>linting</id>
+          <label>ESLint + Prettier</label>
+        </option>
+      </options>
+      <allow_multiple>true</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
 ## read_file
 Description: Request to read the contents of one or more files. The tool outputs line-numbered content (e.g. "1 | const x = 1") for easy reference when creating diffs or discussing code. Supports text extraction from PDF and DOCX files, but may not handle other binary files properly.
 
@@ -149,106 +228,6 @@ Example: Requesting to list all files in the current directory
 <recursive>false</recursive>
 </list_files>
 
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory /test/path) to analyze. When given a directory, it lists definitions from all top-level source files.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>
-
-Examples:
-
-1. List definitions from a specific file:
-<list_code_definition_names>
-<path>src/main.ts</path>
-</list_code_definition_names>
-
-2. List definitions from all files in a directory:
-<list_code_definition_names>
-<path>src/</path>
-</list_code_definition_names>
-
-## ask_multiple_choice
-Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
-
-Use this tool when:
-- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
-- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
-- You want to collect multiple related decisions in a single interaction.
-
-CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
-
-Parameters:
-- title: (optional) A brief title for the decision group.
-- questions: (REQUIRED) An array of question objects (at least 1).
-  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
-  - prompt: (REQUIRED) The text question to display to the user.
-  - options: (REQUIRED) An array of option objects (at least 2).
-    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
-    - label: (REQUIRED) The user-facing display text.
-  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
-
-Usage:
-<ask_multiple_choice>
-  <title>Decision Title</title>
-  <questions>
-    <question>
-      <id>question_slug</id>
-      <prompt>Question text?</prompt>
-      <options>
-        <option>
-          <id>option_slug_1</id>
-          <label>Option 1 Label</label>
-        </option>
-        <option>
-          <id>option_slug_2</id>
-          <label>Option 2 Label</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
-Example:
-<ask_multiple_choice>
-  <title>Project Setup</title>
-  <questions>
-    <question>
-      <id>framework</id>
-      <prompt>Which framework would you like to use?</prompt>
-      <options>
-        <option>
-          <id>react</id>
-          <label>React</label>
-        </option>
-        <option>
-          <id>vue</id>
-          <label>Vue.js</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-    <question>
-      <id>features</id>
-      <prompt>Select additional features:</prompt>
-      <options>
-        <option>
-          <id>typescript</id>
-          <label>TypeScript</label>
-        </option>
-        <option>
-          <id>linting</id>
-          <label>ESLint + Prettier</label>
-        </option>
-      </options>
-      <allow_multiple>true</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
 ## write_to_file
 Description: Request to write content to a file. This tool is primarily used for **creating new files** or for scenarios where a **complete rewrite of an existing file is intentionally required**. If the file exists, it will be overwritten. If it doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
 
diff --git a/src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-true.snap b/src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-true.snap
index 1c1b0c8cff1..a497d568a2b 100644
--- a/src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-true.snap
+++ b/src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-true.snap
@@ -26,6 +26,85 @@ Always use the actual tool name as the XML tag name for proper parsing and execu
 
 # Tools
 
+## ask_multiple_choice
+Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
+
+Use this tool when:
+- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
+- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
+- You want to collect multiple related decisions in a single interaction.
+
+CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
+
+Parameters:
+- title: (optional) A brief title for the decision group.
+- questions: (REQUIRED) An array of question objects (at least 1).
+  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
+  - prompt: (REQUIRED) The text question to display to the user.
+  - options: (REQUIRED) An array of option objects (at least 2).
+    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
+    - label: (REQUIRED) The user-facing display text.
+  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
+
+Usage:
+<ask_multiple_choice>
+  <title>Decision Title</title>
+  <questions>
+    <question>
+      <id>question_slug</id>
+      <prompt>Question text?</prompt>
+      <options>
+        <option>
+          <id>option_slug_1</id>
+          <label>Option 1 Label</label>
+        </option>
+        <option>
+          <id>option_slug_2</id>
+          <label>Option 2 Label</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
+Example:
+<ask_multiple_choice>
+  <title>Project Setup</title>
+  <questions>
+    <question>
+      <id>framework</id>
+      <prompt>Which framework would you like to use?</prompt>
+      <options>
+        <option>
+          <id>react</id>
+          <label>React</label>
+        </option>
+        <option>
+          <id>vue</id>
+          <label>Vue.js</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+    <question>
+      <id>features</id>
+      <prompt>Select additional features:</prompt>
+      <options>
+        <option>
+          <id>typescript</id>
+          <label>TypeScript</label>
+        </option>
+        <option>
+          <id>linting</id>
+          <label>ESLint + Prettier</label>
+        </option>
+      </options>
+      <allow_multiple>true</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
 ## read_file
 Description: Request to read the contents of one or more files. The tool outputs line-numbered content (e.g. "1 | const x = 1") for easy reference when creating diffs or discussing code. Supports text extraction from PDF and DOCX files, but may not handle other binary files properly.
 
@@ -149,106 +228,6 @@ Example: Requesting to list all files in the current directory
 <recursive>false</recursive>
 </list_files>
 
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory /test/path) to analyze. When given a directory, it lists definitions from all top-level source files.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>
-
-Examples:
-
-1. List definitions from a specific file:
-<list_code_definition_names>
-<path>src/main.ts</path>
-</list_code_definition_names>
-
-2. List definitions from all files in a directory:
-<list_code_definition_names>
-<path>src/</path>
-</list_code_definition_names>
-
-## ask_multiple_choice
-Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
-
-Use this tool when:
-- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
-- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
-- You want to collect multiple related decisions in a single interaction.
-
-CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
-
-Parameters:
-- title: (optional) A brief title for the decision group.
-- questions: (REQUIRED) An array of question objects (at least 1).
-  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
-  - prompt: (REQUIRED) The text question to display to the user.
-  - options: (REQUIRED) An array of option objects (at least 2).
-    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
-    - label: (REQUIRED) The user-facing display text.
-  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
-
-Usage:
-<ask_multiple_choice>
-  <title>Decision Title</title>
-  <questions>
-    <question>
-      <id>question_slug</id>
-      <prompt>Question text?</prompt>
-      <options>
-        <option>
-          <id>option_slug_1</id>
-          <label>Option 1 Label</label>
-        </option>
-        <option>
-          <id>option_slug_2</id>
-          <label>Option 2 Label</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
-Example:
-<ask_multiple_choice>
-  <title>Project Setup</title>
-  <questions>
-    <question>
-      <id>framework</id>
-      <prompt>Which framework would you like to use?</prompt>
-      <options>
-        <option>
-          <id>react</id>
-          <label>React</label>
-        </option>
-        <option>
-          <id>vue</id>
-          <label>Vue.js</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-    <question>
-      <id>features</id>
-      <prompt>Select additional features:</prompt>
-      <options>
-        <option>
-          <id>typescript</id>
-          <label>TypeScript</label>
-        </option>
-        <option>
-          <id>linting</id>
-          <label>ESLint + Prettier</label>
-        </option>
-      </options>
-      <allow_multiple>true</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
 ## apply_diff
 Description: Request to apply PRECISE, TARGETED modifications to an existing file by searching for specific sections of content and replacing them. This tool is for SURGICAL EDITS ONLY - specific changes to existing code.
 You can perform multiple distinct search and replace operations within a single `apply_diff` call by providing multiple SEARCH/REPLACE blocks in the `diff` parameter. This is the preferred way to make several targeted changes efficiently.
diff --git a/src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-undefined.snap b/src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-undefined.snap
index 577550ca842..a70df32b0cd 100644
--- a/src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-undefined.snap
+++ b/src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-undefined.snap
@@ -26,6 +26,85 @@ Always use the actual tool name as the XML tag name for proper parsing and execu
 
 # Tools
 
+## ask_multiple_choice
+Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
+
+Use this tool when:
+- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
+- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
+- You want to collect multiple related decisions in a single interaction.
+
+CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
+
+Parameters:
+- title: (optional) A brief title for the decision group.
+- questions: (REQUIRED) An array of question objects (at least 1).
+  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
+  - prompt: (REQUIRED) The text question to display to the user.
+  - options: (REQUIRED) An array of option objects (at least 2).
+    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
+    - label: (REQUIRED) The user-facing display text.
+  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
+
+Usage:
+<ask_multiple_choice>
+  <title>Decision Title</title>
+  <questions>
+    <question>
+      <id>question_slug</id>
+      <prompt>Question text?</prompt>
+      <options>
+        <option>
+          <id>option_slug_1</id>
+          <label>Option 1 Label</label>
+        </option>
+        <option>
+          <id>option_slug_2</id>
+          <label>Option 2 Label</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
+Example:
+<ask_multiple_choice>
+  <title>Project Setup</title>
+  <questions>
+    <question>
+      <id>framework</id>
+      <prompt>Which framework would you like to use?</prompt>
+      <options>
+        <option>
+          <id>react</id>
+          <label>React</label>
+        </option>
+        <option>
+          <id>vue</id>
+          <label>Vue.js</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+    <question>
+      <id>features</id>
+      <prompt>Select additional features:</prompt>
+      <options>
+        <option>
+          <id>typescript</id>
+          <label>TypeScript</label>
+        </option>
+        <option>
+          <id>linting</id>
+          <label>ESLint + Prettier</label>
+        </option>
+      </options>
+      <allow_multiple>true</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
 ## read_file
 Description: Request to read the contents of one or more files. The tool outputs line-numbered content (e.g. "1 | const x = 1") for easy reference when creating diffs or discussing code. Supports text extraction from PDF and DOCX files, but may not handle other binary files properly.
 
@@ -149,106 +228,6 @@ Example: Requesting to list all files in the current directory
 <recursive>false</recursive>
 </list_files>
 
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory /test/path) to analyze. When given a directory, it lists definitions from all top-level source files.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>
-
-Examples:
-
-1. List definitions from a specific file:
-<list_code_definition_names>
-<path>src/main.ts</path>
-</list_code_definition_names>
-
-2. List definitions from all files in a directory:
-<list_code_definition_names>
-<path>src/</path>
-</list_code_definition_names>
-
-## ask_multiple_choice
-Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
-
-Use this tool when:
-- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
-- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
-- You want to collect multiple related decisions in a single interaction.
-
-CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
-
-Parameters:
-- title: (optional) A brief title for the decision group.
-- questions: (REQUIRED) An array of question objects (at least 1).
-  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
-  - prompt: (REQUIRED) The text question to display to the user.
-  - options: (REQUIRED) An array of option objects (at least 2).
-    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
-    - label: (REQUIRED) The user-facing display text.
-  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
-
-Usage:
-<ask_multiple_choice>
-  <title>Decision Title</title>
-  <questions>
-    <question>
-      <id>question_slug</id>
-      <prompt>Question text?</prompt>
-      <options>
-        <option>
-          <id>option_slug_1</id>
-          <label>Option 1 Label</label>
-        </option>
-        <option>
-          <id>option_slug_2</id>
-          <label>Option 2 Label</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
-Example:
-<ask_multiple_choice>
-  <title>Project Setup</title>
-  <questions>
-    <question>
-      <id>framework</id>
-      <prompt>Which framework would you like to use?</prompt>
-      <options>
-        <option>
-          <id>react</id>
-          <label>React</label>
-        </option>
-        <option>
-          <id>vue</id>
-          <label>Vue.js</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-    <question>
-      <id>features</id>
-      <prompt>Select additional features:</prompt>
-      <options>
-        <option>
-          <id>typescript</id>
-          <label>TypeScript</label>
-        </option>
-        <option>
-          <id>linting</id>
-          <label>ESLint + Prettier</label>
-        </option>
-      </options>
-      <allow_multiple>true</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
 ## write_to_file
 Description: Request to write content to a file. This tool is primarily used for **creating new files** or for scenarios where a **complete rewrite of an existing file is intentionally required**. If the file exists, it will be overwritten. If it doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
 
diff --git a/src/core/prompts/__tests__/__snapshots__/system-prompt/with-different-viewport-size.snap b/src/core/prompts/__tests__/__snapshots__/system-prompt/with-different-viewport-size.snap
index 577550ca842..a70df32b0cd 100644
--- a/src/core/prompts/__tests__/__snapshots__/system-prompt/with-different-viewport-size.snap
+++ b/src/core/prompts/__tests__/__snapshots__/system-prompt/with-different-viewport-size.snap
@@ -26,6 +26,85 @@ Always use the actual tool name as the XML tag name for proper parsing and execu
 
 # Tools
 
+## ask_multiple_choice
+Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
+
+Use this tool when:
+- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
+- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
+- You want to collect multiple related decisions in a single interaction.
+
+CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
+
+Parameters:
+- title: (optional) A brief title for the decision group.
+- questions: (REQUIRED) An array of question objects (at least 1).
+  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
+  - prompt: (REQUIRED) The text question to display to the user.
+  - options: (REQUIRED) An array of option objects (at least 2).
+    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
+    - label: (REQUIRED) The user-facing display text.
+  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
+
+Usage:
+<ask_multiple_choice>
+  <title>Decision Title</title>
+  <questions>
+    <question>
+      <id>question_slug</id>
+      <prompt>Question text?</prompt>
+      <options>
+        <option>
+          <id>option_slug_1</id>
+          <label>Option 1 Label</label>
+        </option>
+        <option>
+          <id>option_slug_2</id>
+          <label>Option 2 Label</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
+Example:
+<ask_multiple_choice>
+  <title>Project Setup</title>
+  <questions>
+    <question>
+      <id>framework</id>
+      <prompt>Which framework would you like to use?</prompt>
+      <options>
+        <option>
+          <id>react</id>
+          <label>React</label>
+        </option>
+        <option>
+          <id>vue</id>
+          <label>Vue.js</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+    <question>
+      <id>features</id>
+      <prompt>Select additional features:</prompt>
+      <options>
+        <option>
+          <id>typescript</id>
+          <label>TypeScript</label>
+        </option>
+        <option>
+          <id>linting</id>
+          <label>ESLint + Prettier</label>
+        </option>
+      </options>
+      <allow_multiple>true</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
 ## read_file
 Description: Request to read the contents of one or more files. The tool outputs line-numbered content (e.g. "1 | const x = 1") for easy reference when creating diffs or discussing code. Supports text extraction from PDF and DOCX files, but may not handle other binary files properly.
 
@@ -149,106 +228,6 @@ Example: Requesting to list all files in the current directory
 <recursive>false</recursive>
 </list_files>
 
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory /test/path) to analyze. When given a directory, it lists definitions from all top-level source files.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>
-
-Examples:
-
-1. List definitions from a specific file:
-<list_code_definition_names>
-<path>src/main.ts</path>
-</list_code_definition_names>
-
-2. List definitions from all files in a directory:
-<list_code_definition_names>
-<path>src/</path>
-</list_code_definition_names>
-
-## ask_multiple_choice
-Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
-
-Use this tool when:
-- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
-- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
-- You want to collect multiple related decisions in a single interaction.
-
-CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
-
-Parameters:
-- title: (optional) A brief title for the decision group.
-- questions: (REQUIRED) An array of question objects (at least 1).
-  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
-  - prompt: (REQUIRED) The text question to display to the user.
-  - options: (REQUIRED) An array of option objects (at least 2).
-    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
-    - label: (REQUIRED) The user-facing display text.
-  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
-
-Usage:
-<ask_multiple_choice>
-  <title>Decision Title</title>
-  <questions>
-    <question>
-      <id>question_slug</id>
-      <prompt>Question text?</prompt>
-      <options>
-        <option>
-          <id>option_slug_1</id>
-          <label>Option 1 Label</label>
-        </option>
-        <option>
-          <id>option_slug_2</id>
-          <label>Option 2 Label</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
-Example:
-<ask_multiple_choice>
-  <title>Project Setup</title>
-  <questions>
-    <question>
-      <id>framework</id>
-      <prompt>Which framework would you like to use?</prompt>
-      <options>
-        <option>
-          <id>react</id>
-          <label>React</label>
-        </option>
-        <option>
-          <id>vue</id>
-          <label>Vue.js</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-    <question>
-      <id>features</id>
-      <prompt>Select additional features:</prompt>
-      <options>
-        <option>
-          <id>typescript</id>
-          <label>TypeScript</label>
-        </option>
-        <option>
-          <id>linting</id>
-          <label>ESLint + Prettier</label>
-        </option>
-      </options>
-      <allow_multiple>true</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
 ## write_to_file
 Description: Request to write content to a file. This tool is primarily used for **creating new files** or for scenarios where a **complete rewrite of an existing file is intentionally required**. If the file exists, it will be overwritten. If it doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
 
diff --git a/src/core/prompts/__tests__/__snapshots__/system-prompt/with-mcp-hub-provided.snap b/src/core/prompts/__tests__/__snapshots__/system-prompt/with-mcp-hub-provided.snap
index 08732dc1612..9341bac39b4 100644
--- a/src/core/prompts/__tests__/__snapshots__/system-prompt/with-mcp-hub-provided.snap
+++ b/src/core/prompts/__tests__/__snapshots__/system-prompt/with-mcp-hub-provided.snap
@@ -26,6 +26,85 @@ Always use the actual tool name as the XML tag name for proper parsing and execu
 
 # Tools
 
+## ask_multiple_choice
+Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
+
+Use this tool when:
+- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
+- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
+- You want to collect multiple related decisions in a single interaction.
+
+CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
+
+Parameters:
+- title: (optional) A brief title for the decision group.
+- questions: (REQUIRED) An array of question objects (at least 1).
+  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
+  - prompt: (REQUIRED) The text question to display to the user.
+  - options: (REQUIRED) An array of option objects (at least 2).
+    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
+    - label: (REQUIRED) The user-facing display text.
+  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
+
+Usage:
+<ask_multiple_choice>
+  <title>Decision Title</title>
+  <questions>
+    <question>
+      <id>question_slug</id>
+      <prompt>Question text?</prompt>
+      <options>
+        <option>
+          <id>option_slug_1</id>
+          <label>Option 1 Label</label>
+        </option>
+        <option>
+          <id>option_slug_2</id>
+          <label>Option 2 Label</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
+Example:
+<ask_multiple_choice>
+  <title>Project Setup</title>
+  <questions>
+    <question>
+      <id>framework</id>
+      <prompt>Which framework would you like to use?</prompt>
+      <options>
+        <option>
+          <id>react</id>
+          <label>React</label>
+        </option>
+        <option>
+          <id>vue</id>
+          <label>Vue.js</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+    <question>
+      <id>features</id>
+      <prompt>Select additional features:</prompt>
+      <options>
+        <option>
+          <id>typescript</id>
+          <label>TypeScript</label>
+        </option>
+        <option>
+          <id>linting</id>
+          <label>ESLint + Prettier</label>
+        </option>
+      </options>
+      <allow_multiple>true</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
 ## read_file
 Description: Request to read the contents of one or more files. The tool outputs line-numbered content (e.g. "1 | const x = 1") for easy reference when creating diffs or discussing code. Supports text extraction from PDF and DOCX files, but may not handle other binary files properly.
 
@@ -149,106 +228,6 @@ Example: Requesting to list all files in the current directory
 <recursive>false</recursive>
 </list_files>
 
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory /test/path) to analyze. When given a directory, it lists definitions from all top-level source files.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>
-
-Examples:
-
-1. List definitions from a specific file:
-<list_code_definition_names>
-<path>src/main.ts</path>
-</list_code_definition_names>
-
-2. List definitions from all files in a directory:
-<list_code_definition_names>
-<path>src/</path>
-</list_code_definition_names>
-
-## ask_multiple_choice
-Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
-
-Use this tool when:
-- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
-- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
-- You want to collect multiple related decisions in a single interaction.
-
-CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
-
-Parameters:
-- title: (optional) A brief title for the decision group.
-- questions: (REQUIRED) An array of question objects (at least 1).
-  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
-  - prompt: (REQUIRED) The text question to display to the user.
-  - options: (REQUIRED) An array of option objects (at least 2).
-    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
-    - label: (REQUIRED) The user-facing display text.
-  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
-
-Usage:
-<ask_multiple_choice>
-  <title>Decision Title</title>
-  <questions>
-    <question>
-      <id>question_slug</id>
-      <prompt>Question text?</prompt>
-      <options>
-        <option>
-          <id>option_slug_1</id>
-          <label>Option 1 Label</label>
-        </option>
-        <option>
-          <id>option_slug_2</id>
-          <label>Option 2 Label</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
-Example:
-<ask_multiple_choice>
-  <title>Project Setup</title>
-  <questions>
-    <question>
-      <id>framework</id>
-      <prompt>Which framework would you like to use?</prompt>
-      <options>
-        <option>
-          <id>react</id>
-          <label>React</label>
-        </option>
-        <option>
-          <id>vue</id>
-          <label>Vue.js</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-    <question>
-      <id>features</id>
-      <prompt>Select additional features:</prompt>
-      <options>
-        <option>
-          <id>typescript</id>
-          <label>TypeScript</label>
-        </option>
-        <option>
-          <id>linting</id>
-          <label>ESLint + Prettier</label>
-        </option>
-      </options>
-      <allow_multiple>true</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
 ## write_to_file
 Description: Request to write content to a file. This tool is primarily used for **creating new files** or for scenarios where a **complete rewrite of an existing file is intentionally required**. If the file exists, it will be overwritten. If it doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
 
diff --git a/src/core/prompts/__tests__/__snapshots__/system-prompt/with-undefined-mcp-hub.snap b/src/core/prompts/__tests__/__snapshots__/system-prompt/with-undefined-mcp-hub.snap
index 577550ca842..a70df32b0cd 100644
--- a/src/core/prompts/__tests__/__snapshots__/system-prompt/with-undefined-mcp-hub.snap
+++ b/src/core/prompts/__tests__/__snapshots__/system-prompt/with-undefined-mcp-hub.snap
@@ -26,6 +26,85 @@ Always use the actual tool name as the XML tag name for proper parsing and execu
 
 # Tools
 
+## ask_multiple_choice
+Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
+
+Use this tool when:
+- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
+- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
+- You want to collect multiple related decisions in a single interaction.
+
+CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
+
+Parameters:
+- title: (optional) A brief title for the decision group.
+- questions: (REQUIRED) An array of question objects (at least 1).
+  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
+  - prompt: (REQUIRED) The text question to display to the user.
+  - options: (REQUIRED) An array of option objects (at least 2).
+    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
+    - label: (REQUIRED) The user-facing display text.
+  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
+
+Usage:
+<ask_multiple_choice>
+  <title>Decision Title</title>
+  <questions>
+    <question>
+      <id>question_slug</id>
+      <prompt>Question text?</prompt>
+      <options>
+        <option>
+          <id>option_slug_1</id>
+          <label>Option 1 Label</label>
+        </option>
+        <option>
+          <id>option_slug_2</id>
+          <label>Option 2 Label</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
+Example:
+<ask_multiple_choice>
+  <title>Project Setup</title>
+  <questions>
+    <question>
+      <id>framework</id>
+      <prompt>Which framework would you like to use?</prompt>
+      <options>
+        <option>
+          <id>react</id>
+          <label>React</label>
+        </option>
+        <option>
+          <id>vue</id>
+          <label>Vue.js</label>
+        </option>
+      </options>
+      <allow_multiple>false</allow_multiple>
+    </question>
+    <question>
+      <id>features</id>
+      <prompt>Select additional features:</prompt>
+      <options>
+        <option>
+          <id>typescript</id>
+          <label>TypeScript</label>
+        </option>
+        <option>
+          <id>linting</id>
+          <label>ESLint + Prettier</label>
+        </option>
+      </options>
+      <allow_multiple>true</allow_multiple>
+    </question>
+  </questions>
+</ask_multiple_choice>
+
 ## read_file
 Description: Request to read the contents of one or more files. The tool outputs line-numbered content (e.g. "1 | const x = 1") for easy reference when creating diffs or discussing code. Supports text extraction from PDF and DOCX files, but may not handle other binary files properly.
 
@@ -149,106 +228,6 @@ Example: Requesting to list all files in the current directory
 <recursive>false</recursive>
 </list_files>
 
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory /test/path) to analyze. When given a directory, it lists definitions from all top-level source files.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>
-
-Examples:
-
-1. List definitions from a specific file:
-<list_code_definition_names>
-<path>src/main.ts</path>
-</list_code_definition_names>
-
-2. List definitions from all files in a directory:
-<list_code_definition_names>
-<path>src/</path>
-</list_code_definition_names>
-
-## ask_multiple_choice
-Description: Interrupts the current workflow to present structured multiple-choice questions to the user. Forces selection from predefined options (no free-text). Use this tool when you need explicit user decisions or to resolve ambiguity before proceeding.
-
-Use this tool when:
-- You need to choose between mutually exclusive options (e.g., architecture patterns, frameworks).
-- You need to clarify user intent (e.g., "Add new file?" vs "Update existing?").
-- You want to collect multiple related decisions in a single interaction.
-
-CRITICAL: Every question and every option MUST have an id field - results cannot be matched without ids.
-
-Parameters:
-- title: (optional) A brief title for the decision group.
-- questions: (REQUIRED) An array of question objects (at least 1).
-  - id: (REQUIRED) A unique, program-friendly identifier (slug) for the question (e.g., "framework_choice").
-  - prompt: (REQUIRED) The text question to display to the user.
-  - options: (REQUIRED) An array of option objects (at least 2).
-    - id: (REQUIRED) A unique, program-friendly identifier (slug) for the option (e.g., "react", "vue").
-    - label: (REQUIRED) The user-facing display text.
-  - allow_multiple: (optional) Set to 'true' for checkboxes (multi-select), 'false' for radio buttons (single-select). Defaults to false.
-
-Usage:
-<ask_multiple_choice>
-  <title>Decision Title</title>
-  <questions>
-    <question>
-      <id>question_slug</id>
-      <prompt>Question text?</prompt>
-      <options>
-        <option>
-          <id>option_slug_1</id>
-          <label>Option 1 Label</label>
-        </option>
-        <option>
-          <id>option_slug_2</id>
-          <label>Option 2 Label</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
-Example:
-<ask_multiple_choice>
-  <title>Project Setup</title>
-  <questions>
-    <question>
-      <id>framework</id>
-      <prompt>Which framework would you like to use?</prompt>
-      <options>
-        <option>
-          <id>react</id>
-          <label>React</label>
-        </option>
-        <option>
-          <id>vue</id>
-          <label>Vue.js</label>
-        </option>
-      </options>
-      <allow_multiple>false</allow_multiple>
-    </question>
-    <question>
-      <id>features</id>
-      <prompt>Select additional features:</prompt>
-      <options>
-        <option>
-          <id>typescript</id>
-          <label>TypeScript</label>
-        </option>
-        <option>
-          <id>linting</id>
-          <label>ESLint + Prettier</label>
-        </option>
-      </options>
-      <allow_multiple>true</allow_multiple>
-    </question>
-  </questions>
-</ask_multiple_choice>
-
 ## write_to_file
 Description: Request to write content to a file. This tool is primarily used for **creating new files** or for scenarios where a **complete rewrite of an existing file is intentionally required**. If the file exists, it will be overwritten. If it doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
 
diff --git a/src/core/prompts/instructions/create-mode.ts b/src/core/prompts/instructions/create-mode.ts
index d75e9992cec..5718bde65d2 100644
--- a/src/core/prompts/instructions/create-mode.ts
+++ b/src/core/prompts/instructions/create-mode.ts
@@ -50,7 +50,7 @@ customModes:
       or ensuring responsive web interfaces. This mode is especially effective with CSS,
       HTML, and modern frontend frameworks.  # Optional but recommended
     groups:  # Required: array of tool groups (can be empty)
-      - read     # Read files group (read_file, fetch_instructions, search_files, list_files, list_code_definition_names)
+      - read     # Read files group (read_file, fetch_instructions, search_files, list_files)
       - edit     # Edit files group (apply_diff, write_to_file) - allows editing any file
       # Or with file restrictions:
       # - - edit
diff --git a/src/core/prompts/tools/index.ts b/src/core/prompts/tools/index.ts
index 9db75625475..e9a68266cd3 100644
--- a/src/core/prompts/tools/index.ts
+++ b/src/core/prompts/tools/index.ts
@@ -13,7 +13,6 @@ import { shouldUseSingleFileRead } from "@roo-code/types"
 import { getWriteToFileDescription } from "./write-to-file"
 import { getSearchFilesDescription } from "./search-files"
 import { getListFilesDescription } from "./list-files"
-import { getListCodeDefinitionNamesDescription } from "./list-code-definition-names"
 import { getBrowserActionDescription } from "./browser-action"
 import { getAskFollowupQuestionDescription } from "./ask-followup-question"
 import { getAskMultipleChoiceDescription } from "./ask-multiple-choice"
@@ -43,7 +42,6 @@ const toolDescriptionMap: Record<string, (args: ToolArgs) => string | undefined>
 	write_to_file: (args) => getWriteToFileDescription(args),
 	search_files: (args) => getSearchFilesDescription(args),
 	list_files: (args) => getListFilesDescription(args),
-	list_code_definition_names: (args) => getListCodeDefinitionNamesDescription(args),
 	browser_action: (args) => getBrowserActionDescription(args),
 	ask_followup_question: () => getAskFollowupQuestionDescription(),
 	ask_multiple_choice: () => getAskMultipleChoiceDescription(),
@@ -168,7 +166,6 @@ export {
 	getWriteToFileDescription,
 	getSearchFilesDescription,
 	getListFilesDescription,
-	getListCodeDefinitionNamesDescription,
 	getBrowserActionDescription,
 	getAskFollowupQuestionDescription,
 	getAskMultipleChoiceDescription,
diff --git a/src/core/prompts/tools/list-code-definition-names.ts b/src/core/prompts/tools/list-code-definition-names.ts
deleted file mode 100644
index 259c59d189a..00000000000
--- a/src/core/prompts/tools/list-code-definition-names.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ToolArgs } from "./types"
-
-export function getListCodeDefinitionNamesDescription(args: ToolArgs): string {
-	return `## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory ${args.cwd}) to analyze. When given a directory, it lists definitions from all top-level source files.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>
-
-Examples:
-
-1. List definitions from a specific file:
-<list_code_definition_names>
-<path>src/main.ts</path>
-</list_code_definition_names>
-
-2. List definitions from all files in a directory:
-<list_code_definition_names>
-<path>src/</path>
-</list_code_definition_names>`
-}
diff --git a/src/core/prompts/tools/native-tools/index.ts b/src/core/prompts/tools/native-tools/index.ts
index 0f6a0c4b8db..760d987b47b 100644
--- a/src/core/prompts/tools/native-tools/index.ts
+++ b/src/core/prompts/tools/native-tools/index.ts
@@ -9,7 +9,6 @@ import codebaseSearch from "./codebase_search"
 import executeCommand from "./execute_command"
 import fetchInstructions from "./fetch_instructions"
 import generateImage from "./generate_image"
-import listCodeDefinitionNames from "./list_code_definition_names"
 import listFiles from "./list_files"
 import newTask from "./new_task"
 import { createReadFileTool } from "./read_file"
@@ -42,7 +41,6 @@ export function getNativeTools(partialReadsEnabled: boolean = true): OpenAI.Chat
 		executeCommand,
 		fetchInstructions,
 		generateImage,
-		listCodeDefinitionNames,
 		listFiles,
 		newTask,
 		createReadFileTool(partialReadsEnabled),
diff --git a/src/core/prompts/tools/native-tools/list_code_definition_names.ts b/src/core/prompts/tools/native-tools/list_code_definition_names.ts
deleted file mode 100644
index c5b604c935e..00000000000
--- a/src/core/prompts/tools/native-tools/list_code_definition_names.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import type OpenAI from "openai"
-
-const LIST_CODE_DEFINITION_NAMES_DESCRIPTION = `Request to list definition names (classes, functions, methods, etc.) from source code. This tool can analyze either a single file or all files at the top level of a specified directory. It provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-
-Parameters:
-- path: (required) The path of the file or directory (relative to the current working directory) to analyze. When given a directory, it lists definitions from all top-level source files.
-
-Examples:
-
-1. List definitions from a specific file:
-{ "path": "src/main.ts" }
-
-2. List definitions from all files in a directory:
-{ "path": "src/" }`
-
-const PATH_PARAMETER_DESCRIPTION = `Path to the file or directory to analyze, relative to the workspace`
-
-export default {
-	type: "function",
-	function: {
-		name: "list_code_definition_names",
-		description: LIST_CODE_DEFINITION_NAMES_DESCRIPTION,
-		strict: true,
-		parameters: {
-			type: "object",
-			properties: {
-				path: {
-					type: "string",
-					description: PATH_PARAMETER_DESCRIPTION,
-				},
-			},
-			required: ["path"],
-			additionalProperties: false,
-		},
-	},
-} satisfies OpenAI.Chat.ChatCompletionTool
diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts
index 5d85396c3ed..c1cbfe85cec 100644
--- a/src/core/task/Task.ts
+++ b/src/core/task/Task.ts
@@ -2563,9 +2563,10 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 				const stream = this.attemptApiRequest()
 				let assistantMessage = ""
 				let reasoningMessage = ""
+				let streamingFailedMessage = ""
 				let pendingGroundingSources: GroundingSource[] = []
 				this.isStreaming = true
-
+				let shouldStop = false
 				try {
 					const iterator = stream[Symbol.asyncIterator]()
 
@@ -3102,14 +3103,33 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 					if (!this.abandoned) {
 						// Determine cancellation reason
 						const cancelReason: ClineApiReqCancelReason = this.abort ? "user_cancelled" : "streaming_failed"
-
-						let streamingFailedMessage = this.abort
+						const isZgsm = this.apiConfiguration?.apiProvider === "zgsm"
+						const requestId = error.headers?.get("x-request-id")
+						streamingFailedMessage = this.abort
 							? undefined
 							: (error.message ?? JSON.stringify(serializeError(error), null, 2))
-						const requestId = error.headers?.get("x-request-id")
+						// let shouldStop = false
+						if (isZgsm) {
+							const errorCodeManager = ErrorCodeManager.getInstance()
+							streamingFailedMessage = await errorCodeManager.parseResponse(
+								error,
+								isZgsm,
+								this.taskId,
+								this.instanceId,
+							)
 
-						if (this.apiConfiguration.apiProvider === "zgsm" && requestId) {
-							streamingFailedMessage += `\nRequestId: ${requestId ?? ""}\n`
+							if (requestId) {
+								// Store raw error
+								errorCodeManager.setRawError(requestId, error)
+							}
+
+							if (error.status === 401 || error.code === "ai-gateway.insufficient_quota") {
+								if (error.status === 401) {
+									ZgsmAuthService.openStatusBarLoginTip()
+								}
+
+								shouldStop = true
+							}
 						}
 						// Clean up partial state
 						await abortStream(cancelReason, streamingFailedMessage)
@@ -3152,9 +3172,10 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 								includeFileDetails: false,
 								retryAttempt: (currentItem.retryAttempt ?? 0) + 1,
 							})
-
 							// Continue to retry the request
-							continue
+							if (!shouldStop) {
+								continue
+							}
 						}
 					}
 				} finally {
@@ -3379,13 +3400,15 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 							this.apiConversationHistory.pop()
 						}
 					}
-
+					// if (shouldStop)
 					// Check if we should auto-retry or prompt the user
 					let errorMsg = t("common:errors.unexpected_api_response")
 					// Reuse the state variable from above
 					if (state?.autoApprovalEnabled && state?.alwaysApproveResubmit) {
 						// Auto-retry with backoff - don't persist failure message when retrying
-						if (requestId) {
+						if (shouldStop) {
+							errorMsg = streamingFailedMessage
+						} else if (requestId) {
 							errorMsg += `\n\nRequestId: ${requestId}\n\n`
 						}
 						await this.backoffAndAnnounce(
@@ -3414,9 +3437,12 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 						// Continue to retry the request
 						continue
 					} else {
-						if (requestId) {
+						if (shouldStop) {
+							errorMsg = streamingFailedMessage
+						} else if (requestId) {
 							errorMsg += `\n\nRequestId: ${requestId}\n\n`
 						}
+
 						// Prompt the user for retry decision
 						const { response } = await this.ask("api_req_failed", errorMsg)
 
@@ -3444,7 +3470,11 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 									content: currentUserContent,
 								})
 							}
-
+							if (shouldStop) {
+								errorMsg = streamingFailedMessage
+							} else if (requestId) {
+								errorMsg += `\n\nRequestId: ${requestId}\n\n`
+							}
 							await this.say("error", errorMsg)
 							this.providerRef.deref()?.log(errorMsg, "error")
 							await this.addToApiConversationHistory({
@@ -4131,8 +4161,16 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 				if (this.abort) {
 					throw new Error(`[Task#${this.taskId}] Aborted during retry countdown`)
 				}
-
-				await this.say("api_req_retry_delayed", `${headerText}\n↻ ${i}s...`, undefined, true)
+				if (this.apiConfiguration.apiProvider === "zgsm") {
+					await this.say("api_req_retry_delayed", `${headerText}\n↻ ${i}s...`, undefined, true)
+				} else {
+					await this.say(
+						"api_req_retry_delayed",
+						`${headerText}<retry_timer>${i}</retry_timer>`,
+						undefined,
+						true,
+					)
+				}
 				await delay(1000)
 			}
 
diff --git a/src/core/task/__tests__/validateToolResultIds.spec.ts b/src/core/task/__tests__/validateToolResultIds.spec.ts
index 67aaf238952..b457c3cd2e2 100644
--- a/src/core/task/__tests__/validateToolResultIds.spec.ts
+++ b/src/core/task/__tests__/validateToolResultIds.spec.ts
@@ -1,6 +1,10 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import { TelemetryService } from "@roo-code/telemetry"
-import { validateAndFixToolResultIds, ToolResultIdMismatchError } from "../validateToolResultIds"
+import {
+	validateAndFixToolResultIds,
+	ToolResultIdMismatchError,
+	MissingToolResultError,
+} from "../validateToolResultIds"
 
 // Mock TelemetryService
 vi.mock("@roo-code/telemetry", () => ({
@@ -394,7 +398,7 @@ describe("validateAndFixToolResultIds", () => {
 	})
 
 	describe("when there are more tool_uses than tool_results", () => {
-		it("should fix the available tool_results", () => {
+		it("should fix the available tool_results and add missing ones", () => {
 			const assistantMessage: Anthropic.MessageParam = {
 				role: "assistant",
 				content: [
@@ -426,15 +430,174 @@ describe("validateAndFixToolResultIds", () => {
 
 			const result = validateAndFixToolResultIds(userMessage, [assistantMessage])
 
+			expect(Array.isArray(result.content)).toBe(true)
+			const resultContent = result.content as Anthropic.ToolResultBlockParam[]
+			// Should now have 2 tool_results: one fixed and one added for the missing tool_use
+			expect(resultContent.length).toBe(2)
+			// The missing tool_result is prepended
+			expect(resultContent[0].tool_use_id).toBe("tool-2")
+			expect(resultContent[0].content).toBe("Tool execution was interrupted before completion.")
+			// The original is fixed
+			expect(resultContent[1].tool_use_id).toBe("tool-1")
+		})
+	})
+
+	describe("when tool_results are completely missing", () => {
+		it("should add missing tool_result for single tool_use", () => {
+			const assistantMessage: Anthropic.MessageParam = {
+				role: "assistant",
+				content: [
+					{
+						type: "tool_use",
+						id: "tool-123",
+						name: "read_file",
+						input: { path: "test.txt" },
+					},
+				],
+			}
+
+			const userMessage: Anthropic.MessageParam = {
+				role: "user",
+				content: [
+					{
+						type: "text",
+						text: "Some user message without tool results",
+					},
+				],
+			}
+
+			const result = validateAndFixToolResultIds(userMessage, [assistantMessage])
+
+			expect(Array.isArray(result.content)).toBe(true)
+			const resultContent = result.content as Array<Anthropic.ToolResultBlockParam | Anthropic.TextBlockParam>
+			expect(resultContent.length).toBe(2)
+			// Missing tool_result should be prepended
+			expect(resultContent[0].type).toBe("tool_result")
+			expect((resultContent[0] as Anthropic.ToolResultBlockParam).tool_use_id).toBe("tool-123")
+			expect((resultContent[0] as Anthropic.ToolResultBlockParam).content).toBe(
+				"Tool execution was interrupted before completion.",
+			)
+			// Original text block should be preserved
+			expect(resultContent[1].type).toBe("text")
+		})
+
+		it("should add missing tool_results for multiple tool_uses", () => {
+			const assistantMessage: Anthropic.MessageParam = {
+				role: "assistant",
+				content: [
+					{
+						type: "tool_use",
+						id: "tool-1",
+						name: "read_file",
+						input: { path: "a.txt" },
+					},
+					{
+						type: "tool_use",
+						id: "tool-2",
+						name: "write_to_file",
+						input: { path: "b.txt", content: "test" },
+					},
+				],
+			}
+
+			const userMessage: Anthropic.MessageParam = {
+				role: "user",
+				content: [
+					{
+						type: "text",
+						text: "User message",
+					},
+				],
+			}
+
+			const result = validateAndFixToolResultIds(userMessage, [assistantMessage])
+
+			expect(Array.isArray(result.content)).toBe(true)
+			const resultContent = result.content as Array<Anthropic.ToolResultBlockParam | Anthropic.TextBlockParam>
+			expect(resultContent.length).toBe(3)
+			// Both missing tool_results should be prepended
+			expect(resultContent[0].type).toBe("tool_result")
+			expect((resultContent[0] as Anthropic.ToolResultBlockParam).tool_use_id).toBe("tool-1")
+			expect(resultContent[1].type).toBe("tool_result")
+			expect((resultContent[1] as Anthropic.ToolResultBlockParam).tool_use_id).toBe("tool-2")
+			// Original text should be preserved
+			expect(resultContent[2].type).toBe("text")
+		})
+
+		it("should add only the missing tool_results when some exist", () => {
+			const assistantMessage: Anthropic.MessageParam = {
+				role: "assistant",
+				content: [
+					{
+						type: "tool_use",
+						id: "tool-1",
+						name: "read_file",
+						input: { path: "a.txt" },
+					},
+					{
+						type: "tool_use",
+						id: "tool-2",
+						name: "write_to_file",
+						input: { path: "b.txt", content: "test" },
+					},
+				],
+			}
+
+			const userMessage: Anthropic.MessageParam = {
+				role: "user",
+				content: [
+					{
+						type: "tool_result",
+						tool_use_id: "tool-1",
+						content: "Content for tool 1",
+					},
+				],
+			}
+
+			const result = validateAndFixToolResultIds(userMessage, [assistantMessage])
+
+			expect(Array.isArray(result.content)).toBe(true)
+			const resultContent = result.content as Anthropic.ToolResultBlockParam[]
+			expect(resultContent.length).toBe(2)
+			// Missing tool_result for tool-2 should be prepended
+			expect(resultContent[0].tool_use_id).toBe("tool-2")
+			expect(resultContent[0].content).toBe("Tool execution was interrupted before completion.")
+			// Existing tool_result should be preserved
+			expect(resultContent[1].tool_use_id).toBe("tool-1")
+			expect(resultContent[1].content).toBe("Content for tool 1")
+		})
+
+		it("should handle empty user content array by adding all missing tool_results", () => {
+			const assistantMessage: Anthropic.MessageParam = {
+				role: "assistant",
+				content: [
+					{
+						type: "tool_use",
+						id: "tool-1",
+						name: "read_file",
+						input: { path: "test.txt" },
+					},
+				],
+			}
+
+			const userMessage: Anthropic.MessageParam = {
+				role: "user",
+				content: [],
+			}
+
+			const result = validateAndFixToolResultIds(userMessage, [assistantMessage])
+
 			expect(Array.isArray(result.content)).toBe(true)
 			const resultContent = result.content as Anthropic.ToolResultBlockParam[]
 			expect(resultContent.length).toBe(1)
+			expect(resultContent[0].type).toBe("tool_result")
 			expect(resultContent[0].tool_use_id).toBe("tool-1")
+			expect(resultContent[0].content).toBe("Tool execution was interrupted before completion.")
 		})
 	})
 
 	describe("telemetry", () => {
-		it("should call captureException when there is a mismatch", () => {
+		it("should call captureException for both missing and mismatch when there is a mismatch", () => {
 			const assistantMessage: Anthropic.MessageParam = {
 				role: "assistant",
 				content: [
@@ -460,7 +623,17 @@ describe("validateAndFixToolResultIds", () => {
 
 			validateAndFixToolResultIds(userMessage, [assistantMessage])
 
-			expect(TelemetryService.instance.captureException).toHaveBeenCalledTimes(1)
+			// A mismatch also triggers missing detection since the wrong-id doesn't match any tool_use
+			expect(TelemetryService.instance.captureException).toHaveBeenCalledTimes(2)
+			expect(TelemetryService.instance.captureException).toHaveBeenCalledWith(
+				expect.any(MissingToolResultError),
+				expect.objectContaining({
+					missingToolUseIds: ["correct-id"],
+					existingToolResultIds: ["wrong-id"],
+					toolUseCount: 1,
+					toolResultCount: 1,
+				}),
+			)
 			expect(TelemetryService.instance.captureException).toHaveBeenCalledWith(
 				expect.any(ToolResultIdMismatchError),
 				expect.objectContaining({
@@ -516,4 +689,132 @@ describe("validateAndFixToolResultIds", () => {
 			expect(error.toolUseIds).toEqual(["use-1", "use-2"])
 		})
 	})
+
+	describe("MissingToolResultError", () => {
+		it("should create error with correct properties", () => {
+			const error = new MissingToolResultError(
+				"Missing tool results detected",
+				["tool-1", "tool-2"],
+				["existing-result-1"],
+			)
+
+			expect(error.name).toBe("MissingToolResultError")
+			expect(error.message).toBe("Missing tool results detected")
+			expect(error.missingToolUseIds).toEqual(["tool-1", "tool-2"])
+			expect(error.existingToolResultIds).toEqual(["existing-result-1"])
+		})
+	})
+
+	describe("telemetry for missing tool_results", () => {
+		it("should call captureException when tool_results are missing", () => {
+			const assistantMessage: Anthropic.MessageParam = {
+				role: "assistant",
+				content: [
+					{
+						type: "tool_use",
+						id: "tool-123",
+						name: "read_file",
+						input: { path: "test.txt" },
+					},
+				],
+			}
+
+			const userMessage: Anthropic.MessageParam = {
+				role: "user",
+				content: [
+					{
+						type: "text",
+						text: "No tool results here",
+					},
+				],
+			}
+
+			validateAndFixToolResultIds(userMessage, [assistantMessage])
+
+			expect(TelemetryService.instance.captureException).toHaveBeenCalledTimes(1)
+			expect(TelemetryService.instance.captureException).toHaveBeenCalledWith(
+				expect.any(MissingToolResultError),
+				expect.objectContaining({
+					missingToolUseIds: ["tool-123"],
+					existingToolResultIds: [],
+					toolUseCount: 1,
+					toolResultCount: 0,
+				}),
+			)
+		})
+
+		it("should call captureException twice when both mismatch and missing occur", () => {
+			const assistantMessage: Anthropic.MessageParam = {
+				role: "assistant",
+				content: [
+					{
+						type: "tool_use",
+						id: "tool-1",
+						name: "read_file",
+						input: { path: "a.txt" },
+					},
+					{
+						type: "tool_use",
+						id: "tool-2",
+						name: "read_file",
+						input: { path: "b.txt" },
+					},
+				],
+			}
+
+			const userMessage: Anthropic.MessageParam = {
+				role: "user",
+				content: [
+					{
+						type: "tool_result",
+						tool_use_id: "wrong-id", // Wrong ID (mismatch)
+						content: "Content",
+					},
+					// Missing tool_result for tool-2
+				],
+			}
+
+			validateAndFixToolResultIds(userMessage, [assistantMessage])
+
+			// Should be called twice: once for missing, once for mismatch
+			expect(TelemetryService.instance.captureException).toHaveBeenCalledTimes(2)
+			expect(TelemetryService.instance.captureException).toHaveBeenCalledWith(
+				expect.any(MissingToolResultError),
+				expect.any(Object),
+			)
+			expect(TelemetryService.instance.captureException).toHaveBeenCalledWith(
+				expect.any(ToolResultIdMismatchError),
+				expect.any(Object),
+			)
+		})
+
+		it("should not call captureException for missing when all tool_results exist", () => {
+			const assistantMessage: Anthropic.MessageParam = {
+				role: "assistant",
+				content: [
+					{
+						type: "tool_use",
+						id: "tool-123",
+						name: "read_file",
+						input: { path: "test.txt" },
+					},
+				],
+			}
+
+			const userMessage: Anthropic.MessageParam = {
+				role: "user",
+				content: [
+					{
+						type: "tool_result",
+						tool_use_id: "tool-123",
+						content: "Content",
+					},
+				],
+			}
+
+			validateAndFixToolResultIds(userMessage, [assistantMessage])
+
+			expect(TelemetryService.instance.captureException).not.toHaveBeenCalled()
+		})
+	})
 })
diff --git a/src/core/task/validateToolResultIds.ts b/src/core/task/validateToolResultIds.ts
index 159caca79d8..abedfc8c3a4 100644
--- a/src/core/task/validateToolResultIds.ts
+++ b/src/core/task/validateToolResultIds.ts
@@ -17,18 +17,35 @@ export class ToolResultIdMismatchError extends Error {
 	}
 }
 
+/**
+ * Custom error class for missing tool results.
+ * Used for structured error tracking via PostHog when tool_use blocks
+ * don't have corresponding tool_result blocks.
+ */
+export class MissingToolResultError extends Error {
+	constructor(
+		message: string,
+		public readonly missingToolUseIds: string[],
+		public readonly existingToolResultIds: string[],
+	) {
+		super(message)
+		this.name = "MissingToolResultError"
+	}
+}
+
 /**
  * Validates and fixes tool_result IDs in a user message against the previous assistant message.
  *
- * This is a centralized validation that catches all tool_use/tool_result ID mismatches
+ * This is a centralized validation that catches all tool_use/tool_result issues
  * before messages are added to the API conversation history. It handles scenarios like:
  * - Race conditions during streaming
  * - Message editing scenarios
  * - Resume/delegation scenarios
+ * - Missing tool_result blocks for tool_use calls
  *
  * @param userMessage - The user message being added to history
  * @param apiConversationHistory - The conversation history to find the previous assistant message from
- * @returns The validated user message with corrected tool_use_ids
+ * @returns The validated user message with corrected tool_use_ids and any missing tool_results added
  */
 export function validateAndFixToolResultIds(
 	userMessage: Anthropic.MessageParam,
@@ -39,16 +56,6 @@ export function validateAndFixToolResultIds(
 		return userMessage
 	}
 
-	// Find tool_result blocks in the user message
-	const toolResults = userMessage.content.filter(
-		(block): block is Anthropic.ToolResultBlockParam => block.type === "tool_result",
-	)
-
-	// No tool results to validate
-	if (toolResults.length === 0) {
-		return userMessage
-	}
-
 	// Find the previous assistant message from conversation history
 	const prevAssistantIdx = findLastIndex(apiConversationHistory, (msg) => msg.role === "assistant")
 	if (prevAssistantIdx === -1) {
@@ -65,28 +72,58 @@ export function validateAndFixToolResultIds(
 
 	const toolUseBlocks = assistantContent.filter((block): block is Anthropic.ToolUseBlock => block.type === "tool_use")
 
-	// No tool_use blocks to match against
+	// No tool_use blocks to match against - no validation needed
 	if (toolUseBlocks.length === 0) {
 		return userMessage
 	}
 
+	// Find tool_result blocks in the user message
+	const toolResults = userMessage.content.filter(
+		(block): block is Anthropic.ToolResultBlockParam => block.type === "tool_result",
+	)
+
 	// Build a set of valid tool_use IDs
 	const validToolUseIds = new Set(toolUseBlocks.map((block) => block.id))
 
+	// Build a set of existing tool_result IDs
+	const existingToolResultIds = new Set(toolResults.map((r) => r.tool_use_id))
+
+	// Check for missing tool_results (tool_use IDs that don't have corresponding tool_results)
+	const missingToolUseIds = toolUseBlocks
+		.filter((toolUse) => !existingToolResultIds.has(toolUse.id))
+		.map((toolUse) => toolUse.id)
+
 	// Check if any tool_result has an invalid ID
 	const hasInvalidIds = toolResults.some((result) => !validToolUseIds.has(result.tool_use_id))
 
-	if (!hasInvalidIds) {
-		// All IDs are valid, no changes needed
+	// If no missing tool_results and no invalid IDs, no changes needed
+	if (missingToolUseIds.length === 0 && !hasInvalidIds) {
 		return userMessage
 	}
 
-	// We have mismatches - need to fix them
+	// We have issues - need to fix them
 	const toolResultIdList = toolResults.map((r) => r.tool_use_id)
 	const toolUseIdList = toolUseBlocks.map((b) => b.id)
 
-	// Report the mismatch to PostHog error tracking
-	if (TelemetryService.hasInstance()) {
+	// Report missing tool_results to PostHog error tracking
+	if (missingToolUseIds.length > 0 && TelemetryService.hasInstance()) {
+		TelemetryService.instance.captureException(
+			new MissingToolResultError(
+				`Detected missing tool_result blocks. Missing tool_use IDs: [${missingToolUseIds.join(", ")}], existing tool_result IDs: [${toolResultIdList.join(", ")}]`,
+				missingToolUseIds,
+				toolResultIdList,
+			),
+			{
+				missingToolUseIds,
+				existingToolResultIds: toolResultIdList,
+				toolUseCount: toolUseBlocks.length,
+				toolResultCount: toolResults.length,
+			},
+		)
+	}
+
+	// Report ID mismatches to PostHog error tracking
+	if (hasInvalidIds && TelemetryService.hasInstance()) {
 		TelemetryService.instance.captureException(
 			new ToolResultIdMismatchError(
 				`Detected tool_result ID mismatch. tool_result IDs: [${toolResultIdList.join(", ")}], tool_use IDs: [${toolUseIdList.join(", ")}]`,
@@ -102,10 +139,8 @@ export function validateAndFixToolResultIds(
 		)
 	}
 
-	// Create a mapping of tool_result IDs to corrected IDs
-	// Strategy: Match by position (first tool_result -> first tool_use, etc.)
-	// This handles most cases where the mismatch is due to ID confusion
-	const correctedContent = userMessage.content.map((block) => {
+	// Start with corrected content - fix invalid IDs
+	let correctedContent = userMessage.content.map((block) => {
 		if (block.type !== "tool_result") {
 			return block
 		}
@@ -134,6 +169,29 @@ export function validateAndFixToolResultIds(
 		return block
 	})
 
+	// Add missing tool_result blocks for any tool_use that doesn't have one
+	// After the ID correction above, recalculate which tool_use IDs are now covered
+	const coveredToolUseIds = new Set(
+		correctedContent
+			.filter((b): b is Anthropic.ToolResultBlockParam => b.type === "tool_result")
+			.map((r) => r.tool_use_id),
+	)
+
+	const stillMissingToolUseIds = toolUseBlocks.filter((toolUse) => !coveredToolUseIds.has(toolUse.id))
+
+	if (stillMissingToolUseIds.length > 0) {
+		// Add placeholder tool_result blocks for missing tool_use IDs
+		const missingToolResults: Anthropic.ToolResultBlockParam[] = stillMissingToolUseIds.map((toolUse) => ({
+			type: "tool_result" as const,
+			tool_use_id: toolUse.id,
+			content: "Tool execution was interrupted before completion.",
+		}))
+
+		// Insert missing tool_results at the beginning of the content array
+		// This ensures they come before any text blocks that may summarize the results
+		correctedContent = [...missingToolResults, ...correctedContent]
+	}
+
 	return {
 		...userMessage,
 		content: correctedContent,
diff --git a/src/core/tools/ListCodeDefinitionNamesTool.ts b/src/core/tools/ListCodeDefinitionNamesTool.ts
deleted file mode 100644
index e76a45c880b..00000000000
--- a/src/core/tools/ListCodeDefinitionNamesTool.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import path from "path"
-import fs from "fs/promises"
-
-import { Task } from "../task/Task"
-import { ClineSayTool } from "../../shared/ExtensionMessage"
-import { getReadablePath } from "../../utils/path"
-import { isPathOutsideWorkspace } from "../../utils/pathUtils"
-import { parseSourceCodeForDefinitionsTopLevel, parseSourceCodeDefinitionsForFile } from "../../services/tree-sitter"
-import { RecordSource } from "../context-tracking/FileContextTrackerTypes"
-import { truncateDefinitionsToLineLimit } from "./helpers/truncateDefinitions"
-import { BaseTool, ToolCallbacks } from "./BaseTool"
-import type { ToolUse } from "../../shared/tools"
-
-interface ListCodeDefinitionNamesParams {
-	path: string
-}
-
-export class ListCodeDefinitionNamesTool extends BaseTool<"list_code_definition_names"> {
-	readonly name = "list_code_definition_names" as const
-
-	parseLegacy(params: Partial<Record<string, string>>): ListCodeDefinitionNamesParams {
-		return {
-			path: params.path || "",
-		}
-	}
-
-	async execute(params: ListCodeDefinitionNamesParams, task: Task, callbacks: ToolCallbacks): Promise<void> {
-		const { askApproval, handleError, pushToolResult } = callbacks
-		const { path: relPath } = params
-
-		if (!relPath) {
-			task.consecutiveMistakeCount++
-			task.recordToolError("list_code_definition_names")
-			task.didToolFailInCurrentTurn = true
-			pushToolResult(await task.sayAndCreateMissingParamError("list_code_definition_names", "path"))
-			return
-		}
-
-		task.consecutiveMistakeCount = 0
-
-		const absolutePath = path.resolve(task.cwd, relPath)
-		const isOutsideWorkspace = isPathOutsideWorkspace(absolutePath)
-
-		const sharedMessageProps: ClineSayTool = {
-			tool: "listCodeDefinitionNames",
-			path: getReadablePath(task.cwd, relPath),
-			isOutsideWorkspace,
-		}
-
-		try {
-			let result: string
-
-			try {
-				const stats = await fs.stat(absolutePath)
-
-				if (stats.isFile()) {
-					const fileResult = await parseSourceCodeDefinitionsForFile(absolutePath, task.rooIgnoreController)
-
-					if (fileResult) {
-						const { maxReadFileLine = -1 } = (await task.providerRef.deref()?.getState()) ?? {}
-						result = truncateDefinitionsToLineLimit(fileResult, maxReadFileLine)
-					} else {
-						result = "No source code definitions found in file."
-					}
-				} else if (stats.isDirectory()) {
-					result = await parseSourceCodeForDefinitionsTopLevel(absolutePath, task.rooIgnoreController)
-				} else {
-					result = "The specified path is neither a file nor a directory."
-				}
-			} catch {
-				result = `${absolutePath}: does not exist or cannot be accessed.`
-			}
-
-			const completeMessage = JSON.stringify({ ...sharedMessageProps, content: result } satisfies ClineSayTool)
-			const didApprove = await askApproval("tool", completeMessage)
-
-			if (!didApprove) {
-				return
-			}
-
-			if (relPath) {
-				await task.fileContextTracker.trackFileContext(relPath, "read_tool" as RecordSource)
-			}
-
-			pushToolResult(result)
-		} catch (error) {
-			await handleError("parsing source code definitions", error as Error)
-		}
-	}
-
-	override async handlePartial(task: Task, block: ToolUse<"list_code_definition_names">): Promise<void> {
-		const relPath: string | undefined = block.params.path
-
-		const absolutePath = relPath ? path.resolve(task.cwd, relPath) : task.cwd
-		const isOutsideWorkspace = isPathOutsideWorkspace(absolutePath)
-
-		const sharedMessageProps: ClineSayTool = {
-			tool: "listCodeDefinitionNames",
-			path: getReadablePath(task.cwd, relPath || ""),
-			isOutsideWorkspace,
-		}
-
-		const partialMessage = JSON.stringify({ ...sharedMessageProps, content: "" } satisfies ClineSayTool)
-		await task.ask("tool", partialMessage, block.partial).catch(() => {})
-	}
-}
-
-export const listCodeDefinitionNamesTool = new ListCodeDefinitionNamesTool()
diff --git a/src/core/tools/__tests__/listCodeDefinitionNamesTool.spec.ts b/src/core/tools/__tests__/listCodeDefinitionNamesTool.spec.ts
deleted file mode 100644
index 1e9c61e11cb..00000000000
--- a/src/core/tools/__tests__/listCodeDefinitionNamesTool.spec.ts
+++ /dev/null
@@ -1,343 +0,0 @@
-// npx vitest src/core/tools/__tests__/listCodeDefinitionNamesTool.spec.ts
-
-import { describe, it, expect, vi, beforeEach } from "vitest"
-import { listCodeDefinitionNamesTool } from "../ListCodeDefinitionNamesTool"
-import { Task } from "../../task/Task"
-import { ToolUse } from "../../../shared/tools"
-import * as treeSitter from "../../../services/tree-sitter"
-import fs from "fs/promises"
-
-// Mock the tree-sitter service
-vi.mock("../../../services/tree-sitter", () => ({
-	parseSourceCodeDefinitionsForFile: vi.fn(),
-	parseSourceCodeForDefinitionsTopLevel: vi.fn(),
-}))
-
-// Mock fs module
-vi.mock("fs/promises", () => ({
-	default: {
-		stat: vi.fn(),
-	},
-}))
-
-describe("listCodeDefinitionNamesTool", () => {
-	let mockTask: Partial<Task>
-	let mockAskApproval: any
-	let mockHandleError: any
-	let mockPushToolResult: any
-	let mockRemoveClosingTag: any
-
-	beforeEach(() => {
-		vi.clearAllMocks()
-
-		mockTask = {
-			cwd: "/test/path",
-			consecutiveMistakeCount: 0,
-			recordToolError: vi.fn(),
-			sayAndCreateMissingParamError: vi.fn(),
-			ask: vi.fn(),
-			fileContextTracker: {
-				trackFileContext: vi.fn(),
-			},
-			providerRef: {
-				deref: vi.fn(() => ({
-					getState: vi.fn(async () => ({ maxReadFileLine: -1 })),
-				})),
-			},
-			rooIgnoreController: undefined,
-		} as any
-
-		mockAskApproval = vi.fn(async () => true)
-		mockHandleError = vi.fn()
-		mockPushToolResult = vi.fn()
-		mockRemoveClosingTag = vi.fn((tag: string, value: string) => value)
-	})
-
-	describe("truncateDefinitionsToLineLimit", () => {
-		it("should not truncate when maxReadFileLine is -1 (no limit)", async () => {
-			const mockDefinitions = `# test.ts
-10--20 | function foo() {
-30--40 | function bar() {
-50--60 | function baz() {`
-
-			vi.mocked(treeSitter.parseSourceCodeDefinitionsForFile).mockResolvedValue(mockDefinitions)
-
-			vi.mocked(fs.stat).mockResolvedValue({
-				isFile: () => true,
-				isDirectory: () => false,
-			} as any)
-
-			mockTask.providerRef = {
-				deref: vi.fn(() => ({
-					getState: vi.fn(async () => ({ maxReadFileLine: -1 })),
-				})),
-			} as any
-
-			const block: ToolUse = {
-				type: "tool_use",
-				name: "list_code_definition_names",
-				params: { path: "test.ts" },
-				partial: false,
-			}
-
-			await listCodeDefinitionNamesTool.handle(mockTask as Task, block as ToolUse<"list_code_definition_names">, {
-				askApproval: mockAskApproval,
-				handleError: mockHandleError,
-				pushToolResult: mockPushToolResult,
-				removeClosingTag: mockRemoveClosingTag,
-				toolProtocol: "xml",
-			})
-
-			expect(mockPushToolResult).toHaveBeenCalledWith(mockDefinitions)
-		})
-
-		it("should not truncate when maxReadFileLine is 0 (definitions only mode)", async () => {
-			const mockDefinitions = `# test.ts
-10--20 | function foo() {
-30--40 | function bar() {
-50--60 | function baz() {`
-
-			vi.mocked(treeSitter.parseSourceCodeDefinitionsForFile).mockResolvedValue(mockDefinitions)
-
-			vi.mocked(fs.stat).mockResolvedValue({
-				isFile: () => true,
-				isDirectory: () => false,
-			} as any)
-
-			mockTask.providerRef = {
-				deref: vi.fn(() => ({
-					getState: vi.fn(async () => ({ maxReadFileLine: 0 })),
-				})),
-			} as any
-
-			const block: ToolUse = {
-				type: "tool_use",
-				name: "list_code_definition_names",
-				params: { path: "test.ts" },
-				partial: false,
-			}
-
-			await listCodeDefinitionNamesTool.handle(mockTask as Task, block as ToolUse<"list_code_definition_names">, {
-				askApproval: mockAskApproval,
-				handleError: mockHandleError,
-				pushToolResult: mockPushToolResult,
-				removeClosingTag: mockRemoveClosingTag,
-				toolProtocol: "xml",
-			})
-
-			expect(mockPushToolResult).toHaveBeenCalledWith(mockDefinitions)
-		})
-
-		it("should truncate definitions when maxReadFileLine is set", async () => {
-			const mockDefinitions = `# test.ts
-10--20 | function foo() {
-30--40 | function bar() {
-50--60 | function baz() {`
-
-			vi.mocked(treeSitter.parseSourceCodeDefinitionsForFile).mockResolvedValue(mockDefinitions)
-
-			vi.mocked(fs.stat).mockResolvedValue({
-				isFile: () => true,
-				isDirectory: () => false,
-			} as any)
-
-			mockTask.providerRef = {
-				deref: vi.fn(() => ({
-					getState: vi.fn(async () => ({ maxReadFileLine: 25 })),
-				})),
-			} as any
-
-			const block: ToolUse = {
-				type: "tool_use",
-				name: "list_code_definition_names",
-				params: { path: "test.ts" },
-				partial: false,
-			}
-
-			await listCodeDefinitionNamesTool.handle(mockTask as Task, block as ToolUse<"list_code_definition_names">, {
-				askApproval: mockAskApproval,
-				handleError: mockHandleError,
-				pushToolResult: mockPushToolResult,
-				removeClosingTag: mockRemoveClosingTag,
-				toolProtocol: "xml",
-			})
-
-			// Should only include definitions starting at or before line 25
-			const expectedResult = `# test.ts
-10--20 | function foo() {`
-
-			expect(mockPushToolResult).toHaveBeenCalledWith(expectedResult)
-		})
-
-		it("should include definitions that start within limit even if they end beyond it", async () => {
-			const mockDefinitions = `# test.ts
-10--50 | function foo() {
-60--80 | function bar() {`
-
-			vi.mocked(treeSitter.parseSourceCodeDefinitionsForFile).mockResolvedValue(mockDefinitions)
-
-			vi.mocked(fs.stat).mockResolvedValue({
-				isFile: () => true,
-				isDirectory: () => false,
-			} as any)
-
-			mockTask.providerRef = {
-				deref: vi.fn(() => ({
-					getState: vi.fn(async () => ({ maxReadFileLine: 30 })),
-				})),
-			} as any
-
-			const block: ToolUse = {
-				type: "tool_use",
-				name: "list_code_definition_names",
-				params: { path: "test.ts" },
-				partial: false,
-			}
-
-			await listCodeDefinitionNamesTool.handle(mockTask as Task, block as ToolUse<"list_code_definition_names">, {
-				askApproval: mockAskApproval,
-				handleError: mockHandleError,
-				pushToolResult: mockPushToolResult,
-				removeClosingTag: mockRemoveClosingTag,
-				toolProtocol: "xml",
-			})
-
-			// Should include foo (starts at 10) but not bar (starts at 60)
-			const expectedResult = `# test.ts
-10--50 | function foo() {`
-
-			expect(mockPushToolResult).toHaveBeenCalledWith(expectedResult)
-		})
-
-		it("should handle single-line definitions", async () => {
-			const mockDefinitions = `# test.ts
-10 | const foo = 1
-20 | const bar = 2
-30 | const baz = 3`
-
-			vi.mocked(treeSitter.parseSourceCodeDefinitionsForFile).mockResolvedValue(mockDefinitions)
-
-			vi.mocked(fs.stat).mockResolvedValue({
-				isFile: () => true,
-				isDirectory: () => false,
-			} as any)
-
-			mockTask.providerRef = {
-				deref: vi.fn(() => ({
-					getState: vi.fn(async () => ({ maxReadFileLine: 25 })),
-				})),
-			} as any
-
-			const block: ToolUse = {
-				type: "tool_use",
-				name: "list_code_definition_names",
-				params: { path: "test.ts" },
-				partial: false,
-			}
-
-			await listCodeDefinitionNamesTool.handle(mockTask as Task, block as ToolUse<"list_code_definition_names">, {
-				askApproval: mockAskApproval,
-				handleError: mockHandleError,
-				pushToolResult: mockPushToolResult,
-				removeClosingTag: mockRemoveClosingTag,
-				toolProtocol: "xml",
-			})
-
-			// Should include foo and bar but not baz
-			const expectedResult = `# test.ts
-10 | const foo = 1
-20 | const bar = 2`
-
-			expect(mockPushToolResult).toHaveBeenCalledWith(expectedResult)
-		})
-
-		it("should preserve header line when truncating", async () => {
-			const mockDefinitions = `# test.ts
-100--200 | function foo() {`
-
-			vi.mocked(treeSitter.parseSourceCodeDefinitionsForFile).mockResolvedValue(mockDefinitions)
-
-			vi.mocked(fs.stat).mockResolvedValue({
-				isFile: () => true,
-				isDirectory: () => false,
-			} as any)
-
-			mockTask.providerRef = {
-				deref: vi.fn(() => ({
-					getState: vi.fn(async () => ({ maxReadFileLine: 50 })),
-				})),
-			} as any
-
-			const block: ToolUse = {
-				type: "tool_use",
-				name: "list_code_definition_names",
-				params: { path: "test.ts" },
-				partial: false,
-			}
-
-			await listCodeDefinitionNamesTool.handle(mockTask as Task, block as ToolUse<"list_code_definition_names">, {
-				askApproval: mockAskApproval,
-				handleError: mockHandleError,
-				pushToolResult: mockPushToolResult,
-				removeClosingTag: mockRemoveClosingTag,
-				toolProtocol: "xml",
-			})
-
-			// Should keep header but exclude all definitions beyond line 50
-			const expectedResult = `# test.ts`
-
-			expect(mockPushToolResult).toHaveBeenCalledWith(expectedResult)
-		})
-	})
-
-	it("should handle missing path parameter", async () => {
-		const block: ToolUse = {
-			type: "tool_use",
-			name: "list_code_definition_names",
-			params: {},
-			partial: false,
-		}
-
-		mockTask.sayAndCreateMissingParamError = vi.fn(async () => "Missing parameter: path")
-
-		await listCodeDefinitionNamesTool.handle(mockTask as Task, block as ToolUse<"list_code_definition_names">, {
-			askApproval: mockAskApproval,
-			handleError: mockHandleError,
-			pushToolResult: mockPushToolResult,
-			removeClosingTag: mockRemoveClosingTag,
-			toolProtocol: "xml",
-		})
-
-		expect(mockTask.consecutiveMistakeCount).toBe(1)
-		expect(mockTask.recordToolError).toHaveBeenCalledWith("list_code_definition_names")
-		expect(mockPushToolResult).toHaveBeenCalledWith("Missing parameter: path")
-	})
-
-	it("should handle directory path", async () => {
-		const mockDefinitions = "# Directory definitions"
-
-		vi.mocked(treeSitter.parseSourceCodeForDefinitionsTopLevel).mockResolvedValue(mockDefinitions)
-
-		vi.mocked(fs.stat).mockResolvedValue({
-			isFile: () => false,
-			isDirectory: () => true,
-		} as any)
-
-		const block: ToolUse = {
-			type: "tool_use",
-			name: "list_code_definition_names",
-			params: { path: "src" },
-			partial: false,
-		}
-
-		await listCodeDefinitionNamesTool.handle(mockTask as Task, block as ToolUse<"list_code_definition_names">, {
-			askApproval: mockAskApproval,
-			handleError: mockHandleError,
-			pushToolResult: mockPushToolResult,
-			removeClosingTag: mockRemoveClosingTag,
-			toolProtocol: "xml",
-		})
-
-		expect(mockPushToolResult).toHaveBeenCalledWith(mockDefinitions)
-	})
-})
diff --git a/src/core/tools/__tests__/readFileTool.spec.ts b/src/core/tools/__tests__/readFileTool.spec.ts
index c236653d28b..34e310f323d 100644
--- a/src/core/tools/__tests__/readFileTool.spec.ts
+++ b/src/core/tools/__tests__/readFileTool.spec.ts
@@ -10,8 +10,6 @@ import { parseSourceCodeDefinitionsForFile } from "../../../services/tree-sitter
 import { isBinaryFileWithEncodingDetection } from "../../../utils/encoding"
 import { ReadFileToolUse, ToolParamName, ToolResponse } from "../../../shared/tools"
 import { readFileTool } from "../ReadFileTool"
-// import { formatResponse } from "../../prompts/responses"
-// import { DEFAULT_MAX_IMAGE_FILE_SIZE_MB, DEFAULT_MAX_TOTAL_IMAGE_SIZE_MB } from "../helpers/imageHelpers"
 
 vi.mock("path", async () => {
 	const originalPath = await vi.importActual("path")
diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts
index 825aa356f1b..fb7b627d4ee 100644
--- a/src/core/webview/ClineProvider.ts
+++ b/src/core/webview/ClineProvider.ts
@@ -38,7 +38,6 @@ import {
 	RooCodeEventName,
 	requestyDefaultModelId,
 	openRouterDefaultModelId,
-	glamaDefaultModelId,
 	DEFAULT_TERMINAL_OUTPUT_CHARACTER_LIMIT,
 	DEFAULT_WRITE_DELAY_MS,
 	ORGANIZATION_ALLOW_ALL,
@@ -1609,39 +1608,6 @@ export class ClineProvider
 		await this.upsertProviderProfile(currentApiConfigName, newConfiguration)
 	}
 
-	// Glama
-
-	async handleGlamaCallback(code: string) {
-		let apiKey: string
-
-		try {
-			const response = await axios.post("https://glama.ai/api/gateway/v1/auth/exchange-code", { code })
-
-			if (response.data && response.data.apiKey) {
-				apiKey = response.data.apiKey
-			} else {
-				throw new Error("Invalid response from Glama API")
-			}
-		} catch (error) {
-			this.log(
-				`Error exchanging code for API key: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
-			)
-
-			throw error
-		}
-
-		const { apiConfiguration, currentApiConfigName = "default" } = await this.getState()
-
-		const newConfiguration: ProviderSettings = {
-			...apiConfiguration,
-			apiProvider: "glama",
-			glamaApiKey: apiKey,
-			glamaModelId: apiConfiguration?.glamaModelId || glamaDefaultModelId,
-		}
-
-		await this.upsertProviderProfile(currentApiConfigName, newConfiguration)
-	}
-
 	// Requesty
 
 	async handleRequestyCallback(code: string, baseUrl: string | null) {
@@ -2001,6 +1967,7 @@ export class ClineProvider
 			terminalCompressProgressBar,
 			historyPreviewCollapsed,
 			reasoningBlockCollapsed,
+			enterBehavior,
 			cloudUserInfo,
 			cloudIsAuthenticated,
 			sharingEnabled,
@@ -2158,6 +2125,7 @@ export class ClineProvider
 			hasSystemPromptOverride,
 			historyPreviewCollapsed: historyPreviewCollapsed ?? false,
 			reasoningBlockCollapsed: reasoningBlockCollapsed ?? true,
+			enterBehavior: enterBehavior ?? "send",
 			cloudUserInfo,
 			cloudIsAuthenticated: cloudIsAuthenticated ?? false,
 			// cloudOrganizations,
@@ -2392,6 +2360,7 @@ export class ClineProvider
 			maxConcurrentFileReads: stateValues.maxConcurrentFileReads ?? 5,
 			historyPreviewCollapsed: stateValues.historyPreviewCollapsed ?? false,
 			reasoningBlockCollapsed: stateValues.reasoningBlockCollapsed ?? true,
+			enterBehavior: stateValues.enterBehavior ?? "send",
 			cloudUserInfo,
 			cloudIsAuthenticated,
 			sharingEnabled,
diff --git a/src/core/webview/__tests__/ClineProvider.apiHandlerRebuild.spec.ts b/src/core/webview/__tests__/ClineProvider.apiHandlerRebuild.spec.ts
index b308f51d38d..40da5fb3cbd 100644
--- a/src/core/webview/__tests__/ClineProvider.apiHandlerRebuild.spec.ts
+++ b/src/core/webview/__tests__/ClineProvider.apiHandlerRebuild.spec.ts
@@ -579,7 +579,6 @@ describe("ClineProvider - API Handler Rebuild Guard", () => {
 				"claude-3-5-sonnet-20241022",
 			)
 			expect(getModelId({ apiProvider: "openai", openAiModelId: "gpt-4-turbo" })).toBe("gpt-4-turbo")
-			expect(getModelId({ apiProvider: "glama", glamaModelId: "some-model" })).toBe("some-model")
 			expect(getModelId({ apiProvider: "bedrock", apiModelId: "anthropic.claude-v2" })).toBe(
 				"anthropic.claude-v2",
 			)
diff --git a/src/core/webview/__tests__/ClineProvider.spec.ts b/src/core/webview/__tests__/ClineProvider.spec.ts
index bad87d9c47c..153769c6223 100644
--- a/src/core/webview/__tests__/ClineProvider.spec.ts
+++ b/src/core/webview/__tests__/ClineProvider.spec.ts
@@ -2697,7 +2697,6 @@ describe("ClineProvider - Router Models", () => {
 			apiConfiguration: {
 				openRouterApiKey: "openrouter-key",
 				requestyApiKey: "requesty-key",
-				glamaApiKey: "glama-key",
 				unboundApiKey: "unbound-key",
 				litellmApiKey: "litellm-key",
 				litellmBaseUrl: "http://localhost:4000",
@@ -2727,7 +2726,6 @@ describe("ClineProvider - Router Models", () => {
 		// Verify getModels was called for each provider with correct options
 		expect(getModels).toHaveBeenCalledWith({ provider: "openrouter" })
 		expect(getModels).toHaveBeenCalledWith({ provider: "requesty", apiKey: "requesty-key" })
-		expect(getModels).toHaveBeenCalledWith({ provider: "glama" })
 		expect(getModels).toHaveBeenCalledWith({ provider: "unbound", apiKey: "unbound-key" })
 		expect(getModels).toHaveBeenCalledWith({ provider: "vercel-ai-gateway" })
 		expect(getModels).toHaveBeenCalledWith({ provider: "deepinfra" })
@@ -2759,7 +2757,6 @@ describe("ClineProvider - Router Models", () => {
 				deepinfra: mockModels,
 				openrouter: mockModels,
 				requesty: mockModels,
-				glama: mockModels,
 				unbound: mockModels,
 				// roo: mockModels,
 				chutes: mockModels,
@@ -2782,7 +2779,6 @@ describe("ClineProvider - Router Models", () => {
 			apiConfiguration: {
 				openRouterApiKey: "openrouter-key",
 				requestyApiKey: "requesty-key",
-				glamaApiKey: "glama-key",
 				unboundApiKey: "unbound-key",
 				litellmApiKey: "litellm-key",
 				litellmBaseUrl: "http://localhost:4000",
@@ -2799,7 +2795,6 @@ describe("ClineProvider - Router Models", () => {
 			.mockResolvedValueOnce(mockModels) // zgsm success (first call)
 			.mockResolvedValueOnce(mockModels) // openrouter success
 			.mockRejectedValueOnce(new Error("Requesty API error")) // requesty fail
-			.mockResolvedValueOnce(mockModels) // glama success
 			.mockRejectedValueOnce(new Error("Unbound API error")) // unbound fail
 			.mockResolvedValueOnce(mockModels) // vercel-ai-gateway success
 			.mockResolvedValueOnce(mockModels) // deepinfra success
@@ -2824,7 +2819,6 @@ describe("ClineProvider - Router Models", () => {
 				deepinfra: mockModels,
 				openrouter: mockModels,
 				requesty: {},
-				glama: mockModels,
 				unbound: {},
 				// roo: mockModels,
 				chutes: {},
@@ -2884,7 +2878,6 @@ describe("ClineProvider - Router Models", () => {
 			apiConfiguration: {
 				openRouterApiKey: "openrouter-key",
 				requestyApiKey: "requesty-key",
-				glamaApiKey: "glama-key",
 				unboundApiKey: "unbound-key",
 				// No litellm config
 			},
@@ -2920,7 +2913,6 @@ describe("ClineProvider - Router Models", () => {
 			apiConfiguration: {
 				openRouterApiKey: "openrouter-key",
 				requestyApiKey: "requesty-key",
-				glamaApiKey: "glama-key",
 				unboundApiKey: "unbound-key",
 				// No litellm config
 			},
@@ -2958,7 +2950,6 @@ describe("ClineProvider - Router Models", () => {
 				deepinfra: mockModels,
 				openrouter: mockModels,
 				requesty: mockModels,
-				glama: mockModels,
 				unbound: mockModels,
 				// roo: mockModels,
 				chutes: mockModels,
diff --git a/src/core/webview/__tests__/webviewMessageHandler.routerModels.spec.ts b/src/core/webview/__tests__/webviewMessageHandler.routerModels.spec.ts
index 0c8edd8f1e7..310c8954f6f 100644
--- a/src/core/webview/__tests__/webviewMessageHandler.routerModels.spec.ts
+++ b/src/core/webview/__tests__/webviewMessageHandler.routerModels.spec.ts
@@ -94,8 +94,6 @@ describe("webviewMessageHandler - requestRouterModels provider filter", () => {
 					return { "requesty/model": { contextWindow: 8192, supportsPromptCache: false } }
 				case "deepinfra":
 					return { "deepinfra/model": { contextWindow: 8192, supportsPromptCache: false } }
-				case "glama":
-					return { "glama/model": { contextWindow: 8192, supportsPromptCache: false } }
 				case "unbound":
 					return { "unbound/model": { contextWindow: 8192, supportsPromptCache: false } }
 				case "vercel-ai-gateway":
diff --git a/src/core/webview/__tests__/webviewMessageHandler.spec.ts b/src/core/webview/__tests__/webviewMessageHandler.spec.ts
index ef98c9827da..2d07bf9ee19 100644
--- a/src/core/webview/__tests__/webviewMessageHandler.spec.ts
+++ b/src/core/webview/__tests__/webviewMessageHandler.spec.ts
@@ -200,7 +200,6 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 			apiConfiguration: {
 				openRouterApiKey: "openrouter-key",
 				requestyApiKey: "requesty-key",
-				glamaApiKey: "glama-key",
 				unboundApiKey: "unbound-key",
 				litellmApiKey: "litellm-key",
 				litellmBaseUrl: "http://localhost:4000",
@@ -235,7 +234,6 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 		// Verify getModels was called for each provider
 		expect(mockGetModels).toHaveBeenCalledWith({ provider: "openrouter" })
 		expect(mockGetModels).toHaveBeenCalledWith({ provider: "requesty", apiKey: "requesty-key" })
-		expect(mockGetModels).toHaveBeenCalledWith({ provider: "glama" })
 		expect(mockGetModels).toHaveBeenCalledWith({ provider: "unbound", apiKey: "unbound-key" })
 		expect(mockGetModels).toHaveBeenCalledWith({ provider: "vercel-ai-gateway" })
 		expect(mockGetModels).toHaveBeenCalledWith({ provider: "deepinfra" })
@@ -268,7 +266,6 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 				deepinfra: mockModels,
 				openrouter: mockModels,
 				requesty: mockModels,
-				glama: mockModels,
 				unbound: mockModels,
 				litellm: mockModels,
 				// roo: mockModels,
@@ -288,7 +285,6 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 			apiConfiguration: {
 				openRouterApiKey: "openrouter-key",
 				requestyApiKey: "requesty-key",
-				glamaApiKey: "glama-key",
 				unboundApiKey: "unbound-key",
 				// Missing litellm config
 			},
@@ -326,7 +322,6 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 			apiConfiguration: {
 				openRouterApiKey: "openrouter-key",
 				requestyApiKey: "requesty-key",
-				glamaApiKey: "glama-key",
 				unboundApiKey: "unbound-key",
 				// Missing litellm config
 			},
@@ -378,7 +373,6 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 				deepinfra: mockModels,
 				openrouter: mockModels,
 				requesty: mockModels,
-				glama: mockModels,
 				unbound: mockModels,
 				// roo: mockModels,
 				chutes: mockModels,
@@ -408,7 +402,6 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 			.mockResolvedValueOnce(mockModels) // zgsm success (first call)
 			.mockResolvedValueOnce(mockModels) // openrouter
 			.mockRejectedValueOnce(new Error("Requesty API error")) // requesty
-			.mockResolvedValueOnce(mockModels) // glama
 			.mockRejectedValueOnce(new Error("Unbound API error")) // unbound
 			.mockResolvedValueOnce(mockModels) // vercel-ai-gateway
 			.mockResolvedValueOnce(mockModels) // deepinfra
@@ -463,7 +456,6 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 				deepinfra: mockModels,
 				openrouter: mockModels,
 				requesty: {},
-				glama: mockModels,
 				unbound: {},
 				// roo: mockModels,
 				chutes: {},
@@ -485,7 +477,6 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 			.mockResolvedValueOnce({}) // zgsm success (first call)
 			.mockRejectedValueOnce(new Error("Structured error message")) // openrouter
 			.mockRejectedValueOnce(new Error("Requesty API error")) // requesty
-			.mockRejectedValueOnce(new Error("Glama API error")) // glama
 			.mockRejectedValueOnce(new Error("Unbound API error")) // unbound
 			.mockRejectedValueOnce(new Error("Vercel AI Gateway error")) // vercel-ai-gateway
 			.mockRejectedValueOnce(new Error("DeepInfra API error")) // deepinfra
@@ -512,13 +503,6 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 			values: { provider: "requesty" },
 		})
 
-		expect(mockClineProvider.postMessageToWebview).toHaveBeenCalledWith({
-			type: "singleRouterModelFetchResponse",
-			success: false,
-			error: "Glama API error",
-			values: { provider: "glama" },
-		})
-
 		expect(mockClineProvider.postMessageToWebview).toHaveBeenCalledWith({
 			type: "singleRouterModelFetchResponse",
 			success: false,
diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts
index b1b10cce375..b16492bbba7 100644
--- a/src/core/webview/webviewMessageHandler.ts
+++ b/src/core/webview/webviewMessageHandler.ts
@@ -919,7 +919,6 @@ export const webviewMessageHandler = async (
 						"io-intelligence": {},
 						requesty: {},
 						unbound: {},
-						glama: {},
 						ollama: {},
 						lmstudio: {},
 						// roo: {},
@@ -959,7 +958,6 @@ export const webviewMessageHandler = async (
 						baseUrl: apiConfiguration.requestyBaseUrl,
 					},
 				},
-				{ key: "glama", options: { provider: "glama" } },
 				{ key: "unbound", options: { provider: "unbound", apiKey: apiConfiguration.unboundApiKey } },
 				{ key: "vercel-ai-gateway", options: { provider: "vercel-ai-gateway" } },
 				{
diff --git a/src/i18n/locales/en/common.json b/src/i18n/locales/en/common.json
index 8d7dc7b8748..6a5c6453574 100644
--- a/src/i18n/locales/en/common.json
+++ b/src/i18n/locales/en/common.json
@@ -119,7 +119,11 @@
 		"gemini": {
 			"generate_stream": "Gemini generate context stream error: {{error}}",
 			"generate_complete_prompt": "Gemini completion error: {{error}}",
-			"sources": "Sources:"
+			"sources": "Sources:",
+			"thinking_complete_no_output": "(Thinking complete, but no output was generated.)",
+			"thinking_complete_truncated": "(Thinking complete, but output was truncated due to token limit.)",
+			"thinking_complete_safety": "(Thinking complete, but output was blocked due to safety settings.)",
+			"thinking_complete_recitation": "(Thinking complete, but output was blocked due to recitation check.)"
 		},
 		"cerebras": {
 			"authenticationFailed": "Cerebras API authentication failed. Please check your API key is valid and not expired.",
diff --git a/src/i18n/locales/zh-CN/common.json b/src/i18n/locales/zh-CN/common.json
index 1850aaa06da..3ed951dbce8 100644
--- a/src/i18n/locales/zh-CN/common.json
+++ b/src/i18n/locales/zh-CN/common.json
@@ -124,7 +124,11 @@
 		"gemini": {
 			"generate_stream": "Gemini 生成上下文流错误：{{error}}",
 			"generate_complete_prompt": "Gemini 完成错误：{{error}}",
-			"sources": "来源："
+			"sources": "来源：",
+			"thinking_complete_no_output": "（思考完成，但未生成输出。）",
+			"thinking_complete_truncated": "（思考完成，但由于 Token 限制输出被截断。）",
+			"thinking_complete_safety": "（思考完成，但由于安全设置输出被阻止。）",
+			"thinking_complete_recitation": "（思考完成，但由于引用检查输出被阻止。）"
 		},
 		"cerebras": {
 			"authenticationFailed": "Cerebras API 身份验证失败。请检查你的 API 密钥是否有效且未过期。",
diff --git a/src/i18n/locales/zh-TW/common.json b/src/i18n/locales/zh-TW/common.json
index 64731567d3e..cc57567d5c2 100644
--- a/src/i18n/locales/zh-TW/common.json
+++ b/src/i18n/locales/zh-TW/common.json
@@ -118,7 +118,11 @@
 		"gemini": {
 			"generate_stream": "Gemini 產生內容串流錯誤：{{error}}",
 			"generate_complete_prompt": "Gemini 完成錯誤：{{error}}",
-			"sources": "來源："
+			"sources": "來源：",
+			"thinking_complete_no_output": "（思考完成，但未產生輸出。）",
+			"thinking_complete_truncated": "（思考完成，但由於 Token 限制輸出被截斷。）",
+			"thinking_complete_safety": "（思考完成，但由於安全設定輸出被阻止。）",
+			"thinking_complete_recitation": "（思考完成，但由於引用檢查輸出被阻止。）"
 		},
 		"cerebras": {
 			"authenticationFailed": "Cerebras API 驗證失敗。請檢查您的 API 金鑰是否有效且未過期。",
diff --git a/src/services/checkpoints/__tests__/ShadowCheckpointService.spec.ts b/src/services/checkpoints/__tests__/ShadowCheckpointService.spec.ts
index 2e0977f1658..993dc9ee392 100644
--- a/src/services/checkpoints/__tests__/ShadowCheckpointService.spec.ts
+++ b/src/services/checkpoints/__tests__/ShadowCheckpointService.spec.ts
@@ -23,7 +23,7 @@ const tmpDir = path.join(os.tmpdir(), "CheckpointService")
 const initWorkspaceRepo = async ({
 	workspaceDir,
 	userName = "CoStrict",
-	userEmail = "support@roocode.com",
+	userEmail = "zgsm@sangfor.com.cn",
 	testFileName = "test.txt",
 	textFileContent = "Hello, world!",
 }: {
@@ -410,7 +410,7 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])(
 				const mainGit = simpleGit(workspaceDir)
 				await mainGit.init()
 				await mainGit.addConfig("user.name", "CoStrict")
-				await mainGit.addConfig("user.email", "support@roocode.com")
+				await mainGit.addConfig("user.email", "zgsm@sangfor.com.cn")
 
 				// Create a nested repo inside the workspace.
 				const nestedRepoPath = path.join(workspaceDir, "nested-project")
@@ -418,7 +418,7 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])(
 				const nestedGit = simpleGit(nestedRepoPath)
 				await nestedGit.init()
 				await nestedGit.addConfig("user.name", "CoStrict")
-				await nestedGit.addConfig("user.email", "support@roocode.com")
+				await nestedGit.addConfig("user.email", "zgsm@sangfor.com.cn")
 
 				// Add a file to the nested repo.
 				const nestedFile = path.join(nestedRepoPath, "nested-file.txt")
@@ -480,7 +480,7 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])(
 				const mainGit = simpleGit(workspaceDir)
 				await mainGit.init()
 				await mainGit.addConfig("user.name", "CoStrict")
-				await mainGit.addConfig("user.email", "support@roocode.com")
+				await mainGit.addConfig("user.email", "zgsm@sangfor.com.cn")
 
 				// Create a test file in the main workspace.
 				const mainFile = path.join(workspaceDir, "main-file.txt")
diff --git a/src/services/command/__tests__/built-in-commands.spec.ts b/src/services/command/__tests__/built-in-commands.spec.ts
index c3438d28d15..c16fa5a42dd 100644
--- a/src/services/command/__tests__/built-in-commands.spec.ts
+++ b/src/services/command/__tests__/built-in-commands.spec.ts
@@ -5,12 +5,13 @@ describe("Built-in Commands", () => {
 		it("should return all built-in commands", async () => {
 			const commands = await getBuiltInCommands()
 
-			expect(commands).toHaveLength(8)
+			expect(commands).toHaveLength(9)
 			expect(commands.map((cmd) => cmd.name)).toEqual(
 				expect.arrayContaining([
 					"init",
 					"project-wiki",
 					"tdd",
+					"dotest",
 					"generate-rules",
 					"vibeplus-propsal",
 					"vibeplus-apply",
@@ -73,9 +74,10 @@ describe("Built-in Commands", () => {
 		it("should return all built-in command names", async () => {
 			const names = await getBuiltInCommandNames()
 
-			expect(names).toHaveLength(8)
+			expect(names).toHaveLength(9)
 			expect(names).toEqual(
 				expect.arrayContaining([
+					"dotest",
 					"generate-rules",
 					"init",
 					"openspec-init",
@@ -88,6 +90,7 @@ describe("Built-in Commands", () => {
 			)
 			// Order doesn't matter since it's based on filesystem order
 			expect(names.sort()).toEqual([
+				"dotest",
 				"generate-rules",
 				"init",
 				"openspec-init",
diff --git a/src/services/tree-sitter/__tests__/index.spec.ts b/src/services/tree-sitter/__tests__/index.spec.ts
deleted file mode 100644
index cf0c2c404bb..00000000000
--- a/src/services/tree-sitter/__tests__/index.spec.ts
+++ /dev/null
@@ -1,443 +0,0 @@
-import * as fs from "fs/promises"
-import type { Mock } from "vitest"
-
-import { parseSourceCodeForDefinitionsTopLevel } from "../index"
-import { listFiles } from "../../glob/list-files"
-import { loadRequiredLanguageParsers } from "../languageParser"
-import { fileExistsAtPath } from "../../../utils/fs"
-
-// Mock dependencies
-vi.mock("../../glob/list-files")
-vi.mock("../languageParser")
-vi.mock("../../../utils/fs")
-vi.mock("fs/promises")
-
-describe("Tree-sitter Service", () => {
-	beforeEach(() => {
-		vi.clearAllMocks()
-		;(fileExistsAtPath as Mock).mockResolvedValue(true)
-	})
-
-	describe("parseSourceCodeForDefinitionsTopLevel", () => {
-		it("should handle non-existent directory", async () => {
-			;(fileExistsAtPath as Mock).mockResolvedValue(false)
-
-			const result = await parseSourceCodeForDefinitionsTopLevel("/non/existent/path")
-			expect(result).toBe("This directory does not exist or you do not have permission to access it.")
-		})
-
-		it("should handle empty directory", async () => {
-			;(listFiles as Mock).mockResolvedValue([[], new Set()])
-
-			const result = await parseSourceCodeForDefinitionsTopLevel("/test/path")
-			expect(result).toBe("No source code definitions found.")
-		})
-
-		it("should parse TypeScript files correctly", async () => {
-			const mockFiles = ["/test/path/file1.ts", "/test/path/file2.tsx", "/test/path/readme.md"]
-
-			;(listFiles as Mock).mockResolvedValue([mockFiles, new Set()])
-
-			const mockParser = {
-				parse: vi.fn().mockReturnValue({
-					rootNode: "mockNode",
-				}),
-			}
-
-			const mockQuery = {
-				captures: vi.fn().mockReturnValue([
-					{
-						// Must span 4 lines to meet MIN_COMPONENT_LINES
-						node: {
-							startPosition: { row: 0 },
-							endPosition: { row: 3 },
-							parent: {
-								startPosition: { row: 0 },
-								endPosition: { row: 3 },
-							},
-							text: () => "export class TestClass",
-						},
-						name: "name.definition",
-					},
-				]),
-			}
-
-			;(loadRequiredLanguageParsers as Mock).mockResolvedValue({
-				ts: { parser: mockParser, query: mockQuery },
-				tsx: { parser: mockParser, query: mockQuery },
-			})
-			;(fs.readFile as Mock).mockResolvedValue(Buffer.from("export class TestClass {\n  constructor() {}\n}"))
-
-			const result = await parseSourceCodeForDefinitionsTopLevel("/test/path")
-
-			expect(result).toContain("file1.ts")
-			expect(result).toContain("file2.tsx")
-			expect(result).not.toContain("readme.md")
-			expect(result).toContain("export class TestClass")
-		})
-
-		it("should handle multiple definition types", async () => {
-			const mockFiles = ["/test/path/file.ts"]
-			;(listFiles as Mock).mockResolvedValue([mockFiles, new Set()])
-
-			const mockParser = {
-				parse: vi.fn().mockReturnValue({
-					rootNode: "mockNode",
-				}),
-			}
-
-			const mockQuery = {
-				captures: vi.fn().mockReturnValue([
-					{
-						node: {
-							startPosition: { row: 0 },
-							endPosition: { row: 3 },
-							parent: {
-								startPosition: { row: 0 },
-								endPosition: { row: 3 },
-							},
-							text: () => "class TestClass",
-						},
-						name: "name.definition.class",
-					},
-					{
-						node: {
-							startPosition: { row: 2 },
-							endPosition: { row: 5 },
-							parent: {
-								startPosition: { row: 2 },
-								endPosition: { row: 5 },
-							},
-							text: () => "testMethod()",
-						},
-						name: "name.definition.function",
-					},
-				]),
-			}
-
-			;(loadRequiredLanguageParsers as Mock).mockResolvedValue({
-				ts: { parser: mockParser, query: mockQuery },
-			})
-
-			const fileContent = "class TestClass {\n" + "  constructor() {}\n" + "  testMethod() {}\n" + "}"
-
-			;(fs.readFile as Mock).mockResolvedValue(Buffer.from(fileContent))
-
-			const result = await parseSourceCodeForDefinitionsTopLevel("/test/path")
-
-			expect(result).toContain("class TestClass")
-			expect(result).toContain("testMethod()")
-		})
-
-		it("should handle parsing errors gracefully", async () => {
-			const mockFiles = ["/test/path/file.ts"]
-			;(listFiles as Mock).mockResolvedValue([mockFiles, new Set()])
-
-			const mockParser = {
-				parse: vi.fn().mockImplementation(() => {
-					throw new Error("Parsing error")
-				}),
-			}
-
-			const mockQuery = {
-				captures: vi.fn(),
-			}
-
-			;(loadRequiredLanguageParsers as Mock).mockResolvedValue({
-				ts: { parser: mockParser, query: mockQuery },
-			})
-			;(fs.readFile as Mock).mockResolvedValue(Buffer.from("invalid code"))
-
-			const result = await parseSourceCodeForDefinitionsTopLevel("/test/path")
-			expect(result).toBe("No source code definitions found.")
-		})
-
-		it("should capture arrow functions in JSX attributes with 4+ lines", async () => {
-			const mockFiles = ["/test/path/jsx-arrow.tsx"]
-			;(listFiles as Mock).mockResolvedValue([mockFiles, new Set()])
-
-			// Embed the fixture content directly
-			const fixtureContent = `import React from 'react';
-
-export const CheckboxExample = () => (
-		<VSCodeCheckbox
-		  checked={isCustomTemperature}
-		  onChange={(e: any) => {
-		    const isChecked = e.target.checked
-		    setIsCustomTemperature(isChecked)
-		
-		    if (!isChecked) {
-		      setInputValue(null) // Unset the temperature
-		    } else {
-		      setInputValue(value ?? 0) // Use value from config
-		    }
-		  }}>
-		  <label className="block font-medium mb-1">
-		    {t("settings:temperature.useCustom")}
-		  </label>
-		</VSCodeCheckbox>
-);`
-			;(fs.readFile as Mock).mockResolvedValue(Buffer.from(fixtureContent))
-
-			const lines = fixtureContent.split("\n")
-
-			// Define the node type for proper TypeScript support
-			interface TreeNode {
-				type?: string
-				toString?: () => string
-				text?: () => string
-				startPosition?: { row: number }
-				endPosition?: { row: number }
-				children?: TreeNode[]
-				fields?: () => Record<string, any>
-				printTree?: (depth?: number) => string
-			}
-
-			// Create a more detailed mock rootNode for debugging Tree-sitter structure
-			// Helper function to print tree nodes
-			const printTree = (node: TreeNode, depth = 0): string => {
-				let result = ""
-				const indent = "  ".repeat(depth)
-
-				// Print node details
-				result += `${indent}Type: ${node.type || "ROOT"}\n`
-				result += `${indent}Text: "${node.text ? node.text() : "root"}"`
-
-				// Print fields if available
-				if (node.fields) {
-					result += "\n" + indent + "Fields: " + JSON.stringify(node.fields(), null, 2)
-				}
-
-				// Print children recursively
-				if (node.children && node.children.length > 0) {
-					result += "\n" + indent + "Children:"
-					for (const child of node.children) {
-						result += "\n" + printTree(child, depth + 1)
-					}
-				}
-
-				return result
-			}
-
-			const mockRootNode: TreeNode = {
-				toString: () => fixtureContent,
-				text: () => fixtureContent,
-				printTree: function (depth = 0) {
-					return printTree(this, depth)
-				},
-				children: [
-					{
-						type: "class_declaration",
-						text: () => "class TestComponent extends React.Component",
-						startPosition: { row: 0 },
-						endPosition: { row: 20 },
-						printTree: function (depth = 0) {
-							return printTree(this, depth)
-						},
-						children: [
-							{
-								type: "type_identifier",
-								text: () => "TestComponent",
-								printTree: function (depth = 0) {
-									return printTree(this, depth)
-								},
-							},
-							{
-								type: "extends_clause",
-								text: () => "extends React.Component",
-								printTree: function (depth = 0) {
-									return printTree(this, depth)
-								},
-								children: [
-									{
-										type: "generic_type",
-										text: () => "React.Component",
-										children: [{ type: "member_expression", text: () => "React.Component" }],
-									},
-								],
-							},
-						],
-						// Debug output to see field names
-						fields: () => {
-							return {
-								name: [{ type: "type_identifier", text: () => "TestComponent" }],
-								class_heritage: [{ type: "extends_clause", text: () => "extends React.Component" }],
-							}
-						},
-					},
-				],
-			}
-
-			const mockParser = {
-				parse: vi.fn().mockReturnValue({
-					rootNode: mockRootNode,
-				}),
-			}
-
-			const mockQuery = {
-				captures: vi.fn().mockImplementation(() => {
-					// Log tree structure for debugging
-					console.log("TREE STRUCTURE:")
-					if (mockRootNode.printTree) {
-						console.log(mockRootNode.printTree())
-					} else {
-						console.log("Tree structure:", JSON.stringify(mockRootNode, null, 2))
-					}
-
-					return [
-						{
-							node: {
-								startPosition: { row: 4 },
-								endPosition: { row: 14 },
-								text: () => lines[4],
-								parent: {
-									startPosition: { row: 4 },
-									endPosition: { row: 14 },
-									text: () => lines[4],
-								},
-							},
-							name: "definition.lambda",
-						},
-					]
-				}),
-			}
-
-			;(loadRequiredLanguageParsers as Mock).mockResolvedValue({
-				tsx: { parser: mockParser, query: mockQuery },
-			})
-
-			const result = await parseSourceCodeForDefinitionsTopLevel("/test/path")
-
-			// Verify function found and correctly parsed
-			expect(result).toContain("jsx-arrow.tsx")
-			expect(result).toContain("5--15 |")
-
-			// Verify line count
-			const capture = mockQuery.captures.mock.results[0].value[0]
-			expect(capture.node.endPosition.row - capture.node.startPosition.row).toBeGreaterThanOrEqual(4)
-		})
-
-		it("should respect file limit", async () => {
-			const mockFiles = Array(100)
-				.fill(0)
-				.map((_, i) => `/test/path/file${i}.ts`)
-			;(listFiles as Mock).mockResolvedValue([mockFiles, new Set()])
-
-			const mockParser = {
-				parse: vi.fn().mockReturnValue({
-					rootNode: "mockNode",
-				}),
-			}
-
-			const mockQuery = {
-				captures: vi.fn().mockReturnValue([]),
-			}
-
-			;(loadRequiredLanguageParsers as Mock).mockResolvedValue({
-				ts: { parser: mockParser, query: mockQuery },
-			})
-
-			await parseSourceCodeForDefinitionsTopLevel("/test/path")
-
-			// Should only process first 50 files
-			expect(mockParser.parse).toHaveBeenCalledTimes(50)
-		})
-
-		it("should handle various supported file extensions", async () => {
-			const mockFiles = [
-				"/test/path/script.js",
-				"/test/path/app.py",
-				"/test/path/main.rs",
-				"/test/path/program.cpp",
-				"/test/path/code.go",
-				"/test/path/app.kt",
-				"/test/path/script.kts",
-			]
-
-			;(listFiles as Mock).mockResolvedValue([mockFiles, new Set()])
-
-			const mockParser = {
-				parse: vi.fn().mockReturnValue({
-					rootNode: "mockNode",
-				}),
-			}
-
-			const mockQuery = {
-				captures: vi.fn().mockReturnValue([
-					{
-						node: {
-							startPosition: { row: 0 },
-							endPosition: { row: 3 },
-							parent: {
-								startPosition: { row: 0 },
-								endPosition: { row: 3 },
-							},
-							text: () => "function test() {}",
-						},
-						name: "name",
-					},
-				]),
-			}
-
-			;(loadRequiredLanguageParsers as Mock).mockResolvedValue({
-				js: { parser: mockParser, query: mockQuery },
-				py: { parser: mockParser, query: mockQuery },
-				rs: { parser: mockParser, query: mockQuery },
-				cpp: { parser: mockParser, query: mockQuery },
-				go: { parser: mockParser, query: mockQuery },
-				kt: { parser: mockParser, query: mockQuery },
-				kts: { parser: mockParser, query: mockQuery },
-			})
-			;(fs.readFile as Mock).mockResolvedValue(Buffer.from("function test() {}"))
-
-			const result = await parseSourceCodeForDefinitionsTopLevel("/test/path")
-
-			expect(result).toContain("script.js")
-			expect(result).toContain("app.py")
-			expect(result).toContain("main.rs")
-			expect(result).toContain("program.cpp")
-			expect(result).toContain("code.go")
-			expect(result).toContain("app.kt")
-			expect(result).toContain("script.kts")
-		})
-
-		it("should normalize paths in output", async () => {
-			const mockFiles = ["/test/path/dir\\file.ts"]
-			;(listFiles as Mock).mockResolvedValue([mockFiles, new Set()])
-
-			const mockParser = {
-				parse: vi.fn().mockReturnValue({
-					rootNode: "mockNode",
-				}),
-			}
-
-			const mockQuery = {
-				captures: vi.fn().mockReturnValue([
-					{
-						node: {
-							startPosition: { row: 0 },
-							endPosition: { row: 3 },
-							parent: {
-								startPosition: { row: 0 },
-								endPosition: { row: 3 },
-							},
-							text: () => "class Test {}",
-						},
-						name: "name",
-					},
-				]),
-			}
-
-			;(loadRequiredLanguageParsers as Mock).mockResolvedValue({
-				ts: { parser: mockParser, query: mockQuery },
-			})
-			;(fs.readFile as Mock).mockResolvedValue(Buffer.from("class Test {}"))
-
-			const result = await parseSourceCodeForDefinitionsTopLevel("/test/path")
-
-			// Should use forward slashes regardless of platform
-			expect(result).toContain("dir/file.ts")
-			expect(result).not.toContain("dir\\file.ts")
-		})
-	})
-})
diff --git a/src/services/tree-sitter/index.ts b/src/services/tree-sitter/index.ts
index cfeabe8d24f..85bef04958e 100644
--- a/src/services/tree-sitter/index.ts
+++ b/src/services/tree-sitter/index.ts
@@ -1,6 +1,5 @@
 import * as fs from "fs/promises"
 import * as path from "path"
-import { listFiles } from "../glob/list-files"
 import { LanguageParser, loadRequiredLanguageParsers } from "./languageParser"
 import { fileExistsAtPath } from "../../utils/fs"
 import { parseMarkdown } from "./markdownParser"
@@ -150,89 +149,6 @@ export async function parseSourceCodeDefinitionsForFile(
 	return undefined
 }
 
-// TODO: implement caching behavior to avoid having to keep analyzing project for new tasks.
-export async function parseSourceCodeForDefinitionsTopLevel(
-	dirPath: string,
-	rooIgnoreController?: RooIgnoreController,
-): Promise<string> {
-	// check if the path exists
-	const dirExists = await fileExistsAtPath(path.resolve(dirPath))
-	if (!dirExists) {
-		return "This directory does not exist or you do not have permission to access it."
-	}
-
-	// Get all files at top level (not gitignored)
-	const [allFiles, _] = await listFiles(dirPath, false, 200)
-
-	let result = ""
-
-	// Separate files to parse and remaining files
-	const { filesToParse } = separateFiles(allFiles)
-
-	// Filter filepaths for access if controller is provided
-	const allowedFilesToParse = rooIgnoreController ? rooIgnoreController.filterPaths(filesToParse) : filesToParse
-
-	// Separate markdown files from other files
-	const markdownFiles: string[] = []
-	const otherFiles: string[] = []
-
-	for (const file of allowedFilesToParse) {
-		const ext = path.extname(file).toLowerCase()
-		if (ext === ".md" || ext === ".markdown") {
-			markdownFiles.push(file)
-		} else {
-			otherFiles.push(file)
-		}
-	}
-
-	// Load language parsers only for non-markdown files
-	const languageParsers = await loadRequiredLanguageParsers(otherFiles)
-
-	// Process markdown files
-	for (const file of markdownFiles) {
-		// Check if we have permission to access this file
-		if (rooIgnoreController && !rooIgnoreController.validateAccess(file)) {
-			continue
-		}
-
-		try {
-			// Read file content
-			const fileContent = await readFileWithEncodingDetection(file)
-
-			// Split the file content into individual lines
-			const lines = fileContent.split("\n")
-
-			// Parse markdown content to get captures
-			const markdownCaptures = parseMarkdown(fileContent)
-
-			// Process the captures
-			const markdownDefinitions = processCaptures(markdownCaptures, lines, "markdown")
-
-			if (markdownDefinitions) {
-				result += `# ${path.relative(dirPath, file).toPosix()}\n${markdownDefinitions}\n`
-			}
-		} catch (error) {
-			console.log(`Error parsing markdown file: ${error}\n`)
-		}
-	}
-
-	// Process other files using tree-sitter
-	for (const file of otherFiles) {
-		const definitions = await parseFile(file, languageParsers, rooIgnoreController)
-		if (definitions) {
-			result += `# ${path.relative(dirPath, file).toPosix()}\n${definitions}\n`
-		}
-	}
-
-	return result ? result : "No source code definitions found."
-}
-
-function separateFiles(allFiles: string[]): { filesToParse: string[]; remainingFiles: string[] } {
-	const filesToParse = allFiles.filter((file) => extensions.includes(path.extname(file))).slice(0, 50) // 50 files max
-	const remainingFiles = allFiles.filter((file) => !filesToParse.includes(file))
-	return { filesToParse, remainingFiles }
-}
-
 /*
 Parsing files using tree-sitter
 
diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts
index 1f96221688a..7f4e96cbbcf 100644
--- a/src/shared/ExtensionMessage.ts
+++ b/src/shared/ExtensionMessage.ts
@@ -321,6 +321,7 @@ export type ExtensionState = Pick<
 	| "includeTaskHistoryInEnhance"
 	| "reasoningBlockCollapsed"
 	| "errorCode"
+	| "enterBehavior"
 	| "includeCurrentTime"
 	| "includeCurrentCost"
 	| "maxGitStatusFiles"
@@ -406,7 +407,6 @@ export interface ClineSayTool {
 		| "fetchInstructions"
 		| "listFilesTopLevel"
 		| "listFilesRecursive"
-		| "listCodeDefinitionNames"
 		| "searchFiles"
 		| "switchMode"
 		| "newTask"
diff --git a/src/shared/ProfileValidator.ts b/src/shared/ProfileValidator.ts
index 78ff6ed9fe1..c8a2c243c00 100644
--- a/src/shared/ProfileValidator.ts
+++ b/src/shared/ProfileValidator.ts
@@ -82,8 +82,6 @@ export class ProfileValidator {
 				return profile.vsCodeLmModelSelector?.id
 			case "openrouter":
 				return profile.openRouterModelId
-			case "glama":
-				return profile.glamaModelId
 			case "ollama":
 				return profile.ollamaModelId
 			case "requesty":
diff --git a/src/shared/__tests__/ProfileValidator.spec.ts b/src/shared/__tests__/ProfileValidator.spec.ts
index 5cfe7a720bf..d604cd95234 100644
--- a/src/shared/__tests__/ProfileValidator.spec.ts
+++ b/src/shared/__tests__/ProfileValidator.spec.ts
@@ -306,21 +306,6 @@ describe("ProfileValidator", () => {
 			expect(ProfileValidator.isProfileAllowed(profile, allowList)).toBe(true)
 		})
 
-		it("should extract glamaModelId for glama provider", () => {
-			const allowList: OrganizationAllowList = {
-				allowAll: false,
-				providers: {
-					glama: { allowAll: false, models: ["glama-model"] },
-				},
-			}
-			const profile: ProviderSettings = {
-				apiProvider: "glama",
-				glamaModelId: "glama-model",
-			}
-
-			expect(ProfileValidator.isProfileAllowed(profile, allowList)).toBe(true)
-		})
-
 		it("should extract requestyModelId for requesty provider", () => {
 			const allowList: OrganizationAllowList = {
 				allowAll: false,
diff --git a/src/shared/__tests__/checkExistApiConfig.spec.ts b/src/shared/__tests__/checkExistApiConfig.spec.ts
index 7696f00cc0c..58ea3bccbbd 100644
--- a/src/shared/__tests__/checkExistApiConfig.spec.ts
+++ b/src/shared/__tests__/checkExistApiConfig.spec.ts
@@ -24,7 +24,6 @@ describe("checkExistKey", () => {
 	it("should return true when multiple keys are defined", () => {
 		const config: ProviderSettings = {
 			apiKey: "test-key",
-			glamaApiKey: "glama-key",
 			openRouterApiKey: "openrouter-key",
 		}
 		expect(checkExistKey(config)).toBe(true)
@@ -43,7 +42,6 @@ describe("checkExistKey", () => {
 	it("should return false when all key fields are undefined", () => {
 		const config: ProviderSettings = {
 			apiKey: undefined,
-			glamaApiKey: undefined,
 			openRouterApiKey: undefined,
 			awsRegion: undefined,
 			vertexProjectId: undefined,
diff --git a/src/shared/api.ts b/src/shared/api.ts
index 52292728546..7491f43a2aa 100644
--- a/src/shared/api.ts
+++ b/src/shared/api.ts
@@ -187,7 +187,6 @@ const dynamicProviderExtras = {
 	"io-intelligence": {} as { apiKey: string },
 	requesty: {} as { apiKey?: string; baseUrl?: string },
 	unbound: {} as { apiKey?: string },
-	glama: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
 	ollama: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
 	lmstudio: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
 	// roo: {} as { apiKey?: string; baseUrl?: string },
diff --git a/src/shared/tools.ts b/src/shared/tools.ts
index 86a9c27452f..e7b95d2a6c0 100644
--- a/src/shared/tools.ts
+++ b/src/shared/tools.ts
@@ -104,7 +104,6 @@ export type NativeToolArgs = {
 	codebase_search: { query: string; path?: string }
 	fetch_instructions: { task: string }
 	generate_image: GenerateImageParams
-	list_code_definition_names: { path: string }
 	run_slash_command: { command: string; args?: string }
 	search_files: { path: string; regex: string; file_pattern?: string | null }
 	switch_mode: { mode_slug: string; reason: string }
@@ -186,11 +185,6 @@ export interface ListFilesToolUse extends ToolUse<"list_files"> {
 	params: Partial<Pick<Record<ToolParamName, string>, "path" | "recursive">>
 }
 
-export interface ListCodeDefinitionNamesToolUse extends ToolUse<"list_code_definition_names"> {
-	name: "list_code_definition_names"
-	params: Partial<Pick<Record<ToolParamName, string>, "path">>
-}
-
 export interface BrowserActionToolUse extends ToolUse<"browser_action"> {
 	name: "browser_action"
 	params: Partial<Pick<Record<ToolParamName, string>, "action" | "url" | "coordinate" | "text" | "size" | "path">>
@@ -259,7 +253,6 @@ export const TOOL_DISPLAY_NAMES: Record<ToolName, string> = {
 	apply_patch: "apply patches using codex format",
 	search_files: "search files",
 	list_files: "list files",
-	list_code_definition_names: "list definitions",
 	browser_action: "use a browser",
 	use_mcp_tool: "use mcp tools",
 	access_mcp_resource: "access mcp resources",
@@ -278,13 +271,12 @@ export const TOOL_DISPLAY_NAMES: Record<ToolName, string> = {
 export const TOOL_GROUPS: Record<ToolGroup, ToolGroupConfig> = {
 	read: {
 		tools: [
+			"ask_multiple_choice",
 			"read_file",
 			"fetch_instructions",
 			"search_files",
 			"list_files",
-			"list_code_definition_names",
 			"codebase_search",
-			"ask_multiple_choice",
 		],
 	},
 	edit: {
@@ -309,6 +301,7 @@ export const TOOL_GROUPS: Record<ToolGroup, ToolGroupConfig> = {
 // Tools that are always available to all modes.
 export const ALWAYS_AVAILABLE_TOOLS: ToolName[] = [
 	"ask_followup_question",
+	"ask_multiple_choice",
 	"attempt_completion",
 	"switch_mode",
 	"new_task",
diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index 4d865c61e1b..9f8b7ece0c4 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -71,6 +71,7 @@ import {
 	FolderTree,
 	TerminalSquare,
 	MessageCircle,
+	Repeat2,
 } from "lucide-react"
 import { cn } from "@/lib/utils"
 import { getJumpLine } from "@/utils/path-mentions"
@@ -810,32 +811,6 @@ export const ChatRowContent = ({
 						</div>
 					</>
 				)
-			case "listCodeDefinitionNames":
-				return (
-					<>
-						<div style={headerStyle}>
-							{toolIcon("file-code")}
-							<span style={{ fontWeight: "bold" }}>
-								{message.type === "ask"
-									? tool.isOutsideWorkspace
-										? t("chat:directoryOperations.wantsToViewDefinitionsOutsideWorkspace")
-										: t("chat:directoryOperations.wantsToViewDefinitions")
-									: tool.isOutsideWorkspace
-										? t("chat:directoryOperations.didViewDefinitionsOutsideWorkspace")
-										: t("chat:directoryOperations.didViewDefinitions")}
-							</span>
-						</div>
-						<div className="pl-6">
-							<CodeAccordian
-								path={tool.path}
-								code={tool.content}
-								language="markdown"
-								isExpanded={isExpanded}
-								onToggleExpand={handleToggleExpand}
-							/>
-						</div>
-					</>
-				)
 			case "searchFiles":
 				return (
 					<>
@@ -1218,7 +1193,11 @@ export const ChatRowContent = ({
 									justifyContent: "space-between",
 								}}>
 								<div style={{ display: "flex", alignItems: "center", gap: "10px", flexGrow: 1 }}>
-									{isLast ? <ProgressIndicator /> : getIconSpan("arrow-swap", normalColor)}
+									{!apiRequestFailedMessage && !apiReqStreamingFailedMessage && isLast ? (
+										<ProgressIndicator />
+									) : (
+										getIconSpan("arrow-swap", normalColor)
+									)}
 									{title}
 									{(selectedLLM || originModelId) && !selectReason && (
 										<div
@@ -1258,43 +1237,25 @@ export const ChatRowContent = ({
 									type="api_failure"
 									apiConfiguration={apiConfiguration}
 									message={apiRequestFailedMessage || apiReqStreamingFailedMessage || ""}
+									docsURL={
+										apiRequestFailedMessage?.toLowerCase().includes("powershell")
+											? "https://github.com/cline/cline/wiki/TroubleShooting-%E2%80%90-%22PowerShell-is-not-recognized-as-an-internal-or-external-command%22"
+											: undefined
+									}
 									additionalContent={
-										apiRequestFailedMessage?.toLowerCase().includes("powershell") ? (
-											<>
-												<br />
-												<br />
-												{t("chat:powershell.issues")}{" "}
-												<a
-													href="https://github.com/cline/cline/wiki/TroubleShooting-%E2%80%90-%22PowerShell-is-not-recognized-as-an-internal-or-external-command%22"
-													style={{ color: "inherit", textDecoration: "underline" }}>
-													troubleshooting guide
-												</a>
-												.
-											</>
-										) : (
+										apiConfiguration.apiProvider === "zgsm" && (
 											<>
 												<br />
 												<br />
 												<Button
 													size="sm"
 													className="ml-6"
-													onClick={() =>
-														handleCopyErrorDetail(
-															apiRequestFailedMessage ||
-																apiReqStreamingFailedMessage ||
-																"",
-														)
-													}>
+													onClick={() => handleCopyErrorDetail(message.text || "")}>
 													{t("chat:copy.errorDetail")}
 												</Button>
 											</>
 										)
 									}
-									docsURL={
-										apiRequestFailedMessage?.toLowerCase().includes("powershell")
-											? "https://github.com/cline/cline/wiki/TroubleShooting-%E2%80%90-%22PowerShell-is-not-recognized-as-an-internal-or-external-command%22"
-											: undefined
-									}
 								/>
 							)}
 						</>
@@ -1302,11 +1263,11 @@ export const ChatRowContent = ({
 				}
 				case "api_req_retry_delayed":
 					let body = t(`chat:apiRequest.failed`)
-					let retryInfo, code, docsURL
+					let retryInfo, rawError, code, docsURL
 					if (message.text !== undefined) {
 						// Try to show richer error message for that code, if available
 						const potentialCode = parseInt(message.text.substring(0, 3))
-						if (potentialCode >= 400) {
+						if (!isNaN(potentialCode) && potentialCode >= 400) {
 							code = potentialCode
 							const stringForError = `chat:apiRequest.errorMessage.${code}`
 							if (i18n.exists(stringForError)) {
@@ -1322,15 +1283,30 @@ export const ChatRowContent = ({
 								body = t("chat:apiRequest.errorMessage.unknown")
 								docsURL = "mailto:zgsm@sangfor.com.cn?subject=Unknown API Error"
 							}
-							retryInfo = (
-								<p className="mt-1 font-light text-xs text-vscode-errorForeground/80 cursor-default">
-									{message.text.substring(4)}
-								</p>
-							)
+						} else if (message.text.indexOf("Connection error") === 0) {
+							body = t("chat:apiRequest.errorMessage.connection")
 						} else {
-							// Non-HTTP-status-code error message - display the actual error text
-							body = message.text
+							// Non-HTTP-status-code error message - store full text as errorDetails
+							body = t("chat:apiRequest.errorMessage.unknown")
+							docsURL = "mailto:zgsm@sangfor.com.cn?subject=Unknown API Error"
 						}
+
+						// This isn't pretty, but since the retry logic happens at a lower level
+						// and the message object is just a flat string, we need to extract the
+						// retry information using this "tag" as a convention
+						const retryTimerMatch = message.text.match(/<retry_timer>(.*?)<\/retry_timer>/)
+						const retryTimer = retryTimerMatch && retryTimerMatch[1] ? parseInt(retryTimerMatch[1], 10) : 0
+						rawError = message.text.replace(/<retry_timer>(.*?)<\/retry_timer>/, "").trim()
+						retryInfo = retryTimer > 0 && (
+							<p
+								className={cn(
+									"mt-2 font-light text-xs  text-vscode-descriptionForeground cursor-default flex items-center gap-1 transition-all duration-1000",
+									retryTimer === 0 ? "opacity-0 max-h-0" : "max-h-2 opacity-100",
+								)}>
+								<Repeat2 className="size-3" strokeWidth={1.5} />
+								<span>{retryTimer}s</span>
+							</p>
+						)
 					}
 					return (
 						<ErrorRow
@@ -1339,6 +1315,7 @@ export const ChatRowContent = ({
 							code={code}
 							message={apiConfiguration.apiProvider === "zgsm" ? message.text || "" : body}
 							docsURL={docsURL}
+							errorDetails={rawError}
 							additionalContent={
 								!message?.metadata?.isRateLimit &&
 								!message?.metadata?.isRateLimitRetry &&
@@ -1510,7 +1487,17 @@ export const ChatRowContent = ({
 						</div>
 					)
 				case "error":
-					return <ErrorRow type="error" message={message.text || ""} apiConfiguration={apiConfiguration} />
+					{
+						/* return <ErrorRow type="error" message={message.text || ""} apiConfiguration={apiConfiguration} /> */
+					}
+					return (
+						<ErrorRow
+							type="error"
+							message={t("chat:error")}
+							errorDetails={message.text || undefined}
+							apiConfiguration={apiConfiguration}
+						/>
+					)
 				case "completion_result":
 					return (
 						<>
diff --git a/webview-ui/src/components/chat/ChatTextArea.tsx b/webview-ui/src/components/chat/ChatTextArea.tsx
index e608b50ad37..35b62728336 100644
--- a/webview-ui/src/components/chat/ChatTextArea.tsx
+++ b/webview-ui/src/components/chat/ChatTextArea.tsx
@@ -108,6 +108,7 @@ export const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 			organizationAllowList,
 			// cloudUserInfo,
 			// cloudOrganizations,
+			enterBehavior,
 		} = useExtensionState()
 
 		const selectedProviderModels = useMemo(() => {
@@ -307,6 +308,17 @@ export const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 			return inputValue.trim().length > 0 || selectedImages.length > 0
 		}, [inputValue, selectedImages])
 
+		// Compute the key combination text for the send button tooltip based on enterBehavior
+		const sendKeyCombination = useMemo(() => {
+			if (enterBehavior === "newline") {
+				// When Enter = newline, Ctrl/Cmd+Enter sends
+				const isMac = navigator.platform.toUpperCase().indexOf("MAC") >= 0
+				return isMac ? "⌘+Enter" : "Ctrl+Enter"
+			}
+			// Default: Enter sends
+			return "Enter"
+		}, [enterBehavior])
+
 		const queryItems = useMemo(() => {
 			return [
 				{ type: ContextMenuOptionType.Problems, value: "problems" },
@@ -523,12 +535,24 @@ export const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 					return
 				}
 
-				if (event.key === "Enter" && !event.shiftKey && !isComposing) {
-					event.preventDefault()
-
-					// Always call onSend - let ChatView handle queueing when disabled
-					resetHistoryNavigation()
-					onSend()
+				// Handle Enter key based on enterBehavior setting
+				if (event.key === "Enter" && !isComposing) {
+					if (enterBehavior === "newline") {
+						// New behavior: Enter = newline, Shift+Enter or Ctrl+Enter = send
+						if (event.shiftKey || event.ctrlKey || event.metaKey) {
+							event.preventDefault()
+							resetHistoryNavigation()
+							onSend()
+						}
+						// Otherwise, let Enter create newline (don't preventDefault)
+					} else {
+						// Default behavior: Enter = send, Shift+Enter = newline
+						if (!event.shiftKey) {
+							event.preventDefault()
+							resetHistoryNavigation()
+							onSend()
+						}
+					}
 				}
 
 				if (event.key === "Backspace" && !isComposing) {
@@ -592,6 +616,7 @@ export const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 				handleHistoryNavigation,
 				resetHistoryNavigation,
 				commands,
+				enterBehavior,
 			],
 		)
 
@@ -1286,9 +1311,10 @@ export const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 										<Image className="w-4 h-4" />
 									</button>
 								</StandardTooltip>
-								<StandardTooltip content={t("chat:sendMessage")}>
+								<StandardTooltip
+									content={t("chat:pressToSend", { keyCombination: sendKeyCombination })}>
 									<button
-										aria-label={t("chat:sendMessage")}
+										aria-label={t("chat:pressToSend", { keyCombination: sendKeyCombination })}
 										disabled={!hasInputContent}
 										onClick={onSend}
 										className={cn(
diff --git a/webview-ui/src/components/chat/ErrorRow.tsx b/webview-ui/src/components/chat/ErrorRow.tsx
index abc3d364784..ee6356bad70 100644
--- a/webview-ui/src/components/chat/ErrorRow.tsx
+++ b/webview-ui/src/components/chat/ErrorRow.tsx
@@ -1,11 +1,13 @@
 import React, { useState, useCallback, memo } from "react"
 import { useTranslation } from "react-i18next"
 import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"
-import { BookOpenText, MessageCircleWarning } from "lucide-react"
+import { BookOpenText, MessageCircleWarning, Info, Copy, Check } from "lucide-react"
 import { useCopyToClipboard } from "@src/utils/clipboard"
 import { vscode } from "@src/utils/vscode"
 import CodeBlock from "../common/CodeBlock"
 import { ProviderSettings } from "@roo-code/types"
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from "@src/components/ui/dialog"
+import { Button, Tooltip, TooltipContent, TooltipTrigger } from "../ui"
 
 /**
  * Unified error display component for all error types in the chat.
@@ -63,7 +65,8 @@ export interface ErrorRowProps {
 	headerClassName?: string
 	messageClassName?: string
 	code?: number
-	docsURL?: string // NEW: Optional documentation link
+	docsURL?: string // Optional documentation link
+	errorDetails?: string // Optional detailed error message shown in modal
 }
 
 /**
@@ -81,13 +84,15 @@ export const ErrorRow = memo(
 		additionalContent,
 		headerClassName,
 		messageClassName,
-		// docsURL,
 		docsURL,
 		code,
+		errorDetails,
 	}: ErrorRowProps) => {
 		const { t } = useTranslation()
 		const [isExpanded, setIsExpanded] = useState(defaultExpanded)
 		const [showCopySuccess, setShowCopySuccess] = useState(false)
+		const [isDetailsDialogOpen, setIsDetailsDialogOpen] = useState(false)
+		const [showDetailsCopySuccess, setShowDetailsCopySuccess] = useState(false)
 		const { copyWithFeedback } = useCopyToClipboard()
 
 		// Default titles for different error types
@@ -134,6 +139,22 @@ export const ErrorRow = memo(
 			[message, copyWithFeedback],
 		)
 
+		const handleCopyDetails = useCallback(
+			async (e: React.MouseEvent) => {
+				e.stopPropagation()
+				if (errorDetails) {
+					const success = await copyWithFeedback(errorDetails)
+					if (success) {
+						setShowDetailsCopySuccess(true)
+						setTimeout(() => {
+							setShowDetailsCopySuccess(false)
+						}, 1000)
+					}
+				}
+			},
+			[errorDetails, copyWithFeedback],
+		)
+
 		const errorTitle = getDefaultTitle()
 
 		// For diff_error type with expandable content
@@ -172,38 +193,107 @@ export const ErrorRow = memo(
 
 		// Standard error display
 		return (
-			<div className="group pr-2">
-				{errorTitle && (
-					<div className={headerClassName || "flex items-center justify-between gap-2 break-words"}>
-						<MessageCircleWarning className="w-4 opacity-80" />
-						<span className="opacity-80 font-bold grow cursor-default">{errorTitle}</span>
-						{docsURL && (
-							<a
-								href={docsURL}
-								className="text-sm flex items-center gap-1 transition-opacity opacity-0 group-hover:opacity-100"
-								onClick={(e) => {
-									e.preventDefault()
-									vscode.postMessage({ type: "openExternal", url: docsURL })
-								}}>
-								<BookOpenText className="size-3 mt-[3px]" />
-								{t("chat:apiRequest.errorMessage.docs")}
-							</a>
-						)}
+			<>
+				<div className="group pr-2">
+					{errorTitle && (
+						<div className={headerClassName || "flex items-center justify-between gap-2 break-words"}>
+							<MessageCircleWarning
+								className={`w-4 ${apiConfiguration.apiProvider !== "zgsm" ? "text-vscode-errorForeground" : "opacity-80"}`}
+							/>
+							<span
+								className={
+									apiConfiguration.apiProvider !== "zgsm"
+										? "font-bold grow cursor-default"
+										: "opacity-80 font-bold grow cursor-default"
+								}>
+								{errorTitle}
+							</span>
+							<div className="flex items-center gap-2">
+								{apiConfiguration.apiProvider !== "zgsm" && docsURL && (
+									<a
+										href={docsURL}
+										className="text-sm flex items-center gap-1 transition-opacity opacity-0 group-hover:opacity-100"
+										onClick={(e) => {
+											e.preventDefault()
+											vscode.postMessage({ type: "openExternal", url: docsURL })
+										}}>
+										<BookOpenText className="size-3 mt-[3px]" />
+										{t("chat:apiRequest.errorMessage.docs")}
+									</a>
+								)}
+								{apiConfiguration.apiProvider !== "zgsm" && errorDetails && (
+									<Tooltip>
+										<TooltipTrigger asChild>
+											<button
+												onClick={() => setIsDetailsDialogOpen(true)}
+												className="transition-opacity opacity-0 group-hover:opacity-100 cursor-pointer"
+												aria-label={t("chat:errorDetails.title")}>
+												<Info className="size-4" />
+											</button>
+										</TooltipTrigger>
+										<TooltipContent>{t("chat:errorDetails.title")}</TooltipContent>
+									</Tooltip>
+								)}
+							</div>
+						</div>
+					)}
+					<div
+						className={
+							apiConfiguration.apiProvider !== "zgsm"
+								? "ml-2 pl-4 mt-1 pt-1 border-l border-vscode-errorForeground/50"
+								: ""
+						}>
+						<p
+							className={
+								messageClassName ||
+								(apiConfiguration.apiProvider !== "zgsm"
+									? "my-0 font-light whitespace-pre-wrap break-words text-vscode-descriptionForeground"
+									: "ml-6 my-0 whitespace-pre-wrap break-words opacity-80")
+							}
+							dangerouslySetInnerHTML={
+								apiConfiguration.apiProvider !== "zgsm"
+									? undefined
+									: {
+											__html: message,
+										}
+							}>
+							{apiConfiguration.apiProvider !== "zgsm" ? message : null}
+						</p>
+						{additionalContent}
 					</div>
+				</div>
+
+				{/* Error Details Dialog */}
+				{apiConfiguration.apiProvider !== "zgsm" && errorDetails && (
+					<Dialog open={isDetailsDialogOpen} onOpenChange={setIsDetailsDialogOpen}>
+						<DialogContent className="max-w-2xl">
+							<DialogHeader>
+								<DialogTitle>{t("chat:errorDetails.title")}</DialogTitle>
+							</DialogHeader>
+							<div className="max-h-96 overflow-auto px-3 bg-vscode-editor-background rounded-xl border border-vscode-editorGroup-border">
+								<pre className="font-mono text-sm whitespace-pre-wrap break-words bg-transparent">
+									{errorDetails}
+								</pre>
+							</div>
+							<DialogFooter>
+								<Button variant="secondary" onClick={handleCopyDetails}>
+									{showDetailsCopySuccess ? (
+										<>
+											<Check className="size-3" />
+											{t("chat:errorDetails.copied")}
+										</>
+									) : (
+										<>
+											<Copy className="size-3" />
+											{t("chat:errorDetails.copyToClipboard")}
+										</>
+									)}
+								</Button>
+							</DialogFooter>
+						</DialogContent>
+					</Dialog>
 				)}
-				{apiConfiguration.apiProvider !== "zgsm" ? (
-					<p className={messageClassName || "ml-6 my-0 whitespace-pre-wrap break-words opacity-80"}>
-						{message}
-					</p>
-				) : (
-					<p
-						className={messageClassName || "ml-6 my-0 whitespace-pre-wrap break-words opacity-80"}
-						dangerouslySetInnerHTML={{
-							__html: message,
-						}}></p>
-				)}
-				{additionalContent}
-			</div>
+			</>
 		)
 	},
 )
diff --git a/webview-ui/src/components/chat/TodoChangeDisplay.tsx b/webview-ui/src/components/chat/TodoChangeDisplay.tsx
index 71d84a7a8b3..3904cd9c9ff 100644
--- a/webview-ui/src/components/chat/TodoChangeDisplay.tsx
+++ b/webview-ui/src/components/chat/TodoChangeDisplay.tsx
@@ -1,4 +1,3 @@
-import { cn } from "@/lib/utils"
 import { t } from "i18next"
 import { ArrowRight, Check, ListChecks, SquareDashed } from "lucide-react"
 
@@ -15,13 +14,6 @@ interface TodoChangeDisplayProps {
 	newTodos: TodoItem[]
 }
 
-interface TodoGroup {
-	todos: TodoItem[]
-	status: TodoStatus | null
-	keyPrefix: string
-	className?: string
-}
-
 function getTodoIcon(status: TodoStatus | null) {
 	switch (status) {
 		case "completed":
@@ -33,86 +25,32 @@ function getTodoIcon(status: TodoStatus | null) {
 	}
 }
 
-function TodoList({ todos, status, keyPrefix, className }: TodoGroup) {
-	if (todos.length === 0) return null
-
-	return (
-		<ul className="list-none space-y-1 my-1">
-			{todos.map((todo) => {
-				const icon = getTodoIcon(status)
-				return (
-					<li
-						key={`${keyPrefix}-${todo.id || todo.content}`}
-						className={cn(
-							`flex flex-row gap-2 items-start ${className || ""}`,
-							todo.status === "completed" ? "text-vscode-charts-green" : "",
-						)}>
-						{icon}
-						<span className={cn(todo.status === "completed" ? "line-through" : "")}>{todo.content}</span>
-					</li>
-				)
-			})}
-		</ul>
-	)
-}
-
 export function TodoChangeDisplay({ previousTodos, newTodos }: TodoChangeDisplayProps) {
 	const isInitialState = previousTodos.length === 0
 
 	// Determine which todos to display
-	let todoGroups: TodoGroup[]
+	let todosToDisplay: TodoItem[]
 
 	if (isInitialState && newTodos.length > 0) {
-		// For initial state, show all todos grouped by status
-		todoGroups = [
-			{
-				todos: newTodos.filter((todo) => !todo.status || todo.status === "pending"),
-				status: null,
-				keyPrefix: "pending",
-			},
-			{
-				todos: newTodos.filter((todo) => todo.status === "in_progress"),
-				status: "in_progress",
-				keyPrefix: "in-progress",
-				className: "text-vscode-charts-yellow",
-			},
-			{
-				todos: newTodos.filter((todo) => todo.status === "completed"),
-				status: "completed",
-				keyPrefix: "completed",
-			},
-		]
+		// For initial state, show all todos in their original order
+		todosToDisplay = newTodos
 	} else {
-		// For updates, only show changes
-		const completedTodos = newTodos.filter((newTodo) => {
-			if (newTodo.status !== "completed") return false
-			const previousTodo = previousTodos.find((p) => p.id === newTodo.id || p.content === newTodo.content)
-			return !previousTodo || previousTodo.status !== "completed"
+		// For updates, only show changes (completed or started) in their original order
+		todosToDisplay = newTodos.filter((newTodo) => {
+			if (newTodo.status === "completed") {
+				const previousTodo = previousTodos.find((p) => p.id === newTodo.id || p.content === newTodo.content)
+				return !previousTodo || previousTodo.status !== "completed"
+			}
+			if (newTodo.status === "in_progress") {
+				const previousTodo = previousTodos.find((p) => p.id === newTodo.id || p.content === newTodo.content)
+				return !previousTodo || previousTodo.status !== "in_progress"
+			}
+			return false
 		})
-
-		const startedTodos = newTodos.filter((newTodo) => {
-			if (newTodo.status !== "in_progress") return false
-			const previousTodo = previousTodos.find((p) => p.id === newTodo.id || p.content === newTodo.content)
-			return !previousTodo || previousTodo.status !== "in_progress"
-		})
-
-		todoGroups = [
-			{
-				todos: completedTodos,
-				status: "completed",
-				keyPrefix: "completed",
-			},
-			{
-				todos: startedTodos,
-				status: "in_progress",
-				keyPrefix: "started",
-				className: "text-vscode-charts-yellow",
-			},
-		]
 	}
 
 	// If no todos to display, don't render anything
-	if (todoGroups.every((group) => group.todos.length === 0)) {
+	if (todosToDisplay.length === 0) {
 		return null
 	}
 
@@ -126,9 +64,22 @@ export function TodoChangeDisplay({ previousTodos, newTodos }: TodoChangeDisplay
 			</div>
 
 			<div className="pl-1 pr-1 pt-1 font-light leading-normal">
-				{todoGroups.map((group, index) => (
-					<TodoList key={index} {...group} />
-				))}
+				<ul className="list-none space-y-1 my-1">
+					{todosToDisplay.map((todo) => {
+						const status = (todo.status || "pending") as TodoStatus
+						const icon = getTodoIcon(status)
+						return (
+							<li
+								key={todo.id || todo.content}
+								className={`flex flex-row gap-2 items-start ${
+									status === "in_progress" ? "text-vscode-charts-yellow" : ""
+								}`}>
+								{icon}
+								<span>{todo.content}</span>
+							</li>
+						)
+					})}
+				</ul>
 			</div>
 		</div>
 	)
diff --git a/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx b/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
index 9dea72a71ec..190b9363b97 100644
--- a/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
+++ b/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
@@ -1115,6 +1115,72 @@ describe("ChatTextArea", () => {
 			//                   apiConfigDropdown.classList.contains("opacity-50")
 			// expect(isDisabled).toBe(true)
 		})
+
+		describe("enter key behavior", () => {
+			it("should send on Enter and allow newline on Shift+Enter in default mode", () => {
+				const onSend = vi.fn()
+
+				;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
+					filePaths: [],
+					openedTabs: [],
+					taskHistory: [],
+					cwd: "/test/workspace",
+				})
+
+				const { container } = render(<ChatTextArea {...defaultProps} onSend={onSend} />)
+
+				const textarea = container.querySelector("textarea")!
+
+				fireEvent.keyDown(textarea, { key: "Enter" })
+				expect(onSend).toHaveBeenCalledTimes(1)
+
+				const shiftEnterEvent = new KeyboardEvent("keydown", { key: "Enter", shiftKey: true, bubbles: true })
+				fireEvent(textarea, shiftEnterEvent)
+				expect(onSend).toHaveBeenCalledTimes(1)
+				expect(shiftEnterEvent.defaultPrevented).toBe(false)
+			})
+
+			it("should treat Ctrl/Cmd/Shift+Enter as send and plain Enter as newline in newline mode", () => {
+				const onSend = vi.fn()
+
+				;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
+					filePaths: [],
+					openedTabs: [],
+					taskHistory: [],
+					cwd: "/test/workspace",
+					enterBehavior: "newline",
+				})
+
+				const { container } = render(<ChatTextArea {...defaultProps} onSend={onSend} />)
+
+				const textarea = container.querySelector("textarea")!
+
+				const plainEnterEvent = new KeyboardEvent("keydown", { key: "Enter", bubbles: true, cancelable: true })
+				fireEvent(textarea, plainEnterEvent)
+				expect(onSend).not.toHaveBeenCalled()
+				expect(plainEnterEvent.defaultPrevented).toBe(false)
+
+				const ctrlEnterEvent = new KeyboardEvent("keydown", {
+					key: "Enter",
+					ctrlKey: true,
+					bubbles: true,
+					cancelable: true,
+				})
+				fireEvent(textarea, ctrlEnterEvent)
+				expect(onSend).toHaveBeenCalledTimes(1)
+				expect(ctrlEnterEvent.defaultPrevented).toBe(true)
+
+				const shiftEnterEvent = new KeyboardEvent("keydown", {
+					key: "Enter",
+					shiftKey: true,
+					bubbles: true,
+					cancelable: true,
+				})
+				fireEvent(textarea, shiftEnterEvent)
+				expect(onSend).toHaveBeenCalledTimes(2)
+				expect(shiftEnterEvent.defaultPrevented).toBe(true)
+			})
+		})
 	})
 
 	describe("send button visibility", () => {
diff --git a/webview-ui/src/components/settings/About.tsx b/webview-ui/src/components/settings/About.tsx
index 0397eff61a8..c766ba61eb0 100644
--- a/webview-ui/src/components/settings/About.tsx
+++ b/webview-ui/src/components/settings/About.tsx
@@ -105,7 +105,7 @@ export const About = ({ telemetrySetting, setTelemetrySetting, className, ...pro
 						<MessageCircle className="size-4 text-vscode-descriptionForeground shrink-0" />
 						<span>
 							{t("settings:about.contact.label")}{" "}
-							<VSCodeLink href="mailto:support@roocode.com">zgsm@sangfor.com.cn</VSCodeLink>
+							<VSCodeLink href="mailto:zgsm@sangfor.com.cn">zgsm@sangfor.com.cn</VSCodeLink>
 						</span>
 					</div>
 					<div className="flex items-start gap-2">
diff --git a/webview-ui/src/components/settings/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx
index 20ca18fd89f..6c4098185fc 100644
--- a/webview-ui/src/components/settings/ApiOptions.tsx
+++ b/webview-ui/src/components/settings/ApiOptions.tsx
@@ -10,7 +10,6 @@ import {
 	DEFAULT_CONSECUTIVE_MISTAKE_LIMIT,
 	openRouterDefaultModelId,
 	requestyDefaultModelId,
-	glamaDefaultModelId,
 	unboundDefaultModelId,
 	litellmDefaultModelId,
 	openAiNativeDefaultModelId,
@@ -79,7 +78,6 @@ import {
 	DeepSeek,
 	Doubao,
 	Gemini,
-	Glama,
 	Groq,
 	HuggingFace,
 	IOIntelligence,
@@ -331,7 +329,7 @@ const ApiOptions = ({
 
 			// It would be much easier to have a single attribute that stores
 			// the modelId, but we have a separate attribute for each of
-			// OpenRouter, Glama, Unbound, and Requesty.
+			// OpenRouter, Unbound, and Requesty.
 			// If you switch to one of these providers and the corresponding
 			// modelId is not set then you immediately end up in an error state.
 			// To address that we set the modelId to the default value for th
@@ -365,7 +363,6 @@ const ApiOptions = ({
 			> = {
 				deepinfra: { field: "deepInfraModelId", default: deepInfraDefaultModelId },
 				openrouter: { field: "openRouterModelId", default: openRouterDefaultModelId },
-				glama: { field: "glamaModelId", default: glamaDefaultModelId },
 				unbound: { field: "unboundModelId", default: unboundDefaultModelId },
 				requesty: { field: "requestyModelId", default: requestyDefaultModelId },
 				litellm: { field: "litellmModelId", default: litellmDefaultModelId },
@@ -605,18 +602,6 @@ const ApiOptions = ({
 				/>
 			)}
 
-			{selectedProvider === "glama" && (
-				<Glama
-					apiConfiguration={apiConfiguration}
-					setApiConfigurationField={setApiConfigurationField}
-					routerModels={routerModels}
-					uriScheme={uriScheme}
-					organizationAllowList={organizationAllowList}
-					modelValidationError={modelValidationError}
-					simplifySettings={fromWelcomeView}
-				/>
-			)}
-
 			{selectedProvider === "unbound" && (
 				<Unbound
 					apiConfiguration={apiConfiguration}
diff --git a/webview-ui/src/components/settings/ModelPicker.tsx b/webview-ui/src/components/settings/ModelPicker.tsx
index 7089c17cf1b..db10e78fba4 100644
--- a/webview-ui/src/components/settings/ModelPicker.tsx
+++ b/webview-ui/src/components/settings/ModelPicker.tsx
@@ -29,7 +29,6 @@ import { ApiErrorMessage } from "./ApiErrorMessage"
 
 type ModelIdKey = keyof Pick<
 	ProviderSettings,
-	| "glamaModelId"
 	| "openRouterModelId"
 	| "unboundModelId"
 	| "requestyModelId"
diff --git a/webview-ui/src/components/settings/ProviderRenderer.tsx b/webview-ui/src/components/settings/ProviderRenderer.tsx
index 99e75782e6b..a65df3960de 100644
--- a/webview-ui/src/components/settings/ProviderRenderer.tsx
+++ b/webview-ui/src/components/settings/ProviderRenderer.tsx
@@ -8,7 +8,6 @@ import {
 	zgsmDefaultModelId,
 	openRouterDefaultModelId,
 	requestyDefaultModelId,
-	glamaDefaultModelId,
 	unboundDefaultModelId,
 	litellmDefaultModelId,
 	openAiModelInfoSaneDefaults,
@@ -174,13 +173,6 @@ const ProviderRenderer: React.FC<ProviderRendererProps> = ({
 			serviceUrl: "https://requesty.ai",
 			models: routerModels?.requesty ?? {},
 		},
-		glama: {
-			modelIdKey: "glamaModelId",
-			serviceName: "Glama",
-			defaultModelId: glamaDefaultModelId,
-			serviceUrl: "https://glama.ai/models",
-			models: routerModels?.glama ?? {},
-		},
 		unbound: {
 			modelIdKey: "unboundModelId",
 			serviceName: "Unbound",
diff --git a/webview-ui/src/components/settings/SettingsView.tsx b/webview-ui/src/components/settings/SettingsView.tsx
index 81b5bce5ae2..49acd825d17 100644
--- a/webview-ui/src/components/settings/SettingsView.tsx
+++ b/webview-ui/src/components/settings/SettingsView.tsx
@@ -217,6 +217,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 		openRouterImageApiKey,
 		openRouterImageGenerationSelectedModel,
 		reasoningBlockCollapsed,
+		enterBehavior,
 		includeCurrentTime,
 		includeCurrentCost,
 		maxGitStatusFiles,
@@ -418,6 +419,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 					condensingApiConfigId: condensingApiConfigId || "",
 					includeTaskHistoryInEnhance: includeTaskHistoryInEnhance ?? true,
 					reasoningBlockCollapsed: reasoningBlockCollapsed ?? true,
+					enterBehavior: enterBehavior ?? "send",
 					includeCurrentTime: includeCurrentTime ?? true,
 					includeCurrentCost: includeCurrentCost ?? true,
 					maxGitStatusFiles: maxGitStatusFiles ?? 0,
@@ -883,6 +885,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 					{activeTab === "ui" && (
 						<UISettings
 							reasoningBlockCollapsed={reasoningBlockCollapsed ?? true}
+							enterBehavior={enterBehavior ?? "send"}
 							setCachedStateField={setCachedStateField}
 						/>
 					)}
diff --git a/webview-ui/src/components/settings/UISettings.tsx b/webview-ui/src/components/settings/UISettings.tsx
index 2de16e68822..b4e5a4e861a 100644
--- a/webview-ui/src/components/settings/UISettings.tsx
+++ b/webview-ui/src/components/settings/UISettings.tsx
@@ -1,4 +1,4 @@
-import { HTMLAttributes } from "react"
+import { HTMLAttributes, useMemo } from "react"
 import { useAppTranslation } from "@/i18n/TranslationContext"
 import { VSCodeCheckbox } from "@vscode/webview-ui-toolkit/react"
 import { Glasses } from "lucide-react"
@@ -11,12 +11,24 @@ import { ExtensionStateContextType } from "@/context/ExtensionStateContext"
 
 interface UISettingsProps extends HTMLAttributes<HTMLDivElement> {
 	reasoningBlockCollapsed: boolean
+	enterBehavior: "send" | "newline"
 	setCachedStateField: SetCachedStateField<keyof ExtensionStateContextType>
 }
 
-export const UISettings = ({ reasoningBlockCollapsed, setCachedStateField, ...props }: UISettingsProps) => {
+export const UISettings = ({
+	reasoningBlockCollapsed,
+	enterBehavior,
+	setCachedStateField,
+	...props
+}: UISettingsProps) => {
 	const { t } = useAppTranslation()
 
+	// Detect platform for dynamic modifier key display
+	const primaryMod = useMemo(() => {
+		const isMac = navigator.platform.toUpperCase().indexOf("MAC") >= 0
+		return isMac ? "⌘" : "Ctrl"
+	}, [])
+
 	const handleReasoningBlockCollapsedChange = (value: boolean) => {
 		setCachedStateField("reasoningBlockCollapsed", value)
 
@@ -26,6 +38,16 @@ export const UISettings = ({ reasoningBlockCollapsed, setCachedStateField, ...pr
 		})
 	}
 
+	const handleEnterBehaviorChange = (requireCtrlEnter: boolean) => {
+		const newBehavior = requireCtrlEnter ? "newline" : "send"
+		setCachedStateField("enterBehavior", newBehavior)
+
+		// Track telemetry event
+		telemetryClient.capture("ui_settings_enter_behavior_changed", {
+			behavior: newBehavior,
+		})
+	}
+
 	return (
 		<div {...props}>
 			<SectionHeader>
@@ -49,6 +71,21 @@ export const UISettings = ({ reasoningBlockCollapsed, setCachedStateField, ...pr
 							{t("settings:ui.collapseThinking.description")}
 						</div>
 					</div>
+
+					{/* Enter Key Behavior Setting */}
+					<div className="flex flex-col gap-1">
+						<VSCodeCheckbox
+							checked={enterBehavior === "newline"}
+							onChange={(e: any) => handleEnterBehaviorChange(e.target.checked)}
+							data-testid="enter-behavior-checkbox">
+							<span className="font-medium">
+								{t("settings:ui.requireCtrlEnterToSend.label", { primaryMod })}
+							</span>
+						</VSCodeCheckbox>
+						<div className="text-vscode-descriptionForeground text-sm ml-5 mt-1">
+							{t("settings:ui.requireCtrlEnterToSend.description", { primaryMod })}
+						</div>
+					</div>
 				</div>
 			</Section>
 		</div>
diff --git a/webview-ui/src/components/settings/__tests__/ApiOptions.provider-filtering.spec.tsx b/webview-ui/src/components/settings/__tests__/ApiOptions.provider-filtering.spec.tsx
index da2161267e8..51256c26033 100644
--- a/webview-ui/src/components/settings/__tests__/ApiOptions.provider-filtering.spec.tsx
+++ b/webview-ui/src/components/settings/__tests__/ApiOptions.provider-filtering.spec.tsx
@@ -166,7 +166,6 @@ describe("ApiOptions Provider Filtering", () => {
 		expect(providerValues).toContain("ollama")
 		expect(providerValues).toContain("lmstudio")
 		expect(providerValues).toContain("litellm")
-		expect(providerValues).toContain("glama")
 		expect(providerValues).toContain("unbound")
 		expect(providerValues).toContain("requesty")
 		expect(providerValues).toContain("io-intelligence")
diff --git a/webview-ui/src/components/settings/__tests__/ModelPicker.spec.tsx b/webview-ui/src/components/settings/__tests__/ModelPicker.spec.tsx
index 05cb871a960..081a0a94b99 100644
--- a/webview-ui/src/components/settings/__tests__/ModelPicker.spec.tsx
+++ b/webview-ui/src/components/settings/__tests__/ModelPicker.spec.tsx
@@ -36,7 +36,7 @@ describe("ModelPicker", () => {
 	const defaultProps = {
 		apiConfiguration: {},
 		defaultModelId: "model1",
-		modelIdKey: "glamaModelId" as const,
+		modelIdKey: "openRouterModelId" as const,
 		serviceName: "Test Service",
 		serviceUrl: "https://test.service",
 		recommendedModel: "recommended-model",
diff --git a/webview-ui/src/components/settings/__tests__/UISettings.spec.tsx b/webview-ui/src/components/settings/__tests__/UISettings.spec.tsx
index 43bb013a08f..2a21a410b38 100644
--- a/webview-ui/src/components/settings/__tests__/UISettings.spec.tsx
+++ b/webview-ui/src/components/settings/__tests__/UISettings.spec.tsx
@@ -5,6 +5,7 @@ import { UISettings } from "../UISettings"
 describe("UISettings", () => {
 	const defaultProps = {
 		reasoningBlockCollapsed: false,
+		enterBehavior: "send" as const,
 		setCachedStateField: vi.fn(),
 	}
 
diff --git a/webview-ui/src/components/settings/constants.ts b/webview-ui/src/components/settings/constants.ts
index c7bc05854e9..69fe0812f2f 100644
--- a/webview-ui/src/components/settings/constants.ts
+++ b/webview-ui/src/components/settings/constants.ts
@@ -65,7 +65,6 @@ export const PROVIDERS = [
 	{ value: "qwen-code", label: "Qwen Code" },
 	{ value: "vertex", label: "GCP Vertex AI" },
 	{ value: "bedrock", label: "Amazon Bedrock" },
-	{ value: "glama", label: "Glama" },
 	{ value: "vscode-lm", label: "VS Code LM API" },
 	{ value: "mistral", label: "Mistral" },
 	{ value: "lmstudio", label: "LM Studio" },
diff --git a/webview-ui/src/components/settings/providers/Glama.tsx b/webview-ui/src/components/settings/providers/Glama.tsx
deleted file mode 100644
index 36b13a4a6d6..00000000000
--- a/webview-ui/src/components/settings/providers/Glama.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { useCallback } from "react"
-import { VSCodeTextField } from "@vscode/webview-ui-toolkit/react"
-
-import { type ProviderSettings, type OrganizationAllowList, glamaDefaultModelId } from "@roo-code/types"
-
-import type { RouterModels } from "@roo/api"
-
-import { useAppTranslation } from "@src/i18n/TranslationContext"
-import { getGlamaAuthUrl } from "@src/oauth/urls"
-import { VSCodeButtonLink } from "@src/components/common/VSCodeButtonLink"
-
-import { inputEventTransform } from "../transforms"
-import { ModelPicker } from "../ModelPicker"
-
-type GlamaProps = {
-	apiConfiguration: ProviderSettings
-	setApiConfigurationField: (field: keyof ProviderSettings, value: ProviderSettings[keyof ProviderSettings]) => void
-	routerModels?: RouterModels
-	uriScheme?: string
-	organizationAllowList: OrganizationAllowList
-	modelValidationError?: string
-	simplifySettings?: boolean
-}
-
-export const Glama = ({
-	apiConfiguration,
-	setApiConfigurationField,
-	routerModels,
-	uriScheme,
-	organizationAllowList,
-	modelValidationError,
-	simplifySettings,
-}: GlamaProps) => {
-	const { t } = useAppTranslation()
-
-	const handleInputChange = useCallback(
-		<K extends keyof ProviderSettings, E>(
-			field: K,
-			transform: (event: E) => ProviderSettings[K] = inputEventTransform,
-		) =>
-			(event: E | Event) => {
-				setApiConfigurationField(field, transform(event as E))
-			},
-		[setApiConfigurationField],
-	)
-
-	return (
-		<>
-			<VSCodeTextField
-				value={apiConfiguration?.glamaApiKey || ""}
-				type="password"
-				onInput={handleInputChange("glamaApiKey")}
-				placeholder={t("settings:placeholders.apiKey")}
-				className="w-full">
-				<label className="block font-medium mb-1">{t("settings:providers.glamaApiKey")}</label>
-			</VSCodeTextField>
-			<div className="text-sm text-vscode-descriptionForeground -mt-2">
-				{t("settings:providers.apiKeyStorageNotice")}
-			</div>
-			{!apiConfiguration?.glamaApiKey && (
-				<VSCodeButtonLink href={getGlamaAuthUrl(uriScheme)} style={{ width: "100%" }} appearance="primary">
-					{t("settings:providers.getGlamaApiKey")}
-				</VSCodeButtonLink>
-			)}
-			<ModelPicker
-				apiConfiguration={apiConfiguration}
-				setApiConfigurationField={setApiConfigurationField}
-				defaultModelId={glamaDefaultModelId}
-				models={routerModels?.glama ?? {}}
-				modelIdKey="glamaModelId"
-				serviceName="Glama"
-				serviceUrl="https://glama.ai/models"
-				organizationAllowList={organizationAllowList}
-				errorMessage={modelValidationError}
-				simplifySettings={simplifySettings}
-			/>
-		</>
-	)
-}
diff --git a/webview-ui/src/components/settings/providers/index.ts b/webview-ui/src/components/settings/providers/index.ts
index 76b762c5653..a7a046ae7bb 100644
--- a/webview-ui/src/components/settings/providers/index.ts
+++ b/webview-ui/src/components/settings/providers/index.ts
@@ -6,7 +6,6 @@ export { ClaudeCode } from "./ClaudeCode"
 export { DeepSeek } from "./DeepSeek"
 export { Doubao } from "./Doubao"
 export { Gemini } from "./Gemini"
-export { Glama } from "./Glama"
 export { Groq } from "./Groq"
 export { HuggingFace } from "./HuggingFace"
 export { IOIntelligence } from "./IOIntelligence"
diff --git a/webview-ui/src/components/ui/dialog.tsx b/webview-ui/src/components/ui/dialog.tsx
index ae394f95ce4..83efd07e9ee 100644
--- a/webview-ui/src/components/ui/dialog.tsx
+++ b/webview-ui/src/components/ui/dialog.tsx
@@ -78,7 +78,7 @@ function DialogTitle({ className, ...props }: React.ComponentProps<typeof Dialog
 	return (
 		<DialogPrimitive.Title
 			data-slot="dialog-title"
-			className={cn("text-lg leading-none font-semibold my-0", className)}
+			className={cn("text-lg leading-none font-semibold my-0 cursor-default", className)}
 			{...props}
 		/>
 	)
diff --git a/webview-ui/src/components/ui/hooks/__tests__/useSelectedModel.spec.ts b/webview-ui/src/components/ui/hooks/__tests__/useSelectedModel.spec.ts
index ed95f44fdc8..40800d93423 100644
--- a/webview-ui/src/components/ui/hooks/__tests__/useSelectedModel.spec.ts
+++ b/webview-ui/src/components/ui/hooks/__tests__/useSelectedModel.spec.ts
@@ -55,7 +55,6 @@ describe("useSelectedModel", () => {
 						"test-model": baseModelInfo,
 					},
 					requesty: {},
-					glama: {},
 					unbound: {},
 					litellm: {},
 					"io-intelligence": {},
@@ -119,7 +118,6 @@ describe("useSelectedModel", () => {
 						},
 					},
 					requesty: {},
-					glama: {},
 					unbound: {},
 					litellm: {},
 					"io-intelligence": {},
@@ -187,7 +185,6 @@ describe("useSelectedModel", () => {
 						"test-model": baseModelInfo,
 					},
 					requesty: {},
-					glama: {},
 					unbound: {},
 					litellm: {},
 					"io-intelligence": {},
@@ -242,7 +239,6 @@ describe("useSelectedModel", () => {
 				data: {
 					openrouter: { "test-model": baseModelInfo },
 					requesty: {},
-					glama: {},
 					unbound: {},
 					litellm: {},
 					"io-intelligence": {},
@@ -286,7 +282,6 @@ describe("useSelectedModel", () => {
 						},
 					},
 					requesty: {},
-					glama: {},
 					unbound: {},
 					litellm: {},
 					"io-intelligence": {},
@@ -349,7 +344,7 @@ describe("useSelectedModel", () => {
 
 		it("should NOT set loading when openrouter provider metadata is loading but provider is static (anthropic)", () => {
 			mockUseRouterModels.mockReturnValue({
-				data: { openrouter: {}, requesty: {}, glama: {}, unbound: {}, litellm: {}, "io-intelligence": {} },
+				data: { openrouter: {}, requesty: {}, unbound: {}, litellm: {}, "io-intelligence": {} },
 				isLoading: false,
 				isError: false,
 			} as any)
@@ -416,7 +411,6 @@ describe("useSelectedModel", () => {
 				data: {
 					openrouter: {},
 					requesty: {},
-					glama: {},
 					unbound: {},
 					litellm: {},
 					"io-intelligence": {},
@@ -454,7 +448,6 @@ describe("useSelectedModel", () => {
 				data: {
 					openrouter: {},
 					requesty: {},
-					glama: {},
 					unbound: {},
 					litellm: {},
 					"io-intelligence": {},
@@ -489,7 +482,6 @@ describe("useSelectedModel", () => {
 				data: {
 					openrouter: {},
 					requesty: {},
-					glama: {},
 					unbound: {},
 					litellm: {},
 					"io-intelligence": {},
diff --git a/webview-ui/src/components/ui/hooks/useSelectedModel.ts b/webview-ui/src/components/ui/hooks/useSelectedModel.ts
index b2b582fc133..c12a4530f56 100644
--- a/webview-ui/src/components/ui/hooks/useSelectedModel.ts
+++ b/webview-ui/src/components/ui/hooks/useSelectedModel.ts
@@ -189,11 +189,6 @@ function getSelectedModel({
 			const info = routerModels.requesty?.[id]
 			return { id, info }
 		}
-		case "glama": {
-			const id = getValidatedModelId(apiConfiguration.glamaModelId, routerModels.glama, defaultModelId)
-			const info = routerModels.glama?.[id]
-			return { id, info }
-		}
 		case "unbound": {
 			const id = getValidatedModelId(apiConfiguration.unboundModelId, routerModels.unbound, defaultModelId)
 			const info = routerModels.unbound?.[id]
diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx
index 99d68deea9e..90152fff2ea 100644
--- a/webview-ui/src/context/ExtensionStateContext.tsx
+++ b/webview-ui/src/context/ExtensionStateContext.tsx
@@ -159,6 +159,8 @@ export interface ExtensionStateContextType extends ExtensionState {
 	setTerminalCompressProgressBar: (value: boolean) => void
 	setHistoryPreviewCollapsed: (value: boolean) => void
 	setReasoningBlockCollapsed: (value: boolean) => void
+	enterBehavior?: "send" | "newline"
+	setEnterBehavior: (value: "send" | "newline") => void
 	autoCondenseContext: boolean
 	setAutoCondenseContext: (value: boolean) => void
 	autoCondenseContextPercent: number
@@ -269,6 +271,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 		terminalCompressProgressBar: true, // Default to compress progress bar output
 		historyPreviewCollapsed: false, // Initialize the new state (default to expanded)
 		reasoningBlockCollapsed: true, // Default to collapsed
+		enterBehavior: "send", // Default: Enter sends, Shift+Enter creates newline
 		cloudUserInfo: null,
 		cloudIsAuthenticated: false,
 		// cloudOrganizations: [],
@@ -653,6 +656,8 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 			setState((prevState) => ({ ...prevState, historyPreviewCollapsed: value })),
 		setReasoningBlockCollapsed: (value) =>
 			setState((prevState) => ({ ...prevState, reasoningBlockCollapsed: value })),
+		enterBehavior: state.enterBehavior ?? "send",
+		setEnterBehavior: (value) => setState((prevState) => ({ ...prevState, enterBehavior: value })),
 		setHasOpenedModeSelector: (value) => setState((prevState) => ({ ...prevState, hasOpenedModeSelector: value })),
 		setAutoCondenseContext: (value) => setState((prevState) => ({ ...prevState, autoCondenseContext: value })),
 		setAutoCondenseContextPercent: (value) =>
diff --git a/webview-ui/src/i18n/locales/en/chat.json b/webview-ui/src/i18n/locales/en/chat.json
index 93a339db236..bd6171a16c9 100644
--- a/webview-ui/src/i18n/locales/en/chat.json
+++ b/webview-ui/src/i18n/locales/en/chat.json
@@ -127,6 +127,7 @@
 	"enhancePromptDescription": "The 'Enhance Prompt' button helps improve your prompt by providing additional context, clarification, or rephrasing. Try typing a prompt in here and clicking the button again to see how it works.",
 	"addImages": "Add images to message",
 	"sendMessage": "Send message",
+	"pressToSend": "Press {{keyCombination}} to send",
 	"stopTts": "Stop text-to-speech",
 	"typeMessage": "Type a message...",
 	"typeTask": "Type your task here...",
@@ -154,6 +155,7 @@
 			"403": "Unauthorized. Your API key is valid, but the provider refused to complete this request.",
 			"429": "Too many requests. You're being rate-limited by the provider. Please wait a bit before your next API call.",
 			"500": "Provider server error. Something is wrong on the provider side, there's nothing wrong with your request.",
+			"connection": "Connection error. Make sure you have a working internet connection.",
 			"unknown": "Unknown API error. Please contact CoStrict support."
 		}
 	},
@@ -223,10 +225,6 @@
 		"didViewRecursive": "Roo recursively viewed all files in this directory",
 		"wantsToViewRecursiveOutsideWorkspace": "Roo wants to recursively view all files in this directory (outside workspace)",
 		"didViewRecursiveOutsideWorkspace": "Roo recursively viewed all files in this directory (outside workspace)",
-		"wantsToViewDefinitions": "Roo wants to view source code definition names used in this directory",
-		"didViewDefinitions": "Roo viewed source code definition names used in this directory",
-		"wantsToViewDefinitionsOutsideWorkspace": "Roo wants to view source code definition names used in this directory (outside workspace)",
-		"didViewDefinitionsOutsideWorkspace": "Roo viewed source code definition names used in this directory (outside workspace)",
 		"wantsToSearch": "Roo wants to search this directory for <code>{{regex}}</code>",
 		"didSearch": "Roo searched this directory for <code>{{regex}}</code>",
 		"wantsToSearchOutsideWorkspace": "Roo wants to search this directory (outside workspace) for <code>{{regex}}</code>",
@@ -290,6 +288,11 @@
 	},
 	"taskCompleted": "Task Completed",
 	"error": "Error",
+	"errorDetails": {
+		"title": "Error Details",
+		"copyToClipboard": "Copy to Clipboard",
+		"copied": "Copied!"
+	},
 	"diffError": {
 		"title": "Edit Unsuccessful"
 	},
diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json
index b4b5497cc73..2c4c6f05a2e 100644
--- a/webview-ui/src/i18n/locales/en/settings.json
+++ b/webview-ui/src/i18n/locales/en/settings.json
@@ -61,6 +61,16 @@
 	"slashCommands": {
 		"description": "Manage your slash commands to quickly execute custom workflows and actions. <DocsLink>Learn more</DocsLink>"
 	},
+	"ui": {
+		"collapseThinking": {
+			"label": "Collapse Thinking messages by default",
+			"description": "When enabled, thinking blocks will be collapsed by default until you interact with them"
+		},
+		"requireCtrlEnterToSend": {
+			"label": "Require {{primaryMod}}+Enter to send messages",
+			"description": "When enabled, you must press {{primaryMod}}+Enter to send messages instead of just Enter"
+		}
+	},
 	"prompts": {
 		"description": "Configure support prompts that are used for quick actions like enhancing prompts, explaining code, and fixing issues. These prompts help Roo provide better assistance for common development tasks."
 	},
@@ -283,8 +293,6 @@
 		"vercelAiGatewayApiKey": "Vercel AI Gateway API Key",
 		"getVercelAiGatewayApiKey": "Get Vercel AI Gateway API Key",
 		"apiKeyStorageNotice": "API keys are stored securely in VSCode's Secret Storage",
-		"glamaApiKey": "Glama API Key",
-		"getGlamaApiKey": "Get Glama API Key",
 		"useCustomBaseUrl": "Use custom base URL",
 		"useReasoning": "Enable reasoning",
 		"useHostHeader": "Use custom Host header",
@@ -970,11 +978,5 @@
 			"output": "Output",
 			"cacheReads": "Cache reads"
 		}
-	},
-	"ui": {
-		"collapseThinking": {
-			"label": "Collapse Thinking messages by default",
-			"description": "When enabled, thinking blocks will be collapsed by default until you interact with them"
-		}
 	}
 }
diff --git a/webview-ui/src/i18n/locales/zh-CN/chat.json b/webview-ui/src/i18n/locales/zh-CN/chat.json
index 53bafb13c26..a1240e6cebb 100644
--- a/webview-ui/src/i18n/locales/zh-CN/chat.json
+++ b/webview-ui/src/i18n/locales/zh-CN/chat.json
@@ -107,6 +107,7 @@
 	"enhancePrompt": "增强提示词",
 	"addImages": "添加图片到消息",
 	"sendMessage": "发送消息",
+	"pressToSend": "按 {{keyCombination}} 发送",
 	"stopTts": "停止文本转语音",
 	"typeMessage": "输入消息...",
 	"typeTask": "在此处输入您的任务...",
@@ -148,7 +149,8 @@
 			"403": "无权限。您的 API 密钥有效，但提供商拒绝完成此请求。",
 			"429": "请求过于频繁。提供商已对您的请求进行速率限制。请在下一次 API 调用前稍候。",
 			"500": "提供商服务器错误。提供商端出现问题，您的请求无问题。",
-			"unknown": "未知 API 错误。请联系 CoStrict 支持。"
+			"unknown": "未知 API 错误。请联系 CoStrict 支持。",
+			"connection": "连接错误。确保您有可用的互联网连接。"
 		}
 	},
 	"checkpoint": {
@@ -200,8 +202,6 @@
 		"didViewTopLevel": "已查看目录文件列表",
 		"wantsToViewRecursive": "需要查看目录所有文件",
 		"didViewRecursive": "已查看目录所有文件",
-		"wantsToViewDefinitions": "Roo想查看此目录中使用的源代码定义名称",
-		"didViewDefinitions": "Roo已查看此目录中使用的源代码定义名称",
 		"wantsToSearch": "需要搜索内容: {{regex}}",
 		"didSearch": "已完成内容搜索: {{regex}}",
 		"wantsToSearchOutsideWorkspace": "需要搜索内容（工作区外）: {{regex}}",
@@ -209,9 +209,7 @@
 		"wantsToViewTopLevelOutsideWorkspace": "需要查看目录文件列表（工作区外）",
 		"didViewTopLevelOutsideWorkspace": "已查看目录文件列表（工作区外）",
 		"wantsToViewRecursiveOutsideWorkspace": "需要查看目录所有文件（工作区外）",
-		"didViewRecursiveOutsideWorkspace": "已查看目录所有文件（工作区外）",
-		"wantsToViewDefinitionsOutsideWorkspace": "Roo想查看此目录中使用的源代码定义名称（工作区外）",
-		"didViewDefinitionsOutsideWorkspace": "Roo已查看此目录中使用的源代码定义名称（工作区外）"
+		"didViewRecursiveOutsideWorkspace": "已查看目录所有文件（工作区外）"
 	},
 	"commandOutput": "命令输出",
 	"commandExecution": {
@@ -264,6 +262,11 @@
 		"hasQuestion": "Roo有一个问题"
 	},
 	"taskCompleted": "任务完成",
+	"errorDetails": {
+		"title": "错误详情",
+		"copyToClipboard": "复制到剪贴板",
+		"copied": "已复制!"
+	},
 	"powershell": {
 		"issues": "看起来您遇到了Windows PowerShell问题，请参阅此"
 	},
diff --git a/webview-ui/src/i18n/locales/zh-CN/settings.json b/webview-ui/src/i18n/locales/zh-CN/settings.json
index 677606bdda8..acf3a1d0892 100644
--- a/webview-ui/src/i18n/locales/zh-CN/settings.json
+++ b/webview-ui/src/i18n/locales/zh-CN/settings.json
@@ -284,8 +284,6 @@
 		"vercelAiGatewayApiKey": "Vercel AI Gateway API 密钥",
 		"getVercelAiGatewayApiKey": "获取 Vercel AI Gateway API 密钥",
 		"apiKeyStorageNotice": "API 密钥安全存储在 VSCode 的密钥存储中",
-		"glamaApiKey": "Glama API 密钥",
-		"getGlamaApiKey": "获取 Glama API 密钥",
 		"useCustomBaseUrl": "使用自定义基础 URL",
 		"useReasoning": "启用推理",
 		"useHostHeader": "使用自定义 Host 标头",
@@ -975,8 +973,12 @@
 	},
 	"ui": {
 		"collapseThinking": {
-			"label": "默认折叠“思考”消息",
-			"description": "启用后，“思考”块将默认折叠，直到您与其交互"
+			"label": "默认折叠「思考」消息",
+			"description": "启用后，「思考」块将默认折叠，直到您与其交互"
+		},
+		"requireCtrlEnterToSend": {
+			"label": "需要 {{primaryMod}}+Enter 发送消息",
+			"description": "启用后，必须按 {{primaryMod}}+Enter 发送消息，而不仅仅是 Enter"
 		}
 	}
 }
diff --git a/webview-ui/src/i18n/locales/zh-TW/chat.json b/webview-ui/src/i18n/locales/zh-TW/chat.json
index 85d8a330f32..672ad04f2c1 100644
--- a/webview-ui/src/i18n/locales/zh-TW/chat.json
+++ b/webview-ui/src/i18n/locales/zh-TW/chat.json
@@ -127,6 +127,7 @@
 	"enhancePromptDescription": "「強化提示詞」按鈕可透過提供額外內容、說明或改寫來協助改善您的提示詞。請試著在這裡輸入提示詞，然後再次點選按鈕，以了解其運作方式。",
 	"addImages": "新增圖片到訊息中",
 	"sendMessage": "傳送訊息",
+	"pressToSend": "按 {{keyCombination}} 傳送",
 	"stopTts": "停止文字轉語音",
 	"typeMessage": "輸入訊息...",
 	"typeTask": "在這裡輸入您的工作...",
@@ -154,7 +155,8 @@
 			"403": "無權存取。您的 API 金鑰有效，但提供商拒絕完成此請求。",
 			"429": "請求次數過多。提供商已對您的請求進行速率限制。請在下一次 API 呼叫前稍候。",
 			"500": "提供商伺服器錯誤。提供商端發生問題，您的請求沒有問題。",
-			"unknown": "未知 API 錯誤。請聯絡 CoStrict支援。"
+			"unknown": "未知 API 錯誤。請聯絡 CoStrict 支援。",
+			"connection": "連線錯誤。請確保您有可用的網際網路連線。"
 		}
 	},
 	"checkpoint": {
@@ -225,10 +227,6 @@
 		"didViewRecursive": "Roo 已遞迴檢視此目錄中的所有檔案",
 		"wantsToViewRecursiveOutsideWorkspace": "Roo 想要遞迴檢視此目錄（工作區外）中的所有檔案",
 		"didViewRecursiveOutsideWorkspace": "Roo 已遞迴檢視此目錄（工作區外）中的所有檔案",
-		"wantsToViewDefinitions": "Roo 想要檢視此目錄中使用的原始碼定義名稱",
-		"didViewDefinitions": "Roo 已檢視此目錄中使用的原始碼定義名稱",
-		"wantsToViewDefinitionsOutsideWorkspace": "Roo 想要檢視此目錄（工作區外）中使用的原始碼定義名稱",
-		"didViewDefinitionsOutsideWorkspace": "Roo 已檢視此目錄（工作區外）中使用的原始碼定義名稱",
 		"wantsToSearch": "Roo 想要在此目錄中搜尋 <code>{{regex}}</code>",
 		"didSearch": "Roo 已在此目錄中搜尋 <code>{{regex}}</code>",
 		"wantsToSearchOutsideWorkspace": "Roo 想要在此目錄（工作區外）中搜尋 <code>{{regex}}</code>",
@@ -297,6 +295,11 @@
 		"title": "編輯失敗"
 	},
 	"troubleMessage": "Roo 遇到問題...",
+	"errorDetails": {
+		"title": "錯誤詳細資訊",
+		"copyToClipboard": "複製到剪貼簿",
+		"copied": "已複製！"
+	},
 	"powershell": {
 		"issues": "您似乎遇到了 Windows PowerShell 的問題，請參閱此說明文件"
 	},
diff --git a/webview-ui/src/i18n/locales/zh-TW/settings.json b/webview-ui/src/i18n/locales/zh-TW/settings.json
index 842ca00416a..4e30a69f648 100644
--- a/webview-ui/src/i18n/locales/zh-TW/settings.json
+++ b/webview-ui/src/i18n/locales/zh-TW/settings.json
@@ -284,8 +284,6 @@
 		"vercelAiGatewayApiKey": "Vercel AI Gateway API 金鑰",
 		"getVercelAiGatewayApiKey": "取得 Vercel AI Gateway API 金鑰",
 		"apiKeyStorageNotice": "API 金鑰安全儲存於 VSCode 金鑰儲存中",
-		"glamaApiKey": "Glama API 金鑰",
-		"getGlamaApiKey": "取得 Glama API 金鑰",
 		"useCustomBaseUrl": "使用自訂基礎 URL",
 		"useReasoning": "啟用推理",
 		"useHostHeader": "使用自訂 Host 標頭",
@@ -975,8 +973,12 @@
 	},
 	"ui": {
 		"collapseThinking": {
-			"label": "預設折疊“思考”訊息",
-			"description": "啟用後，“思考”塊將預設折疊，直到您與其互動"
+			"label": "預設折疊「思考」訊息",
+			"description": "啟用後，「思考」塊將預設折疊，直到您與其互動"
+		},
+		"requireCtrlEnterToSend": {
+			"label": "需要 {{primaryMod}}+Enter 傳送訊息",
+			"description": "啟用後，必須按 {{primaryMod}}+Enter 傳送訊息，而不只是 Enter"
 		}
 	}
 }
diff --git a/webview-ui/src/oauth/urls.ts b/webview-ui/src/oauth/urls.ts
index 8abf0ca4340..38acb839c43 100644
--- a/webview-ui/src/oauth/urls.ts
+++ b/webview-ui/src/oauth/urls.ts
@@ -4,10 +4,6 @@ export function getCallbackUrl(provider: string, uriScheme?: string) {
 	return encodeURIComponent(`${uriScheme || "vscode"}://${Package.publisher}.${Package.name}/${provider}`)
 }
 
-export function getGlamaAuthUrl(uriScheme?: string) {
-	return `https://glama.ai/oauth/authorize?callback_url=${getCallbackUrl("glama", uriScheme)}`
-}
-
 export function getOpenRouterAuthUrl(uriScheme?: string) {
 	return `https://openrouter.ai/auth?callback_url=${getCallbackUrl("openrouter", uriScheme)}`
 }
diff --git a/webview-ui/src/utils/__tests__/validate.test.ts b/webview-ui/src/utils/__tests__/validate.test.ts
index 3fed0f70c29..c8c90cfe2ed 100644
--- a/webview-ui/src/utils/__tests__/validate.test.ts
+++ b/webview-ui/src/utils/__tests__/validate.test.ts
@@ -24,16 +24,6 @@ describe("Model Validation Functions", () => {
 				outputPrice: 5.0,
 			},
 		},
-		glama: {
-			"valid-model": {
-				maxTokens: 8192,
-				contextWindow: 200000,
-				supportsImages: true,
-				supportsPromptCache: false,
-				inputPrice: 3.0,
-				outputPrice: 15.0,
-			},
-		},
 		requesty: {},
 		unbound: {},
 		litellm: {},
@@ -94,26 +84,6 @@ describe("Model Validation Functions", () => {
 			expect(result).toContain("model")
 		})
 
-		it("returns undefined for valid Glama model", () => {
-			const config: ProviderSettings = {
-				apiProvider: "glama",
-				glamaModelId: "valid-model",
-			}
-
-			const result = getModelValidationError(config, mockRouterModels, allowAllOrganization)
-			expect(result).toBeUndefined()
-		})
-
-		it("returns error for invalid Glama model", () => {
-			const config: ProviderSettings = {
-				apiProvider: "glama",
-				glamaModelId: "invalid-model",
-			}
-
-			const result = getModelValidationError(config, mockRouterModels, allowAllOrganization)
-			expect(result).toBeUndefined()
-		})
-
 		it("returns undefined for OpenAI models when no router models provided", () => {
 			const config: ProviderSettings = {
 				apiProvider: "openai",
@@ -193,25 +163,5 @@ describe("Model Validation Functions", () => {
 			)
 			expect(result).toBeUndefined() // Should exclude model-specific org errors
 		})
-
-		it("returns undefined for valid IO Intelligence model", () => {
-			const config: ProviderSettings = {
-				apiProvider: "io-intelligence",
-				glamaModelId: "valid-model",
-			}
-
-			const result = getModelValidationError(config, mockRouterModels, allowAllOrganization)
-			expect(result).toBeUndefined()
-		})
-
-		it("returns error for invalid IO Intelligence model", () => {
-			const config: ProviderSettings = {
-				apiProvider: "io-intelligence",
-				glamaModelId: "invalid-model",
-			}
-
-			const result = getModelValidationError(config, mockRouterModels, allowAllOrganization)
-			expect(result).toBeUndefined()
-		})
 	})
 })
diff --git a/webview-ui/src/utils/validate.ts b/webview-ui/src/utils/validate.ts
index 5c04ebe926c..2f390f7dd77 100644
--- a/webview-ui/src/utils/validate.ts
+++ b/webview-ui/src/utils/validate.ts
@@ -45,11 +45,6 @@ function validateModelsAndKeysProvided(apiConfiguration: ProviderSettings): stri
 				return i18next.t("settings:validation.apiKey")
 			}
 			break
-		case "glama":
-			if (!apiConfiguration.glamaApiKey) {
-				return i18next.t("settings:validation.apiKey")
-			}
-			break
 		case "unbound":
 			if (!apiConfiguration.unboundApiKey) {
 				return i18next.t("settings:validation.apiKey")