@skyhook-io/radar-app 1.11.0 → 1.12.3

package/src/components/resources/ResourcesView.tsx

@@ -16,10 +16,12 @@ import {
   ResourcesView as BaseResourcesView,
   CORE_RESOURCES,
   intersectWorkloadWrites,
+  hasCuratedColumns,
+  sanitizePrinterTable,
 } from '@skyhook-io/k8s-ui'
-import type { Capabilities, ResourceQueryResult, WorkloadWritePermissions } from '@skyhook-io/k8s-ui'
+import type { Capabilities, PrinterTable, ResourceQueryResult, WorkloadWritePermissions } from '@skyhook-io/k8s-ui'
 import type { SelectedResource } from '../../types'
-import { kindToPlural, type NavigateToResource } from '../../utils/navigation'
+import { apiVersionToGroup, kindToPluralWithGroup, type NavigateToResource } from '../../utils/navigation'
 import { CreateResourceDialog } from '../shared/CreateResourceDialog'
 import { getSkeletonYaml } from '../../utils/skeleton-yaml'
 
@@ -229,12 +231,19 @@ export function ResourcesView({ namespaces, selectedResource, onResourceClick, o
   // Fetch full data only for the selected kind
   const selectedKindQuery = useQuery({
     queryKey: ['resources', selectedKind?.name, isSelectedCrd ? selectedKind?.group : '', namespaces],
-    queryFn: async () => {
-      if (!selectedKind) return []
+    queryFn: async (): Promise<{ items: any[]; printerTable: PrinterTable | null }> => {
+      if (!selectedKind) return { items: [], printerTable: null }
       const params = new URLSearchParams()
       if (namespaces.length > 0) params.set('namespaces', namespacesParam)
       if (isSelectedCrd && selectedKind.group) params.set('group', selectedKind.group)
       if (selectedKindSummaryServed) params.set('include', 'summary')
+      // Only CRDs can declare printer columns, and a curated kind discards the
+      // result — so table mode is requested from exactly the kinds that can use
+      // it. Resolving a table costs the server a CRD read per request; doing
+      // that for a kind whose columns are hand-curated is pure waste.
+      const wantsTable = isSelectedCrd && !!selectedKind.group &&
+        !hasCuratedColumns(selectedKind.name, selectedKind.group)
+      if (wantsTable) params.set('table', '1')
       const startedAt = performance.now()
       debugNamespaceLog('resources:selected-kind-fetch-start', {
         kind: selectedKind.name,
@@ -258,7 +267,19 @@ export function ResourcesView({ namespaces, selectedResource, onResourceClick, o
         const errorData = await res.json().catch(() => ({ error: `HTTP ${res.status}` }))
         throw new ApiError(errorData.error || `Failed to fetch ${selectedKind.name}`, res.status, errorData)
       }
-      return res.json()
+      const body = await res.json()
+      // Both branches are current shapes, not a guess at a legacy one: a Radar
+      // backend that predates `table` ignores the parameter and answers with
+      // the bare array. @skyhook-io/radar-app is versioned independently of the
+      // backend it points at, so a consumer can pair a new frontend with an
+      // older Radar — and reading that array as a missing envelope would render
+      // every CRD list empty. Items and columns still come from one response,
+      // so a row can never render against another fetch's cells.
+      if (!wantsTable || Array.isArray(body)) return { items: body as any[], printerTable: null }
+      return {
+        items: Array.isArray(body?.items) ? body.items as any[] : [],
+        printerTable: sanitizePrinterTable(body),
+      }
     },
     enabled: !!selectedKind && !selectedKindQueryBlocked,
     staleTime: 30000,
@@ -275,13 +296,13 @@ export function ResourcesView({ namespaces, selectedResource, onResourceClick, o
     return {
       resourceName: selectedKind.name,
       group: selectedKind.group,
-      data: selectedKindQueryBlocked ? [] : selectedKindQuery.data as any[] | undefined,
+      data: selectedKindQueryBlocked ? [] : selectedKindQuery.data?.items,
       isLoading: waitingForGuardCount || selectedKindQuery.isLoading,
       error: selectedKindQueryBlocked ? undefined : selectedKindQuery.error,
       refetch: selectedKindQuery.refetch,
       dataUpdatedAt: selectedKindQuery.dataUpdatedAt,
     }
-  }, [selectedKind, selectedKindQueryBlocked, waitingForGuardCount, selectedKindQuery.data, selectedKindQuery.isLoading, selectedKindQuery.error, selectedKindQuery.refetch, selectedKindQuery.dataUpdatedAt])
+  }, [selectedKind, selectedKindQueryBlocked, waitingForGuardCount, selectedKindQuery.data?.items, selectedKindQuery.isLoading, selectedKindQuery.error, selectedKindQuery.refetch, selectedKindQuery.dataUpdatedAt])
 
   // Metrics
   const { data: topPodMetrics } = useTopPodMetrics({ enabled: topPodMetricsEnabled, namespaces })
@@ -352,6 +373,7 @@ export function ResourcesView({ namespaces, selectedResource, onResourceClick, o
       resourceReasons={countsData?.reasons}
       resourceUnavailable={countsData?.unavailable}
       selectedKindQuery={selectedKindQueryResult}
+      printerTable={selectedKindQueryBlocked ? null : selectedKindQuery.data?.printerTable ?? null}
       connectionState={connection.state}
       largeListGuard={largeListGuard}
       onSelectedKindChange={setSelectedKind}
@@ -394,7 +416,8 @@ export function ResourcesView({ namespaces, selectedResource, onResourceClick, o
       initialYaml={createDialogYaml}
       title={createDialogTitle}
       onCreated={(result) => {
-        onResourceClick?.({ kind: kindToPlural(result.kind), namespace: result.namespace, name: result.name, group: '' })
+        const group = apiVersionToGroup(result.apiVersion)
+        onResourceClick?.({ kind: kindToPluralWithGroup(result.kind, group), namespace: result.namespace, name: result.name, group })
       }}
     />
     </>

package/src/components/resources/renderers/WorkloadRenderer.tsx

@@ -4,8 +4,8 @@ import { useScaleWorkload, fetchJSON } from '../../../api/client'
 import { useRBACSubject } from '../../../api/rbac'
 import { usePolicyResource } from '../../../api/policy'
 import { useQueries, useQueryClient } from '@tanstack/react-query'
-import { kindToPlural } from '@skyhook-io/k8s-ui/utils/navigation'
-import type { Relationships, ResourceRef, ResourceWithRelationships } from '../../../types'
+import { kindToPlural, kindToPluralWithGroup } from '@skyhook-io/k8s-ui/utils/navigation'
+import type { Relationships, ResourceRef, ResourceWithRelationships, WorkloadPodInfo } from '../../../types'
 import type { ScalerDiagnosis } from '@skyhook-io/k8s-ui/components/resources/renderers/WorkloadRenderer'
 
 // Map plural lowercase kind to singular PascalCase for ownerReferences matching
@@ -26,9 +26,10 @@ interface WorkloadRendererProps {
   onNavigate?: (ref: ResourceRef) => void
   relationships?: Relationships
   scaleBlockedBy?: ResourceRef[]
+  workloadPods?: WorkloadPodInfo[]
 }
 
-export function WorkloadRenderer({ kind, data, onNavigate, scaleBlockedBy }: WorkloadRendererProps) {
+export function WorkloadRenderer({ kind, data, onNavigate, scaleBlockedBy, workloadPods }: WorkloadRendererProps) {
   const navigate = useNavigate()
   const queryClient = useQueryClient()
   const scaleMutation = useScaleWorkload()
@@ -54,13 +55,19 @@ export function WorkloadRenderer({ kind, data, onNavigate, scaleBlockedBy }: Wor
   })
   const hpaQueries = useQueries({
     queries: hpaRefs.map(ref => ({
-      queryKey: ['resource', kindToPlural(ref.kind), ref.namespace, ref.name, ref.group],
+      queryKey: [
+        'resource',
+        kindToPluralWithGroup(ref.kind, ref.group ?? ''),
+        ref.namespace,
+        ref.name,
+        ref.group,
+      ],
       queryFn: () => {
         const ns = ref.namespace || '_'
         const params = new URLSearchParams()
         if (ref.group) params.set('group', ref.group)
         const query = params.toString()
-        return fetchJSON<ResourceWithRelationships<any>>(`/resources/${kindToPlural(ref.kind)}/${ns}/${ref.name}${query ? `?${query}` : ''}`)
+        return fetchJSON<ResourceWithRelationships<any>>(`/resources/${kindToPluralWithGroup(ref.kind, ref.group ?? '')}/${ns}/${ref.name}${query ? `?${query}` : ''}`)
       },
       enabled: Boolean(ref.kind && ref.name),
       staleTime: 10000,
@@ -90,6 +97,7 @@ export function WorkloadRenderer({ kind, data, onNavigate, scaleBlockedBy }: Wor
       policyLoading={policyLoading}
       policyError={policyError as Error | null}
       scaleBlockedBy={scaleBlockedBy}
+      workloadPods={workloadPods}
       scalerDiagnostics={scalerDiagnostics}
       onScale={async (replicas) => {
         await scaleMutation.mutateAsync({

package/src/components/rightsizing/RightsizingScanView.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useLayoutEffect, useMemo, useState } from 'react'
 import { useNavigate, useSearchParams } from 'react-router-dom'
-import { AlertTriangle, DollarSign, ExternalLink, Gauge, Loader2, RefreshCw } from 'lucide-react'
+import { AlertTriangle, Coins, ExternalLink, Gauge, Loader2, RefreshCw } from 'lucide-react'
 import {
   Collapse,
   CollapseChevron,
@@ -194,7 +194,7 @@ export function RightsizingScanView({ namespaces }: RightsizingScanViewProps) {
     <div className="flex-1 min-h-0 overflow-y-auto">
       <div className="mx-auto flex w-full max-w-[1920px] flex-col gap-4 px-6 py-6">
         <PageHeader
-          icon={DollarSign}
+          icon={Coins}
           title="Cost Insights"
           description="Understand current allocation and find CPU and memory requests worth tuning."
         />

package/src/components/settings/SettingsDialog.tsx

@@ -3,22 +3,25 @@ import { createPortal } from 'react-dom'
 import {
   Settings, X, RotateCcw, RotateCw, Loader2, Copy, Check, Pin, Shield, Lock, Plug,
   Plus, Terminal, Boxes, Activity, GitBranch, Sparkles, SlidersHorizontal, Zap,
-  LayoutDashboard, ChevronRight, ExternalLink, Download, AlertTriangle,
+  LayoutDashboard, ChevronRight, ExternalLink, Download, AlertTriangle, Coins,
   type LucideIcon,
 } from 'lucide-react'
 import { clsx } from 'clsx'
+import { useQueryClient } from '@tanstack/react-query'
 import { useAnimatedUnmount } from '../../hooks/useAnimatedUnmount'
 import { TRANSITION_BACKDROP, TRANSITION_PANEL } from '../../utils/animation'
 import { apiUrl, getAuthHeaders, getCredentialsMode, routePath } from '../../api/config'
 import {
-  useCloudRole, useVersionCheck, useClusterInfo, usePrometheusStatus, useArgoStatus,
+  useCloudRole, useVersionCheck, useClusterInfo, usePrometheusStatus, useArgoStatus, useCapabilities,
 } from '../../api/client'
 import { useCapabilitiesContext } from '../../contexts/CapabilitiesContext'
-import { Input } from '@skyhook-io/k8s-ui'
+import { Input, SelectMenu } from '@skyhook-io/k8s-ui'
 import { Tooltip } from '../ui/Tooltip'
 import { AISettingsSection, type AIDraft } from '../diagnose/AISettings'
 import { MyPermissionsContent } from './MyPermissionsDialog'
 import { useDiagnose } from '../diagnose/DiagnoseContext'
+import { currencyOptionsForValue } from './currency-options'
+import { versionUpdateURL } from '../../utils/version'
 
 // The loopback URL an MCP client is told to connect to. Shared by the overview
 // row and the MCP section: both must carry the base path, or the URL they
@@ -39,15 +42,18 @@ interface Config {
   timelineDbPath?: string
   historyLimit?: number
   prometheusUrl?: string
+  opencostCurrency?: string
   argoCdUrl?: string
   argoCdInsecureTls?: boolean
   mcp?: boolean | null
+  restoreLastDesktopContext?: boolean | null
 }
 
 interface ConfigResponse {
   file: Config
   effective: Config
   isDesktop: boolean
+  openCostCurrencyManaged?: boolean
   prometheusHeaderKeys?: string[]
   // True when an Argo CD auth token is stored. The token itself is never
   // returned — the card shows a "configured" placeholder and omits the token
@@ -72,17 +78,19 @@ interface SettingsDialogProps {
 }
 
 // The settings surface splits into three honest apply buckets:
-//   • Startup config (kubeconfig, server, timeline, MCP) — persisted by the
-//     owner-gated footer to the config file; effect on next launch.
+//   • Persisted config (kubeconfig, server, timeline, MCP, cost currency) —
+//     saved by the owner-gated footer. Currency applies live unless a startup
+//     flag owns it; the rest restart.
 //   • Live integrations (Prometheus, Argo CD) — their own Apply/Connect endpoints
 //     re-point the running server; effect immediately, NOT part of footer dirty.
 //   • AI diagnose — client-side prefs, self-saving, editable by everyone.
 export type SettingsSectionId =
-  | 'overview' | 'perms' | 'connection' | 'prometheus' | 'argocd' | 'ai' | 'advanced'
+  | 'overview' | 'perms' | 'connection' | 'prometheus' | 'cost' | 'argocd' | 'ai' | 'advanced'
 
-// Only STARTUP fields count toward footer dirty. Integration fields (prometheusUrl,
-// argoCdUrl, argoCdInsecureTls) apply live and are excluded here. Every field is
-// normalized so unset≡default doesn't read as a change.
+// Persisted footer fields include startup settings plus the live currency override.
+// Integration fields (prometheusUrl, argoCdUrl, argoCdInsecureTls) apply through
+// their own controls and are excluded here. Every field is normalized so
+// unset≡default doesn't read as a change.
 function normalizeStartup(c: Config) {
   return {
     kubeconfig: c.kubeconfig ?? '',
@@ -95,6 +103,8 @@ function normalizeStartup(c: Config) {
     timelineDbPath: c.timelineDbPath ?? '',
     historyLimit: c.historyLimit ?? null,
     mcp: c.mcp ?? true,
+    opencostCurrency: c.opencostCurrency?.trim().toUpperCase() ?? '',
+    restoreLastDesktopContext: c.restoreLastDesktopContext ?? true,
   }
 }
 
@@ -103,6 +113,7 @@ export function SettingsDialog({
   onClose,
   initialSection = 'overview',
 }: SettingsDialogProps) {
+  const queryClient = useQueryClient()
   const dialogRef = useRef<HTMLDivElement>(null)
   const { shouldRender, isOpen } = useAnimatedUnmount(open, 200)
   const { data: versionInfo } = useVersionCheck()
@@ -122,6 +133,9 @@ export function SettingsDialog({
   const [loadError, setLoadError] = useState<string | null>(null)
   const [section, setSection] = useState<SettingsSectionId>('overview')
   const [confirmingClose, setConfirmingClose] = useState(false)
+  const { data: argoSectionStatus, refetch: refetchArgoSectionStatus } = useArgoStatus(
+    open && section === 'argocd'
+  )
 
   // AI Diagnosis prefs are client-side (localStorage) and now SELF-SAVING: the
   // section has its own Save that commits the draft to DiagnoseContext, so it's
@@ -148,7 +162,8 @@ export function SettingsDialog({
   const clusterDirty =
     edN.kubeconfig !== svN.kubeconfig ||
     edN.kubeconfigDirs !== svN.kubeconfigDirs ||
-    edN.namespace !== svN.namespace
+    edN.namespace !== svN.namespace ||
+    edN.restoreLastDesktopContext !== svN.restoreLastDesktopContext
   const serverDirty =
     edN.port !== svN.port || edN.noBrowser !== svN.noBrowser || edN.browser !== svN.browser
   const mcpDirty = edN.mcp !== svN.mcp
@@ -156,10 +171,11 @@ export function SettingsDialog({
     edN.timelineStorage !== svN.timelineStorage ||
     edN.timelineDbPath !== svN.timelineDbPath ||
     edN.historyLimit !== svN.historyLimit
+  const costDirty = edN.opencostCurrency !== svN.opencostCurrency
   // Merged-pane dirty for the flat nav (Connection = cluster+server, Advanced = mcp+timeline).
   const connectionDirty = clusterDirty || serverDirty
   const advancedDirty = mcpDirty || timelineDirty
-  const startupDirty = configData != null && (connectionDirty || advancedDirty)
+  const configDirty = configData != null && (connectionDirty || costDirty || advancedDirty)
 
   // Load config on open + snapshot AI prefs + pick a default section that's
   // actually accessible to the current identity.
@@ -237,9 +253,27 @@ export function SettingsDialog({
         setSaveMessage(`Error: ${data?.error || res.statusText}`)
         return false
       }
-      // Advance the committed snapshot so startupDirty settles to false.
-      setConfigData((prev) => (prev ? { ...prev, file: body } : prev))
-      setSaveMessage('Saved. Restart Radar to apply.')
+      const saved = await res.json() as Config
+      const committed = { ...body, opencostCurrency: saved.opencostCurrency }
+      setEditedConfig((prev) => ({ ...prev, opencostCurrency: saved.opencostCurrency }))
+      setConfigData((prev) => (prev ? { ...prev, file: committed } : prev))
+      if (costDirty && !configData.openCostCurrencyManaged) {
+        void queryClient.invalidateQueries({
+          predicate: (query) =>
+            typeof query.queryKey[0] === 'string' && query.queryKey[0].startsWith('opencost-'),
+        })
+      }
+      if (costDirty && configData.openCostCurrencyManaged) {
+        setSaveMessage(connectionDirty || advancedDirty
+          ? 'Saved. CLI/Helm currency remains active; restart without that override to apply it. Restart Radar for other changes.'
+          : 'Saved. CLI/Helm currency remains active; restart without that override to apply this setting.')
+      } else {
+        setSaveMessage(connectionDirty || advancedDirty
+          ? costDirty
+            ? 'Saved. Currency applied immediately; restart Radar for other changes.'
+            : 'Saved. Restart Radar to apply.'
+          : 'Saved. Applied immediately.')
+      }
       return true
     } catch (err) {
       setSaveMessage(`Error: ${err}`)
@@ -247,7 +281,7 @@ export function SettingsDialog({
     } finally {
       setSaving(false)
     }
-  }, [editedConfig, configData])
+  }, [editedConfig, configData, costDirty, connectionDirty, advancedDirty, queryClient])
 
   // AI prefs are client-side (localStorage) — commit the staged draft now.
   // setSelectedAgent clears model/effort (they're agent-specific), so set the
@@ -277,24 +311,26 @@ export function SettingsDialog({
 
   // Close guard: a pending startup edit prompts an inline confirm rather than
   // silently discarding. An unsaved AI draft is re-derivable, so it's fine to
-  // drop it on close. Held in a ref so the ESC listener reads current dirtiness.
+  // drop it on close.
   const requestCloseRef = useRef<() => void>(() => {})
   requestCloseRef.current = () => {
-    if (canEditConfig && startupDirty) setConfirmingClose(true)
+    if (canEditConfig && configDirty) setConfirmingClose(true)
     else onClose()
   }
 
-  // ESC key
   useEffect(() => {
     if (!open) return
-    const handleKeyDown = (e: KeyboardEvent) => {
-      if (e.key === 'Escape') {
-        e.stopPropagation()
-        requestCloseRef.current()
-      }
+    const handleDocumentKeyDown = (event: KeyboardEvent) => {
+      if (event.key !== 'Escape') return
+      const modalDialogs = Array.from(document.querySelectorAll<HTMLElement>('[role="dialog"][aria-modal="true"]'))
+      const topDialog = modalDialogs[modalDialogs.length - 1]
+      if (topDialog !== dialogRef.current || dialogRef.current?.contains(event.target as Node)) return
+      event.preventDefault()
+      event.stopPropagation()
+      requestCloseRef.current()
     }
-    document.addEventListener('keydown', handleKeyDown, true)
-    return () => document.removeEventListener('keydown', handleKeyDown, true)
+    document.addEventListener('keydown', handleDocumentKeyDown, true)
+    return () => document.removeEventListener('keydown', handleDocumentKeyDown, true)
   }, [open])
 
   // Post-save feedback ("Saved. Restart Radar to apply.") is scoped to the
@@ -326,12 +362,13 @@ export function SettingsDialog({
     { id: 'perms', label: 'My permissions', icon: Shield, ownerOnly: false, dirty: false },
     { id: 'connection', label: 'Connection', icon: Boxes, ownerOnly: true, dirty: connectionDirty },
     { id: 'prometheus', label: 'Prometheus', icon: Activity, ownerOnly: true, dirty: false },
+    { id: 'cost', label: 'Cost', icon: Coins, ownerOnly: true, dirty: costDirty },
     { id: 'argocd', label: 'Argo CD', icon: GitBranch, ownerOnly: true, dirty: false },
     { id: 'ai', label: 'AI diagnose', icon: Sparkles, ownerOnly: false, dirty: aiDirty },
     { id: 'advanced', label: 'Advanced', icon: SlidersHorizontal, ownerOnly: true, dirty: advancedDirty },
   ]
 
-  const showFooter = canEditConfig && (confirmingClose || startupDirty || !!saveMessage)
+  const showFooter = canEditConfig && (confirmingClose || configDirty || !!saveMessage)
 
   return createPortal(
     <div className="fixed inset-0 z-50 flex items-center justify-center">
@@ -348,7 +385,16 @@ export function SettingsDialog({
       {/* Dialog */}
       <div
         ref={dialogRef}
+        role="dialog"
+        aria-modal="true"
+        aria-labelledby="settings-dialog-title"
         tabIndex={-1}
+        onKeyDown={(event) => {
+          if (event.key !== 'Escape') return
+          event.preventDefault()
+          event.stopPropagation()
+          requestCloseRef.current()
+        }}
         className={clsx(
           'relative bg-theme-surface border border-theme-border shadow-theme-lg w-full outline-none flex flex-col',
           'max-sm:inset-0 max-sm:absolute max-sm:rounded-none max-sm:max-h-full max-sm:border-0',
@@ -365,7 +411,7 @@ export function SettingsDialog({
           <div className="flex items-center gap-2">
             <Settings className="w-5 h-5 text-theme-text-secondary" />
             <div className="flex items-baseline gap-2">
-              <h2 className="text-lg font-semibold text-theme-text-primary">Settings</h2>
+              <h2 id="settings-dialog-title" className="text-lg font-semibold text-theme-text-primary">Settings</h2>
               <span className="text-[11px] text-theme-text-tertiary">
                 Radar{versionInfo?.currentVersion ? ` v${versionInfo.currentVersion}` : ''}
                 <span className="text-theme-text-disabled"> · by Skyhook</span>
@@ -462,6 +508,7 @@ export function SettingsDialog({
                 <ClusterSection
                   config={editedConfig}
                   effectiveConfig={configData?.effective}
+                  isDesktop={isDesktop}
                   onChange={updateConfigField}
                 />
               </div>
@@ -498,6 +545,24 @@ export function SettingsDialog({
               />
             </SectionPane>
 
+            <SectionPane
+              id="cost"
+              active={section}
+              title="Cost"
+              caption={configData?.openCostCurrencyManaged
+                ? 'Saved to config. A CLI or Helm override is currently active.'
+                : 'Saved to config and applied immediately.'}
+              live={!configData?.openCostCurrencyManaged}
+              locked={!canEditConfig}
+            >
+              <CostSection
+                currency={editedConfig.opencostCurrency ?? ''}
+                managed={configData?.openCostCurrencyManaged ?? false}
+                effectiveCurrency={configData?.effective.opencostCurrency ?? ''}
+                onChange={(value) => updateConfigField('opencostCurrency', value || undefined)}
+              />
+            </SectionPane>
+
             {/* Argo CD — live */}
             <SectionPane
               id="argocd"
@@ -514,9 +579,14 @@ export function SettingsDialog({
                 envManaged={configData?.argoCdEnvManaged ?? false}
                 envError={configData?.argoCdEnvError}
                 cliSession={configData?.argoCdCliSession}
+                statusReason={
+                  argoSectionStatus?.configured && !argoSectionStatus.connected
+                    ? argoSectionStatus.reason
+                    : undefined
+                }
                 onChangeUrl={(v) => updateConfigField('argoCdUrl', v || undefined)}
                 onChangeInsecureTls={(v) => updateConfigField('argoCdInsecureTls', v || undefined)}
-                onApplied={({ url, insecureTls, tokenSet }) =>
+                onApplied={({ url, insecureTls, tokenSet }) => {
                   setConfigData((prev) =>
                     prev
                       ? {
@@ -526,7 +596,8 @@ export function SettingsDialog({
                         }
                       : prev
                   )
-                }
+                  void refetchArgoSectionStatus()
+                }}
               />
             </SectionPane>
 
@@ -609,8 +680,8 @@ export function SettingsDialog({
           </div>
         </div>
 
-        {/* Footer — owner-gated. Startup config only: AI self-saves, integrations
-            apply live. Shown whenever a startup edit is pending (any section),
+        {/* Footer — owner-gated persisted config. AI self-saves and integrations
+            apply separately. Shown whenever an edit is pending (any section),
             while confirming a close, or briefly after a save. */}
         <div
           className={clsx(
@@ -653,7 +724,7 @@ export function SettingsDialog({
                   <Tooltip content="Discard unsaved changes and revert to the last saved values">
                     <button
                       onClick={discardChanges}
-                      disabled={saving || !startupDirty}
+                      disabled={saving || !configDirty}
                       className="flex items-center gap-1.5 px-3 py-1.5 text-xs font-medium text-theme-text-secondary hover:text-theme-text-primary hover:bg-theme-elevated rounded-md transition-colors disabled:opacity-50 disabled:pointer-events-none"
                     >
                       <RotateCcw className="w-3.5 h-3.5" />
@@ -668,7 +739,7 @@ export function SettingsDialog({
                 </div>
                 <button
                   onClick={saveConfig}
-                  disabled={saving || !startupDirty}
+                  disabled={saving || !configDirty}
                   className="flex items-center gap-1.5 px-4 py-1.5 text-sm font-medium btn-brand rounded-md"
                 >
                   {saving && <Loader2 className="w-3.5 h-3.5 animate-spin" />}
@@ -841,6 +912,8 @@ function OverviewPanel({ active, onNavigate }: { active: boolean; onNavigate: (s
   const { data: cluster } = useClusterInfo()
   const { data: prom } = usePrometheusStatus()
   const { data: argo } = useArgoStatus(active)
+  const { data: capabilitiesData } = useCapabilities()
+  const deploymentMode = capabilitiesData ? (capabilitiesData.deployment?.mode ?? 'local') : undefined
   const { data: version } = useVersionCheck()
   const capabilities = useCapabilitiesContext()
   const diag = useDiagnose()
@@ -872,7 +945,7 @@ function OverviewPanel({ active, onNavigate }: { active: boolean; onNavigate: (s
       // token, not a transient reconnect — "Not reachable" matches Prometheus and
       // doesn't imply it will recover on its own.
       value: argo?.connected ? 'Connected' : argo?.configured ? 'Not reachable' : 'Not connected',
-      detail: argo?.connected ? argo.address : undefined,
+      detail: argo?.connected ? argo.address : argo?.reason,
     },
     {
       id: 'advanced', icon: Zap, label: 'MCP',
@@ -897,9 +970,9 @@ function OverviewPanel({ active, onNavigate }: { active: boolean; onNavigate: (s
 
   return (
     <div className="space-y-4">
-      {version?.updateAvailable && (
+      {version?.updateAvailable && deploymentMode !== undefined && deploymentMode !== 'cloud' && (
         <a
-          href={version.releaseUrl}
+          href={versionUpdateURL(deploymentMode, version.releaseUrl)}
           target="_blank"
           rel="noreferrer"
           className="flex items-center gap-2 px-3 py-2 text-xs rounded-md border border-skyhook-500/30 bg-skyhook-500/10 hover:bg-skyhook-500/15 transition-colors"
@@ -986,25 +1059,30 @@ function AIUnavailableNotice() {
 function ClusterSection({
   config,
   effectiveConfig,
+  isDesktop,
   onChange,
 }: {
   config: Config
   effectiveConfig?: Config
+  isDesktop: boolean
   onChange: <K extends keyof Config>(field: K, value: Config[K]) => void
 }) {
+  const kubeconfigDirs = effectiveConfig ? (effectiveConfig.kubeconfigDirs ?? []) : config.kubeconfigDirs
+  const hasKubeconfigDirs = (kubeconfigDirs?.length ?? 0) > 0
+
   return (
     <>
       <ConfigField
-        label="Kubeconfig"
-        help="Path to kubeconfig file"
+        label="Primary Kubeconfig"
+        help="File path loaded before additional directories"
         value={config.kubeconfig ?? ''}
         effectiveValue={effectiveConfig?.kubeconfig}
-        placeholder="~/.kube/config"
+        placeholder={hasKubeconfigDirs ? 'No primary file configured' : '~/.kube/config'}
         onChange={(v) => onChange('kubeconfig', v || undefined)}
       />
       <ConfigArrayField
         label="Kubeconfig Directories"
-        help="Comma-separated directories containing kubeconfig files"
+        help="Additional kubeconfig directories. Without a primary file, they replace KUBECONFIG"
         value={config.kubeconfigDirs}
         effectiveValue={effectiveConfig?.kubeconfigDirs}
         placeholder="/path/to/dir1, /path/to/dir2"
@@ -1018,6 +1096,14 @@ function ClusterSection({
         placeholder="All namespaces"
         onChange={(v) => onChange('namespace', v || undefined)}
       />
+      {isDesktop && (
+        <ConfigToggle
+          label="Reopen on the last used cluster"
+          description="Come back to the cluster you were working in. Turn off to use your kubeconfig's current context on the next Desktop start."
+          value={config.restoreLastDesktopContext ?? true}
+          onChange={(v) => onChange('restoreLastDesktopContext', v ? undefined : false)}
+        />
+      )}
     </>
   )
 }
@@ -1108,6 +1194,46 @@ function TimelineSection({
   )
 }
 
+function CostSection({
+  currency,
+  managed,
+  effectiveCurrency,
+  onChange,
+}: {
+  currency: string
+  managed: boolean
+  effectiveCurrency: string
+  onChange: (value: string) => void
+}) {
+  return (
+    <div>
+      <label className="mb-1 block text-sm font-medium text-theme-text-primary">
+        Currency override
+      </label>
+      <p className="mb-1 text-xs text-theme-text-tertiary">
+        Choose a currency, or use Auto to read <code>currencyCode</code> or{' '}
+        <code>DISPLAY_CURRENCY</code> from an active OpenCost/Kubecost installation, then fall back
+        to USD. A custom Prometheus URL disables detection. Radar labels values but does not convert
+        them.
+      </p>
+      <SelectMenu
+        value={currency}
+        options={currencyOptionsForValue(currency)}
+        onChange={onChange}
+        ariaLabel="Currency override"
+        searchPlaceholder="Search currencies by name or code"
+        className="w-full"
+      />
+      {managed && (
+        <p className="mt-1 text-xs text-amber-600 dark:text-amber-400/80">
+          Currently managed by CLI or Helm: {effectiveCurrency || 'Auto'}. Saved changes apply
+          after Radar starts without that override.
+        </p>
+      )}
+    </div>
+  )
+}
+
 // -- MCP Section --------------------------------------------------------------
 
 function MCPSection({
@@ -1440,6 +1566,7 @@ function ArgoCDConfigField({
   envManaged,
   envError,
   cliSession,
+  statusReason,
   onChangeUrl,
   onChangeInsecureTls,
   onApplied,
@@ -1450,6 +1577,7 @@ function ArgoCDConfigField({
   envManaged?: boolean
   envError?: string
   cliSession?: { server: string; user: string; insecure?: boolean }
+  statusReason?: string
   onChangeUrl: (value: string) => void
   onChangeInsecureTls: (value: boolean) => void
   onApplied?: (v: { url: string; insecureTls: boolean; tokenSet: boolean }) => void
@@ -1463,6 +1591,7 @@ function ArgoCDConfigField({
       insecureTls={insecureTls}
       tokenSet={tokenSet}
       cliSession={cliSession}
+      statusReason={statusReason}
       onChangeUrl={onChangeUrl}
       onChangeInsecureTls={onChangeInsecureTls}
       onApplied={onApplied}
@@ -1555,6 +1684,7 @@ function ArgoCDEditableField({
   insecureTls,
   tokenSet,
   cliSession,
+  statusReason,
   onChangeUrl,
   onChangeInsecureTls,
   onApplied,
@@ -1563,6 +1693,7 @@ function ArgoCDEditableField({
   insecureTls: boolean
   tokenSet: boolean
   cliSession?: { server: string; user: string; insecure?: boolean }
+  statusReason?: string
   onChangeUrl: (value: string) => void
   onChangeInsecureTls: (value: boolean) => void
   onApplied?: (v: { url: string; insecureTls: boolean; tokenSet: boolean }) => void
@@ -1665,6 +1796,16 @@ function ArgoCDEditableField({
         back to a lighter annotation-based drift that can miss fields.
       </p>
 
+      {statusReason && state.status !== 'connected' && (
+        <div className="mb-3 rounded-md border border-theme-border bg-theme-elevated p-3">
+          <p className="flex items-center gap-1.5 text-sm font-medium text-warning-text">
+            <AlertTriangle className="w-3.5 h-3.5 shrink-0" />
+            Argo CD token needs attention
+          </p>
+          <p className="mt-1 text-xs text-theme-text-secondary">{statusReason}</p>
+        </div>
+      )}
+
       <label className="block text-sm font-medium text-theme-text-primary mb-1">Server URL</label>
       <p className="text-xs text-theme-text-tertiary mb-1">
         Leave blank to auto-discover the argocd-server in this cluster, or enter its API URL.