@hanzo/build 0.2.38 → 0.2.39

package/lib/api/machines.d.ts

@@ -36,12 +36,20 @@ export interface Machine {
 }
 export declare function machine(raw: unknown): Machine;
 export declare function machines(t: Target): Promise<Machine[]>;
-/** Register a machine by hand. `hanzo link` on a machine with this hostname takes the row over. */
+/**
+ * Register a machine by hand. One left unnamed takes its hostname, the name `hanzo
+ * link` gives it; `hanzo link` on a machine with this hostname takes the row over.
+ */
 export declare function add(t: Target, what: {
     label: string;
     kind: Kind;
     host?: string;
 }): Promise<Machine>;
+/**
+ * Whether a machine is up. The platform reports a hand-registered machine at its
+ * registered status until a heartbeat arrives, so `online` counts only once one has.
+ */
+export declare function live(m: Machine): boolean;
 /** Rename a machine, or drain it (`draining`) and bring it back (`online`). */
 export declare function change(t: Target, id: string, what: {
     label?: string;

package/lib/api/machines.js

@@ -46,14 +46,24 @@ async function owned(p) {
         throw e;
     }
 }
-/** Register a machine by hand. `hanzo link` on a machine with this hostname takes the row over. */
+/**
+ * Register a machine by hand. One left unnamed takes its hostname, the name `hanzo
+ * link` gives it; `hanzo link` on a machine with this hostname takes the row over.
+ */
 export async function add(t, what) {
-    const label = what.label.trim();
-    if (!label)
-        throw new Error('A machine needs a name');
     const host = (what.host ?? '').trim();
+    const label = what.label.trim() || host;
+    if (!label)
+        throw new Error('A machine needs a name or a hostname');
     return machine(await call(t, 'POST', '/v1/agent/targets', { label, kind: what.kind, ...(host ? { host } : {}) }));
 }
+/**
+ * Whether a machine is up. The platform reports a hand-registered machine at its
+ * registered status until a heartbeat arrives, so `online` counts only once one has.
+ */
+export function live(m) {
+    return m.status === 'online' && m.seen !== '';
+}
 /** Rename a machine, or drain it (`draining`) and bring it back (`online`). */
 export async function change(t, id, what) {
     const body = {};

package/lib/settings/machines.js

@@ -10,8 +10,8 @@ import { SizableText, XStack, YStack } from '@hanzo/gui';
 import { MoreHorizontal, Plus } from '@hanzogui/lucide-icons-2';
 import { Button, Dialog, DialogContent, DialogTitle, DropdownMenu, Input } from '@hanzo/ui';
 import { CopyButton } from '@hanzo/ui/product';
-import { useState } from 'react';
-import { add, change, KINDS, key, machines, remove } from '../api/machines.js';
+import { useEffect, useState } from 'react';
+import { add, change, KINDS, key, live, machines, remove } from '../api/machines.js';
 import { Confirm, Rename } from '../ask.js';
 import { useRead } from '../data.js';
 import { useHost, useTarget } from '../host.js';
@@ -19,26 +19,39 @@ import { Card, Field, Group, Heading, Note, Once, Row, Soft } from './ui.js';
 const mono = { fontFamily: 'var(--f-mono, ui-monospace, monospace)' };
 /** What `hanzo link` needs, in the order it is typed on the machine. */
 const LINK = ['hanzo login', 'hanzo link'].join('\n');
+/** How often the list is read again, so a machine that comes up or goes quiet shows it: the agent's beat. */
+const BEAT = 30_000;
+/** The list before its first answer; every answer is a new array, even an empty one. */
+const UNREAD = [];
 /** The line under a machine: what it is, where, how big, and what it is doing. */
 function about(m) {
     const load = m.running ? `${m.running} running` : m.sessions ? `${m.sessions} runs` : '';
-    return [m.status || 'unknown', m.kind, m.host && m.host !== m.label ? m.host : '', m.capacity, load].filter(Boolean).join(' · ');
+    const state = m.status === 'online' && !live(m) ? 'not seen yet' : m.status || 'unknown';
+    return [state, m.kind, m.host && m.host !== m.label ? m.host : '', m.capacity, load].filter(Boolean).join(' · ');
 }
-function Dot({ status }) {
-    const on = status === 'online';
-    return (_jsx(YStack, { width: 8, height: 8, rounded: 999, shrink: 0, bg: on ? '$green10' : 'transparent', borderWidth: on ? 0 : 1, borderColor: status === 'draining' ? '$yellow10' : '$soft', "aria-hidden": true }));
+function Dot({ m }) {
+    const on = live(m);
+    return (_jsx(YStack, { width: 8, height: 8, rounded: 999, shrink: 0, bg: on ? '$green10' : 'transparent', borderWidth: on ? 0 : 1, borderColor: m.status === 'draining' ? '$yellow10' : '$soft', "aria-hidden": true }));
 }
 export function Machines() {
     const host = useHost();
     const t = useTarget();
     const signed = Boolean(host.person);
-    const list = useRead(signed ? () => machines(t) : null, [], [t, signed]);
+    const list = useRead(signed ? () => machines(t) : null, UNREAD, [t, signed]);
     const [adding, setAdding] = useState(false);
     const [renaming, setRenaming] = useState(null);
     const [removing, setRemoving] = useState(null);
     const [keying, setKeying] = useState(null);
     const [minted, setMinted] = useState(null);
     const [note, setNote] = useState('');
+    // Read again on the agent's beat; "Reading machines…" stays for the first read only.
+    const again = list.reload;
+    useEffect(() => {
+        if (!signed)
+            return;
+        const id = setInterval(again, BEAT);
+        return () => clearInterval(id);
+    }, [again, signed]);
     if (!signed) {
         return (_jsxs(YStack, { gap: "$5", children: [_jsx(Heading, { title: "Machines" }), _jsx(Soft, { children: "Sign in to see your organization\u2019s machines." })] }));
     }
@@ -53,7 +66,7 @@ export function Machines() {
             setNote(e.message);
         }
     };
-    return (_jsxs(YStack, { gap: "$6", children: [_jsx(Heading, { title: "Machines", detail: "Your organization\u2019s own computers. A run sent to one runs there instead of in the Hanzo sandbox." }), _jsxs(Group, { title: "Link a machine", detail: "Run these on it. It registers under its hostname, and stays online while hanzo link runs.", children: [_jsxs(XStack, { items: "flex-start", gap: "$2", px: "$3", py: "$2.5", rounded: "$3", borderWidth: 1, borderColor: "$borderColor", bg: "$raised", children: [_jsx(SizableText, { flex: 1, minW: 0, size: "$2", color: "$ink", "aria-label": "Link commands", style: { ...mono, whiteSpace: 'pre-wrap' }, children: LINK }), _jsx(CopyButton, { value: LINK, label: "Copy the commands" })] }), _jsx(XStack, { children: _jsxs(Button, { size: "sm", variant: "ghost", onPress: () => setAdding(true), children: [_jsx(Plus, { size: 14 }), " Register one by hand"] }) })] }), _jsx(Group, { title: "Linked", children: list.error ? (_jsx(Soft, { children: list.error.message })) : list.loading && list.value.length === 0 ? (_jsx(Soft, { children: "Reading machines\u2026" })) : list.value.length === 0 ? (_jsx(Soft, { children: "No machine is linked yet." })) : (_jsx(Card, { children: list.value.map((m, i) => (_jsx(Row, { first: i === 0, leading: _jsx(Dot, { status: m.status }), title: m.label, detail: about(m), trailing: _jsx(DropdownMenu, { trigger: _jsx(XStack, { render: "button", "aria-label": `Actions for ${m.label}`, px: "$1.5", py: "$1", rounded: "$2", hoverStyle: { bg: '$hover' }, children: _jsx(MoreHorizontal, { size: 16 }) }), items: [
+    return (_jsxs(YStack, { gap: "$6", children: [_jsx(Heading, { title: "Machines", detail: "Your organization\u2019s own computers. A run sent to one runs there instead of in the Hanzo sandbox." }), _jsxs(Group, { title: "Link a machine", detail: "Run these on it. It registers under its hostname, and stays online while hanzo link runs.", children: [_jsxs(XStack, { items: "flex-start", gap: "$2", px: "$3", py: "$2.5", rounded: "$3", borderWidth: 1, borderColor: "$borderColor", bg: "$raised", children: [_jsx(SizableText, { flex: 1, minW: 0, size: "$2", color: "$ink", "aria-label": "Link commands", style: { ...mono, whiteSpace: 'pre-wrap' }, children: LINK }), _jsx(CopyButton, { value: LINK, label: "Copy the commands" })] }), _jsx(XStack, { children: _jsxs(Button, { size: "sm", variant: "ghost", onPress: () => setAdding(true), children: [_jsx(Plus, { size: 14 }), " Register one by hand"] }) })] }), _jsx(Group, { title: "Linked", children: list.error ? (_jsx(Soft, { children: list.error.message })) : list.value === UNREAD ? (_jsx(Soft, { children: "Reading machines\u2026" })) : list.value.length === 0 ? (_jsx(Soft, { children: "No machine is linked yet." })) : (_jsx(Card, { children: list.value.map((m, i) => (_jsx(Row, { first: i === 0, leading: _jsx(Dot, { m: m }), title: m.label, detail: about(m), trailing: _jsx(DropdownMenu, { trigger: _jsx(XStack, { render: "button", "aria-label": `Actions for ${m.label}`, px: "$1.5", py: "$1", rounded: "$2", hoverStyle: { bg: '$hover' }, children: _jsx(MoreHorizontal, { size: 16 }) }), items: [
                                 { key: 'rename', label: 'Rename', onSelect: () => setRenaming(m) },
                                 m.status === 'draining'
                                     ? { key: 'online', label: 'Take runs again', onSelect: () => void drain(m, 'online') }
@@ -110,5 +123,5 @@ function Adding({ open, onOpenChange, onAdded }) {
             setWorking(false);
         }
     };
-    return (_jsx(Dialog, { open: open, onOpenChange: (o) => !o && close(), children: _jsxs(DialogContent, { maxW: 440, showCloseButton: false, children: [_jsx(DialogTitle, { children: "Register a machine" }), _jsxs(YStack, { gap: "$3", children: [_jsx(Field, { label: "Name", children: _jsx(Input, { value: label, onChangeText: setLabel, placeholder: "workshop", "aria-label": "Machine name", autoFocus: true }) }), _jsx(Field, { label: "Kind", children: _jsx(XStack, { flexWrap: "wrap", gap: "$1.5", role: "radiogroup", "aria-label": "Kind", children: KINDS.map((k) => (_jsx(XStack, { render: "button", role: "radio", "aria-checked": k === kind, "aria-label": k, onPress: () => setKind(k), px: "$2.5", py: "$1", rounded: "$10", borderWidth: 1, borderColor: k === kind ? '$ink' : '$borderColor', children: _jsx(SizableText, { size: "$1", color: k === kind ? '$ink' : '$soft', children: k }) }, k))) }) }), _jsx(Field, { label: "Hostname", hint: "Optional. What its runs report. hanzo link, signed in as you on a machine with this hostname, takes this row over.", children: _jsx(Input, { value: hostname, onChangeText: setHostname, placeholder: "gpu-01", "aria-label": "Hostname", autoCapitalize: "none" }) }), note ? (_jsx(SizableText, { size: "$1", color: "$soft", role: "status", children: note })) : null, _jsxs(XStack, { gap: "$2", justify: "flex-end", children: [_jsx(Button, { size: "sm", variant: "ghost", disabled: working, onPress: close, children: "Cancel" }), _jsx(Button, { size: "sm", disabled: working, onPress: () => void save(), children: "Register" })] })] })] }) }));
+    return (_jsx(Dialog, { open: open, onOpenChange: (o) => !o && close(), children: _jsxs(DialogContent, { maxW: 440, showCloseButton: false, children: [_jsx(DialogTitle, { children: "Register a machine" }), _jsxs(YStack, { gap: "$3", children: [_jsx(Field, { label: "Name", hint: "Left empty, it takes the hostname.", children: _jsx(Input, { value: label, onChangeText: setLabel, "aria-label": "Machine name", autoFocus: true }) }), _jsx(Field, { label: "Kind", children: _jsx(XStack, { flexWrap: "wrap", gap: "$1.5", role: "radiogroup", "aria-label": "Kind", children: KINDS.map((k) => (_jsx(XStack, { render: "button", role: "radio", "aria-checked": k === kind, "aria-label": k, onPress: () => setKind(k), px: "$2.5", py: "$1", rounded: "$10", borderWidth: 1, borderColor: k === kind ? '$ink' : '$borderColor', children: _jsx(SizableText, { size: "$1", color: k === kind ? '$ink' : '$soft', children: k }) }, k))) }) }), _jsx(Field, { label: "Hostname", hint: "Optional. What its runs report. hanzo link, signed in as you on a machine with this hostname, takes this row over.", children: _jsx(Input, { value: hostname, onChangeText: setHostname, "aria-label": "Hostname", autoCapitalize: "none" }) }), note ? (_jsx(SizableText, { size: "$1", color: "$soft", role: "status", children: note })) : null, _jsxs(XStack, { gap: "$2", justify: "flex-end", children: [_jsx(Button, { size: "sm", variant: "ghost", disabled: working, onPress: close, children: "Cancel" }), _jsx(Button, { size: "sm", disabled: working, onPress: () => void save(), children: "Register" })] })] })] }) }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzo/build",
-  "version": "0.2.38",
+  "version": "0.2.39",
   "type": "module",
   "license": "Apache-2.0 OR MIT",
   "description": "Hanzo Build — say what you want, watch it built, deployed and running. The builder as a component, mounted by the Hanzo app at hanzo.ai.",