From fba94922b1244351cfb38797622cf5a4e756a037 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Thu, 28 Aug 2025 18:08:41 +0000
Subject: [PATCH 01/33] refactor: replace Popover with Tooltip in AgentLatency

---
 .../components/HelpTooltip/HelpTooltip.tsx    | 49 ++++++-----
 site/src/modules/resources/AgentLatency.tsx   | 82 ++++++++++---------
 2 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/site/src/components/HelpTooltip/HelpTooltip.tsx b/site/src/components/HelpTooltip/HelpTooltip.tsx
index 2bcaef1eb6847..b05b9934903ed 100644
--- a/site/src/components/HelpTooltip/HelpTooltip.tsx
+++ b/site/src/components/HelpTooltip/HelpTooltip.tsx
@@ -3,18 +3,16 @@ import {
 	css,
 	type Interpolation,
 	type Theme,
-	useTheme,
 } from "@emotion/react";
 import Link from "@mui/material/Link";
-import {
-	Popover,
-	PopoverContent,
-	type PopoverContentProps,
-	type PopoverProps,
-	PopoverTrigger,
-	usePopover,
-} from "components/deprecated/Popover/Popover";
+import { TooltipContentProps, TooltipProps } from "@radix-ui/react-tooltip";
+import { usePopover } from "components/deprecated/Popover/Popover";
 import { Stack } from "components/Stack/Stack";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipTrigger,
+} from "components/Tooltip/Tooltip";
 import { CircleHelpIcon, ExternalLinkIcon } from "lucide-react";
 import {
 	type FC,
@@ -23,6 +21,7 @@ import {
 	type PropsWithChildren,
 	type ReactNode,
 } from "react";
+import { cn } from "utils/cn";
 
 type Icon = typeof CircleHelpIcon;
 
@@ -30,24 +29,23 @@ type Size = "small" | "medium";
 
 export const HelpTooltipIcon = CircleHelpIcon;
 
-export const HelpTooltip: FC<PopoverProps> = (props) => {
-	return <Popover mode="hover" {...props} />;
+export const HelpTooltip: FC<TooltipProps> = (props) => {
+	return <Tooltip delayDuration={0} {...props} />;
 };
 
-export const HelpTooltipContent: FC<PopoverContentProps> = (props) => {
-	const theme = useTheme();
-
+export const HelpTooltipContent: FC<TooltipContentProps> = ({
+	className,
+	...props
+}) => {
 	return (
-		<PopoverContent
+		<TooltipContent
+			side="bottom"
+			align="start"
 			{...props}
-			css={{
-				"& .MuiPaper-root": {
-					fontSize: 14,
-					width: 304,
-					padding: 20,
-					color: theme.palette.text.secondary,
-				},
-			}}
+			className={cn(
+				"w-[320px] p-5 bg-surface-secondary border-surface-quaternary",
+				className,
+			)}
 		/>
 	);
 };
@@ -76,7 +74,7 @@ export const HelpTooltipTrigger = forwardRef<
 	});
 
 	return (
-		<PopoverTrigger>
+		<TooltipTrigger>
 			<button
 				{...buttonProps}
 				aria-label="More info"
@@ -102,7 +100,7 @@ export const HelpTooltipTrigger = forwardRef<
 			>
 				{children}
 			</button>
-		</PopoverTrigger>
+		</TooltipTrigger>
 	);
 });
 
@@ -155,6 +153,7 @@ export const HelpTooltipAction: FC<HelpTooltipActionProps> = ({
 	onClick,
 	ariaLabel,
 }) => {
+	// TODO dismiss tooltip
 	const popover = usePopover();
 
 	return (
diff --git a/site/src/modules/resources/AgentLatency.tsx b/site/src/modules/resources/AgentLatency.tsx
index 4be2a4cf52a07..0f5f436b62341 100644
--- a/site/src/modules/resources/AgentLatency.tsx
+++ b/site/src/modules/resources/AgentLatency.tsx
@@ -1,6 +1,5 @@
 import { type Theme, useTheme } from "@emotion/react";
 import type { DERPRegion, WorkspaceAgent } from "api/typesGenerated";
-import { PopoverTrigger } from "components/deprecated/Popover/Popover";
 import {
 	HelpTooltip,
 	HelpTooltipContent,
@@ -8,6 +7,7 @@ import {
 	HelpTooltipTitle,
 } from "components/HelpTooltip/HelpTooltip";
 import { Stack } from "components/Stack/Stack";
+import { TooltipProvider, TooltipTrigger } from "components/Tooltip/Tooltip";
 import type { FC } from "react";
 import { getLatencyColor } from "utils/latency";
 
@@ -43,45 +43,47 @@ export const AgentLatency: FC<AgentLatencyProps> = ({ agent }) => {
 	}
 
 	return (
-		<HelpTooltip>
-			<PopoverTrigger>
-				<span
-					role="presentation"
-					aria-label="latency"
-					css={{ cursor: "pointer", color: latency.color }}
-				>
-					{Math.round(latency.latency_ms)}ms
-				</span>
-			</PopoverTrigger>
-			<HelpTooltipContent>
-				<HelpTooltipTitle>Latency</HelpTooltipTitle>
-				<HelpTooltipText>
-					This is the latency overhead on non peer to peer connections. The
-					first row is the preferred relay.
-				</HelpTooltipText>
-				<HelpTooltipText>
-					<Stack direction="column" spacing={1} css={{ marginTop: 16 }}>
-						{Object.entries(agent.latency)
-							.sort(([, a], [, b]) => a.latency_ms - b.latency_ms)
-							.map(([regionName, region]) => (
-								<Stack
-									direction="row"
-									key={regionName}
-									spacing={0.5}
-									justifyContent="space-between"
-									css={
-										region.preferred && {
-											color: theme.palette.text.primary,
+		<TooltipProvider>
+			<HelpTooltip>
+				<TooltipTrigger asChild>
+					<span
+						role="presentation"
+						aria-label="latency"
+						css={{ cursor: "pointer", color: latency.color }}
+					>
+						{Math.round(latency.latency_ms)}ms
+					</span>
+				</TooltipTrigger>
+				<HelpTooltipContent>
+					<HelpTooltipTitle>Latency</HelpTooltipTitle>
+					<HelpTooltipText>
+						This is the latency overhead on non peer to peer connections. The
+						first row is the preferred relay.
+					</HelpTooltipText>
+					<HelpTooltipText>
+						<Stack direction="column" spacing={1} css={{ marginTop: 16 }}>
+							{Object.entries(agent.latency)
+								.sort(([, a], [, b]) => a.latency_ms - b.latency_ms)
+								.map(([regionName, region]) => (
+									<Stack
+										direction="row"
+										key={regionName}
+										spacing={0.5}
+										justifyContent="space-between"
+										css={
+											region.preferred && {
+												color: theme.palette.text.primary,
+											}
 										}
-									}
-								>
-									<strong>{regionName}</strong>
-									{Math.round(region.latency_ms)}ms
-								</Stack>
-							))}
-					</Stack>
-				</HelpTooltipText>
-			</HelpTooltipContent>
-		</HelpTooltip>
+									>
+										<strong>{regionName}</strong>
+										{Math.round(region.latency_ms)}ms
+									</Stack>
+								))}
+						</Stack>
+					</HelpTooltipText>
+				</HelpTooltipContent>
+			</HelpTooltip>
+		</TooltipProvider>
 	);
 };

From e230f38027cf201b67ab530fa62974df6296d7a0 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Thu, 28 Aug 2025 18:23:48 +0000
Subject: [PATCH 02/33] refactor: replace PopoverTrigger with TooltipTrigger in
 AgentStatus

---
 site/src/modules/resources/AgentStatus.tsx | 56 +++++++++++-----------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/site/src/modules/resources/AgentStatus.tsx b/site/src/modules/resources/AgentStatus.tsx
index 8f6b923e70d68..543c31313d043 100644
--- a/site/src/modules/resources/AgentStatus.tsx
+++ b/site/src/modules/resources/AgentStatus.tsx
@@ -6,13 +6,13 @@ import type {
 	WorkspaceAgentDevcontainer,
 } from "api/typesGenerated";
 import { ChooseOne, Cond } from "components/Conditionals/ChooseOne";
-import { PopoverTrigger } from "components/deprecated/Popover/Popover";
 import {
 	HelpTooltip,
 	HelpTooltipContent,
 	HelpTooltipText,
 	HelpTooltipTitle,
 } from "components/HelpTooltip/HelpTooltip";
+import { TooltipProvider, TooltipTrigger } from "components/Tooltip/Tooltip";
 import { TriangleAlertIcon } from "lucide-react";
 import type { FC } from "react";
 
@@ -62,9 +62,9 @@ interface DevcontainerStatusProps {
 const StartTimeoutLifecycle: FC<AgentStatusProps> = ({ agent }) => {
 	return (
 		<HelpTooltip>
-			<PopoverTrigger role="status" aria-label="Agent timeout">
+			<TooltipTrigger asChild role="status" aria-label="Agent timeout">
 				<TriangleAlertIcon css={styles.timeoutWarning} />
-			</PopoverTrigger>
+			</TooltipTrigger>
 
 			<HelpTooltipContent>
 				<HelpTooltipTitle>Agent is taking too long to start</HelpTooltipTitle>
@@ -87,9 +87,9 @@ const StartTimeoutLifecycle: FC<AgentStatusProps> = ({ agent }) => {
 const StartErrorLifecycle: FC<AgentStatusProps> = ({ agent }) => {
 	return (
 		<HelpTooltip>
-			<PopoverTrigger role="status" aria-label="Start error">
+			<TooltipTrigger asChild role="status" aria-label="Start error">
 				<TriangleAlertIcon css={styles.errorWarning} />
-			</PopoverTrigger>
+			</TooltipTrigger>
 			<HelpTooltipContent>
 				<HelpTooltipTitle>Error starting the agent</HelpTooltipTitle>
 				<HelpTooltipText>
@@ -123,9 +123,9 @@ const ShuttingDownLifecycle: FC = () => {
 const ShutdownTimeoutLifecycle: FC<AgentStatusProps> = ({ agent }) => {
 	return (
 		<HelpTooltip>
-			<PopoverTrigger role="status" aria-label="Stop timeout">
+			<TooltipTrigger asChild role="status" aria-label="Stop timeout">
 				<TriangleAlertIcon css={styles.timeoutWarning} />
-			</PopoverTrigger>
+			</TooltipTrigger>
 			<HelpTooltipContent>
 				<HelpTooltipTitle>Agent is taking too long to stop</HelpTooltipTitle>
 				<HelpTooltipText>
@@ -147,9 +147,9 @@ const ShutdownTimeoutLifecycle: FC<AgentStatusProps> = ({ agent }) => {
 const ShutdownErrorLifecycle: FC<AgentStatusProps> = ({ agent }) => {
 	return (
 		<HelpTooltip>
-			<PopoverTrigger role="status" aria-label="Stop error">
+			<TooltipTrigger asChild role="status" aria-label="Stop error">
 				<TriangleAlertIcon css={styles.errorWarning} />
-			</PopoverTrigger>
+			</TooltipTrigger>
 			<HelpTooltipContent>
 				<HelpTooltipTitle>Error stopping the agent</HelpTooltipTitle>
 				<HelpTooltipText>
@@ -243,9 +243,9 @@ const ConnectingStatus: FC = () => {
 const TimeoutStatus: FC<AgentStatusProps> = ({ agent }) => {
 	return (
 		<HelpTooltip>
-			<PopoverTrigger role="status" aria-label="Timeout">
+			<TooltipTrigger asChild role="status" aria-label="Timeout">
 				<TriangleAlertIcon css={styles.timeoutWarning} />
-			</PopoverTrigger>
+			</TooltipTrigger>
 			<HelpTooltipContent>
 				<HelpTooltipTitle>Agent is taking too long to connect</HelpTooltipTitle>
 				<HelpTooltipText>
@@ -266,20 +266,22 @@ const TimeoutStatus: FC<AgentStatusProps> = ({ agent }) => {
 
 export const AgentStatus: FC<AgentStatusProps> = ({ agent }) => {
 	return (
-		<ChooseOne>
-			<Cond condition={agent.status === "connected"}>
-				<ConnectedStatus agent={agent} />
-			</Cond>
-			<Cond condition={agent.status === "disconnected"}>
-				<DisconnectedStatus />
-			</Cond>
-			<Cond condition={agent.status === "timeout"}>
-				<TimeoutStatus agent={agent} />
-			</Cond>
-			<Cond>
-				<ConnectingStatus />
-			</Cond>
-		</ChooseOne>
+		<TooltipProvider>
+			<ChooseOne>
+				<Cond condition={agent.status === "connected"}>
+					<ConnectedStatus agent={agent} />
+				</Cond>
+				<Cond condition={agent.status === "disconnected"}>
+					<DisconnectedStatus />
+				</Cond>
+				<Cond condition={agent.status === "timeout"}>
+					<TimeoutStatus agent={agent} />
+				</Cond>
+				<Cond>
+					<ConnectingStatus />
+				</Cond>
+			</ChooseOne>
+		</TooltipProvider>
 	);
 };
 
@@ -308,9 +310,9 @@ const SubAgentStatus: FC<SubAgentStatusProps> = ({ agent }) => {
 const DevcontainerStartError: FC<AgentStatusProps> = ({ agent }) => {
 	return (
 		<HelpTooltip>
-			<PopoverTrigger role="status" aria-label="Start error">
+			<TooltipTrigger asChild role="status" aria-label="Start error">
 				<TriangleAlertIcon css={styles.errorWarning} />
-			</PopoverTrigger>
+			</TooltipTrigger>
 			<HelpTooltipContent>
 				<HelpTooltipTitle>
 					Error starting the devcontainer agent

From 75c9fdfc4cd0457e80368f3b6ebdcd45779bba2c Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Thu, 28 Aug 2025 18:47:33 +0000
Subject: [PATCH 03/33] refactor: replace PopoverTrigger with TooltipTrigger in
 AgentOutdatedTooltip

---
 .../components/HelpTooltip/HelpTooltip.tsx    | 12 +--
 .../resources/AgentOutdatedTooltip.tsx        | 83 ++++++++++---------
 2 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/site/src/components/HelpTooltip/HelpTooltip.tsx b/site/src/components/HelpTooltip/HelpTooltip.tsx
index b05b9934903ed..8c788661bff62 100644
--- a/site/src/components/HelpTooltip/HelpTooltip.tsx
+++ b/site/src/components/HelpTooltip/HelpTooltip.tsx
@@ -6,7 +6,6 @@ import {
 } from "@emotion/react";
 import Link from "@mui/material/Link";
 import { TooltipContentProps, TooltipProps } from "@radix-ui/react-tooltip";
-import { usePopover } from "components/deprecated/Popover/Popover";
 import { Stack } from "components/Stack/Stack";
 import {
 	Tooltip,
@@ -43,7 +42,7 @@ export const HelpTooltipContent: FC<TooltipContentProps> = ({
 			align="start"
 			{...props}
 			className={cn(
-				"w-[320px] p-5 bg-surface-secondary border-surface-quaternary",
+				"w-[320px] p-5 bg-surface-secondary border-surface-quaternary text-sm",
 				className,
 			)}
 		/>
@@ -153,19 +152,12 @@ export const HelpTooltipAction: FC<HelpTooltipActionProps> = ({
 	onClick,
 	ariaLabel,
 }) => {
-	// TODO dismiss tooltip
-	const popover = usePopover();
-
 	return (
 		<button
 			type="button"
 			aria-label={ariaLabel ?? ""}
 			css={styles.action}
-			onClick={(event) => {
-				event.stopPropagation();
-				onClick();
-				popover.setOpen(false);
-			}}
+			onClick={onClick}
 		>
 			<Icon css={styles.actionIcon} />
 			{children}
diff --git a/site/src/modules/resources/AgentOutdatedTooltip.tsx b/site/src/modules/resources/AgentOutdatedTooltip.tsx
index 113762648ebc6..520e92a3ac287 100644
--- a/site/src/modules/resources/AgentOutdatedTooltip.tsx
+++ b/site/src/modules/resources/AgentOutdatedTooltip.tsx
@@ -10,8 +10,9 @@ import {
 } from "components/HelpTooltip/HelpTooltip";
 import { Stack } from "components/Stack/Stack";
 import { RotateCcwIcon } from "lucide-react";
-import type { FC } from "react";
+import { useState, type FC } from "react";
 import { agentVersionStatus } from "../../utils/workspace";
+import { TooltipProvider, TooltipTrigger } from "components/Tooltip/Tooltip";
 
 type AgentOutdatedTooltipProps = {
 	agent: WorkspaceAgent;
@@ -26,6 +27,8 @@ export const AgentOutdatedTooltip: FC<AgentOutdatedTooltipProps> = ({
 	status,
 	onUpdate,
 }) => {
+	const [isOpen, setIsOpen] = useState(false);
+
 	const title =
 		status === agentVersionStatus.Outdated
 			? "Agent Outdated"
@@ -37,44 +40,50 @@ export const AgentOutdatedTooltip: FC<AgentOutdatedTooltipProps> = ({
 	const text = `${opener} This can happen after you update Coder with running workspaces. To fix this, you can stop and start the workspace.`;
 
 	return (
-		<HelpTooltip>
-			<PopoverTrigger>
-				<span role="status" className="cursor-pointer">
-					{status === agentVersionStatus.Outdated ? "Outdated" : "Deprecated"}
-				</span>
-			</PopoverTrigger>
-			<HelpTooltipContent>
-				<Stack spacing={1}>
-					<div>
-						<HelpTooltipTitle>{title}</HelpTooltipTitle>
-						<HelpTooltipText>{text}</HelpTooltipText>
-					</div>
+		<TooltipProvider>
+			<HelpTooltip open={isOpen} onOpenChange={setIsOpen}>
+				<TooltipTrigger asChild>
+					<span role="status" className="cursor-pointer">
+						{status === agentVersionStatus.Outdated ? "Outdated" : "Deprecated"}
+					</span>
+				</TooltipTrigger>
+				<HelpTooltipContent>
+					<Stack spacing={1}>
+						<div>
+							<HelpTooltipTitle>{title}</HelpTooltipTitle>
+							<HelpTooltipText>{text}</HelpTooltipText>
+						</div>
 
-					<Stack spacing={0.5}>
-						<span className="font-semibold text-content-primary">
-							Agent version
-						</span>
-						<span>{agent.version}</span>
-					</Stack>
+						<Stack spacing={0.5}>
+							<span className="font-semibold text-content-primary">
+								Agent version
+							</span>
+							<span>{agent.version}</span>
+						</Stack>
 
-					<Stack spacing={0.5}>
-						<span className="font-semibold text-content-primary">
-							Server version
-						</span>
-						<span>{serverVersion}</span>
-					</Stack>
+						<Stack spacing={0.5}>
+							<span className="font-semibold text-content-primary">
+								Server version
+							</span>
+							<span>{serverVersion}</span>
+						</Stack>
 
-					<HelpTooltipLinksGroup>
-						<HelpTooltipAction
-							icon={RotateCcwIcon}
-							onClick={onUpdate}
-							ariaLabel="Update workspace"
-						>
-							Update workspace
-						</HelpTooltipAction>
-					</HelpTooltipLinksGroup>
-				</Stack>
-			</HelpTooltipContent>
-		</HelpTooltip>
+						<HelpTooltipLinksGroup>
+							<HelpTooltipAction
+								icon={RotateCcwIcon}
+								onClick={() => {
+									onUpdate();
+									// TODO can we move this tooltip-closing logic to the definition of HelpTooltipAction?
+									setIsOpen(false);
+								}}
+								ariaLabel="Update workspace"
+							>
+								Update workspace
+							</HelpTooltipAction>
+						</HelpTooltipLinksGroup>
+					</Stack>
+				</HelpTooltipContent>
+			</HelpTooltip>
+		</TooltipProvider>
 	);
 };

From bea24d8b686f5ad6ca3e877dcf19ba43cd4ba512 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Thu, 28 Aug 2025 19:22:09 +0000
Subject: [PATCH 04/33] fix: remove HelpTooltipText from AgentLatency (div
 inside p)

---
 site/src/modules/resources/AgentLatency.tsx | 40 ++++++++++-----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/site/src/modules/resources/AgentLatency.tsx b/site/src/modules/resources/AgentLatency.tsx
index 0f5f436b62341..f25874023584d 100644
--- a/site/src/modules/resources/AgentLatency.tsx
+++ b/site/src/modules/resources/AgentLatency.tsx
@@ -60,28 +60,26 @@ export const AgentLatency: FC<AgentLatencyProps> = ({ agent }) => {
 						This is the latency overhead on non peer to peer connections. The
 						first row is the preferred relay.
 					</HelpTooltipText>
-					<HelpTooltipText>
-						<Stack direction="column" spacing={1} css={{ marginTop: 16 }}>
-							{Object.entries(agent.latency)
-								.sort(([, a], [, b]) => a.latency_ms - b.latency_ms)
-								.map(([regionName, region]) => (
-									<Stack
-										direction="row"
-										key={regionName}
-										spacing={0.5}
-										justifyContent="space-between"
-										css={
-											region.preferred && {
-												color: theme.palette.text.primary,
-											}
+					<Stack direction="column" spacing={1} css={{ marginTop: 16 }}>
+						{Object.entries(agent.latency)
+							.sort(([, a], [, b]) => a.latency_ms - b.latency_ms)
+							.map(([regionName, region]) => (
+								<Stack
+									direction="row"
+									key={regionName}
+									spacing={0.5}
+									justifyContent="space-between"
+									css={
+										region.preferred && {
+											color: theme.palette.text.primary,
 										}
-									>
-										<strong>{regionName}</strong>
-										{Math.round(region.latency_ms)}ms
-									</Stack>
-								))}
-						</Stack>
-					</HelpTooltipText>
+									}
+								>
+									<strong>{regionName}</strong>
+									{Math.round(region.latency_ms)}ms
+								</Stack>
+							))}
+					</Stack>
 				</HelpTooltipContent>
 			</HelpTooltip>
 		</TooltipProvider>

From 9e6fa0c2193054ab1d794d78261392f1ace92833 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Thu, 28 Aug 2025 20:16:59 +0000
Subject: [PATCH 05/33] fix: add TooltipProvider to AuditHelpTooltip

---
 .../components/HelpTooltip/HelpTooltip.tsx    |  2 +-
 site/src/pages/AuditPage/AuditHelpTooltip.tsx | 27 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/site/src/components/HelpTooltip/HelpTooltip.tsx b/site/src/components/HelpTooltip/HelpTooltip.tsx
index 8c788661bff62..33070078b389c 100644
--- a/site/src/components/HelpTooltip/HelpTooltip.tsx
+++ b/site/src/components/HelpTooltip/HelpTooltip.tsx
@@ -73,7 +73,7 @@ export const HelpTooltipTrigger = forwardRef<
 	});
 
 	return (
-		<TooltipTrigger>
+		<TooltipTrigger asChild>
 			<button
 				{...buttonProps}
 				aria-label="More info"
diff --git a/site/src/pages/AuditPage/AuditHelpTooltip.tsx b/site/src/pages/AuditPage/AuditHelpTooltip.tsx
index 1d7acdf8a14da..55964e5f4daac 100644
--- a/site/src/pages/AuditPage/AuditHelpTooltip.tsx
+++ b/site/src/pages/AuditPage/AuditHelpTooltip.tsx
@@ -7,6 +7,7 @@ import {
 	HelpTooltipTitle,
 	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
+import { TooltipProvider } from "components/Tooltip/Tooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
 
@@ -18,18 +19,20 @@ const Language = {
 
 export const AuditHelpTooltip: FC = () => {
 	return (
-		<HelpTooltip>
-			<HelpTooltipTrigger />
+		<TooltipProvider>
+			<HelpTooltip>
+				<HelpTooltipTrigger />
 
-			<HelpTooltipContent>
-				<HelpTooltipTitle>{Language.title}</HelpTooltipTitle>
-				<HelpTooltipText>{Language.body}</HelpTooltipText>
-				<HelpTooltipLinksGroup>
-					<HelpTooltipLink href={docs("/admin/security/audit-logs")}>
-						{Language.docs}
-					</HelpTooltipLink>
-				</HelpTooltipLinksGroup>
-			</HelpTooltipContent>
-		</HelpTooltip>
+				<HelpTooltipContent>
+					<HelpTooltipTitle>{Language.title}</HelpTooltipTitle>
+					<HelpTooltipText>{Language.body}</HelpTooltipText>
+					<HelpTooltipLinksGroup>
+						<HelpTooltipLink href={docs("/admin/security/audit-logs")}>
+							{Language.docs}
+						</HelpTooltipLink>
+					</HelpTooltipLinksGroup>
+				</HelpTooltipContent>
+			</HelpTooltip>
+		</TooltipProvider>
 	);
 };

From 303222b1d13ad40bb74da8679ffbea1588191cdc Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Thu, 28 Aug 2025 20:58:49 +0000
Subject: [PATCH 06/33] fix: add TooltipProvider to ConnectionLogHelpTooltip,
 IdpOrgSyncPageView, TableColumnHelpTooltip, TemplateInsightsPage

---
 .../ConnectionLogHelpTooltip.tsx              | 27 ++++++------
 .../IdpOrgSyncPage/IdpOrgSyncPageView.tsx     | 20 +++++----
 .../UserTable/TableColumnHelpTooltip.tsx      | 31 +++++++------
 .../TemplateInsightsPage.tsx                  | 43 ++++++++++---------
 4 files changed, 66 insertions(+), 55 deletions(-)

diff --git a/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx b/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx
index be87c6e8a8b17..8fdfd268cb628 100644
--- a/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx
+++ b/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx
@@ -7,6 +7,7 @@ import {
 	HelpTooltipTitle,
 	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
+import { TooltipProvider } from "components/Tooltip/Tooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
 
@@ -18,18 +19,20 @@ const Language = {
 
 export const ConnectionLogHelpTooltip: FC = () => {
 	return (
-		<HelpTooltip>
-			<HelpTooltipTrigger />
+		<TooltipProvider>
+			<HelpTooltip>
+				<HelpTooltipTrigger />
 
-			<HelpTooltipContent>
-				<HelpTooltipTitle>{Language.title}</HelpTooltipTitle>
-				<HelpTooltipText>{Language.body}</HelpTooltipText>
-				<HelpTooltipLinksGroup>
-					<HelpTooltipLink href={docs("/admin/monitoring/connection-logs")}>
-						{Language.docs}
-					</HelpTooltipLink>
-				</HelpTooltipLinksGroup>
-			</HelpTooltipContent>
-		</HelpTooltip>
+				<HelpTooltipContent>
+					<HelpTooltipTitle>{Language.title}</HelpTooltipTitle>
+					<HelpTooltipText>{Language.body}</HelpTooltipText>
+					<HelpTooltipLinksGroup>
+						<HelpTooltipLink href={docs("/admin/monitoring/connection-logs")}>
+							{Language.docs}
+						</HelpTooltipLink>
+					</HelpTooltipLinksGroup>
+				</HelpTooltipContent>
+			</HelpTooltip>
+		</TooltipProvider>
 	);
 };
diff --git a/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx b/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx
index 1feb4a8707f9b..6a5d3b606294a 100644
--- a/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx
+++ b/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx
@@ -458,14 +458,16 @@ const OrganizationRow: FC<OrganizationRowProps> = ({
 
 const AssignDefaultOrgHelpTooltip: FC = () => {
 	return (
-		<HelpTooltip>
-			<HelpTooltipTrigger />
-			<HelpTooltipContent>
-				<HelpTooltipText>
-					Disabling will remove all users from the default organization if a
-					mapping for the default organization is not defined.
-				</HelpTooltipText>
-			</HelpTooltipContent>
-		</HelpTooltip>
+		<TooltipProvider>
+			<HelpTooltip>
+				<HelpTooltipTrigger />
+				<HelpTooltipContent>
+					<HelpTooltipText>
+						Disabling will remove all users from the default organization if a
+						mapping for the default organization is not defined.
+					</HelpTooltipText>
+				</HelpTooltipContent>
+			</HelpTooltip>
+		</TooltipProvider>
 	);
 };
diff --git a/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx b/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx
index 1cbc04c18f1b2..ae01492c8a994 100644
--- a/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx
+++ b/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx
@@ -7,6 +7,7 @@ import {
 	HelpTooltipTitle,
 	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
+import { TooltipProvider } from "components/Tooltip/Tooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
 
@@ -44,19 +45,21 @@ export const TableColumnHelpTooltip: FC<Props> = ({ variant }) => {
 	const variantLang = Language[variant];
 
 	return (
-		<HelpTooltip>
-			<HelpTooltipTrigger size="small" />
-			<HelpTooltipContent>
-				<HelpTooltipTitle>{variantLang.title}</HelpTooltipTitle>
-				<HelpTooltipText>{variantLang.text}</HelpTooltipText>
-				<HelpTooltipLinksGroup>
-					{variantLang.links.map((link) => (
-						<HelpTooltipLink key={link.text} href={link.href}>
-							{link.text}
-						</HelpTooltipLink>
-					))}
-				</HelpTooltipLinksGroup>
-			</HelpTooltipContent>
-		</HelpTooltip>
+		<TooltipProvider>
+			<HelpTooltip>
+				<HelpTooltipTrigger size="small" />
+				<HelpTooltipContent>
+					<HelpTooltipTitle>{variantLang.title}</HelpTooltipTitle>
+					<HelpTooltipText>{variantLang.text}</HelpTooltipText>
+					<HelpTooltipLinksGroup>
+						{variantLang.links.map((link) => (
+							<HelpTooltipLink key={link.text} href={link.href}>
+								{link.text}
+							</HelpTooltipLink>
+						))}
+					</HelpTooltipLinksGroup>
+				</HelpTooltipContent>
+			</HelpTooltip>
+		</TooltipProvider>
 	);
 };
diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
index 0c12d96625156..9c8930a341f31 100644
--- a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
+++ b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
@@ -61,6 +61,7 @@ import { DateRange as DailyPicker, type DateRangeValue } from "./DateRange";
 import { type InsightsInterval, IntervalMenu } from "./IntervalMenu";
 import { lastWeeks } from "./utils";
 import { numberOfWeeksOptions, WeekPicker } from "./WeekPicker";
+import { TooltipProvider } from "components/Tooltip/Tooltip";
 
 const DEFAULT_NUMBER_OF_WEEKS = numberOfWeeksOptions[0];
 
@@ -207,26 +208,28 @@ export const TemplateInsightsPageView: FC<TemplateInsightsPageViewProps> = ({
 					gap: 24,
 				}}
 			>
-				<ActiveUsersPanel
-					css={{ gridColumn: "span 2" }}
-					interval={interval}
-					userLimit={
-						entitlements?.features.user_limit.enabled
-							? entitlements?.features.user_limit.limit
-							: undefined
-					}
-					data={templateInsights?.interval_reports}
-				/>
-				<UsersLatencyPanel data={userLatency} />
-				<TemplateUsagePanel
-					css={{ gridColumn: "span 2" }}
-					data={templateInsights?.report?.apps_usage}
-				/>
-				<UsersActivityPanel data={userActivity} />
-				<TemplateParametersUsagePanel
-					css={{ gridColumn: "span 3" }}
-					data={templateInsights?.report?.parameters_usage}
-				/>
+				<TooltipProvider>
+					<ActiveUsersPanel
+						css={{ gridColumn: "span 2" }}
+						interval={interval}
+						userLimit={
+							entitlements?.features.user_limit.enabled
+								? entitlements?.features.user_limit.limit
+								: undefined
+						}
+						data={templateInsights?.interval_reports}
+					/>
+					<UsersLatencyPanel data={userLatency} />
+					<TemplateUsagePanel
+						css={{ gridColumn: "span 2" }}
+						data={templateInsights?.report?.apps_usage}
+					/>
+					<UsersActivityPanel data={userActivity} />
+					<TemplateParametersUsagePanel
+						css={{ gridColumn: "span 3" }}
+						data={templateInsights?.report?.parameters_usage}
+					/>
+				</TooltipProvider>
 			</div>
 		</>
 	);

From f835cb1bc8ee8061fd7ed1ca7bce588ce2005b08 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Thu, 28 Aug 2025 21:09:28 +0000
Subject: [PATCH 07/33] fix: add TooltipProvider to
 PublishTemplateVersionDialog

---
 .../components/HelpTooltip/HelpTooltip.tsx    |  3 +-
 site/src/components/Tooltip/Tooltip.tsx       | 10 ++--
 .../PublishTemplateVersionDialog.tsx          | 47 +++++++++++--------
 3 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/site/src/components/HelpTooltip/HelpTooltip.tsx b/site/src/components/HelpTooltip/HelpTooltip.tsx
index 33070078b389c..6c2384f13f800 100644
--- a/site/src/components/HelpTooltip/HelpTooltip.tsx
+++ b/site/src/components/HelpTooltip/HelpTooltip.tsx
@@ -5,11 +5,12 @@ import {
 	type Theme,
 } from "@emotion/react";
 import Link from "@mui/material/Link";
-import { TooltipContentProps, TooltipProps } from "@radix-ui/react-tooltip";
+import { TooltipProps } from "@radix-ui/react-tooltip";
 import { Stack } from "components/Stack/Stack";
 import {
 	Tooltip,
 	TooltipContent,
+	type TooltipContentProps,
 	TooltipTrigger,
 } from "components/Tooltip/Tooltip";
 import { CircleHelpIcon, ExternalLinkIcon } from "lucide-react";
diff --git a/site/src/components/Tooltip/Tooltip.tsx b/site/src/components/Tooltip/Tooltip.tsx
index c437240ec949f..e5eff91a0c181 100644
--- a/site/src/components/Tooltip/Tooltip.tsx
+++ b/site/src/components/Tooltip/Tooltip.tsx
@@ -12,11 +12,15 @@ export const Tooltip = TooltipPrimitive.Root;
 
 export const TooltipTrigger = TooltipPrimitive.Trigger;
 
+export type TooltipContentProps = React.ComponentPropsWithoutRef<
+	typeof TooltipPrimitive.Content
+> & {
+	disablePortal?: boolean;
+};
+
 export const TooltipContent = React.forwardRef<
 	React.ElementRef<typeof TooltipPrimitive.Content>,
-	React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content> & {
-		disablePortal?: boolean;
-	}
+	TooltipContentProps
 >(({ className, sideOffset = 4, disablePortal, ...props }, ref) => {
 	const content = (
 		<TooltipPrimitive.Content
diff --git a/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx b/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
index fcba193d8e8ae..87c0144706a9b 100644
--- a/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
+++ b/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
@@ -20,6 +20,7 @@ import {
 	HelpTooltipTrigger,
 } from "../../components/HelpTooltip/HelpTooltip";
 import { docs } from "../../utils/docs";
+import { TooltipProvider } from "components/Tooltip/Tooltip";
 
 export const Language = {
 	versionNameLabel: "Version name",
@@ -120,27 +121,33 @@ export const PublishTemplateVersionDialog: FC<
 									}
 								/>
 
-								<HelpTooltip>
-									<HelpTooltipTrigger />
+								<TooltipProvider>
+									<HelpTooltip>
+										<HelpTooltipTrigger />
 
-									<HelpTooltipContent>
-										<HelpTooltipTitle>
-											{Language.activeVersionHelpTitle}
-										</HelpTooltipTitle>
-										<HelpTooltipText>
-											{Language.activeVersionHelpText}
-										</HelpTooltipText>
-										<HelpTooltipLinksGroup>
-											<HelpTooltipLink
-												href={docs(
-													"/admin/templates/managing-templates#template-update-policies",
-												)}
-											>
-												{Language.activeVersionHelpBody}
-											</HelpTooltipLink>
-										</HelpTooltipLinksGroup>
-									</HelpTooltipContent>
-								</HelpTooltip>
+										{/**
+										 * Without disablePortal, the tooltip will render under the dialog;
+										 * this prop may not need to be set when we switch away from MuiDialog
+										 */}
+										<HelpTooltipContent disablePortal>
+											<HelpTooltipTitle>
+												{Language.activeVersionHelpTitle}
+											</HelpTooltipTitle>
+											<HelpTooltipText>
+												{Language.activeVersionHelpText}
+											</HelpTooltipText>
+											<HelpTooltipLinksGroup>
+												<HelpTooltipLink
+													href={docs(
+														"/admin/templates/managing-templates#template-update-policies",
+													)}
+												>
+													{Language.activeVersionHelpBody}
+												</HelpTooltipLink>
+											</HelpTooltipLinksGroup>
+										</HelpTooltipContent>
+									</HelpTooltip>
+								</TooltipProvider>
 							</Stack>
 						</FormFields>
 					</Stack>

From dd7e233bac1327c75188a7153b64ef2ff6fee593 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 00:03:50 +0000
Subject: [PATCH 08/33] fix: add TooltipProvider to TemplateHelpTooltip

---
 .../pages/TemplatesPage/TemplatesPageView.tsx | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/site/src/pages/TemplatesPage/TemplatesPageView.tsx b/site/src/pages/TemplatesPage/TemplatesPageView.tsx
index a37cb31232816..ef45651318fc8 100644
--- a/site/src/pages/TemplatesPage/TemplatesPageView.tsx
+++ b/site/src/pages/TemplatesPage/TemplatesPageView.tsx
@@ -52,6 +52,7 @@ import {
 } from "utils/templates";
 import { EmptyTemplates } from "./EmptyTemplates";
 import { TemplatesFilter } from "./TemplatesFilter";
+import { TooltipProvider } from "components/Tooltip/Tooltip";
 
 const Language = {
 	developerCount: (activeCount: number): string => {
@@ -71,18 +72,20 @@ const Language = {
 
 const TemplateHelpTooltip: FC = () => {
 	return (
-		<HelpTooltip>
-			<HelpTooltipTrigger />
-			<HelpTooltipContent>
-				<HelpTooltipTitle>{Language.templateTooltipTitle}</HelpTooltipTitle>
-				<HelpTooltipText>{Language.templateTooltipText}</HelpTooltipText>
-				<HelpTooltipLinksGroup>
-					<HelpTooltipLink href={docs("/admin/templates")}>
-						{Language.templateTooltipLink}
-					</HelpTooltipLink>
-				</HelpTooltipLinksGroup>
-			</HelpTooltipContent>
-		</HelpTooltip>
+		<TooltipProvider>
+			<HelpTooltip>
+				<HelpTooltipTrigger />
+				<HelpTooltipContent>
+					<HelpTooltipTitle>{Language.templateTooltipTitle}</HelpTooltipTitle>
+					<HelpTooltipText>{Language.templateTooltipText}</HelpTooltipText>
+					<HelpTooltipLinksGroup>
+						<HelpTooltipLink href={docs("/admin/templates")}>
+							{Language.templateTooltipLink}
+						</HelpTooltipLink>
+					</HelpTooltipLinksGroup>
+				</HelpTooltipContent>
+			</HelpTooltip>
+		</TooltipProvider>
 	);
 };
 

From d397fff43568a8b74e26312b42e5f297387aecc3 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 00:36:48 +0000
Subject: [PATCH 09/33] fix: add TooltipProvider to WorkspaceHelpTooltip

---
 .../WorkspacesPage/WorkspaceHelpTooltip.tsx   | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx b/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx
index c462c2d81ae0f..4eb71b37d2001 100644
--- a/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx
+++ b/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx
@@ -7,6 +7,7 @@ import {
 	HelpTooltipTitle,
 	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
+import { TooltipProvider } from "components/Tooltip/Tooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
 
@@ -21,20 +22,22 @@ const Language = {
 
 export const WorkspaceHelpTooltip: FC = () => {
 	return (
-		<HelpTooltip>
-			<HelpTooltipTrigger />
-			<HelpTooltipContent>
-				<HelpTooltipTitle>{Language.workspaceTooltipTitle}</HelpTooltipTitle>
-				<HelpTooltipText>{Language.workspaceTooltipText}</HelpTooltipText>
-				<HelpTooltipLinksGroup>
-					<HelpTooltipLink href={docs("/user-guides")}>
-						{Language.workspaceTooltipLink1}
-					</HelpTooltipLink>
-					<HelpTooltipLink href={docs("/user-guides/workspace-access")}>
-						{Language.workspaceTooltipLink2}
-					</HelpTooltipLink>
-				</HelpTooltipLinksGroup>
-			</HelpTooltipContent>
-		</HelpTooltip>
+		<TooltipProvider>
+			<HelpTooltip>
+				<HelpTooltipTrigger />
+				<HelpTooltipContent>
+					<HelpTooltipTitle>{Language.workspaceTooltipTitle}</HelpTooltipTitle>
+					<HelpTooltipText>{Language.workspaceTooltipText}</HelpTooltipText>
+					<HelpTooltipLinksGroup>
+						<HelpTooltipLink href={docs("/user-guides")}>
+							{Language.workspaceTooltipLink1}
+						</HelpTooltipLink>
+						<HelpTooltipLink href={docs("/user-guides/workspace-access")}>
+							{Language.workspaceTooltipLink2}
+						</HelpTooltipLink>
+					</HelpTooltipLinksGroup>
+				</HelpTooltipContent>
+			</HelpTooltip>
+		</TooltipProvider>
 	);
 };

From 6134badf59bcb341dd4891ee2ec03fc48dcca50f Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 00:50:06 +0000
Subject: [PATCH 10/33] fix: add TooltipProvider to WorkspaceOurdatedTooltip

---
 .../WorkspaceOutdatedTooltip.tsx              | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
index e1e83d502781a..3228818f9d391 100644
--- a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
+++ b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
@@ -4,7 +4,6 @@ import Skeleton from "@mui/material/Skeleton";
 import { getErrorDetail, getErrorMessage } from "api/errors";
 import { templateVersion } from "api/queries/templates";
 import type { Workspace } from "api/typesGenerated";
-import { usePopover } from "components/deprecated/Popover/Popover";
 import { displayError } from "components/GlobalSnackbar/utils";
 import {
 	HelpTooltip,
@@ -17,36 +16,46 @@ import {
 } from "components/HelpTooltip/HelpTooltip";
 import { InfoIcon, RotateCcwIcon } from "lucide-react";
 import { linkToTemplate, useLinks } from "modules/navigation";
-import type { FC } from "react";
+import { useState, type FC } from "react";
 import { useQuery } from "react-query";
 import {
 	useWorkspaceUpdate,
 	WorkspaceUpdateDialogs,
 } from "../WorkspaceUpdateDialogs";
+import { TooltipProvider } from "components/Tooltip/Tooltip";
 
 interface TooltipProps {
 	workspace: Workspace;
 }
 
 export const WorkspaceOutdatedTooltip: FC<TooltipProps> = (props) => {
+	const [isOpen, setIsOpen] = useState(false);
+
 	return (
-		<HelpTooltip>
-			<HelpTooltipTrigger size="small" hoverEffect={false}>
-				<InfoIcon css={styles.icon} />
-				<span className="sr-only">Outdated info</span>
-			</HelpTooltipTrigger>
-			<WorkspaceOutdatedTooltipContent {...props} />
-		</HelpTooltip>
+		<TooltipProvider>
+			<HelpTooltip open={isOpen} onOpenChange={setIsOpen}>
+				<HelpTooltipTrigger size="small" hoverEffect={false}>
+					<InfoIcon css={styles.icon} />
+					<span className="sr-only">Outdated info</span>
+				</HelpTooltipTrigger>
+				<WorkspaceOutdatedTooltipContent isOpen={isOpen} {...props} />
+			</HelpTooltip>
+		</TooltipProvider>
 	);
 };
 
-const WorkspaceOutdatedTooltipContent: FC<TooltipProps> = ({ workspace }) => {
+type TooltipContentProps = TooltipProps & { isOpen: boolean };
+
+const WorkspaceOutdatedTooltipContent: FC<TooltipContentProps> = ({
+	workspace,
+	isOpen,
+}) => {
 	const getLink = useLinks();
 	const theme = useTheme();
-	const popover = usePopover();
 	const { data: activeVersion } = useQuery({
 		...templateVersion(workspace.template_active_version_id),
-		enabled: popover.open,
+		// TODO is making the parent HelpTooltip a controlled component the only way to track whether the tooltip is open?
+		enabled: isOpen,
 	});
 	const updateWorkspace = useWorkspaceUpdate({
 		workspace,

From ad562be915a693ab6a64e87ec70d102530dedded Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 01:09:44 +0000
Subject: [PATCH 11/33] fix: add TooltipProvider to SubAgentOutdatedTooltip

---
 site/src/modules/resources/AgentStatus.tsx    | 44 ++++++++--------
 .../resources/SubAgentOutdatedTooltip.tsx     | 51 ++++++++++---------
 2 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/site/src/modules/resources/AgentStatus.tsx b/site/src/modules/resources/AgentStatus.tsx
index 543c31313d043..47ec56cae13c2 100644
--- a/site/src/modules/resources/AgentStatus.tsx
+++ b/site/src/modules/resources/AgentStatus.tsx
@@ -309,27 +309,29 @@ const SubAgentStatus: FC<SubAgentStatusProps> = ({ agent }) => {
 
 const DevcontainerStartError: FC<AgentStatusProps> = ({ agent }) => {
 	return (
-		<HelpTooltip>
-			<TooltipTrigger asChild role="status" aria-label="Start error">
-				<TriangleAlertIcon css={styles.errorWarning} />
-			</TooltipTrigger>
-			<HelpTooltipContent>
-				<HelpTooltipTitle>
-					Error starting the devcontainer agent
-				</HelpTooltipTitle>
-				<HelpTooltipText>
-					Something went wrong during the devcontainer agent startup.{" "}
-					<Link
-						target="_blank"
-						rel="noreferrer"
-						href={agent.troubleshooting_url}
-					>
-						Troubleshoot
-					</Link>
-					.
-				</HelpTooltipText>
-			</HelpTooltipContent>
-		</HelpTooltip>
+		<TooltipProvider>
+			<HelpTooltip>
+				<TooltipTrigger asChild role="status" aria-label="Start error">
+					<TriangleAlertIcon css={styles.errorWarning} />
+				</TooltipTrigger>
+				<HelpTooltipContent>
+					<HelpTooltipTitle>
+						Error starting the devcontainer agent
+					</HelpTooltipTitle>
+					<HelpTooltipText>
+						Something went wrong during the devcontainer agent startup.{" "}
+						<Link
+							target="_blank"
+							rel="noreferrer"
+							href={agent.troubleshooting_url}
+						>
+							Troubleshoot
+						</Link>
+						.
+					</HelpTooltipText>
+				</HelpTooltipContent>
+			</HelpTooltip>
+		</TooltipProvider>
 	);
 };
 
diff --git a/site/src/modules/resources/SubAgentOutdatedTooltip.tsx b/site/src/modules/resources/SubAgentOutdatedTooltip.tsx
index c32b4c30c863b..e81ea4216e747 100644
--- a/site/src/modules/resources/SubAgentOutdatedTooltip.tsx
+++ b/site/src/modules/resources/SubAgentOutdatedTooltip.tsx
@@ -12,6 +12,7 @@ import {
 	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { Stack } from "components/Stack/Stack";
+import { TooltipProvider } from "components/Tooltip/Tooltip";
 import { RotateCcwIcon } from "lucide-react";
 import type { FC } from "react";
 
@@ -38,30 +39,32 @@ export const SubAgentOutdatedTooltip: FC<SubAgentOutdatedTooltipProps> = ({
 	const text = `${opener} This can happen if you modify your devcontainer.json file after the Dev Container has been created. To fix this, you can rebuild the Dev Container.`;
 
 	return (
-		<HelpTooltip>
-			<HelpTooltipTrigger>
-				<span role="status" className="cursor-pointer">
-					Outdated
-				</span>
-			</HelpTooltipTrigger>
-			<HelpTooltipContent>
-				<Stack spacing={1}>
-					<div>
-						<HelpTooltipTitle>{title}</HelpTooltipTitle>
-						<HelpTooltipText>{text}</HelpTooltipText>
-					</div>
+		<TooltipProvider>
+			<HelpTooltip>
+				<HelpTooltipTrigger>
+					<span role="status" className="cursor-pointer">
+						Outdated
+					</span>
+				</HelpTooltipTrigger>
+				<HelpTooltipContent>
+					<Stack spacing={1}>
+						<div>
+							<HelpTooltipTitle>{title}</HelpTooltipTitle>
+							<HelpTooltipText>{text}</HelpTooltipText>
+						</div>
 
-					<HelpTooltipLinksGroup>
-						<HelpTooltipAction
-							icon={RotateCcwIcon}
-							onClick={onUpdate}
-							ariaLabel="Rebuild Dev Container"
-						>
-							Rebuild Dev Container
-						</HelpTooltipAction>
-					</HelpTooltipLinksGroup>
-				</Stack>
-			</HelpTooltipContent>
-		</HelpTooltip>
+						<HelpTooltipLinksGroup>
+							<HelpTooltipAction
+								icon={RotateCcwIcon}
+								onClick={onUpdate}
+								ariaLabel="Rebuild Dev Container"
+							>
+								Rebuild Dev Container
+							</HelpTooltipAction>
+						</HelpTooltipLinksGroup>
+					</Stack>
+				</HelpTooltipContent>
+			</HelpTooltip>
+		</TooltipProvider>
 	);
 };

From d30170cd19f09e36063570ce0eea7d80fb3abcab Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 01:36:30 +0000
Subject: [PATCH 12/33] fix: add TooltipProvider to EditRolesButton

---
 .../UserTable/EditRolesButton.stories.tsx     | 11 ++++++++++
 .../UserTable/EditRolesButton.tsx             | 21 +++++++++++--------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.stories.tsx b/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.stories.tsx
index 7b6b29c4cca3d..48a03a15d2b43 100644
--- a/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.stories.tsx
+++ b/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.stories.tsx
@@ -43,6 +43,17 @@ export const Loading: Story = {
 	},
 };
 
+export const CannotSetRoles: Story = {
+	args: {
+		userLoginType: "oidc",
+		oidcRoleSync: true,
+	},
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		await userEvent.hover(canvas.getByLabelText("More info"));
+	},
+};
+
 export const AdvancedOpen: Story = {
 	args: {
 		selectedRoleNames: new Set([MockWorkspaceCreationBanRole.name]),
diff --git a/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx b/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx
index 4983e671aa5a6..916b13e7b9c81 100644
--- a/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx
+++ b/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx
@@ -16,6 +16,7 @@ import {
 	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { EditSquare } from "components/Icons/EditSquare";
+import { TooltipProvider } from "components/Tooltip/Tooltip";
 import { UserIcon } from "lucide-react";
 import { type FC, useEffect, useState } from "react";
 
@@ -82,15 +83,17 @@ export const EditRolesButton: FC<EditRolesButtonProps> = (props) => {
 
 	if (!canSetRoles) {
 		return (
-			<HelpTooltip>
-				<HelpTooltipTrigger size="small" />
-				<HelpTooltipContent>
-					<HelpTooltipTitle>Externally controlled</HelpTooltipTitle>
-					<HelpTooltipText>
-						Roles for this user are controlled by the OIDC identity provider.
-					</HelpTooltipText>
-				</HelpTooltipContent>
-			</HelpTooltip>
+			<TooltipProvider>
+				<HelpTooltip>
+					<HelpTooltipTrigger size="small" />
+					<HelpTooltipContent>
+						<HelpTooltipTitle>Externally controlled</HelpTooltipTitle>
+						<HelpTooltipText>
+							Roles for this user are controlled by the OIDC identity provider.
+						</HelpTooltipText>
+					</HelpTooltipContent>
+				</HelpTooltip>
+			</TooltipProvider>
 		);
 	}
 

From 4438af836b5c6467185f9b08e2271203713d9d8c Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 01:49:30 +0000
Subject: [PATCH 13/33] fix: add TooltipProvider to
 AutoCreateMissingGroupsHelpTooltip and LegacyGroupSyncHeader

---
 .../IdpSyncPage/IdpGroupSyncForm.tsx          | 54 ++++++++++---------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
index 1be01567f6bb3..0c6ada4b5bcbc 100644
--- a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
+++ b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
@@ -413,15 +413,17 @@ const GroupRow: FC<GroupRowProps> = ({
 
 const AutoCreateMissingGroupsHelpTooltip: FC = () => {
 	return (
-		<HelpTooltip>
-			<HelpTooltipTrigger />
-			<HelpTooltipContent>
-				<HelpTooltipText>
-					Enabling auto create missing groups will automatically create groups
-					returned by the OIDC provider if they do not exist in Coder.
-				</HelpTooltipText>
-			</HelpTooltipContent>
-		</HelpTooltip>
+		<TooltipProvider>
+			<HelpTooltip>
+				<HelpTooltipTrigger />
+				<HelpTooltipContent>
+					<HelpTooltipText>
+						Enabling auto create missing groups will automatically create groups
+						returned by the OIDC provider if they do not exist in Coder.
+					</HelpTooltipText>
+				</HelpTooltipContent>
+			</HelpTooltip>
+		</TooltipProvider>
 	);
 };
 
@@ -430,22 +432,24 @@ const LegacyGroupSyncHeader: FC = () => {
 		<h4 className="text-xl font-medium">
 			<div className="flex items-end gap-2">
 				<span>Legacy group sync settings</span>
-				<HelpTooltip>
-					<HelpTooltipTrigger />
-					<HelpTooltipContent>
-						<HelpTooltipTitle>Legacy group sync settings</HelpTooltipTitle>
-						<HelpTooltipText>
-							These settings were configured using environment variables, and
-							only apply to the default organization. It is now recommended to
-							configure IdP sync via the CLI or the UI, which enables sync to be
-							configured for any organization, and for those settings to be
-							persisted without manually setting environment variables.{" "}
-							<Link href={docs("/admin/users/idp-sync")}>
-								Learn more&hellip;
-							</Link>
-						</HelpTooltipText>
-					</HelpTooltipContent>
-				</HelpTooltip>
+				<TooltipProvider>
+					<HelpTooltip>
+						<HelpTooltipTrigger />
+						<HelpTooltipContent>
+							<HelpTooltipTitle>Legacy group sync settings</HelpTooltipTitle>
+							<HelpTooltipText>
+								These settings were configured using environment variables, and
+								only apply to the default organization. It is now recommended to
+								configure IdP sync via the CLI or the UI, which enables sync to
+								be configured for any organization, and for those settings to be
+								persisted without manually setting environment variables.{" "}
+								<Link href={docs("/admin/users/idp-sync")}>
+									Learn more&hellip;
+								</Link>
+							</HelpTooltipText>
+						</HelpTooltipContent>
+					</HelpTooltip>
+				</TooltipProvider>
 			</div>
 		</h4>
 	);

From 00b70ea6f2382bcf7d8e503f048ce843fb47621e Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 02:31:18 +0000
Subject: [PATCH 14/33] refactor: extract TooltipProvder to definition of
 HelpTooltip

---
 .../components/HelpTooltip/HelpTooltip.tsx    |  7 +-
 site/src/modules/resources/AgentLatency.tsx   | 78 +++++++++--------
 .../resources/AgentOutdatedTooltip.tsx        | 84 +++++++++----------
 site/src/modules/resources/AgentStatus.tsx    | 30 ++++---
 .../resources/SubAgentOutdatedTooltip.tsx     | 51 ++++++-----
 .../WorkspaceOutdatedTooltip.tsx              | 17 ++--
 site/src/pages/AuditPage/AuditHelpTooltip.tsx | 27 +++---
 .../ConnectionLogHelpTooltip.tsx              | 27 +++---
 .../IdpOrgSyncPage/IdpOrgSyncPageView.tsx     | 20 ++---
 .../IdpSyncPage/IdpGroupSyncForm.tsx          | 54 ++++++------
 .../UserTable/EditRolesButton.tsx             | 21 ++---
 .../UserTable/TableColumnHelpTooltip.tsx      | 31 ++++---
 .../TemplateInsightsPage.tsx                  | 43 +++++-----
 .../PublishTemplateVersionDialog.tsx          | 51 ++++++-----
 .../pages/TemplatesPage/TemplatesPageView.tsx | 27 +++---
 .../WorkspacesPage/WorkspaceHelpTooltip.tsx   | 33 ++++----
 16 files changed, 282 insertions(+), 319 deletions(-)

diff --git a/site/src/components/HelpTooltip/HelpTooltip.tsx b/site/src/components/HelpTooltip/HelpTooltip.tsx
index 6c2384f13f800..696d96f1c0e59 100644
--- a/site/src/components/HelpTooltip/HelpTooltip.tsx
+++ b/site/src/components/HelpTooltip/HelpTooltip.tsx
@@ -11,6 +11,7 @@ import {
 	Tooltip,
 	TooltipContent,
 	type TooltipContentProps,
+	TooltipProvider,
 	TooltipTrigger,
 } from "components/Tooltip/Tooltip";
 import { CircleHelpIcon, ExternalLinkIcon } from "lucide-react";
@@ -30,7 +31,11 @@ type Size = "small" | "medium";
 export const HelpTooltipIcon = CircleHelpIcon;
 
 export const HelpTooltip: FC<TooltipProps> = (props) => {
-	return <Tooltip delayDuration={0} {...props} />;
+	return (
+		<TooltipProvider>
+			<Tooltip delayDuration={0} {...props} />
+		</TooltipProvider>
+	);
 };
 
 export const HelpTooltipContent: FC<TooltipContentProps> = ({
diff --git a/site/src/modules/resources/AgentLatency.tsx b/site/src/modules/resources/AgentLatency.tsx
index f25874023584d..80892ffd15142 100644
--- a/site/src/modules/resources/AgentLatency.tsx
+++ b/site/src/modules/resources/AgentLatency.tsx
@@ -7,7 +7,7 @@ import {
 	HelpTooltipTitle,
 } from "components/HelpTooltip/HelpTooltip";
 import { Stack } from "components/Stack/Stack";
-import { TooltipProvider, TooltipTrigger } from "components/Tooltip/Tooltip";
+import { TooltipTrigger } from "components/Tooltip/Tooltip";
 import type { FC } from "react";
 import { getLatencyColor } from "utils/latency";
 
@@ -43,45 +43,43 @@ export const AgentLatency: FC<AgentLatencyProps> = ({ agent }) => {
 	}
 
 	return (
-		<TooltipProvider>
-			<HelpTooltip>
-				<TooltipTrigger asChild>
-					<span
-						role="presentation"
-						aria-label="latency"
-						css={{ cursor: "pointer", color: latency.color }}
-					>
-						{Math.round(latency.latency_ms)}ms
-					</span>
-				</TooltipTrigger>
-				<HelpTooltipContent>
-					<HelpTooltipTitle>Latency</HelpTooltipTitle>
-					<HelpTooltipText>
-						This is the latency overhead on non peer to peer connections. The
-						first row is the preferred relay.
-					</HelpTooltipText>
-					<Stack direction="column" spacing={1} css={{ marginTop: 16 }}>
-						{Object.entries(agent.latency)
-							.sort(([, a], [, b]) => a.latency_ms - b.latency_ms)
-							.map(([regionName, region]) => (
-								<Stack
-									direction="row"
-									key={regionName}
-									spacing={0.5}
-									justifyContent="space-between"
-									css={
-										region.preferred && {
-											color: theme.palette.text.primary,
-										}
+		<HelpTooltip>
+			<TooltipTrigger asChild>
+				<span
+					role="presentation"
+					aria-label="latency"
+					css={{ cursor: "pointer", color: latency.color }}
+				>
+					{Math.round(latency.latency_ms)}ms
+				</span>
+			</TooltipTrigger>
+			<HelpTooltipContent>
+				<HelpTooltipTitle>Latency</HelpTooltipTitle>
+				<HelpTooltipText>
+					This is the latency overhead on non peer to peer connections. The
+					first row is the preferred relay.
+				</HelpTooltipText>
+				<Stack direction="column" spacing={1} css={{ marginTop: 16 }}>
+					{Object.entries(agent.latency)
+						.sort(([, a], [, b]) => a.latency_ms - b.latency_ms)
+						.map(([regionName, region]) => (
+							<Stack
+								direction="row"
+								key={regionName}
+								spacing={0.5}
+								justifyContent="space-between"
+								css={
+									region.preferred && {
+										color: theme.palette.text.primary,
 									}
-								>
-									<strong>{regionName}</strong>
-									{Math.round(region.latency_ms)}ms
-								</Stack>
-							))}
-					</Stack>
-				</HelpTooltipContent>
-			</HelpTooltip>
-		</TooltipProvider>
+								}
+							>
+								<strong>{regionName}</strong>
+								{Math.round(region.latency_ms)}ms
+							</Stack>
+						))}
+				</Stack>
+			</HelpTooltipContent>
+		</HelpTooltip>
 	);
 };
diff --git a/site/src/modules/resources/AgentOutdatedTooltip.tsx b/site/src/modules/resources/AgentOutdatedTooltip.tsx
index 520e92a3ac287..c8b767a5993f4 100644
--- a/site/src/modules/resources/AgentOutdatedTooltip.tsx
+++ b/site/src/modules/resources/AgentOutdatedTooltip.tsx
@@ -12,7 +12,7 @@ import { Stack } from "components/Stack/Stack";
 import { RotateCcwIcon } from "lucide-react";
 import { useState, type FC } from "react";
 import { agentVersionStatus } from "../../utils/workspace";
-import { TooltipProvider, TooltipTrigger } from "components/Tooltip/Tooltip";
+import { TooltipTrigger } from "components/Tooltip/Tooltip";
 
 type AgentOutdatedTooltipProps = {
 	agent: WorkspaceAgent;
@@ -40,50 +40,48 @@ export const AgentOutdatedTooltip: FC<AgentOutdatedTooltipProps> = ({
 	const text = `${opener} This can happen after you update Coder with running workspaces. To fix this, you can stop and start the workspace.`;
 
 	return (
-		<TooltipProvider>
-			<HelpTooltip open={isOpen} onOpenChange={setIsOpen}>
-				<TooltipTrigger asChild>
-					<span role="status" className="cursor-pointer">
-						{status === agentVersionStatus.Outdated ? "Outdated" : "Deprecated"}
-					</span>
-				</TooltipTrigger>
-				<HelpTooltipContent>
-					<Stack spacing={1}>
-						<div>
-							<HelpTooltipTitle>{title}</HelpTooltipTitle>
-							<HelpTooltipText>{text}</HelpTooltipText>
-						</div>
+		<HelpTooltip open={isOpen} onOpenChange={setIsOpen}>
+			<TooltipTrigger asChild>
+				<span role="status" className="cursor-pointer">
+					{status === agentVersionStatus.Outdated ? "Outdated" : "Deprecated"}
+				</span>
+			</TooltipTrigger>
+			<HelpTooltipContent>
+				<Stack spacing={1}>
+					<div>
+						<HelpTooltipTitle>{title}</HelpTooltipTitle>
+						<HelpTooltipText>{text}</HelpTooltipText>
+					</div>
 
-						<Stack spacing={0.5}>
-							<span className="font-semibold text-content-primary">
-								Agent version
-							</span>
-							<span>{agent.version}</span>
-						</Stack>
-
-						<Stack spacing={0.5}>
-							<span className="font-semibold text-content-primary">
-								Server version
-							</span>
-							<span>{serverVersion}</span>
-						</Stack>
+					<Stack spacing={0.5}>
+						<span className="font-semibold text-content-primary">
+							Agent version
+						</span>
+						<span>{agent.version}</span>
+					</Stack>
 
-						<HelpTooltipLinksGroup>
-							<HelpTooltipAction
-								icon={RotateCcwIcon}
-								onClick={() => {
-									onUpdate();
-									// TODO can we move this tooltip-closing logic to the definition of HelpTooltipAction?
-									setIsOpen(false);
-								}}
-								ariaLabel="Update workspace"
-							>
-								Update workspace
-							</HelpTooltipAction>
-						</HelpTooltipLinksGroup>
+					<Stack spacing={0.5}>
+						<span className="font-semibold text-content-primary">
+							Server version
+						</span>
+						<span>{serverVersion}</span>
 					</Stack>
-				</HelpTooltipContent>
-			</HelpTooltip>
-		</TooltipProvider>
+
+					<HelpTooltipLinksGroup>
+						<HelpTooltipAction
+							icon={RotateCcwIcon}
+							onClick={() => {
+								onUpdate();
+								// TODO can we move this tooltip-closing logic to the definition of HelpTooltipAction?
+								setIsOpen(false);
+							}}
+							ariaLabel="Update workspace"
+						>
+							Update workspace
+						</HelpTooltipAction>
+					</HelpTooltipLinksGroup>
+				</Stack>
+			</HelpTooltipContent>
+		</HelpTooltip>
 	);
 };
diff --git a/site/src/modules/resources/AgentStatus.tsx b/site/src/modules/resources/AgentStatus.tsx
index 47ec56cae13c2..9df8ae7598e93 100644
--- a/site/src/modules/resources/AgentStatus.tsx
+++ b/site/src/modules/resources/AgentStatus.tsx
@@ -266,22 +266,20 @@ const TimeoutStatus: FC<AgentStatusProps> = ({ agent }) => {
 
 export const AgentStatus: FC<AgentStatusProps> = ({ agent }) => {
 	return (
-		<TooltipProvider>
-			<ChooseOne>
-				<Cond condition={agent.status === "connected"}>
-					<ConnectedStatus agent={agent} />
-				</Cond>
-				<Cond condition={agent.status === "disconnected"}>
-					<DisconnectedStatus />
-				</Cond>
-				<Cond condition={agent.status === "timeout"}>
-					<TimeoutStatus agent={agent} />
-				</Cond>
-				<Cond>
-					<ConnectingStatus />
-				</Cond>
-			</ChooseOne>
-		</TooltipProvider>
+		<ChooseOne>
+			<Cond condition={agent.status === "connected"}>
+				<ConnectedStatus agent={agent} />
+			</Cond>
+			<Cond condition={agent.status === "disconnected"}>
+				<DisconnectedStatus />
+			</Cond>
+			<Cond condition={agent.status === "timeout"}>
+				<TimeoutStatus agent={agent} />
+			</Cond>
+			<Cond>
+				<ConnectingStatus />
+			</Cond>
+		</ChooseOne>
 	);
 };
 
diff --git a/site/src/modules/resources/SubAgentOutdatedTooltip.tsx b/site/src/modules/resources/SubAgentOutdatedTooltip.tsx
index e81ea4216e747..c32b4c30c863b 100644
--- a/site/src/modules/resources/SubAgentOutdatedTooltip.tsx
+++ b/site/src/modules/resources/SubAgentOutdatedTooltip.tsx
@@ -12,7 +12,6 @@ import {
 	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { Stack } from "components/Stack/Stack";
-import { TooltipProvider } from "components/Tooltip/Tooltip";
 import { RotateCcwIcon } from "lucide-react";
 import type { FC } from "react";
 
@@ -39,32 +38,30 @@ export const SubAgentOutdatedTooltip: FC<SubAgentOutdatedTooltipProps> = ({
 	const text = `${opener} This can happen if you modify your devcontainer.json file after the Dev Container has been created. To fix this, you can rebuild the Dev Container.`;
 
 	return (
-		<TooltipProvider>
-			<HelpTooltip>
-				<HelpTooltipTrigger>
-					<span role="status" className="cursor-pointer">
-						Outdated
-					</span>
-				</HelpTooltipTrigger>
-				<HelpTooltipContent>
-					<Stack spacing={1}>
-						<div>
-							<HelpTooltipTitle>{title}</HelpTooltipTitle>
-							<HelpTooltipText>{text}</HelpTooltipText>
-						</div>
+		<HelpTooltip>
+			<HelpTooltipTrigger>
+				<span role="status" className="cursor-pointer">
+					Outdated
+				</span>
+			</HelpTooltipTrigger>
+			<HelpTooltipContent>
+				<Stack spacing={1}>
+					<div>
+						<HelpTooltipTitle>{title}</HelpTooltipTitle>
+						<HelpTooltipText>{text}</HelpTooltipText>
+					</div>
 
-						<HelpTooltipLinksGroup>
-							<HelpTooltipAction
-								icon={RotateCcwIcon}
-								onClick={onUpdate}
-								ariaLabel="Rebuild Dev Container"
-							>
-								Rebuild Dev Container
-							</HelpTooltipAction>
-						</HelpTooltipLinksGroup>
-					</Stack>
-				</HelpTooltipContent>
-			</HelpTooltip>
-		</TooltipProvider>
+					<HelpTooltipLinksGroup>
+						<HelpTooltipAction
+							icon={RotateCcwIcon}
+							onClick={onUpdate}
+							ariaLabel="Rebuild Dev Container"
+						>
+							Rebuild Dev Container
+						</HelpTooltipAction>
+					</HelpTooltipLinksGroup>
+				</Stack>
+			</HelpTooltipContent>
+		</HelpTooltip>
 	);
 };
diff --git a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
index 3228818f9d391..cf9fc51fdb643 100644
--- a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
+++ b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
@@ -22,7 +22,6 @@ import {
 	useWorkspaceUpdate,
 	WorkspaceUpdateDialogs,
 } from "../WorkspaceUpdateDialogs";
-import { TooltipProvider } from "components/Tooltip/Tooltip";
 
 interface TooltipProps {
 	workspace: Workspace;
@@ -32,15 +31,13 @@ export const WorkspaceOutdatedTooltip: FC<TooltipProps> = (props) => {
 	const [isOpen, setIsOpen] = useState(false);
 
 	return (
-		<TooltipProvider>
-			<HelpTooltip open={isOpen} onOpenChange={setIsOpen}>
-				<HelpTooltipTrigger size="small" hoverEffect={false}>
-					<InfoIcon css={styles.icon} />
-					<span className="sr-only">Outdated info</span>
-				</HelpTooltipTrigger>
-				<WorkspaceOutdatedTooltipContent isOpen={isOpen} {...props} />
-			</HelpTooltip>
-		</TooltipProvider>
+		<HelpTooltip open={isOpen} onOpenChange={setIsOpen}>
+			<HelpTooltipTrigger size="small" hoverEffect={false}>
+				<InfoIcon css={styles.icon} />
+				<span className="sr-only">Outdated info</span>
+			</HelpTooltipTrigger>
+			<WorkspaceOutdatedTooltipContent isOpen={isOpen} {...props} />
+		</HelpTooltip>
 	);
 };
 
diff --git a/site/src/pages/AuditPage/AuditHelpTooltip.tsx b/site/src/pages/AuditPage/AuditHelpTooltip.tsx
index 55964e5f4daac..1d7acdf8a14da 100644
--- a/site/src/pages/AuditPage/AuditHelpTooltip.tsx
+++ b/site/src/pages/AuditPage/AuditHelpTooltip.tsx
@@ -7,7 +7,6 @@ import {
 	HelpTooltipTitle,
 	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
-import { TooltipProvider } from "components/Tooltip/Tooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
 
@@ -19,20 +18,18 @@ const Language = {
 
 export const AuditHelpTooltip: FC = () => {
 	return (
-		<TooltipProvider>
-			<HelpTooltip>
-				<HelpTooltipTrigger />
+		<HelpTooltip>
+			<HelpTooltipTrigger />
 
-				<HelpTooltipContent>
-					<HelpTooltipTitle>{Language.title}</HelpTooltipTitle>
-					<HelpTooltipText>{Language.body}</HelpTooltipText>
-					<HelpTooltipLinksGroup>
-						<HelpTooltipLink href={docs("/admin/security/audit-logs")}>
-							{Language.docs}
-						</HelpTooltipLink>
-					</HelpTooltipLinksGroup>
-				</HelpTooltipContent>
-			</HelpTooltip>
-		</TooltipProvider>
+			<HelpTooltipContent>
+				<HelpTooltipTitle>{Language.title}</HelpTooltipTitle>
+				<HelpTooltipText>{Language.body}</HelpTooltipText>
+				<HelpTooltipLinksGroup>
+					<HelpTooltipLink href={docs("/admin/security/audit-logs")}>
+						{Language.docs}
+					</HelpTooltipLink>
+				</HelpTooltipLinksGroup>
+			</HelpTooltipContent>
+		</HelpTooltip>
 	);
 };
diff --git a/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx b/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx
index 8fdfd268cb628..be87c6e8a8b17 100644
--- a/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx
+++ b/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx
@@ -7,7 +7,6 @@ import {
 	HelpTooltipTitle,
 	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
-import { TooltipProvider } from "components/Tooltip/Tooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
 
@@ -19,20 +18,18 @@ const Language = {
 
 export const ConnectionLogHelpTooltip: FC = () => {
 	return (
-		<TooltipProvider>
-			<HelpTooltip>
-				<HelpTooltipTrigger />
+		<HelpTooltip>
+			<HelpTooltipTrigger />
 
-				<HelpTooltipContent>
-					<HelpTooltipTitle>{Language.title}</HelpTooltipTitle>
-					<HelpTooltipText>{Language.body}</HelpTooltipText>
-					<HelpTooltipLinksGroup>
-						<HelpTooltipLink href={docs("/admin/monitoring/connection-logs")}>
-							{Language.docs}
-						</HelpTooltipLink>
-					</HelpTooltipLinksGroup>
-				</HelpTooltipContent>
-			</HelpTooltip>
-		</TooltipProvider>
+			<HelpTooltipContent>
+				<HelpTooltipTitle>{Language.title}</HelpTooltipTitle>
+				<HelpTooltipText>{Language.body}</HelpTooltipText>
+				<HelpTooltipLinksGroup>
+					<HelpTooltipLink href={docs("/admin/monitoring/connection-logs")}>
+						{Language.docs}
+					</HelpTooltipLink>
+				</HelpTooltipLinksGroup>
+			</HelpTooltipContent>
+		</HelpTooltip>
 	);
 };
diff --git a/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx b/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx
index 6a5d3b606294a..1feb4a8707f9b 100644
--- a/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx
+++ b/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx
@@ -458,16 +458,14 @@ const OrganizationRow: FC<OrganizationRowProps> = ({
 
 const AssignDefaultOrgHelpTooltip: FC = () => {
 	return (
-		<TooltipProvider>
-			<HelpTooltip>
-				<HelpTooltipTrigger />
-				<HelpTooltipContent>
-					<HelpTooltipText>
-						Disabling will remove all users from the default organization if a
-						mapping for the default organization is not defined.
-					</HelpTooltipText>
-				</HelpTooltipContent>
-			</HelpTooltip>
-		</TooltipProvider>
+		<HelpTooltip>
+			<HelpTooltipTrigger />
+			<HelpTooltipContent>
+				<HelpTooltipText>
+					Disabling will remove all users from the default organization if a
+					mapping for the default organization is not defined.
+				</HelpTooltipText>
+			</HelpTooltipContent>
+		</HelpTooltip>
 	);
 };
diff --git a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
index 0c6ada4b5bcbc..1be01567f6bb3 100644
--- a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
+++ b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
@@ -413,17 +413,15 @@ const GroupRow: FC<GroupRowProps> = ({
 
 const AutoCreateMissingGroupsHelpTooltip: FC = () => {
 	return (
-		<TooltipProvider>
-			<HelpTooltip>
-				<HelpTooltipTrigger />
-				<HelpTooltipContent>
-					<HelpTooltipText>
-						Enabling auto create missing groups will automatically create groups
-						returned by the OIDC provider if they do not exist in Coder.
-					</HelpTooltipText>
-				</HelpTooltipContent>
-			</HelpTooltip>
-		</TooltipProvider>
+		<HelpTooltip>
+			<HelpTooltipTrigger />
+			<HelpTooltipContent>
+				<HelpTooltipText>
+					Enabling auto create missing groups will automatically create groups
+					returned by the OIDC provider if they do not exist in Coder.
+				</HelpTooltipText>
+			</HelpTooltipContent>
+		</HelpTooltip>
 	);
 };
 
@@ -432,24 +430,22 @@ const LegacyGroupSyncHeader: FC = () => {
 		<h4 className="text-xl font-medium">
 			<div className="flex items-end gap-2">
 				<span>Legacy group sync settings</span>
-				<TooltipProvider>
-					<HelpTooltip>
-						<HelpTooltipTrigger />
-						<HelpTooltipContent>
-							<HelpTooltipTitle>Legacy group sync settings</HelpTooltipTitle>
-							<HelpTooltipText>
-								These settings were configured using environment variables, and
-								only apply to the default organization. It is now recommended to
-								configure IdP sync via the CLI or the UI, which enables sync to
-								be configured for any organization, and for those settings to be
-								persisted without manually setting environment variables.{" "}
-								<Link href={docs("/admin/users/idp-sync")}>
-									Learn more&hellip;
-								</Link>
-							</HelpTooltipText>
-						</HelpTooltipContent>
-					</HelpTooltip>
-				</TooltipProvider>
+				<HelpTooltip>
+					<HelpTooltipTrigger />
+					<HelpTooltipContent>
+						<HelpTooltipTitle>Legacy group sync settings</HelpTooltipTitle>
+						<HelpTooltipText>
+							These settings were configured using environment variables, and
+							only apply to the default organization. It is now recommended to
+							configure IdP sync via the CLI or the UI, which enables sync to be
+							configured for any organization, and for those settings to be
+							persisted without manually setting environment variables.{" "}
+							<Link href={docs("/admin/users/idp-sync")}>
+								Learn more&hellip;
+							</Link>
+						</HelpTooltipText>
+					</HelpTooltipContent>
+				</HelpTooltip>
 			</div>
 		</h4>
 	);
diff --git a/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx b/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx
index 916b13e7b9c81..4983e671aa5a6 100644
--- a/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx
+++ b/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx
@@ -16,7 +16,6 @@ import {
 	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { EditSquare } from "components/Icons/EditSquare";
-import { TooltipProvider } from "components/Tooltip/Tooltip";
 import { UserIcon } from "lucide-react";
 import { type FC, useEffect, useState } from "react";
 
@@ -83,17 +82,15 @@ export const EditRolesButton: FC<EditRolesButtonProps> = (props) => {
 
 	if (!canSetRoles) {
 		return (
-			<TooltipProvider>
-				<HelpTooltip>
-					<HelpTooltipTrigger size="small" />
-					<HelpTooltipContent>
-						<HelpTooltipTitle>Externally controlled</HelpTooltipTitle>
-						<HelpTooltipText>
-							Roles for this user are controlled by the OIDC identity provider.
-						</HelpTooltipText>
-					</HelpTooltipContent>
-				</HelpTooltip>
-			</TooltipProvider>
+			<HelpTooltip>
+				<HelpTooltipTrigger size="small" />
+				<HelpTooltipContent>
+					<HelpTooltipTitle>Externally controlled</HelpTooltipTitle>
+					<HelpTooltipText>
+						Roles for this user are controlled by the OIDC identity provider.
+					</HelpTooltipText>
+				</HelpTooltipContent>
+			</HelpTooltip>
 		);
 	}
 
diff --git a/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx b/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx
index ae01492c8a994..1cbc04c18f1b2 100644
--- a/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx
+++ b/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx
@@ -7,7 +7,6 @@ import {
 	HelpTooltipTitle,
 	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
-import { TooltipProvider } from "components/Tooltip/Tooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
 
@@ -45,21 +44,19 @@ export const TableColumnHelpTooltip: FC<Props> = ({ variant }) => {
 	const variantLang = Language[variant];
 
 	return (
-		<TooltipProvider>
-			<HelpTooltip>
-				<HelpTooltipTrigger size="small" />
-				<HelpTooltipContent>
-					<HelpTooltipTitle>{variantLang.title}</HelpTooltipTitle>
-					<HelpTooltipText>{variantLang.text}</HelpTooltipText>
-					<HelpTooltipLinksGroup>
-						{variantLang.links.map((link) => (
-							<HelpTooltipLink key={link.text} href={link.href}>
-								{link.text}
-							</HelpTooltipLink>
-						))}
-					</HelpTooltipLinksGroup>
-				</HelpTooltipContent>
-			</HelpTooltip>
-		</TooltipProvider>
+		<HelpTooltip>
+			<HelpTooltipTrigger size="small" />
+			<HelpTooltipContent>
+				<HelpTooltipTitle>{variantLang.title}</HelpTooltipTitle>
+				<HelpTooltipText>{variantLang.text}</HelpTooltipText>
+				<HelpTooltipLinksGroup>
+					{variantLang.links.map((link) => (
+						<HelpTooltipLink key={link.text} href={link.href}>
+							{link.text}
+						</HelpTooltipLink>
+					))}
+				</HelpTooltipLinksGroup>
+			</HelpTooltipContent>
+		</HelpTooltip>
 	);
 };
diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
index 9c8930a341f31..0c12d96625156 100644
--- a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
+++ b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
@@ -61,7 +61,6 @@ import { DateRange as DailyPicker, type DateRangeValue } from "./DateRange";
 import { type InsightsInterval, IntervalMenu } from "./IntervalMenu";
 import { lastWeeks } from "./utils";
 import { numberOfWeeksOptions, WeekPicker } from "./WeekPicker";
-import { TooltipProvider } from "components/Tooltip/Tooltip";
 
 const DEFAULT_NUMBER_OF_WEEKS = numberOfWeeksOptions[0];
 
@@ -208,28 +207,26 @@ export const TemplateInsightsPageView: FC<TemplateInsightsPageViewProps> = ({
 					gap: 24,
 				}}
 			>
-				<TooltipProvider>
-					<ActiveUsersPanel
-						css={{ gridColumn: "span 2" }}
-						interval={interval}
-						userLimit={
-							entitlements?.features.user_limit.enabled
-								? entitlements?.features.user_limit.limit
-								: undefined
-						}
-						data={templateInsights?.interval_reports}
-					/>
-					<UsersLatencyPanel data={userLatency} />
-					<TemplateUsagePanel
-						css={{ gridColumn: "span 2" }}
-						data={templateInsights?.report?.apps_usage}
-					/>
-					<UsersActivityPanel data={userActivity} />
-					<TemplateParametersUsagePanel
-						css={{ gridColumn: "span 3" }}
-						data={templateInsights?.report?.parameters_usage}
-					/>
-				</TooltipProvider>
+				<ActiveUsersPanel
+					css={{ gridColumn: "span 2" }}
+					interval={interval}
+					userLimit={
+						entitlements?.features.user_limit.enabled
+							? entitlements?.features.user_limit.limit
+							: undefined
+					}
+					data={templateInsights?.interval_reports}
+				/>
+				<UsersLatencyPanel data={userLatency} />
+				<TemplateUsagePanel
+					css={{ gridColumn: "span 2" }}
+					data={templateInsights?.report?.apps_usage}
+				/>
+				<UsersActivityPanel data={userActivity} />
+				<TemplateParametersUsagePanel
+					css={{ gridColumn: "span 3" }}
+					data={templateInsights?.report?.parameters_usage}
+				/>
 			</div>
 		</>
 	);
diff --git a/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx b/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
index 87c0144706a9b..d6c7188257a72 100644
--- a/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
+++ b/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
@@ -20,7 +20,6 @@ import {
 	HelpTooltipTrigger,
 } from "../../components/HelpTooltip/HelpTooltip";
 import { docs } from "../../utils/docs";
-import { TooltipProvider } from "components/Tooltip/Tooltip";
 
 export const Language = {
 	versionNameLabel: "Version name",
@@ -121,33 +120,31 @@ export const PublishTemplateVersionDialog: FC<
 									}
 								/>
 
-								<TooltipProvider>
-									<HelpTooltip>
-										<HelpTooltipTrigger />
+								<HelpTooltip>
+									<HelpTooltipTrigger />
 
-										{/**
-										 * Without disablePortal, the tooltip will render under the dialog;
-										 * this prop may not need to be set when we switch away from MuiDialog
-										 */}
-										<HelpTooltipContent disablePortal>
-											<HelpTooltipTitle>
-												{Language.activeVersionHelpTitle}
-											</HelpTooltipTitle>
-											<HelpTooltipText>
-												{Language.activeVersionHelpText}
-											</HelpTooltipText>
-											<HelpTooltipLinksGroup>
-												<HelpTooltipLink
-													href={docs(
-														"/admin/templates/managing-templates#template-update-policies",
-													)}
-												>
-													{Language.activeVersionHelpBody}
-												</HelpTooltipLink>
-											</HelpTooltipLinksGroup>
-										</HelpTooltipContent>
-									</HelpTooltip>
-								</TooltipProvider>
+									{/**
+									 * Without disablePortal, the tooltip will render under the dialog;
+									 * this prop may not need to be set when we switch away from MuiDialog
+									 */}
+									<HelpTooltipContent disablePortal>
+										<HelpTooltipTitle>
+											{Language.activeVersionHelpTitle}
+										</HelpTooltipTitle>
+										<HelpTooltipText>
+											{Language.activeVersionHelpText}
+										</HelpTooltipText>
+										<HelpTooltipLinksGroup>
+											<HelpTooltipLink
+												href={docs(
+													"/admin/templates/managing-templates#template-update-policies",
+												)}
+											>
+												{Language.activeVersionHelpBody}
+											</HelpTooltipLink>
+										</HelpTooltipLinksGroup>
+									</HelpTooltipContent>
+								</HelpTooltip>
 							</Stack>
 						</FormFields>
 					</Stack>
diff --git a/site/src/pages/TemplatesPage/TemplatesPageView.tsx b/site/src/pages/TemplatesPage/TemplatesPageView.tsx
index ef45651318fc8..a37cb31232816 100644
--- a/site/src/pages/TemplatesPage/TemplatesPageView.tsx
+++ b/site/src/pages/TemplatesPage/TemplatesPageView.tsx
@@ -52,7 +52,6 @@ import {
 } from "utils/templates";
 import { EmptyTemplates } from "./EmptyTemplates";
 import { TemplatesFilter } from "./TemplatesFilter";
-import { TooltipProvider } from "components/Tooltip/Tooltip";
 
 const Language = {
 	developerCount: (activeCount: number): string => {
@@ -72,20 +71,18 @@ const Language = {
 
 const TemplateHelpTooltip: FC = () => {
 	return (
-		<TooltipProvider>
-			<HelpTooltip>
-				<HelpTooltipTrigger />
-				<HelpTooltipContent>
-					<HelpTooltipTitle>{Language.templateTooltipTitle}</HelpTooltipTitle>
-					<HelpTooltipText>{Language.templateTooltipText}</HelpTooltipText>
-					<HelpTooltipLinksGroup>
-						<HelpTooltipLink href={docs("/admin/templates")}>
-							{Language.templateTooltipLink}
-						</HelpTooltipLink>
-					</HelpTooltipLinksGroup>
-				</HelpTooltipContent>
-			</HelpTooltip>
-		</TooltipProvider>
+		<HelpTooltip>
+			<HelpTooltipTrigger />
+			<HelpTooltipContent>
+				<HelpTooltipTitle>{Language.templateTooltipTitle}</HelpTooltipTitle>
+				<HelpTooltipText>{Language.templateTooltipText}</HelpTooltipText>
+				<HelpTooltipLinksGroup>
+					<HelpTooltipLink href={docs("/admin/templates")}>
+						{Language.templateTooltipLink}
+					</HelpTooltipLink>
+				</HelpTooltipLinksGroup>
+			</HelpTooltipContent>
+		</HelpTooltip>
 	);
 };
 
diff --git a/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx b/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx
index 4eb71b37d2001..c462c2d81ae0f 100644
--- a/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx
+++ b/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx
@@ -7,7 +7,6 @@ import {
 	HelpTooltipTitle,
 	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
-import { TooltipProvider } from "components/Tooltip/Tooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
 
@@ -22,22 +21,20 @@ const Language = {
 
 export const WorkspaceHelpTooltip: FC = () => {
 	return (
-		<TooltipProvider>
-			<HelpTooltip>
-				<HelpTooltipTrigger />
-				<HelpTooltipContent>
-					<HelpTooltipTitle>{Language.workspaceTooltipTitle}</HelpTooltipTitle>
-					<HelpTooltipText>{Language.workspaceTooltipText}</HelpTooltipText>
-					<HelpTooltipLinksGroup>
-						<HelpTooltipLink href={docs("/user-guides")}>
-							{Language.workspaceTooltipLink1}
-						</HelpTooltipLink>
-						<HelpTooltipLink href={docs("/user-guides/workspace-access")}>
-							{Language.workspaceTooltipLink2}
-						</HelpTooltipLink>
-					</HelpTooltipLinksGroup>
-				</HelpTooltipContent>
-			</HelpTooltip>
-		</TooltipProvider>
+		<HelpTooltip>
+			<HelpTooltipTrigger />
+			<HelpTooltipContent>
+				<HelpTooltipTitle>{Language.workspaceTooltipTitle}</HelpTooltipTitle>
+				<HelpTooltipText>{Language.workspaceTooltipText}</HelpTooltipText>
+				<HelpTooltipLinksGroup>
+					<HelpTooltipLink href={docs("/user-guides")}>
+						{Language.workspaceTooltipLink1}
+					</HelpTooltipLink>
+					<HelpTooltipLink href={docs("/user-guides/workspace-access")}>
+						{Language.workspaceTooltipLink2}
+					</HelpTooltipLink>
+				</HelpTooltipLinksGroup>
+			</HelpTooltipContent>
+		</HelpTooltip>
 	);
 };

From c59daf3b45252c80b3e50cba7b1012a6e4291982 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 02:35:21 +0000
Subject: [PATCH 15/33] refactor: remove extract TooltipProvider from
 DevContainerStartError

---
 site/src/modules/resources/AgentStatus.tsx | 46 +++++++++++-----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/site/src/modules/resources/AgentStatus.tsx b/site/src/modules/resources/AgentStatus.tsx
index 9df8ae7598e93..ab0cf054bb0a2 100644
--- a/site/src/modules/resources/AgentStatus.tsx
+++ b/site/src/modules/resources/AgentStatus.tsx
@@ -12,7 +12,7 @@ import {
 	HelpTooltipText,
 	HelpTooltipTitle,
 } from "components/HelpTooltip/HelpTooltip";
-import { TooltipProvider, TooltipTrigger } from "components/Tooltip/Tooltip";
+import { TooltipTrigger } from "components/Tooltip/Tooltip";
 import { TriangleAlertIcon } from "lucide-react";
 import type { FC } from "react";
 
@@ -307,29 +307,27 @@ const SubAgentStatus: FC<SubAgentStatusProps> = ({ agent }) => {
 
 const DevcontainerStartError: FC<AgentStatusProps> = ({ agent }) => {
 	return (
-		<TooltipProvider>
-			<HelpTooltip>
-				<TooltipTrigger asChild role="status" aria-label="Start error">
-					<TriangleAlertIcon css={styles.errorWarning} />
-				</TooltipTrigger>
-				<HelpTooltipContent>
-					<HelpTooltipTitle>
-						Error starting the devcontainer agent
-					</HelpTooltipTitle>
-					<HelpTooltipText>
-						Something went wrong during the devcontainer agent startup.{" "}
-						<Link
-							target="_blank"
-							rel="noreferrer"
-							href={agent.troubleshooting_url}
-						>
-							Troubleshoot
-						</Link>
-						.
-					</HelpTooltipText>
-				</HelpTooltipContent>
-			</HelpTooltip>
-		</TooltipProvider>
+		<HelpTooltip>
+			<TooltipTrigger asChild role="status" aria-label="Start error">
+				<TriangleAlertIcon css={styles.errorWarning} />
+			</TooltipTrigger>
+			<HelpTooltipContent>
+				<HelpTooltipTitle>
+					Error starting the devcontainer agent
+				</HelpTooltipTitle>
+				<HelpTooltipText>
+					Something went wrong during the devcontainer agent startup.{" "}
+					<Link
+						target="_blank"
+						rel="noreferrer"
+						href={agent.troubleshooting_url}
+					>
+						Troubleshoot
+					</Link>
+					.
+				</HelpTooltipText>
+			</HelpTooltipContent>
+		</HelpTooltip>
 	);
 };
 

From 3aeaa49a7864ec6f804b6b65665fb91f3549d503 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 02:40:29 +0000
Subject: [PATCH 16/33] test: add PublishDTemplateVersionDialog story

---
 .../TemplateVersionEditor.stories.tsx                       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/site/src/pages/TemplateVersionEditorPage/TemplateVersionEditor.stories.tsx b/site/src/pages/TemplateVersionEditorPage/TemplateVersionEditor.stories.tsx
index 897446db61c6e..77082b71c5a84 100644
--- a/site/src/pages/TemplateVersionEditorPage/TemplateVersionEditor.stories.tsx
+++ b/site/src/pages/TemplateVersionEditorPage/TemplateVersionEditor.stories.tsx
@@ -157,6 +157,12 @@ export const WithError = {
 	},
 };
 
+export const PublishDialog = {
+	args: {
+		isAskingPublishParameters: true,
+	},
+};
+
 export const Published = {
 	args: {
 		publishedVersion: MockTemplateVersion,

From eaf3baf10ed09acdf49248ecaab4e82f584c452f Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 06:02:57 +0000
Subject: [PATCH 17/33] chore: remove unused import

---
 site/src/modules/resources/AgentOutdatedTooltip.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/site/src/modules/resources/AgentOutdatedTooltip.tsx b/site/src/modules/resources/AgentOutdatedTooltip.tsx
index c8b767a5993f4..7f414fe96b4cf 100644
--- a/site/src/modules/resources/AgentOutdatedTooltip.tsx
+++ b/site/src/modules/resources/AgentOutdatedTooltip.tsx
@@ -1,5 +1,4 @@
 import type { WorkspaceAgent } from "api/typesGenerated";
-import { PopoverTrigger } from "components/deprecated/Popover/Popover";
 import {
 	HelpTooltip,
 	HelpTooltipAction,

From c93e092e84dee04e66ae2196ff40bb3fc31cce46 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 17:58:15 +0000
Subject: [PATCH 18/33] refactor: rename Tooltip to MUITooltip

---
 site/src/pages/WorkspacePage/WorkspaceTopbar.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx b/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
index b6b21b6f226b9..87a00d1d78f36 100644
--- a/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
@@ -1,6 +1,6 @@
 import { type Interpolation, type Theme, useTheme } from "@emotion/react";
 import Link from "@mui/material/Link";
-import Tooltip from "@mui/material/Tooltip";
+import MUITooltip from "@mui/material/Tooltip";
 import { workspaceQuota } from "api/queries/workspaceQuota";
 import type * as TypesGen from "api/typesGenerated";
 import { Avatar } from "components/Avatar/Avatar";
@@ -105,11 +105,11 @@ export const WorkspaceTopbar: FC<WorkspaceProps> = ({
 
 	return (
 		<Topbar css={{ gridArea: "topbar" }}>
-			<Tooltip title="Back to workspaces">
+			<MUITooltip title="Back to workspaces">
 				<TopbarIconButton component={RouterLink} to="/workspaces">
 					<ChevronLeftIcon className="size-icon-sm" />
 				</TopbarIconButton>
-			</Tooltip>
+			</MUITooltip>
 
 			<div css={styles.topbarLeft}>
 				<TopbarData>

From ef6cceb009b4e95fa928f75d5a2ef83f90a8d937 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 18:20:51 +0000
Subject: [PATCH 19/33] refactor: replace Popover in OwnerBreadcrumb,
 WorkspaceBreadcrumb, OrganizationBreadcrumb

---
 .../components/HelpTooltip/HelpTooltip.tsx    |  1 +
 .../pages/WorkspacePage/WorkspaceTopbar.tsx   | 46 ++++++++-----------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/site/src/components/HelpTooltip/HelpTooltip.tsx b/site/src/components/HelpTooltip/HelpTooltip.tsx
index 696d96f1c0e59..f743bc3a552f0 100644
--- a/site/src/components/HelpTooltip/HelpTooltip.tsx
+++ b/site/src/components/HelpTooltip/HelpTooltip.tsx
@@ -46,6 +46,7 @@ export const HelpTooltipContent: FC<TooltipContentProps> = ({
 		<TooltipContent
 			side="bottom"
 			align="start"
+			collisionPadding={16} // 1rem
 			{...props}
 			className={cn(
 				"w-[320px] p-5 bg-surface-secondary border-surface-quaternary text-sm",
diff --git a/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx b/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
index 87a00d1d78f36..b047a94999baa 100644
--- a/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
@@ -6,7 +6,6 @@ import type * as TypesGen from "api/typesGenerated";
 import { Avatar } from "components/Avatar/Avatar";
 import { AvatarData } from "components/Avatar/AvatarData";
 import { CopyButton } from "components/CopyButton/CopyButton";
-import { Popover, PopoverTrigger } from "components/deprecated/Popover/Popover";
 import {
 	Topbar,
 	TopbarAvatar,
@@ -15,7 +14,10 @@ import {
 	TopbarIcon,
 	TopbarIconButton,
 } from "components/FullPageLayout/Topbar";
-import { HelpTooltipContent } from "components/HelpTooltip/HelpTooltip";
+import {
+	HelpTooltip,
+	HelpTooltipContent,
+} from "components/HelpTooltip/HelpTooltip";
 import { ChevronLeftIcon, CircleDollarSign, TrashIcon } from "lucide-react";
 import { useDashboard } from "modules/dashboard/useDashboard";
 import { linkToTemplate, useLinks } from "modules/navigation";
@@ -28,6 +30,7 @@ import type { WorkspacePermissions } from "../../modules/workspaces/permissions"
 import { WorkspaceActions } from "./WorkspaceActions/WorkspaceActions";
 import { WorkspaceNotifications } from "./WorkspaceNotifications/WorkspaceNotifications";
 import { WorkspaceScheduleControls } from "./WorkspaceScheduleControls";
+import { TooltipTrigger } from "components/Tooltip/Tooltip";
 
 interface WorkspaceProps {
 	isUpdating: boolean;
@@ -253,21 +256,18 @@ const OwnerBreadcrumb: FC<OwnerBreadcrumbProps> = ({
 	ownerAvatarUrl,
 }) => {
 	return (
-		<Popover mode="hover">
-			<PopoverTrigger>
+		<HelpTooltip>
+			<TooltipTrigger asChild>
 				<span css={styles.breadcrumbSegment}>
 					<Avatar size="sm" fallback={ownerName} src={ownerAvatarUrl} />
 					<span css={styles.breadcrumbText}>{ownerName}</span>
 				</span>
-			</PopoverTrigger>
+			</TooltipTrigger>
 
-			<HelpTooltipContent
-				anchorOrigin={{ vertical: "bottom", horizontal: "center" }}
-				transformOrigin={{ vertical: "top", horizontal: "center" }}
-			>
+			<HelpTooltipContent align="center">
 				<AvatarData title={ownerName} subtitle="Owner" src={ownerAvatarUrl} />
 			</HelpTooltipContent>
-		</Popover>
+		</HelpTooltip>
 	);
 };
 
@@ -283,8 +283,8 @@ const OrganizationBreadcrumb: FC<OrganizationBreadcrumbProps> = ({
 	orgIconUrl,
 }) => {
 	return (
-		<Popover mode="hover">
-			<PopoverTrigger>
+		<HelpTooltip>
+			<TooltipTrigger asChild>
 				<span css={styles.breadcrumbSegment}>
 					<Avatar
 						size="sm"
@@ -294,12 +294,9 @@ const OrganizationBreadcrumb: FC<OrganizationBreadcrumbProps> = ({
 					/>
 					<span css={styles.breadcrumbText}>{orgName}</span>
 				</span>
-			</PopoverTrigger>
+			</TooltipTrigger>
 
-			<HelpTooltipContent
-				anchorOrigin={{ vertical: "bottom", horizontal: "center" }}
-				transformOrigin={{ vertical: "top", horizontal: "center" }}
-			>
+			<HelpTooltipContent align="center">
 				<AvatarData
 					title={
 						orgPageUrl ? (
@@ -323,7 +320,7 @@ const OrganizationBreadcrumb: FC<OrganizationBreadcrumbProps> = ({
 					imgFallbackText={orgName}
 				/>
 			</HelpTooltipContent>
-		</Popover>
+		</HelpTooltip>
 	);
 };
 
@@ -346,8 +343,8 @@ const WorkspaceBreadcrumb: FC<WorkspaceBreadcrumbProps> = ({
 }) => {
 	return (
 		<div className="flex items-center">
-			<Popover mode="hover">
-				<PopoverTrigger>
+			<HelpTooltip>
+				<TooltipTrigger asChild>
 					<span css={styles.breadcrumbSegment}>
 						<TopbarAvatar
 							src={templateIconUrl}
@@ -358,12 +355,9 @@ const WorkspaceBreadcrumb: FC<WorkspaceBreadcrumbProps> = ({
 							{workspaceName}
 						</span>
 					</span>
-				</PopoverTrigger>
+				</TooltipTrigger>
 
-				<HelpTooltipContent
-					anchorOrigin={{ vertical: "bottom", horizontal: "center" }}
-					transformOrigin={{ vertical: "top", horizontal: "center" }}
-				>
+				<HelpTooltipContent align="center">
 					<AvatarData
 						title={
 							<Link
@@ -393,7 +387,7 @@ const WorkspaceBreadcrumb: FC<WorkspaceBreadcrumbProps> = ({
 						imgFallbackText={templateDisplayName}
 					/>
 				</HelpTooltipContent>
-			</Popover>
+			</HelpTooltip>
 			<CopyButton text={workspaceName} label="Copy workspace name" />
 		</div>
 	);

From c142b5adee67f531d447b62511ebc93eb412c8ac Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 18:46:07 +0000
Subject: [PATCH 20/33] chore: check:fix

---
 site/src/components/HelpTooltip/HelpTooltip.tsx               | 2 +-
 site/src/modules/resources/AgentOutdatedTooltip.tsx           | 4 ++--
 .../WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx     | 2 +-
 site/src/pages/WorkspacePage/WorkspaceTopbar.tsx              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/site/src/components/HelpTooltip/HelpTooltip.tsx b/site/src/components/HelpTooltip/HelpTooltip.tsx
index f743bc3a552f0..4c41a56b0e331 100644
--- a/site/src/components/HelpTooltip/HelpTooltip.tsx
+++ b/site/src/components/HelpTooltip/HelpTooltip.tsx
@@ -5,7 +5,7 @@ import {
 	type Theme,
 } from "@emotion/react";
 import Link from "@mui/material/Link";
-import { TooltipProps } from "@radix-ui/react-tooltip";
+import type { TooltipProps } from "@radix-ui/react-tooltip";
 import { Stack } from "components/Stack/Stack";
 import {
 	Tooltip,
diff --git a/site/src/modules/resources/AgentOutdatedTooltip.tsx b/site/src/modules/resources/AgentOutdatedTooltip.tsx
index 7f414fe96b4cf..22adc66c28471 100644
--- a/site/src/modules/resources/AgentOutdatedTooltip.tsx
+++ b/site/src/modules/resources/AgentOutdatedTooltip.tsx
@@ -8,10 +8,10 @@ import {
 	HelpTooltipTitle,
 } from "components/HelpTooltip/HelpTooltip";
 import { Stack } from "components/Stack/Stack";
+import { TooltipTrigger } from "components/Tooltip/Tooltip";
 import { RotateCcwIcon } from "lucide-react";
-import { useState, type FC } from "react";
+import { type FC, useState } from "react";
 import { agentVersionStatus } from "../../utils/workspace";
-import { TooltipTrigger } from "components/Tooltip/Tooltip";
 
 type AgentOutdatedTooltipProps = {
 	agent: WorkspaceAgent;
diff --git a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
index cf9fc51fdb643..c47c36003a162 100644
--- a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
+++ b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
@@ -16,7 +16,7 @@ import {
 } from "components/HelpTooltip/HelpTooltip";
 import { InfoIcon, RotateCcwIcon } from "lucide-react";
 import { linkToTemplate, useLinks } from "modules/navigation";
-import { useState, type FC } from "react";
+import { type FC, useState } from "react";
 import { useQuery } from "react-query";
 import {
 	useWorkspaceUpdate,
diff --git a/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx b/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
index b047a94999baa..d9622d51f7ad0 100644
--- a/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
@@ -18,6 +18,7 @@ import {
 	HelpTooltip,
 	HelpTooltipContent,
 } from "components/HelpTooltip/HelpTooltip";
+import { TooltipTrigger } from "components/Tooltip/Tooltip";
 import { ChevronLeftIcon, CircleDollarSign, TrashIcon } from "lucide-react";
 import { useDashboard } from "modules/dashboard/useDashboard";
 import { linkToTemplate, useLinks } from "modules/navigation";
@@ -30,7 +31,6 @@ import type { WorkspacePermissions } from "../../modules/workspaces/permissions"
 import { WorkspaceActions } from "./WorkspaceActions/WorkspaceActions";
 import { WorkspaceNotifications } from "./WorkspaceNotifications/WorkspaceNotifications";
 import { WorkspaceScheduleControls } from "./WorkspaceScheduleControls";
-import { TooltipTrigger } from "components/Tooltip/Tooltip";
 
 interface WorkspaceProps {
 	isUpdating: boolean;

From d22a040ca143a9e5109d1d33bd52b14c3e3c2ac6 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 22:43:54 +0000
Subject: [PATCH 21/33] chore: lint:fix

---
 site/src/components/deprecated/Popover/Popover.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/src/components/deprecated/Popover/Popover.tsx b/site/src/components/deprecated/Popover/Popover.tsx
index 044306f325c4f..cd30a40f1a784 100644
--- a/site/src/components/deprecated/Popover/Popover.tsx
+++ b/site/src/components/deprecated/Popover/Popover.tsx
@@ -60,7 +60,7 @@ type ControlledPopoverProps = BasePopoverProps & {
 	onOpenChange: (open: boolean) => void;
 };
 
-export type PopoverProps = UncontrolledPopoverProps | ControlledPopoverProps;
+type PopoverProps = UncontrolledPopoverProps | ControlledPopoverProps;
 
 /** @deprecated prefer `components.Popover` */
 export const Popover: FC<PopoverProps> = (props) => {
@@ -155,7 +155,7 @@ export const PopoverTrigger: FC<PopoverTriggerProps> = (props) => {
 
 type Horizontal = "left" | "right";
 
-export type PopoverContentProps = Omit<
+type PopoverContentProps = Omit<
 	MuiPopoverProps,
 	"open" | "onClose" | "anchorEl"
 > & {

From 2ff9e66925bcae4d02960eb728a195179da8d924 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 23:44:53 +0000
Subject: [PATCH 22/33] test: expect elements + text content rendered by
 HelpTooltip

---
 .../InfoTooltip/InfoTooltip.stories.tsx       | 26 +++++++++----------
 .../WorkspaceOutdatedTooltip.stories.tsx      |  6 +++--
 .../WorkspacePage/WorkspaceTopbar.stories.tsx | 12 ++++-----
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/site/src/components/InfoTooltip/InfoTooltip.stories.tsx b/site/src/components/InfoTooltip/InfoTooltip.stories.tsx
index b531e052fd356..3cd09862d9b25 100644
--- a/site/src/components/InfoTooltip/InfoTooltip.stories.tsx
+++ b/site/src/components/InfoTooltip/InfoTooltip.stories.tsx
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from "@storybook/react-vite";
-import { expect, userEvent, waitFor, within } from "storybook/test";
+import { expect, screen, userEvent, waitFor } from "storybook/test";
 import { InfoTooltip } from "./InfoTooltip";
 
 const meta = {
@@ -16,13 +16,13 @@ export default meta;
 type Story = StoryObj<typeof InfoTooltip>;
 
 export const Example: Story = {
-	play: async ({ canvasElement, step }) => {
-		const screen = within(canvasElement);
-
+	play: async ({ step }) => {
 		await step("activate hover trigger", async () => {
 			await userEvent.hover(screen.getByRole("button"));
 			await waitFor(() =>
-				expect(screen.getByText(meta.args.message)).toBeInTheDocument(),
+				expect(screen.getByRole("tooltip")).toHaveTextContent(
+					meta.args.message,
+				),
 			);
 		});
 	},
@@ -33,13 +33,13 @@ export const Notice = {
 		type: "notice",
 		message: "Unfortunately, there's a radio connected to my brain",
 	},
-	play: async ({ canvasElement, step }) => {
-		const screen = within(canvasElement);
-
+	play: async ({ step }) => {
 		await step("activate hover trigger", async () => {
 			await userEvent.hover(screen.getByRole("button"));
 			await waitFor(() =>
-				expect(screen.getByText(Notice.args.message)).toBeInTheDocument(),
+				expect(screen.getByRole("tooltip")).toHaveTextContent(
+					Notice.args.message,
+				),
 			);
 		});
 	},
@@ -50,13 +50,13 @@ export const Warning = {
 		type: "warning",
 		message: "Unfortunately, there's a radio connected to my brain",
 	},
-	play: async ({ canvasElement, step }) => {
-		const screen = within(canvasElement);
-
+	play: async ({ step }) => {
 		await step("activate hover trigger", async () => {
 			await userEvent.hover(screen.getByRole("button"));
 			await waitFor(() =>
-				expect(screen.getByText(Warning.args.message)).toBeInTheDocument(),
+				expect(screen.getByRole("tooltip")).toHaveTextContent(
+					Warning.args.message,
+				),
 			);
 		});
 	},
diff --git a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.stories.tsx b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.stories.tsx
index fc0a28815752b..c6fb40924c96d 100644
--- a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.stories.tsx
+++ b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.stories.tsx
@@ -5,7 +5,7 @@ import {
 } from "testHelpers/entities";
 import { withDashboardProvider } from "testHelpers/storybook";
 import type { Meta, StoryObj } from "@storybook/react-vite";
-import { expect, userEvent, waitFor, within } from "storybook/test";
+import { expect, screen, userEvent, waitFor, within } from "storybook/test";
 import { WorkspaceOutdatedTooltip } from "./WorkspaceOutdatedTooltip";
 
 const meta: Meta<typeof WorkspaceOutdatedTooltip> = {
@@ -39,7 +39,9 @@ const Example: Story = {
 		await step("activate hover trigger", async () => {
 			await userEvent.hover(body.getByRole("button"));
 			await waitFor(() =>
-				expect(body.getByText(MockTemplateVersion.message)).toBeInTheDocument(),
+				expect(screen.getByRole("tooltip")).toHaveTextContent(
+					MockTemplateVersion.message,
+				),
 			);
 		});
 	},
diff --git a/site/src/pages/WorkspacePage/WorkspaceTopbar.stories.tsx b/site/src/pages/WorkspacePage/WorkspaceTopbar.stories.tsx
index aafd16d9c099d..dae0874e7c93e 100644
--- a/site/src/pages/WorkspacePage/WorkspaceTopbar.stories.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceTopbar.stories.tsx
@@ -320,9 +320,9 @@ export const TemplateInfoPopover: Story = {
 		await step("activate hover trigger", async () => {
 			await userEvent.hover(canvas.getByText(baseWorkspace.name));
 			await waitFor(() =>
-				expect(
-					canvas.getByRole("presentation", { hidden: true }),
-				).toHaveTextContent(MockTemplate.display_name),
+				expect(screen.getByRole("tooltip")).toHaveTextContent(
+					MockTemplate.display_name,
+				),
 			);
 		});
 	},
@@ -346,9 +346,9 @@ export const TemplateInfoPopoverWithoutDisplayName: Story = {
 		await step("activate hover trigger", async () => {
 			await userEvent.hover(canvas.getByText(baseWorkspace.name));
 			await waitFor(() =>
-				expect(
-					canvas.getByRole("presentation", { hidden: true }),
-				).toHaveTextContent(MockTemplate.name),
+				expect(screen.getByRole("tooltip")).toHaveTextContent(
+					MockTemplate.name,
+				),
 			);
 		});
 	},

From ed5bf98e79b4bf561802988ad0b1bbe19a40ae59 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Fri, 29 Aug 2025 23:47:59 +0000
Subject: [PATCH 23/33] Revert "refactor: rename Tooltip to MUITooltip"

This reverts commit c93e092e84dee04e66ae2196ff40bb3fc31cce46.
---
 site/src/pages/WorkspacePage/WorkspaceTopbar.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx b/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
index d9622d51f7ad0..6b972f39ba52c 100644
--- a/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
@@ -1,6 +1,6 @@
 import { type Interpolation, type Theme, useTheme } from "@emotion/react";
 import Link from "@mui/material/Link";
-import MUITooltip from "@mui/material/Tooltip";
+import Tooltip from "@mui/material/Tooltip";
 import { workspaceQuota } from "api/queries/workspaceQuota";
 import type * as TypesGen from "api/typesGenerated";
 import { Avatar } from "components/Avatar/Avatar";
@@ -108,11 +108,11 @@ export const WorkspaceTopbar: FC<WorkspaceProps> = ({
 
 	return (
 		<Topbar css={{ gridArea: "topbar" }}>
-			<MUITooltip title="Back to workspaces">
+			<Tooltip title="Back to workspaces">
 				<TopbarIconButton component={RouterLink} to="/workspaces">
 					<ChevronLeftIcon className="size-icon-sm" />
 				</TopbarIconButton>
-			</MUITooltip>
+			</Tooltip>
 
 			<div css={styles.topbarLeft}>
 				<TopbarData>

From 8f939f9940797dd6fb33634f95c24e55a8464f0b Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Wed, 3 Sep 2025 19:34:51 +0000
Subject: [PATCH 24/33] chore: remove TODO

---
 .../WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
index c47c36003a162..7b8736f958b67 100644
--- a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
+++ b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
@@ -51,7 +51,6 @@ const WorkspaceOutdatedTooltipContent: FC<TooltipContentProps> = ({
 	const theme = useTheme();
 	const { data: activeVersion } = useQuery({
 		...templateVersion(workspace.template_active_version_id),
-		// TODO is making the parent HelpTooltip a controlled component the only way to track whether the tooltip is open?
 		enabled: isOpen,
 	});
 	const updateWorkspace = useWorkspaceUpdate({

From 5050a927277a8e8f54b178bd578c431a53c4e831 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Wed, 3 Sep 2025 19:36:29 +0000
Subject: [PATCH 25/33] docs: add date to disablePortal comment

---
 .../TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx b/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
index d6c7188257a72..3025f3c29679d 100644
--- a/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
+++ b/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
@@ -124,7 +124,7 @@ export const PublishTemplateVersionDialog: FC<
 									<HelpTooltipTrigger />
 
 									{/**
-									 * Without disablePortal, the tooltip will render under the dialog;
+									 * 2025-09-03 - Without disablePortal, the tooltip will render under the dialog;
 									 * this prop may not need to be set when we switch away from MuiDialog
 									 */}
 									<HelpTooltipContent disablePortal>

From ded841106b160d6e1db4864b85ab7ae93487d51d Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Wed, 3 Sep 2025 19:37:11 +0000
Subject: [PATCH 26/33] chore: remove 1rem comment

---
 site/src/components/HelpTooltip/HelpTooltip.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/src/components/HelpTooltip/HelpTooltip.tsx b/site/src/components/HelpTooltip/HelpTooltip.tsx
index 4c41a56b0e331..a0fadd54a411f 100644
--- a/site/src/components/HelpTooltip/HelpTooltip.tsx
+++ b/site/src/components/HelpTooltip/HelpTooltip.tsx
@@ -46,7 +46,7 @@ export const HelpTooltipContent: FC<TooltipContentProps> = ({
 		<TooltipContent
 			side="bottom"
 			align="start"
-			collisionPadding={16} // 1rem
+			collisionPadding={16}
 			{...props}
 			className={cn(
 				"w-[320px] p-5 bg-surface-secondary border-surface-quaternary text-sm",

From 3466e9074d7d90b14f0c221eab526d1924171b01 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Wed, 3 Sep 2025 19:47:29 +0000
Subject: [PATCH 27/33] refactor: rename to WorkspaceOutdatedTooltipProps

---
 .../WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
index 7b8736f958b67..92336d4a30760 100644
--- a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
+++ b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
@@ -23,11 +23,13 @@ import {
 	WorkspaceUpdateDialogs,
 } from "../WorkspaceUpdateDialogs";
 
-interface TooltipProps {
+interface WorkspaceOutdatedTooltipProps {
 	workspace: Workspace;
 }
 
-export const WorkspaceOutdatedTooltip: FC<TooltipProps> = (props) => {
+export const WorkspaceOutdatedTooltip: FC<WorkspaceOutdatedTooltipProps> = (
+	props,
+) => {
 	const [isOpen, setIsOpen] = useState(false);
 
 	return (
@@ -41,7 +43,7 @@ export const WorkspaceOutdatedTooltip: FC<TooltipProps> = (props) => {
 	);
 };
 
-type TooltipContentProps = TooltipProps & { isOpen: boolean };
+type TooltipContentProps = WorkspaceOutdatedTooltipProps & { isOpen: boolean };
 
 const WorkspaceOutdatedTooltipContent: FC<TooltipContentProps> = ({
 	workspace,

From 3a8a4035240bc313bbb4ab0ea34c24e8a72ea81d Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Wed, 3 Sep 2025 20:21:26 +0000
Subject: [PATCH 28/33] refactor: export TooltipProps from Tooltip

---
 site/src/components/HelpTooltip/HelpTooltip.tsx | 2 +-
 site/src/components/Tooltip/Tooltip.tsx         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/site/src/components/HelpTooltip/HelpTooltip.tsx b/site/src/components/HelpTooltip/HelpTooltip.tsx
index a0fadd54a411f..4370329f4106c 100644
--- a/site/src/components/HelpTooltip/HelpTooltip.tsx
+++ b/site/src/components/HelpTooltip/HelpTooltip.tsx
@@ -5,12 +5,12 @@ import {
 	type Theme,
 } from "@emotion/react";
 import Link from "@mui/material/Link";
-import type { TooltipProps } from "@radix-ui/react-tooltip";
 import { Stack } from "components/Stack/Stack";
 import {
 	Tooltip,
 	TooltipContent,
 	type TooltipContentProps,
+	type TooltipProps,
 	TooltipProvider,
 	TooltipTrigger,
 } from "components/Tooltip/Tooltip";
diff --git a/site/src/components/Tooltip/Tooltip.tsx b/site/src/components/Tooltip/Tooltip.tsx
index e5eff91a0c181..262dc415c9de6 100644
--- a/site/src/components/Tooltip/Tooltip.tsx
+++ b/site/src/components/Tooltip/Tooltip.tsx
@@ -8,6 +8,8 @@ import { cn } from "utils/cn";
 
 export const TooltipProvider = TooltipPrimitive.Provider;
 
+export type TooltipProps = TooltipPrimitive.TooltipProps;
+
 export const Tooltip = TooltipPrimitive.Root;
 
 export const TooltipTrigger = TooltipPrimitive.Trigger;

From b0696dd4a81c8548b212ef1ed8b77bfb34e8dc83 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Thu, 4 Sep 2025 22:43:56 +0000
Subject: [PATCH 29/33] refactor: rename HelpTooltipTrigger to
 HelpTooltipIconTrigger

---
 .../ActiveUserChart/ActiveUserChart.tsx          |  4 ++--
 site/src/components/HelpTooltip/HelpTooltip.tsx  |  2 +-
 site/src/components/InfoTooltip/InfoTooltip.tsx  | 16 ++++++++--------
 .../resources/SubAgentOutdatedTooltip.tsx        |  6 +++---
 .../WorkspaceOutdatedTooltip.tsx                 |  6 +++---
 site/src/pages/AuditPage/AuditHelpTooltip.tsx    |  4 ++--
 .../ConnectionLogHelpTooltip.tsx                 |  4 ++--
 .../IdpOrgSyncPage/IdpOrgSyncPageView.tsx        |  4 ++--
 .../IdpSyncPage/IdpGroupSyncForm.tsx             |  6 +++---
 .../UserTable/EditRolesButton.tsx                |  4 ++--
 .../UserTable/TableColumnHelpTooltip.tsx         |  4 ++--
 .../TemplateInsightsPage.tsx                     |  6 +++---
 .../PublishTemplateVersionDialog.tsx             |  4 ++--
 .../pages/TemplatesPage/TemplatesPageView.tsx    |  4 ++--
 .../WorkspacesPage/WorkspaceHelpTooltip.tsx      |  4 ++--
 15 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/site/src/components/ActiveUserChart/ActiveUserChart.tsx b/site/src/components/ActiveUserChart/ActiveUserChart.tsx
index ef55e06d568a4..43a6585a33628 100644
--- a/site/src/components/ActiveUserChart/ActiveUserChart.tsx
+++ b/site/src/components/ActiveUserChart/ActiveUserChart.tsx
@@ -9,7 +9,7 @@ import {
 	HelpTooltipContent,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipTrigger,
+	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import type { FC } from "react";
 import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from "recharts";
@@ -116,7 +116,7 @@ export const ActiveUsersTitle: FC<ActiveUsersTitleProps> = ({ interval }) => {
 		<div className="flex items-center gap-2">
 			{interval === "day" ? "Daily" : "Weekly"} Active Users
 			<HelpTooltip>
-				<HelpTooltipTrigger size="small" />
+				<HelpTooltipIconTrigger size="small" />
 				<HelpTooltipContent>
 					<HelpTooltipTitle>How do we calculate active users?</HelpTooltipTitle>
 					<HelpTooltipText>
diff --git a/site/src/components/HelpTooltip/HelpTooltip.tsx b/site/src/components/HelpTooltip/HelpTooltip.tsx
index 4370329f4106c..ff2ef2a3cabf5 100644
--- a/site/src/components/HelpTooltip/HelpTooltip.tsx
+++ b/site/src/components/HelpTooltip/HelpTooltip.tsx
@@ -61,7 +61,7 @@ type HelpTooltipTriggerProps = HTMLAttributes<HTMLButtonElement> & {
 	hoverEffect?: boolean;
 };
 
-export const HelpTooltipTrigger = forwardRef<
+export const HelpTooltipIconTrigger = forwardRef<
 	HTMLButtonElement,
 	HelpTooltipTriggerProps
 >((props, ref) => {
diff --git a/site/src/components/InfoTooltip/InfoTooltip.tsx b/site/src/components/InfoTooltip/InfoTooltip.tsx
index 63a9187245859..55680234e3615 100644
--- a/site/src/components/InfoTooltip/InfoTooltip.tsx
+++ b/site/src/components/InfoTooltip/InfoTooltip.tsx
@@ -5,7 +5,7 @@ import {
 	HelpTooltipIcon,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipTrigger,
+	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import type { FC, ReactNode } from "react";
 import type { ThemeRole } from "theme/roles";
@@ -26,9 +26,9 @@ export const InfoTooltip: FC<InfoTooltipProps> = ({
 
 	return (
 		<HelpTooltip>
-			<HelpTooltipTrigger size="small" css={styles.button}>
+			<HelpTooltipIconTrigger size="small" css={styles.button}>
 				<HelpTooltipIcon css={{ color: iconColor }} />
-			</HelpTooltipTrigger>
+			</HelpTooltipIconTrigger>
 			<HelpTooltipContent>
 				<HelpTooltipTitle>{title}</HelpTooltipTitle>
 				<HelpTooltipText>{message}</HelpTooltipText>
@@ -39,10 +39,10 @@ export const InfoTooltip: FC<InfoTooltipProps> = ({
 
 const styles = {
 	button: css`
-    opacity: 1;
+		opacity: 1;
 
-    &:hover {
-      opacity: 1;
-    }
-  `,
+		&:hover {
+			opacity: 1;
+		}
+	`,
 } satisfies Record<string, Interpolation<Theme>>;
diff --git a/site/src/modules/resources/SubAgentOutdatedTooltip.tsx b/site/src/modules/resources/SubAgentOutdatedTooltip.tsx
index c32b4c30c863b..1bf61c5857ee1 100644
--- a/site/src/modules/resources/SubAgentOutdatedTooltip.tsx
+++ b/site/src/modules/resources/SubAgentOutdatedTooltip.tsx
@@ -9,9 +9,9 @@ import {
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { Stack } from "components/Stack/Stack";
+import { TooltipTrigger } from "components/Tooltip/Tooltip";
 import { RotateCcwIcon } from "lucide-react";
 import type { FC } from "react";
 
@@ -39,11 +39,11 @@ export const SubAgentOutdatedTooltip: FC<SubAgentOutdatedTooltipProps> = ({
 
 	return (
 		<HelpTooltip>
-			<HelpTooltipTrigger>
+			<TooltipTrigger className="px-0 py-1 bg-transparent text-inherit border-none opacity-50 hover:opacity-100">
 				<span role="status" className="cursor-pointer">
 					Outdated
 				</span>
-			</HelpTooltipTrigger>
+			</TooltipTrigger>
 			<HelpTooltipContent>
 				<Stack spacing={1}>
 					<div>
diff --git a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
index 92336d4a30760..bc207f60fd0d5 100644
--- a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
+++ b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
@@ -12,7 +12,7 @@ import {
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipTrigger,
+	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { InfoIcon, RotateCcwIcon } from "lucide-react";
 import { linkToTemplate, useLinks } from "modules/navigation";
@@ -34,10 +34,10 @@ export const WorkspaceOutdatedTooltip: FC<WorkspaceOutdatedTooltipProps> = (
 
 	return (
 		<HelpTooltip open={isOpen} onOpenChange={setIsOpen}>
-			<HelpTooltipTrigger size="small" hoverEffect={false}>
+			<HelpTooltipIconTrigger size="small" hoverEffect={false}>
 				<InfoIcon css={styles.icon} />
 				<span className="sr-only">Outdated info</span>
-			</HelpTooltipTrigger>
+			</HelpTooltipIconTrigger>
 			<WorkspaceOutdatedTooltipContent isOpen={isOpen} {...props} />
 		</HelpTooltip>
 	);
diff --git a/site/src/pages/AuditPage/AuditHelpTooltip.tsx b/site/src/pages/AuditPage/AuditHelpTooltip.tsx
index 1d7acdf8a14da..df8bbc8df2ffa 100644
--- a/site/src/pages/AuditPage/AuditHelpTooltip.tsx
+++ b/site/src/pages/AuditPage/AuditHelpTooltip.tsx
@@ -5,7 +5,7 @@ import {
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipTrigger,
+	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
@@ -19,7 +19,7 @@ const Language = {
 export const AuditHelpTooltip: FC = () => {
 	return (
 		<HelpTooltip>
-			<HelpTooltipTrigger />
+			<HelpTooltipIconTrigger />
 
 			<HelpTooltipContent>
 				<HelpTooltipTitle>{Language.title}</HelpTooltipTitle>
diff --git a/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx b/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx
index be87c6e8a8b17..b40eb606e8760 100644
--- a/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx
+++ b/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx
@@ -5,7 +5,7 @@ import {
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipTrigger,
+	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
@@ -19,7 +19,7 @@ const Language = {
 export const ConnectionLogHelpTooltip: FC = () => {
 	return (
 		<HelpTooltip>
-			<HelpTooltipTrigger />
+			<HelpTooltipIconTrigger />
 
 			<HelpTooltipContent>
 				<HelpTooltipTitle>{Language.title}</HelpTooltipTitle>
diff --git a/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx b/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx
index 1feb4a8707f9b..2421154fba853 100644
--- a/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx
+++ b/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx
@@ -19,7 +19,7 @@ import {
 	HelpTooltip,
 	HelpTooltipContent,
 	HelpTooltipText,
-	HelpTooltipTrigger,
+	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { Input } from "components/Input/Input";
 import { Label } from "components/Label/Label";
@@ -459,7 +459,7 @@ const OrganizationRow: FC<OrganizationRowProps> = ({
 const AssignDefaultOrgHelpTooltip: FC = () => {
 	return (
 		<HelpTooltip>
-			<HelpTooltipTrigger />
+			<HelpTooltipIconTrigger />
 			<HelpTooltipContent>
 				<HelpTooltipText>
 					Disabling will remove all users from the default organization if a
diff --git a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
index 1be01567f6bb3..1779527ebd504 100644
--- a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
+++ b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
@@ -10,7 +10,7 @@ import {
 	HelpTooltipContent,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipTrigger,
+	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { Input } from "components/Input/Input";
 import { Label } from "components/Label/Label";
@@ -414,7 +414,7 @@ const GroupRow: FC<GroupRowProps> = ({
 const AutoCreateMissingGroupsHelpTooltip: FC = () => {
 	return (
 		<HelpTooltip>
-			<HelpTooltipTrigger />
+			<HelpTooltipIconTrigger />
 			<HelpTooltipContent>
 				<HelpTooltipText>
 					Enabling auto create missing groups will automatically create groups
@@ -431,7 +431,7 @@ const LegacyGroupSyncHeader: FC = () => {
 			<div className="flex items-end gap-2">
 				<span>Legacy group sync settings</span>
 				<HelpTooltip>
-					<HelpTooltipTrigger />
+					<HelpTooltipIconTrigger />
 					<HelpTooltipContent>
 						<HelpTooltipTitle>Legacy group sync settings</HelpTooltipTitle>
 						<HelpTooltipText>
diff --git a/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx b/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx
index 4983e671aa5a6..25967f8d4ea22 100644
--- a/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx
+++ b/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx
@@ -13,7 +13,7 @@ import {
 	HelpTooltipContent,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipTrigger,
+	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { EditSquare } from "components/Icons/EditSquare";
 import { UserIcon } from "lucide-react";
@@ -83,7 +83,7 @@ export const EditRolesButton: FC<EditRolesButtonProps> = (props) => {
 	if (!canSetRoles) {
 		return (
 			<HelpTooltip>
-				<HelpTooltipTrigger size="small" />
+				<HelpTooltipIconTrigger size="small" />
 				<HelpTooltipContent>
 					<HelpTooltipTitle>Externally controlled</HelpTooltipTitle>
 					<HelpTooltipText>
diff --git a/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx b/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx
index 1cbc04c18f1b2..e02cce85818b6 100644
--- a/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx
+++ b/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx
@@ -5,7 +5,7 @@ import {
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipTrigger,
+	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
@@ -45,7 +45,7 @@ export const TableColumnHelpTooltip: FC<Props> = ({ variant }) => {
 
 	return (
 		<HelpTooltip>
-			<HelpTooltipTrigger size="small" />
+			<HelpTooltipIconTrigger size="small" />
 			<HelpTooltipContent>
 				<HelpTooltipTitle>{variantLang.title}</HelpTooltipTitle>
 				<HelpTooltipText>{variantLang.text}</HelpTooltipText>
diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
index 0c12d96625156..b0e58aa4b50fc 100644
--- a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
+++ b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
@@ -31,7 +31,7 @@ import {
 	HelpTooltipContent,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipTrigger,
+	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { Loader } from "components/Loader/Loader";
 import { Stack } from "components/Stack/Stack";
@@ -284,7 +284,7 @@ const UsersLatencyPanel: FC<UsersLatencyPanelProps> = ({
 				<PanelTitle css={{ display: "flex", alignItems: "center", gap: 8 }}>
 					Latency by user
 					<HelpTooltip>
-						<HelpTooltipTrigger size="small" />
+						<HelpTooltipIconTrigger size="small" />
 						<HelpTooltipContent>
 							<HelpTooltipTitle>How is latency calculated?</HelpTooltipTitle>
 							<HelpTooltipText>
@@ -352,7 +352,7 @@ const UsersActivityPanel: FC<UsersActivityPanelProps> = ({
 				<PanelTitle css={{ display: "flex", alignItems: "center", gap: 8 }}>
 					Activity by user
 					<HelpTooltip>
-						<HelpTooltipTrigger size="small" />
+						<HelpTooltipIconTrigger size="small" />
 						<HelpTooltipContent>
 							<HelpTooltipTitle>How is activity calculated?</HelpTooltipTitle>
 							<HelpTooltipText>
diff --git a/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx b/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
index 3025f3c29679d..f6e7b5f9bcbbe 100644
--- a/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
+++ b/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
@@ -17,7 +17,7 @@ import {
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipTrigger,
+	HelpTooltipIconTrigger,
 } from "../../components/HelpTooltip/HelpTooltip";
 import { docs } from "../../utils/docs";
 
@@ -121,7 +121,7 @@ export const PublishTemplateVersionDialog: FC<
 								/>
 
 								<HelpTooltip>
-									<HelpTooltipTrigger />
+									<HelpTooltipIconTrigger />
 
 									{/**
 									 * 2025-09-03 - Without disablePortal, the tooltip will render under the dialog;
diff --git a/site/src/pages/TemplatesPage/TemplatesPageView.tsx b/site/src/pages/TemplatesPage/TemplatesPageView.tsx
index e36b278949497..dac8a8332cb57 100644
--- a/site/src/pages/TemplatesPage/TemplatesPageView.tsx
+++ b/site/src/pages/TemplatesPage/TemplatesPageView.tsx
@@ -16,7 +16,7 @@ import {
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipTrigger,
+	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { Margins } from "components/Margins/Margins";
 import {
@@ -72,7 +72,7 @@ const Language = {
 const TemplateHelpTooltip: FC = () => {
 	return (
 		<HelpTooltip>
-			<HelpTooltipTrigger />
+			<HelpTooltipIconTrigger />
 			<HelpTooltipContent>
 				<HelpTooltipTitle>{Language.templateTooltipTitle}</HelpTooltipTitle>
 				<HelpTooltipText>{Language.templateTooltipText}</HelpTooltipText>
diff --git a/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx b/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx
index c462c2d81ae0f..03d55c3099553 100644
--- a/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx
+++ b/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx
@@ -5,7 +5,7 @@ import {
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipTrigger,
+	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
@@ -22,7 +22,7 @@ const Language = {
 export const WorkspaceHelpTooltip: FC = () => {
 	return (
 		<HelpTooltip>
-			<HelpTooltipTrigger />
+			<HelpTooltipIconTrigger />
 			<HelpTooltipContent>
 				<HelpTooltipTitle>{Language.workspaceTooltipTitle}</HelpTooltipTitle>
 				<HelpTooltipText>{Language.workspaceTooltipText}</HelpTooltipText>

From 71c18247eafbafc06d6188c98ef39a2feffce9e4 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Thu, 4 Sep 2025 22:45:29 +0000
Subject: [PATCH 30/33] refactor: rename HelpTooltipTriggerProps to
 HelpTooltipIconTriggerProps

---
 site/src/components/HelpTooltip/HelpTooltip.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/src/components/HelpTooltip/HelpTooltip.tsx b/site/src/components/HelpTooltip/HelpTooltip.tsx
index ff2ef2a3cabf5..34a2fd63d16fb 100644
--- a/site/src/components/HelpTooltip/HelpTooltip.tsx
+++ b/site/src/components/HelpTooltip/HelpTooltip.tsx
@@ -56,14 +56,14 @@ export const HelpTooltipContent: FC<TooltipContentProps> = ({
 	);
 };
 
-type HelpTooltipTriggerProps = HTMLAttributes<HTMLButtonElement> & {
+type HelpTooltipIconTriggerProps = HTMLAttributes<HTMLButtonElement> & {
 	size?: Size;
 	hoverEffect?: boolean;
 };
 
 export const HelpTooltipIconTrigger = forwardRef<
 	HTMLButtonElement,
-	HelpTooltipTriggerProps
+	HelpTooltipIconTriggerProps
 >((props, ref) => {
 	const {
 		size = "medium",

From 70e0dbf2e109eaf18abf0aec79d9791eb815687e Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Thu, 4 Sep 2025 22:57:49 +0000
Subject: [PATCH 31/33] refactor: use HelpTooltipTrigger inside of HelpTooltip

---
 .../components/HelpTooltip/HelpTooltip.tsx    |  6 +++--
 site/src/modules/resources/AgentLatency.tsx   |  6 ++---
 .../resources/AgentOutdatedTooltip.tsx        |  6 ++---
 site/src/modules/resources/AgentStatus.tsx    | 26 +++++++++----------
 .../pages/WorkspacePage/WorkspaceTopbar.tsx   | 14 +++++-----
 5 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/site/src/components/HelpTooltip/HelpTooltip.tsx b/site/src/components/HelpTooltip/HelpTooltip.tsx
index 34a2fd63d16fb..fbdc93e53dea8 100644
--- a/site/src/components/HelpTooltip/HelpTooltip.tsx
+++ b/site/src/components/HelpTooltip/HelpTooltip.tsx
@@ -28,6 +28,8 @@ type Icon = typeof CircleHelpIcon;
 
 type Size = "small" | "medium";
 
+export const HelpTooltipTrigger = TooltipTrigger;
+
 export const HelpTooltipIcon = CircleHelpIcon;
 
 export const HelpTooltip: FC<TooltipProps> = (props) => {
@@ -80,7 +82,7 @@ export const HelpTooltipIconTrigger = forwardRef<
 	});
 
 	return (
-		<TooltipTrigger asChild>
+		<HelpTooltipTrigger asChild>
 			<button
 				{...buttonProps}
 				aria-label="More info"
@@ -106,7 +108,7 @@ export const HelpTooltipIconTrigger = forwardRef<
 			>
 				{children}
 			</button>
-		</TooltipTrigger>
+		</HelpTooltipTrigger>
 	);
 });
 
diff --git a/site/src/modules/resources/AgentLatency.tsx b/site/src/modules/resources/AgentLatency.tsx
index 80892ffd15142..2e50c63d0c205 100644
--- a/site/src/modules/resources/AgentLatency.tsx
+++ b/site/src/modules/resources/AgentLatency.tsx
@@ -5,9 +5,9 @@ import {
 	HelpTooltipContent,
 	HelpTooltipText,
 	HelpTooltipTitle,
+	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { Stack } from "components/Stack/Stack";
-import { TooltipTrigger } from "components/Tooltip/Tooltip";
 import type { FC } from "react";
 import { getLatencyColor } from "utils/latency";
 
@@ -44,7 +44,7 @@ export const AgentLatency: FC<AgentLatencyProps> = ({ agent }) => {
 
 	return (
 		<HelpTooltip>
-			<TooltipTrigger asChild>
+			<HelpTooltipTrigger asChild>
 				<span
 					role="presentation"
 					aria-label="latency"
@@ -52,7 +52,7 @@ export const AgentLatency: FC<AgentLatencyProps> = ({ agent }) => {
 				>
 					{Math.round(latency.latency_ms)}ms
 				</span>
-			</TooltipTrigger>
+			</HelpTooltipTrigger>
 			<HelpTooltipContent>
 				<HelpTooltipTitle>Latency</HelpTooltipTitle>
 				<HelpTooltipText>
diff --git a/site/src/modules/resources/AgentOutdatedTooltip.tsx b/site/src/modules/resources/AgentOutdatedTooltip.tsx
index 22adc66c28471..0ac21eb036b60 100644
--- a/site/src/modules/resources/AgentOutdatedTooltip.tsx
+++ b/site/src/modules/resources/AgentOutdatedTooltip.tsx
@@ -6,9 +6,9 @@ import {
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
+	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { Stack } from "components/Stack/Stack";
-import { TooltipTrigger } from "components/Tooltip/Tooltip";
 import { RotateCcwIcon } from "lucide-react";
 import { type FC, useState } from "react";
 import { agentVersionStatus } from "../../utils/workspace";
@@ -40,11 +40,11 @@ export const AgentOutdatedTooltip: FC<AgentOutdatedTooltipProps> = ({
 
 	return (
 		<HelpTooltip open={isOpen} onOpenChange={setIsOpen}>
-			<TooltipTrigger asChild>
+			<HelpTooltipTrigger asChild>
 				<span role="status" className="cursor-pointer">
 					{status === agentVersionStatus.Outdated ? "Outdated" : "Deprecated"}
 				</span>
-			</TooltipTrigger>
+			</HelpTooltipTrigger>
 			<HelpTooltipContent>
 				<Stack spacing={1}>
 					<div>
diff --git a/site/src/modules/resources/AgentStatus.tsx b/site/src/modules/resources/AgentStatus.tsx
index ab0cf054bb0a2..0dc43cc7ca86b 100644
--- a/site/src/modules/resources/AgentStatus.tsx
+++ b/site/src/modules/resources/AgentStatus.tsx
@@ -11,8 +11,8 @@ import {
 	HelpTooltipContent,
 	HelpTooltipText,
 	HelpTooltipTitle,
+	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
-import { TooltipTrigger } from "components/Tooltip/Tooltip";
 import { TriangleAlertIcon } from "lucide-react";
 import type { FC } from "react";
 
@@ -62,9 +62,9 @@ interface DevcontainerStatusProps {
 const StartTimeoutLifecycle: FC<AgentStatusProps> = ({ agent }) => {
 	return (
 		<HelpTooltip>
-			<TooltipTrigger asChild role="status" aria-label="Agent timeout">
+			<HelpTooltipTrigger asChild role="status" aria-label="Agent timeout">
 				<TriangleAlertIcon css={styles.timeoutWarning} />
-			</TooltipTrigger>
+			</HelpTooltipTrigger>
 
 			<HelpTooltipContent>
 				<HelpTooltipTitle>Agent is taking too long to start</HelpTooltipTitle>
@@ -87,9 +87,9 @@ const StartTimeoutLifecycle: FC<AgentStatusProps> = ({ agent }) => {
 const StartErrorLifecycle: FC<AgentStatusProps> = ({ agent }) => {
 	return (
 		<HelpTooltip>
-			<TooltipTrigger asChild role="status" aria-label="Start error">
+			<HelpTooltipTrigger asChild role="status" aria-label="Start error">
 				<TriangleAlertIcon css={styles.errorWarning} />
-			</TooltipTrigger>
+			</HelpTooltipTrigger>
 			<HelpTooltipContent>
 				<HelpTooltipTitle>Error starting the agent</HelpTooltipTitle>
 				<HelpTooltipText>
@@ -123,9 +123,9 @@ const ShuttingDownLifecycle: FC = () => {
 const ShutdownTimeoutLifecycle: FC<AgentStatusProps> = ({ agent }) => {
 	return (
 		<HelpTooltip>
-			<TooltipTrigger asChild role="status" aria-label="Stop timeout">
+			<HelpTooltipTrigger asChild role="status" aria-label="Stop timeout">
 				<TriangleAlertIcon css={styles.timeoutWarning} />
-			</TooltipTrigger>
+			</HelpTooltipTrigger>
 			<HelpTooltipContent>
 				<HelpTooltipTitle>Agent is taking too long to stop</HelpTooltipTitle>
 				<HelpTooltipText>
@@ -147,9 +147,9 @@ const ShutdownTimeoutLifecycle: FC<AgentStatusProps> = ({ agent }) => {
 const ShutdownErrorLifecycle: FC<AgentStatusProps> = ({ agent }) => {
 	return (
 		<HelpTooltip>
-			<TooltipTrigger asChild role="status" aria-label="Stop error">
+			<HelpTooltipTrigger asChild role="status" aria-label="Stop error">
 				<TriangleAlertIcon css={styles.errorWarning} />
-			</TooltipTrigger>
+			</HelpTooltipTrigger>
 			<HelpTooltipContent>
 				<HelpTooltipTitle>Error stopping the agent</HelpTooltipTitle>
 				<HelpTooltipText>
@@ -243,9 +243,9 @@ const ConnectingStatus: FC = () => {
 const TimeoutStatus: FC<AgentStatusProps> = ({ agent }) => {
 	return (
 		<HelpTooltip>
-			<TooltipTrigger asChild role="status" aria-label="Timeout">
+			<HelpTooltipTrigger asChild role="status" aria-label="Timeout">
 				<TriangleAlertIcon css={styles.timeoutWarning} />
-			</TooltipTrigger>
+			</HelpTooltipTrigger>
 			<HelpTooltipContent>
 				<HelpTooltipTitle>Agent is taking too long to connect</HelpTooltipTitle>
 				<HelpTooltipText>
@@ -308,9 +308,9 @@ const SubAgentStatus: FC<SubAgentStatusProps> = ({ agent }) => {
 const DevcontainerStartError: FC<AgentStatusProps> = ({ agent }) => {
 	return (
 		<HelpTooltip>
-			<TooltipTrigger asChild role="status" aria-label="Start error">
+			<HelpTooltipTrigger asChild role="status" aria-label="Start error">
 				<TriangleAlertIcon css={styles.errorWarning} />
-			</TooltipTrigger>
+			</HelpTooltipTrigger>
 			<HelpTooltipContent>
 				<HelpTooltipTitle>
 					Error starting the devcontainer agent
diff --git a/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx b/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
index 6b972f39ba52c..2c346432defb8 100644
--- a/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
@@ -17,8 +17,8 @@ import {
 import {
 	HelpTooltip,
 	HelpTooltipContent,
+	HelpTooltipTrigger,
 } from "components/HelpTooltip/HelpTooltip";
-import { TooltipTrigger } from "components/Tooltip/Tooltip";
 import { ChevronLeftIcon, CircleDollarSign, TrashIcon } from "lucide-react";
 import { useDashboard } from "modules/dashboard/useDashboard";
 import { linkToTemplate, useLinks } from "modules/navigation";
@@ -257,12 +257,12 @@ const OwnerBreadcrumb: FC<OwnerBreadcrumbProps> = ({
 }) => {
 	return (
 		<HelpTooltip>
-			<TooltipTrigger asChild>
+			<HelpTooltipTrigger asChild>
 				<span css={styles.breadcrumbSegment}>
 					<Avatar size="sm" fallback={ownerName} src={ownerAvatarUrl} />
 					<span css={styles.breadcrumbText}>{ownerName}</span>
 				</span>
-			</TooltipTrigger>
+			</HelpTooltipTrigger>
 
 			<HelpTooltipContent align="center">
 				<AvatarData title={ownerName} subtitle="Owner" src={ownerAvatarUrl} />
@@ -284,7 +284,7 @@ const OrganizationBreadcrumb: FC<OrganizationBreadcrumbProps> = ({
 }) => {
 	return (
 		<HelpTooltip>
-			<TooltipTrigger asChild>
+			<HelpTooltipTrigger asChild>
 				<span css={styles.breadcrumbSegment}>
 					<Avatar
 						size="sm"
@@ -294,7 +294,7 @@ const OrganizationBreadcrumb: FC<OrganizationBreadcrumbProps> = ({
 					/>
 					<span css={styles.breadcrumbText}>{orgName}</span>
 				</span>
-			</TooltipTrigger>
+			</HelpTooltipTrigger>
 
 			<HelpTooltipContent align="center">
 				<AvatarData
@@ -344,7 +344,7 @@ const WorkspaceBreadcrumb: FC<WorkspaceBreadcrumbProps> = ({
 	return (
 		<div className="flex items-center">
 			<HelpTooltip>
-				<TooltipTrigger asChild>
+				<HelpTooltipTrigger asChild>
 					<span css={styles.breadcrumbSegment}>
 						<TopbarAvatar
 							src={templateIconUrl}
@@ -355,7 +355,7 @@ const WorkspaceBreadcrumb: FC<WorkspaceBreadcrumbProps> = ({
 							{workspaceName}
 						</span>
 					</span>
-				</TooltipTrigger>
+				</HelpTooltipTrigger>
 
 				<HelpTooltipContent align="center">
 					<AvatarData

From 6733d6a95bdb6aeb5d9db41f0ef3aee65f107c64 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Thu, 4 Sep 2025 23:26:45 +0000
Subject: [PATCH 32/33] chore: rm TODO

---
 site/src/modules/resources/AgentOutdatedTooltip.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/site/src/modules/resources/AgentOutdatedTooltip.tsx b/site/src/modules/resources/AgentOutdatedTooltip.tsx
index 0ac21eb036b60..2f126fbca15bb 100644
--- a/site/src/modules/resources/AgentOutdatedTooltip.tsx
+++ b/site/src/modules/resources/AgentOutdatedTooltip.tsx
@@ -71,7 +71,6 @@ export const AgentOutdatedTooltip: FC<AgentOutdatedTooltipProps> = ({
 							icon={RotateCcwIcon}
 							onClick={() => {
 								onUpdate();
-								// TODO can we move this tooltip-closing logic to the definition of HelpTooltipAction?
 								setIsOpen(false);
 							}}
 							ariaLabel="Update workspace"

From bc12f84aa09ea21a6ac54d6cb4d00cced2a4bc93 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Thu, 4 Sep 2025 23:27:06 +0000
Subject: [PATCH 33/33] chore: check:fix

---
 site/src/components/ActiveUserChart/ActiveUserChart.tsx         | 2 +-
 site/src/components/InfoTooltip/InfoTooltip.tsx                 | 2 +-
 .../WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx       | 2 +-
 site/src/pages/AuditPage/AuditHelpTooltip.tsx                   | 2 +-
 site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx   | 2 +-
 .../IdpOrgSyncPage/IdpOrgSyncPageView.tsx                       | 2 +-
 .../OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx   | 2 +-
 .../OrganizationSettingsPage/UserTable/EditRolesButton.tsx      | 2 +-
 .../UserTable/TableColumnHelpTooltip.tsx                        | 2 +-
 .../TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx  | 2 +-
 .../TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx  | 2 +-
 site/src/pages/TemplatesPage/TemplatesPageView.tsx              | 2 +-
 site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx          | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/site/src/components/ActiveUserChart/ActiveUserChart.tsx b/site/src/components/ActiveUserChart/ActiveUserChart.tsx
index 43a6585a33628..8a196402334f8 100644
--- a/site/src/components/ActiveUserChart/ActiveUserChart.tsx
+++ b/site/src/components/ActiveUserChart/ActiveUserChart.tsx
@@ -7,9 +7,9 @@ import {
 import {
 	HelpTooltip,
 	HelpTooltipContent,
+	HelpTooltipIconTrigger,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import type { FC } from "react";
 import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from "recharts";
diff --git a/site/src/components/InfoTooltip/InfoTooltip.tsx b/site/src/components/InfoTooltip/InfoTooltip.tsx
index 55680234e3615..411d9aef69d1c 100644
--- a/site/src/components/InfoTooltip/InfoTooltip.tsx
+++ b/site/src/components/InfoTooltip/InfoTooltip.tsx
@@ -3,9 +3,9 @@ import {
 	HelpTooltip,
 	HelpTooltipContent,
 	HelpTooltipIcon,
+	HelpTooltipIconTrigger,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import type { FC, ReactNode } from "react";
 import type { ThemeRole } from "theme/roles";
diff --git a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
index bc207f60fd0d5..6de6f2c40df50 100644
--- a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
+++ b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
@@ -9,10 +9,10 @@ import {
 	HelpTooltip,
 	HelpTooltipAction,
 	HelpTooltipContent,
+	HelpTooltipIconTrigger,
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { InfoIcon, RotateCcwIcon } from "lucide-react";
 import { linkToTemplate, useLinks } from "modules/navigation";
diff --git a/site/src/pages/AuditPage/AuditHelpTooltip.tsx b/site/src/pages/AuditPage/AuditHelpTooltip.tsx
index df8bbc8df2ffa..6e31c589ed3c0 100644
--- a/site/src/pages/AuditPage/AuditHelpTooltip.tsx
+++ b/site/src/pages/AuditPage/AuditHelpTooltip.tsx
@@ -1,11 +1,11 @@
 import {
 	HelpTooltip,
 	HelpTooltipContent,
+	HelpTooltipIconTrigger,
 	HelpTooltipLink,
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
diff --git a/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx b/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx
index b40eb606e8760..6deb9ada834db 100644
--- a/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx
+++ b/site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx
@@ -1,11 +1,11 @@
 import {
 	HelpTooltip,
 	HelpTooltipContent,
+	HelpTooltipIconTrigger,
 	HelpTooltipLink,
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
diff --git a/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx b/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx
index 2421154fba853..07791c99832ce 100644
--- a/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx
+++ b/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx
@@ -18,8 +18,8 @@ import { EmptyState } from "components/EmptyState/EmptyState";
 import {
 	HelpTooltip,
 	HelpTooltipContent,
-	HelpTooltipText,
 	HelpTooltipIconTrigger,
+	HelpTooltipText,
 } from "components/HelpTooltip/HelpTooltip";
 import { Input } from "components/Input/Input";
 import { Label } from "components/Label/Label";
diff --git a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
index 1779527ebd504..b3840e19a36ad 100644
--- a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
+++ b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
@@ -8,9 +8,9 @@ import { Combobox } from "components/Combobox/Combobox";
 import {
 	HelpTooltip,
 	HelpTooltipContent,
+	HelpTooltipIconTrigger,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { Input } from "components/Input/Input";
 import { Label } from "components/Label/Label";
diff --git a/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx b/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx
index 25967f8d4ea22..62fa29e834f98 100644
--- a/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx
+++ b/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx
@@ -11,9 +11,9 @@ import {
 import {
 	HelpTooltip,
 	HelpTooltipContent,
+	HelpTooltipIconTrigger,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { EditSquare } from "components/Icons/EditSquare";
 import { UserIcon } from "lucide-react";
diff --git a/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx b/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx
index e02cce85818b6..7076809d2c2f4 100644
--- a/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx
+++ b/site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx
@@ -1,11 +1,11 @@
 import {
 	HelpTooltip,
 	HelpTooltipContent,
+	HelpTooltipIconTrigger,
 	HelpTooltipLink,
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";
diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
index b0e58aa4b50fc..b5c94bf1a3d18 100644
--- a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
+++ b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
@@ -29,9 +29,9 @@ import { Avatar } from "components/Avatar/Avatar";
 import {
 	HelpTooltip,
 	HelpTooltipContent,
+	HelpTooltipIconTrigger,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { Loader } from "components/Loader/Loader";
 import { Stack } from "components/Stack/Stack";
diff --git a/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx b/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
index f6e7b5f9bcbbe..7f5c10dfe0099 100644
--- a/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
+++ b/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx
@@ -13,11 +13,11 @@ import * as Yup from "yup";
 import {
 	HelpTooltip,
 	HelpTooltipContent,
+	HelpTooltipIconTrigger,
 	HelpTooltipLink,
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipIconTrigger,
 } from "../../components/HelpTooltip/HelpTooltip";
 import { docs } from "../../utils/docs";
 
diff --git a/site/src/pages/TemplatesPage/TemplatesPageView.tsx b/site/src/pages/TemplatesPage/TemplatesPageView.tsx
index dac8a8332cb57..7b33751457153 100644
--- a/site/src/pages/TemplatesPage/TemplatesPageView.tsx
+++ b/site/src/pages/TemplatesPage/TemplatesPageView.tsx
@@ -12,11 +12,11 @@ import { Button } from "components/Button/Button";
 import {
 	HelpTooltip,
 	HelpTooltipContent,
+	HelpTooltipIconTrigger,
 	HelpTooltipLink,
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import { Margins } from "components/Margins/Margins";
 import {
diff --git a/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx b/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx
index 03d55c3099553..5b07cc5eda7c0 100644
--- a/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx
+++ b/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx
@@ -1,11 +1,11 @@
 import {
 	HelpTooltip,
 	HelpTooltipContent,
+	HelpTooltipIconTrigger,
 	HelpTooltipLink,
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 	HelpTooltipTitle,
-	HelpTooltipIconTrigger,
 } from "components/HelpTooltip/HelpTooltip";
 import type { FC } from "react";
 import { docs } from "utils/docs";