herdr-remote 0.2.19 → 0.2.21

package/dist/i18n/en.js

@@ -219,5 +219,17 @@ const en = {
     'update.mirrorBehind': '{registries} still has an older version; installing from {source}',
     'update.cannot.source': 'Source checkout — update with git',
     'update.cannot.linked': 'Linked package — managed by npm link',
+    'relayUpdate.check': 'Relay {version}: check for updates',
+    'relayUpdate.checking': 'Relay: checking npm…',
+    'relayUpdate.upToDate': 'Relay up to date ({version})',
+    'relayUpdate.available': 'Relay {latest} available, installed {installed} (press Enter to install)',
+    'relayUpdate.needsCli': 'Relay {latest} needs a newer herdr-remote: update herdr-remote first',
+    'relayUpdate.updating': 'Installing relay {version}…',
+    'relayUpdate.updatingRetry': 'Installing relay {version}… (npm has not caught up yet, attempt {attempt})',
+    'relayUpdate.restart': 'Relay {version} installed, {running} still running (press Enter to restart)',
+    'relayUpdate.restarting': 'Restarting herdr-remote…',
+    'relayUpdate.restarted': 'herdr-remote restarted; the relay now runs {version}.',
+    'relayUpdate.errorNotApplied': 'npm finished, but relay {installed} is still installed',
+    'relayUpdate.banner': 'Relay {latest} is out (installed {current}). Press 7 and Enter on the relay row to install.',
 };
 export default en;

package/dist/i18n/zh.js

@@ -218,5 +218,17 @@ const zh = {
     'update.mirrorBehind': '{registries} 仍是旧版本，将从 {source} 安装',
     'update.cannot.source': '源码目录运行，请使用 git 更新',
     'update.cannot.linked': 'npm link 工作副本，由 npm link 管理',
+    'relayUpdate.check': 'Relay {version}：检查更新',
+    'relayUpdate.checking': 'Relay：查询 npm 中…',
+    'relayUpdate.upToDate': 'Relay 已是最新（{version}）',
+    'relayUpdate.available': 'Relay 新版本 {latest} 可用，当前 {installed}（按 Enter 安装）',
+    'relayUpdate.needsCli': 'Relay {latest} 需要更新 herdr-remote，请先更新上一行',
+    'relayUpdate.updating': '安装 relay {version} 中…',
+    'relayUpdate.updatingRetry': '安装 relay {version} 中…（npm 尚未同步，第 {attempt} 次尝试）',
+    'relayUpdate.restart': 'Relay {version} 已安装，运行中的仍是 {running}（按 Enter 重启生效）',
+    'relayUpdate.restarting': '正在重启 herdr-remote…',
+    'relayUpdate.restarted': 'herdr-remote 已重启，relay 现在运行 {version}。',
+    'relayUpdate.errorNotApplied': 'npm 已完成，但安装的仍是 relay {installed}',
+    'relayUpdate.banner': 'Relay {latest} 已发布（当前 {current}），按 7 进入「语言与关于」，在 Relay 一行按 Enter 安装。',
 };
 export default zh;

package/dist/relay-updater.js

@@ -0,0 +1,81 @@
+// Updating the relay a local or LAN workstation runs, on its own.
+//
+// The relay is a package of its own that herdr-remote installs. A release of
+// the relay alone leaves herdr-remote's version where it was, so the update
+// check for herdr-remote says "up to date" while the relay on disk falls
+// behind. This checks the relay by itself, and installs the newest relay that
+// this herdr-remote's dependency range allows.
+import fs from 'node:fs';
+import path from 'node:path';
+import { createRequire } from 'node:module';
+import { PACKAGE_ROOT } from './paths.js';
+import { checkForUpdate, compareVersions, currentVersion, performUpdate, } from './updater.js';
+const RELAY_PACKAGE = 'herdr-remote-relay';
+/** The relay installed under this herdr-remote, read from disk: an update moves it. */
+export function installedRelayVersion() {
+    try {
+        const manifest = createRequire(import.meta.url).resolve(`${RELAY_PACKAGE}/package.json`);
+        return JSON.parse(fs.readFileSync(manifest, 'utf8')).version;
+    }
+    catch {
+        return null;
+    }
+}
+/** The relay versions this herdr-remote declares it works with, e.g. `^0.3.9`. */
+function relayRange() {
+    try {
+        const manifest = JSON.parse(fs.readFileSync(path.join(PACKAGE_ROOT, 'package.json'), 'utf8'));
+        return manifest.dependencies?.[RELAY_PACKAGE] ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Whether `version` is inside a caret range, the only kind herdr-remote
+ * declares. Below 1.0 a caret holds the minor version (`^0.3.9` is `0.3.x`
+ * from `0.3.9`), which is exactly the line a relay must not cross alone.
+ */
+export function withinCaretRange(version, range) {
+    const match = /^\^(\d+)\.(\d+)\.(\d+)$/.exec(range.trim());
+    if (!match)
+        return false;
+    const floor = `${match[1]}.${match[2]}.${match[3]}`;
+    const [major, minor] = version.split('.').map((part) => Number.parseInt(part, 10));
+    const [floorMajor, floorMinor] = [Number(match[1]), Number(match[2])];
+    if (compareVersions(version, floor) < 0 || major !== floorMajor)
+        return false;
+    return floorMajor > 0 || minor === floorMinor;
+}
+/** Whether a newer relay than the installed one is out, and whether this herdr-remote can take it. */
+export async function checkForRelayUpdate(options = {}) {
+    const installed = installedRelayVersion();
+    const result = await checkForUpdate({
+        ...options,
+        packageName: RELAY_PACKAGE,
+        current: installed ?? '0.0.0',
+    });
+    if (!result.ok || !result.updateAvailable || !result.latest)
+        return result;
+    const range = relayRange();
+    if (range && !withinCaretRange(result.latest, range)) {
+        return { ...result, updateAvailable: false, needsNewerCli: true };
+    }
+    return result;
+}
+/**
+ * Install the newest relay this herdr-remote allows: the same herdr-remote,
+ * reinstalled, which npm resolves afresh, relay included. The installed
+ * herdr-remote does not change, and neither does anything it was tested with
+ * but the relay. Success is the relay on disk, not npm's exit code.
+ */
+export async function performRelayUpdate({ relayVersion, readRelayVersion = installedRelayVersion, ...options }) {
+    const result = await performUpdate({ ...options, version: currentVersion() });
+    if (!result.ok)
+        return result;
+    const installed = readRelayVersion();
+    if (!installed || compareVersions(installed, relayVersion) < 0) {
+        return { ok: false, errorKey: 'relayUpdate.errorNotApplied', installed, output: result.output };
+    }
+    return { ...result, installed };
+}

package/dist/tui/App.js

@@ -3,7 +3,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Box, Text, useApp, useInput } from 'ink';
 import { useMouse, useMouseTarget } from './mouse/index.js';
 import { theme } from './theme.js';
-import { checkForUpdate, createDraft, createTranslator, detectLocale, ensureRuntime, fullStatus, loadConfig, requiresRestart, updateChecksEnabled, } from './api.js';
+import { checkForRelayUpdate, checkForUpdate, createDraft, createTranslator, detectLocale, ensureRuntime, fullStatus, loadConfig, requiresRestart, runsLocalRelay, updateChecksEnabled, } from './api.js';
 import { Overview } from './screens/Overview.js';
 import { PairScreen } from './screens/Pair.js';
 import { Services } from './screens/Services.js';
@@ -30,7 +30,7 @@ function Tab({ label, active, onSelect, }) {
 function Footer({ hints }) {
     return (_jsx(Box, { marginTop: 1, paddingX: 1, children: _jsx(Text, { color: theme.muted, children: hints.join('  ·  ') }) }));
 }
-export function App({ initialLanguage, needsWizard, updateChecker = updateChecksEnabled() ? checkForUpdate : null, }) {
+export function App({ initialLanguage, needsWizard, updateChecker = updateChecksEnabled() ? checkForUpdate : null, relayUpdateChecker = updateChecksEnabled() ? checkForRelayUpdate : null, }) {
     const { exit } = useApp();
     const mouse = useMouse();
     const [config, setConfig] = useState(() => loadConfig());
@@ -38,11 +38,13 @@ export function App({ initialLanguage, needsWizard, updateChecker = updateChecks
     const [runtime, setRuntime] = useState(() => ensureRuntime());
     const [status, setStatus] = useState(null);
     const [tab, setTab] = useState('overview');
-    const [message, setMessage] = useState(null);
+    const [notice, setNotice] = useState(null);
     const [busy, setBusy] = useState(false);
     const [editingId, setEditingId] = useState(null);
     const [wizardDone, setWizardDone] = useState(!needsWizard);
     const [updateCheck, setUpdateCheck] = useState(null);
+    const [relayUpdateCheck, setRelayUpdateCheck] = useState(null);
+    const localRelay = runsLocalRelay(config);
     // Every time the TUI opens: that is when someone is here to act on it.
     // Failure says nothing; the About tab can still be asked by hand.
     useEffect(() => {
@@ -59,13 +61,32 @@ export function App({ initialLanguage, needsWizard, updateChecker = updateChecks
             cancelled = true;
         };
     }, [updateChecker]);
+    // A relay somewhere else is somebody else's to update.
+    useEffect(() => {
+        if (!relayUpdateChecker || !localRelay)
+            return undefined;
+        let cancelled = false;
+        relayUpdateChecker()
+            .then((result) => {
+            if (!cancelled && result?.ok)
+                setRelayUpdateCheck(result);
+        })
+            .catch(() => { });
+        return () => {
+            cancelled = true;
+        };
+    }, [relayUpdateChecker, localRelay]);
     const locale = useMemo(() => detectLocale({ preference: initialLanguage ?? draft.ui.language }), [initialLanguage, draft.ui.language]);
     const t = useMemo(() => createTranslator(locale), [locale]);
     const dirty = useMemo(() => JSON.stringify(config) !== JSON.stringify(draft), [config, draft]);
     const restartPending = useMemo(() => dirty && requiresRestart(config, draft), [config, draft, dirty]);
-    const notify = useCallback((text, level = 'info') => {
-        setMessage({ text, level });
+    const notify = useCallback((next, level = 'info') => {
+        setNotice({ notice: next, level });
     }, []);
+    const message = notice && {
+        text: typeof notice.notice === 'string' ? notice.notice : notice.notice(t),
+        level: notice.level,
+    };
     const refresh = useCallback(() => {
         fullStatus(loadConfig())
             .then((next) => setStatus(next))
@@ -132,6 +153,8 @@ export function App({ initialLanguage, needsWizard, updateChecker = updateChecks
         message,
         updateCheck,
         setUpdateCheck,
+        relayUpdateCheck,
+        setRelayUpdateCheck,
     };
     useInput((input, key) => {
         if (key.ctrl && input === 'c') {
@@ -143,13 +166,13 @@ export function App({ initialLanguage, needsWizard, updateChecker = updateChecks
             return;
         }
         if (input === 'r') {
-            setMessage(null);
+            setNotice(null);
             refresh();
             return;
         }
         if (input === 'm') {
             if (!mouse.supported) {
-                notify(t('hint.mouseUnsupported'), 'info');
+                notify((t) => t('hint.mouseUnsupported'), 'info');
                 return;
             }
             mouseChoice.current = !mouse.enabled;
@@ -191,5 +214,8 @@ export function App({ initialLanguage, needsWizard, updateChecker = updateChecks
             : t('hint.mouseUnsupported'),
         t('hint.quit'),
     ].filter(Boolean);
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: [_jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: t('app.name') }), _jsx(Text, { color: theme.muted, children: `  ${t('app.tagline')}` })] }), updateCheck?.updateAvailable ? (_jsx(Text, { color: theme.warn, children: t('update.banner', { latest: updateCheck.latest ?? '', current: updateCheck.current }) })) : null] }), _jsx(Box, { marginBottom: 1, children: TABS.map((entry, entryIndex) => (_jsx(Tab, { label: `${entryIndex + 1} ${t(entry.labelKey)}`, active: entry.id === tab, onSelect: () => setTab(entry.id) }, entry.id))) }), tab === 'overview' ? _jsx(Overview, { ctx: context }) : null, tab === 'pair' ? _jsx(PairScreen, { ctx: context }) : null, tab === 'services' ? _jsx(Services, { ctx: context }) : null, tab === 'relay' ? _jsx(RelayScreen, { ctx: context }) : null, tab === 'keepalive' ? _jsx(Keepalive, { ctx: context }) : null, tab === 'herdr' ? _jsx(HerdrScreen, { ctx: context }) : null, tab === 'about' ? _jsx(About, { ctx: context }) : null, restartPending ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.warn, children: t('hint.restartRequired') }) })) : null, _jsx(Footer, { hints: hints })] }));
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: [_jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: t('app.name') }), _jsx(Text, { color: theme.muted, children: `  ${t('app.tagline')}` })] }), updateCheck?.updateAvailable ? (_jsx(Text, { color: theme.warn, children: t('update.banner', { latest: updateCheck.latest ?? '', current: updateCheck.current }) })) : null, localRelay && relayUpdateCheck?.updateAvailable ? (_jsx(Text, { color: theme.warn, children: t('relayUpdate.banner', {
+                            latest: relayUpdateCheck.latest ?? '',
+                            current: relayUpdateCheck.current,
+                        }) })) : null] }), _jsx(Box, { marginBottom: 1, children: TABS.map((entry, entryIndex) => (_jsx(Tab, { label: `${entryIndex + 1} ${t(entry.labelKey)}`, active: entry.id === tab, onSelect: () => setTab(entry.id) }, entry.id))) }), tab === 'overview' ? _jsx(Overview, { ctx: context }) : null, tab === 'pair' ? _jsx(PairScreen, { ctx: context }) : null, tab === 'services' ? _jsx(Services, { ctx: context }) : null, tab === 'relay' ? _jsx(RelayScreen, { ctx: context }) : null, tab === 'keepalive' ? _jsx(Keepalive, { ctx: context }) : null, tab === 'herdr' ? _jsx(HerdrScreen, { ctx: context }) : null, tab === 'about' ? _jsx(About, { ctx: context }) : null, restartPending ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.warn, children: t('hint.restartRequired') }) })) : null, _jsx(Footer, { hints: hints })] }));
 }

package/dist/tui/api.js

@@ -5,7 +5,7 @@
 // single surface to call.
 import { OFFICIAL_RELAY_URL, configExists, loadConfig } from '../config.js';
 import { configPath, stateDir } from '../paths.js';
-import { bindAddress, resolveAdminOrigin } from '../relay-urls.js';
+import { bindAddress, resolveAdminOrigin, runsLocalRelay } from '../relay-urls.js';
 import { MIN_HERDR_VERSION, herdrVersion } from '../herdr-command.js';
 import { createTranslator, detectLocale } from '../i18n/index.js';
 import { listReachableAddresses } from '../net-interfaces.js';
@@ -15,8 +15,9 @@ import { ensureRuntime, regenerateHostIdentity, setRelayPassword } from '../runt
 import { pair, readLogTail } from '../service.js';
 import { fullStatus, restartAll, startAll, stopAll } from '../lifecycle.js';
 import * as keepalive from '../keepalive/index.js';
-import { canSelfUpdate, checkForUpdate, currentVersion, updateChecksEnabled, installKind, performUpdate, } from '../updater.js';
-export { detectLocale, listReachableAddresses, MIN_HERDR_VERSION, OFFICIAL_RELAY_URL, isOfficialRelay, selectedMode, canSelfUpdate, checkForUpdate, currentVersion, updateChecksEnabled, installKind, performUpdate, bindAddress, configExists, configPath, createDraft, createTranslator, ensureRuntime, extractPairingCode, fieldsForMode, fullStatus, getField, getFieldPlaceholder, herdrVersion, keepalive, loadConfig, pair, readLogTail, regenerateHostIdentity, requiresRestart, restartAll, saveDraft, setField, setRelayPassword, startAll, stateDir, stopAll, };
+import { canSelfUpdate, checkForUpdate, compareVersions, currentVersion, updateChecksEnabled, installKind, performUpdate, } from '../updater.js';
+import { checkForRelayUpdate, installedRelayVersion, performRelayUpdate, } from '../relay-updater.js';
+export { detectLocale, listReachableAddresses, MIN_HERDR_VERSION, OFFICIAL_RELAY_URL, isOfficialRelay, selectedMode, canSelfUpdate, checkForUpdate, compareVersions, currentVersion, updateChecksEnabled, installKind, performUpdate, checkForRelayUpdate, installedRelayVersion, performRelayUpdate, runsLocalRelay, bindAddress, configExists, configPath, createDraft, createTranslator, ensureRuntime, extractPairingCode, fieldsForMode, fullStatus, getField, getFieldPlaceholder, herdrVersion, keepalive, loadConfig, pair, readLogTail, regenerateHostIdentity, requiresRestart, restartAll, saveDraft, setField, setRelayPassword, startAll, stateDir, stopAll, };
 /** The command that starts a matching relay, ready to paste on the server. */
 export function relayStartCommand(config, password) {
     const publicUrl = config.relay.remoteUrl

package/dist/tui/screens/About.js

@@ -2,6 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
 import { Box, Text, useInput } from 'ink';
 import { theme } from '../theme.js';
+import { useRelayUpdate } from './useRelayUpdate.js';
 import { Message, Panel, Row, Selectable } from '../components/common.js';
 import { canSelfUpdate, checkForUpdate, configPath, currentVersion, detectLocale, installKind, performUpdate, saveDraft, setField, stateDir, } from '../api.js';
 /** `https://registry.npmmirror.com` → `registry.npmmirror.com`, for one line of text. */
@@ -42,7 +43,12 @@ export function About({ ctx }) {
                 return t('update.check');
         }
     })();
-    const options = [...languageOptions, { id: 'update', label: updateLabel }];
+    const relay = useRelayUpdate(ctx);
+    const options = [
+        ...languageOptions,
+        { id: 'update', label: updateLabel },
+        ...(relay.visible ? [{ id: 'relay-update', label: relay.label }] : []),
+    ];
     /** Show a check's answer, whether this screen asked or the TUI did on opening. */
     const applyCheck = (result) => {
         checkRef.current = { registry: result.registry ?? '', sources: result.sources ?? [] };
@@ -50,12 +56,12 @@ export function About({ ctx }) {
         // answer. It is still asked, and said to be behind.
         const behind = result.behind ?? [];
         setSourceNote(result.updateAvailable && behind.length > 0 && result.registry
-            ? t('update.mirrorBehind', {
+            ? {
                 registries: behind
                     .map((entry) => `${registryHost(entry.registry)} ${entry.version ?? ''}`.trim())
                     .join(', '),
                 source: registryHost(result.registry),
-            })
+            }
             : null);
         setUpdate(result.updateAvailable
             ? { phase: 'available', latest: result.latest }
@@ -76,8 +82,9 @@ export function About({ ctx }) {
             // Which registries were tried, and what each of them said. Without this
             // the row reads "could not reach npm registry" on a machine where
             // `npm install` works perfectly, and there is nothing to act on.
-            if (result.message)
-                ctx.notify(t('update.errorNetworkDetail', { message: result.message }), 'error');
+            const { message } = result;
+            if (message)
+                ctx.notify((t) => t('update.errorNetworkDetail', { message }), 'error');
             return;
         }
         ctx.setUpdateCheck(result);
@@ -95,7 +102,7 @@ export function About({ ctx }) {
             const params = { version: latest, installed: result.installed ?? '' };
             setUpdate({ phase: 'error', messageKey: result.errorKey ?? 'update.errorFailed', params });
             // npm's own words: "update failed" alone is what left this unfixable.
-            ctx.notify(result.summary
+            ctx.notify((t) => result.summary
                 ? t('update.errorFailedDetail', { message: result.summary })
                 : t(result.errorKey ?? 'update.errorFailed', params), 'error');
             return;
@@ -104,7 +111,7 @@ export function About({ ctx }) {
         setSourceNote(null);
         // Installed: the line under the title has nothing left to announce.
         ctx.setUpdateCheck(null);
-        ctx.notify(t('update.restartHint'), 'success');
+        ctx.notify((t) => t('update.restartHint'), 'success');
     };
     /**
      * One row, two meanings: check first, then install what the check found.
@@ -126,21 +133,26 @@ export function About({ ctx }) {
     };
     const choose = (language) => {
         const result = setField(draft, 'language', language);
-        if (result.errorKey) {
-            ctx.notify(t(result.errorKey), 'error');
+        const { errorKey } = result;
+        if (errorKey) {
+            ctx.notify((t) => t(errorKey), 'error');
             return;
         }
         ctx.updateDraft(result.draft);
         try {
             saveDraft(result.draft);
             ctx.reloadConfig();
-            ctx.notify(t('common.saved', { path: configPath() }), 'success');
+            ctx.notify((t) => t('common.saved', { path: configPath() }), 'success');
         }
         catch (error) {
-            ctx.notify(t('error.saveFailed', { message: error.message }), 'error');
+            ctx.notify((t) => t('error.saveFailed', { message: error.message }), 'error');
         }
     };
     const activate = (id) => {
+        if (id === 'relay-update') {
+            relay.activate();
+            return;
+        }
         if (id === 'update') {
             activateUpdate();
             return;
@@ -162,5 +174,8 @@ export function About({ ctx }) {
                     }, onHover: () => setSelected(option.id), children: `${option.label}${draft.ui.language === option.id ? '  ✓' : ''}` }, option.id))) }), _jsx(Text, { color: theme.muted, children: t('update.title') }), _jsxs(Box, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: [_jsx(Selectable, { selected: selected === 'update', onSelect: () => {
                             setSelected('update');
                             activateUpdate();
-                        }, onHover: () => setSelected('update'), children: updateLabel }), sourceNote ? _jsx(Text, { color: theme.muted, children: `  ${sourceNote}` }) : null] }), _jsx(Row, { label: t('about.version'), children: _jsx(Text, { color: theme.muted, children: currentVersion() }) }), _jsx(Row, { label: t('about.configPath'), children: _jsx(Text, { color: theme.muted, children: configPath() }) }), _jsx(Row, { label: t('about.statePath'), children: _jsx(Text, { color: theme.muted, children: stateDir() }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.muted, children: t('about.docs') }) }), _jsx(Message, { text: ctx.message?.text ?? null, level: ctx.message?.level ?? 'info' })] }));
+                        }, onHover: () => setSelected('update'), children: updateLabel }), sourceNote ? (_jsx(Text, { color: theme.muted, children: `  ${t('update.mirrorBehind', sourceNote)}` })) : null, relay.visible ? (_jsx(Selectable, { selected: selected === 'relay-update', onSelect: () => {
+                            setSelected('relay-update');
+                            relay.activate();
+                        }, onHover: () => setSelected('relay-update'), children: relay.label })) : null] }), _jsx(Row, { label: t('about.version'), children: _jsx(Text, { color: theme.muted, children: currentVersion() }) }), relay.visible ? (_jsx(Row, { label: t('about.relayPackage'), children: _jsx(Text, { color: theme.muted, children: relay.installed ?? '?' }) })) : null, _jsx(Row, { label: t('about.configPath'), children: _jsx(Text, { color: theme.muted, children: configPath() }) }), _jsx(Row, { label: t('about.statePath'), children: _jsx(Text, { color: theme.muted, children: stateDir() }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.muted, children: t('about.docs') }) }), _jsx(Message, { text: ctx.message?.text ?? null, level: ctx.message?.level ?? 'info' })] }));
 }

package/dist/tui/screens/Herdr.js

@@ -20,8 +20,9 @@ export function HerdrScreen({ ctx }) {
     ];
     const applyField = (id, value) => {
         const result = setField(draft, id, value);
-        if (result.errorKey) {
-            ctx.notify(t(result.errorKey), 'error');
+        const { errorKey } = result;
+        if (errorKey) {
+            ctx.notify((t) => t(errorKey), 'error');
             return false;
         }
         ctx.updateDraft(result.draft);
@@ -31,10 +32,10 @@ export function HerdrScreen({ ctx }) {
         try {
             const result = saveDraft(draft);
             ctx.reloadConfig();
-            ctx.notify(t('common.saved', { path: result.path }), 'success');
+            ctx.notify((t) => t('common.saved', { path: result.path }), 'success');
         }
         catch (error) {
-            ctx.notify(t('error.saveFailed', { message: error.message }), 'error');
+            ctx.notify((t) => t('error.saveFailed', { message: error.message }), 'error');
         }
     };
     const activate = (id) => {

package/dist/tui/screens/Keepalive.js

@@ -27,22 +27,22 @@ export function Keepalive({ ctx }) {
         ctx.run(() => {
             if (id === 'install') {
                 const result = keepalive.install(ctx.config);
-                ctx.notify(t('keepalive.installed', { manager: result.manager }), 'success');
+                ctx.notify((t) => t('keepalive.installed', { manager: result.manager }), 'success');
                 return;
             }
             if (id === 'uninstall') {
                 keepalive.uninstall(ctx.config);
-                ctx.notify(t('keepalive.uninstalled'), 'success');
+                ctx.notify((t) => t('keepalive.uninstalled'), 'success');
                 return;
             }
             if (id === 'restart') {
                 keepalive.restart(ctx.config);
-                ctx.notify(t('keepalive.restarted'), 'success');
+                ctx.notify((t) => t('keepalive.restarted'), 'success');
                 return;
             }
             if (id === 'linger') {
                 const result = keepalive.enableLinger();
-                ctx.notify(t('keepalive.lingerDone', { username: result.username }), 'success');
+                ctx.notify((t) => t('keepalive.lingerDone', { username: result.username }), 'success');
             }
         });
     };
@@ -58,8 +58,9 @@ export function Keepalive({ ctx }) {
     if (editingId === 'keepaliveManager') {
         return (_jsx(Panel, { title: t('field.keepalive'), children: _jsx(ChoiceList, { options: MANAGERS.map((manager) => ({ id: manager, label: manager })), current: draft.keepalive.manager, onPick: (manager) => {
                     const result = setField(draft, 'keepaliveManager', manager);
-                    if (result.errorKey) {
-                        ctx.notify(t(result.errorKey), 'error');
+                    const { errorKey } = result;
+                    if (errorKey) {
+                        ctx.notify((t) => t(errorKey), 'error');
                         return;
                     }
                     ctx.updateDraft(result.draft);
@@ -68,7 +69,7 @@ export function Keepalive({ ctx }) {
                         ctx.reloadConfig();
                     }
                     catch (error) {
-                        ctx.notify(t('error.saveFailed', { message: error.message }), 'error');
+                        ctx.notify((t) => t('error.saveFailed', { message: error.message }), 'error');
                     }
                     ctx.setEditing(null);
                 }, onCancel: () => ctx.setEditing(null) }) }));

package/dist/tui/screens/Overview.js

@@ -32,5 +32,5 @@ export function Overview({ ctx }) {
                                     ? t('common.running')
                                     : status.keepalive.installed
                                         ? t('common.installed')
-                                        : t('common.notInstalled')] })] }) }), _jsx(Box, { marginTop: 1, flexDirection: "column", children: relayReachable ? (_jsxs(_Fragment, { children: [_jsx(Row, { label: t('overview.hosts'), children: _jsx(Text, { children: health.hosts ?? 0 }) }), _jsx(Row, { label: t('overview.devices'), children: _jsx(Text, { children: health.clients ?? 0 }) }), _jsx(Row, { label: t('overview.uptime'), children: _jsx(Text, { color: theme.muted, children: formatUptime(health.uptimeSeconds, t) }) })] })) : (_jsx(Text, { color: theme.warn, children: t('overview.unreachable', { message: health.message ?? '' }) })) }), nothingRunning ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.muted, children: t('overview.notStarted') }) })) : null, config.relay.mode === 'local' ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.muted, children: t('mode.local.description') }) })) : null, _jsx(Message, { text: ctx.message?.text ?? null, level: ctx.message?.level ?? 'info' })] }));
+                                        : t('common.notInstalled')] })] }) }), _jsx(Box, { marginTop: 1, flexDirection: "column", children: relayReachable ? (_jsxs(_Fragment, { children: [typeof health.hosts === 'number' ? (_jsx(Row, { label: t('overview.hosts'), children: _jsx(Text, { children: health.hosts }) })) : null, typeof health.clients === 'number' ? (_jsx(Row, { label: t('overview.devices'), children: _jsx(Text, { children: health.clients }) })) : null, _jsx(Row, { label: t('overview.uptime'), children: _jsx(Text, { color: theme.muted, children: formatUptime(health.uptimeSeconds, t) }) })] })) : (_jsx(Text, { color: theme.warn, children: t('overview.unreachable', { message: health.message ?? '' }) })) }), nothingRunning ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.muted, children: t('overview.notStarted') }) })) : null, config.relay.mode === 'local' ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.muted, children: t('mode.local.description') }) })) : null, _jsx(Message, { text: ctx.message?.text ?? null, level: ctx.message?.level ?? 'info' })] }));
 }

package/dist/tui/screens/Pair.js

@@ -43,7 +43,7 @@ export function PairScreen({ ctx }) {
         };
     }, [pairing, columns]);
     const generate = () => run(async () => {
-        ctx.notify(t('pair.working'));
+        ctx.notify((t) => t('pair.working'));
         try {
             const result = await pair();
             const code = extractPairingCode(result);

package/dist/tui/screens/Relay.js

@@ -65,8 +65,9 @@ export function RelayScreen({ ctx }) {
         let next = draft;
         for (const [id, value] of updates) {
             const result = setField(next, id, value);
-            if (result.errorKey) {
-                ctx.notify(t(result.errorKey), 'error');
+            const { errorKey } = result;
+            if (errorKey) {
+                ctx.notify((t) => t(errorKey), 'error');
                 return false;
             }
             next = result.draft;
@@ -80,11 +81,11 @@ export function RelayScreen({ ctx }) {
         try {
             const result = saveDraft(draft);
             ctx.reloadConfig();
-            ctx.notify(t('common.saved', { path: result.path }), 'success');
+            ctx.notify((t) => t('common.saved', { path: result.path }), 'success');
         }
         catch (error) {
             const problems = error.problems;
-            ctx.notify(problems
+            ctx.notify((t) => problems
                 ? problems.map((key) => t(key)).join(' ')
                 : t('error.saveFailed', { message: error.message }), 'error');
         }
@@ -94,7 +95,7 @@ export function RelayScreen({ ctx }) {
         if (!entry)
             return;
         if (entry.kind === 'readonly') {
-            ctx.notify(t('relay.officialFixed'), 'info');
+            ctx.notify((t) => t('relay.officialFixed'), 'info');
             return;
         }
         if (entry.kind === 'field' || entry.kind === 'password') {
@@ -117,14 +118,14 @@ export function RelayScreen({ ctx }) {
             ctx.run(() => {
                 regenerateHostIdentity();
                 ctx.reloadConfig();
-                ctx.notify(t('relay.regenerated'), 'success');
+                ctx.notify((t) => t('relay.regenerated'), 'success');
             });
             return;
         }
         if (id === 'test') {
             ctx.run(async () => {
                 const result = await probeRelay(ctx.config);
-                ctx.notify(result.ok
+                ctx.notify((t) => result.ok
                     ? t('relay.testOk', { version: result.version ?? '?', hosts: result.hosts ?? 0 })
                     : t('relay.testFailed', { message: result.message ?? '' }), result.ok ? 'success' : 'error');
             });
@@ -193,7 +194,7 @@ export function RelayScreen({ ctx }) {
                         setPassword(value);
                         setRelayPassword(value);
                         ctx.setEditing(null);
-                        ctx.notify(t('relay.passwordSaved'), 'success');
+                        ctx.notify((t) => t('relay.passwordSaved'), 'success');
                     }, onCancel: () => ctx.setEditing(null) })) : entry.kind === 'readonly' ? (
                 // Fixed by us, so it is printed rather than offered for editing.
                 _jsx(Text, { color: theme.muted, children: `${getField(draft, entry.id) || placeholderText(ctx, entry.id)}  (${t('relay.locked')})` })) : entry.fieldKind === 'choice' ? (

package/dist/tui/screens/Services.js

@@ -18,27 +18,27 @@ export function Services({ ctx }) {
         // top of an unsaved draft silently applies the old settings — which reads
         // as "I changed the relay and it never took effect". Stopping is unaffected.
         if (ctx.dirty && id !== 'stop') {
-            ctx.notify(t('services.unsavedBlocked'), 'error');
+            ctx.notify((t) => t('services.unsavedBlocked'), 'error');
             return;
         }
         return run(() => {
             const config = ctx.config;
             if (id === 'start') {
                 const result = startAll(config);
-                ctx.notify(result.managed
+                ctx.notify((t) => result.managed
                     ? t('services.managedNotice', { manager: result.manager ?? '' })
                     : t('services.started'), 'success');
                 return;
             }
             if (id === 'stop') {
                 const result = stopAll(config);
-                ctx.notify(result.managed
+                ctx.notify((t) => result.managed
                     ? t('services.managedNotice', { manager: result.manager ?? '' })
                     : t('services.stopped'), 'success');
                 return;
             }
             const result = restartAll(config);
-            ctx.notify(result.managed
+            ctx.notify((t) => result.managed
                 ? t('services.managedNotice', { manager: result.manager ?? '' })
                 : t('services.restarted'), 'success');
         });

package/dist/tui/screens/Wizard.js

@@ -50,8 +50,9 @@ export function Wizard({ ctx, onDone }) {
         let next = draft;
         for (const [id, value] of updates) {
             const result = setField(next, id, value);
-            if (result.errorKey) {
-                ctx.notify(t(result.errorKey), 'error');
+            const { errorKey } = result;
+            if (errorKey) {
+                ctx.notify((t) => t(errorKey), 'error');
                 return false;
             }
             next = result.draft;
@@ -102,7 +103,7 @@ export function Wizard({ ctx, onDone }) {
                 catch (error) {
                     // Keep-alive is a convenience; a container without systemd should not
                     // block a working setup.
-                    ctx.notify(t('keepalive.failed', { message: error.message }), 'error');
+                    ctx.notify((t) => t('keepalive.failed', { message: error.message }), 'error');
                 }
             }
             if (startNow && !keepaliveInstalled)
@@ -173,7 +174,7 @@ export function Wizard({ ctx, onDone }) {
     if (step === 'relayUrl') {
         return (_jsxs(Panel, { title: t('wizard.relayTitle'), children: [header, _jsx(FieldRow, { label: t('wizard.relayUrlLabel'), selected: true, onSelect: () => { }, children: _jsx(TextField, { value: draft.relay.remoteUrl, placeholder: "wss://relay.example.com", active: true, onSubmit: (value) => {
                             if (!value) {
-                                ctx.notify(t('error.remoteUrlRequired'), 'error');
+                                ctx.notify((t) => t('error.remoteUrlRequired'), 'error');
                                 return;
                             }
                             if (apply('remoteUrl', value))

package/dist/tui/screens/useRelayUpdate.js

@@ -0,0 +1,122 @@
+// The relay row on the About tab: check for, install and switch to a newer
+// relay. Only a machine that runs its own relay has one to update.
+import { useEffect, useState } from 'react';
+import { canSelfUpdate, checkForRelayUpdate, compareVersions, currentVersion, installKind, installedRelayVersion, performRelayUpdate, restartAll, runsLocalRelay, } from '../api.js';
+export function useRelayUpdate(ctx) {
+    const { t } = ctx;
+    const [state, setState] = useState({ phase: 'idle' });
+    const [source, setSource] = useState({
+        registry: '',
+        sources: [],
+    });
+    const visible = runsLocalRelay(ctx.config);
+    const installed = installedRelayVersion();
+    const health = ctx.status?.relay.health;
+    const running = typeof health?.version === 'string' ? health.version : null;
+    const busy = state.phase === 'checking' || state.phase === 'updating';
+    // Installed but not yet running: an update from here, or from npm by hand.
+    const restartNeeded = !busy &&
+        state.phase !== 'restarting' &&
+        !!installed &&
+        !!running &&
+        compareVersions(installed, running) > 0;
+    const applyCheck = (result) => {
+        setSource({ registry: result.registry ?? '', sources: result.sources ?? [] });
+        const latest = result.latest;
+        if (result.needsNewerCli)
+            setState({ phase: 'needsCli', latest });
+        else if (result.updateAvailable)
+            setState({ phase: 'available', latest });
+        else
+            setState({ phase: 'current', version: result.current });
+    };
+    // The TUI asked when it opened; start from that answer.
+    // biome-ignore lint/correctness/useExhaustiveDependencies: only a new answer from the opening check matters, not each render's applyCheck or phase
+    useEffect(() => {
+        if (ctx.relayUpdateCheck?.ok && state.phase === 'idle')
+            applyCheck(ctx.relayUpdateCheck);
+    }, [ctx.relayUpdateCheck]);
+    const check = async () => {
+        setState({ phase: 'checking' });
+        const result = await checkForRelayUpdate();
+        if (!result.ok) {
+            setState({ phase: 'error', messageKey: result.errorKey ?? 'update.errorNetwork' });
+            const { message } = result;
+            if (message)
+                ctx.notify((t) => t('update.errorNetworkDetail', { message }), 'error');
+            return;
+        }
+        ctx.setRelayUpdateCheck(result);
+        applyCheck(result);
+    };
+    const install = async (latest) => {
+        setState({ phase: 'updating', latest, attempt: 1 });
+        const result = await performRelayUpdate({
+            ...source,
+            relayVersion: latest,
+            onAttempt: ({ attempt }) => setState({ phase: 'updating', latest, attempt }),
+        });
+        if (!result.ok) {
+            const params = { version: currentVersion(), installed: result.installed ?? '' };
+            const messageKey = result.errorKey ?? 'update.errorFailed';
+            setState({ phase: 'error', messageKey, params });
+            const { summary } = result;
+            ctx.notify((t) => summary ? t('update.errorFailedDetail', { message: summary }) : t(messageKey, params), 'error');
+            return;
+        }
+        ctx.setRelayUpdateCheck(null);
+        setState({ phase: 'current', version: latest });
+    };
+    const restart = () => {
+        setState({ phase: 'restarting' });
+        ctx.run(() => {
+            restartAll(ctx.config);
+            const version = installed ?? '';
+            setState({ phase: 'current', version });
+            ctx.notify((t) => t('relayUpdate.restarted', { version }), 'success');
+        });
+    };
+    /** One row: restart onto a relay already installed, install one found, or check. */
+    const activate = () => {
+        if (busy || state.phase === 'restarting')
+            return;
+        if (restartNeeded) {
+            restart();
+            return;
+        }
+        if (state.phase === 'available') {
+            if (!canSelfUpdate()) {
+                setState({ phase: 'error', messageKey: `update.cannot.${installKind()}` });
+                return;
+            }
+            void install(state.latest);
+            return;
+        }
+        void check();
+    };
+    const label = (() => {
+        if (restartNeeded)
+            return t('relayUpdate.restart', { version: installed ?? '', running: running ?? '' });
+        switch (state.phase) {
+            case 'checking':
+                return t('relayUpdate.checking');
+            case 'current':
+                return t('relayUpdate.upToDate', { version: state.version });
+            case 'available':
+                return t('relayUpdate.available', { latest: state.latest, installed: installed ?? '?' });
+            case 'needsCli':
+                return t('relayUpdate.needsCli', { latest: state.latest });
+            case 'updating':
+                return state.attempt > 1
+                    ? t('relayUpdate.updatingRetry', { version: state.latest, attempt: state.attempt })
+                    : t('relayUpdate.updating', { version: state.latest });
+            case 'restarting':
+                return t('relayUpdate.restarting');
+            case 'error':
+                return t(state.messageKey, state.params);
+            default:
+                return t('relayUpdate.check', { version: installed ?? '?' });
+        }
+    })();
+    return { visible, installed, label, activate };
+}

package/dist/updater.js

@@ -165,13 +165,13 @@ async function fetchJson(url, { timeoutMs, fetchImpl }) {
  * format, which npmjs refuses on that path with a 406, so every check quietly
  * fell through to a mirror that had not synced the release yet.
  */
-async function askRegistry(registry, { timeoutMs, fetchImpl }) {
+async function askRegistry(registry, { timeoutMs, fetchImpl, packageName, }) {
     const endpoints = [
         {
-            url: `${registry}/-/package/${PACKAGE_NAME}/dist-tags`,
+            url: `${registry}/-/package/${packageName}/dist-tags`,
             read: (body) => body?.latest,
         },
-        { url: `${registry}/${PACKAGE_NAME}/latest`, read: (body) => body?.version },
+        { url: `${registry}/${packageName}/latest`, read: (body) => body?.version },
     ];
     let message = null;
     for (const endpoint of endpoints) {
@@ -199,11 +199,12 @@ async function askRegistry(registry, { timeoutMs, fetchImpl }) {
  * newest version, preferred order first, which is where an install should come
  * from; `behind` lists the ones that do not, so the screen can say why.
  */
-async function checkForUpdate({ timeoutMs = 6000, fetchImpl = globalThis.fetch, registries = registryCandidates(), } = {}) {
-    const current = currentVersion();
+async function checkForUpdate({ timeoutMs = 6000, fetchImpl = globalThis.fetch, registries = registryCandidates(), 
+// Another package this one installs, and the version of it on disk: the relay.
+packageName = PACKAGE_NAME, current = currentVersion(), } = {}) {
     const attempts = await Promise.all(registries.map(async (registry) => ({
         registry,
-        ...(await askRegistry(registry, { timeoutMs, fetchImpl })),
+        ...(await askRegistry(registry, { timeoutMs, fetchImpl, packageName })),
     })));
     const answers = attempts.filter((attempt) => attempt.ok);
     if (answers.length === 0) {

package/herdr-plugin.toml

@@ -1,6 +1,6 @@
 id = "herdr.remote.web"
 name = "Herdr Remote Web"
-version = "0.2.19"
+version = "0.2.21"
 min_herdr_version = "0.9.1"
 description = "Browser access to Herdr workspaces via local or self-hosted relay"
 platforms = ["linux", "macos"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdr-remote",
-  "version": "0.2.19",
+  "version": "0.2.21",
   "description": "Browser access to Herdr workspaces: plugin, host connector, and configuration TUI",
   "license": "MIT",
   "type": "module",