pyre-cli 1.4.0 → 3.0.0

package/src/live/input.ts

@@ -9,7 +9,7 @@
 import readline from 'node:readline';
 import chalk from 'chalk';
 import { collectAll, StatsData } from '../monitors/index.js';
-import { THEMES, type ThemeName, type VisibleItems } from '../formatters/index.js';
+import { THEMES, type ThemeName, type VisibleItems, getTabHitboxes, TAB_BAR_ROW } from '../formatters/index.js';
 import { state, setStatus } from './state.js';
 import { exportSnapshot, startLogging, stopLogging, toggleLogging, writeLogRow } from './export.js';
 import { render, footerLine, checkAlerts, processRowBudget } from './render.js';
@@ -118,29 +118,33 @@ function killProcess(pidStr: string, signal: string = 'SIGTERM') {
    state.intervalHandle = setInterval(tick, state.interval * 1000);
  }
 
- async function tick() {
-   if (state.paused) return;
-   try {
-     const data = await collectAll({ detailed: state.detailed, processLimit: processRowBudget() });
-     state.lastData = data;
-
-     const temp = data.cpu.temperature ?? data.thermal.temperatures?.cpu_die ?? null;
-     state.history.push({
-       cpuUsage: data.cpu.usage,
-       memUsage: data.memory.usagePercent,
-       temp,
-       rxBytes: data.network.rxBytes,
-       txBytes: data.network.txBytes,
-       gpuUtil: data.gpu?.utilization,
-     });
-
-     writeLogRow(data);
-     checkAlerts(data);
-     render();
-   } catch {
-     // skip bad tick
-   }
- }
+  async function tick() {
+    if (state.paused) return;
+    try {
+      const data = await collectAll({ detailed: state.detailed, processLimit: processRowBudget() });
+      state.lastData = data;
+
+      const temp = data.cpu.temperature ?? data.thermal.temperatures?.cpu_die ?? null;
+      state.history.push({
+        cpuUsage: data.cpu.usage,
+        memUsage: data.memory.usagePercent,
+        temp,
+        rxBytes: data.network.rxBytes,
+        txBytes: data.network.txBytes,
+        gpuUtil: data.gpu?.utilization,
+        powerWatts: data.power?.combinedWatts ?? data.power?.cpuWatts ?? 0,
+        rxPackets: data.network.rxPackets,
+        txPackets: data.network.txPackets,
+        connections: data.network.connections ?? 0,
+      });
+
+      writeLogRow(data);
+      checkAlerts(data);
+      render();
+    } catch {
+      // skip bad tick
+    }
+  }
 
  /**
   * Start the interactive live dashboard.
@@ -149,163 +153,291 @@ function killProcess(pidStr: string, signal: string = 'SIGTERM') {
   * rendering interval.  Idempotent — calling while already
   * running is a no-op.
   */
- export async function startLive(opts: LiveOptions) {
-   if (state.running) return;
-   state.running = true;
-   state.paused = false;
-   state.detailed = !!opts.detailed;
-   state.interval = opts.interval;
-   if (opts.exportDir) state.exportDir = opts.exportDir;
-   state.termWidth = process.stdout.columns || 80;
-   state.termHeight = process.stdout.rows || 24;
-   state.history.reset();
-   state.history.setMaxLen(Math.max(20, Math.min(200, state.termWidth - 30)));
+  export async function startLive(opts: LiveOptions) {
+    if (state.running) return;
+    state.running = true;
+    state.paused = false;
+    state.detailed = !!opts.detailed;
+    state.interval = opts.interval;
+    if (opts.exportDir) state.exportDir = opts.exportDir;
+    state.termWidth = process.stdout.columns || 80;
+    state.termHeight = process.stdout.rows || 24;
+    state.history.reset();
+    state.history.setMaxLen(Math.max(20, Math.min(200, state.termWidth - 30)));
+
+    process.stdout.write('\x1b[?1049h');
+    process.stdout.write('\x1b[?25l');
+    process.stdout.write('\x1b[2J\x1b[H');
+    process.title = 'pyre';
+
+    if (state.mouseEnabled) {
+      process.stdout.write('\x1b[?1000h');
+    }
 
-   process.stdout.write('\x1b[?1049h');
-   process.stdout.write('\x1b[?25l');
-   process.stdout.write('\x1b[2J\x1b[H');
-   process.title = 'pyre';
+    await tick();
+    restartTicker();
 
-   await tick();
-   restartTicker();
+    if (opts.autoLog) startLogging();
 
-   if (opts.autoLog) startLogging();
+    readline.emitKeypressEvents(process.stdin);
+    if (process.stdin.isTTY) process.stdin.setRawMode(true);
+    process.stdin.resume();
 
-   readline.emitKeypressEvents(process.stdin);
-   if (process.stdin.isTTY) process.stdin.setRawMode(true);
-   process.stdin.resume();
+    process.stdout.on('resize', onResize);
 
-   process.stdout.on('resize', onResize);
+    state.keypressHandler = (str: string, key: readline.Key) => {
+      if (!key) return;
 
-   state.keypressHandler = (str: string, key: readline.Key) => {
-     if (!key) return;
+      if (key.ctrl && key.name === 'c') {
+        stopLive();
+        return;
+      }
 
-     if (key.ctrl && key.name === 'c') {
-       stopLive();
-       return;
-     }
+      if (state.inputMode) {
+        handleInputModeKey(str, key);
+        return;
+      }
 
-     if (state.inputMode) {
-       handleInputModeKey(str, key);
-       return;
-     }
+      if (key.mouse) {
+        handleMouseClick(key.mouse);
+        return;
+      }
 
-     switch (key.sequence) {
-       case '+':
-         state.interval += 1;
-         restartTicker();
-         setStatus(`Interval set to ${state.interval}s`);
-         return;
-       case '-':
-         state.interval = Math.max(1, state.interval - 1);
-         restartTicker();
-         setStatus(`Interval set to ${state.interval}s`);
-         return;
-       case '/':
-         state.inputMode = 'filter';
-         state.inputBuffer = state.processFilter;
-         render();
-         return;
-     }
+      if (key.sequence && key.sequence.startsWith('\x1b[M')) {
+        handleNormalMouse(key.sequence);
+        return;
+      }
 
-     switch (key.name) {
-       case 'q':
-         stopLive();
-         break;
-       case 'c':
-         state.inputMode = 'customizer';
-         state.customizerIndex = 0;
-         render();
-         break;
-       case 'p':
-         state.paused = !state.paused;
-         setStatus(state.paused ? 'Paused' : 'Resumed');
-         render();
-         break;
-        case 'g':
-          state.showGraphs = !state.showGraphs;
+      if (key.sequence && key.sequence.startsWith('\x1b[<')) {
+        handleSGRMouse(key.sequence);
+        return;
+      }
+
+      switch (key.sequence) {
+        case '+':
+          state.interval += 1;
+          restartTicker();
+          setStatus(`Interval set to ${state.interval}s`);
+          return;
+        case '-':
+          state.interval = Math.max(1, state.interval - 1);
+          restartTicker();
+          setStatus(`Interval set to ${state.interval}s`);
+          return;
+        case '/':
+          state.inputMode = 'filter';
+          state.inputBuffer = state.processFilter;
+          render();
+          return;
+        case '0': case '1': case '2': case '3': case '4':
+        case '5': case '6': case '7': case '8': case '9': {
+          const tabMap: Record<string, string> = {
+            '0': 'disk', '1': 'cpu', '2': 'mem', '3': 'gpu', '4': 'power',
+            '5': 'battery', '6': 'thermal', '7': 'network', '8': 'packets', '9': 'tasks'
+          };
+          const panelId = tabMap[key.sequence];
+          if (panelId) {
+            state.activePanel = state.activePanel === panelId ? 'grid' : panelId;
+            setStatus(state.activePanel === 'grid' ? 'Grid view' : `${panelId} panel`);
+            render();
+          }
+          return;
+        }
+        case 'P': {
+          state.activePanel = state.activePanel === 'process' ? 'grid' : 'process';
+          setStatus(state.activePanel === 'grid' ? 'Grid view' : 'Process panel');
           render();
+          return;
+        }
+      }
+
+      switch (key.name) {
+        case 'q':
+          stopLive();
           break;
-        case 'b':
-          state.graphMode = state.graphMode === 'spark' ? 'bar' : 'spark';
-          setStatus(`Graph mode: ${state.graphMode}`);
+        case 'left': {
+          const currentIdx = state.PANEL_TABS.findIndex(t => t.id === state.activePanel);
+          if (currentIdx > 0) {
+            state.activePanel = state.PANEL_TABS[currentIdx - 1].id;
+          } else if (currentIdx === -1) {
+            state.activePanel = state.PANEL_TABS[state.PANEL_TABS.length - 1].id;
+          }
+          setStatus(`Panel: ${state.activePanel}`);
           render();
           break;
-        case 'd':
-
-         state.detailed = !state.detailed;
-         setStatus(`Detailed sensor mode: ${state.detailed ? 'on' : 'off'}`);
-         break;
-       case 's':
-         const sortCycle: SortMode[] = ['cpu', 'mem', 'pid', 'user', 'command', 'state', 'threads', 'runtime'];
-         const curIdx = sortCycle.indexOf(state.sortMode);
-         state.sortMode = sortCycle[(curIdx + 1) % sortCycle.length];
-         setStatus(`Sorting by ${state.sortMode}`);
-         render();
-         break;
-       case 'k':
-         state.inputMode = 'kill';
-         state.inputBuffer = '';
-         render();
-         break;
-       case 'S':
-         state.inputMode = 'signal';
-         state.inputBuffer = 'SIGTERM';
-         render();
-         break;
-       case 't':
-         state.treeView = !state.treeView;
-         setStatus(state.treeView ? 'Tree view enabled' : 'Flat view enabled');
-         render();
-         break;
-       case 'e':
-         exportSnapshot();
-         render();
-         break;
-       case 'l':
-         toggleLogging();
-         render();
-         break;
-       case 'f':
-         state.exportFormat = state.exportFormat === 'json' ? 'csv' : state.exportFormat === 'csv' ? 'tsv' : 'json';
-         setStatus(`Export format: ${state.exportFormat}`);
-         render();
-         break;
-     }
-   };
+        }
+        case 'right': {
+          const currentIdx = state.PANEL_TABS.findIndex(t => t.id === state.activePanel);
+          if (currentIdx < state.PANEL_TABS.length - 1) {
+            state.activePanel = state.PANEL_TABS[currentIdx + 1].id;
+          } else if (currentIdx === -1) {
+            state.activePanel = state.PANEL_TABS[0].id;
+          }
+          setStatus(`Panel: ${state.activePanel}`);
+          render();
+          break;
+        }
+        case 'c':
+          state.inputMode = 'customizer';
+          state.customizerIndex = 0;
+          render();
+          break;
+        case 'p':
+          state.paused = !state.paused;
+          setStatus(state.paused ? 'Paused' : 'Resumed');
+          render();
+          break;
+         case 'g':
+           state.showGraphs = !state.showGraphs;
+           render();
+           break;
+         case 'b':
+           state.graphMode = state.graphMode === 'spark' ? 'bar' : 'spark';
+           setStatus(`Graph mode: ${state.graphMode}`);
+           render();
+           break;
+         case 'd':
+
+          state.detailed = !state.detailed;
+          setStatus(`Detailed sensor mode: ${state.detailed ? 'on' : 'off'}`);
+          break;
+        case 's':
+          const sortCycle: SortMode[] = ['cpu', 'mem', 'pid', 'user', 'command', 'state', 'threads', 'runtime'];
+          const curIdx = sortCycle.indexOf(state.sortMode);
+          state.sortMode = sortCycle[(curIdx + 1) % sortCycle.length];
+          setStatus(`Sorting by ${state.sortMode}`);
+          render();
+          break;
+        case 'k':
+          state.inputMode = 'kill';
+          state.inputBuffer = '';
+          render();
+          break;
+        case 'S':
+          state.inputMode = 'signal';
+          state.inputBuffer = 'SIGTERM';
+          render();
+          break;
+        case 't':
+          state.treeView = !state.treeView;
+          setStatus(state.treeView ? 'Tree view enabled' : 'Flat view enabled');
+          render();
+          break;
+        case 'e':
+          exportSnapshot();
+          render();
+          break;
+        case 'l':
+          toggleLogging();
+          render();
+          break;
+        case 'f':
+          state.exportFormat = state.exportFormat === 'json' ? 'csv' : state.exportFormat === 'csv' ? 'tsv' : 'json';
+          setStatus(`Export format: ${state.exportFormat}`);
+          render();
+          break;
+        case 'tab':
+          cycleTab(1);
+          break;
+        case 'left':
+          cycleTab(-1);
+          break;
+        case 'right':
+          cycleTab(1);
+          break;
+        default:
+          if (str && str.length === 1) {
+            const tabId = tabKeyToId(str);
+            if (tabId) {
+              state.activePanel = tabId;
+              setStatus(`Panel: ${tabId.toUpperCase()}`);
+              render();
+            }
+          }
+      }
+    };
 
-   process.stdin.on('keypress', state.keypressHandler);
-   process.once('SIGINT', () => stopLive());
- }
+    process.stdin.on('keypress', state.keypressHandler);
+    process.once('SIGINT', () => stopLive());
+  }
 
- export function stopLive() {
-   if (state.intervalHandle) {
-     clearInterval(state.intervalHandle);
-     state.intervalHandle = null;
-   }
-   if (state.statusTimer) {
-     clearTimeout(state.statusTimer);
-     state.statusTimer = null;
-   }
-   if (state.logStream) {
-     state.logStream.end();
-     state.logStream = null;
-   }
-   if (state.keypressHandler) {
-     process.stdin.removeListener('keypress', state.keypressHandler);
-     state.keypressHandler = null;
-   }
-   process.stdout.removeListener('resize', onResize);
+  function tabKeyToId(str: string): string | null {
+    const map: Record<string, string> = { '1': 'cpu', '2': 'mem', '3': 'gpu', '4': 'power', '5': 'battery', '6': 'thermal', '7': 'network', '8': 'packets', '9': 'tasks', '0': 'disk', 'p': 'process' };
+    return map[str] ?? null;
+  }
+
+  function cycleTab(direction: number) {
+    const tabs = state.PANEL_TABS.map(t => t.id);
+    const current = state.activePanel === 'grid' ? -1 : tabs.indexOf(state.activePanel);
+    const next = (current + direction + tabs.length) % tabs.length;
+    state.activePanel = tabs[next];
+    setStatus(`Panel: ${state.activePanel.toUpperCase()}`);
+    render();
+  }
+
+  function handleNormalMouse(seq: string) {
+    if (seq.length < 6) return;
+    const cb = seq.charCodeAt(3) - 32;
+    const cx = seq.charCodeAt(4) - 32;
+    const cy = seq.charCodeAt(5) - 32;
+    if (cb === 0 || cb === 1) {
+      handleMouseClick(cy, cx);
+    }
+  }
+
+  function handleSGRMouse(seq: string) {
+    const match = seq.match(/^\x1b\[<(\d+);(\d+);(\d+)([Mm])/);
+    if (!match) return;
+    const button = parseInt(match[1]);
+    const cx = parseInt(match[2]);
+    const cy = parseInt(match[3]);
+    if (button === 0 || button === 1) {
+      handleMouseClick(cy, cx);
+    }
+  }
 
-   state.running = false;
-   state.logging = false;
+  function handleMouseClick(y: number, x: number) {
+    if (y !== TAB_BAR_ROW) return;
+    const hitboxes = getTabHitboxes();
+    const hit = hitboxes.find(h => x >= h.start && x < h.end);
+    if (hit) {
+      state.activePanel = state.activePanel === hit.id ? 'grid' : (hit.id as typeof state.activePanel);
+      setStatus(state.activePanel === 'grid' ? 'Grid view' : `Panel: ${hit.id.toUpperCase()}`);
+      render();
+    }
+  }
+
+  export function stopLive() {
+    if (state.intervalHandle) {
+      clearInterval(state.intervalHandle);
+      state.intervalHandle = null;
+    }
+    if (state.statusTimer) {
+      clearTimeout(state.statusTimer);
+      state.statusTimer = null;
+    }
+    if (state.logStream) {
+      state.logStream.end();
+      state.logStream = null;
+    }
+    if (state.keypressHandler) {
+      process.stdin.removeListener('keypress', state.keypressHandler);
+      state.keypressHandler = null;
+    }
+    process.stdout.removeListener('resize', onResize);
 
-   if (process.stdin.isTTY) process.stdin.setRawMode(false);
-   process.stdin.pause();
+    state.running = false;
+    state.logging = false;
 
-   process.stdout.write('\x1b[?25h');
-   process.stdout.write('\x1b[?1049l');
-   process.stdout.write('\x1b[2J\x1b[H');
+    if (process.stdin.isTTY) process.stdin.setRawMode(false);
+    process.stdin.pause();
+
+    if (state.mouseEnabled) {
+      process.stdout.write('\x1b[?1000l');
+    }
+    process.stdout.write('\x1b[?25h');
+    process.stdout.write('\x1b[?1049l');
+    process.stdout.write('\x1b[2J\x1b[H');
 
-   process.exit(0);
- }
+    process.exit(0);
+  }

package/src/live/render.ts

@@ -19,7 +19,8 @@ import type { StatsData } from '../monitors/index.js';
  */
 function processRowBudget(): number {
   const columns = gridColumns(state.termWidth);
-  const cardRows = Math.ceil(6 / columns);
+  const visibleCards = Object.values(state.visiblePanels).filter(v => v !== false).length;
+  const cardRows = Math.ceil(visibleCards / columns);
   const reserved = 2 + cardRows * 8 + 11 + (state.showGraphs ? 9 : 0) + 4;
   return Math.max(3, Math.min(40, state.termHeight - reserved));
 }
@@ -65,6 +66,7 @@ function render() {
       theme: state.currentTheme,
       visible: state.visiblePanels,
       treeView: state.treeView,
+      activePanel: state.activePanel,
     })
   );
 
@@ -76,21 +78,21 @@ function render() {
   lines.push('');
   lines.push(footerLine());
 
-if (state.inputMode === 'customizer') {
-     lines.push(renderCustomizerOverlay());
-   } else if (state.inputMode === 'filter') {
-     lines.push(chalk.cyan(`  Filter processes: ${state.inputBuffer}_`));
-   } else if (state.inputMode === 'kill') {
-     lines.push(chalk.cyan(`  Kill PID: ${state.inputBuffer}_  (enter to confirm, esc to cancel)`));
-    } else if (state.inputMode === 'signal') {
-      const sigIdx = state.SIGNAL_OPTIONS.indexOf(state.inputBuffer as typeof state.SIGNAL_OPTIONS[number]);
-      const sigList = state.SIGNAL_OPTIONS.map((s, i) => i === sigIdx ? chalk.yellow(s) : chalk.dim(s)).join('  ');
-      lines.push(chalk.cyan(`  Signal: ${state.inputBuffer}_`));
-      lines.push(chalk.dim(`  ${sigList}`));
-      lines.push(chalk.dim('  ↑/↓ to select, Enter to confirm, Esc to cancel'));
-   } else if (state.statusMessage) {
-     lines.push(`  ${state.statusMessage}`);
-   }
+  if (state.inputMode === 'customizer') {
+      lines.push(renderCustomizerOverlay());
+    } else if (state.inputMode === 'filter') {
+      lines.push(chalk.cyan(`  Filter processes: ${state.inputBuffer}_`));
+    } else if (state.inputMode === 'kill') {
+      lines.push(chalk.cyan(`  Kill PID: ${state.inputBuffer}_  (enter to confirm, esc to cancel)`));
+     } else if (state.inputMode === 'signal') {
+       const sigIdx = state.SIGNAL_OPTIONS.indexOf(state.inputBuffer as typeof state.SIGNAL_OPTIONS[number]);
+       const sigList = state.SIGNAL_OPTIONS.map((s, i) => i === sigIdx ? chalk.yellow(s) : chalk.dim(s)).join('  ');
+       lines.push(chalk.cyan(`  Signal: ${state.inputBuffer}_`));
+       lines.push(chalk.dim(`  ${sigList}`));
+       lines.push(chalk.dim('  ↑/↓ to select, Enter to confirm, Esc to cancel'));
+     } else if (state.statusMessage) {
+       lines.push(`  ${state.statusMessage}`);
+     }
 
   process.stdout.write('\x1b[2J\x1b[H');
   process.stdout.write(lines.join('\n'));
@@ -104,27 +106,29 @@ function footerLine(): string {
       ['g', state.showGraphs ? 'hide graphs' : 'show graphs'],
       ['b', `graph:${state.graphMode}`],
       ['d', state.detailed ? 'basic' : 'detailed'],
-
-     ['s', `sort:${state.sortMode}`],
-     ['/', 'filter'],
-     ['k', 'kill'],
-     ['S', 'signal'],
-     ['t', state.treeView ? 'flat' : 'tree'],
-     ['e', 'export'],
-     ['l', state.logging ? 'stop log' : 'log'],
-     ['f', state.exportFormat],
-     ['+/-', `${state.interval}s`],
-   ];
+      ['←/→', 'tab'],
+      ['1-9', 'panels'],
+      ['s', `sort:${state.sortMode}`],
+      ['/', 'filter'],
+      ['k', 'kill'],
+      ['S', 'signal'],
+      ['t', state.treeView ? 'flat' : 'tree'],
+      ['e', 'export'],
+      ['l', state.logging ? 'stop log' : 'log'],
+      ['f', state.exportFormat],
+      ['+/-', `${state.interval}s`],
+    ];
     const keyStr = keys.map(([k, label]) => `${chalk.hex('#50fa7b').bold(k)} ${chalk.dim(label)}`).join(chalk.dim('  |  '));
 
 
    const badges: string[] = [];
    if (state.paused) badges.push(chalk.yellow.bold('⏸ PAUSED'));
    if (state.logging) badges.push(chalk.red.bold('● REC'));
+   if (state.activePanel !== 'grid') badges.push(chalk.cyan.bold(`◉ ${state.activePanel.toUpperCase()}`));
    const badgeStr = badges.join('  ');
 
    return badgeStr ? `${keyStr}    ${badgeStr}` : keyStr;
- }
+  }
 
 function checkAlerts(data: StatsData) {
   const temp = data.cpu.temperature ?? data.thermal.temperatures?.cpu_die ?? null;