pyre-cli 5.1.0 → 6.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pyre-cli",
-  "version": "5.1.0",
+  "version": "6.1.0",
   "description": "CLI Mac monitoring tool: temps, system stats, live dashboard, packet monitor, battery predictor, export",
   "main": "dist/index.js",
   "type": "module",

package/src/completions.ts

@@ -0,0 +1,118 @@
+export function generateZshCompletions(): string {
+  return `#compdef pyre
+
+_pyre() {
+    local -a commands
+    commands=(
+        'live:Start interactive live monitoring dashboard'
+        'info:Display static system overview'
+        'doctor:Run system permissions and diagnostic checks'
+        'web:Launch web dashboard server'
+        'config:Show or reset configuration options'
+        'p2p:P2P streaming server or client'
+        'ssh:Stream metrics over SSH'
+        'bench:Benchmark command while logging system stats'
+        'completions:Generate shell completion scripts'
+    )
+
+    _arguments -s \\
+        '(-j --json)'{-j,--json}'[Output snapshot as JSON]' \\
+        '--html[Output snapshot as HTML]' \\
+        '--md[Output snapshot as Markdown]' \\
+        '(-c --csv)'{-c,--csv}'[Output snapshot as CSV]' \\
+        '(-t --tsv)'{-t,--tsv}'[Output snapshot as TSV]' \\
+        '--detailed[Include detailed system info and sensor readings]' \\
+        '--theme[Default theme]:theme:(default dracula cyberpunk monochrome nord gruvbox)' \\
+        '--interval[Refresh interval in seconds]:seconds:' \\
+        '--once[Show a single static snapshot]' \\
+        '--out[Write snapshot output to file]:file:_files' \\
+        '--export-dir[Directory for snapshot exports and logs]:directory:_files -/' \\
+        '--log[Start continuous CSV logging]' \\
+        '--tree[Show process tree view]' \\
+        '--sort[Sort processes by]:key:(cpu mem pid user command state threads runtime)' \\
+        '--packets[Include packet monitor panel]' \\
+        '--limit[Max processes to include]:count:' \\
+        '--alert-cpu[CPU alert threshold pct]:pct:' \\
+        '--alert-temp[CPU alert threshold temp C]:temp:' \\
+        '--temp-unit[Temperature display unit]:unit:(c f)' \\
+        '*::command:->command'
+
+    case $state in
+        command)
+            _describe -t commands 'pyre command' commands
+            ;;
+    esac
+}
+
+_pyre "$@"
+`;
+}
+
+export function generateBashCompletions(): string {
+  return `# bash completion for pyre
+
+_pyre_completions() {
+    local cur prev opts commands
+    COMPREPLY=()
+    cur="\${COMP_WORDS[COMP_CWORD]}"
+    prev="\${COMP_WORDS[COMP_CWORD-1]}"
+    commands="live info doctor web config p2p ssh bench completions"
+    opts="--json --html --md --csv --tsv --detailed --theme --interval --once --out --export-dir --log --tree --sort --packets --limit --alert-cpu --alert-temp --temp-unit"
+
+    case "\${prev}" in
+        --theme)
+            COMPREPLY=( $(compgen -W "default dracula cyberpunk monochrome nord gruvbox" -- \${cur}) )
+            return 0
+            ;;
+        --sort)
+            COMPREPLY=( $(compgen -W "cpu mem pid user command state threads runtime" -- \${cur}) )
+            return 0
+            ;;
+        --temp-unit)
+            COMPREPLY=( $(compgen -W "c f" -- \${cur}) )
+            return 0
+            ;;
+        config)
+            COMPREPLY=( $(compgen -W "show reset" -- \${cur}) )
+            return 0
+            ;;
+        p2p)
+            COMPREPLY=( $(compgen -W "server connect" -- \${cur}) )
+            return 0
+            ;;
+    esac
+
+    if [[ \${cur} == -* ]] ; then
+        COMPREPLY=( $(compgen -W "\${opts}" -- \${cur}) )
+        return 0
+    fi
+
+    COMPREPLY=( $(compgen -W "\${commands}" -- \${cur}) )
+}
+
+complete -F _pyre_completions pyre
+`;
+}
+
+export function generateFishCompletions(): string {
+  return `# fish completion for pyre
+
+complete -c pyre -n "__fish_use_subcommand" -a live -d "Start interactive live monitoring dashboard"
+complete -c pyre -n "__fish_use_subcommand" -a info -d "Display static system overview"
+complete -c pyre -n "__fish_use_subcommand" -a doctor -d "Run system diagnostics"
+complete -c pyre -n "__fish_use_subcommand" -a web -d "Launch web dashboard server"
+complete -c pyre -n "__fish_use_subcommand" -a config -d "Show or reset configuration options"
+complete -c pyre -n "__fish_use_subcommand" -a p2p -d "P2P streaming mode"
+complete -c pyre -n "__fish_use_subcommand" -a completions -d "Generate shell completions"
+
+complete -c pyre -l json -s j -d "Output snapshot as JSON"
+complete -c pyre -l html -d "Output snapshot as HTML"
+complete -c pyre -l md -d "Output snapshot as Markdown"
+complete -c pyre -l csv -s c -d "Output snapshot as CSV"
+complete -c pyre -l tsv -s t -d "Output snapshot as TSV"
+complete -c pyre -l detailed -d "Include detailed system info and sensor readings"
+complete -c pyre -l theme -x -a "default dracula cyberpunk monochrome nord gruvbox" -d "Set color theme"
+complete -c pyre -l sort -x -a "cpu mem pid user command state threads runtime" -d "Sort processes by key"
+complete -c pyre -l temp-unit -x -a "c f" -d "Temperature unit"
+`;
+}

package/src/diffCmd.ts

@@ -0,0 +1,36 @@
+import fs from 'node:fs';
+import chalk from 'chalk';
+import type { StatsData } from './monitors/types.js';
+
+export function runDiffCommand(file1: string, file2: string): void {
+  console.log(chalk.bold(`\n  pyre diff — Snapshot Comparison\n`));
+  console.log(chalk.dim(`  Snapshot A: ${file1}`));
+  console.log(chalk.dim(`  Snapshot B: ${file2}\n`));
+
+  try {
+    const dataA: StatsData = JSON.parse(fs.readFileSync(file1, 'utf-8'));
+    const dataB: StatsData = JSON.parse(fs.readFileSync(file2, 'utf-8'));
+
+    const diffNum = (label: string, valA: number, valB: number, unit = '') => {
+      const delta = valB - valA;
+      const sign = delta > 0 ? '+' : '';
+      const color = delta > 0 ? chalk.red : delta < 0 ? chalk.green : chalk.dim;
+      console.log(`  ${label.padEnd(20)} ${valA.toFixed(1)}${unit} ➔ ${valB.toFixed(1)}${unit} (${color(sign + delta.toFixed(1) + unit)})`);
+    };
+
+    diffNum('CPU Usage', dataA.cpu.usage, dataB.cpu.usage, '%');
+    diffNum('Memory Usage', dataA.memory.usagePercent, dataB.memory.usagePercent, '%');
+    if (dataA.cpu.temperature && dataB.cpu.temperature) {
+      diffNum('CPU Temp', dataA.cpu.temperature, dataB.cpu.temperature, '°C');
+    }
+    if (dataA.gpu && dataB.gpu) {
+      diffNum('GPU Util', dataA.gpu.utilization, dataB.gpu.utilization, '%');
+    }
+    diffNum('Network RX Packets', dataA.network.rxPackets, dataB.network.rxPackets);
+    diffNum('Network TX Packets', dataA.network.txPackets, dataB.network.txPackets);
+
+    console.log();
+  } catch (err: any) {
+    console.log(chalk.red(`Failed to compare snapshots: ${err.message}`));
+  }
+}

package/src/doctor.ts

@@ -0,0 +1,123 @@
+import chalk from 'chalk';
+import { run } from './monitors/run.js';
+import { readConfig, CONFIG_FILE } from './state/config.js';
+
+export interface DoctorCheck {
+  name: string;
+  status: 'ok' | 'warn' | 'error';
+  message: string;
+  details?: string;
+}
+
+export async function runDoctor(): Promise<DoctorCheck[]> {
+  const checks: DoctorCheck[] = [];
+
+  // 1. Sudo / Powermetrics Access
+  try {
+    const pmResult = await run('sudo -n powermetrics --samplers cpu_power -n 1 2>&1', '');
+    if (pmResult.includes('Password:') || pmResult.includes('Permission denied') || pmResult.includes('sudo: a password is required')) {
+      checks.push({
+        name: 'Sudo / Powermetrics',
+        status: 'warn',
+        message: 'Passwordless sudo for powermetrics is not configured.',
+        details: 'Powermetrics allows high-precision GPU & CPU power sampling. Run with sudo or configure passwordless sudo in /etc/sudoers.',
+      });
+    } else {
+      checks.push({
+        name: 'Sudo / Powermetrics',
+        status: 'ok',
+        message: 'Powermetrics access available.',
+      });
+    }
+  } catch {
+    checks.push({
+      name: 'Sudo / Powermetrics',
+      status: 'warn',
+      message: 'Powermetrics check failed.',
+    });
+  }
+
+  // 2. TCC / System Permissions
+  try {
+    const psCheck = await run('ps -ax -o pid,user,command', '');
+    if (psCheck.length > 0) {
+      checks.push({
+        name: 'TCC / Process Visibility',
+        status: 'ok',
+        message: 'Process listing access available.',
+      });
+    } else {
+      checks.push({
+        name: 'TCC / Process Visibility',
+        status: 'warn',
+        message: 'Restricted process visibility.',
+        details: 'Grant Full Disk Access or Terminal permissions in System Settings -> Privacy & Security.',
+      });
+    }
+  } catch {
+    checks.push({
+      name: 'TCC / Process Visibility',
+      status: 'error',
+      message: 'Unable to list system processes.',
+    });
+  }
+
+  // 3. Network Reachability for P2P
+  try {
+    const netCheck = await run('netstat -rn', '');
+    if (netCheck.includes('default') || netCheck.includes('gateway')) {
+      checks.push({
+        name: 'Network Reachability',
+        status: 'ok',
+        message: 'Network interface active with default gateway.',
+      });
+    } else {
+      checks.push({
+        name: 'Network Reachability',
+        status: 'warn',
+        message: 'No active network route detected for P2P mode.',
+      });
+    }
+  } catch {
+    checks.push({
+      name: 'Network Reachability',
+      status: 'warn',
+      message: 'Could not verify network routes.',
+    });
+  }
+
+  // 4. Config file integrity
+  try {
+    const cfg = readConfig();
+    checks.push({
+      name: 'Configuration File',
+      status: 'ok',
+      message: `Config file valid (${CONFIG_FILE}).`,
+    });
+  } catch (err: any) {
+    checks.push({
+      name: 'Configuration File',
+      status: 'error',
+      message: 'Failed to parse config file.',
+      details: err.message,
+    });
+  }
+
+  return checks;
+}
+
+export function printDoctorReport(checks: DoctorCheck[]): void {
+  console.log(chalk.bold('\n  pyre doctor — System Diagnostics\n'));
+
+  for (const check of checks) {
+    let icon = chalk.green('✔');
+    if (check.status === 'warn') icon = chalk.yellow('⚠');
+    if (check.status === 'error') icon = chalk.red('✖');
+
+    console.log(`  ${icon} ${chalk.bold(check.name.padEnd(26))} ${check.message}`);
+    if (check.details) {
+      console.log(chalk.dim(`     ↳ ${check.details}`));
+    }
+  }
+  console.log();
+}

package/src/formatters/index.ts

@@ -11,7 +11,7 @@
  * - `render.ts` — dashboard layout, cards, tables, and the main `formatTable`
  * - `output.ts` — JSON/CSV/TSV export and sparkline graph rendering
  */
-export { formatTable, clampWidth, gridColumns, thermalColor, capacityColor, getTabHitboxes, TAB_BAR_ROW, TAB_DEFS, panel, formatBytes } from './render.js';
+export { formatTable, clampWidth, gridColumns, thermalColor, capacityColor, getTabHitboxes, TAB_BAR_ROW, TAB_DEFS, panel, formatBytes, padVisible, visLen, fitVisible } from './render.js';
 export { formatJson, formatCsv, formatTsv, formatGraphs, formatHtml, formatMarkdown } from './output.js';
 export type { ThemeName, ThemeColors, VisibleItems, TableOptions, AnomalyAlert } from './types.js';
 export { THEMES } from './themes.js';

package/src/formatters/output.ts

@@ -10,8 +10,7 @@ import { sparkline } from '../sparkline.js';
 import type { History } from '../history.js';
 import type { StatsData } from './types.js';
 import { THEMES, type ThemeName } from './themes.js';
-import { formatBytes, celsiusToFahrenheit, formatTemp } from './render.js';
-import { panel } from './render.js';
+import { formatBytes, celsiusToFahrenheit, formatTemp, panel, fitVisible } from './render.js';
 
 export function formatJson(data: StatsData): string {
   return JSON.stringify(data, null, 2);
@@ -434,24 +433,24 @@ export function formatGraphs(history: History, width = 80, themeName: ThemeName
   const theme = THEMES[themeName] || THEMES.default;
   const contentWidth = width - 4;
   const sampleCount = history.cpuUsage.length;
-  const sparkWidth = Math.max(10, contentWidth - 28);
+  const sparkWidth = Math.max(10, contentWidth - 24);
 
   const lines: string[] = [];
-  lines.push(graphRow('CPU %', history.cpuUsage, { min: 0, max: 100 }, v => `${v.toFixed(0)}%`, sparkWidth, 'collecting data...', graphMode));
-  lines.push(graphRow('Mem %', history.memUsage, { min: 0, max: 100 }, v => `${v.toFixed(0)}%`, sparkWidth, 'collecting data...', graphMode));
+  lines.push(graphRow('CPU %', history.cpuUsage, { min: 0, max: 100 }, v => `${v.toFixed(0)}%`, sparkWidth, 'collecting data...', graphMode, contentWidth));
+  lines.push(graphRow('Mem %', history.memUsage, { min: 0, max: 100 }, v => `${v.toFixed(0)}%`, sparkWidth, 'collecting data...', graphMode, contentWidth));
   lines.push(
-    graphRow('Temp', history.temp, {}, formatTemp, sparkWidth, 'no sensor access (needs sudo powermetrics)', graphMode)
+    graphRow('Temp', history.temp, {}, v => `${v.toFixed(1)}°C`, sparkWidth, 'no sensor access', graphMode, contentWidth)
   );
-  lines.push(graphRow('Net RX/s', history.netRxRate, {}, v => `${formatBytes(v)}/s`, sparkWidth, 'collecting data...', graphMode));
-  lines.push(graphRow('Net TX/s', history.netTxRate, {}, v => `${formatBytes(v)}/s`, sparkWidth, 'collecting data...', graphMode));
+  lines.push(graphRow('Net RX/s', history.netRxRate, {}, v => `${formatBytes(v)}/s`, sparkWidth, 'collecting data...', graphMode, contentWidth));
+  lines.push(graphRow('Net TX/s', history.netTxRate, {}, v => `${formatBytes(v)}/s`, sparkWidth, 'collecting data...', graphMode, contentWidth));
   if (history.powerWatts.length) {
-    lines.push(graphRow('Power W', history.powerWatts, {}, v => `${v.toFixed(1)} W`, sparkWidth, 'collecting data...', graphMode));
+    lines.push(graphRow('Power W', history.powerWatts, {}, v => `${v.toFixed(1)} W`, sparkWidth, 'collecting data...', graphMode, contentWidth));
   }
   if (history.rxPacketRate.length) {
-    lines.push(graphRow('RX pkt/s', history.rxPacketRate, {}, v => `${v.toFixed(0)} pkt/s`, sparkWidth, 'collecting data...', graphMode));
+    lines.push(graphRow('RX pkt/s', history.rxPacketRate, {}, v => `${v.toFixed(0)} pkt/s`, sparkWidth, 'collecting data...', graphMode, contentWidth));
   }
   if (history.txPacketRate.length) {
-    lines.push(graphRow('TX pkt/s', history.txPacketRate, {}, v => `${v.toFixed(0)} pkt/s`, sparkWidth, 'collecting data...', graphMode));
+    lines.push(graphRow('TX pkt/s', history.txPacketRate, {}, v => `${v.toFixed(0)} pkt/s`, sparkWidth, 'collecting data...', graphMode, contentWidth));
   }
 
   const title = `Graphs · mode:${graphMode} · last ${sampleCount} sample${sampleCount === 1 ? '' : 's'}`;
@@ -465,7 +464,8 @@ function graphRow(
   fmt: (v: number) => string,
   sparkWidth = 40,
   emptyMessage = 'collecting data...',
-  mode: 'spark' | 'bar' = 'spark'
+  mode: 'spark' | 'bar' = 'spark',
+  contentWidth = 76
 ): string {
   if (!values.length) {
     return `${chalk.dim(label.padEnd(10))} ${chalk.dim(emptyMessage)}`;
@@ -480,7 +480,8 @@ function graphRow(
     color = pct > 90 ? chalk.red : pct > 70 ? chalk.yellow : chalk.green;
   }
 
-  return `${chalk.dim(label.padEnd(10))}${color(spark)}  ${chalk.bold(fmt(current))}`;
+  const raw = `${chalk.dim(label.padEnd(10))}${color(spark)}  ${chalk.bold(fmt(current))}`;
+  return fitVisible(raw, contentWidth);
 }
 
 function barGraph(values: number[], bounds: { min?: number; max?: number }, width: number): string {