@co0ontty/wand 1.22.0 → 1.23.0

package/dist/tui/layout.js

@@ -2,11 +2,13 @@ import { createRequire } from "node:module";
 const require = createRequire(import.meta.url);
 // neo-blessed 是 CJS，没有匹配 @types/blessed 的 default export，统一当 any 用。
 const blessed = require("neo-blessed");
-const HEADER_HEIGHT = 6;
+const HEADER_HEIGHT = 8;
 const SESSIONS_HEIGHT = 12;
+const HINT_HEIGHT = 2;
 const LOG_TOP = HEADER_HEIGHT + SESSIONS_HEIGHT;
 const LOG_BUFFER_LIMIT = 1000;
 const RENDER_THROTTLE_MS = 50;
+const TOAST_DEFAULT_TTL = 3500;
 export function buildLayout() {
     const screen = blessed.screen({
         smartCSR: true,
@@ -22,7 +24,7 @@ export function buildLayout() {
         width: "100%",
         height: HEADER_HEIGHT,
         border: { type: "line" },
-        label: " wand ",
+        label: " ✦ wand ",
         tags: true,
         style: {
             border: { fg: "cyan" },
@@ -58,7 +60,7 @@ export function buildLayout() {
         top: LOG_TOP,
         left: 0,
         width: "100%",
-        bottom: 1,
+        bottom: HINT_HEIGHT,
         border: { type: "line" },
         label: " Logs ",
         tags: false,
@@ -75,10 +77,82 @@ export function buildLayout() {
         bottom: 0,
         left: 0,
         width: "100%",
+        height: HINT_HEIGHT,
+        tags: true,
+        content: buildHintContent(),
+    });
+    // —— Toast：右下角 1 行浮层 ——
+    const toast = blessed.box({
+        parent: screen,
+        bottom: HINT_HEIGHT,
+        right: 2,
         height: 1,
+        width: "shrink",
+        tags: true,
+        hidden: true,
+        style: { fg: "white" },
+    });
+    let toastTimer = null;
+    // —— Help Overlay ——
+    const helpBox = blessed.box({
+        parent: screen,
+        top: "center",
+        left: "center",
+        width: 66,
+        height: 24,
+        border: { type: "line" },
+        label: " ✦ Shortcuts ",
+        tags: true,
+        hidden: true,
+        style: {
+            border: { fg: "cyan" },
+            label: { fg: "cyan", bold: true },
+            bg: "black",
+        },
+        content: buildHelpContent(),
+    });
+    // —— Detail Overlay（用于显示命令输出详情）。tags 关闭，按纯文本渲染。 ——
+    const detailBox = blessed.box({
+        parent: screen,
+        top: "center",
+        left: "center",
+        width: "80%",
+        height: "70%",
+        border: { type: "line" },
+        label: " Detail ",
+        tags: false,
+        hidden: true,
+        keys: true,
+        scrollable: true,
+        alwaysScroll: true,
+        scrollbar: { ch: " ", style: { bg: "gray" } },
+        style: {
+            border: { fg: "magenta" },
+            label: { fg: "magenta", bold: true },
+            bg: "black",
+        },
+    });
+    // —— Service Control Panel —— 居中浮层，tags: true 用于上色
+    const servicePanel = blessed.box({
+        parent: screen,
+        top: "center",
+        left: "center",
+        width: 64,
+        height: 16,
+        border: { type: "line" },
+        label: " ✦ Service Control ",
         tags: true,
-        content: "{gray-fg}[q]uit  [r]efresh  [↑↓] navigate{/}",
+        hidden: true,
+        keys: true,
+        style: {
+            border: { fg: "yellow" },
+            label: { fg: "yellow", bold: true },
+            bg: "black",
+        },
     });
+    let servicePanelHandlers = null;
+    let servicePanelView = null;
+    const servicePanelKeys = ["s", "t", "r", "i", "u", "l", "R", "escape", "q"];
     // 让 sessions 默认获得焦点以接收键盘事件
     sessions.focus();
     let renderPending = false;
@@ -98,17 +172,30 @@ export function buildLayout() {
         renderTimer.unref?.();
     }
     function refreshHeader(info) {
+        const counts = info.sessionCounts;
+        const sess = `{green-fg}${counts.active}{/} active · ` +
+            `{gray-fg}${counts.archived}{/} archived · ` +
+            `{white-fg}${counts.total}{/} total`;
         const orphan = info.orphanRecoveredCount > 0
             ? `  {gray-fg}(${info.orphanRecoveredCount} orphan PTYs cleaned){/}`
             : "";
-        const counts = info.sessionCounts;
-        const sess = `${counts.active} active · ${counts.archived} archived · ${counts.total} total`;
+        const schemeColor = info.scheme === "HTTPS" ? "green" : "yellow";
+        const serviceBadge = info.serviceInstalled
+            ? "  {green-fg}[service: on]{/}"
+            : "  {gray-fg}[service: off]{/}";
+        const uptime = formatUptime(Date.now() - info.startedAtMs);
+        const mem = formatBytes(info.rssBytes);
         const lines = [
-            `{cyan-fg}Version{/}    ${info.version}`,
-            `{cyan-fg}URL{/}        ${info.url} {gray-fg}(${info.scheme}, bind ${info.bindAddr}){/}`,
-            `{cyan-fg}Config{/}     ${info.configPath}`,
-            `{cyan-fg}Database{/}   ${info.dbPath}`,
-            `{cyan-fg}Sessions{/}   ${sess}${orphan}`,
+            `{cyan-fg}{bold}Version{/}    ${info.version}` +
+                `   {gray-fg}·{/}   {cyan-fg}{bold}Uptime{/} ${uptime}` +
+                `   {gray-fg}·{/}   {cyan-fg}{bold}Memory{/} ${mem}` +
+                serviceBadge,
+            `{cyan-fg}{bold}URL{/}        {underline}${info.url}{/underline}  ` +
+                `{${schemeColor}-fg}● ${info.scheme}{/}  {gray-fg}(bind ${info.bindAddr}){/}`,
+            `{cyan-fg}{bold}Config{/}     ${info.configPath}`,
+            `{cyan-fg}{bold}Database{/}   ${info.dbPath}`,
+            `{cyan-fg}{bold}Sessions{/}   ${sess}${orphan}`,
+            `{gray-fg}按 ?  查看快捷键 · q 退出 · R 重启 · u 检查更新 · s 注册服务 · o 浏览器打开 · c 拷贝 URL{/}`,
         ];
         header.setContent(lines.join("\n"));
         scheduleRender();
@@ -132,11 +219,177 @@ export function buildLayout() {
     function setSelectionListener(listener) {
         sessions.on("select item", (_item, index) => listener(index));
     }
+    function showHelp(visible) {
+        if (visible) {
+            helpBox.setContent(buildHelpContent());
+            helpBox.show();
+            helpBox.setFront();
+        }
+        else {
+            helpBox.hide();
+            sessions.focus();
+        }
+        scheduleRender();
+    }
+    function toggleHelp() {
+        const next = helpBox.hidden === true;
+        showHelp(next);
+        return next;
+    }
+    function showToast(message, level = "info", ttlMs = TOAST_DEFAULT_TTL) {
+        const color = level === "error" ? "red" : level === "warn" ? "yellow" : level === "success" ? "green" : "cyan";
+        const icon = level === "error" ? "✖" : level === "warn" ? "⚠" : level === "success" ? "✔" : "ℹ";
+        toast.setContent(`{${color}-fg}${icon} ${escapeTags(message)}{/}`);
+        toast.show();
+        toast.setFront();
+        if (toastTimer)
+            clearTimeout(toastTimer);
+        toastTimer = setTimeout(() => {
+            toast.hide();
+            scheduleRender();
+            toastTimer = null;
+        }, ttlMs);
+        toastTimer.unref?.();
+        scheduleRender();
+    }
+    function confirm(opts) {
+        return new Promise((resolve) => {
+            const yes = opts.yes || "回车 / y 确认";
+            const no = opts.no || "Esc / n 取消";
+            const dlg = blessed.box({
+                parent: screen,
+                top: "center",
+                left: "center",
+                width: Math.min(78, Math.max(48, opts.body.length + 14)),
+                height: 9,
+                border: { type: "line" },
+                label: ` ${opts.title} `,
+                tags: true,
+                keys: true,
+                style: {
+                    border: { fg: "yellow" },
+                    label: { fg: "yellow", bold: true },
+                    bg: "black",
+                },
+                content: `\n  ${escapeTags(opts.body)}\n\n` +
+                    `  {green-fg}${yes}{/}    {gray-fg}${no}{/}`,
+            });
+            dlg.setFront();
+            dlg.focus();
+            const cleanup = (result) => {
+                try {
+                    dlg.destroy();
+                }
+                catch { /* noop */ }
+                sessions.focus();
+                scheduleRender();
+                resolve(result);
+            };
+            dlg.key(["enter", "y", "Y"], () => cleanup(true));
+            dlg.key(["escape", "n", "N", "q"], () => cleanup(false));
+            scheduleRender();
+        });
+    }
+    function showDetail(title, body) {
+        detailBox.setLabel(` ${title} (Esc 关闭) `);
+        // tags: false 的 box 里 content 直接按字面值渲染。
+        detailBox.setContent(body);
+        detailBox.show();
+        detailBox.setFront();
+        detailBox.focus();
+        detailBox.key(["escape", "q"], () => hideDetail());
+        scheduleRender();
+    }
+    function hideDetail() {
+        detailBox.hide();
+        sessions.focus();
+        scheduleRender();
+    }
+    function clearLogs() {
+        // neo-blessed.log 没有公开 clear 方法，直接重置 content + scrollback
+        try {
+            logbox.setContent("");
+            logbox._clines && (logbox._clines.length = 0);
+        }
+        catch { /* noop */ }
+        scheduleRender();
+    }
+    function openServicePanel(handlers, initial) {
+        servicePanelHandlers = handlers;
+        servicePanelView = initial;
+        renderServicePanel();
+        servicePanel.show();
+        servicePanel.setFront();
+        servicePanel.focus();
+        // 绑定一次性按键
+        for (const k of servicePanelKeys)
+            servicePanel.unkey(k, () => { });
+        servicePanel.key(["s"], () => { void handlers.onStart(); });
+        servicePanel.key(["t"], () => { void handlers.onStop(); });
+        servicePanel.key(["r"], () => { void handlers.onRestart(); });
+        servicePanel.key(["R"], () => { void handlers.onRefresh(); });
+        servicePanel.key(["i"], () => { void handlers.onInstall(); });
+        servicePanel.key(["u"], () => { void handlers.onUninstall(); });
+        servicePanel.key(["l"], () => { void handlers.onLogs(); });
+        servicePanel.key(["escape", "q"], () => { handlers.onClose(); });
+        scheduleRender();
+    }
+    function updateServicePanel(view) {
+        servicePanelView = view;
+        renderServicePanel();
+        scheduleRender();
+    }
+    function closeServicePanel() {
+        servicePanel.hide();
+        servicePanelHandlers = null;
+        sessions.focus();
+        scheduleRender();
+    }
+    function isServicePanelOpen() {
+        return servicePanel.hidden !== true;
+    }
+    function renderServicePanel() {
+        if (!servicePanelView)
+            return;
+        const v = servicePanelView;
+        const stateColor = v.state === "active" ? "green" :
+            v.state === "failed" ? "red" :
+                v.state === "inactive" ? "yellow" :
+                    v.state === "unsupported" ? "gray" : "white";
+        const platformLabel = v.platform === "linux" ? "systemd (--user)" :
+            v.platform === "darwin" ? "launchd (LaunchAgents)" :
+                v.platform;
+        const installedBadge = v.installed
+            ? "{green-fg}[installed]{/}"
+            : "{gray-fg}[not installed]{/}";
+        const lastAction = v.lastAction
+            ? `\n  {gray-fg}最近操作:{/} ${escapeTags(v.lastAction)}`
+            : "";
+        const lines = [
+            "",
+            `  {cyan-fg}{bold}Backend{/bold}{/}    ${platformLabel}   ${installedBadge}`,
+            `  {cyan-fg}{bold}State{/bold}{/}      {${stateColor}-fg}${escapeTags(v.statusLine)}{/}`,
+            lastAction ? lastAction.replace(/^\n/, "") : "",
+            "",
+            "  {yellow-fg}{bold}Actions{/bold}{/}",
+            "    {green-fg}s{/} 启动 (start)        {yellow-fg}t{/} 停止 (stop)",
+            "    {magenta-fg}r{/} 重启 (restart)     {cyan-fg}R{/} 刷新状态",
+            "    {white-fg}i{/} 注册到系统         {gray-fg}u{/} 卸载",
+            "    {blue-fg}l{/} 查看日志 (journalctl)",
+            "",
+            "  {gray-fg}按 Esc / q 关闭面板{/}",
+        ];
+        servicePanel.setContent(lines.join("\n"));
+    }
     function destroy() {
         if (renderTimer) {
             clearTimeout(renderTimer);
             renderTimer = null;
         }
+        if (toastTimer) {
+            clearTimeout(toastTimer);
+            toastTimer = null;
+        }
         try {
             screen.destroy();
         }
@@ -148,9 +401,83 @@ export function buildLayout() {
         refreshSessions,
         appendLog,
         setSelectionListener,
+        showHelp,
+        toggleHelp,
+        showToast,
+        confirm,
+        showDetail,
+        hideDetail,
+        clearLogs,
+        openServicePanel,
+        updateServicePanel,
+        closeServicePanel,
+        isServicePanelOpen,
         destroy,
     };
 }
+function buildHintContent() {
+    // 两行底栏，分组展示，避免单行过长。
+    const line1 = "{gray-fg}{bold}NAV{/bold}{/}  " +
+        "{cyan-fg}↑↓{/} 选择   " +
+        "{cyan-fg}r{/} 刷新   " +
+        "{cyan-fg}l{/} 清日志   " +
+        "{cyan-fg}?{/} 帮助   " +
+        "{cyan-fg}q{/} 退出";
+    const line2 = "{gray-fg}{bold}OPS{/bold}{/}  " +
+        "{magenta-fg}g{/} 服务面板   " +
+        "{magenta-fg}R{/} 重启   " +
+        "{magenta-fg}u{/} 更新   " +
+        "{magenta-fg}o{/} 浏览器   " +
+        "{magenta-fg}c{/} 拷贝 URL";
+    return `${line1}\n${line2}`;
+}
+function buildHelpContent() {
+    const rows = [
+        ["↑ / ↓", "在会话列表中上下移动"],
+        ["r", "立即刷新 header 与会话列表"],
+        ["l", "清空日志面板"],
+        ["?  /  h", "切换本帮助面板"],
+        ["q  /  Ctrl-C", "退出 wand"],
+        ["—", "—"],
+        ["g", "打开服务控制面板 (status/start/stop/restart/logs)"],
+        ["R", "重启 wand 进程（保留同一组 argv）"],
+        ["u", "检查 npm 更新，可选择安装"],
+        ["o", "在默认浏览器中打开 URL"],
+        ["c", "复制 URL 到剪贴板"],
+        ["s", "注册为系统服务 (systemd / launchd)"],
+        ["S", "卸载系统服务"],
+    ];
+    const lines = [
+        "",
+        "  {cyan-fg}{bold}NAV{/bold}{/}  浏览 & 渲染",
+        "",
+    ];
+    let inOps = false;
+    for (const [k, desc] of rows) {
+        if (k === "—") {
+            lines.push("");
+            lines.push("  {magenta-fg}{bold}OPS{/bold}{/}  运维操作");
+            lines.push("");
+            inOps = true;
+            continue;
+        }
+        const color = inOps ? "magenta-fg" : "cyan-fg";
+        lines.push(`  {${color}}${padRight(k, 14)}{/}${desc}`);
+    }
+    lines.push("");
+    lines.push("  {gray-fg}按 Esc / ? / h 关闭{/}");
+    return lines.join("\n");
+}
+function padRight(s, width) {
+    if (s.length >= width)
+        return s;
+    return s + " ".repeat(width - s.length);
+}
+function escapeTags(text) {
+    // 把可能被 blessed tag parser 吞掉的 `{...}` 转为视觉相近的全角字符。
+    // 这是给"tags: true"box 里嵌入用户文本时用的（confirm body / toast 等）。
+    return text.replace(/\{/g, "｛").replace(/\}/g, "｝");
+}
 function formatRow(row) {
     const glyphColor = toneColor(row.tone);
     const glyph = `{${glyphColor}-fg}${row.glyph}{/}`;
@@ -196,3 +523,30 @@ function formatTs(ms) {
     const ss = String(d.getSeconds()).padStart(2, "0");
     return `${hh}:${mm}:${ss}`;
 }
+function formatUptime(ms) {
+    if (!Number.isFinite(ms) || ms < 0)
+        ms = 0;
+    const sec = Math.floor(ms / 1000);
+    if (sec < 60)
+        return `${sec}s`;
+    const min = Math.floor(sec / 60);
+    if (min < 60)
+        return `${min}m ${sec % 60}s`;
+    const hr = Math.floor(min / 60);
+    if (hr < 24)
+        return `${hr}h ${min % 60}m`;
+    const d = Math.floor(hr / 24);
+    return `${d}d ${hr % 24}h`;
+}
+function formatBytes(bytes) {
+    if (!Number.isFinite(bytes) || bytes <= 0)
+        return "0 B";
+    const units = ["B", "KB", "MB", "GB"];
+    let value = bytes;
+    let i = 0;
+    while (value >= 1024 && i < units.length - 1) {
+        value /= 1024;
+        i++;
+    }
+    return `${value.toFixed(value >= 100 || i === 0 ? 0 : 1)} ${units[i]}`;
+}

package/dist/tui/service-panel.d.ts

@@ -0,0 +1,19 @@
+/**
+ * 服务控制面板的业务回调。本地 TUI 和 attach TUI 复用同一份逻辑。
+ *
+ * 面板按键与处理函数：
+ *   s — 启动服务
+ *   t — 停止服务 (有确认)
+ *   r — 重启服务 (有确认)
+ *   R — 仅刷新状态行
+ *   i — 安装到系统
+ *   u — 卸载
+ *   l — 查看最近日志
+ *   Esc / q — 关闭面板
+ */
+import { LayoutHandle } from "./layout.js";
+export interface ServicePanelDeps {
+    layout: LayoutHandle;
+    configPath: string;
+}
+export declare function openServicePanel(deps: ServicePanelDeps): void;

package/dist/tui/service-panel.js

@@ -0,0 +1,108 @@
+/**
+ * 服务控制面板的业务回调。本地 TUI 和 attach TUI 复用同一份逻辑。
+ *
+ * 面板按键与处理函数：
+ *   s — 启动服务
+ *   t — 停止服务 (有确认)
+ *   r — 重启服务 (有确认)
+ *   R — 仅刷新状态行
+ *   i — 安装到系统
+ *   u — 卸载
+ *   l — 查看最近日志
+ *   Esc / q — 关闭面板
+ */
+import { installService, isServiceInstalled, serviceLogs, serviceRestart, serviceStart, serviceStatus, serviceStop, uninstallService, } from "./commands.js";
+export function openServicePanel(deps) {
+    const { layout, configPath } = deps;
+    let lastAction;
+    function computeView() {
+        const s = serviceStatus();
+        return {
+            statusLine: s.description,
+            state: s.state,
+            installed: s.installed,
+            platform: s.platform,
+            lastAction,
+        };
+    }
+    function setLastAction(msg) {
+        const ts = new Date().toLocaleTimeString();
+        lastAction = `${ts} ${msg}`;
+        layout.updateServicePanel(computeView());
+    }
+    function handleResult(label, result) {
+        layout.showToast(result.message, result.ok ? "success" : "error", 3500);
+        if (result.detail) {
+            layout.showDetail(`${label} ${result.ok ? "输出" : "失败"}`, result.detail);
+        }
+        setLastAction(`${label}: ${result.message}`);
+    }
+    layout.openServicePanel({
+        onStart: () => {
+            handleResult("start", serviceStart());
+        },
+        onStop: async () => {
+            const ok = await layout.confirm({
+                title: "停止服务",
+                body: "将停止 wand.service / launchd 代理；如果你正 attach 到它，连接会断开。",
+            });
+            if (!ok)
+                return;
+            handleResult("stop", serviceStop());
+        },
+        onRestart: async () => {
+            const ok = await layout.confirm({
+                title: "重启服务",
+                body: "将 restart wand.service / 重新 load 代理；attach 连接会短暂断开后自动重连。",
+            });
+            if (!ok)
+                return;
+            handleResult("restart", serviceRestart());
+        },
+        onInstall: async () => {
+            if (isServiceInstalled()) {
+                layout.showToast("服务已安装，按 u 先卸载再重装", "warn", 2500);
+                return;
+            }
+            const ok = await layout.confirm({
+                title: "注册服务",
+                body: "将写入 unit / plist 并启用（无需 sudo，使用用户级服务）。",
+            });
+            if (!ok)
+                return;
+            handleResult("install", installService({ configPath }));
+        },
+        onUninstall: async () => {
+            if (!isServiceInstalled()) {
+                layout.showToast("当前未安装", "warn", 2500);
+                return;
+            }
+            const ok = await layout.confirm({
+                title: "卸载服务",
+                body: "将禁用并删除服务配置文件。",
+            });
+            if (!ok)
+                return;
+            handleResult("uninstall", uninstallService());
+        },
+        onLogs: () => {
+            const r = serviceLogs(80);
+            if (r.ok) {
+                layout.showDetail("Service Logs (最近 80 行)", r.detail || "(空)");
+                setLastAction("logs: 已展开");
+            }
+            else {
+                layout.showToast(r.message, "error", 3000);
+                if (r.detail)
+                    layout.showDetail("Service Logs 失败", r.detail);
+            }
+        },
+        onRefresh: () => {
+            layout.updateServicePanel(computeView());
+            layout.showToast("已刷新状态", "info", 1000);
+        },
+        onClose: () => {
+            layout.closeServicePanel();
+        },
+    }, computeView());
+}

package/dist/tui/snapshot.d.ts

@@ -0,0 +1,26 @@
+/**
+ * 把主进程当前状态打包成 IPC snapshot。
+ *
+ * 这里同时被 IPC 服务端（远端 attach 客户端拉数据）调用。本地 TUI 仍然直接读
+ * processManager / structuredSessions（避免一次额外的对象拷贝）。
+ */
+import { SessionSnapshot } from "../types.js";
+import { IpcSnapshotData } from "./ipc-protocol.js";
+export interface SnapshotInputs {
+    version: string;
+    url: string;
+    scheme: "HTTP" | "HTTPS";
+    bindAddr: string;
+    configPath: string;
+    dbPath: string;
+    orphanRecoveredCount: number;
+    startedAtMs: number;
+    pid: number;
+    processManager: {
+        listSlim(): SessionSnapshot[];
+    };
+    structuredSessions: {
+        listSlim(): SessionSnapshot[];
+    };
+}
+export declare function buildSnapshotData(inputs: SnapshotInputs): IpcSnapshotData;

package/dist/tui/snapshot.js

@@ -0,0 +1,58 @@
+/**
+ * 把主进程当前状态打包成 IPC snapshot。
+ *
+ * 这里同时被 IPC 服务端（远端 attach 客户端拉数据）调用。本地 TUI 仍然直接读
+ * processManager / structuredSessions（避免一次额外的对象拷贝）。
+ */
+import { formatSession, sortRows } from "./session-formatter.js";
+export function buildSnapshotData(inputs) {
+    const ptyList = inputs.processManager.listSlim();
+    let structuredList = [];
+    try {
+        structuredList = inputs.structuredSessions.listSlim();
+    }
+    catch { /* noop */ }
+    const seen = new Set();
+    const merged = [];
+    for (const s of ptyList) {
+        seen.add(s.id);
+        merged.push(s);
+    }
+    for (const s of structuredList) {
+        if (!seen.has(s.id))
+            merged.push(s);
+    }
+    const sorted = sortRows(merged);
+    let active = 0, archived = 0;
+    for (const s of sorted) {
+        if (s.archived)
+            archived += 1;
+        else if (s.status === "running")
+            active += 1;
+    }
+    const header = {
+        version: inputs.version,
+        url: inputs.url,
+        scheme: inputs.scheme,
+        bindAddr: inputs.bindAddr,
+        configPath: inputs.configPath,
+        dbPath: inputs.dbPath,
+        orphanRecoveredCount: inputs.orphanRecoveredCount,
+        sessionCounts: { active, archived, total: sorted.length },
+        startedAtMs: inputs.startedAtMs,
+        rssBytes: safeRss(),
+        pid: inputs.pid,
+    };
+    return {
+        header,
+        sessions: sorted.map((s) => formatSession(s)),
+    };
+}
+function safeRss() {
+    try {
+        return process.memoryUsage().rss;
+    }
+    catch {
+        return 0;
+    }
+}