herdr-remote 0.2.20 → 0.2.22

package/dist/socket-discovery.js

@@ -5,12 +5,22 @@ function defaultSocketPath(env = process.env, platform = process.platform) {
     if (env.HERDR_SOCKET_PATH)
         return env.HERDR_SOCKET_PATH;
     if (platform === 'win32') {
-        const appData = env.APPDATA || path.join(os.homedir(), 'AppData', 'Roaming');
-        return path.join(appData, 'herdr', 'herdr.sock');
+        const configHome = env.XDG_CONFIG_HOME ||
+            env.APPDATA ||
+            (env.USERPROFILE && path.join(env.USERPROFILE, 'AppData', 'Roaming')) ||
+            path.join(os.homedir(), 'AppData', 'Roaming');
+        return path.join(configHome, 'herdr', 'herdr.sock');
     }
     const configHome = env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config');
     return path.join(configHome, 'herdr', 'herdr.sock');
 }
+/**
+ * On Windows, Herdr uses this path itself as the GenericNamespaced pipe name;
+ * the file only contains the `pid:nanos` marker.
+ */
+function herdrEndpoint(socketPath, platform = process.platform) {
+    return platform === 'win32' ? `\\\\.\\pipe\\${socketPath}` : socketPath;
+}
 function resolveSocketPath(configuredPath = null, env = process.env) {
     return configuredPath || env.HERDR_SOCKET_PATH || defaultSocketPath(env);
 }
@@ -20,9 +30,11 @@ function inspectSocket(socketPath, options = {}) {
     }
     try {
         const stat = fs.statSync(socketPath);
+        // Herdr leaves an ordinary marker file on Windows and connects through the pipe named by its path.
         if (process.platform !== 'win32' && !stat.isSocket()) {
             return { ok: false, reason: 'path is not a Unix socket', path: socketPath };
         }
+        // Windows has no per-process uid to compare, so ownership checks naturally skip there.
         if (options.requireOwner !== false &&
             typeof process.getuid === 'function' &&
             stat.uid !== process.getuid()) {
@@ -45,4 +57,4 @@ function inspectSocket(socketPath, options = {}) {
         };
     }
 }
-export { defaultSocketPath, resolveSocketPath, inspectSocket };
+export { defaultSocketPath, herdrEndpoint, resolveSocketPath, inspectSocket };

package/dist/supervisor.js

@@ -133,6 +133,7 @@ class Supervisor {
             child = spawn(entry.spec.command, entry.spec.args, {
                 cwd: PACKAGE_ROOT,
                 env: { ...baseEnvironment(), ...entry.spec.env },
+                windowsHide: true,
                 stdio,
             });
         }

package/dist/terminal-font/deps.js

@@ -19,7 +19,11 @@ export const GENERIC_FAMILIES = new Set([
 ]);
 export function defaultRun(command, args) {
     try {
-        const result = spawnSync(command, args, { encoding: 'utf8', timeout: COMMAND_TIMEOUT_MS });
+        const result = spawnSync(command, args, {
+            encoding: 'utf8',
+            timeout: COMMAND_TIMEOUT_MS,
+            windowsHide: true,
+        });
         return { status: result.status, stdout: result.stdout || '' };
     }
     catch {
@@ -60,6 +64,12 @@ export function configHome(deps) {
 export function dataHome(deps) {
     return deps.env.XDG_DATA_HOME || path.join(deps.home, '.local', 'share');
 }
+export function localAppData(deps) {
+    return deps.env.LOCALAPPDATA || path.join(deps.home, 'AppData', 'Local');
+}
+export function roamingAppData(deps) {
+    return deps.env.APPDATA || path.join(deps.home, 'AppData', 'Roaming');
+}
 export function expandHome(filePath, deps) {
     return filePath.startsWith('~/') ? path.join(deps.home, filePath.slice(2)) : filePath;
 }

package/dist/terminal-font/files.js

@@ -4,7 +4,7 @@ import crypto from 'node:crypto';
 import fs from 'node:fs';
 import path from 'node:path';
 import { MAX_TERMINAL_FONT_BYTES, TERMINAL_FONT_STYLES, } from 'herdr-remote-relay/protocol';
-import { GENERIC_FAMILIES, withDefaults } from './deps.js';
+import { GENERIC_FAMILIES, localAppData, withDefaults } from './deps.js';
 const FACE_PATTERNS = {
     regular: ':weight=regular:slant=roman',
     bold: ':weight=bold:slant=roman',
@@ -117,12 +117,15 @@ function readSfntNames(filePath) {
             }
     }
 }
-function macFontFiles(deps) {
-    const roots = [
-        path.join(deps.home, 'Library', 'Fonts'),
-        '/Library/Fonts',
-        '/System/Library/Fonts',
-    ];
+function fontFolderFiles(deps) {
+    const roots = deps.platform === 'darwin'
+        ? [path.join(deps.home, 'Library', 'Fonts'), '/Library/Fonts', '/System/Library/Fonts']
+        : deps.platform === 'win32'
+            ? [
+                path.join(deps.env.WINDIR || deps.env.SystemRoot || 'C:\\Windows', 'Fonts'),
+                path.join(localAppData(deps), 'Microsoft', 'Windows', 'Fonts'),
+            ]
+            : [];
     const files = [];
     const walk = (directory, depth) => {
         let entries;
@@ -161,7 +164,7 @@ export function familyForPostScriptName(postscript, deps) {
         return listed.stdout.trim().split('\n')[0].split(',')[0].trim();
     if (deps.platform !== 'darwin')
         return null;
-    for (const file of macFontFiles(deps)) {
+    for (const file of fontFolderFiles(deps)) {
         const names = readSfntNames(file);
         if (names?.postscript === postscript)
             return names.family;
@@ -202,9 +205,9 @@ function locateFaceFiles(family, deps) {
             continue;
         located[style] = file;
     }
-    if (fontconfig || deps.platform !== 'darwin')
+    if (fontconfig || (deps.platform !== 'darwin' && deps.platform !== 'win32'))
         return located;
-    for (const file of macFontFiles(deps)) {
+    for (const file of fontFolderFiles(deps)) {
         const names = readSfntNames(file);
         if (!names || names.family?.toLowerCase() !== family.toLowerCase())
             continue;

package/dist/terminal-font/readers.js

@@ -1,7 +1,7 @@
 // Each terminal's own settings, read the way that terminal reads them.
 import path from 'node:path';
 import { parseBinaryPlist, unarchiveKeyed } from '../binary-plist.js';
-import { configHome, dataHome, expandHome, pointsToPx, positiveNumber, } from './deps.js';
+import { configHome, dataHome, expandHome, localAppData, pointsToPx, positiveNumber, roamingAppData, } from './deps.js';
 import { familyForPostScriptName } from './files.js';
 import { firstCssFamily, optionValue, parseFontconfigPattern, parseGVariantString, parseIni, parseJsonc, parsePangoFontDescription, parseQtFontString, parseTomlSubset, parseXFontName, xResource, xrmResources, } from './formats.js';
 function gsettingsGet(deps, schema, key) {
@@ -25,7 +25,54 @@ function readGSettingsProfileFont(deps, { schema, path: profilePath, fontKey = '
 function systemMonospaceFont(deps) {
     return parsePangoFontDescription(parseGVariantString(gsettingsGet(deps, 'org.gnome.desktop.interface', 'monospace-font-name')));
 }
+function settingsObject(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value)
+        ? value
+        : null;
+}
+function windowsTerminalProfileFont(profile) {
+    const values = settingsObject(profile);
+    const font = settingsObject(values?.font);
+    return {
+        family: firstCssFamily(font?.face) || firstCssFamily(values?.fontFace),
+        size: positiveNumber(font?.size) || positiveNumber(values?.fontSize),
+    };
+}
+function readWindowsTerminalFont(deps) {
+    const local = localAppData(deps);
+    let settings = null;
+    for (const file of [
+        path.join(local, 'Packages', 'Microsoft.WindowsTerminal_8wekyb3d8bbwe', 'LocalState', 'settings.json'),
+        path.join(local, 'Packages', 'Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe', 'LocalState', 'settings.json'),
+        path.join(local, 'Microsoft', 'Windows Terminal', 'settings.json'),
+    ]) {
+        settings = parseJsonc(deps.readFile(file));
+        if (settings)
+            break;
+    }
+    if (!settings)
+        return null;
+    const profiles = settings.profiles;
+    const profileSettings = settingsObject(profiles);
+    const list = Array.isArray(profiles)
+        ? profiles
+        : Array.isArray(profileSettings?.list)
+            ? profileSettings.list
+            : [];
+    const guidOf = (profile) => String(settingsObject(profile)?.guid || '').toLowerCase();
+    const currentId = String(deps.env.WT_PROFILE_ID || '').toLowerCase();
+    const defaultId = String(settings.defaultProfile || '').toLowerCase();
+    const selected = (currentId ? list.find((profile) => guidOf(profile) === currentId) : undefined) ||
+        (defaultId ? list.find((profile) => guidOf(profile) === defaultId) : undefined);
+    const selectedFont = windowsTerminalProfileFont(selected);
+    const defaults = windowsTerminalProfileFont(profileSettings?.defaults);
+    // These are Windows Terminal's own defaults when settings omit the values.
+    const family = selectedFont.family || defaults.family || 'Cascadia Mono';
+    const size = selectedFont.size || defaults.size || 12;
+    return { family, sizePx: pointsToPx(size) };
+}
 export const READERS = {
+    'windows-terminal': readWindowsTerminalFont,
     'gnome-terminal': (deps) => {
         const id = parseGVariantString(gsettingsGet(deps, 'org.gnome.Terminal.ProfilesList', 'default'));
         if (!id)
@@ -111,6 +158,9 @@ export const READERS = {
     },
     alacritty: (deps) => {
         const candidates = [
+            ...(deps.platform === 'win32'
+                ? [path.join(roamingAppData(deps), 'alacritty', 'alacritty.toml')]
+                : []),
             path.join(configHome(deps), 'alacritty', 'alacritty.toml'),
             path.join(configHome(deps), 'alacritty.toml'),
             path.join(deps.home, '.alacritty.toml'),
@@ -212,7 +262,9 @@ export const READERS = {
     vscode: (deps) => {
         const base = deps.platform === 'darwin'
             ? path.join(deps.home, 'Library', 'Application Support')
-            : configHome(deps);
+            : deps.platform === 'win32'
+                ? roamingAppData(deps)
+                : configHome(deps);
         for (const product of ['Code', 'Cursor', 'Code - Insiders', 'VSCodium', 'Windsurf']) {
             const settings = parseJsonc(deps.readFile(path.join(base, product, 'User', 'settings.json')));
             if (!settings)
@@ -225,7 +277,12 @@ export const READERS = {
             if (family)
                 return { family, sizePx };
         }
-        return { family: deps.platform === 'darwin' ? 'Menlo' : 'Droid Sans Mono', sizePx: 14 };
+        const family = deps.platform === 'darwin'
+            ? 'Menlo'
+            : deps.platform === 'win32'
+                ? 'Consolas'
+                : 'Droid Sans Mono';
+        return { family, sizePx: 14 };
     },
     iterm2: (deps) => {
         const prefs = readPreferences('com.googlecode.iterm2', deps);

package/dist/terminal-font/terminals.js

@@ -64,6 +64,9 @@ export function identifyTerminal({ env = process.env, ancestry = [], } = {}) {
         return 'gnome-terminal';
     if (/^rxvt-unicode/.test(env.TERM || ''))
         return 'urxvt';
+    // WT_SESSION is inherited by nested terminals, so specific terminal markers win first.
+    if (env.WT_SESSION)
+        return 'windows-terminal';
     // Last: a terminal started from xterm inherits this too.
     if (env.XTERM_VERSION)
         return 'xterm';

package/dist/terminal-palette.js

@@ -115,7 +115,11 @@ function paletteFromEnvironment(env = process.env) {
     }
 }
 function runStty(args, ttyPath) {
-    return spawnSync('stty', [...args, '-F', ttyPath], { encoding: 'utf8', timeout: 1000 });
+    return spawnSync('stty', [...args, '-F', ttyPath], {
+        encoding: 'utf8',
+        timeout: 1000,
+        windowsHide: true,
+    });
 }
 /**
  * Takes one reply out of the buffered bytes, leaving the rest.
@@ -131,6 +135,17 @@ function takeOscColorReply(state, expectedPrefix) {
     state.pending = state.pending.slice(0, found.start) + state.pending.slice(found.end);
     return found.color;
 }
+const PALETTE_QUERIES = [
+    { query: '\x1b]10;?\x1b\\', prefix: '\x1b]10', paletteKey: 'foreground' },
+    { query: '\x1b]11;?\x1b\\', prefix: '\x1b]11', paletteKey: 'background' },
+    { query: '\x1b]12;?\x1b\\', prefix: '\x1b]12', paletteKey: 'cursor' },
+    ...ANSI_KEYS.map((ansiKey, slot) => ({
+        query: `\x1b]4;${slot};?\x1b\\`,
+        prefix: `\x1b]4;${slot}`,
+        paletteKey: 'ansi',
+        ansiKey,
+    })),
+];
 /**
  * Runs the color conversation over an injected `ask(query, prefix)`.
  *
@@ -150,21 +165,17 @@ function takeOscColorReply(state, expectedPrefix) {
  */
 function collectPalette(ask) {
     const palette = {};
-    const foreground = ask('\x1b]10;?\x1b\\', '\x1b]10');
-    if (foreground)
-        palette.foreground = foreground;
-    const background = ask('\x1b]11;?\x1b\\', '\x1b]11');
-    if (background)
-        palette.background = background;
-    const cursor = ask('\x1b]12;?\x1b\\', '\x1b]12');
-    if (cursor)
-        palette.cursor = cursor;
     const ansi = {};
-    for (let slot = 0; slot < ANSI_SLOTS; slot += 1) {
-        const color = ask(`\x1b]4;${slot};?\x1b\\`, `\x1b]4;${slot}`);
-        if (!color)
-            break;
-        ansi[ANSI_KEYS[slot]] = color;
+    for (const query of PALETTE_QUERIES) {
+        const color = ask(query.query, query.prefix);
+        if (query.paletteKey === 'ansi') {
+            if (!color)
+                break;
+            ansi[query.ansiKey] = color;
+        }
+        else if (color) {
+            palette[query.paletteKey] = color;
+        }
     }
     if (Object.keys(ansi).length === ANSI_SLOTS)
         palette.ansi = ansi;
@@ -251,6 +262,55 @@ function probeTerminalPalette({ ttyPath = '/dev/tty', timeoutMs = TOTAL_TIMEOUT_
         }
     }
 }
+/** Queries Windows Terminal through the raw stdin stream, whose replies are VT bytes. */
+async function probeConsolePalette({ input = process.stdin, output = process.stdout, timeoutMs = TOTAL_TIMEOUT_MS, } = {}) {
+    if (!input.isTTY || !output.isTTY)
+        return null;
+    const state = { pending: '', overallDeadline: Date.now() + timeoutMs };
+    let listener = null;
+    let timer;
+    try {
+        input.setRawMode(true);
+        await new Promise((resolve) => {
+            let finished = false;
+            const finish = () => {
+                if (finished)
+                    return;
+                finished = true;
+                resolve();
+            };
+            listener = (chunk) => {
+                state.pending += typeof chunk === 'string' ? chunk : chunk.toString('latin1');
+                if (/\x1b\[\?[\d;]*c/.test(state.pending))
+                    finish();
+            };
+            input.on('data', listener);
+            input.resume();
+            timer = setTimeout(finish, Math.max(0, state.overallDeadline - Date.now()));
+            // Windows has no /dev/tty-style synchronous read with a timeout. Terminals
+            // answer in order, so DA1 confirms all earlier color replies arrived.
+            output.write(`${PALETTE_QUERIES.map(({ query }) => query).join('')}\x1b[c`);
+        });
+        return collectPalette((_query, prefix) => takeOscColorReply(state, prefix));
+    }
+    catch {
+        // A broken or disconnected console must not prevent the CLI from starting.
+        return null;
+    }
+    finally {
+        if (timer)
+            clearTimeout(timer);
+        if (listener)
+            input.removeListener('data', listener);
+        try {
+            input.setRawMode(false);
+        }
+        catch {
+            // A closed console can reject mode restoration, but pausing still releases the stream.
+        }
+        input.pause();
+    }
+}
 /**
  * Remembers a palette for the next start that has no terminal to ask.
  *
@@ -297,13 +357,13 @@ function resolveHostPalette({ env = process.env, probe = probeTerminalPalette, }
  * the very start of the command, means every later caller in this process tree
  * simply inherits the answer through the environment.
  */
-function captureTerminalPalette({ env = process.env, probe = probeTerminalPalette, } = {}) {
+async function captureTerminalPalette({ env = process.env, probe = probeTerminalPalette, platform = process.platform, consoleProbe = probeConsolePalette, } = {}) {
     if (env.HERDR_TERM_PALETTE_JSON)
         return paletteFromEnvironment(env);
     // Without both ends on a terminal there is nobody to answer the query.
     if (!process.stdin.isTTY || !process.stdout.isTTY)
         return null;
-    const palette = probe();
+    const palette = platform === 'win32' ? await consoleProbe() : probe();
     if (!palette)
         return null;
     env.HERDR_TERM_PALETTE_JSON = JSON.stringify(palette);
@@ -336,4 +396,4 @@ function hostTerminalPalette({ refresh = false } = {}) {
     cachedHostPalette = probed ? rememberTerminalPalette(probed) : rememberedTerminalPalette();
     return cachedHostPalette;
 }
-export { ANSI_KEYS, ANSI_SLOTS, parseXColor, parseOscColorReply, takeOscColorReply, collectPalette, sanitizePalette, paletteFromEnvironment, probeTerminalPalette, resolveHostPalette, hostTerminalPalette, captureTerminalPalette, rememberTerminalPalette, rememberedTerminalPalette, };
+export { ANSI_KEYS, ANSI_SLOTS, parseXColor, parseOscColorReply, takeOscColorReply, collectPalette, sanitizePalette, paletteFromEnvironment, probeTerminalPalette, probeConsolePalette, resolveHostPalette, hostTerminalPalette, captureTerminalPalette, rememberTerminalPalette, rememberedTerminalPalette, };

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

@@ -4,8 +4,9 @@
 // shared with the CLI. Funnelling it through one module gives the screens a
 // single surface to call.
 import { OFFICIAL_RELAY_URL, configExists, loadConfig } from '../config.js';
+export { KEEPALIVE_MANAGERS } 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';
@@ -13,10 +14,11 @@ import { createDraft, fieldsForMode, getField, getFieldPlaceholder, isOfficialRe
 import { extractPairingCode, requestJson } from '../relay-client.js';
 import { ensureRuntime, regenerateHostIdentity, setRelayPassword } from '../runtime.js';
 import { pair, readLogTail } from '../service.js';
-import { fullStatus, restartAll, startAll, stopAll } from '../lifecycle.js';
+import { fullStatus, restartAll, startAll, stopAll, whileServicesStopped } 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, whileServicesStopped, };
 /** 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,8 +2,9 @@ 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';
+import { canSelfUpdate, checkForUpdate, configPath, currentVersion, detectLocale, installKind, performUpdate, saveDraft, setField, stateDir, whileServicesStopped, } from '../api.js';
 /** `https://registry.npmmirror.com` → `registry.npmmirror.com`, for one line of text. */
 const registryHost = (registry) => registry.replace(/^https?:\/\//, '');
 export function About({ ctx }) {
@@ -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);
@@ -85,17 +92,17 @@ export function About({ ctx }) {
     };
     const runUpdate = async (latest) => {
         setUpdate({ phase: 'updating', latest, attempt: 1 });
-        const result = await performUpdate({
+        const result = await whileServicesStopped(ctx.config, () => performUpdate({
             registry: checkRef.current.registry,
             sources: checkRef.current.sources,
             version: latest,
             onAttempt: ({ attempt }) => setUpdate({ phase: 'updating', latest, attempt }),
-        });
+        }));
         if (!result.ok) {
             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' })] }));
 }