herdr-remote 0.2.26 → 0.2.28

package/dist/connector/elevatedPty.js

@@ -1,54 +1,46 @@
-import net from 'node:net';
-import { ADMIN_BROKER_MAX_MESSAGE_BYTES, adminBrokerPipePath, sendAdminBrokerMessage, } from './adminBrokerPipe.js';
+import { ADMIN_BROKER_MAX_MESSAGE_BYTES, connectAdminBroker, sendAdminBrokerMessage, } from './adminBrokerEndpoint.js';
 const BROKER_CONNECT_TIMEOUT_MS = 5_000;
+/** A PTY the admin broker runs elevated, driven over its loopback socket. */
 export class ElevatedPty {
-    pid = 0;
-    cols;
-    rows;
     socket = null;
     input = '';
     connected = false;
     started = false;
     finished = false;
     killed = false;
+    /** Keystrokes typed while the elevated shell was still starting. */
+    early = [];
     dataListener = null;
     exitListener = null;
-    readyListener = null;
     errorListener = null;
     options;
-    constructor(options, cols, rows) {
+    constructor(options) {
         this.options = options;
-        this.cols = cols;
-        this.rows = rows;
     }
-    onData(listener) {
-        this.dataListener = listener;
-    }
-    onExit(listener) {
-        this.exitListener = listener;
-    }
-    start({ cols, rows, onData, onExit, onReady, onError }) {
-        this.cols = cols;
-        this.rows = rows;
+    start({ cols, rows, onData, onExit, onError }) {
         this.dataListener = onData;
         this.exitListener = onExit;
-        this.readyListener = onReady || null;
-        this.errorListener = onError || null;
-        const socket = net.createConnection(adminBrokerPipePath());
+        this.errorListener = onError;
+        let broker;
+        try {
+            broker = connectAdminBroker();
+        }
+        catch (error) {
+            this.fail(error);
+            return;
+        }
+        const { socket, token } = broker;
         this.socket = socket;
         socket.setEncoding('utf8');
         socket.setTimeout(BROKER_CONNECT_TIMEOUT_MS, () => {
-            socket.destroy(new Error('Administrator terminal broker connection timed out'));
+            socket.destroy(Object.assign(new Error('Administrator terminal broker connection timed out'), {
+                code: 'ETIMEDOUT',
+            }));
         });
         socket.on('connect', () => {
             this.connected = true;
             socket.setTimeout(0);
-            sendAdminBrokerMessage(socket, {
-                type: 'start',
-                ...this.options,
-                cols: this.cols,
-                rows: this.rows,
-            });
+            sendAdminBrokerMessage(socket, { type: 'start', token, ...this.options, cols, rows });
         });
         socket.on('data', (chunk) => this.receive(chunk));
         socket.on('error', (error) => this.fail(error));
@@ -60,7 +52,13 @@ export class ElevatedPty {
         });
     }
     write(data) {
-        if (this.started && !this.finished && this.socket?.writable) {
+        if (this.finished)
+            return;
+        if (!this.started) {
+            this.early.push(Buffer.from(data));
+            return;
+        }
+        if (this.socket?.writable) {
             sendAdminBrokerMessage(this.socket, {
                 type: 'input',
                 dataBase64: Buffer.from(data).toString('base64'),
@@ -68,15 +66,12 @@ export class ElevatedPty {
         }
     }
     resize(cols, rows) {
-        this.cols = cols;
-        this.rows = rows;
         if (this.started && this.socket?.writable) {
             sendAdminBrokerMessage(this.socket, { type: 'resize', cols, rows });
         }
     }
     kill() {
         this.killed = true;
-        this.pid = 0;
         if (!this.socket)
             return;
         if (this.connected && this.socket.writable) {
@@ -109,15 +104,16 @@ export class ElevatedPty {
             }
             if (message.type === 'started') {
                 this.started = true;
-                this.pid = Number(message.pid) || 0;
-                this.readyListener?.();
+                const early = Buffer.concat(this.early);
+                this.early = [];
+                if (early.length > 0)
+                    this.write(early);
             }
             else if (message.type === 'data' && typeof message.dataBase64 === 'string') {
                 this.dataListener?.(Buffer.from(message.dataBase64, 'base64').toString('utf8'));
             }
             else if (message.type === 'exit') {
                 this.finished = true;
-                this.pid = 0;
                 this.exitListener?.({
                     exitCode: Number(message.exitCode) || 0,
                     ...(typeof message.signal === 'number' ? { signal: message.signal } : {}),

package/dist/connector/host-connector.js

@@ -13,6 +13,7 @@ import { hostWebSocketUrl, resolveHostRelayUrl } from '../relay-urls.js';
 import { resolveSocketPath } from '../socket-discovery.js';
 import { resolveHostPalette } from '../terminal-palette.js';
 import { randomToken } from 'herdr-remote-relay/state';
+import { openAdminTabFor } from './admin-tab.js';
 import { AgentWatch } from './agent-watch.js';
 import { FontServer } from './font-server.js';
 import { acquireHostLock, releaseHostLock } from './lock.js';
@@ -196,7 +197,7 @@ export class HostConnector {
                     CAPABILITY.hostHandoff,
                     CAPABILITY.idleHeartbeat,
                     CAPABILITY.binaryFrameV2,
-                    ...(process.platform === 'win32' ? [CAPABILITY.adminSessions] : []),
+                    ...(process.platform === 'win32' ? [CAPABILITY.adminTabs] : []),
                 ],
             });
             // The relay sends host_ready with the current browser count. No business
@@ -283,6 +284,12 @@ export class HostConnector {
                 return this.startSession(message);
             case 'herdr_start':
                 return this.sessions.startHerdrFor(streamOf(message));
+            case 'admin_tab_open':
+                return openAdminTabFor(streamOf(message), {
+                    socketPath: this.socketPath,
+                    language: this.config.ui?.language,
+                    send: (payload) => sendJson(this.ws, payload),
+                });
             case 'session_stop': {
                 const streamId = streamOf(message);
                 if (streamId)

package/dist/connector/sessions.js

@@ -105,10 +105,6 @@ export class Sessions {
         if (!streamId)
             return undefined;
         this.stop(streamId);
-        if (message.adminTerminal) {
-            this.spawn(message);
-            return undefined;
-        }
         const missingHerdr = this.ensureHerdrCommand();
         if (missingHerdr) {
             process.stderr.write(`herdr-remote host connector: ${missingHerdr}\n`);
@@ -204,15 +200,11 @@ export class Sessions {
     spawn(message) {
         const streamId = streamOf(message);
         const streamIndex = typeof message.streamIndex === 'number' ? message.streamIndex : null;
-        const adminTerminal = message.adminTerminal === true;
-        // The normal Herdr server keeps its original token, so admin mode needs its own shell.
         const pty = new this.Pty({
-            command: adminTerminal ? 'powershell.exe' : this.herdrCommand,
-            args: adminTerminal ? ['-NoLogo', '-NoProfile'] : this.herdrArgs,
+            command: this.herdrCommand,
+            args: this.herdrArgs,
             cwd: this.cwd,
-            socketPath: adminTerminal ? null : this.socketPath,
-            adminTerminal,
-            fastWindowsPty: adminTerminal,
+            socketPath: this.socketPath,
         });
         const session = {
             id: streamId,
@@ -243,29 +235,6 @@ export class Sessions {
                 ? packStreamFrameV2(FRAME_TYPE_OUTPUT, session.streamIndex, payload)
                 : packStreamFrame('output', streamId, payload));
         };
-        let readySent = false;
-        const reportReady = () => {
-            if (readySent || this.byStream.get(streamId) !== session)
-                return;
-            readySent = true;
-            this.link.send({ type: 'session_ready', clientId: streamId });
-        };
-        const reportStartError = (error) => {
-            if (this.byStream.get(streamId) !== session)
-                return;
-            this.forget(session);
-            session.pty.kill();
-            const code = error.code;
-            const brokerUnavailable = session.pty.adminTerminal &&
-                (code === 'ENOENT' || code === 'ECONNREFUSED' || code === 'ETIMEDOUT');
-            this.sendError(streamId, brokerUnavailable ? 'admin_broker_unavailable' : 'pty_start_failed', brokerUnavailable
-                ? 'Run herdr-remote admin-broker install once from an administrator terminal.'
-                : error.message);
-            this.link.changed();
-        };
-        this.byStream.set(streamId, session);
-        if (streamIndex !== null)
-            this.streamIndexToId.set(streamIndex, streamId);
         try {
             pty.start({
                 cols: session.cols,
@@ -291,16 +260,18 @@ export class Sessions {
                     this.reportExit(session, exitCode);
                     this.link.changed();
                 },
-                onReady: reportReady,
-                onError: reportStartError,
             });
-            if (!adminTerminal)
-                reportReady();
         }
         catch (error) {
-            reportStartError(error);
+            discardOutput(session);
+            this.sendError(streamId, 'pty_start_failed', error.message);
+            pty.kill();
             return;
         }
+        this.byStream.set(streamId, session);
+        if (streamIndex !== null)
+            this.streamIndexToId.set(streamIndex, streamId);
+        this.link.send({ type: 'session_ready', clientId: streamId });
         this.link.changed();
     }
     /**

package/dist/connector/update-report.js

@@ -54,6 +54,8 @@ export class UpdateReport {
                 updateAvailable: compareVersions(result.latest, running) > 0,
                 // Updated on disk, still running the old code: a restart finishes it.
                 restartPending: compareVersions(installed, running) > 0,
+                // Older connectors leave this out, and their windows keep the npm steps.
+                updateCommand: true,
             });
         })
             .catch(() => {

package/dist/i18n/en.js

@@ -86,6 +86,7 @@ const en = {
     'services.logHost': 'Host connector',
     'adminBroker.windowsOnly': 'The administrator terminal broker only runs on Windows.',
     'adminBroker.needsElevation': 'Open the Windows TUI and choose Set up admin terminal access. Approve the one-time Windows prompt under the same account as Herdr Remote.',
+    'adminBroker.busy': 'An admin terminal is open; close it before restarting the broker.',
     'adminBroker.title': 'Admin terminal broker',
     'adminBroker.checking': 'Checking…',
     'adminBroker.ready': 'Ready',
@@ -97,6 +98,9 @@ const en = {
     'adminBroker.elevationCancelled': 'Administrator approval was declined; no changes were made.',
     'adminBroker.setupFailed': 'Could not configure the administrator terminal broker.',
     'adminBroker.tuiHint': 'Set this up once. Windows asks for administrator approval; later WebUI admin terminals open without UAC.',
+    'adminShell.needsTerminal': 'admin-shell must run in a terminal.',
+    'adminShell.brokerUnavailable': 'The administrator terminal broker is not running. Open the herdr-remote TUI, go to Keep-alive, and choose Set up admin terminal access.',
+    'adminShell.tabLabel': 'Admin',
     'relay.title': 'Relay settings',
     'relay.settings': 'Settings',
     'relay.locked': 'fixed',
@@ -241,6 +245,14 @@ 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',
+    'update.stoppingServices': 'Stopping services while npm replaces their files…',
+    'update.restarting': 'Restarting services on the new release…',
+    'update.notRunning': 'Services were not running and were left stopped. Start them with: herdr-remote start',
+    'update.restartFailed': 'Installed, but the services did not restart: {message}',
+    'update.brokerRestarted': 'Admin terminal broker restarted.',
+    'update.brokerRestartFailed': 'The admin terminal broker did not start again. Sign out of Windows and back in, or run herdr-remote admin-broker restart.',
+    'update.brokerBusy': 'An admin terminal is open, so the broker keeps running the previous release. Close admin terminals, then run herdr-remote admin-broker restart.',
+    'update.errorBusy': "A process still holds the herdr-remote folder; an admin terminal broker set up by an older release does. In an administrator PowerShell run: Get-ScheduledTask -TaskName 'HerdrRemoteAdminBroker-*' | Stop-ScheduledTask. Then run herdr-remote update again here, and afterwards herdr-remote admin-broker install as administrator.",
     'relayUpdate.check': 'Relay {version}: check for updates',
     'relayUpdate.checking': 'Relay: checking npm…',
     'relayUpdate.upToDate': 'Relay up to date ({version})',
@@ -251,6 +263,7 @@ const en = {
     '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.done': 'Relay updated to {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.',
 };

package/dist/i18n/zh.js

@@ -85,6 +85,7 @@ const zh = {
     'services.logHost': '主机连接器',
     'adminBroker.windowsOnly': '管理员终端 broker 只支持 Windows。',
     'adminBroker.needsElevation': '请打开 Windows TUI 并选择“设置管理员终端”，使用运行 Herdr Remote 的同一账户批准一次 Windows 提权提示。',
+    'adminBroker.busy': '有管理员终端开着，请先关闭再重启 broker。',
     'adminBroker.title': '管理员终端 broker',
     'adminBroker.checking': '正在检查…',
     'adminBroker.ready': '已就绪',
@@ -96,6 +97,9 @@ const zh = {
     'adminBroker.elevationCancelled': '未批准管理员权限，未进行更改。',
     'adminBroker.setupFailed': '管理员终端 broker 设置失败。',
     'adminBroker.tuiHint': '只需设置一次。Windows 会请求管理员授权；之后 WebUI 新建管理员终端不再弹出 UAC。',
+    'adminShell.needsTerminal': 'admin-shell 必须在终端中运行。',
+    'adminShell.brokerUnavailable': '管理员终端 broker 尚未运行。请打开 herdr-remote TUI，进入「保活」并选择「设置管理员终端」。',
+    'adminShell.tabLabel': '管理员',
     'relay.title': 'Relay 设置',
     'relay.settings': '设置',
     'relay.locked': '固定',
@@ -240,6 +244,14 @@ const zh = {
     'update.mirrorBehind': '{registries} 仍是旧版本，将从 {source} 安装',
     'update.cannot.source': '源码目录运行，请使用 git 更新',
     'update.cannot.linked': 'npm link 工作副本，由 npm link 管理',
+    'update.stoppingServices': '替换文件期间先停止服务…',
+    'update.restarting': '正在用新版本重启服务…',
+    'update.notRunning': '服务之前没有运行，保持停止。需要时执行：herdr-remote start',
+    'update.restartFailed': '已安装，但服务没能重启：{message}',
+    'update.brokerRestarted': '管理员终端 broker 已重启。',
+    'update.brokerRestartFailed': '管理员终端 broker 没有重新启动。重新登录 Windows，或运行 herdr-remote admin-broker restart。',
+    'update.brokerBusy': '有管理员终端开着，broker 继续运行旧版本。关闭所有管理员终端后运行 herdr-remote admin-broker restart。',
+    'update.errorBusy': "仍有进程占用 herdr-remote 的安装目录，旧版本设置的管理员终端 broker 会这样。先在管理员 PowerShell 中执行：Get-ScheduledTask -TaskName 'HerdrRemoteAdminBroker-*' | Stop-ScheduledTask，再回到这里重新运行 herdr-remote update，最后以管理员身份运行 herdr-remote admin-broker install。",
     'relayUpdate.check': 'Relay {version}：检查更新',
     'relayUpdate.checking': 'Relay：查询 npm 中…',
     'relayUpdate.upToDate': 'Relay 已是最新（{version}）',
@@ -250,6 +262,7 @@ const zh = {
     'relayUpdate.restart': 'Relay {version} 已安装，运行中的仍是 {running}（按 Enter 重启生效）',
     'relayUpdate.restarting': '正在重启 herdr-remote…',
     'relayUpdate.restarted': 'herdr-remote 已重启，relay 现在运行 {version}。',
+    'relayUpdate.done': 'Relay 已更新至 {version}',
     'relayUpdate.errorNotApplied': 'npm 已完成，但安装的仍是 relay {installed}',
     'relayUpdate.banner': 'Relay {latest} 已发布（当前 {current}），按 7 进入「语言与关于」，在 Relay 一行按 Enter 安装。',
 };

package/dist/keepalive/detached.js

@@ -5,7 +5,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { ensureDir, readJson, writeJsonAtomic } from 'herdr-remote-relay/state';
 import { pidAlive } from '../lib/process.js';
-import { logPath, PACKAGE_ROOT, stateDir } from '../paths.js';
+import { logPath, stateDir } from '../paths.js';
 import { cliEntryPoint, serviceEnvironment } from './environment.js';
 function fallbackPidPath() {
     return path.join(stateDir(), 'supervisor.pid');
@@ -22,7 +22,8 @@ function start() {
     const logFd = fs.openSync(logPath('supervisor'), 'a');
     try {
         const child = spawn(process.execPath, [cliEntryPoint(), 'run', '--daemon'], {
-            cwd: PACKAGE_ROOT,
+            // Not PACKAGE_ROOT: npm renames it to update, which Windows refuses for a working directory.
+            cwd: stateDir(),
             env: { ...process.env, HERDR_REMOTE_SERVICE: '1', ...serviceEnvironment() },
             detached: true,
             windowsHide: true,

package/dist/lifecycle.js

@@ -49,8 +49,12 @@ function restartAll(config = loadConfig()) {
     }
     return { ...restartServices(), managed: false };
 }
+/** Whether the host connector is up, under a keep-alive manager or detached. */
+function servicesRunning(config = loadConfig()) {
+    return Boolean(managerInUse(config)?.active || pidAlive(readRuntime().hostPid));
+}
 /** Stop Windows keep-alive processes while npm replaces their package files. */
-async function whileServicesStopped(config, task, { platform = process.platform, isRunning = () => Boolean(managerInUse(config)?.active || pidAlive(readRuntime().hostPid)), stop = stopAll, start = startAll, } = {}) {
+async function whileServicesStopped(config, task, { platform = process.platform, isRunning = () => servicesRunning(config), stop = stopAll, start = startAll, } = {}) {
     if (platform !== 'win32' || !isRunning())
         return task();
     await stop(config);
@@ -70,4 +74,4 @@ async function fullStatus(config = loadConfig()) {
         logsHint: keepalive.logsHint(config),
     };
 }
-export { startAll, stopAll, restartAll, fullStatus, managerInUse, whileServicesStopped };
+export { startAll, stopAll, restartAll, fullStatus, managerInUse, servicesRunning, whileServicesStopped, };

package/dist/node-pty-loader.js

@@ -0,0 +1,80 @@
+// Where node-pty is loaded from.
+//
+// npm updates this package by renaming its directory and deleting the old one,
+// and Windows refuses both while a process has a file in it loaded: node-pty's
+// .node modules, or the OpenConsole.exe that ConPTY starts from beside them.
+// The host connector and the admin broker hold those for as long as they run,
+// so on Windows node-pty is loaded from a copy in the state directory, one per
+// build. Copies are never deleted: a process of an older release may still
+// have one loaded, and a build is a few megabytes.
+import { createHash } from 'node:crypto';
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import { stateDir } from './paths.js';
+const require = createRequire(import.meta.url);
+/** What node-pty loads or starts; debug symbols are most of the prebuilds' size. */
+const BINARY_EXTENSIONS = ['.node', '.dll', '.exe'];
+/** The files a running node-pty needs, relative to its package directory. */
+function runtimeFiles(source, platform, arch) {
+    const files = ['package.json'];
+    const collect = (directory, keep) => {
+        const absolute = path.join(source, directory);
+        if (!fs.existsSync(absolute))
+            return;
+        for (const entry of fs.readdirSync(absolute, { recursive: true, withFileTypes: true })) {
+            if (entry.isFile() && keep(entry.name))
+                files.push(path.relative(source, path.join(entry.parentPath, entry.name)));
+        }
+    };
+    collect('lib', (name) => name.endsWith('.js') && !name.endsWith('.test.js'));
+    const binary = (name) => BINARY_EXTENSIONS.includes(path.extname(name));
+    // Where node-pty looks for its modules: a local build, then the prebuilds.
+    collect(path.join('build', 'Release'), binary);
+    collect(path.join('prebuilds', `${platform}-${arch}`), binary);
+    return files;
+}
+/** Copy node-pty's run-time files under `directory`, once per build; returns the copy. */
+export function copyNodePty(source, directory, platform, arch) {
+    const files = runtimeFiles(source, platform, arch);
+    const hash = createHash('sha256');
+    for (const file of files)
+        hash.update(`${file}\0`).update(fs.readFileSync(path.join(source, file)));
+    const target = path.join(directory, hash.digest('hex').slice(0, 16));
+    if (fs.existsSync(target))
+        return target;
+    // Renamed into place whole, so a copy that exists is complete.
+    const staging = `${target}.${process.pid}.tmp`;
+    for (const file of files) {
+        fs.mkdirSync(path.dirname(path.join(staging, file)), { recursive: true });
+        fs.copyFileSync(path.join(source, file), path.join(staging, file));
+    }
+    try {
+        fs.renameSync(staging, target);
+    }
+    catch (error) {
+        fs.rmSync(staging, { recursive: true, force: true });
+        // Another process put the same build in place first.
+        if (!fs.existsSync(target))
+            throw error;
+    }
+    return target;
+}
+export function loadNodePty({ platform = process.platform, arch = process.arch, source = path.dirname(require.resolve('node-pty/package.json')), directory = path.join(stateDir(), 'node-pty'), warn = (message) => process.stderr.write(`${message}\n`), } = {}) {
+    if (platform !== 'win32')
+        return require(source);
+    try {
+        return require(copyNodePty(source, directory, platform, arch));
+    }
+    catch (error) {
+        // Terminals still work from the package; only an update has to wait for them to end.
+        warn(`herdr-remote: could not copy node-pty out of the package: ${error.message}`);
+        return require(source);
+    }
+}
+let loaded = null;
+/** node-pty, loaded on first use: only processes that start terminals pay for it. */
+export function nodePty() {
+    loaded ??= loadNodePty();
+    return loaded;
+}

package/dist/pty-session.js

@@ -1,6 +1,5 @@
 import os from 'node:os';
-import pty from 'node-pty';
-import { ElevatedPty } from './connector/elevatedPty.js';
+import { nodePty } from './node-pty-loader.js';
 class PtySession {
     static DEFAULT_COLS = 100;
     static DEFAULT_ROWS = 30;
@@ -11,12 +10,11 @@ class PtySession {
     cwd;
     socketPath;
     platform;
-    adminTerminal;
     fastWindowsPty;
     spawnPty;
     terminal;
     startedAt;
-    constructor({ command, args = [], cwd = os.homedir(), socketPath, platform = process.platform, spawn: spawnPty = pty.spawn, adminTerminal = false, fastWindowsPty = false, } = {}) {
+    constructor({ command, args = [], cwd = os.homedir(), socketPath, platform = process.platform, spawn: spawnPty = nodePty().spawn, fastWindowsPty = false, } = {}) {
         if (typeof command !== 'string' || command.length === 0)
             throw new TypeError('command must be a non-empty string');
         if (!Array.isArray(args) || !args.every((arg) => typeof arg === 'string'))
@@ -26,7 +24,6 @@ class PtySession {
         this.cwd = cwd;
         this.socketPath = socketPath;
         this.platform = platform;
-        this.adminTerminal = adminTerminal;
         this.fastWindowsPty = fastWindowsPty;
         this.spawnPty = spawnPty;
         this.terminal = null;
@@ -50,31 +47,9 @@ class PtySession {
             return fallback;
         return Math.min(PtySession.MAX_DIMENSION, Math.max(PtySession.MIN_DIMENSION, numeric));
     }
-    start({ cols, rows, onData, onExit, onReady, onError }) {
+    start({ cols, rows, onData, onExit }) {
         if (this.terminal)
             throw new Error('PTY session already started');
-        if (this.adminTerminal) {
-            if (this.platform !== 'win32')
-                throw new Error('Administrator PTYs are only supported on Windows');
-            const terminal = new ElevatedPty({ command: this.command, args: this.args, cwd: this.cwd, socketPath: this.socketPath }, PtySession.clampDimension(cols, PtySession.DEFAULT_COLS), PtySession.clampDimension(rows, PtySession.DEFAULT_ROWS));
-            this.terminal = terminal;
-            this.startedAt = new Date().toISOString();
-            terminal.start({
-                cols: terminal.cols,
-                rows: terminal.rows,
-                onData: onData || (() => { }),
-                onExit: (event) => {
-                    this.terminal = null;
-                    onExit?.(event);
-                },
-                onReady,
-                onError: (error) => {
-                    this.terminal = null;
-                    onError?.(error);
-                },
-            });
-            return this;
-        }
         // The Herdr UI needs the bundled ConPTY's Kitty and mouse reporting.
         this.terminal = this.spawnPty(this.command, this.args, {
             name: 'xterm-256color',
@@ -98,7 +73,6 @@ class PtySession {
                 onExit(event);
             });
         }
-        onReady?.();
         return this;
     }
     write(data) {

package/dist/service.js

@@ -40,6 +40,7 @@ export function serviceSpecs(config = loadConfig(), state = ensureRuntime()) {
             name: 'relay',
             command: process.execPath,
             args: [relayBinPath()],
+            cwd: stateDir(),
             env: {
                 // Let the shared web UI tell a private workstation relay apart from
                 // the operator-facing self-hosted relay. Standalone relay installs
@@ -71,6 +72,7 @@ export function serviceSpecs(config = loadConfig(), state = ensureRuntime()) {
         name: 'host',
         command: process.execPath,
         args: [path.join(PACKAGE_ROOT, 'dist', 'connector', 'main.js')],
+        cwd: stateDir(),
         env: {
             // Captured here, where a terminal may still be attached, because the
             // connector itself usually runs detached with no terminal to ask.
@@ -96,7 +98,7 @@ function spawnDetached(spec) {
     const logFd = fs.openSync(logPath(spec.name), 'a');
     try {
         const child = spawn(spec.command, spec.args, {
-            cwd: PACKAGE_ROOT,
+            cwd: spec.cwd,
             env: { ...baseEnvironment(), ...spec.env },
             detached: true,
             // A detached console program can open a visible window from a console-less Windows parent.

package/dist/supervisor.js

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import { spawn } from 'node:child_process';
 import { loadConfig } from './config.js';
-import { logPath, PACKAGE_ROOT, stateDir } from './paths.js';
+import { logPath, stateDir } from './paths.js';
 import { ensureDir } from 'herdr-remote-relay/state';
 import { ensureRuntime, managedPids, recordManagedPid, updateRuntime, } from './runtime.js';
 import { baseEnvironment, serviceSpecs } from './service.js';
@@ -131,7 +131,7 @@ class Supervisor {
         let child;
         try {
             child = spawn(entry.spec.command, entry.spec.args, {
-                cwd: PACKAGE_ROOT,
+                cwd: entry.spec.cwd,
                 env: { ...baseEnvironment(), ...entry.spec.env },
                 windowsHide: true,
                 stdio,

package/dist/tui/api.js

@@ -19,11 +19,11 @@ import * as keepalive from '../keepalive/index.js';
 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, };
-export async function adminBrokerStatus() {
+export async function adminBrokerStatus({ waitForStart = false } = {}) {
     if (process.platform !== 'win32')
         return false;
     const broker = await import('../connector/admin-broker.js');
-    return broker.adminBrokerStatus();
+    return waitForStart ? broker.waitForAdminBroker() : broker.adminBrokerStatus();
 }
 export async function configureAdminBroker(action, t) {
     const setup = await import('../connector/admin-broker-setup.js');

package/dist/tui/screens/Keepalive.js

@@ -53,7 +53,7 @@ export function Keepalive({ ctx }) {
                 let ready = false;
                 try {
                     await configureAdminBroker(action, t);
-                    ready = action === 'install' && (await adminBrokerStatus());
+                    ready = action === 'install' && (await adminBrokerStatus({ waitForStart: true }));
                 }
                 catch (error) {
                     if (error.code === 'ELEVATION_CANCELLED') {