@skyhook-io/k8s-ui 1.14.9 → 1.14.11

package/src/components/workload/WorkloadView.tsx

@@ -1,3 +1,5 @@
+import { PodRow, PodListFrame, PodListToggle, workloadPodDetail } from './PodList'
+export { workloadPodDetail, podStatusLabel, podStatusClass, podDotClass } from './PodList'
 import { useState, useMemo, useEffect, useRef, useCallback, type ComponentType, type ReactNode } from 'react'
 import { flushSync } from 'react-dom'
 import { useRefreshAnimation } from '../../hooks/useRefreshAnimation'
@@ -7,7 +9,6 @@ import { FetchResult } from '../ui/FetchResult'
 import { PaneLoader } from '../ui/PaneLoader'
 import { useRegisterShortcuts } from '../../hooks/useKeyboardShortcuts'
 import { clsx } from 'clsx'
-import { Collapse } from '../ui/Collapse'
 import {
   ArrowLeft,
   ArrowRight,
@@ -38,7 +39,7 @@ import type { TimelineEvent, ResourceRef, Relationships, SelectedResource, Resol
 import type { GitOpsStatus } from '../../types/gitops'
 import type { NavigateToResource } from '../../utils/navigation'
 import { refToSelectedResource, pluralToKind, knownKindForPluralWithGroup, kindToPlural, kindToPluralWithGroup, apiVersionToGroup } from '../../utils/navigation'
-import { neighborhoodFor, seedNodeIds } from '../../utils/topology-neighborhood'
+import { neighborhoodFor, seedNodeIds, topologyNodeResourceKind } from '../../utils/topology-neighborhood'
 import { TopologyGraph } from '../topology/TopologyGraph'
 import { gitOpsOwnerFromRelationships, type GitOpsOwnerRef } from '../../utils/gitops-owner'
 import { gitOpsRouteForResource } from '../../utils/gitops-route'
@@ -441,8 +442,9 @@ export function WorkloadView({
   onOpenHelmRelease,
   onNavigateGitOpsPath,
 }: WorkloadViewProps) {
-  // Normalize kind: URL has plural lowercase, internal logic uses singular PascalCase
-  const kind = pluralToKind(kindProp)
+  // The live object preserves exact CRD capitalization (RayJob, TFJob); the URL
+  // plural remains the API resource name used by fetches and mutations.
+  const kind = resource?.kind || pluralToKind(kindProp)
   const apiKind = kindProp
 
   // Tab state — controlled or uncontrolled
@@ -498,14 +500,14 @@ export function WorkloadView({
     return buildResourceHierarchy({
       events: allEvents,
       topology,
-      rootResource: { kind, namespace, name },
+      rootResource: { kind, group, namespace, name },
       groupByApp: true,
     })
-  }, [allEvents, topology, kind, namespace, name])
+  }, [allEvents, topology, kind, group, namespace, name])
 
   // Topology tab — the seeded neighborhood around this one workload (its
   // ownership core + attached Services/config/policies), not the whole namespace.
-  const neighborhoodSeed = useMemo(() => [{ kind, namespace, name }], [kind, namespace, name])
+  const neighborhoodSeed = useMemo(() => [{ kind, group, namespace, name }], [kind, group, namespace, name])
   const neighborhood = useMemo(
     () => (topology ? neighborhoodFor(topology, neighborhoodSeed) : null),
     [topology, neighborhoodSeed],
@@ -538,7 +540,7 @@ export function WorkloadView({
       .filter((n) => n.kind !== 'Internet' && n.kind !== 'PodGroup')
       .map((n) => ({
         id: n.id,
-        kind: n.kind as string,
+        kind: topologyNodeResourceKind(n),
         namespace: (n.data?.namespace as string) || namespace,
         name: n.name,
         group: apiVersionToGroup(n.data?.apiVersion as string | undefined),
@@ -556,10 +558,11 @@ export function WorkloadView({
   const yamlObject = yamlObjectId ? yamlObjects.find((o) => o.id === yamlObjectId) : undefined
   const handleTopologyNodeClick = useCallback(
     (node: TopologyNode) => {
-      if (!onNavigateToResource || !node.kind || !node.name) return
+      const resourceKind = topologyNodeResourceKind(node)
+      if (!onNavigateToResource || !resourceKind || !node.name) return
       const group = apiVersionToGroup(node.data?.apiVersion as string | undefined)
       onNavigateToResource({
-        kind: kindToPluralWithGroup(node.kind, group),
+        kind: kindToPluralWithGroup(resourceKind, group),
         namespace: (node.data?.namespace as string) || '',
         name: node.name,
         group,
@@ -742,8 +745,7 @@ export function WorkloadView({
   const showMetricsTab = isMetricsAvailable ? isMetricsAvailable(kind, resource) : false
   const showCostTab = isCostAvailable ? isCostAvailable(kind, resource) : false
   const normalizedKind = kindToPlural(kind).toLowerCase()
-  const logsWithoutPods = LOGS_TAB_WITHOUT_PODS_KINDS.has(normalizedKind) &&
-    (normalizedKind !== 'jobs' || isCoreBatchJob(kind, group))
+  const logsWithoutPods = supportsLogsWithoutPods(normalizedKind, kind, group, resource?.apiVersion)
   const logsTabVisible = Boolean(renderLogsTab) && (allPods.length > 0 || logsWithoutPods)
   const metricsTabVisible = Boolean(showMetricsTab && renderMetricsTab)
   const costTabVisible = Boolean(showCostTab && renderCostTab)
@@ -1737,11 +1739,26 @@ const LOGS_TAB_WITHOUT_PODS_KINDS = new Set([
   'workflowtemplates',
   'clusterworkflowtemplates',
   'scaledjobs',
+  'jobsets',
 ])
 const RUNTIME_WORKLOAD_OVERVIEW_KINDS = new Set(['deployments', 'statefulsets', 'daemonsets', 'jobs', 'cronjobs'])
 const ROLLOUT_STATUS_KINDS = new Set(['deployments', 'statefulsets', 'daemonsets', 'rollouts'])
 type RuntimeOverviewShape = 'replicated' | 'job' | 'cronjob'
 
+export function supportsLogsWithoutPods(
+  normalizedKind: string,
+  kind: string,
+  group?: string,
+  apiVersion?: string,
+): boolean {
+  if (!LOGS_TAB_WITHOUT_PODS_KINDS.has(normalizedKind)) return false
+  if (normalizedKind === 'jobs') return isCoreBatchJob(kind, group)
+  if (normalizedKind === 'jobsets') {
+    return group === 'jobset.x-k8s.io' && apiVersion === 'jobset.x-k8s.io/v1alpha2'
+  }
+  return true
+}
+
 function isRuntimeWorkloadOverviewKind(kind: string, group?: string) {
   const normalizedKind = kindToPlural(kind).toLowerCase()
   return RUNTIME_WORKLOAD_OVERVIEW_KINDS.has(normalizedKind) &&
@@ -2882,116 +2899,6 @@ function PodsListContent({
   )
 }
 
-function PodRow({
-  name,
-  namespace,
-  ready,
-  healthLevel,
-  detail,
-  onNavigate,
-}: {
-  name: string
-  namespace: string
-  ready: boolean | null
-  healthLevel?: WorkloadPodInfo['healthLevel']
-  detail: string
-  onNavigate?: NavigateToResource
-}) {
-  const statusLabel = podStatusLabel(healthLevel, ready)
-  const statusClass = podStatusClass(healthLevel, ready)
-  const content = (
-    <>
-      <span className={clsx('h-2 w-2 shrink-0 rounded-full', podDotClass(healthLevel, ready))} />
-      <span className="min-w-0 flex-1">
-        <span className="block truncate text-sm font-medium text-theme-text-primary">{name}</span>
-        <span className="block truncate text-xs text-theme-text-tertiary">{detail}</span>
-      </span>
-      <span className={clsx('badge-sm shrink-0', statusClass)}>
-        {statusLabel}
-      </span>
-    </>
-  )
-
-  if (!onNavigate) {
-    return (
-      <div className="flex w-full min-w-0 items-center gap-3 rounded-md border border-theme-border bg-theme-base px-3 py-2 text-left">
-        {content}
-      </div>
-    )
-  }
-
-  return (
-    <button
-      type="button"
-      onClick={() => onNavigate({ kind: 'pods', namespace, name })}
-      className="flex w-full min-w-0 items-center gap-3 rounded-md border border-theme-border bg-theme-base px-3 py-2 text-left transition-colors hover:bg-theme-hover"
-    >
-      {content}
-    </button>
-  )
-}
-
-function PodListFrame({
-  expanded,
-  hasOverflow,
-  overflow,
-  toggle,
-  children,
-}: {
-  expanded: boolean
-  hasOverflow: boolean
-  overflow?: ReactNode
-  toggle?: ReactNode
-  children: ReactNode
-}) {
-  return (
-    <div className="space-y-2">
-      <div className="space-y-2">
-        {children}
-      </div>
-      {hasOverflow && (
-        <Collapse open={expanded}>
-          {/* Long overflow lists scroll inside a capped box once open; the
-              cap comes off while closed so the collapse measures to zero. */}
-          <div className={clsx(expanded && 'max-h-[26rem] overflow-y-auto pr-1')}>
-            <div className="space-y-2">
-              {overflow}
-            </div>
-          </div>
-        </Collapse>
-      )}
-      {toggle}
-    </div>
-  )
-}
-
-function PodListToggle({
-  expanded,
-  hiddenCount,
-  label,
-  onToggle,
-}: {
-  expanded: boolean
-  hiddenCount: number
-  label: string
-  onToggle: () => void
-}) {
-  if (!expanded && hiddenCount <= 0) return null
-
-  return (
-    <div className="pt-1">
-      <button
-        type="button"
-        aria-expanded={expanded}
-        onClick={onToggle}
-        className="text-xs font-medium text-accent-text hover:underline"
-      >
-        {expanded ? `Collapse ${label}` : `Show ${hiddenCount} more ${label}`}
-      </button>
-    </div>
-  )
-}
-
 function compareWorkloadPods(a: WorkloadPodInfo, b: WorkloadPodInfo): number {
   const severity = podSeverityRank(b) - podSeverityRank(a)
   if (severity !== 0) return severity
@@ -3011,43 +2918,6 @@ function podSeverityRank(pod: WorkloadPodInfo): number {
   }
 }
 
-function workloadPodDetail(pod: WorkloadPodInfo): string {
-  const parts: string[] = []
-  if (pod.phase) parts.push(pod.reason ? `${pod.phase} / ${pod.reason}` : pod.phase)
-  else if (pod.reason) parts.push(pod.reason)
-  parts.push(`${pod.containers.length} container${pod.containers.length === 1 ? '' : 's'}`)
-  if ((pod.restartCount ?? 0) > 0) parts.push(`${pod.restartCount} restart${pod.restartCount === 1 ? '' : 's'}`)
-  if (pod.lastTerminationReason && !['Unknown', 'Completed'].includes(pod.lastTerminationReason)) {
-    parts.push(`last ${pod.lastTerminationReason}`)
-  }
-  if (pod.createdAt) parts.push(`${formatAge(pod.createdAt)} old`)
-  return parts.join(' · ')
-}
-
-function podStatusLabel(healthLevel: WorkloadPodInfo['healthLevel'] | undefined, ready: boolean | null): string {
-  if (healthLevel === 'unhealthy') return 'Unhealthy'
-  if (healthLevel === 'degraded') return 'Degraded'
-  if (healthLevel === 'neutral') return ready ? 'Ready' : 'Neutral'
-  if (healthLevel === 'unknown') return 'Unknown'
-  return ready === null ? 'Unknown' : ready ? 'Ready' : 'Not ready'
-}
-
-function podStatusClass(healthLevel: WorkloadPodInfo['healthLevel'] | undefined, ready: boolean | null): string {
-  if (healthLevel === 'unhealthy') return 'status-unhealthy'
-  if (healthLevel === 'degraded') return 'status-degraded'
-  if (healthLevel === 'neutral') return 'status-neutral'
-  if (healthLevel === 'unknown' || ready === null) return 'status-unknown'
-  return ready ? 'status-healthy' : 'status-degraded'
-}
-
-function podDotClass(healthLevel: WorkloadPodInfo['healthLevel'] | undefined, ready: boolean | null): string {
-  if (healthLevel === 'unhealthy') return 'bg-red-500'
-  if (healthLevel === 'degraded') return 'bg-amber-500'
-  if (healthLevel === 'neutral') return 'bg-skyhook-500'
-  if (healthLevel === 'unknown' || ready === null) return 'bg-theme-text-tertiary'
-  return ready ? 'bg-emerald-500' : 'bg-amber-500'
-}
-
 function MoreRows({ count, label }: { count: number; label: string }) {
   return <div className="text-xs text-theme-text-tertiary">+{count} more {label} hidden from this overview.</div>
 }

package/src/components/workload/index.ts

@@ -1,2 +1,12 @@
-export { WorkloadView, isDiagnoseKind, type ResourceOwnershipContext, type ServingResourceDetail, type WorkloadTabType } from './WorkloadView'
+export {
+  WorkloadView,
+  isDiagnoseKind,
+  workloadPodDetail,
+  podStatusLabel,
+  podStatusClass,
+  podDotClass,
+  type ResourceOwnershipContext,
+  type ServingResourceDetail,
+  type WorkloadTabType,
+} from './WorkloadView'
 export { ResourceDetailDrawer } from './ResourceDetailDrawer'

package/src/components/workload/workload-logs-availability.test.ts

@@ -0,0 +1,20 @@
+import { describe, expect, it } from 'vitest'
+
+import { supportsLogsWithoutPods } from './WorkloadView'
+
+describe('supportsLogsWithoutPods', () => {
+  it('allows the supported JobSet identity to select child Job logs', () => {
+    expect(supportsLogsWithoutPods('jobsets', 'JobSet', 'jobset.x-k8s.io', 'jobset.x-k8s.io/v1alpha2')).toBe(true)
+  })
+
+  it('rejects foreign and unsupported same-kind JobSets', () => {
+    expect(supportsLogsWithoutPods('jobsets', 'JobSet', 'example.io', 'example.io/v1alpha2')).toBe(false)
+    expect(supportsLogsWithoutPods('jobsets', 'JobSet', 'jobset.x-k8s.io', 'jobset.x-k8s.io/v1beta1')).toBe(false)
+  })
+
+  it('preserves existing scheduled workload and core Job behavior', () => {
+    expect(supportsLogsWithoutPods('cronjobs', 'CronJob', 'batch', 'batch/v1')).toBe(true)
+    expect(supportsLogsWithoutPods('jobs', 'Job', 'batch', 'batch/v1')).toBe(true)
+    expect(supportsLogsWithoutPods('jobs', 'Job', 'example.io', 'example.io/v1')).toBe(false)
+  })
+})

package/src/components/workload/workload-pod-presentation.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, it } from 'vitest'
+import {
+  podStatusClass,
+  podStatusLabel,
+  workloadPodDetail,
+} from './WorkloadView'
+
+describe('workload Pod presentation', () => {
+  it('surfaces container failure evidence instead of reporting only the Pod phase', () => {
+    const pod = {
+      name: 'workers-2-abc',
+      phase: 'Running',
+      ready: false,
+      containers: ['worker'],
+      restartCount: 3,
+      reason: 'CrashLoopBackOff',
+      lastTerminationReason: 'OOMKilled',
+      healthLevel: 'unhealthy' as const,
+    }
+
+    expect(podStatusLabel(pod.healthLevel, pod.ready)).toBe('Unhealthy')
+    expect(podStatusClass(pod.healthLevel, pod.ready)).toBe('status-unhealthy')
+    expect(workloadPodDetail(pod)).toBe(
+      'Running / CrashLoopBackOff · 1 container · 3 restarts · last OOMKilled',
+    )
+  })
+})

package/src/types/core.ts

@@ -116,6 +116,7 @@ export interface IntegrationCapability {
 
 // Feature capabilities based on RBAC permissions
 export interface Capabilities {
+  configManagement?: 'local' | 'operator' | 'cloud'
   exec: boolean           // Terminal feature (pods/exec)
   localTerminal: boolean  // Local terminal available (not in-cluster, not disabled)
   logs: boolean           // Log viewer (pods/log)
@@ -746,6 +747,28 @@ export interface ResourceWithRelationships<T = unknown> {
 }
 
 // API Resource (from discovery endpoint)
+export type DynamicObservationState =
+  | 'unwatched'
+  | 'deferred'
+  | 'syncing'
+  | 'synced'
+  | 'denied'
+  | 'unsupported'
+
+export type DynamicObservationScope = 'cluster' | 'explicit_namespaces'
+
+/** Initial sync and viewer-visible scope, not watch health or authorization.
+ * Origin/start time and projection flags are omitted; none proves freshness. */
+export interface DynamicResourceObservation {
+  /** Time of a retained probe decision, not resource freshness. */
+  observedAt?: string
+  state: DynamicObservationState
+  scope?: DynamicObservationScope
+  namespaces?: string[]
+  truncated?: boolean
+  reasonCode?: string
+}
+
 export interface APIResource {
   group: string
   version: string
@@ -755,6 +778,7 @@ export interface APIResource {
   isCrd: boolean
   featured?: boolean
   verbs: string[]
+  observation?: DynamicResourceObservation
 }
 
 // Helm release types

package/src/types/gitops-tree.ts

@@ -40,6 +40,9 @@ export interface GitOpsTreeNode {
   groupedNodeIDs?: string[]
   count?: number
   data?: Record<string, unknown>
+  // Lives on the destination cluster of a remote tree. This cluster's API
+  // would answer for a different, same-named object.
+  remote?: boolean
 }
 
 // 'controllerApi' is the controller's own verdict read from its API server
@@ -80,7 +83,7 @@ export interface GitOpsResourceTree {
   healthFromApi?: boolean
   // The controller's API server was asked and didn't answer usefully.
   healthApiError?: string
-  // The Application deploys to another cluster; Radar derives nothing about
-  // its resources from here.
+  // The Application (or Flux object with spec.kubeConfig) deploys to another
+  // cluster; Radar derives nothing about its resources from here.
   remoteDestination?: boolean
 }

package/src/types/scheduling.ts

@@ -0,0 +1,71 @@
+export interface SchedulingRef {
+  kind: string
+  group?: string
+  namespace?: string
+  name: string
+}
+
+export interface SchedulingCondition {
+  type: string
+  status: string
+  reason?: string
+  message?: string
+  observedGeneration?: number
+  lastTransitionTime?: string
+}
+
+export type SchedulingDecision = 'satisfied' | 'unsatisfied' | 'held' | 'unknown'
+
+// Matches the shared Go scheduling projection; admission UI consumes this subset.
+export interface SchedulingObservation {
+  source: string
+  domain: string
+  subject: SchedulingRef
+  subjectGeneration?: number
+  decision: SchedulingDecision
+  primaryCondition?: SchedulingCondition
+  queues?: { name: string; roles: string[]; ref?: SchedulingRef }[]
+  gates?: {
+    kind: string
+    name: string
+    ref?: SchedulingRef
+    nativeState?: string
+    decision: SchedulingDecision
+    message?: string
+    lastTransitionTime?: string
+    requeueAfterSeconds?: number
+    retryCount?: number
+  }[]
+  disruptions?: SchedulingCondition[]
+  kueue?: {
+    phase: 'pending' | 'quota_reserved' | 'admitted' | 'finished'
+    outcome?: 'succeeded' | 'failed'
+    active?: boolean
+    podsReady?: SchedulingCondition
+    waitingForReplacementPods?: SchedulingCondition
+    requeueState?: { count?: number; requeueAt?: string }
+    concurrentAdmission?: { parentName: string; parentRef?: SchedulingRef }
+  }
+}
+
+export interface KueueAdmissionWorkload {
+  apiVersion: string
+  namespace: string
+  name: string
+  uid: string
+  generation: number
+  createdAt: string | null
+  deleting: boolean
+  ref?: SchedulingRef
+  projection: 'available' | 'unsupported' | 'forbidden'
+  scheduling?: { observations?: SchedulingObservation[] }
+  linksLimited: boolean
+}
+
+export interface KueueAdmissionResponse {
+  uid: string
+  installed: boolean
+  workloads: KueueAdmissionWorkload[]
+  total: number
+  truncated: boolean
+}

package/src/utils/api-resources.test.ts

@@ -1,5 +1,24 @@
 import { describe, expect, it } from 'vitest'
-import { categorizeResources, findAPIResourceForRoute, formatGroupName, isCoreBatchJob, shortenGroupName } from './api-resources'
+import { builtinGroupForKind, canonicalResourceGroup, categorizeResources, findAPIResourceForRoute, formatGroupName, isCoreBatchJob, shortenGroupName } from './api-resources'
+
+describe('canonicalResourceGroup', () => {
+  it('infers built-in groups from either Kind or resource name', () => {
+    expect(builtinGroupForKind('Service')).toBe('')
+    expect(builtinGroupForKind('jobs')).toBe('batch')
+    expect(builtinGroupForKind('PodDisruptionBudget')).toBe('policy')
+    expect(canonicalResourceGroup('Deployment', undefined)).toBe('apps')
+    expect(canonicalResourceGroup('Job', '')).toBe('batch')
+    expect(canonicalResourceGroup('ResourceClaim', undefined)).toBe('resource.k8s.io')
+    expect(canonicalResourceGroup('ControllerRevision', undefined)).toBe('apps')
+    expect(canonicalResourceGroup('Endpoints', undefined)).toBe('')
+  })
+
+  it('never overwrites an explicit custom group', () => {
+    expect(canonicalResourceGroup('Job', 'batch.volcano.sh')).toBe('batch.volcano.sh')
+    expect(canonicalResourceGroup('Widget', undefined)).toBeUndefined()
+    expect(canonicalResourceGroup('Widget', '')).toBeUndefined()
+  })
+})
 
 describe('findAPIResourceForRoute', () => {
   const resources = [

package/src/utils/api-resources.ts

@@ -35,6 +35,9 @@ export const CORE_RESOURCES: APIResource[] = [
   { group: 'networking.k8s.io', version: 'v1', kind: 'NetworkPolicy', name: 'networkpolicies', namespaced: true, isCrd: false, verbs: ['list', 'get', 'watch'] },
   { group: 'discovery.k8s.io', version: 'v1', kind: 'EndpointSlice', name: 'endpointslices', namespaced: true, isCrd: false, verbs: ['list', 'get', 'watch'] },
   { group: 'autoscaling', version: 'v2', kind: 'HorizontalPodAutoscaler', name: 'horizontalpodautoscalers', namespaced: true, isCrd: false, verbs: ['list', 'get', 'watch'] },
+  { group: 'policy', version: 'v1', kind: 'PodDisruptionBudget', name: 'poddisruptionbudgets', namespaced: true, isCrd: false, verbs: ['list', 'get', 'watch'] },
+  { group: '', version: 'v1', kind: 'LimitRange', name: 'limitranges', namespaced: true, isCrd: false, verbs: ['list', 'get', 'watch'] },
+  { group: '', version: 'v1', kind: 'ResourceQuota', name: 'resourcequotas', namespaced: true, isCrd: false, verbs: ['list', 'get', 'watch'] },
   { group: '', version: 'v1', kind: 'Event', name: 'events', namespaced: true, isCrd: false, verbs: ['list', 'get', 'watch'] },
   { group: 'rbac.authorization.k8s.io', version: 'v1', kind: 'Role', name: 'roles', namespaced: true, isCrd: false, verbs: ['list', 'get', 'watch'] },
   { group: 'rbac.authorization.k8s.io', version: 'v1', kind: 'ClusterRole', name: 'clusterroles', namespaced: false, isCrd: false, verbs: ['list', 'get', 'watch'] },
@@ -50,6 +53,29 @@ export const CORE_RESOURCES: APIResource[] = [
   { group: 'storage.k8s.io', version: 'v1', kind: 'VolumeAttachment', name: 'volumeattachments', namespaced: false, isCrd: false, verbs: ['list', 'get', 'watch'] },
 ]
 
+// These identities are built-in but must not become always-present sidebar rows.
+const ADDITIONAL_BUILTIN_IDENTITIES: Record<string, string> = {
+  endpoints: '',
+  controllerrevision: 'apps', controllerrevisions: 'apps',
+  resourceclaim: 'resource.k8s.io', resourceclaims: 'resource.k8s.io',
+  resourceclaimtemplate: 'resource.k8s.io', resourceclaimtemplates: 'resource.k8s.io',
+  resourceslice: 'resource.k8s.io', resourceslices: 'resource.k8s.io',
+  deviceclass: 'resource.k8s.io', deviceclasses: 'resource.k8s.io',
+};
+
+export function builtinGroupForKind(kindOrResource: string): string | undefined {
+  const value = kindOrResource.toLowerCase()
+  return CORE_RESOURCES.find(resource =>
+    resource.kind.toLowerCase() === value || resource.name.toLowerCase() === value,
+  )?.group ?? ADDITIONAL_BUILTIN_IDENTITIES[value]
+}
+
+export function canonicalResourceGroup(kindOrResource: string, group: string | undefined): string | undefined {
+  const builtin = builtinGroupForKind(kindOrResource)
+  if (!group) return builtin
+  return group
+}
+
 export function findAPIResourceForRoute(
   resources: APIResource[] | undefined,
   routeSlug: string,

package/src/utils/application-topology.test.ts

@@ -103,6 +103,31 @@ describe('layerDeploymentInventory', () => {
     expect(result.managedOnly.map((node) => node.id)).toEqual(['core-service'])
   })
 
+  it('joins a pseudo topology node to inventory by its real Kubernetes kind', () => {
+    const runtime: Topology = {
+      nodes: [{
+        id: 'knativeservice/default/api',
+        kind: 'KnativeService',
+        name: 'api',
+        status: 'healthy',
+        data: { namespace: 'default', apiVersion: 'serving.knative.dev/v1', resourceKind: 'Service' },
+      }],
+      edges: [],
+    }
+    const result = layerDeploymentInventory(runtime, deploymentInventoryFromGitOps({
+      root: inventory().root,
+      edges: [],
+      nodes: [
+        inventory().root,
+        { id: 'knative-service', ref: { group: 'serving.knative.dev', kind: 'Service', namespace: 'default', name: 'api' }, role: 'declared', tool: 'argocd' },
+      ],
+    })!, 'Argo CD')
+
+    expect(result.managedRuntimeCount).toBe(1)
+    expect(result.runtimeOnlyCount).toBe(0)
+    expect(result.managedOnly).toEqual([])
+  })
+
   it('does not classify synthetic graph nodes as runtime-only resources', () => {
     const syntheticTopology: Topology = {
       nodes: [

package/src/utils/application-topology.ts

@@ -1,6 +1,7 @@
 import type { GitOpsResourceTree, HealthStatus, HelmOwnedResource, Topology, TopologyNode } from '../types'
 import { apiVersionToGroup, groupQualifiesLaneId } from './navigation'
 import { pluralize } from './pluralize'
+import { topologyNodeResourceKind } from './topology-neighborhood'
 
 export type DeploymentMembership = 'runtime-only' | 'source-only'
 
@@ -157,7 +158,7 @@ export function layerDeploymentInventory(
   const runtimeNodes = topology.nodes.map((node) => {
     if (node.kind === 'PodGroup' || node.kind === 'Internet') return node
     const namespace = (node.data?.namespace as string) || ''
-    const match = inventoryByExact.get(identityKey(node.kind, topologyGroup(node), namespace, node.name))
+    const match = inventoryByExact.get(identityKey(topologyNodeResourceKind(node), topologyGroup(node), namespace, node.name))
     if (match) {
       matchedInventoryIds.add(match.id)
       managedRuntimeCount += 1