about-system 0.0.40 → 0.0.45

package/dist/system-info-api.d.ts

@@ -15,7 +15,7 @@ declare function battery(context: InfoContext): string;
  * Uses fuzzy matching to find similar CPU models
  * @param context - Info context with cache
  * @returns Benchmark info with score and rank, or empty string
- * @example "💪 37.9k #1", "💪 20.5k #68"
+ * @example "37.9k #1", "20.5k #68"
  */
 declare function bench(context: InfoContext): string;
 
@@ -102,9 +102,23 @@ declare function cpu_bench_info(context: InfoContext): string;
  */
 declare function device(context: InfoContext): string;
 
+/**
+ * Gets disk size (used/total) for each real disk
+ * Uses `df -k` on Linux/macOS, filtering out pseudo filesystems, system/boot
+ * partitions (e.g. /boot, /System/Volumes/*), and anything under 10GB, since
+ * those aren't disks a user would care about. When exactly one real disk is
+ * found (the common case) the result omits the mount point; when multiple
+ * real disks are found (e.g. a data drive or external volume), each is
+ * labeled by its mount point.
+ * @param context - Info context with cache
+ * @returns Disk size as "used/total GB" or "mount(used/total GB) ..." or empty string
+ * @example "256/512GB", "/(100/500GB) /Volumes/Backup(900/2000GB)"
+ */
+declare function disk_size(context: InfoContext): string;
+
 /**
  * Gets root filesystem disk usage percentage
- * Uses df command on Linux/Android
+ * Uses df command on Linux/Android/macOS
  * @param context - Info context with cache
  * @returns Percentage string or empty string
  * @example "45%", "78%"
@@ -134,6 +148,24 @@ export declare function getSystemInfo(options?: SystemInfoOptions): Promise<Syst
  */
 declare function gpu(context: InfoContext): string;
 
+/**
+ * Gets GPU benchmark score and rank from Geekbench 6 data
+ * Uses fuzzy matching to find similar GPU models
+ * @param context - Info context with cache
+ * @returns Benchmark info with score and rank, or empty string
+ * @example "37.9k #1", "20.5k #68"
+ */
+declare function gpu_bench(context: InfoContext): string;
+
+/**
+ * Gets detailed GPU benchmark information from Geekbench 6 data
+ * Includes score, rank, and vendor detection
+ * @param context - Info context with cache
+ * @returns Detailed benchmark info with vendor, or empty string
+ * @example "Geekbench 6: 37.9k (Rank #1) - NVIDIA", "Geekbench 6: 20.5k (Rank #68) - AMD"
+ */
+declare function gpu_bench_info(context: InfoContext): string;
+
 /**
  * Gets the system hostname
  * @returns Computer hostname/network name
@@ -167,7 +199,10 @@ export declare const infoFunctions: {
     gpu: typeof gpu;
     bench: typeof bench;
     cpu_bench_info: typeof cpu_bench_info;
+    gpu_bench: typeof gpu_bench;
+    gpu_bench_info: typeof gpu_bench_info;
     disk_used: typeof disk_used;
+    disk_size: typeof disk_size;
     ram_used: typeof ram_used;
     top_process: typeof top_process;
     uptime: typeof uptime;
@@ -244,7 +279,8 @@ declare function kernel(context: InfoContext): string;
 
 /**
  * Gets system load averages
- * Reads 1, 5, and 15 minute load averages from /proc/loadavg (Linux only)
+ * Reads 1, 5, and 15 minute load averages from /proc/loadavg (Linux) or
+ * os.loadavg() (macOS)
  * @returns Space-separated load averages (1m 5m 15m) or empty string
  * @example "0.52 0.58 0.59", "2.10 1.95 1.88"
  */
@@ -257,7 +293,8 @@ export declare function loadCache(): Cache_2;
 
 /**
  * Gets available memory in gigabytes
- * Reads MemAvailable from /proc/meminfo (Linux only)
+ * Reads MemAvailable from /proc/meminfo (Linux) or derives it from
+ * vm_stat's free+inactive pages (macOS)
  * @returns Available memory with "GB available" suffix or empty string
  * @example "12GB available", "4GB available"
  */
@@ -265,20 +302,23 @@ declare function memory_available(): string;
 
 /**
  * Gets mounted filesystem information
- * Lists non-system mount points with usage from df (Linux only)
- * Excludes /, /dev, /proc, and /sys mounts
+ * Lists non-system mount points with usage from df (Linux/macOS)
+ * On Linux, excludes /, /dev, /proc, /sys and internal /System/Volumes mounts.
+ * On macOS, APFS internal volumes (Data, VM, Preboot, Update, ...) all live
+ * under /System/Volumes and are not user-relevant, so only /Volumes (external
+ * disks, network shares, disk images) are reported.
  * @param context - Info context with cache
  * @returns Space-separated mount points with usage or empty string
- * @example "/home(45%) /mnt/data(78%)", "/media/usb(12%)"
+ * @example "/home(45%) /mnt/data(78%)", "/Volumes/Backup(78%)"
  */
 declare function mount_points(context: InfoContext): string;
 
 /**
  * Gets active network interface names
- * Lists non-loopback interfaces with IPv4 addresses (Linux only)
+ * Lists non-loopback interfaces with IPv4 addresses (Linux/macOS only)
  * @param context - Info context with cache
  * @returns Space-separated interface names or empty string
- * @example "eth0 wlan0", "enp0s3"
+ * @example "eth0 wlan0", "en0 en1"
  */
 declare function network_interfaces(context: InfoContext): string;
 
@@ -302,7 +342,7 @@ declare function packages(context: InfoContext): string;
 
 /**
  * Gets open TCP ports with service names
- * Uses lsof to find listening TCP ports (Linux only)
+ * Uses lsof to find listening TCP ports (Linux/macOS only)
  * @param context - Info context with cache
  * @returns Space-separated port+process pairs or empty string
  * @example "80http 443http 22ssh", "3000node 5432post"
@@ -324,8 +364,8 @@ declare function ram_used(context: InfoContext): string;
 export declare function saveCache(cache: Cache_2): void;
 
 /**
- * Gets screen resolution from X11 display
- * Uses xrandr command (Linux with X11/Xorg only)
+ * Gets screen resolution
+ * Uses xrandr on Linux (X11/Xorg only) or system_profiler on macOS
  * @returns Resolution in WIDTHxHEIGHT format or empty string
  * @example "1920x1080", "2560x1440", "3840x2160"
  */
@@ -342,7 +382,8 @@ declare function services_running(context: InfoContext): string;
 
 /**
  * Gets the current shell name
- * Uses ps command to find parent process shell (Linux/Unix only)
+ * Uses the user's login shell (macOS/Linux), falls back to ps for the
+ * parent process shell
  * @returns Shell name or empty string on Windows
  * @example "bash", "zsh", "fish", "nu"
  */
@@ -350,7 +391,8 @@ declare function shell(context: InfoContext): string;
 
 /**
  * Gets swap memory usage
- * Calculates swap usage from /proc/meminfo (Linux only)
+ * Calculates swap usage from /proc/meminfo (Linux) or `sysctl vm.swapusage`
+ * (macOS)
  * @returns Swap usage as "percentage (size MB) swap" or empty string
  * @example "15% (512MB) swap", "0% (0MB) swap"
  */
@@ -358,7 +400,9 @@ declare function swap_used(): string;
 
 /**
  * Gets system temperature in Celsius
- * Reads from thermal zone or hwmon sensors (Linux only)
+ * Reads from thermal zone or hwmon sensors (Linux), or from the
+ * `osx-cpu-temp` CLI (macOS, if installed via `brew install osx-cpu-temp`) -
+ * macOS has no unprivileged API for this, so nothing is reported without it
  * @param context - Info context with cache
  * @returns Temperature with °C suffix or empty string
  * @example "45°C", "62°C"
@@ -367,7 +411,7 @@ declare function temperature(context: InfoContext): string;
 
 /**
  * Gets the highest CPU-consuming process
- * Uses ps command to find top process by CPU usage (Linux only)
+ * Uses ps command to find top process by CPU usage (Linux/macOS only)
  * @param context - Info context with cache
  * @returns Process info as "percentage processname" or empty string
  * @example "8% firefox", "15% chrome", "3% systemd"
@@ -389,7 +433,7 @@ declare function user(): string;
 
 /**
  * Gets number of logged in users
- * Uses who command to count active user sessions (Linux only)
+ * Uses who command to count active user sessions (Linux/macOS only)
  * @returns User count with "users" suffix or empty string
  * @example "3 users", "1 users"
  */

package/dist/system-info-api.js

@@ -2,7 +2,7 @@ import "os";
 import "fs";
 import "https";
 import "path";
-import { g as m, i as r, l as p, s as n } from "./system-info-api-J8OqC6YU.js";
+import { g as m, i as r, l as p, s as n } from "./system-info-api-CChFyamn.js";
 export {
   m as getSystemInfo,
   r as infoFunctions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "about-system",
-  "version": "0.0.40",
+  "version": "0.0.45",
   "description": "A Node.js script to display key system information with emojis. Cross-platform support for Windows, macOS, and Linux with customizable output and caching.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -56,9 +56,9 @@
   "license": "rights.institute/prosper",
   "repository": {
     "type": "git",
-    "url": "https://github.com/OpenSourceAGI/starter-app-dev-tools/tree/master/packages/about-system-info"
+    "url": "https://github.com/OpenSourceAGI/dev-tools-starter-agent/tree/master/packages/about-system-info"
   },
-  "homepage": "https://github.com/OpenSourceAGI/starter-app-dev-tools/tree/master/packages/about-system-info",
+  "homepage": "https://github.com/OpenSourceAGI/dev-tools-starter-agent/tree/master/packages/about-system-info",
   "files": [
     "dist/**/*",
     "src/**/*.ts",

package/src/info/hardware.ts

@@ -6,7 +6,7 @@
 import os from "os";
 import fs from "fs";
 import type { InfoContext } from "../types/internal-types";
-import { IS_WINDOWS, IS_LINUX } from "../utils/platform";
+import { IS_WINDOWS, IS_MAC, IS_LINUX } from "../utils/platform";
 import { execCommand } from "../utils/command";
 import { getCachedValue, setCachedValue } from "../cache/cache";
 import Fuse from "fuse.js";
@@ -97,54 +97,87 @@ export function gpu(context: InfoContext): string {
   if (cached !== null) return cached;
 
   if (IS_WINDOWS) {
+    const gpus: string[] = [];
+
     try {
       const wmic = execCommand(
         "wmic path win32_VideoController get name /format:list"
       );
-      const nameMatch = wmic.match(/Name=(.+)/);
-      if (nameMatch) {
-        const gpu = nameMatch[1].trim();
-        if (gpu && gpu !== "" && !gpu.includes("Microsoft Basic")) {
-          setCachedValue(context.cache, "gpu", gpu);
-          return gpu;
+      const nameMatches = wmic.matchAll(/Name=(.+)/g);
+      for (const match of nameMatches) {
+        const name = match[1].trim();
+        if (name && !name.includes("Microsoft Basic")) {
+          gpus.push(name);
         }
       }
     } catch {}
 
+    if (gpus.length === 0) {
+      try {
+        const ps = execCommand(
+          "powershell.exe -Command \"Get-WmiObject -Class Win32_VideoController | Where-Object {$_.Name -notlike '*Microsoft Basic*'} | Select-Object -ExpandProperty Name\""
+        );
+        if (ps.trim()) {
+          for (const line of ps.trim().split(/\r?\n/)) {
+            const name = line.trim();
+            if (name && !name.includes("Microsoft Basic")) {
+              gpus.push(name);
+            }
+          }
+        }
+      } catch {}
+    }
+
+    if (gpus.length > 0) {
+      const result = gpus.join(", ");
+      setCachedValue(context.cache, "gpu", result);
+      return result;
+    }
+  } else if (IS_MAC) {
     try {
-      const ps = execCommand(
-        "powershell.exe -Command \"Get-WmiObject -Class Win32_VideoController | Where-Object {$_.Name -notlike '*Microsoft Basic*'} | Select-Object -First 1 -ExpandProperty Name\""
+      const profile = execCommand("system_profiler SPDisplaysDataType");
+      const gpus = Array.from(profile.matchAll(/Chipset Model:\s*(.+)/g)).map(
+        (match) => match[1].trim()
       );
-      if (ps.trim()) {
-        const gpu = ps.trim();
-        setCachedValue(context.cache, "gpu", gpu);
-        return gpu;
+
+      if (gpus.length > 0) {
+        const result = gpus.join(", ");
+        setCachedValue(context.cache, "gpu", result);
+        return result;
       }
     } catch {}
   } else if (IS_LINUX) {
     try {
       const lspci = execCommand("lspci");
-      const gpuMatch = lspci.match(
-        /VGA.*?(RTX|GeForce|AMD|Intel|NVIDIA)[^\n]*/i
-      );
-      if (gpuMatch) {
-        let gpu = gpuMatch[0];
-
-        const bracketMatch = gpu.match(/\[([^\]]+)\]/);
-        if (bracketMatch) {
-          gpu = bracketMatch[1];
+      const gpus: string[] = [];
+      const classPattern = /(?:VGA compatible controller|3D controller|Display controller)/i;
+      const gpuPattern = /(?:NVIDIA|GeForce|RTX|GTX|Quadro|Tesla|AMD|ATI|Radeon|Navi|Vega|RX|Intel.*(?:Arc|UHD|Iris|HD Graphics))/i;
+
+      for (const line of lspci.split("\n")) {
+        if (!classPattern.test(line) || !gpuPattern.test(line)) continue;
+
+        let name: string;
+        const allBrackets = line.match(/\[([^\]]+)\]/g);
+        if (allBrackets && allBrackets.length > 0) {
+          const last = allBrackets[allBrackets.length - 1];
+          name = last.replace(/^\[|\]$/g, "");
         } else {
-          gpu = gpu
-            .replace(/^.*VGA[^:]*:\s*/, "")
-            .replace(/\s*\(.*\)$/, "")
+          name = line
+            .replace(/^.*(?:VGA compatible controller|3D controller|Display controller):\s*/i, "")
+            .replace(/\s*\(rev [a-f0-9]+\)\s*$/i, "")
             .trim();
         }
 
-        if (gpu) {
-          setCachedValue(context.cache, "gpu", gpu);
-          return gpu;
+        if (name && !gpus.includes(name)) {
+          gpus.push(name);
         }
       }
+
+      if (gpus.length > 0) {
+        const result = gpus.join(", ");
+        setCachedValue(context.cache, "gpu", result);
+        return result;
+      }
     } catch {}
   }
 
@@ -153,12 +186,23 @@ export function gpu(context: InfoContext): string {
 }
 
 /**
- * Gets screen resolution from X11 display
- * Uses xrandr command (Linux with X11/Xorg only)
+ * Gets screen resolution
+ * Uses xrandr on Linux (X11/Xorg only) or system_profiler on macOS
  * @returns Resolution in WIDTHxHEIGHT format or empty string
  * @example "1920x1080", "2560x1440", "3840x2160"
  */
 export function screen_resolution(): string {
+  if (IS_MAC) {
+    try {
+      const profile = execCommand("system_profiler SPDisplaysDataType");
+      const resolutionMatch = profile.match(/Resolution:\s*(\d+) x (\d+)/);
+      if (resolutionMatch) {
+        return `${resolutionMatch[1]}x${resolutionMatch[2]}`;
+      }
+    } catch {}
+    return "";
+  }
+
   if (!IS_LINUX) return "";
 
   try {
@@ -178,7 +222,7 @@ export function screen_resolution(): string {
  * Uses fuzzy matching to find similar CPU models
  * @param context - Info context with cache
  * @returns Benchmark info with score and rank, or empty string
- * @example "💪 37.9k #1", "💪 20.5k #68"
+ * @example "37.9k #1", "20.5k #68"
  */
 export function bench(context: InfoContext): string {
   const cached = getCachedValue(context.cache, "bench");
@@ -192,7 +236,7 @@ export function bench(context: InfoContext): string {
 
   try {
     let benchmarkPath: string;
-    const benchmarkFile = "cpu-geekbench-1k.json";
+    const benchmarkFile = "cpu-geekbench.json";
 
     // Try multiple resolution strategies
     if (fs.existsSync(benchmarkFile)) {
@@ -232,7 +276,7 @@ export function bench(context: InfoContext): string {
       const match = results[0].item;
       const score = Math.round(match.score / 100) / 10;
       const rank = match.rank;
-      const result = `💪 ${score}k #${rank}`;
+      const result = `${score}k #${rank}`;
       setCachedValue(context.cache, "bench", result);
       return result;
     }
@@ -263,7 +307,7 @@ export function cpu_bench_info(context: InfoContext): string {
 
   try {
     let benchmarkPath: string;
-    const benchmarkFile = "cpu-geekbench-1k.json";
+    const benchmarkFile = "cpu-geekbench.json";
 
     // Try multiple resolution strategies
     if (fs.existsSync(benchmarkFile)) {
@@ -331,3 +375,171 @@ export function cpu_bench_info(context: InfoContext): string {
   setCachedValue(context.cache, "cpu_bench_info", "");
   return "";
 }
+
+/**
+ * Gets GPU benchmark score and rank from Geekbench 6 data
+ * Uses fuzzy matching to find similar GPU models
+ * @param context - Info context with cache
+ * @returns Benchmark info with score and rank, or empty string
+ * @example "37.9k #1", "20.5k #68"
+ */
+export function gpu_bench(context: InfoContext): string {
+  const cached = getCachedValue(context.cache, "gpu_bench");
+  if (cached) return cached;
+
+  const gpuName = gpu(context);
+  if (!gpuName) {
+    setCachedValue(context.cache, "gpu_bench", "");
+    return "";
+  }
+
+  try {
+    let benchmarkPath: string;
+    const benchmarkFile = "gpu-geekbench.json";
+
+    // Try multiple resolution strategies
+    if (fs.existsSync(benchmarkFile)) {
+      benchmarkPath = benchmarkFile;
+    } else if (fs.existsSync(`src/bench/${benchmarkFile}`)) {
+      benchmarkPath = `src/bench/${benchmarkFile}`;
+    } else if (fs.existsSync(`./bench/${benchmarkFile}`)) {
+      benchmarkPath = `./bench/${benchmarkFile}`;
+    } else {
+      // Last resort: construct path from import.meta.url
+      try {
+        const url = new URL(`./${benchmarkFile}`, import.meta.url);
+        benchmarkPath = url.pathname;
+        if (!fs.existsSync(benchmarkPath)) {
+          const distPath = url.pathname.substring(0, url.pathname.lastIndexOf('/'));
+          benchmarkPath = distPath + `/${benchmarkFile}`;
+        }
+      } catch {
+        benchmarkPath = benchmarkFile;
+      }
+    }
+
+    const benchmarkData = fs.readFileSync(benchmarkPath, "utf8");
+    const parsed = JSON.parse(benchmarkData);
+    const scores = parsed.scores as [string, number, number][];
+
+    const gpuList = scores.map((item) => ({ name: item[0], score: item[1], rank: item[2] }));
+
+    const fuse = new Fuse(gpuList, {
+      keys: ["name"],
+      threshold: 0.6,
+      minMatchCharLength: 3,
+    });
+
+    const results = fuse.search(gpuName);
+    if (results.length > 0) {
+      const match = results[0].item;
+      const score = Math.round(match.score / 100) / 10;
+      const rank = match.rank;
+      const result = `${score}k #${rank}`;
+      setCachedValue(context.cache, "gpu_bench", result);
+      return result;
+    }
+  } catch (e) {
+    // Silently fail
+  }
+
+  setCachedValue(context.cache, "gpu_bench", "");
+  return "";
+}
+
+/**
+ * Gets detailed GPU benchmark information from Geekbench 6 data
+ * Includes score, rank, and vendor detection
+ * @param context - Info context with cache
+ * @returns Detailed benchmark info with vendor, or empty string
+ * @example "Geekbench 6: 37.9k (Rank #1) - NVIDIA", "Geekbench 6: 20.5k (Rank #68) - AMD"
+ */
+export function gpu_bench_info(context: InfoContext): string {
+  const cached = getCachedValue(context.cache, "gpu_bench_info");
+  if (cached) return cached;
+
+  const gpuName = gpu(context);
+  if (!gpuName) {
+    setCachedValue(context.cache, "gpu_bench_info", "");
+    return "";
+  }
+
+  try {
+    let benchmarkPath: string;
+    const benchmarkFile = "gpu-geekbench.json";
+
+    // Try multiple resolution strategies
+    if (fs.existsSync(benchmarkFile)) {
+      benchmarkPath = benchmarkFile;
+    } else if (fs.existsSync(`src/bench/${benchmarkFile}`)) {
+      benchmarkPath = `src/bench/${benchmarkFile}`;
+    } else if (fs.existsSync(`./bench/${benchmarkFile}`)) {
+      benchmarkPath = `./bench/${benchmarkFile}`;
+    } else {
+      // Last resort: construct path from import.meta.url
+      try {
+        const url = new URL(`./${benchmarkFile}`, import.meta.url);
+        benchmarkPath = url.pathname;
+        if (!fs.existsSync(benchmarkPath)) {
+          const distPath = url.pathname.substring(0, url.pathname.lastIndexOf('/'));
+          benchmarkPath = distPath + `/${benchmarkFile}`;
+        }
+      } catch {
+        benchmarkPath = benchmarkFile;
+      }
+    }
+
+    const benchmarkData = fs.readFileSync(benchmarkPath, "utf8");
+    const parsed = JSON.parse(benchmarkData);
+    const scores = parsed.scores as [string, number, number][];
+
+    const gpuList = scores.map((item) => ({
+      name: item[0],
+      score: item[1],
+      rank: item[2],
+    }));
+
+    const fuse = new Fuse(gpuList, {
+      keys: ["name"],
+      threshold: 0.6,
+      minMatchCharLength: 3,
+    });
+
+    const results = fuse.search(gpuName);
+    if (results.length > 0) {
+      const match = results[0].item;
+      const score = Math.round(match.score / 100) / 10;
+      const rank = match.rank;
+
+      // Detect vendor from GPU name
+      let vendor = "Unknown";
+      const upperName = match.name.toUpperCase();
+      if (upperName.includes("NVIDIA") || upperName.includes("GEFORCE") ||
+          upperName.includes("RTX") || upperName.includes("GTX") ||
+          upperName.includes("QUADRO") || upperName.includes("TESL") ||
+          upperName.includes("B200") || upperName.includes("H100") ||
+          upperName.includes("A100") || upperName.includes("A40") ||
+          upperName.includes("L40") || upperName.includes("L20")) {
+        vendor = "NVIDIA";
+      } else if (upperName.includes("AMD") || upperName.includes("RADEON") ||
+                 upperName.includes("RX ") || upperName.includes("HD") ||
+                 upperName.includes("EPYC") || upperName.includes("INSTINCT") ||
+                 upperName.includes("NAVI") || upperName.includes("VEGA")) {
+        vendor = "AMD";
+      } else if (upperName.includes("INTEL") || upperName.includes("ARC") ||
+                 upperName.includes("UHD") || upperName.includes("IRIS") ||
+                 upperName.includes("HD GRAPHICS")) {
+        vendor = "Intel";
+      }
+
+      const result = `Geekbench 6: ${score}k (Rank #${rank}) - ${vendor}`;
+      setCachedValue(context.cache, "gpu_bench_info", result);
+      return result;
+    }
+  } catch (e) {
+    // Silently fail
+  }
+
+  setCachedValue(context.cache, "gpu_bench_info", "");
+  return "";
+}