Merge branch 'main' of https://github.com/RooVetGit/Roo-Code into rate-limit-profile-specific2

Author: olweraltuve

src/shared/support-prompt.ts

@@ -96,7 +96,7 @@ Provide the improved code along with explanations for each enhancement.`,
 		label: "Add to Context",
 		description:
 			"Add context to your current task or conversation. Useful for providing additional information or clarifications. Available in code actions (lightbulb icon in the editor). and the editor context menu (right-click on selected code).",
-		template: `@/\${filePath}:
+		template: `\${filePath}:
 \`\`\`
 \${selectedText}
 \`\`\``,

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

@@ -337,7 +337,26 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone },
 				</div>
 			</TabHeader>
 
-			<TabContent className="p-0 divide-y divide-vscode-sideBar-background" onScroll={handleScroll}>
+			<TabContent
+				className="p-0 divide-y divide-vscode-sideBar-background"
+				style={{
+					maxHeight: "calc(100vh - 6rem)",
+					height: "calc(100vh - 6rem)",
+					overflowY: "scroll",
+					overflowX: "hidden",
+					WebkitOverflowScrolling: "touch",
+					position: "relative",
+					display: "block",
+					msOverflowStyle: "-ms-autohiding-scrollbar",
+					scrollbarWidth: "auto",
+					scrollbarGutter: "stable",
+					willChange: "scroll-position",
+				}}
+				onWheel={(e) => {
+					const container = e.currentTarget
+					container.scrollTop += e.deltaY
+				}}
+				onScroll={handleScroll}>
 				<div ref={providersRef}>
 					<SectionHeader>
 						<div className="flex items-center gap-2">