diff --git a/site/src/pages/AgentsPage/components/ChatElements/tools/Tool.tsx b/site/src/pages/AgentsPage/components/ChatElements/tools/Tool.tsx
index 5934b2524f..4e8d6aa237 100644
--- a/site/src/pages/AgentsPage/components/ChatElements/tools/Tool.tsx
+++ b/site/src/pages/AgentsPage/components/ChatElements/tools/Tool.tsx
@@ -1016,7 +1016,7 @@ const StartWorkspaceRenderer: FC<ToolRendererProps> = ({
 // Renderer lookup map for tool names and specialized renderers.
 // ---------------------------------------------------------------------------
 
-const toolRenderers: Record<string, FC<ToolRendererProps>> = {
+export const toolRenderers: Record<string, FC<ToolRendererProps>> = {
 	execute: ExecuteRenderer,
 	process_output: ProcessOutputRenderer,
 	process_signal: ProcessSignalRenderer,
diff --git a/site/src/pages/AgentsPage/components/ChatElements/tools/ToolIcon.tsx b/site/src/pages/AgentsPage/components/ChatElements/tools/ToolIcon.tsx
index 913b8d0bc8..b74f26d148 100644
--- a/site/src/pages/AgentsPage/components/ChatElements/tools/ToolIcon.tsx
+++ b/site/src/pages/AgentsPage/components/ChatElements/tools/ToolIcon.tsx
@@ -5,6 +5,7 @@ import {
 	FilePenLineIcon,
 	FileTextIcon,
 	LightbulbIcon,
+	type LucideIcon,
 	MonitorIcon,
 	PowerIcon,
 	RouteIcon,
@@ -22,6 +23,28 @@ import {
 } from "#/components/Tooltip/Tooltip";
 import { cn } from "#/utils/cn";
 
+export const toolIcons: Partial<Record<string, LucideIcon>> = {
+	execute: TerminalIcon,
+	process_output: TerminalIcon,
+	process_list: TerminalIcon,
+	process_signal: TerminalIcon,
+	read_file: FileTextIcon,
+	read_skill: FileTextIcon,
+	write_file: FilePenLineIcon,
+	edit_files: FilePenLineIcon,
+	list_templates: ServerIcon,
+	read_template: ServerIcon,
+	create_workspace: ServerIcon,
+	start_workspace: PowerIcon,
+	chat_summarized: BotIcon,
+	list_agents: BotIcon,
+	thinking: LightbulbIcon,
+	propose_plan: RouteIcon,
+	ask_user_question: BadgeQuestionMarkIcon,
+	advisor: CompassIcon,
+	computer: MonitorIcon,
+};
+
 export const ToolIcon: React.FC<{
 	name: string;
 	iconUrl?: string;
@@ -73,39 +96,6 @@ export const ToolIcon: React.FC<{
 		return img;
 	}
 
-	switch (name) {
-		case "execute":
-		case "process_output":
-		case "process_list":
-		case "process_signal":
-			return <TerminalIcon className={base} />;
-		case "read_file":
-		case "read_skill":
-			return <FileTextIcon className={base} />;
-		case "write_file":
-		case "edit_files":
-			return <FilePenLineIcon className={base} />;
-		case "list_templates":
-		case "read_template":
-		case "create_workspace":
-			return <ServerIcon className={base} />;
-		case "start_workspace":
-			return <PowerIcon className={base} />;
-		case "chat_summarized":
-		case "list_agents":
-			return <BotIcon className={base} />;
-		case "thinking":
-			return <LightbulbIcon className={base} />;
-		case "propose_plan":
-			return <RouteIcon className={base} />;
-		case "ask_user_question":
-			return <BadgeQuestionMarkIcon className={base} />;
-		case "advisor":
-			return <CompassIcon className={base} />;
-		case "computer":
-			return <MonitorIcon className={base} />;
-
-		default:
-			return <WrenchIcon className={base} />;
-	}
+	const Icon = toolIcons[name] ?? WrenchIcon;
+	return <Icon className={base} />;
 };
diff --git a/site/src/pages/AgentsPage/components/ChatElements/tools/ToolLabel.tsx b/site/src/pages/AgentsPage/components/ChatElements/tools/ToolLabel.tsx
index 4b465e7b03..bbe9b59daf 100644
--- a/site/src/pages/AgentsPage/components/ChatElements/tools/ToolLabel.tsx
+++ b/site/src/pages/AgentsPage/components/ChatElements/tools/ToolLabel.tsx
@@ -2,75 +2,86 @@ import type React from "react";
 import { getPathBasename } from "../../../utils/path";
 import { asRecord, asString, humanizeMCPToolName, parseArgs } from "./utils";
 
-export const ToolLabel: React.FC<{
+type ToolLabelProps = {
 	name: string;
 	args: unknown;
 	result: unknown;
 	mcpSlug?: string;
-}> = ({ name, args, result, mcpSlug }) => {
+};
+
+const ProcessSignalLabel: React.FC<ToolLabelProps> = ({ args, result }) => {
 	const parsed = parseArgs(args);
 	const parsedResult = asRecord(result);
+	const signal = parsed ? asString(parsed.signal) : "";
+	const processId = parsed ? asString(parsed.process_id) : "";
+	const shortId = processId ? processId.slice(0, 8) : "";
+	const suffix = shortId ? ` ${shortId}` : "";
+	const isKill = signal === "kill";
+	const isTerminate = signal === "terminate";
 
-	switch (name) {
-		case "process_signal": {
-			const signal = parsed ? asString(parsed.signal) : "";
-			const processId = parsed ? asString(parsed.process_id) : "";
-			const shortId = processId ? processId.slice(0, 8) : "";
-			const hasResult = result !== undefined && result !== null;
-			const success = parsedResult ? Boolean(parsedResult.success) : false;
-			if (hasResult && success) {
-				const verb = signal === "kill" ? "Killed" : "Terminated";
-				return (
-					<span className="truncate text-[13px]">
-						{verb} process{shortId ? ` ${shortId}` : ""}
-					</span>
-				);
-			}
-			if (hasResult && !success) {
-				const verb =
-					signal === "kill"
-						? "kill"
-						: signal === "terminate"
-							? "terminate"
-							: "signal";
-				return (
-					<span className="truncate text-[13px]">
-						Failed to {verb} process{shortId ? ` ${shortId}` : ""}
-					</span>
-				);
-			}
-			return (
-				<span className="truncate text-[13px]">
-					{signal === "kill"
-						? "Killing process…"
-						: signal === "terminate"
-							? "Terminating process…"
-							: "Sending signal…"}
-				</span>
-			);
-		}
-		case "process_list":
-			return <span className="truncate text-[13px]">Listing processes</span>;
-		case "attach_file": {
-			const attachedName =
-				(parsedResult ? asString(parsedResult.name) : "") ||
-				(parsed ? asString(parsed.name) : "") ||
-				(parsed ? getPathBasename(asString(parsed.path)) : "") ||
-				"file";
-			return (
-				<span className="truncate text-[13px]">{`Attached ${attachedName}`}</span>
-			);
-		}
-		case "advisor":
-			return (
-				<span className="truncate text-[13px] leading-4 text-content-secondary">
-					Advisor
-				</span>
-			);
-
-		default: {
-			const displayName = mcpSlug ? humanizeMCPToolName(mcpSlug, name) : name;
-			return <span className="truncate text-[13px]">{displayName}</span>;
-		}
+	const hasResult = result !== undefined && result !== null;
+	if (!hasResult) {
+		const inFlightVerb = isKill
+			? "Killing process…"
+			: isTerminate
+				? "Terminating process…"
+				: "Sending signal…";
+		return <span className="truncate text-[13px]">{inFlightVerb}</span>;
 	}
+
+	const success = parsedResult ? Boolean(parsedResult.success) : false;
+	if (success) {
+		const verb = isKill ? "Killed" : "Terminated";
+		return (
+			<span className="truncate text-[13px]">
+				{verb} process{suffix}
+			</span>
+		);
+	}
+
+	const failedVerb = isKill ? "kill" : isTerminate ? "terminate" : "signal";
+	return (
+		<span className="truncate text-[13px]">
+			Failed to {failedVerb} process{suffix}
+		</span>
+	);
+};
+
+const AttachFileLabel: React.FC<ToolLabelProps> = ({ args, result }) => {
+	const parsed = parseArgs(args);
+	const parsedResult = asRecord(result);
+	const resultName = parsedResult ? asString(parsedResult.name) : "";
+	const argName = parsed ? asString(parsed.name) : "";
+	const argPath = parsed ? asString(parsed.path) : "";
+	const attachedName =
+		resultName || argName || getPathBasename(argPath) || "file";
+	return (
+		<span className="truncate text-[13px]">{`Attached ${attachedName}`}</span>
+	);
+};
+
+export const genericToolLabels: Partial<
+	Record<string, React.FC<ToolLabelProps>>
+> = {
+	process_signal: ProcessSignalLabel,
+	process_list: () => (
+		<span className="truncate text-[13px]">Listing processes</span>
+	),
+	attach_file: AttachFileLabel,
+	advisor: () => (
+		<span className="truncate text-[13px] leading-4 text-content-secondary">
+			Advisor
+		</span>
+	),
+};
+
+export const ToolLabel: React.FC<ToolLabelProps> = (props) => {
+	const Label = genericToolLabels[props.name];
+	if (Label) {
+		return <Label {...props} />;
+	}
+	const displayName = props.mcpSlug
+		? humanizeMCPToolName(props.mcpSlug, props.name)
+		: props.name;
+	return <span className="truncate text-[13px]">{displayName}</span>;
 };
diff --git a/site/src/pages/AgentsPage/components/ChatElements/tools/toolIconsCoverage.test.ts b/site/src/pages/AgentsPage/components/ChatElements/tools/toolIconsCoverage.test.ts
new file mode 100644
index 0000000000..641385ebff
--- /dev/null
+++ b/site/src/pages/AgentsPage/components/ChatElements/tools/toolIconsCoverage.test.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from "vitest";
+import { toolRenderers } from "./Tool";
+import { toolIcons } from "./ToolIcon";
+
+// ReadSkillFileRenderer renders ReadSkillTool, which passes the
+// hardcoded iconName "read_skill" for read_skill_file calls.
+const aliasedIconNames = new Set(["read_skill_file"]);
+
+describe("toolIcons coverage", () => {
+	// A registered tool name without a table entry silently degrades to
+	// WrenchIcon, unless its renderer passes an aliased fixed iconName.
+	it("resolves an icon for every registered renderer", () => {
+		const missing = Object.keys(toolRenderers).filter(
+			(name) => !aliasedIconNames.has(name) && toolIcons[name] === undefined,
+		);
+		expect(missing).toEqual([]);
+	});
+});
diff --git a/site/src/pages/AgentsPage/components/ChatElements/tools/toolLabelVisibility.test.ts b/site/src/pages/AgentsPage/components/ChatElements/tools/toolLabelVisibility.test.ts
new file mode 100644
index 0000000000..55ada134f3
--- /dev/null
+++ b/site/src/pages/AgentsPage/components/ChatElements/tools/toolLabelVisibility.test.ts
@@ -0,0 +1,26 @@
+import { describe, expect, it } from "vitest";
+import { toolRenderers } from "./Tool";
+import { genericToolLabels } from "./ToolLabel";
+
+// process_signal's renderer delegates to GenericToolRenderer.
+const genericDelegatingToolNames = new Set(["process_signal"]);
+
+// advisor's registered renderer does not delegate; AdvisorTool renders
+// ToolLabel directly with a hardcoded name instead.
+const directToolLabelConsumers = new Set(["advisor"]);
+
+// genericToolLabels holds the label for every tool name that can reach
+// GenericToolRenderer. A name with a registered renderer only reaches it
+// when that renderer delegates, so a name that is registered but does not
+// delegate can never use its genericToolLabels entry.
+describe("genericToolLabels visibility", () => {
+	it("contains no arm shadowed by a non-delegating registered renderer", () => {
+		const shadowed = Object.keys(genericToolLabels).filter(
+			(name) =>
+				!genericDelegatingToolNames.has(name) &&
+				!directToolLabelConsumers.has(name) &&
+				toolRenderers[name] !== undefined,
+		);
+		expect(shadowed).toEqual([]);
+	});
+});