@nonbot/cli 0.9.6 → 0.9.7

package/dist/commands/daemon.js

@@ -13,7 +13,7 @@ import { applyPaneTitle, applyPaneState } from '../lib/pane-title.js';
 import { installService, uninstallService } from '../lib/service.js';
 import { detectTmuxSession, inTmuxSession, nonbotTmuxOptOut, resolveTerminal, } from '../lib/terminal.js';
 import { VERSION } from '../version.js';
-import { errorBlock, statusRow, daemonOpener, daemonCloser, pollTick, activationCard, runSummary, formatElapsed, liveFooter, needsYouBanner, resumedLine, buildPaneBorderFormat, buildTmuxStatusLeft, buildTmuxStatusRight, c, } from '../lib/output.js';
+import { errorBlock, statusRow, daemonOpener, daemonCloser, activationCard, runSummary, formatElapsed, liveFooter, needsYouBanner, resumedLine, buildPaneBorderFormat, buildTmuxStatusLeft, buildTmuxStatusRight, WORDMARK_WIDTH, c, } from '../lib/output.js';
 export const POLL_FAST_MS = 2000;
 export const POLL_MAX_MS = 30000;
 export const POLL_INTERVAL_MS = POLL_FAST_MS;
@@ -89,12 +89,12 @@ export function applyNonbotTmuxConfig(deps = {}) {
         tmux('set-option', '-g', 'pane-border-lines', 'heavy');
         tmux('set-option', '-g', 'status', 'on');
         tmux('set-option', '-g', 'status-interval', '5');
-        tmux('set-option', '-g', 'status-style', 'bg=#0b0b12,fg=#8b949e');
+        tmux('set-option', '-g', 'status-style', 'bg=#0a0d17,fg=#8a93a6');
         tmux('set-option', '-g', 'status-left-length', '60');
         tmux('set-option', '-g', 'status-right-length', '120');
         tmux('set-option', '-g', 'status-left', buildTmuxStatusLeft({ ascii }));
         tmux('set-option', '-g', 'status-right', buildTmuxStatusRight({ ascii }));
-        tmux('set-option', '-g', 'window-status-current-style', 'fg=#0b0b12,bg=#4fc3f7,bold');
+        tmux('set-option', '-g', 'window-status-current-style', 'fg=#0a0d17,bg=#6c8cff,bold');
         tmux('refresh-client', '-S');
     }
     if (!stdoutIsTTY)
@@ -289,13 +289,11 @@ export async function runDaemonCommand(args = [], options = {}, deps = {}) {
         catch {
         }
     };
-    const stdoutIsTTY = deps.stdoutIsTTY ?? (process.stdout?.isTTY === true && !process.env.VITEST);
-    const footerEnabled = stdoutIsTTY && !headless;
-    let footerActive = false;
+    const log = (s) => rawLog(s);
     let lastPollOk = true;
     const noBell = process.env.NONBOT_NO_BELL === '1' || process.env.NONBOT_NO_BELL === 'true';
-    const ERASE = '\r\x1b[K';
-    const footerHealth = () => {
+    const stdoutIsTTY = deps.stdoutIsTTY ?? (process.stdout?.isTTY === true && !process.env.VITEST);
+    const pollHealth = () => {
         if (openPrompts.size > 0)
             return 'waiting';
         if (!lastPollOk)
@@ -304,7 +302,7 @@ export async function runDaemonCommand(args = [], options = {}, deps = {}) {
             return 'backoff';
         return 'live';
     };
-    const renderFooter = () => liveFooter({
+    const heartbeatLine = () => liveFooter({
         running: trackedPanes.size,
         waiting: openPrompts.size,
         done: doneCount,
@@ -312,33 +310,8 @@ export async function runDaemonCommand(args = [], options = {}, deps = {}) {
         nextPollMs: fixedInterval ?? currentInterval,
         version: `v${VERSION}`,
         machine: machineName,
-        health: footerHealth(),
+        health: pollHealth(),
     });
-    const refreshFooter = () => {
-        if (footerEnabled && footerActive)
-            rawLog(ERASE + renderFooter());
-    };
-    const startFooter = () => {
-        if (!footerEnabled)
-            return;
-        footerActive = true;
-        rawLog(ERASE + renderFooter());
-    };
-    const log = (s) => {
-        if (!footerEnabled || !footerActive) {
-            rawLog(s);
-            return;
-        }
-        rawLog(ERASE);
-        rawLog(s);
-        rawLog(ERASE + renderFooter());
-    };
-    const dropFooter = () => {
-        if (footerActive) {
-            footerActive = false;
-            rawLog(ERASE);
-        }
-    };
     const emitSummary = () => {
         log(runSummary({ running: trackedPanes.size, done: doneCount, failed: failedCount }) + '\n');
         pushTmuxStatus();
@@ -372,7 +345,7 @@ export async function runDaemonCommand(args = [], options = {}, deps = {}) {
                     }) +
                     '\n');
                 retitlePane('waiting', paneId, meta?.story ?? '');
-                if (!noBell && footerEnabled)
+                if (!noBell && stdoutIsTTY)
                     rawLog('\x07');
                 changed = true;
             }
@@ -391,7 +364,6 @@ export async function runDaemonCommand(args = [], options = {}, deps = {}) {
         }
         if (changed) {
             pushTmuxStatus();
-            refreshFooter();
         }
     };
     let running = true;
@@ -401,7 +373,6 @@ export async function runDaemonCommand(args = [], options = {}, deps = {}) {
             running = false;
             for (const id of [...runHeartbeats.keys()])
                 stopHeartbeat(id);
-            dropFooter();
             pushTmuxStatus(0, true);
             rawLog('\n' + statusRow('✓', 'daemon stopped', 'Ctrl-C received') + '\n');
             process.exit(0);
@@ -428,11 +399,16 @@ export async function runDaemonCommand(args = [], options = {}, deps = {}) {
     ];
     if (tmuxSessionName)
         badgeSublines.push(`tmux host: ${tmuxSessionName}`);
+    const stdoutCols = deps.stdoutColumns ?? process.stdout?.columns ?? 0;
+    const stdoutRows = deps.stdoutRows ?? process.stdout?.rows ?? 0;
+    const compactMast = stdoutIsTTY &&
+        ((stdoutCols > 0 && stdoutCols < WORDMARK_WIDTH + 4) || (stdoutRows > 0 && stdoutRows < 16));
     log(daemonOpener(`v${VERSION}`, {
         state: 'IDLE',
         badgeColor: 'green',
         badgeLabel: 'CONNECTED',
         badgeSublines,
+        compact: compactMast,
     }) + '\n\n');
     const headerMarker = c.green('[ + ]');
     const headerLabel = c.white('LISTENING  ·  READY FOR ACTIVATIONS');
@@ -458,7 +434,6 @@ export async function runDaemonCommand(args = [], options = {}, deps = {}) {
     }) + '\n');
     log('\n');
     pushTmuxStatus();
-    startFooter();
     while (running) {
         let firedThisPoll = false;
         try {
@@ -719,12 +694,8 @@ export async function runDaemonCommand(args = [], options = {}, deps = {}) {
                         emitSummary();
                     }
                 }
-                if (!firedThisPoll && pendingKills.length === 0 && !footerEnabled) {
-                    log(pollTick({
-                        pending: 0,
-                        sleepMs: fixedInterval ?? currentInterval,
-                        backingOff: fixedInterval === undefined && currentInterval > POLL_FAST_MS,
-                    }) + '\n');
+                if (!firedThisPoll && pendingKills.length === 0 && !tmuxChromeEnabled) {
+                    log(heartbeatLine() + '\n');
                 }
                 evictOldestToCap(seen, 500);
             }
@@ -736,13 +707,11 @@ export async function runDaemonCommand(args = [], options = {}, deps = {}) {
         if (options.oneShot)
             break;
         if (fixedInterval !== undefined) {
-            refreshFooter();
             await sleep(fixedInterval);
         }
         else {
             if (firedThisPoll)
                 currentInterval = POLL_FAST_MS;
-            refreshFooter();
             await sleep(currentInterval);
             if (!firedThisPoll) {
                 currentInterval = Math.min(currentInterval * 2, maxIntervalMs);

package/dist/lib/output.js

@@ -1,12 +1,15 @@
 import { ANSI, renderBannerHeader } from './banner.js';
 export { ANSI };
 export const BRAND = {
-    white: '\x1b[38;2;255;255;255m',
-    cyan: '\x1b[38;2;79;195;247m',
-    green: '\x1b[38;2;40;199;111m',
-    amber: '\x1b[38;2;255;159;67m',
-    red: '\x1b[38;2;255;76;81m',
-    muted: '\x1b[38;2;139;148;158m',
+    white: '\x1b[38;2;240;235;226m',
+    cream: '\x1b[38;2;240;235;226m',
+    blue: '\x1b[38;2;108;140;255m',
+    indigo: '\x1b[38;2;155;108;240m',
+    cyan: '\x1b[38;2;88;199;230m',
+    green: '\x1b[38;2;69;209;127m',
+    amber: '\x1b[38;2;255;180;84m',
+    red: '\x1b[38;2;255;92;108m',
+    muted: '\x1b[38;2;138;147;166m',
     bold: '\x1b[1m',
     reset: '\x1b[0m',
     underline: '\x1b[4m',
@@ -31,6 +34,9 @@ function paint(s, code, stream = process.stdout) {
 }
 export const c = {
     white: (s, stream) => paintRaw(s, BRAND.white, stream),
+    cream: (s, stream) => paintRaw(s, BRAND.cream, stream),
+    blue: (s, stream) => paintRaw(s, BRAND.blue, stream),
+    indigo: (s, stream) => paintRaw(s, BRAND.indigo, stream),
     cyan: (s, stream) => paintRaw(s, BRAND.cyan, stream),
     green: (s, stream) => paintRaw(s, BRAND.green, stream),
     amber: (s, stream) => paintRaw(s, BRAND.amber, stream),
@@ -137,17 +143,7 @@ const WORDMARK_LINES = [
 ];
 export const WORDMARK_WIDTH = 63;
 export const WORDMARK_HEIGHT = 6;
-export const WORDMARK_GRADIENT = [
-    '#13b9e2', '#1abadc', '#20bad7', '#27bbd1', '#2ebbcb', '#35bcc5', '#3bbdc0',
-    '#42bdba', '#49beb4', '#50bfae', '#50bfae', '#5dc0a3', '#64c09d', '#6bc197',
-    '#71c292', '#78c28c', '#7fc386', '#86c380', '#8cc47b', '#93c575', '#93c575',
-    '#a1c669', '#a7c664', '#aec75e', '#b5c858', '#bcc852', '#c2c94d', '#c9ca47',
-    '#d0ca41', '#d7cb3b', '#ddcb36', '#e4cc30', '#e0c536', '#dcbf3b', '#d8b841',
-    '#d4b246', '#d0ab4c', '#cca551', '#c89e57', '#c4975d', '#c09162', '#bc8a68',
-    '#bc8a68', '#bc8a68', '#b07679', '#ac707e', '#a86984', '#a36389', '#9f5c8f',
-    '#9b5694', '#974f9a', '#9348a0', '#8f42a5', '#8f42a5', '#8735b0', '#832eb6',
-    '#7f27bc', '#7b21c1', '#771ac7', '#7314cc', '#6f0dd2', '#6b07d7', '#6700dd',
-];
+export const WORDMARK_DOT_COLS = [31, 32, 33];
 function hexFg(hex) {
     const n = parseInt(hex.slice(1), 16);
     return `\x1b[38;2;${(n >> 16) & 255};${(n >> 8) & 255};${n & 255}m`;
@@ -163,8 +159,8 @@ function paintWordmarkLine(line, stream = process.stdout) {
             out += ' ';
             continue;
         }
-        const hex = WORDMARK_GRADIENT[i] ?? WORDMARK_GRADIENT[WORDMARK_GRADIENT.length - 1];
-        out += BRAND.bold + hexFg(hex) + ch + BRAND.reset;
+        const colour = WORDMARK_DOT_COLS.includes(i) ? BRAND.blue : BRAND.cream;
+        out += BRAND.bold + colour + ch + BRAND.reset;
     }
     return out;
 }
@@ -333,6 +329,43 @@ export function fixBlock(args) {
     });
     return lines.join('\n');
 }
+export function promptLine(opts = {}) {
+    const stream = opts.stream ?? process.stdout;
+    const cursor = asciiOnly() ? '_' : '▌';
+    return (`${c.cyan('~', stream)} ${c.green('$', stream)} ` +
+        `${c.bold(c.cream('nonbot', stream), stream)} ${c.blue('run', stream)}` +
+        c.cream(cursor, stream));
+}
+export function gradientRule(width, opts = {}) {
+    const stream = opts.stream ?? process.stdout;
+    const n = Math.max(0, Math.floor(width));
+    const glyph = asciiOnly() ? '-' : '━';
+    if (!isTTY(stream) || n === 0)
+        return glyph.repeat(n);
+    const from = [0x6c, 0x8c, 0xff];
+    const to = [0x9b, 0x6c, 0xf0];
+    let out = '';
+    for (let i = 0; i < n; i++) {
+        const t = n === 1 ? 0 : i / (n - 1);
+        const r = Math.round(from[0] + (to[0] - from[0]) * t);
+        const g = Math.round(from[1] + (to[1] - from[1]) * t);
+        const b = Math.round(from[2] + (to[2] - from[2]) * t);
+        out += `\x1b[38;2;${r};${g};${b}m${glyph}`;
+    }
+    return out + BRAND.reset;
+}
+export function compactMasthead(version, opts = {}) {
+    const stream = opts.stream ?? process.stdout;
+    const state = opts.state ?? 'IDLE';
+    const badgeColor = opts.badgeColor ?? 'green';
+    const badgeLabel = opts.badgeLabel ?? 'CONNECTED';
+    const dotGlyph = asciiOnly() ? '*' : '●';
+    const brand = `${c.bold(c.cream('non.bot', stream), stream)}${c.blue('.', stream)}`;
+    const badge = colorize(`${dotGlyph} ${badgeLabel}`, badgeColor, stream);
+    const sep = c.muted('·', stream);
+    const tail = [c.muted(`daemon ${version}`, stream), sep, c.muted(state, stream)].join(' ');
+    return `${brand} ${badge}  ${tail}`;
+}
 export const DAEMON_TAGLINES = [
     "click ▶ on the canvas. terminal opens here. that's it.",
 ];
@@ -348,10 +381,19 @@ export function daemonOpener(version, opts = {}) {
     const seed = opts.seed ?? Date.now();
     const tagline = pickDaemonTagline(seed, opts.pool);
     const state = opts.state ?? 'IDLE';
-    const breadcrumb = opts.breadcrumb ?? 'SYS://nonbot/daemon';
-    const breadcrumbLine = breadcrumb
-        ? `  ${c.cyan(breadcrumb, stream)}\n\n`
-        : '';
+    if (opts.compact) {
+        return compactMasthead(version, {
+            state,
+            badgeColor: opts.badgeColor ?? 'green',
+            badgeLabel: opts.badgeLabel ?? 'CONNECTED',
+            stream,
+        });
+    }
+    const topLine = opts.breadcrumb === ''
+        ? ''
+        : opts.breadcrumb
+            ? `  ${c.cyan(opts.breadcrumb, stream)}\n\n`
+            : `  ${promptLine({ stream })}\n\n`;
     const stamp = renderWordmarkWithBadge({
         badgeColor: opts.badgeColor ?? 'green',
         badgeLabel: opts.badgeLabel ?? 'CONNECTED',
@@ -369,8 +411,10 @@ export function daemonOpener(version, opts = {}) {
         subParts.push(c.muted(trackedCaps(state), stream));
     }
     const subtitleLine = `  ${subParts.join('  ')}`;
+    const ruleWidth = Math.min(46, Math.max(10, terminalWidth(opts.width) - 2));
+    const ruleLine = `  ${gradientRule(ruleWidth, { stream })}`;
     const taglineLine = tagline ? `\n\n  ${c.muted(tagline, stream)}` : '';
-    return `${breadcrumbLine}${stamp}\n\n${subtitleLine}${taglineLine}`;
+    return `${topLine}${stamp}\n\n${ruleLine}\n\n${subtitleLine}${taglineLine}`;
 }
 export function daemonCloser(opts = {}) {
     const stream = opts.stream ?? process.stdout;
@@ -475,27 +519,27 @@ export function resumedLine(activationId, stream = process.stdout) {
 }
 export function buildPaneBorderFormat(opts = {}) {
     const warn = opts.ascii ? '!! ' : '⚠ ';
-    return (`#{?#{==:#{@nb_state},waiting},#[fg=colour203 bold]${warn},}` +
+    return (`#{?#{==:#{@nb_state},waiting},#[fg=#ffb454 bold]${warn},}` +
         '#[fg=' +
-        '#{?#{==:#{@nb_state},waiting},colour203,' +
-        '#{?#{==:#{@nb_state},failed},colour203,' +
-        '#{?#{==:#{@nb_state},completed},colour78,' +
-        '#{?#{==:#{@nb_state},stopping},colour214,colour45}}}}' +
+        '#{?#{==:#{@nb_state},waiting},#ffb454,' +
+        '#{?#{==:#{@nb_state},failed},#ff5c6c,' +
+        '#{?#{==:#{@nb_state},completed},#45d17f,' +
+        '#{?#{==:#{@nb_state},stopping},#ffb454,#58c7e6}}}}' +
         ']' +
         ' #{pane_title} ');
 }
 export function buildTmuxStatusLeft(opts = {}) {
     const dot = opts.ascii ? '* ' : '● ';
-    return (' #[fg=#ffffff,bold]non.bot#[default] ' +
-        '#{?#{==:#{@nb_halted},1},#[fg=#ff4c51]HALTED,' +
-        `#[fg=#28c76f]${dot}CONNECTED}#[default] `);
+    return (' #[fg=#f0ebe2,bold]non#[fg=#6c8cff].#[fg=#f0ebe2]bot#[default] ' +
+        '#{?#{==:#{@nb_halted},1},#[fg=#ff5c6c]HALTED,' +
+        `#[fg=#45d17f]${dot}CONNECTED}#[default] `);
 }
 export function buildTmuxStatusRight(opts = {}) {
     const warn = opts.ascii ? '!!' : '⚠';
     const dot = '·';
-    return ('#[fg=#28c76f]#{@nb_running} run#[default] ' +
-        `#[fg=#8b949e]${dot} #{@nb_done} done` +
-        `#{?#{@nb_failed}, #[fg=#ff4c51]${dot} #{@nb_failed} fail,}#[default] ` +
-        `#{?#{@nb_needsyou},#[fg=#ff9f43,bold]${dot} ${warn} #{@nb_needsyou} NEEDS YOU ,}` +
-        `#[fg=#4fc3f7]${dot} #{host_short} ${dot} poll #{@nb_poll}s `);
+    return ('#[fg=#45d17f]#{@nb_running} run#[default] ' +
+        `#[fg=#8a93a6]${dot} #{@nb_done} done` +
+        `#{?#{@nb_failed}, #[fg=#ff5c6c]${dot} #{@nb_failed} fail,}#[default] ` +
+        `#{?#{@nb_needsyou},#[fg=#ffb454,bold]${dot} ${warn} #{@nb_needsyou} NEEDS YOU ,}` +
+        `#[fg=#58c7e6]${dot} #{host_short} ${dot} poll #{@nb_poll}s `);
 }

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '0.9.6';
+export const VERSION = '0.9.7';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nonbot/cli",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "type": "module",
   "description": "The local host for non.bot ▶ Run — opens a terminal on your machine and starts the work in your linked repo.",
   "license": "UNLICENSED",