@@ -36,7 +36,7 @@ import {
 import type { TimelineEvent, ResourceRef, Relationships, SelectedResource, ResolvedEnvFrom, Topology, TopologyNode, HPADiagnosis, WorkloadPodInfo } from '../../types'
 import type { GitOpsStatus } from '../../types/gitops'
 import type { NavigateToResource } from '../../utils/navigation'
-import { refToSelectedResource, pluralToKind, kindToPlural, kindToPluralWithGroup, apiVersionToGroup } from '../../utils/navigation'
+import { refToSelectedResource, pluralToKind, knownKindForPluralWithGroup, kindToPlural, kindToPluralWithGroup, apiVersionToGroup } from '../../utils/navigation'
 import { neighborhoodFor, seedNodeIds } from '../../utils/topology-neighborhood'
 import { TopologyGraph } from '../topology/TopologyGraph'
 import { gitOpsOwnerFromRelationships, type GitOpsOwnerRef } from '../../utils/gitops-owner'
@@ -731,7 +731,7 @@ export function WorkloadView({
     | ((ctx: { kind: string; group?: string; namespace: string; name: string; health?: DiagnoseHealthHint }) => ReactNode)
     | undefined
   const diagnoseAction = renderDiagnose?.({
-    kind: apiKind,
+    kind: resource?.kind ?? knownKindForPluralWithGroup(apiKind, group ?? '') ?? apiKind,
     group,
     namespace,
     name,
 
@@ -1,6 +1,6 @@
 import { describe, test, expect, afterEach } from 'vitest'
 import { englishPlural } from './pluralize'
-import { kindToPlural, kindToPluralWithGroup, pluralToKind, refToSelectedResource, initNavigationMap, resetNavigationMap, laneId, laneResourceKey, groupQualifiesLaneId, parseLaneId } from './navigation'
+import { kindToPlural, kindToPluralWithGroup, pluralToKind, knownKindForPluralWithGroup, refToSelectedResource, initNavigationMap, resetNavigationMap, laneId, laneResourceKey, groupQualifiesLaneId, parseLaneId } from './navigation'
 
 afterEach(() => {
   resetNavigationMap()
@@ -223,6 +223,25 @@ describe('initNavigationMap', () => {
       { group: 'metrics.k8s.io', version: 'v1beta1', kind: 'PodMetrics', name: 'pods', namespaced: true, isCrd: false, verbs: ['get'] },
     ])
     expect(pluralToKind('pods')).toBe('Pod')
+    expect(knownKindForPluralWithGroup('pods', '')).toBe('Pod')
+    expect(knownKindForPluralWithGroup('pods', 'metrics.k8s.io')).toBe('PodMetrics')
+    expect(kindToPluralWithGroup('PodMetrics', 'metrics.k8s.io')).toBe('pods')
+  })
+
+  test('resolves discovered plural collisions by API group', () => {
+    initNavigationMap([
+      { group: 'a.example.io', version: 'v1', kind: 'Widget', name: 'widgets', namespaced: true, isCrd: true, verbs: ['get'] },
+      { group: 'b.example.io', version: 'v1', kind: 'OtherWidget', name: 'widgets', namespaced: true, isCrd: true, verbs: ['get'] },
+    ])
+    expect(knownKindForPluralWithGroup('widgets', 'a.example.io')).toBe('Widget')
+    expect(knownKindForPluralWithGroup('widgets', 'b.example.io')).toBe('OtherWidget')
+    expect(knownKindForPluralWithGroup('OtherWidget', 'b.example.io')).toBe('OtherWidget')
+  })
+
+  test('does not invent a Kind for an undiscovered irregular CRD', () => {
+    expect(knownKindForPluralWithGroup('databases', 'postgresql.cnpg.io')).toBeUndefined()
+    expect(kindToPluralWithGroup('Database', 'postgresql.cnpg.io')).toBe('databases')
+    expect(kindToPluralWithGroup('databases', 'postgresql.cnpg.io')).toBe('databases')
   })
 
   test('keeps the virtual PodGroup alias distinct from scheduling PodGroup', () => {
 
@@ -1,5 +1,6 @@
 import type { SelectedResource, ResourceRef, APIResource } from '../types/core'
 import { englishPlural, englishSingular, isEnglishPlural } from './pluralize'
+import { CORE_RESOURCES } from './api-resources'
 
 /**
  * Canonical callback type for navigating to a resource.
@@ -44,13 +45,23 @@ const BUILTIN_PLURAL_TO_KIND: Record<string, string> = {
 
 const BUILTIN_GROUP_KIND_TO_PLURAL: Record<string, string> = {
   'scheduling.k8s.io/podgroup': 'podgroups',
+  'metrics.k8s.io/podmetrics': 'pods',
+  'metrics.k8s.io/nodemetrics': 'nodes',
+}
+
+const BUILTIN_GROUP_PLURAL_TO_KIND: Record<string, string> = {
+  ...Object.fromEntries(CORE_RESOURCES.map(r => [`${r.group}/${r.name}`, r.kind])),
+  'metrics.k8s.io/pods': 'PodMetrics',
+  'metrics.k8s.io/nodes': 'NodeMetrics',
+  'scheduling.k8s.io/podgroups': 'PodGroup',
 }
 
 // Dynamic map built from API discovery — populated by initNavigationMap().
 // Once populated, this is the source of truth for all kind↔plural lookups.
 let discoveredPluralToKind: Record<string, string> | null = null
 let discoveredKindToPlural: Record<string, string> | null = null
 let discoveredGroupKindToPlural: Record<string, string> | null = null
+let discoveredGroupPluralToKind: Record<string, string> | null = null
 
 /**
  * Initialize navigation maps from discovered API resources.
@@ -61,6 +72,7 @@ export function initNavigationMap(resources: APIResource[]) {
   const p2k: Record<string, string> = { ...BUILTIN_PLURAL_TO_KIND }
   const k2p: Record<string, string> = {}
   const gk2p: Record<string, string> = {}
+  const gp2k: Record<string, string> = { ...BUILTIN_GROUP_PLURAL_TO_KIND }
   for (const r of resources) {
     const plural = r.name.toLowerCase()
     // First-wins on plurals: BUILTIN_PLURAL_TO_KIND seeds canonical core mappings
@@ -69,17 +81,21 @@ export function initNavigationMap(resources: APIResource[]) {
     if (!(plural in p2k)) p2k[plural] = r.kind
     k2p[r.kind.toLowerCase()] = plural
     gk2p[`${r.group}/${r.kind.toLowerCase()}`] = plural
+    const groupPlural = `${r.group}/${plural}`
+    if (!(groupPlural in gp2k)) gp2k[groupPlural] = r.kind
   }
   discoveredPluralToKind = p2k
   discoveredKindToPlural = k2p
   discoveredGroupKindToPlural = gk2p
+  discoveredGroupPluralToKind = gp2k
 }
 
 /** Reset navigation maps to builtin-only state. For testing. */
 export function resetNavigationMap() {
   discoveredPluralToKind = null
   discoveredKindToPlural = null
   discoveredGroupKindToPlural = null
+  discoveredGroupPluralToKind = null
 }
 
 function getPluralToKind(): Record<string, string> {
@@ -166,6 +182,15 @@ export function pluralToKind(plural: string): string {
   return singular.charAt(0).toUpperCase() + singular.slice(1)
 }
 
+/** Return an exact Kind only when the input or group-qualified discovery proves it. */
+export function knownKindForPluralWithGroup(plural: string, group: string): string | undefined {
+  if (!plural) return undefined
+  if (plural[0] !== plural[0].toLowerCase()) return plural
+  const groupPlural = `${group}/${plural.toLowerCase()}`
+  return discoveredGroupPluralToKind?.[groupPlural]
+    ?? BUILTIN_GROUP_PLURAL_TO_KIND[groupPlural]
+}
+
 /**
  * Convert a ResourceRef (from backend relationships) to a SelectedResource (for navigation).
  * Handles kind singular→plural conversion.
 
@@ -183,6 +183,7 @@ export interface DiagnoseStreamEvent {
 // server runs.
 export interface RunSummary {
   id: string;
+  /** Stored target Kind; existing hosted runs may contain a plural API resource name. */
   kind: string;
   /** Kubernetes API group; empty means the core API group. */
   group: string;
 
@@ -36,6 +36,7 @@ import {
   type ExecutionProfile,
 } from "../../api/diagnose";
 import { runTargetKey } from "./target";
+import { knownKindForPluralWithGroup } from "../../utils/navigation";
 
 export interface Target {
   kind: string;
@@ -660,7 +661,7 @@ function RoutedDiagnoseProvider({
   const startRunRef = useRef<(t: Target) => void>(() => {});
   startRunRef.current = (t: Target) => {
     const seq = ++startSeqRef.current;
-    createRun(t, {
+    createRun({ ...t, kind: knownKindForPluralWithGroup(t.kind, t.group) ?? t.kind }, {
       agent: selectedAgent || undefined,
       profile: hosted ? undefined : effectiveProfile,
       model: model || undefined,
 
@@ -71,6 +71,35 @@ function diagnoseWithPods(...pods: string[]) {
 }
 
 describe("prometheus rules adapter", () => {
+  it("attributes workload-labelled alerts in saved plural-kind Hub runs", () => {
+    const projection = projectInvestigationEvidence(
+      [
+        {
+          timeline: [
+            tool("rules", "get_prometheus_rules", {
+              count: 1,
+              rules: [
+                alertingRule({
+                  alerts: [
+                    {
+                      state: "firing",
+                      labels: { namespace: "shop", deployment: "api" },
+                    },
+                  ],
+                }),
+              ],
+            }),
+          ],
+        },
+      ],
+      { ...target, kind: "deployments" },
+    );
+
+    expect(groupsOf(projection.groups, "alerts")[0].latest.relevance).toBe(
+      "target",
+    );
+  });
+
   it("relates a rule to the target through its instances, never the rule alone", () => {
     const projection = project([
       diagnoseWithPods("api-68c7b766dc-fmphn"),
 
@@ -1,4 +1,4 @@
-import { apiVersionToGroup } from "../../../utils/navigation";
+import { apiVersionToGroup, knownKindForPluralWithGroup } from "../../../utils/navigation";
 import { adaptChanges } from "./adapters/changes";
 import { adaptDiagnose } from "./adapters/diagnose";
 import { adaptEvents } from "./adapters/events";
@@ -118,7 +118,10 @@ export function projectInvestigationEvidence(
   turns: readonly InvestigationEvidenceTurn[],
   target: InvestigationEvidenceTarget,
 ): InvestigationEvidenceProjection {
-  const builder = new ProjectionBuilder(target);
+  const builder = new ProjectionBuilder({
+    ...target,
+    kind: knownKindForPluralWithGroup(target.kind, target.group) ?? target.kind,
+  });
   collectEstablishedTargetPods(builder, turns);
   const evidenceRefSources: InvestigationEvidenceSource[] = [];
   const citableSources: InvestigationEvidenceSource[] = [];
 
@@ -16,6 +16,7 @@ import {
   diagnosisSeverityTone,
 } from "../diagnoseEvidenceTypes";
 import { investigationResourceEvidenceSummary } from "../investigationResourceEvidenceModel";
+import { kindToPluralWithGroup } from "../../../utils/navigation";
 import { stableHash } from "./identity";
 import { nonEmptyString, parseJSON, record, stringArray } from "./parse";
 import {
@@ -198,9 +199,11 @@ export function resourceMatchesTarget(
     name: string;
   },
 ): boolean {
+  const group = (resource.group ?? "").toLowerCase();
   return (
-    resource.kind.toLowerCase() === target.kind.toLowerCase() &&
-    (resource.group ?? "").toLowerCase() === target.group.toLowerCase() &&
+    group === target.group.toLowerCase() &&
+    kindToPluralWithGroup(resource.kind, group) ===
+      kindToPluralWithGroup(target.kind, group) &&
     (resource.namespace ?? "") === (target.namespace ?? "") &&
     resource.name === target.name
   );
 
@@ -469,6 +469,100 @@ describe("strict evidence adapters", () => {
     );
   });
 
+  it("attributes evidence to saved Hub runs with a plural resource kind", () => {
+    const result = projectInvestigationEvidence(
+      [
+        {
+          timeline: [
+            tool("deployment", "get_resource", deployment),
+            tool("wrong-group", "get_resource", {
+              ...deployment,
+              apiVersion: "example.com/v1",
+            }),
+            tool(
+              "plural-events",
+              "get_events",
+              { events: [warningEvent] },
+              {
+                summary: JSON.stringify({
+                  kind: "deployments",
+                  namespace: "shop",
+                  name: "api",
+                }),
+              },
+            ),
+            tool("plural-issue", "issues", {
+              issues: [{ ...criticalIssue, kind: "deployments" }],
+              total: 1,
+              total_matched: 1,
+            }),
+          ],
+        },
+      ],
+      { ...target, kind: "deployments" },
+    );
+
+    const resources = groupsOf(result.groups, "resource");
+    expect(resources.map((group) => group.latest.relevance)).toEqual([
+      "target",
+      "broader",
+    ]);
+    expect(groupsOf(result.groups, "events")[0].latest.relevance).toBe(
+      "target",
+    );
+    expect(groupsOf(result.groups, "issue")[0].latest.relevance).toBe(
+      "target",
+    );
+  });
+
+  it("keeps colliding non-core plurals on their own API group", () => {
+    const podMetrics = {
+      apiVersion: "metrics.k8s.io/v1beta1",
+      kind: "PodMetrics",
+      metadata: { namespace: "shop", name: "api" },
+    };
+    const result = projectInvestigationEvidence(
+      [
+        {
+          timeline: [
+            tool("metrics-pod", "get_resource", podMetrics),
+            tool("core-pod", "get_resource", {
+              ...podMetrics,
+              apiVersion: "v1",
+              kind: "Pod",
+            }),
+          ],
+        },
+      ],
+      { ...target, kind: "pods", group: "metrics.k8s.io" },
+    );
+    expect(
+      groupsOf(result.groups, "resource").map(
+        (group) => group.latest.relevance,
+      ),
+    ).toEqual(["target", "broader"]);
+  });
+
+  it("matches an undiscovered irregular CRD without inventing its Kind", () => {
+    const result = projectInvestigationEvidence(
+      [
+        {
+          timeline: [
+            tool("database", "get_resource", {
+              apiVersion: "postgresql.cnpg.io/v1",
+              kind: "Database",
+              metadata: { namespace: "shop", name: "api" },
+            }),
+          ],
+        },
+      ],
+      { ...target, kind: "databases", group: "postgresql.cnpg.io" },
+    );
+    expect(groupsOf(result.groups, "resource")[0].latest.relevance).toBe(
+      "target",
+    );
+  });
+
   it("treats an unexpressible event group as unspecified while honoring explicit groups", () => {
     const eventsFor = (group?: string) =>
       project([
 
@@ -26,6 +26,25 @@ describe("investigation target identity", () => {
     ).toBe("Rollout.argoproj.io prod/checkout");
   });
 
+  it("formats saved plural targets as Kubernetes Kinds", () => {
+    expect(
+      formatInvestigationTarget({
+        kind: "deployments",
+        group: "apps",
+        namespace: "prod",
+        name: "api",
+      }),
+    ).toBe("Deployment.apps prod/api");
+    expect(
+      formatInvestigationTarget({
+        kind: "pods",
+        group: "metrics.k8s.io",
+        namespace: "prod",
+        name: "api",
+      }),
+    ).toBe("PodMetrics.metrics.k8s.io prod/api");
+  });
+
   it("keeps the core target label compact", () => {
     expect(
       formatInvestigationTarget({