@bhooai/nexus-cli 2.0.9 → 2.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bhooai/nexus-cli",
-  "version": "2.0.9",
+  "version": "2.0.12",
   "description": "BhooAI Nexus v2 CLI — init, dev, build, test, scaffolding, plugins, queue, db.",
   "license": "MIT",
   "type": "module",

package/src/devPanel.ts

@@ -35,6 +35,8 @@ export interface DevPanelOptions {
 
 type Tab = 'services' | 'logs' | 'commands' | 'features' | 'settings';
 
+let isCapturing = false;
+
 const TABS: Array<{ id: Tab; label: string }> = [
   { id: 'services', label: 'Services' },
   { id: 'logs', label: 'Logs' },
@@ -121,16 +123,27 @@ export async function startDevPanel(opts: DevPanelOptions): Promise<void> {
   };
 
   let lastRender = 0;
+  let throttleTimer: ReturnType<typeof setTimeout> | null = null;
 
   function throttledRender(): void {
+    if (isCapturing || state.quit) return;
     const now = Date.now();
-    if (now - lastRender < 80) return;
+    if (now - lastRender < 80) {
+      if (!throttleTimer) {
+        throttleTimer = setTimeout(() => {
+          throttleTimer = null;
+          lastRender = Date.now();
+          render();
+        }, 80);
+      }
+      return;
+    }
     lastRender = now;
     render();
   }
 
   function render(): void {
-    if (state.quit) return;
+    if (state.quit || isCapturing) return;
     tui.draw(buildRows(state, services, palette, projectRoot), helpText(state));
   }
 
@@ -146,6 +159,7 @@ export async function startDevPanel(opts: DevPanelOptions): Promise<void> {
   render();
 
   await tui.wait();
+  if (throttleTimer) { clearTimeout(throttleTimer); throttleTimer = null; }
   tui.exit();
   services.onLog = null;
   opts.onQuit?.();
@@ -206,12 +220,6 @@ function onKey(state: PanelState, str: string, key: KeyInfo, ctx: Ctx): void {
     ctx.redraw();
     return;
   }
-  if (key.name === 'q') {
-    state.confirmQuit = true;
-    state.quitIndex = 0;
-    ctx.redraw();
-    return;
-  }
   if (key.name === 'escape') {
     if (state.tab === 'commands' && state.cmdFilter) {
       state.cmdFilter = '';
@@ -231,7 +239,8 @@ function onKey(state: PanelState, str: string, key: KeyInfo, ctx: Ctx): void {
   }
   if (state.showHelp) return;
 
-  // Type-to-filter in the Commands tab.
+  // Type-to-filter in the Commands tab — must be before single-letter shortcuts
+  // so 'q','s','t','r','l','a','d' act as filter characters instead of hotkeys.
   if (state.tab === 'commands' && str && !key.ctrl && !key.meta && str.length === 1 && str !== '?') {
     state.cmdFilter += str;
     const fp = filteredPalette(ctx.palette, state.cmdFilter);
@@ -255,6 +264,12 @@ function onKey(state: PanelState, str: string, key: KeyInfo, ctx: Ctx): void {
     ctx.redraw();
     return;
   }
+  if (key.name === 'q') {
+    state.confirmQuit = true;
+    state.quitIndex = 0;
+    ctx.redraw();
+    return;
+  }
 
   switch (key.name) {
     case 'tab': {
@@ -286,13 +301,13 @@ function onKey(state: PanelState, str: string, key: KeyInfo, ctx: Ctx): void {
       void activate(state, ctx);
       break;
     case 's':
-      ctx.services.start(ctx.services.services[state.svcIndex]?.name ?? '');
+      if (state.tab === 'services' || state.tab === 'logs') ctx.services.start(ctx.services.services[state.svcIndex]?.name ?? '');
       break;
     case 't':
-      ctx.services.stop(ctx.services.services[state.svcIndex]?.name ?? '');
+      if (state.tab === 'services' || state.tab === 'logs') ctx.services.stop(ctx.services.services[state.svcIndex]?.name ?? '');
       break;
     case 'r':
-      ctx.services.restart(ctx.services.services[state.svcIndex]?.name ?? '');
+      if (state.tab === 'services' || state.tab === 'logs') ctx.services.restart(ctx.services.services[state.svcIndex]?.name ?? '');
       break;
     case 'l':
       state.tab = 'logs';
@@ -394,7 +409,10 @@ async function runSelectedCommand(state: PanelState, cmd: CommandItem, inlineArg
   ctx.redraw();
 
   if (cmd.interactive) {
-    // Suspend panel → real TTY → resume.
+    // Suspend panel → real TTY → resume. Suppress log redraws while suspended
+    const prevLog = ctx.services.onLog;
+    ctx.services.onLog = null;
+    isCapturing = true;
     ctx.tui.suspend();
     try {
       const bin = resolveCliBin();
@@ -404,6 +422,8 @@ async function runSelectedCommand(state: PanelState, cmd: CommandItem, inlineArg
       push(state, `✗ ${cmd.name} failed: ${(err as Error).message}`);
     }
     ctx.tui.resume();
+    isCapturing = false;
+    ctx.services.onLog = prevLog;
     ctx.redraw();
     return;
   }
@@ -411,6 +431,9 @@ async function runSelectedCommand(state: PanelState, cmd: CommandItem, inlineArg
   const argv = inlineArgs ? inlineArgs.trim().split(/\s+/) : [];
   const origOut = process.stdout.write.bind(process.stdout);
   const origErr = process.stderr.write.bind(process.stderr);
+  const prevLog2 = ctx.services.onLog;
+  isCapturing = true;
+  ctx.services.onLog = null;
   const sink = (chunk: string | Buffer) => {
     push(state, String(chunk));
     return true;
@@ -425,6 +448,8 @@ async function runSelectedCommand(state: PanelState, cmd: CommandItem, inlineArg
   } finally {
     (process.stdout as unknown as { write: Function }).write = origOut;
     (process.stderr as unknown as { write: Function }).write = origErr;
+    isCapturing = false;
+    ctx.services.onLog = prevLog2;
   }
   ctx.redraw();
 }
@@ -437,12 +462,17 @@ function push(state: PanelState, text: string): void {
 }
 
 async function runSpawned(cmd: string, args: string[], ctx: Ctx): Promise<void> {
+  const prevLog = ctx.services.onLog;
+  ctx.services.onLog = null;
+  isCapturing = true;
   ctx.tui.suspend();
   try {
     const bin = resolveCliBin();
     await spawnNode(bin, [cmd, ...args]);
   } catch { /* ignore */ }
   ctx.tui.resume();
+  isCapturing = false;
+  ctx.services.onLog = prevLog;
   ctx.redraw();
 }
 
@@ -530,23 +560,6 @@ function prevSelectable(list: PaletteRow[], current: number, dir: number): numbe
 function filteredPalette(palette: PaletteRow[], filter: string): PaletteRow[] {
   if (!filter) return palette;
   const q = filter.toLowerCase();
-  const result: PaletteRow[] = [];
-  let currentHeader: PaletteRow | null = null;
-  let headerHasMatch = false;
-  for (const row of palette) {
-    if (row.kind === 'header') {
-      if (currentHeader && headerHasMatch) result.push(currentHeader);
-      currentHeader = row;
-      headerHasMatch = false;
-      continue;
-    }
-    if (row.cmd.name.toLowerCase().includes(q) || row.cmd.desc.toLowerCase().includes(q)) {
-      headerHasMatch = true;
-      result.push(row);
-    }
-  }
-  if (currentHeader && headerHasMatch) result.push(currentHeader);
-  // Re-headers got pushed to the end; rebuild with headers in the right place.
   const ordered: PaletteRow[] = [];
   let pendingHeader: PaletteRow | null = null;
   for (const row of palette) {
@@ -819,5 +832,5 @@ function helpText(state: PanelState): string {
 }
 
 function clamp(n: number, lo: number, hi: number): number {
-  return Math.min(Math.max(n, lo), Math.max(lo, hi));
+  return Math.min(Math.max(n, lo), hi);
 }

package/src/devServiceManager.ts

@@ -219,12 +219,23 @@ export class ServiceManager {
   }
 
   private push(svc: ManagedService, text: string, source: 'stdout' | 'stderr' | 'system' = 'stdout'): void {
-    const lines = text.split(/\r?\n/);
+    // Sanitize terminal control sequences that would otherwise move the cursor
+    // when rendered in the TUI panel (e.g. \r progress bars, clear lines, alt buffer)
+    const sanitized = text
+      .replace(/\r/g, '')
+      .replace(/\x1b\[\?25[hl]/g, '')
+      .replace(/\x1b\[\?1049[hl]/g, '')
+      .replace(/\x1b\[2[JK]/g, '')
+      .replace(/\x1b\[[0-9;]*[ABCDGKHf]/g, '');
+    const lines = sanitized.split(/\n/);
     for (const line of lines) {
       if (!line.trim()) continue;
+      // Keep color codes for panel rendering, but strip for level detection
+      const stripped = line.replace(/\x1b\[[0-9;?]*[A-Za-z]/g, '');
+      if (!stripped.trim()) continue;
       svc.logBuffer.push(line);
       if (svc.logBuffer.length > MAX_LOG_LINES) svc.logBuffer.shift();
-      this.allLogs.push({ service: svc.name, ts: Date.now(), source, level: detectLevel(line), line });
+      this.allLogs.push({ service: svc.name, ts: Date.now(), source, level: detectLevel(stripped), line });
       if (this.allLogs.length > MAX_ALL_LOGS) this.allLogs.shift();
     }
     this.onLog?.(svc.name);

package/src/launcher.ts

@@ -95,10 +95,22 @@ function handleMenuKey(state: MenuState, items: MenuItem[], tui: Tui, _str: stri
     return;
   }
   if (key.name === 'up') {
-    state.index = Math.max(0, state.index - 1);
+    let next = state.index;
+    for (let i = 0; i < items.length; i++) {
+      next = Math.max(0, next - 1);
+      if (items[next]?.enabled) break;
+      if (next === 0) break;
+    }
+    state.index = next;
     renderMenu(state, items, tui);
   } else if (key.name === 'down') {
-    state.index = Math.min(items.length - 1, state.index + 1);
+    let next = state.index;
+    for (let i = 0; i < items.length; i++) {
+      next = Math.min(items.length - 1, next + 1);
+      if (items[next]?.enabled) break;
+      if (next === items.length - 1) break;
+    }
+    state.index = next;
     renderMenu(state, items, tui);
   } else if (key.name === 'return' || key.name === 'enter') {
     const item = items[state.index];

package/src/tui.ts

@@ -91,27 +91,40 @@ export class Tui {
       readline.emitKeypressEvents(input);
       input.on('keypress', this.keypress);
     }
-    output.write(ANSI.altOn + ANSI.hideCursor);
+    if (output.isTTY) output.write(ANSI.altOn + ANSI.hideCursor + ANSI.clear);
     process.on('SIGINT', this.onSignal);
     process.on('SIGTERM', this.onSignal);
   }
 
   /** Leave the screen so a child process can own the TTY. */
   suspend(): void {
-    input.setRawMode?.(false);
-    output.write(ANSI.altOff + ANSI.showCursor);
+    input.removeListener('keypress', this.keypress);
+    process.removeListener('SIGINT', this.onSignal);
+    process.removeListener('SIGTERM', this.onSignal);
+    if (input.isTTY) input.setRawMode?.(false);
+    if (output.isTTY) output.write(ANSI.altOff + ANSI.showCursor);
   }
 
   resume(): void {
-    input.setRawMode?.(true);
-    input.resume?.();
-    output.write(ANSI.altOn + ANSI.hideCursor);
+    // Ensure idempotent — remove stale handlers before re-adding.
+    input.removeListener('keypress', this.keypress);
+    process.removeListener('SIGINT', this.onSignal);
+    process.removeListener('SIGTERM', this.onSignal);
+    if (input.isTTY) {
+      input.setRawMode?.(true);
+      input.resume?.();
+      readline.emitKeypressEvents(input);
+      input.on('keypress', this.keypress);
+    }
+    process.on('SIGINT', this.onSignal);
+    process.on('SIGTERM', this.onSignal);
+    if (output.isTTY) output.write(ANSI.altOn + ANSI.hideCursor + ANSI.clear);
   }
 
   exit(): void {
     input.removeListener('keypress', this.keypress);
-    input.setRawMode?.(false);
-    output.write(ANSI.altOff + ANSI.showCursor);
+    if (input.isTTY) input.setRawMode?.(false);
+    if (output.isTTY) output.write(ANSI.altOff + ANSI.showCursor);
     process.removeListener('SIGINT', this.onSignal);
     process.removeListener('SIGTERM', this.onSignal);
   }
@@ -119,25 +132,71 @@ export class Tui {
   /** Paint a frame. `rows` are the body; `footer` is the final status line. */
   draw(rows: string[], footer = ''): void {
     const H = output.rows || 24;
+    const W = output.columns || 80;
     const body = fitLines(rows);
-    let out = ANSI.clear;
+    const clippedFooter = footer ? clipAnsi(footer, W) : '';
+    let out = '';
+    if (output.isTTY) out += ANSI.clear;
     out += body.join('\n');
-    out += ANSI.move(H, 1);
-    out += footer;
-    output.write(out);
+    // Pad body to H-1 lines so previous longer frames don't leave stale lines.
+    const bodyLines = body.length;
+    if (bodyLines < H - 1) out += '\n'.repeat(H - 1 - bodyLines);
+    out += ANSI.move(H, 1) + '\x1b[2K';
+    if (clippedFooter) out += clippedFooter;
+    if (output.isTTY) output.write(out);
+    else output.write(body.join('\n') + (clippedFooter ? '\n' + stripAnsi(clippedFooter) : '') + '\n');
   }
 
   /** Resolve once `quit` becomes true. */
   async wait(): Promise<void> {
     while (!this._quit) {
-      await new Promise((r) => setTimeout(r, 100));
+      await new Promise((r) => setTimeout(r, 50));
     }
   }
 }
 
-/** Strip ANSI color codes from a string. */
+/** Strip ANSI escape codes from a string (SGR + CSI + ESC sequences). */
 export function stripAnsi(text: string): string {
-  return text.replace(/\x1b\[[0-9;]*m/g, '');
+  return text
+    .replace(/\x1b\[[0-9;?]*[A-Za-z]/g, '')
+    .replace(/\x1b\][^\x07]*\x07/g, '')
+    .replace(/\x1b\(B/g, '')
+    .replace(/\x1b\[[0-9;]*m/g, '');
+}
+
+/** Clip an ANSI-colored string to `width` visible columns, preserving leading color. */
+function clipAnsi(text: string, width: number): string {
+  if (stripAnsi(text).length <= width) return text;
+  let out = '';
+  let used = 0;
+  let i = 0;
+  let sawColor = false;
+  while (i < text.length && used < width) {
+    const ch = text[i]!;
+    if (ch === '\x1b') {
+      let j = i + 1;
+      if (text.charCodeAt(j) === 0x5b) {
+        j++;
+        while (j < text.length) {
+          const c = text.charCodeAt(j);
+          if (c >= 0x20 && c <= 0x3f) { j++; continue; }
+          break;
+        }
+        if (j < text.length) j++;
+      } else if (j < text.length) {
+        j++;
+      }
+      out += text.slice(i, j);
+      sawColor = true;
+      i = j;
+    } else {
+      out += ch;
+      used++;
+      i++;
+    }
+  }
+  if (sawColor && !out.endsWith(ANSI.reset)) out += ANSI.reset;
+  return out;
 }
 
 /** Spawn `node <bin> <args>` with inherited stdio (used for interactive CLI commands). */

package/src/wizard.ts

@@ -300,10 +300,9 @@ function pageExamples(state: WizardState, key: KeyInfo, tui: Tui): void {
 }
 
 function pageAdmin(state: WizardState, str: string, key: KeyInfo): void {
-  const isYes = state.features.has('admin');
   if (key.name === 'left' || key.name === 'right' || key.name === 'up' || key.name === 'down') {
-    state.features.add('admin');
-    if (isYes) state.features.delete('admin');
+    if (state.features.has('admin')) state.features.delete('admin');
+    else state.features.add('admin');
   } else if (key.name === 'return' || key.name === 'enter') {
     state.page = 'features';
   } else if (str && /y/i.test(str)) {
@@ -501,7 +500,7 @@ function titleBar(state: WizardState, W: number): string {
   const n = stepIndex(state.page) + 1;
   const right = `${ANSI.dim}Step ${n} of ${STEPS.length}${ANSI.reset}`;
   const gap = Math.max(1, W - visibleWidth(left) - visibleWidth(right));
-  return `${left}${' '.repeat(gap)}${right}`;
+  return clipVisible(`${left}${' '.repeat(gap)}${right}`, W);
 }
 
 function progressDots(state: WizardState): string {

package/templates/base/apps/admin/postcss.config.js

@@ -1,5 +1,10 @@
 import { createPreset } from '@bhooai/nexus-postcss';
 
 export default createPreset({
-  extraContent: ['./src/**/*.{ts,tsx}', '../../node_modules/@bhooai/nexus-admin/src/**/*.{ts,tsx,js}'],
+  extraContent: [
+    './src/**/*.{ts,tsx}',
+    '../../node_modules/@bhooai/nexus-admin/src/**/*.{ts,tsx,js}',
+    './node_modules/@bhooai/nexus-admin/src/**/*.{ts,tsx,js}',
+    '../../../node_modules/@bhooai/nexus-admin/src/**/*.{ts,tsx,js}',
+  ],
 });

package/templates/base/apps/admin/tailwind.config.js

@@ -3,7 +3,10 @@ export default {
   content: [
     './index.html',
     './src/**/*.{ts,tsx}',
+    // When admin is package-only, scan the published package so admin-* utilities are not purged
     '../../node_modules/@bhooai/nexus-admin/src/**/*.{ts,tsx,js}',
+    './node_modules/@bhooai/nexus-admin/src/**/*.{ts,tsx,js}',
+    '../../../node_modules/@bhooai/nexus-admin/src/**/*.{ts,tsx,js}',
   ],
   theme: { extend: {} },
   plugins: [],