diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts
index db01046acb7..4b9f4535261 100644
--- a/src/shared/ExtensionMessage.ts
+++ b/src/shared/ExtensionMessage.ts
@@ -6,7 +6,7 @@ import { Mode, CustomModePrompts, ModeConfig, defaultModeSlug, defaultPrompts }
 import { CustomSupportPrompts } from "./support-prompt"
 import { experimentDefault, ExperimentId } from "./experiments"
 import { TERMINAL_OUTPUT_LIMIT } from "./terminal"
-import { ClineMessage } from "../exports/roo-code"
+import { ClineMessage, ClineAsk, ClineSay } from "../exports/roo-code"
 import { CheckpointStorage } from "./checkpoints"
 import { TelemetrySetting } from "./TelemetrySetting"
 
@@ -158,7 +158,7 @@ export interface ExtensionState {
 	showRooIgnoredFiles: boolean // Whether to show .rooignore'd files in listings
 }
 
-export type { ClineMessage }
+export type { ClineMessage, ClineAsk, ClineSay }
 
 export interface ClineSayTool {
 	tool:
diff --git a/webview-ui/src/components/chat/ChatTextArea/ChatTextArea.tsx b/webview-ui/src/components/chat/ChatTextArea/ChatTextArea.tsx
index 53c2608da84..8a14598b069 100644
--- a/webview-ui/src/components/chat/ChatTextArea/ChatTextArea.tsx
+++ b/webview-ui/src/components/chat/ChatTextArea/ChatTextArea.tsx
@@ -20,6 +20,7 @@ interface ChatTextAreaProps {
 	onHeightChange?: (height: number) => void
 	mode: Mode
 	setMode: (value: Mode) => void
+	modeShortcutText: string
 }
 
 const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
@@ -37,6 +38,7 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 			onHeightChange,
 			mode,
 			setMode,
+			modeShortcutText,
 		},
 		ref,
 	) => {
@@ -56,7 +58,6 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 			return () => document.removeEventListener("mousedown", handleClickOutside)
 		}, [showDropdown])
 
-
 		// Handle enhanced prompt response
 		useEffect(() => {
 			const messageHandler = (event: MessageEvent) => {
@@ -111,6 +112,7 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 							currentApiConfigName={currentApiConfigName}
 							listApiConfigMeta={listApiConfigMeta}
 							customModes={customModes}
+							modeShortcutText={modeShortcutText}
 						/>
 					),
 					actions: (
diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
index f2e3135369a..58388dc684a 100644
--- a/webview-ui/src/components/chat/ChatView.tsx
+++ b/webview-ui/src/components/chat/ChatView.tsx
@@ -5,6 +5,7 @@ import { useDeepCompareEffect, useEvent, useMount } from "react-use"
 import { Virtuoso, type VirtuosoHandle } from "react-virtuoso"
 import styled from "styled-components"
 import {
+	ClineAsk,
 	ClineMessage,
 	ClineSayBrowserAction,
 	ClineSayTool,
@@ -29,7 +30,6 @@ import { AudioType } from "../../../../src/shared/WebviewMessage"
 import { validateCommand } from "../../utils/command-validation"
 import { getAllModes } from "../../../../src/shared/modes"
 import TelemetryBanner from "../common/TelemetryBanner"
-import { ClineAsk } from "../../../../src/exports/roo-code"
 
 interface ChatViewProps {
 	isHidden: boolean
diff --git a/webview-ui/src/components/ui/select-dropdown.tsx b/webview-ui/src/components/ui/select-dropdown.tsx
index 684256fc65e..87adc2ab40c 100644
--- a/webview-ui/src/components/ui/select-dropdown.tsx
+++ b/webview-ui/src/components/ui/select-dropdown.tsx
@@ -77,9 +77,7 @@ export const SelectDropdown = React.forwardRef<React.ElementRef<typeof DropdownM
 		}
 
 		return (
-			<div
-				className="relative inline-block min-w-0 flex-[0_1_auto]" // Select container styles
-			>
+			<div className="relative inline-block min-w-0 flex-[0_1_auto]">
 				<DropdownMenu open={open} onOpenChange={setOpen}>
 					<DropdownMenuTrigger
 						ref={ref}
@@ -95,14 +93,12 @@ export const SelectDropdown = React.forwardRef<React.ElementRef<typeof DropdownM
 							triggerClassName,
 						)}
 						style={{
-							width: "100%", // Take full width of parent.
+							width: "100%",
 							minWidth: "0",
 							maxWidth: "100%",
 						}}>
 						{shouldShowCaret && (
-							<div
-								className="pointer-events-none opacity-60 text-[10px]" // Caret container styles
-							>
+							<div className="pointer-events-none opacity-60 text-[10px]">
 								<svg
 									fill="none"
 									height="10"
diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx
index cdd698d296d..79305ae2ff1 100644
--- a/webview-ui/src/context/ExtensionStateContext.tsx
+++ b/webview-ui/src/context/ExtensionStateContext.tsx
@@ -6,9 +6,7 @@ import {
 	ExtensionMessage,
 	ExtensionState,
 } from "../../../src/shared/ExtensionMessage"
-import { ApiConfiguration, ModelInfo } from "../../../src/shared/api"
-import { vscode } from "../utils/vscode"
-import { convertTextMateToHljs } from "../utils/textMateToHljs"
+import { ApiConfiguration } from "../../../src/shared/api"
 import { findLastIndex } from "../../../src/shared/array"
 import { McpServer } from "../../../src/shared/mcp"
 import { checkExistKey } from "../../../src/shared/checkExistApiConfig"
@@ -17,6 +15,9 @@ import { CustomSupportPrompts } from "../../../src/shared/support-prompt"
 import { ExperimentId } from "../../../src/shared/experiments"
 import { TelemetrySetting } from "../../../src/shared/TelemetrySetting"
 
+import { vscode } from "@/utils/vscode"
+import { convertTextMateToHljs } from "@/utils/textMateToHljs"
+
 export interface ExtensionStateContextType extends ExtensionState {
 	didHydrateState: boolean
 	showWelcome: boolean