pyre-cli 6.1.0 → 7.1.0

package/src/live/input.ts

@@ -42,10 +42,10 @@ import { writeConfig } from '../state/config.js';
   }
 
   function isUpKey(key: readline.Key, str?: string): boolean {
-  return key.name === 'up' || str === 'k' || key.sequence === '\x1b[A' || key.sequence === '\x1bOA';
+  return key.name === 'up' || key.sequence === '\x1b[A' || key.sequence === '\x1bOA';
 }
 function isDownKey(key: readline.Key, str?: string): boolean {
-  return key.name === 'down' || str === 'j' || key.sequence === '\x1b[B' || key.sequence === '\x1bOB';
+  return key.name === 'down' || key.sequence === '\x1b[B' || key.sequence === '\x1bOB';
 }
 function isEnterKey(key: readline.Key, str?: string): boolean {
   return key.name === 'return' || key.name === 'enter' || key.sequence === '\r' || key.sequence === '\n' || str === '\r' || str === '\n';

package/src/live/render.ts

@@ -6,7 +6,7 @@
  * alert checker.  All state variables are imported from
  * `state.ts`.
  */
-import { execFile } from 'node:child_process';
+import { execFile, exec } from 'node:child_process';
 import chalk from 'chalk';
 import { formatTable, formatGraphs, gridColumns, THEMES, type ThemeName, panel, fitVisible } from '../formatters/index.js';
 import { detectAnomalies } from '../anomalies.js';
@@ -54,6 +54,7 @@ function tableCacheParams(): string {
     state.treeView ? '1' : '0',
     state.history.version,
     JSON.stringify(state.visiblePanels),
+    JSON.stringify(state.panelLayout),
   ].join('|');
 }
 
@@ -215,10 +216,12 @@ function render() {
             visible: state.visiblePanels,
             treeView: state.treeView,
             activePanel: state.activePanel,
-            anomalies,
+            anomalies: anomalies,
+            anomalyHistory: state.anomalyHistory,
             tempUnit: state.tempUnit,
             history: state.history,
             graphMode: state.graphMode,
+            panelLayout: state.panelLayout,
           });
           _cachedTableData = state.lastData;
           _cachedTableParams = cacheParams;
@@ -353,6 +356,19 @@ function checkAlerts(data: StatsData) {
    const temp = data.cpu.temperature ?? data.thermal.temperatures?.cpu_die ?? null;
    const hot = data.cpu.usage >= state.CPU_ALERT_PCT || (temp !== null && temp >= state.TEMP_ALERT_C);
    const anomalies = detectAnomalies(data, state.history);
+   
+   // Add timestamp to anomalies and push to history
+   for (const a of anomalies) {
+     const timestamped = { ...a, timestamp: new Date() };
+     // Only add if not already recently reported (same metric and similar zScore)
+     const recent = state.anomalyHistory.slice(-5);
+     const isDuplicate = recent.some(r => r.metric === a.metric && Math.abs(r.zScore - a.zScore) < 0.5);
+     if (!isDuplicate) {
+       state.anomalyHistory.push(timestamped as any);
+       if (state.anomalyHistory.length > 50) state.anomalyHistory.shift();
+     }
+   }
+
    const hasCriticalAnomaly = anomalies.some(a => a.severity === 'critical');
    const hasWarningAnomaly = anomalies.some(a => a.severity === 'warning');
    // Process watchdog check
@@ -381,6 +397,18 @@ function checkAlerts(data: StatsData) {
      }
       setStatus(chalk.red(`⚠ Alert: ${reasons.join('; ')}`), 5000);
       sendNotification('pyre Alert', reasons.join('; '));
+      
+      const alertMsg = reasons.join('; ');
+      if (state.webhookUrl) {
+        fetch(state.webhookUrl, {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ alert: alertMsg, timestamp: new Date().toISOString() })
+        }).catch(() => {});
+      }
+      if (state.alertCmd) {
+        exec(state.alertCmd, { env: { ...process.env, PYRE_ALERT: alertMsg } }, () => {});
+      }
     } else if (!hot && !anomalyTriggered && !watchdogTriggered) {
      state.alerted = false;
    }

package/src/live/state.ts

@@ -48,6 +48,7 @@ const state = {
        disk: config.visiblePanels.disk,
        process: config.visiblePanels.process,
      } as VisibleItems,
+     panelLayout: config.panelLayout || ['mem', 'disk', 'net'],
     logging: false,
     logStream: null as fs.WriteStream | null,
     statusMessage: '',
@@ -93,8 +94,10 @@ const state = {
      watchdogCpu: config.watchdogCpu || 80,
      watchdogMem: config.watchdogMem || 80,
      notificationsEnabled: config.notificationsEnabled,
+     webhookUrl: config.webhookUrl || '',
+     alertCmd: config.alertCmd || '',
       alerted: false,
-      activePanel: 'grid' as 'grid' | 'cpu' | 'mem' | 'gpu' | 'power' | 'battery' | 'thermal' | 'network' | 'packets' | 'tasks' | 'disk' | 'process' | 'p2p',
+      activePanel: 'grid' as 'grid' | 'cpu' | 'mem' | 'gpu' | 'power' | 'battery' | 'thermal' | 'network' | 'packets' | 'tasks' | 'disk' | 'process' | 'p2p' | 'anomalies',
        mouseEnabled: config.mouseEnabled,
          PANEL_TABS: [
            { id: 'cpu', label: 'CPU', key: '1' },
@@ -109,13 +112,17 @@ const state = {
            { id: 'disk', label: 'Disk', key: '0' },
            { id: 'process', label: 'Process', key: 'P' },
            { id: 'p2p', label: 'P2P', key: 'R' },
-         ] as const,
-        p2pEvents: [] as { type: string; detail: string; ts: number }[],
-        p2pBind: '',
-        p2pServer: null as { stop: () => void; peerEventHistory: { type: string; detail: string; ts: number }[] } | null,
-        p2pServerRunning: false,
-        p2pPort: config.p2pPort,
-        p2pPassword: config.p2pPassword,
+           { id: 'anomalies', label: 'Anomalies', key: 'A' },
+         ],
+         p2pServer: null as import('../p2p/server.js').P2PServer | null,
+         p2pClient: null as import('../p2p/client.js').P2PClient | null,
+         p2pServerRunning: false,
+         p2pClientConnected: false,
+         p2pEvents: [] as any[],
+         p2pBind: '',
+         p2pPassword: config.p2pPassword,
+         p2pPort: config.p2pPort,
+         anomalyHistory: [] as import('../anomalies.js').AnomalyAlert[],
         splashEnabled: config.splashEnabled,
         splashColorScheme: config.splashColorScheme as SplashColorScheme,
         splashAnimation: config.splashAnimation as SplashAnimation,

package/src/state/config.ts

@@ -37,6 +37,8 @@ export interface PyreConfig {
   watchdogProcess?: string;
   watchdogCpu?: number;
   watchdogMem?: number;
+  webhookUrl?: string;
+  alertCmd?: string;
   visiblePanels?: {
     cpu?: boolean;
     mem?: boolean;
@@ -51,6 +53,7 @@ export interface PyreConfig {
     process?: boolean;
     tree?: boolean;
   };
+  panelLayout?: string[];
 }
 
 export const DEFAULT_CONFIG: Required<PyreConfig> = {
@@ -75,6 +78,8 @@ export const DEFAULT_CONFIG: Required<PyreConfig> = {
   splashEnabled: true,
   splashColorScheme: 'fire',
   splashAnimation: 'classic',
+  webhookUrl: '',
+  alertCmd: '',
   visiblePanels: {
     cpu: true,
     mem: true,
@@ -89,6 +94,7 @@ export const DEFAULT_CONFIG: Required<PyreConfig> = {
     process: true,
     tree: false,
   },
+  panelLayout: ['mem', 'disk', 'net'],
 };
 
 export function readConfig(): Required<PyreConfig> {

package/src/xbar.ts

@@ -0,0 +1,53 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import os from 'node:os';
+import chalk from 'chalk';
+
+export function generateXbarPlugin() {
+  const pyrePath = process.argv[1];
+  const nodePath = process.execPath;
+  
+  const script = `#!/bin/bash
+# <xbar.title>Pyre Monitor</xbar.title>
+# <xbar.version>v1.0</xbar.version>
+# <xbar.author>somalip</xbar.author>
+# <xbar.author.github>somalip</xbar.author.github>
+# <xbar.desc>Mac system monitoring powered by pyre.</xbar.desc>
+
+# Run pyre to get a JSON snapshot
+# We use node directly to avoid env issues in xbar
+DATA=$("${nodePath}" "${pyrePath}" --once --json)
+
+if [ -z "$DATA" ]; then
+  echo "🔥 err"
+  echo "---"
+  echo "Could not fetch data"
+  exit 1
+fi
+
+CPU=$(echo "$DATA" | grep -o '"usage": *[0-9.]*' | head -1 | awk '{print $2}')
+MEM=$(echo "$DATA" | grep -o '"usagePercent": *[0-9.]*' | head -1 | awk '{print $2}')
+TEMP=$(echo "$DATA" | grep -o '"temperature": *[0-9.]*' | head -1 | awk '{print $2}')
+
+# Format to 1 decimal place
+CPU=$(printf "%.1f" "$CPU")
+MEM=$(printf "%.1f" "$MEM")
+TEMP=$(printf "%.1f" "$TEMP")
+
+echo "🔥 C:\${CPU}% M:\${MEM}% T:\${TEMP}°C | font=Menlo"
+echo "---"
+echo "Open Dashboard | bash='${nodePath}' param1='${pyrePath}' param2='live' terminal=true"
+`;
+
+  const pluginDir = path.join(os.homedir(), 'Library', 'Application Support', 'xbar', 'plugins');
+  const filename = 'pyre-monitor.2s.sh';
+  const outPath = path.join(process.cwd(), filename);
+  
+  fs.writeFileSync(outPath, script);
+  fs.chmodSync(outPath, '755');
+  
+  console.log(chalk.green(`Generated xbar plugin script at ${outPath}`));
+  console.log(`To install, move it to your xbar plugins directory:`);
+  console.log(chalk.cyan(`  mv ${filename} "${pluginDir}/"`));
+  console.log(`Then refresh xbar.`);
+}