May 21, 2025 · May 20, 2025 · May 21, 2025
diff --git a/site/src/modules/workspaces/WorkspaceStatusIndicator/WorkspaceStatusIndicator.stories.tsx b/site/src/modules/workspaces/WorkspaceStatusIndicator/WorkspaceStatusIndicator.stories.tsx
 },
 };

 export const Unhealthy: Story = {
 args: {
 workspace: {
 ...createWorkspaceWithStatus("running"),
 health: {
 healthy: false,
 failing_agents: [],
 },
 },
 },
 };

 export const Stopped: Story = {
 args: {
 workspace: createWorkspaceWithStatus("stopped"),
diff --git a/site/src/modules/workspaces/WorkspaceStatusIndicator/WorkspaceStatusIndicator.tsx b/site/src/modules/workspaces/WorkspaceStatusIndicator/WorkspaceStatusIndicator.tsx
 StatusIndicatorDot,
 type StatusIndicatorProps,
 } from "components/StatusIndicator/StatusIndicator";
 import {
 Tooltip,
 TooltipContent,
 TooltipProvider,
 TooltipTrigger,
 } from "components/Tooltip/Tooltip";
 import type { FC } from "react";
 import type React from "react";
 import {
 workspace,
 children,
 }) => {
 const { text, type } = getDisplayWorkspaceStatus(
 let { text, type } = getDisplayWorkspaceStatus(
 workspace.latest_build.status,
 workspace.latest_build.job,
 );

 return (
 if (!workspace.health.healthy) {
 type = "warning";
 }

 const statusIndicator = (
 <StatusIndicator variant={variantByStatusType[type]}>
 <StatusIndicatorDot />
 <span>
 <span className="sr-only">Workspace status:</span> {text}
 </span>
 <span className="sr-only">Workspace status:</span> {text}
 {children}
 </StatusIndicator>
 );

 if (workspace.health.healthy) {
 return statusIndicator;
 }

 return (
 <TooltipProvider>
 <Tooltip>
 <TooltipTrigger asChild>
 <StatusIndicator variant={variantByStatusType[type]}>
 <StatusIndicatorDot />
 <span className="sr-only">Workspace status:</span> {text}
 {children}
 </StatusIndicator>
 </TooltipTrigger>
 <TooltipContent>
 Your workspace is running but some agents are unhealthy.
 </TooltipContent>
 </Tooltip>
 </TooltipProvider>
 );
 };
diff --git a/site/src/pages/WorkspacesPage/WorkspacesTable.tsx b/site/src/pages/WorkspacesPage/WorkspacesTable.tsx
 import { ExternalImage } from "components/ExternalImage/ExternalImage";
 import { VSCodeIcon } from "components/Icons/VSCodeIcon";
 import { VSCodeInsidersIcon } from "components/Icons/VSCodeInsidersIcon";
 import { InfoTooltip } from "components/InfoTooltip/InfoTooltip";
 import { Spinner } from "components/Spinner/Spinner";
 import { Stack } from "components/Stack/Stack";
 import {
 </TableCell>

 <WorkspaceStatusCell workspace={workspace} />

 <WorkspaceActionsCell
 workspace={workspace}
 onActionSuccess={onActionSuccess}
 <TableCell>
 <div className="flex flex-col">
 <WorkspaceStatusIndicator workspace={workspace}>
 {workspace.latest_build.status === "running" &&
 !workspace.health.healthy && (
 <InfoTooltip
 type="warning"
 title="Workspace is unhealthy"
 message="Your workspace is running but some agents are unhealthy."
 />
 )}
 {workspace.dormant_at && (
 <WorkspaceDormantBadge workspace={workspace} />
 )}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,6 +27,18 @@ export const Running: Story = {
		},
		};

		export const Unhealthy: Story = {
		args: {
		workspace: {
		...createWorkspaceWithStatus("running"),
		health: {
		healthy: false,
		failing_agents: [],
		},
		},
		},
		};

		export const Stopped: Story = {
		args: {
		workspace: createWorkspaceWithStatus("stopped"),
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,6 +4,12 @@ import {
		StatusIndicatorDot,
		type StatusIndicatorProps,
		} from "components/StatusIndicator/StatusIndicator";
		import {
		Tooltip,
		TooltipContent,
		TooltipProvider,
		TooltipTrigger,
		} from "components/Tooltip/Tooltip";
		import type { FC } from "react";
		import type React from "react";
		import {
Expand DownExpand Up		@@ -32,18 +38,41 @@ export const WorkspaceStatusIndicator: FC<WorkspaceStatusIndicatorProps> = ({
		workspace,
		children,
		}) => {
		const { text, type } = getDisplayWorkspaceStatus(
		let { text, type } = getDisplayWorkspaceStatus(
		workspace.latest_build.status,
		workspace.latest_build.job,
		);

		return (
		if (!workspace.health.healthy) {
		type = "warning";
		}

		const statusIndicator = (
		<StatusIndicator variant={variantByStatusType[type]}>
		<StatusIndicatorDot />
		<span>
		<span className="sr-only">Workspace status:</span> {text}
		</span>
		<span className="sr-only">Workspace status:</span> {text}
		{children}
		</StatusIndicator>
		);

		if (workspace.health.healthy) {
		return statusIndicator;
		}

		return (
		<TooltipProvider>
		<Tooltip>
		<TooltipTrigger asChild>
		<StatusIndicator variant={variantByStatusType[type]}>
		<StatusIndicatorDot />
		<span className="sr-only">Workspace status:</span> {text}
		{children}
		</StatusIndicator>
		</TooltipTrigger>
		<TooltipContent>
		Your workspace is running but some agents are unhealthy.
		</TooltipContent>
		</Tooltip>
		</TooltipProvider>
		);
		};
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,7 +21,6 @@ import { Button } from "components/Button/Button";
		import { ExternalImage } from "components/ExternalImage/ExternalImage";
		import { VSCodeIcon } from "components/Icons/VSCodeIcon";
		import { VSCodeInsidersIcon } from "components/Icons/VSCodeInsidersIcon";
		import { InfoTooltip } from "components/InfoTooltip/InfoTooltip";
		import { Spinner } from "components/Spinner/Spinner";
		import { Stack } from "components/Stack/Stack";
		import {
Expand DownExpand Up		@@ -290,6 +289,7 @@ export const WorkspacesTable: FC<WorkspacesTableProps> = ({
		</TableCell>

		<WorkspaceStatusCell workspace={workspace} />

		<WorkspaceActionsCell
		workspace={workspace}
		onActionSuccess={onActionSuccess}
Expand DownExpand Up		@@ -395,14 +395,6 @@ const WorkspaceStatusCell: FC<WorkspaceStatusCellProps> = ({ workspace }) => {
		<TableCell>
		<div className="flex flex-col">
		<WorkspaceStatusIndicator workspace={workspace}>
		{workspace.latest_build.status === "running" &&
		!workspace.health.healthy && (
		<InfoTooltip
		type="warning"
		title="Workspace is unhealthy"
		message="Your workspace is running but some agents are unhealthy."
		/>
		)}
		{workspace.dormant_at && (
		<WorkspaceDormantBadge workspace={workspace} />
		)}
Expand Down