From c63cdfbb1f436e8a3d13f09d5805aca0c9ed972a Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Sun, 8 Nov 2026 23:43:11 -0800 Subject: [PATCH] Simplify remote host status popover --- config/host-list-render-baseline.txt | 1 - .../status-bar/RemoteHostStatusRow.tsx | 209 ++++++++++ .../status-bar/RuntimeHostStatusRow.tsx | 382 ++++-------------- .../SshStatusSegment.large-host-list.test.tsx | 227 ++++++++++- .../status-bar/SshStatusSegment.tsx | 282 ++++++------- .../status-bar/SshTargetStatusRow.tsx | 169 ++++---- .../remote-host-connection-status.ts | 62 +-- .../status-bar/remote-host-menu-inventory.ts | 120 ++++++ .../status-bar/remote-host-menu.test.tsx | 249 ++++++++++++ ...ntime-environment-explicit-connect.test.ts | 57 +++ .../runtime-environment-explicit-connect.ts | 59 ++- .../status-bar/ssh-status-menu-rows.ts | 26 +- .../status-bar/use-remote-host-menu-state.ts | 116 ++++++ src/renderer/src/i18n/locales/de.json | 40 +- src/renderer/src/i18n/locales/en.json | 44 +- src/renderer/src/i18n/locales/es.json | 40 +- src/renderer/src/i18n/locales/fr.json | 40 +- src/renderer/src/i18n/locales/ja.json | 40 +- src/renderer/src/i18n/locales/ko.json | 40 +- src/renderer/src/i18n/locales/pt.json | 40 +- src/renderer/src/i18n/locales/ru.json | 40 +- src/renderer/src/i18n/locales/tr.json | 40 +- src/renderer/src/i18n/locales/zh-Hant.json | 40 +- src/renderer/src/i18n/locales/zh.json | 40 +- 24 files changed, 1551 insertions(+), 852 deletions(-) create mode 100644 src/renderer/src/components/status-bar/RemoteHostStatusRow.tsx create mode 100644 src/renderer/src/components/status-bar/remote-host-menu-inventory.ts create mode 100644 src/renderer/src/components/status-bar/remote-host-menu.test.tsx create mode 100644 src/renderer/src/components/status-bar/runtime-environment-explicit-connect.test.ts create mode 100644 src/renderer/src/components/status-bar/use-remote-host-menu-state.ts diff --git a/config/host-list-render-baseline.txt b/config/host-list-render-baseline.txt index 09d3a029300..d882f82dcce 100644 --- a/config/host-list-render-baseline.txt +++ b/config/host-list-render-baseline.txt @@ -9,7 +9,6 @@ 1 src/renderer/src/components/settings/quick-commands/QuickCommandsToolbar.tsx 1 src/renderer/src/components/settings/repository/hosts/RepositoryHostSetupsSection.tsx 1 src/renderer/src/components/sidebar/host-admission/ssh/AddRemoteHostSshConfigPicker.tsx -4 src/renderer/src/components/status-bar/SshStatusSegment.tsx 1 src/renderer/src/components/status-bar/resource-usage-popover-body.tsx 1 src/renderer/src/components/tab-bar/TabBarQuickCommandAddActions.tsx 2 src/renderer/src/components/terminal-pane/quick-commands/TerminalQuickCommandsSubmenu.tsx diff --git a/src/renderer/src/components/status-bar/RemoteHostStatusRow.tsx b/src/renderer/src/components/status-bar/RemoteHostStatusRow.tsx new file mode 100644 index 00000000000..805cf894f3b --- /dev/null +++ b/src/renderer/src/components/status-bar/RemoteHostStatusRow.tsx @@ -0,0 +1,209 @@ +import { useRef, useState } from 'react' +import { Loader2 } from 'lucide-react' +import { useTranslate, useIntlLocale } from '@/i18n/use-translate' +import { formatUiNarrowRelativeTime } from '@/i18n/relative-time-format' +import { cn } from '@/lib/utils' +import { useMountedRef } from '@/hooks/useMountedRef' +import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip' +import { + DropdownMenuItem, + DropdownMenuSub, + DropdownMenuSubContent, + DropdownMenuSubTrigger +} from '@/components/ui/dropdown-menu' +import type { HostRecoveryObservation } from './use-remote-host-menu-state' + +export function RemoteHostStatusRow({ + label, + kind, + tone, + status, + actionLabel, + actionKind, + onAction, + disabled, + errorSentence, + rawDetail, + recovery, + now, + onRetry, + onDisconnect +}: { + label: string + kind?: string + tone: 'connected' | 'offline' | 'busy' | 'error' + status: string + actionLabel: string + actionKind: 'connect' | 'disconnect' | 'recover' + onAction?: () => Promise | void + disabled?: boolean + errorSentence?: string + rawDetail?: string + recovery?: HostRecoveryObservation + now: number + onRetry?: () => Promise + onDisconnect?: () => Promise +}): React.JSX.Element { + const t = useTranslate() + const locale = useIntlLocale() + const mounted = useMountedRef() + const pending = useRef<{ token: symbol; kind: typeof actionKind } | null>(null) + const [busy, setBusy] = useState(null) + const [open, setOpen] = useState(false) + const reconnectCard = + tone === 'busy' && recovery && (recovery.attempt >= 3 || now - recovery.since >= 30_000) + const hasCard = Boolean(errorSentence || reconnectCard) + const run = async (action: (() => Promise | void) | undefined, kind: typeof actionKind) => { + if (!action || pending.current?.kind === kind) { + return + } + const token = Symbol() + pending.current = { token, kind } + setBusy(kind) + try { + await action() + } finally { + if (pending.current?.token === token) { + pending.current = null + if (mounted.current) { + setBusy(null) + } + } + } + } + let relativeTime = '' + if (reconnectCard) { + const elapsed = Math.max(1000, now - recovery.since) + const [unit, divisor] = + elapsed < 60_000 + ? (['second', 1000] as const) + : elapsed < 3_600_000 + ? (['minute', 60_000] as const) + : elapsed < 86_400_000 + ? (['hour', 3_600_000] as const) + : (['day', 86_400_000] as const) + relativeTime = formatUiNarrowRelativeTime(-Math.floor(elapsed / divisor), unit, locale) + } + const rowName = `${label}${kind ? ` ${kind}` : ''}, ${status}` + const details = ( + <> + + + + + {status} + + + {label} + {kind ? {kind} : null} + + ) + const action = ( + { + event.preventDefault() + setOpen(false) + void run(onAction, actionKind) + }} + > + + + ) + const triggerClass = 'min-w-0 flex-1' + return ( +
+ {hasCard ? ( + + + {details} + + +

+ {errorSentence ?? + t( + 'auto.components.status.bar.RemoteHostStatusRow.unreachable_since', + "Can't reach this host since {{time}}.", + { time: relativeTime } + )} +

+ {errorSentence ? ( + { + event.preventDefault() + if (rawDetail) { + void window.api.ui.writeClipboardText(rawDetail) + } + }} + > + {t('auto.components.status.bar.RemoteHostStatusRow.copy_error', 'Copy error')} + + ) : ( + { + event.preventDefault() + void run(onRetry, 'connect') + }} + > + {t('auto.components.status.bar.RemoteHostStatusRow.retry_now', 'Retry now')} + + )} + { + event.preventDefault() + void run(onDisconnect, 'disconnect') + }} + > + {reconnectCard && !errorSentence + ? t( + 'auto.components.status.bar.RemoteHostStatusRow.stop_reconnecting', + 'Stop reconnecting' + ) + : t('auto.components.status.bar.SshStatusSegment.59b553e2aa', 'Disconnect')} + +
+
+ ) : ( + event.preventDefault()} + > + {details} + + )} + {action} +
+ ) +} diff --git a/src/renderer/src/components/status-bar/RuntimeHostStatusRow.tsx b/src/renderer/src/components/status-bar/RuntimeHostStatusRow.tsx index 7ac8d2d96a9..096ec1e5be8 100644 --- a/src/renderer/src/components/status-bar/RuntimeHostStatusRow.tsx +++ b/src/renderer/src/components/status-bar/RuntimeHostStatusRow.tsx @@ -1,25 +1,13 @@ -import { useCallback, useRef, useState } from 'react' -import { Loader2 } from 'lucide-react' import { translate } from '@/i18n/i18n' -import { useIntlLocale, useTranslate, type Translate } from '@/i18n/use-translate' -import { formatUiRelativeTimeFromDate } from '@/i18n/relative-time-format' -import { useMountedRef } from '@/hooks/useMountedRef' -import { - DropdownMenuItem, - DropdownMenuSub, - DropdownMenuSubContent, - DropdownMenuSubTrigger -} from '@/components/ui/dropdown-menu' -import '@/runtime/hosts/connections/runtime-host-connection-state' -import { - isConnectedRuntimeHostState, - type RuntimeHostConnectionState -} from '../../../../shared/remote-runtime/host-status/runtime-host-connection-state' +import { useTranslate, type Translate } from '@/i18n/use-translate' +import type { RuntimeHostConnectionState } from '../../../../shared/remote-runtime/host-status/runtime-host-connection-state' import type { RemoteRuntimeSharedConnectionDiagnostics } from '../../../../shared/remote-runtime/control/remote-runtime-shared-control-types' import type { RuntimeHostBlockedCopy, RuntimeHostBlockedRecovery } from './remote-host-connection-status' +import { RemoteHostStatusRow } from './RemoteHostStatusRow' +import type { HostRecoveryObservation } from './use-remote-host-menu-state' function runtimeStatusLabel(state: RuntimeHostConnectionState, t: Translate = translate): string { switch (state) { @@ -44,314 +32,98 @@ function runtimeStatusLabel(state: RuntimeHostConnectionState, t: Translate = tr } } -function runtimeDotColor(state: RuntimeHostConnectionState): string { - switch (state) { - case 'connected': - return 'bg-emerald-500' - case 'workspace-window-closed': - case 'checking': - case 'reconnecting': - case 'runtime-unavailable': - return 'bg-yellow-500' - case 'disconnected': - return 'bg-muted-foreground/40' - } -} - -function runtimeStatusTone(state: RuntimeHostConnectionState): string { - if ( - state === 'checking' || - state === 'reconnecting' || - state === 'workspace-window-closed' || - state === 'runtime-unavailable' - ) { - return 'text-yellow-500' - } - return 'text-muted-foreground' -} - -function runtimeActionLabel( - state: RuntimeHostConnectionState, - t: Translate = translate -): string | null { - switch (state) { - case 'connected': - case 'workspace-window-closed': - case 'runtime-unavailable': - return t('auto.components.status.bar.SshStatusSegment.59b553e2aa', 'Disconnect') - case 'disconnected': - return t('auto.components.status.bar.SshStatusSegment.63f36455cc', 'Connect') - case 'checking': - case 'reconnecting': - return null - } -} - -function runtimeFailureSummary( - state: RuntimeHostConnectionState, - t: Translate = translate -): string { - switch (state) { - case 'connected': - return t( - 'auto.components.status.bar.RuntimeHostStatusRow.previous_connection_closed', - 'The previous connection closed' - ) - case 'workspace-window-closed': - return t( - 'auto.components.status.bar.RuntimeHostStatusRow.workspace_window_closed', - 'The workspace window is closed' - ) - case 'runtime-unavailable': - return t( - 'auto.components.status.bar.RuntimeHostStatusRow.runtime_unavailable', - 'SSH transport is connected, but the Orca runtime is unavailable' - ) - case 'checking': - return t( - 'auto.components.status.bar.RuntimeHostStatusRow.checking_host', - 'Orca is checking whether this host is reachable' - ) - case 'reconnecting': - return t( - 'auto.components.status.bar.RuntimeHostStatusRow.restoring_connection', - 'Orca is trying to restore the connection' - ) - case 'disconnected': - return t( - 'auto.components.status.bar.RuntimeHostStatusRow.host_unreachable', - 'Orca isn’t reachable on this host' - ) - } -} - -function runtimeFailureExplanation( - state: RuntimeHostConnectionState, - t: Translate = translate -): string | null { - if (state === 'connected' || state === 'workspace-window-closed') { - return null - } - if (state === 'runtime-unavailable') { - return t( - 'auto.components.status.bar.RuntimeHostStatusRow.runtime_unavailable_explanation', - 'The remote host may still be running; only the Orca runtime connection is unavailable.' - ) - } - return t( - 'auto.components.status.bar.RuntimeHostStatusRow.contact_note', - 'The host may still be running; only the Orca connection is unavailable.' - ) -} - export function RuntimeHostStatusRow({ label, + kind, state, - detail, diagnostics, blocked, + pending, + recovery, + now, onConnect, onDisconnect, onRecover }: { label: string + kind?: string state: RuntimeHostConnectionState - detail?: string diagnostics?: RemoteRuntimeSharedConnectionDiagnostics | null - /** Set when the host refused this client; its copy replaces the transport state. */ blocked?: (RuntimeHostBlockedCopy & { recovery: RuntimeHostBlockedRecovery | null }) | null - onConnect?: () => Promise - onDisconnect?: () => Promise - onRecover?: () => void + pending: boolean + recovery?: HostRecoveryObservation + now: number + onConnect: () => Promise + onDisconnect: () => Promise + onRecover: () => void }): React.JSX.Element { const t = useTranslate() - const intlLocale = useIntlLocale() - const [busy, setBusy] = useState(false) - const [submenuOpen, setSubmenuOpen] = useState(false) - const actionPointerActiveRef = useRef(false) - const mountedRef = useMountedRef() - // Why: reconnecting a refused pairing is futile; only its recovery (a new pairing) gets back in. - const repairs = Boolean(blocked?.recovery && onRecover) + pending = pending && state !== 'connected' && state !== 'workspace-window-closed' + blocked = pending ? null : blocked + const transient = pending || state === 'checking' || state === 'reconnecting' + const error = Boolean(blocked || state === 'runtime-unavailable') + const repairs = Boolean(blocked?.recovery) + const tone = blocked + ? 'error' + : transient + ? 'busy' + : error + ? 'error' + : state === 'disconnected' + ? 'offline' + : 'connected' + const status = + blocked?.label ?? + (state === 'reconnecting' || (transient && recovery?.attempt) + ? recovery?.attempt + ? t( + 'auto.components.status.bar.RemoteHostStatusRow.reconnecting_attempt', + 'Reconnecting (attempt {{attempt}})', + { attempt: String(recovery.attempt) } + ) + : runtimeStatusLabel('reconnecting', t) + : runtimeStatusLabel(pending ? 'checking' : state, t)) + const actionKind = repairs + ? 'recover' + : transient && !blocked + ? 'disconnect' + : error || state === 'disconnected' + ? 'connect' + : 'disconnect' const actionLabel = repairs ? blocked?.recovery === 'open-settings' ? t('auto.components.status.bar.RuntimeHostStatusRow.open_settings', 'Open settings…') : t('auto.components.status.bar.RuntimeHostStatusRow.repair', 'Re-pair…') - : blocked?.recovery - ? null - : runtimeActionLabel(state, t) - const transportAction = isConnectedRuntimeHostState(state) ? onDisconnect : onConnect - const action = repairs ? onRecover : transportAction - const hasSubmenu = Boolean(detail || blocked) - - const handleAction = useCallback(async () => { - if (repairs) { - onRecover?.() - return - } - if (!transportAction) { - return - } - setBusy(true) - try { - await transportAction() - } finally { - if (mountedRef.current) { - setBusy(false) - } - } - }, [mountedRef, onRecover, repairs, transportAction]) - - const lastConnectedLabel = diagnostics?.lastConnectedAt - ? t( - 'auto.components.status.bar.RuntimeHostStatusRow.last_connected', - 'Last connected {{value0}}', - { - value0: formatUiRelativeTimeFromDate( - new Date(diagnostics.lastConnectedAt).toISOString(), - undefined, - intlLocale - ) - } - ) - : null - const reconnectAttemptLabel = - diagnostics && state === 'reconnecting' - ? t( - 'auto.components.status.bar.RuntimeHostStatusRow.reconnect_attempt', - 'Attempt {{value0}}', - { value0: String(diagnostics.reconnectAttempt + 1) } - ) - : null - const diagnosticLabel = [lastConnectedLabel, reconnectAttemptLabel].filter(Boolean).join(' · ') - const rawDetail = - blocked?.detail ?? diagnostics?.lastError ?? diagnostics?.lastClose?.reason ?? detail - const failureSummary = blocked?.summary ?? runtimeFailureSummary(state, t) - const failureExplanation = blocked ? blocked.explanation : runtimeFailureExplanation(state, t) - const dotColor = blocked ? 'bg-destructive' : runtimeDotColor(state) - const statusTone = blocked ? 'text-destructive' : runtimeStatusTone(state) - const showSpinner = !blocked && (state === 'checking' || state === 'reconnecting') - - const rowDetails = ( - <> -