pyre-cli 8.2.0 → 9.0.0

package/dist/{brewHealth-6NE37NAU.js → brewHealth-F2BXF5M6.js}

@@ -1,6 +1,6 @@
 import {
   run
-} from "./chunk-GLH7EKAX.js";
+} from "./chunk-FH5WDJBF.js";
 
 // src/brewHealth.ts
 import chalk from "chalk";

package/dist/{chunk-KBKXU2ZV.js → chunk-EQZCK2VC.js}

@@ -1,6 +1,6 @@
 import {
   run
-} from "./chunk-GLH7EKAX.js";
+} from "./chunk-FH5WDJBF.js";
 
 // src/monitors/collectors.ts
 import chalk from "chalk";
@@ -15,7 +15,8 @@ async function getSmcMetrics() {
   try {
     const pm = (await run(
       "sudo -n powermetrics --samplers smc,cpu_power -n 1 --format text 2>/dev/null",
-      ""
+      "",
+      2e3
     )).trim();
     if (pm) {
       const cpuTemp = pm.match(/CPU die temperature:\s*([\d.]+)/i);
@@ -71,13 +72,9 @@ async function getSmcMetrics() {
     }
   }
   if (result.temps["cpu_die"] === void 0) {
-    let loadUsage = 0;
-    try {
-      const top = await run("top -l 1 -n 0 2>/dev/null", "");
-      const m = top.match(/CPU usage:\s*[\d.]+\%\s*user,\s*[\d.]+\%\s*sys,\s*([\d.]+)\%\s*idle/);
-      if (m) loadUsage = Math.max(0, 100 - parseFloat(m[1]));
-    } catch {
-    }
+    const loadAvg = (await import("os")).loadavg();
+    const ncpus = (await import("os")).cpus().length || 1;
+    const loadUsage = Math.min(100, loadAvg[0] / ncpus * 100);
     const estCpu = Math.round((38 + loadUsage * 0.42) * 10) / 10;
     result.temps["cpu_die"] = estCpu;
     if (result.temps["gpu_die"] === void 0) {
@@ -98,6 +95,7 @@ function parseSuffix(s) {
 var SP_TTL_MS = 1e4;
 var NETSTAT_TTL_MS = 1e3;
 var prevCpuTimes = null;
+var prevCpuTotal = { total: 0, idle: 0, ts: 0 };
 var ROUTE_TTL_MS = 5e3;
 var SYSCTL_TTL_MS = 6e4;
 var spGpuCache = null;
@@ -239,7 +237,7 @@ async function collectGpu(detailed) {
   if (spGpuCache && now - spGpuCache.ts < SP_TTL_MS) {
     spRaw = spGpuCache.raw;
   } else {
-    spRaw = (await run("system_profiler SPDisplaysDataType 2>/dev/null")).trim();
+    spRaw = (await run("system_profiler SPDisplaysDataType 2>/dev/null", "", 3e3)).trim();
     spGpuCache = { raw: spRaw, ts: now };
   }
   let model = "Unknown";
@@ -376,12 +374,21 @@ async function collectCpu() {
   }
   let usage = 0;
   try {
-    const top = (await run("top -l 1 -n 0")).trim();
-    const cpuLine = top.match(/CPU usage:\s*[\d.]+%\s*user,\s*[\d.]+%\s*sys,\s*([\d.]+)%\s*idle/);
-    if (cpuLine) {
-      const idle = parseFloat(cpuLine[1]);
-      usage = Math.round(100 - idle);
+    const cpus = os.cpus();
+    let totalNow = 0;
+    let idleNow = 0;
+    for (const cpu of cpus) {
+      totalNow += cpu.times.user + cpu.times.nice + cpu.times.sys + cpu.times.idle + cpu.times.irq;
+      idleNow += cpu.times.idle;
+    }
+    if (prevCpuTotal.ts > 0) {
+      const totalDelta = totalNow - prevCpuTotal.total;
+      const idleDelta = idleNow - prevCpuTotal.idle;
+      if (totalDelta > 0) {
+        usage = Math.round((totalDelta - idleDelta) / totalDelta * 100);
+      }
     }
+    prevCpuTotal = { total: totalNow, idle: idleNow, ts: Date.now() };
   } catch {
   }
   const loadAvgStr = (await run("sysctl -n vm.loadavg", "0.00 0.00 0.00")).trim();
@@ -485,7 +492,7 @@ async function getDiskIoRates() {
     return { readBytesSec: cachedDiskIo.readBytesSec, writeBytesSec: cachedDiskIo.writeBytesSec };
   }
   try {
-    const raw = (await run("iostat -d -c 2 1 2", "")).trim();
+    const raw = (await run("iostat -d -c 2 1 2", "", 3e3)).trim();
     const blocks = raw.split(/\n\s*\n/).filter(Boolean);
     const targetBlock = blocks.length > 1 ? blocks[1] : blocks[0];
     if (targetBlock) {
@@ -547,7 +554,7 @@ async function collectBattery() {
       if (spBatteryCache && now - spBatteryCache.ts < SP_TTL_MS) {
         battInfo = spBatteryCache.raw;
       } else {
-        battInfo = (await run("system_profiler SPPowerDataType 2>/dev/null")).trim();
+        battInfo = (await run("system_profiler SPPowerDataType 2>/dev/null", "", 3e3)).trim();
         spBatteryCache = { raw: battInfo, ts: now };
       }
       const cycleMatch = battInfo.match(/Cycle Count:\s+(\d+)/);
@@ -723,7 +730,7 @@ async function collectPackets() {
     }
     let connections = 0;
     try {
-      const tcpConns = (await run("netstat -an | grep ESTABLISHED | wc -l", "0")).trim();
+      const tcpConns = (await run("netstat -an | grep ESTABLISHED | wc -l", "0", 2e3)).trim();
       connections = parseInt(tcpConns) || 0;
     } catch {
       connections = 0;
@@ -731,7 +738,7 @@ async function collectPackets() {
     let topProcesses = [];
     let allProcesses = [];
     try {
-      const lsof = (await run("lsof -i -n -P 2>/dev/null | tail -n +2 | awk '{print $1, $2}' | sort | uniq -c | sort -rn", "")).trim();
+      const lsof = (await run("lsof -i -n -P 2>/dev/null | tail -n +2 | awk '{print $1, $2}' | sort | uniq -c | sort -rn", "", 2e3)).trim();
       const lsofLines = lsof.split("\n");
       topProcesses = lsofLines.map((line) => {
         const parts = line.trim().split(/\s+/);

package/dist/{chunk-GLH7EKAX.js → chunk-FH5WDJBF.js}

@@ -2,7 +2,7 @@
 import { exec } from "child_process";
 import { promisify } from "util";
 var execAsync = promisify(exec);
-async function run(cmd, fallback = "", timeout = 5e3) {
+async function run(cmd, fallback = "", timeout = 3e3) {
   try {
     return (await execAsync(cmd, { encoding: "utf8", timeout })).stdout.trim();
   } catch {

package/dist/{collectors-4VYRJVRO.js → collectors-KNEN4YJD.js}

@@ -13,8 +13,8 @@ import {
   collectThermal,
   getDisplayInfo,
   getTimeMachineStatus
-} from "./chunk-KBKXU2ZV.js";
-import "./chunk-GLH7EKAX.js";
+} from "./chunk-EQZCK2VC.js";
+import "./chunk-FH5WDJBF.js";
 export {
   collectAll,
   collectBattery,

package/dist/{doctor-LJQAABZ4.js → doctor-L6FZYA7F.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-RVGKEJXT.js";
 import {
   run
-} from "./chunk-GLH7EKAX.js";
+} from "./chunk-FH5WDJBF.js";
 
 // src/doctor.ts
 import chalk from "chalk";

package/dist/{extensions-QCFSVCL5.js → extensions-DVA5YLGH.js}

@@ -1,6 +1,6 @@
 import {
   run
-} from "./chunk-GLH7EKAX.js";
+} from "./chunk-FH5WDJBF.js";
 
 // src/extensions.ts
 import chalk from "chalk";

package/dist/index.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import {
   collectAll
-} from "./chunk-KBKXU2ZV.js";
+} from "./chunk-EQZCK2VC.js";
 import {
   CONFIG_FILE,
   readConfig,
   writeConfig
 } from "./chunk-RVGKEJXT.js";
-import "./chunk-GLH7EKAX.js";
+import "./chunk-FH5WDJBF.js";
 
 // src/index.ts
 import fs8 from "fs";
@@ -2697,8 +2697,7 @@ function graphsCacheParams() {
 }
 function processRowBudget() {
   let overlayRows = 0;
-  if (state.inputMode === "customizer") overlayRows = state.CUSTOMIZER_OPTIONS.length + 3;
-  else if (state.inputMode === "signal") overlayRows = 6;
+  if (state.inputMode === "signal") overlayRows = 6;
   else if (state.inputMode === "filter" || state.inputMode === "kill" || state.inputMode === "p2p") overlayRows = 3;
   if (state.activePanel === "process") {
     return Math.max(10, state.termHeight - 12 - overlayRows);
@@ -2854,14 +2853,20 @@ function render() {
   const footerHeight = 3;
   const targetBodyHeight = Math.max(1, state.termHeight - footerHeight);
   if (state.inputMode === "customizer") {
-    const preOverlayCount = bodyLines.length;
-    const availableForOverlay = targetBodyHeight - preOverlayCount;
     const totalItems = state.CUSTOMIZER_OPTIONS.length;
     const headerLines = 1;
-    const blankLines = availableForOverlay >= 2 ? 1 : 0;
-    const maxVisibleItems = Math.max(0, availableForOverlay - headerLines - blankLines);
+    const blankLines = 1;
+    const idealOverlayHeight = totalItems + headerLines + blankLines;
+    const minOverlayHeight = Math.min(10 + headerLines + blankLines, Math.floor(targetBodyHeight / 2));
+    const overlayHeight = Math.min(idealOverlayHeight, Math.max(minOverlayHeight, Math.floor(targetBodyHeight * 0.6)));
+    const maxBodyForTable = Math.max(3, targetBodyHeight - overlayHeight);
+    if (bodyLines.length > maxBodyForTable) {
+      bodyLines.length = maxBodyForTable;
+    }
+    const availableForOverlay = targetBodyHeight - bodyLines.length;
+    const maxVisibleItems = Math.max(1, availableForOverlay - headerLines - blankLines);
     const scrollOffset = totalItems > maxVisibleItems ? Math.max(0, Math.min(state.customizerIndex, totalItems - maxVisibleItems)) : 0;
-    if (blankLines > 0) bodyLines.push("");
+    bodyLines.push("");
     bodyLines.push(...renderCustomizerOverlay(scrollOffset, maxVisibleItems).split("\n"));
   } else if (state.inputMode === "filter") {
     bodyLines.push(chalk4.cyan(`  Filter processes: ${state.inputBuffer}_`));
@@ -4591,7 +4596,7 @@ async function showSplash(config3) {
     process.stdin.setRawMode(true);
     process.stdin.resume();
     process.stdin.on("data", onEnter);
-    setTimeout(onEnter, 5e3);
+    setTimeout(onEnter, 1500);
   });
 }
 
@@ -4861,12 +4866,12 @@ async function main() {
     return;
   }
   if (cmd === "extensions") {
-    const { printExtensionsReport } = await import("./extensions-QCFSVCL5.js");
+    const { printExtensionsReport } = await import("./extensions-DVA5YLGH.js");
     await printExtensionsReport();
     return;
   }
   if (cmd === "brew") {
-    const { printBrewHealthReport } = await import("./brewHealth-6NE37NAU.js");
+    const { printBrewHealthReport } = await import("./brewHealth-F2BXF5M6.js");
     await printBrewHealthReport();
     return;
   }
@@ -4969,7 +4974,7 @@ async function main() {
     return;
   }
   if (cmd === "doctor") {
-    const { runDoctor, printDoctorReport } = await import("./doctor-LJQAABZ4.js");
+    const { runDoctor, printDoctorReport } = await import("./doctor-L6FZYA7F.js");
     const checks = await runDoctor();
     printDoctorReport(checks);
     return;
@@ -5234,7 +5239,7 @@ async function runP2PConnect() {
 }
 async function runInfoCommand() {
   const data = await collectAll({ detailed: true });
-  const { getDisplayInfo, getTimeMachineStatus } = await import("./collectors-4VYRJVRO.js");
+  const { getDisplayInfo, getTimeMachineStatus } = await import("./collectors-KNEN4YJD.js");
   const displays = await getDisplayInfo();
   const tmStatus = await getTimeMachineStatus();
   const lines = [];

package/package.json

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

package/src/live/render.ts

@@ -68,8 +68,7 @@ function graphsCacheParams(): string {
 
 function processRowBudget(): number {
   let overlayRows = 0;
-  if (state.inputMode === 'customizer') overlayRows = state.CUSTOMIZER_OPTIONS.length + 3;
-  else if (state.inputMode === 'signal') overlayRows = 6;
+  if (state.inputMode === 'signal') overlayRows = 6;
   else if (state.inputMode === 'filter' || state.inputMode === 'kill' || state.inputMode === 'p2p') overlayRows = 3;
 
   if (state.activePanel === 'process') {
@@ -265,17 +264,26 @@ function render() {
   const targetBodyHeight = Math.max(1, state.termHeight - footerHeight);
 
   if (state.inputMode === 'customizer') {
-    const preOverlayCount = bodyLines.length;
-    const availableForOverlay = targetBodyHeight - preOverlayCount;
     const totalItems = state.CUSTOMIZER_OPTIONS.length;
-    const headerLines = 1;
-    const blankLines = availableForOverlay >= 2 ? 1 : 0;
-    const maxVisibleItems = Math.max(0, availableForOverlay - headerLines - blankLines);
+    const headerLines = 1;  // the "UI CUSTOMIZER" header
+    const blankLines = 1;   // blank separator line
+    // Reserve a fixed height for the customizer: show all items if they fit,
+    // otherwise guarantee at least 10 visible items (or half the screen).
+    const idealOverlayHeight = totalItems + headerLines + blankLines;
+    const minOverlayHeight = Math.min(10 + headerLines + blankLines, Math.floor(targetBodyHeight / 2));
+    const overlayHeight = Math.min(idealOverlayHeight, Math.max(minOverlayHeight, Math.floor(targetBodyHeight * 0.6)));
+    // Truncate table body to make room for the customizer overlay
+    const maxBodyForTable = Math.max(3, targetBodyHeight - overlayHeight);
+    if (bodyLines.length > maxBodyForTable) {
+      bodyLines.length = maxBodyForTable;
+    }
+    const availableForOverlay = targetBodyHeight - bodyLines.length;
+    const maxVisibleItems = Math.max(1, availableForOverlay - headerLines - blankLines);
     const scrollOffset = totalItems > maxVisibleItems
       ? Math.max(0, Math.min(state.customizerIndex, totalItems - maxVisibleItems))
       : 0;
 
-    if (blankLines > 0) bodyLines.push('');
+    bodyLines.push('');
     bodyLines.push(...renderCustomizerOverlay(scrollOffset, maxVisibleItems).split('\n'));
   } else if (state.inputMode === 'filter') {
     bodyLines.push(chalk.cyan(`  Filter processes: ${state.inputBuffer}_`));

package/src/monitors/collectors.ts

@@ -20,6 +20,7 @@ import type { StatsData, CpuData, MemoryData, ThermalData, BatteryData, PowerDat
 const SP_TTL_MS = 10_000;
 const NETSTAT_TTL_MS = 1000;
 let prevCpuTimes: { total: number; idle: number }[] | null = null;
+let prevCpuTotal = { total: 0, idle: 0, ts: 0 };
 const ROUTE_TTL_MS = 5_000;
 const SYSCTL_TTL_MS = 60_000;
 
@@ -236,7 +237,7 @@ export async function collectPower(): Promise<PowerData | null> {
     if (spGpuCache && now - spGpuCache.ts < SP_TTL_MS) {
       spRaw = spGpuCache.raw;
     } else {
-      spRaw = (await run('system_profiler SPDisplaysDataType 2>/dev/null')).trim();
+      spRaw = (await run('system_profiler SPDisplaysDataType 2>/dev/null', '', 3000)).trim();
       spGpuCache = { raw: spRaw, ts: now };
     }
 
@@ -400,18 +401,25 @@ export async function collectCpu(): Promise<CpuData> {
     }
   }
 
+  // Use os.cpus() delta instead of the very slow `top -l 1 -n 0` which
+  // blocks for ~1-2s waiting for a sampling window. os.cpus() is instant.
   let usage = 0;
   try {
-    const top = (await run('top -l 1 -n 0')).trim();
-    // Real `top -l 1 -n 0` output is comma-separated and newline-terminated,
-    // e.g. "CPU usage: 5.26% user, 10.52% sys, 84.21% idle" — there is no
-    // semicolon anywhere on that line. The old regex required one to
-    // terminate the match, so it never matched and usage stayed at 0.
-    const cpuLine = top.match(/CPU usage:\s*[\d.]+%\s*user,\s*[\d.]+%\s*sys,\s*([\d.]+)%\s*idle/);
-    if (cpuLine) {
-      const idle = parseFloat(cpuLine[1]);
-      usage = Math.round(100 - idle);
+    const cpus = os.cpus();
+    let totalNow = 0;
+    let idleNow = 0;
+    for (const cpu of cpus) {
+      totalNow += cpu.times.user + cpu.times.nice + cpu.times.sys + cpu.times.idle + cpu.times.irq;
+      idleNow += cpu.times.idle;
+    }
+    if (prevCpuTotal.ts > 0) {
+      const totalDelta = totalNow - prevCpuTotal.total;
+      const idleDelta = idleNow - prevCpuTotal.idle;
+      if (totalDelta > 0) {
+        usage = Math.round(((totalDelta - idleDelta) / totalDelta) * 100);
+      }
     }
+    prevCpuTotal = { total: totalNow, idle: idleNow, ts: Date.now() };
   } catch {
     // ignore
   }
@@ -534,7 +542,7 @@ async function getDiskIoRates(): Promise<{ readBytesSec: number; writeBytesSec:
     return { readBytesSec: cachedDiskIo.readBytesSec, writeBytesSec: cachedDiskIo.writeBytesSec };
   }
   try {
-    const raw = (await run('iostat -d -c 2 1 2', '')).trim();
+    const raw = (await run('iostat -d -c 2 1 2', '', 3000)).trim();
     const blocks = raw.split(/\n\s*\n/).filter(Boolean);
     const targetBlock = blocks.length > 1 ? blocks[1] : blocks[0];
     if (targetBlock) {
@@ -606,7 +614,7 @@ export async function collectBattery(): Promise<BatteryData | null> {
       if (spBatteryCache && now - spBatteryCache.ts < SP_TTL_MS) {
         battInfo = spBatteryCache.raw;
       } else {
-        battInfo = (await run('system_profiler SPPowerDataType 2>/dev/null')).trim();
+        battInfo = (await run('system_profiler SPPowerDataType 2>/dev/null', '', 3000)).trim();
         spBatteryCache = { raw: battInfo, ts: now };
       }
 
@@ -821,7 +829,7 @@ export async function collectPackets(): Promise<PacketData | null> {
 
      let connections = 0;
      try {
-       const tcpConns = (await run('netstat -an | grep ESTABLISHED | wc -l', '0')).trim();
+       const tcpConns = (await run('netstat -an | grep ESTABLISHED | wc -l', '0', 2000)).trim();
        connections = parseInt(tcpConns) || 0;
      } catch {
        connections = 0;
@@ -830,7 +838,7 @@ export async function collectPackets(): Promise<PacketData | null> {
      let topProcesses: { pid: number; command: string; rxBytes: number; txBytes: number }[] = [];
      let allProcesses: { pid: number; command: string; rxBytes: number; txBytes: number; rxPackets?: number; txPackets?: number }[] = [];
        try {
-          const lsof = (await run('lsof -i -n -P 2>/dev/null | tail -n +2 | awk \'{print $1, $2}\' | sort | uniq -c | sort -rn', '')).trim();
+          const lsof = (await run('lsof -i -n -P 2>/dev/null | tail -n +2 | awk \'{print $1, $2}\' | sort | uniq -c | sort -rn', '', 2000)).trim();
          const lsofLines = lsof.split('\n');
          topProcesses = lsofLines.map(line => {
            const parts = line.trim().split(/\s+/);

package/src/monitors/run.ts

@@ -11,7 +11,7 @@ import { promisify } from 'node:util';
 
 const execAsync = promisify(exec);
 
-async function run(cmd: string, fallback: string = '', timeout = 5000): Promise<string> {
+async function run(cmd: string, fallback: string = '', timeout = 3000): Promise<string> {
   try {
     return (await execAsync(cmd, { encoding: 'utf8', timeout })).stdout.trim();
   } catch {

package/src/monitors/smc.ts

@@ -41,7 +41,8 @@ export async function getSmcMetrics(): Promise<SmcMetrics> {
     const pm = (
       await run(
         'sudo -n powermetrics --samplers smc,cpu_power -n 1 --format text 2>/dev/null',
-        ''
+        '',
+        2000
       )
     ).trim();
 
@@ -116,14 +117,10 @@ export async function getSmcMetrics(): Promise<SmcMetrics> {
 
   // 4. Smart load-based thermal estimation if hardware sensors return nothing
   if (result.temps['cpu_die'] === undefined) {
-    let loadUsage = 0;
-    try {
-      const top = await run('top -l 1 -n 0 2>/dev/null', '');
-      const m = top.match(/CPU usage:\s*[\d.]+\%\s*user,\s*[\d.]+\%\s*sys,\s*([\d.]+)\%\s*idle/);
-      if (m) loadUsage = Math.max(0, 100 - parseFloat(m[1]));
-    } catch {
-      // ignore
-    }
+    // Use os.loadavg() (instant) instead of the slow `top -l 1` (~1-2s)
+    const loadAvg = (await import('node:os')).loadavg();
+    const ncpus = (await import('node:os')).cpus().length || 1;
+    const loadUsage = Math.min(100, (loadAvg[0] / ncpus) * 100);
 
     const estCpu = Math.round((38 + (loadUsage * 0.42)) * 10) / 10;
     result.temps['cpu_die'] = estCpu;

package/src/splash.ts

@@ -198,6 +198,6 @@ export async function showSplash(config?: SplashConfig): Promise<void> {
     process.stdin.resume();
     process.stdin.on('data', onEnter);
 
-    setTimeout(onEnter, 5000);
+    setTimeout(onEnter, 1500);
   });
 }