opencode-system-metrics-tui 0.1.10 → 0.1.12

package/README.md

@@ -3,7 +3,7 @@
 ## Install globally in OpenCode
 
 ```powershell
-opencode plugin -g opencode-system-metrics-tui@0.1.10 --force
+opencode plugin -g opencode-system-metrics-tui@0.1.12 --force
 ```
 
 This is the primary installation path. The version must match `package.json`; `--force` asks OpenCode to refresh its package cache. The helper below skips OpenCode when the expected artifact is already current. Verify the actual installed artifact afterward:
@@ -40,7 +40,8 @@ The README is available in **Español**, **English**, and **Português**.
 - Soporte para Linux, macOS y Windows cuando el sistema expone las métricas.
 - En macOS, la utilización de GPU usa `ioreg` y las temperaturas usan el helper de Stats si está instalado; si cualquiera de ellos falta, esa métrica queda como no disponible sin interrumpir el plugin. En Intel se conserva el fallback de GPU discreta de `systeminformation`.
 - En Windows, la temperatura de CPU requiere LibreHardwareMonitor ejecutándose como administrador con **Remote Web Server** activo en `http://127.0.0.1:8085`.
-- En Windows, la velocidad de red usa PowerShell y `Get-NetAdapterStatistics`; no agrega una dependencia npm.
+- En Windows, la velocidad de red usa una llamada nativa `GetIfTable2` de `iphlpapi.dll` mediante Koffi; la ruta PowerShell queda como fallback acotado si la API nativa no está disponible.
+- La agregación nativa incluye interfaces de hardware activas, excluye interfaces de filtro, loopback y túnel, y suma sus contadores `InOctets`/`OutOctets`.
 - Las lecturas opcionales de Windows se hacen bajo demanda, con timeout y caché; no hay timers globales de PowerShell.
 - La detección de Nerd Font en Linux/macOS está limitada a rutas conocidas, 2 niveles de profundidad y 256 entradas por directorio; una ruta ausente o inaccesible usa Unicode. Windows no escanea fuentes salvo con `OPENCODE_MONITOR_NERD_FONT=1`.
 - Si una fuente de métricas no responde a tiempo, su intento en caché se abandona de forma segura para permitir reintentos sin cancelar APIs que no aceptan `AbortSignal`.
@@ -93,7 +94,7 @@ npm publish --access public
 En otro equipo:
 
 ```bash
-opencode plugin opencode-system-metrics-tui@0.1.10
+opencode plugin opencode-system-metrics-tui@0.1.12
 ```
 
 El paquete exporta tanto la raíz (`opencode-system-metrics-tui`) como `./tui`; ambas rutas cargan el mismo bundle TUI.
@@ -103,8 +104,8 @@ El instalador de OpenCode configura el plugin TUI automáticamente. Reinicia Ope
 Publicar en npm e instalar en OpenCode son pasos distintos:
 
 - `npm publish --access public` publica el paquete en npm.
-- `opencode plugin opencode-system-metrics-tui@0.1.10` lo instala solo en el proyecto actual.
-- `opencode plugin -g opencode-system-metrics-tui@0.1.10 --force` lo instala globalmente para todos los proyectos.
+- `opencode plugin opencode-system-metrics-tui@0.1.12` lo instala solo en el proyecto actual.
+- `opencode plugin -g opencode-system-metrics-tui@0.1.12 --force` lo instala globalmente para todos los proyectos.
 
 ### Verificación
 
@@ -133,9 +134,12 @@ npm run build
 - Windows uses Unicode icons by default (installed-font detection does not change selection); Linux/macOS use Nerd Font only when installed and retain Unicode fallback.
 - On Windows, visible Unicode icons are used by default because OpenCode cannot detect the terminal's active font.
 - Supports Linux, macOS, and Windows when the operating system exposes the metrics.
+- CPU and RAM use native, read-only paths without subprocesses during normal operation: Linux reads `/proc/stat` and `/proc/meminfo`; Windows uses `GetSystemTimes` and `GlobalMemoryStatusEx` through the lazy Koffi integration; macOS uses Mach host statistics and `hw.memsize` on both Intel and Apple Silicon. If native loading or a read fails, the existing `systeminformation` path is used with the existing timeout and cache protections.
+- Native CPU percentages are deltas between consecutive samples; the first sample is intentionally unavailable. Counter resets, malformed data, and API failures fall back safely. Apple Silicon retains unified-memory semantics and does not treat system RAM as discrete VRAM.
 - On macOS, GPU utilization uses `ioreg` and temperatures use the Stats helper when installed; missing helpers leave only that metric unavailable without interrupting the plugin. Intel retains the discrete-GPU `systeminformation` fallback.
 - On Windows, CPU temperature requires LibreHardwareMonitor running as administrator with **Remote Web Server** enabled at `http://127.0.0.1:8085`.
-- On Windows, network speed uses PowerShell and `Get-NetAdapterStatistics`; it adds no npm dependency.
+- On Windows, network speed uses one native `GetIfTable2` call from `iphlpapi.dll` through Koffi; the PowerShell path remains only as a bounded fallback when the native API cannot load.
+- Native aggregation includes active hardware interfaces, excludes filter, loopback, and tunnel interfaces, and sums their `InOctets`/`OutOctets` counters.
 - Optional Windows reads are on demand, timeout-bounded, and cached; no global PowerShell timers are used.
 - Linux/macOS Nerd Font detection is limited to known paths, two directory levels, and 256 entries per directory; missing or inaccessible paths safely fall back to Unicode. Windows does not scan fonts unless `OPENCODE_MONITOR_NERD_FONT=1` is set.
 - When a metric source does not respond in time, its cache attempt is safely abandoned so retries remain possible without cancelling APIs that do not accept `AbortSignal`.
@@ -188,7 +192,7 @@ npm publish --access public
 On another machine:
 
 ```bash
-opencode plugin opencode-system-metrics-tui@0.1.10
+opencode plugin opencode-system-metrics-tui@0.1.12
 ```
 
 The package exports both the root (`opencode-system-metrics-tui`) and `./tui`; both paths load the same TUI bundle.
@@ -198,8 +202,8 @@ The OpenCode installer configures the TUI plugin automatically. Restart OpenCode
 Publishing to npm and installing in OpenCode are separate steps:
 
 - `npm publish --access public` publishes the package to npm.
-- `opencode plugin opencode-system-metrics-tui@0.1.10` installs it for the current project only.
-- `opencode plugin -g opencode-system-metrics-tui@0.1.10 --force` installs it globally for all projects.
+- `opencode plugin opencode-system-metrics-tui@0.1.12` installs it for the current project only.
+- `opencode plugin -g opencode-system-metrics-tui@0.1.12 --force` installs it globally for all projects.
 
 ### Verification
 
@@ -229,7 +233,8 @@ npm run build
 - No Windows, ícones Unicode visíveis são usados por padrão porque o OpenCode não consegue detectar a fonte ativa do terminal.
 - Suporte para Linux, macOS e Windows quando o sistema disponibiliza as métricas.
 - No Windows, a temperatura da CPU requer o LibreHardwareMonitor executado como administrador com o **Remote Web Server** ativo em `http://127.0.0.1:8085`.
-- No Windows, a velocidade da rede usa o PowerShell e `Get-NetAdapterStatistics`; nenhuma dependência npm é adicionada.
+- No Windows, a velocidade da rede usa uma chamada nativa `GetIfTable2` de `iphlpapi.dll` via Koffi; o PowerShell permanece apenas como fallback limitado quando a API nativa não pode ser carregada.
+- A agregação nativa inclui interfaces de hardware ativas, exclui interfaces de filtro, loopback e túnel, e soma os contadores `InOctets`/`OutOctets`.
 - As leituras opcionais do Windows são sob demanda, têm timeout e cache; não há timers globais do PowerShell.
 - A detecção de Nerd Font no Linux/macOS é limitada a caminhos conhecidos, dois níveis de profundidade e 256 entradas por diretório; caminhos ausentes ou inacessíveis usam Unicode. O Windows não verifica fontes sem `OPENCODE_MONITOR_NERD_FONT=1`.
 - Quando uma fonte de métricas não responde a tempo, a tentativa em cache é abandonada com segurança para permitir novas tentativas sem cancelar APIs que não aceitam `AbortSignal`.
@@ -282,7 +287,7 @@ npm publish --access public
 Em outro computador:
 
 ```bash
-opencode plugin opencode-system-metrics-tui@0.1.10
+opencode plugin opencode-system-metrics-tui@0.1.12
 ```
 
 O pacote exporta tanto a raiz (`opencode-system-metrics-tui`) quanto `./tui`; os dois caminhos carregam o mesmo bundle TUI.
@@ -292,8 +297,8 @@ O instalador do OpenCode configura o plugin TUI automaticamente. Reinicie o Open
 Publicar no npm e instalar no OpenCode são etapas diferentes:
 
 - `npm publish --access public` publica o pacote no npm.
-- `opencode plugin opencode-system-metrics-tui@0.1.10` instala o plugin apenas no projeto atual.
-- `opencode plugin -g opencode-system-metrics-tui@0.1.10 --force` instala o plugin globalmente para todos os projetos.
+- `opencode plugin opencode-system-metrics-tui@0.1.12` instala o plugin apenas no projeto atual.
+- `opencode plugin -g opencode-system-metrics-tui@0.1.12 --force` instala o plugin globalmente para todos os projetos.
 
 ### Verificação
 

package/dist/tui.js

@@ -6,7 +6,7 @@ import { insertNode as _$insertNode } from "@opentui/solid";
 import { insert as _$insert } from "@opentui/solid";
 import { setProp as _$setProp } from "@opentui/solid";
 import { createElement as _$createElement } from "@opentui/solid";
-import { createMemo, createSignal, onCleanup, onMount } from "solid-js";
+import { Show, createMemo, createSignal, onCleanup, onMount } from "solid-js";
 import { TextAttributes } from "@opentui/core";
 
 // src/format.ts
@@ -39,6 +39,311 @@ function formatRate(bytesPerSecond) {
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import si from "systeminformation";
+
+// src/windows-network.ts
+var IF_TYPE_SOFTWARE_LOOPBACK = 24;
+var IF_TYPE_TUNNEL = 131;
+var IF_OPER_STATUS_UP = 1;
+var NET_IF_ACCESS_LOOPBACK = 1;
+var ROWS_OFFSET = 8;
+var nativeReader;
+function toUint64(value) {
+  if (typeof value === "bigint" && value >= 0n)
+    return value;
+  if (typeof value === "number" && Number.isSafeInteger(value) && value >= 0)
+    return BigInt(value);
+  return 0n;
+}
+function mapWindowsNetworkRows(rows) {
+  return rows.reduce((total, row) => {
+    const flags = row.InterfaceAndOperStatusFlags;
+    const isHardware = typeof flags === "number" ? (flags & 1) !== 0 : flags?.HardwareInterface === 1;
+    const isFilter = typeof flags === "number" ? (flags & 2) !== 0 : flags?.FilterInterface === 1;
+    const isUsable = row.OperStatus === IF_OPER_STATUS_UP && row.AccessType !== NET_IF_ACCESS_LOOPBACK && row.Type !== IF_TYPE_SOFTWARE_LOOPBACK && row.Type !== IF_TYPE_TUNNEL;
+    if (!isHardware || isFilter || !isUsable)
+      return total;
+    return { rx: total.rx + toUint64(row.InOctets), tx: total.tx + toUint64(row.OutOctets) };
+  }, { rx: 0n, tx: 0n });
+}
+async function readWithFallback(primary, fallback) {
+  try {
+    return { value: await primary(), usedFallback: false };
+  } catch {
+    return { value: await fallback(), usedFallback: true };
+  }
+}
+function networkRate(current, previous, elapsedMs) {
+  if (previous === undefined)
+    return { rx: undefined, tx: undefined };
+  const seconds = Math.max(elapsedMs / 1000, 0.001);
+  const rx = current.rx >= previous.rx ? current.rx - previous.rx : 0n;
+  const tx = current.tx >= previous.tx ? current.tx - previous.tx : 0n;
+  return { rx: Number(rx) / seconds, tx: Number(tx) / seconds };
+}
+function defineNativeReader(koffi) {
+  const guid = koffi.struct("MIB_GUID", {
+    Data1: "uint32",
+    Data2: "uint16",
+    Data3: "uint16",
+    Data4: koffi.array("uint8", 8)
+  });
+  const row = koffi.struct("MIB_IF_ROW2", {
+    InterfaceLuid: "uint64",
+    InterfaceIndex: "uint32",
+    InterfaceGuid: guid,
+    Alias: koffi.array("char16_t", 257),
+    Description: koffi.array("char16_t", 257),
+    PhysicalAddressLength: "uint32",
+    PhysicalAddress: koffi.array("uint8", 32),
+    PermanentPhysicalAddress: koffi.array("uint8", 32),
+    Mtu: "uint32",
+    Type: "uint32",
+    TunnelType: "uint32",
+    MediaType: "uint32",
+    PhysicalMediumType: "uint32",
+    AccessType: "uint32",
+    DirectionType: "uint32",
+    InterfaceAndOperStatusFlags: "uint8",
+    OperStatus: "uint32",
+    AdminStatus: "uint32",
+    MediaConnectState: "uint32",
+    NetworkGuid: guid,
+    ConnectionType: "uint32",
+    TransmitLinkSpeed: "uint64",
+    ReceiveLinkSpeed: "uint64",
+    InOctets: "uint64",
+    InUcastPkts: "uint64",
+    InNUcastPkts: "uint64",
+    InDiscards: "uint64",
+    InErrors: "uint64",
+    InUnknownProtos: "uint64",
+    InUcastOctets: "uint64",
+    InMulticastOctets: "uint64",
+    InBroadcastOctets: "uint64",
+    OutOctets: "uint64",
+    OutUcastPkts: "uint64",
+    OutNUcastPkts: "uint64",
+    OutDiscards: "uint64",
+    OutErrors: "uint64",
+    OutUcastOctets: "uint64",
+    OutMulticastOctets: "uint64",
+    OutBroadcastOctets: "uint64",
+    OutQLen: "uint64"
+  });
+  if (koffi.sizeof(row) !== 1352)
+    throw new Error(`Unexpected MIB_IF_ROW2 size: ${koffi.sizeof(row)}`);
+  const iphlpapi = koffi.load("iphlpapi.dll");
+  const getIfTable2 = iphlpapi.func("uint32 __stdcall GetIfTable2(_Out_ void **Table)");
+  const freeMibTable = iphlpapi.func("void __stdcall FreeMibTable(void *Memory)");
+  return () => {
+    const output = [null];
+    const result = getIfTable2(output);
+    if (result !== 0 || output[0] === null)
+      throw new Error(`GetIfTable2 failed: ${result}`);
+    const table = output[0];
+    try {
+      const count = Number(koffi.decode(table, 0, "uint32"));
+      if (!Number.isSafeInteger(count) || count < 0 || count > 4096)
+        throw new Error(`Invalid interface count: ${count}`);
+      return Array.from({ length: count }, (_, index) => koffi.decode(table, ROWS_OFFSET + index * koffi.sizeof(row), row));
+    } finally {
+      freeMibTable(table);
+    }
+  };
+}
+async function loadNativeReader() {
+  const loaded = await import("koffi");
+  return defineNativeReader(loaded.default ?? loaded);
+}
+async function readWindowsNetworkCounters() {
+  nativeReader ??= loadNativeReader();
+  return mapWindowsNetworkRows((await nativeReader)());
+}
+
+// src/native-metrics.ts
+import { readFile } from "node:fs/promises";
+function parseLinuxCpuCounters(stat) {
+  const line = stat.split(/\r?\n/).find((item) => /^cpu(?:\s|$)/.test(item));
+  if (line === undefined)
+    return;
+  const fields = line.trim().split(/\s+/).slice(1);
+  if (fields.length < 4)
+    return;
+  const values = fields.map((value) => {
+    try {
+      const parsed = BigInt(value);
+      return parsed >= 0n ? parsed : undefined;
+    } catch {
+      return;
+    }
+  });
+  if (values.some((value) => value === undefined))
+    return;
+  const numbers = values;
+  return { total: numbers.reduce((sum, value) => sum + value, 0n), idle: numbers[3] + (numbers[4] ?? 0n) };
+}
+function cpuPercentFromCounters(current, previous) {
+  if (previous === undefined || current.total < previous.total || current.idle < previous.idle)
+    return;
+  const totalDelta = current.total - previous.total;
+  const idleDelta = current.idle - previous.idle;
+  if (totalDelta <= 0n || idleDelta > totalDelta)
+    return;
+  return Number((totalDelta - idleDelta) * 10000n / totalDelta) / 100;
+}
+function parseLinuxMemoryInfo(meminfo) {
+  const values = new Map;
+  for (const line of meminfo.split(/\r?\n/)) {
+    const match = /^(MemTotal|MemAvailable|MemFree|Buffers|Cached):\s+(\d+)(?:\s+kB)?\s*$/.exec(line);
+    if (match !== null)
+      values.set(match[1], Number(match[2]) * 1024);
+  }
+  const total = values.get("MemTotal");
+  const hasAvailable = values.has("MemAvailable") || values.has("MemFree") || values.has("Buffers") || values.has("Cached");
+  const available = values.get("MemAvailable") ?? (values.get("MemFree") ?? 0) + (values.get("Buffers") ?? 0) + (values.get("Cached") ?? 0);
+  if (total === undefined || !hasAvailable || !Number.isSafeInteger(total) || !Number.isSafeInteger(available) || total <= 0 || available < 0)
+    return;
+  return { totalBytes: total, availableBytes: Math.min(total, available) };
+}
+function mapMemoryBytes(totalBytes, availableBytes) {
+  if (!Number.isSafeInteger(totalBytes) || !Number.isSafeInteger(availableBytes) || totalBytes <= 0 || availableBytes < 0)
+    return;
+  return { memoryTotalBytes: totalBytes, memoryAvailableBytes: Math.min(totalBytes, availableBytes) };
+}
+var reader;
+async function readNativeMetrics() {
+  reader ??= (async () => {
+    if (process.platform === "linux")
+      return createLinuxReader();
+    if (process.platform === "win32")
+      return createWindowsReader();
+    if (process.platform === "darwin")
+      return createMacReader();
+    throw new Error(`Native CPU/RAM metrics are unsupported on ${process.platform}`);
+  })();
+  return (await reader)();
+}
+function createLinuxReader() {
+  let previous;
+  return async () => {
+    const [stat, meminfo] = await Promise.all([readFile("/proc/stat", "utf8"), readFile("/proc/meminfo", "utf8")]);
+    const counters = parseLinuxCpuCounters(stat);
+    const memory = parseLinuxMemoryInfo(meminfo);
+    if (counters === undefined || memory === undefined)
+      throw new Error("Malformed Linux CPU/RAM data");
+    const cpuPercent = cpuPercentFromCounters(counters, previous);
+    previous = cpuPercent === undefined && previous !== undefined ? undefined : counters;
+    return { cpuPercent, memoryTotalBytes: memory.totalBytes, memoryAvailableBytes: memory.availableBytes };
+  };
+}
+async function createWindowsReader() {
+  const loaded = await import("koffi");
+  const koffi = loaded.default ?? loaded;
+  koffi.struct("FILETIME", { low: "uint32", high: "uint32" });
+  const memoryStatus = koffi.struct("MEMORYSTATUSEX", {
+    length: "uint32",
+    memoryLoad: "uint32",
+    total: "uint64",
+    available: "uint64",
+    pageFile: "uint64",
+    availablePageFile: "uint64",
+    virtual: "uint64",
+    availableVirtual: "uint64",
+    availableExtended: "uint64"
+  });
+  const kernel32 = koffi.load("kernel32.dll");
+  const getSystemTimes = kernel32.func("int __stdcall GetSystemTimes(_Out_ FILETIME *idle, _Out_ FILETIME *kernel, _Out_ FILETIME *user)");
+  const globalMemoryStatusEx = kernel32.func("int __stdcall GlobalMemoryStatusEx(_Inout_ MEMORYSTATUSEX *status)");
+  let previous;
+  return async () => {
+    const idle = {};
+    const kernel = {};
+    const user = {};
+    if (!getSystemTimes(idle, kernel, user))
+      throw new Error("GetSystemTimes failed");
+    const toUint64 = (value) => BigInt(value.low ?? 0) + (BigInt(value.high ?? 0) << 32n);
+    const counters = { total: toUint64(kernel) + toUint64(user), idle: toUint64(idle) };
+    const cpuPercent = cpuPercentFromCounters(counters, previous);
+    previous = cpuPercent === undefined && previous !== undefined ? undefined : counters;
+    const status = { length: koffi.sizeof(memoryStatus) };
+    if (!globalMemoryStatusEx(status))
+      throw new Error("GlobalMemoryStatusEx failed");
+    const memory = mapMemoryBytes(Number(status.total ?? 0n), Number(status.available ?? 0n));
+    if (memory === undefined)
+      throw new Error("Malformed Windows RAM data");
+    return { cpuPercent, ...memory };
+  };
+}
+async function createMacReader() {
+  const loaded = await import("koffi");
+  const koffi = loaded.default ?? loaded;
+  const vmStatistics = koffi.struct("vm_statistics64", {
+    free_count: "uint32",
+    active_count: "uint32",
+    inactive_count: "uint32",
+    wire_count: "uint32",
+    zero_fill_count: "uint32",
+    reactivations: "uint32",
+    pageins: "uint32",
+    pageouts: "uint32",
+    faults: "uint32",
+    cow_faults: "uint32",
+    lookups: "uint32",
+    hits: "uint32",
+    purgeable_count: "uint32",
+    speculative_count: "uint32",
+    decompressions: "uint32",
+    compressions: "uint32",
+    swapins: "uint32",
+    swapouts: "uint32",
+    compressor_page_count: "uint32",
+    throttled_count: "uint32",
+    external_page_count: "uint32",
+    internal_page_count: "uint32",
+    total_uncompressed_pages_in_compressor: "uint32"
+  });
+  const cpuLoad = koffi.struct("host_cpu_load_info", { user: "uint32", system: "uint32", idle: "uint32", nice: "uint32" });
+  const libc = koffi.load("libSystem.B.dylib");
+  const sysctlbyname = libc.func("int sysctlbyname(const char *name, void *oldp, size_t *oldlenp, const void *newp, size_t newlen)");
+  const machHostSelf = libc.func("uint32 mach_host_self()");
+  const hostStatistics64 = libc.func("int host_statistics64(uint32 host, int flavor, _Out_ vm_statistics64 *stats, _Inout_ uint32_t *count)");
+  const hostCpuLoad = libc.func("int host_statistics(uint32 host, int flavor, _Out_ host_cpu_load_info *load, _Inout_ uint32_t *count)");
+  const readUint64Sysctl = (name) => {
+    const output = koffi.alloc("uint64", 1);
+    const length = [8];
+    if (sysctlbyname(name, output, length, null, 0) !== 0)
+      throw new Error(`sysctlbyname failed: ${name}`);
+    return Number(koffi.decode(output, "uint64"));
+  };
+  const totalBytes = readUint64Sysctl("hw.memsize");
+  const pageSize = readUint64Sysctl("hw.pagesize");
+  if (!Number.isSafeInteger(totalBytes) || !Number.isSafeInteger(pageSize) || pageSize <= 0)
+    throw new Error("Malformed macOS memory data");
+  let previous;
+  return async () => {
+    const load = {};
+    const loadCount = [4];
+    if (hostCpuLoad(machHostSelf(), 3, load, loadCount) !== 0)
+      throw new Error("host_statistics failed");
+    const counters = {
+      total: BigInt(load.user ?? 0) + BigInt(load.system ?? 0) + BigInt(load.idle ?? 0) + BigInt(load.nice ?? 0),
+      idle: BigInt(load.idle ?? 0)
+    };
+    const cpuPercent = cpuPercentFromCounters(counters, previous);
+    previous = cpuPercent === undefined && previous !== undefined ? undefined : counters;
+    const stats = {};
+    const count = [38];
+    if (hostStatistics64(machHostSelf(), 4, stats, count) !== 0)
+      throw new Error("host_statistics64 failed");
+    const availablePages = (stats.free_count ?? 0) + (stats.inactive_count ?? 0) + (stats.purgeable_count ?? 0) + (stats.speculative_count ?? 0);
+    const memory = mapMemoryBytes(totalBytes, availablePages * pageSize);
+    if (memory === undefined)
+      throw new Error("Malformed macOS RAM data");
+    return { cpuPercent, ...memory };
+  };
+}
+
+// src/metrics.ts
 var execFileAsync = promisify(execFile);
 var DEFAULT_METRIC_TIMEOUT_MS = 1500;
 var WINDOWS_MEMORY_TIMEOUT_MS = 5000;
@@ -139,7 +444,7 @@ function parseWindowsNetworkOutput(stdout) {
     tx_bytes: finite(item.SentBytes) ?? 0
   }));
 }
-async function readWindowsNetworkSample() {
+async function readWindowsNetworkFallback() {
   const { stdout } = await execFileAsync("powershell.exe", [
     "-NoProfile",
     "-NonInteractive",
@@ -286,20 +591,28 @@ var cachedNetwork = {
   inFlight: undefined
 };
 var previousWindowsNetwork;
+var previousNativeWindowsNetwork;
 async function readWindowsNetworkMetrics() {
-  const samples = await readWindowsNetworkSample();
   const timestamp = Date.now();
-  const rx = samples.reduce((total, item) => total + (finite(item.rx_bytes) ?? 0), 0);
-  const tx = samples.reduce((total, item) => total + (finite(item.tx_bytes) ?? 0), 0);
+  const fallback = async () => {
+    const samples = await readWindowsNetworkFallback();
+    const rx = samples.reduce((total, item) => total + (finite(item.rx_bytes) ?? 0), 0);
+    const tx = samples.reduce((total, item) => total + (finite(item.tx_bytes) ?? 0), 0);
+    return { rx: BigInt(rx), tx: BigInt(tx) };
+  };
+  const { value: counters, usedFallback } = await readWithFallback(readWindowsNetworkCounters, fallback);
+  if (!usedFallback) {
+    const rate = networkRate(counters, previousNativeWindowsNetwork?.counters, previousNativeWindowsNetwork === undefined ? 0 : timestamp - previousNativeWindowsNetwork.timestamp);
+    previousNativeWindowsNetwork = { timestamp, counters };
+    return [{ rx_bytes: Number(counters.rx), tx_bytes: Number(counters.tx), rx_sec: rate.rx, tx_sec: rate.tx }];
+  }
   const seconds = previousWindowsNetwork === undefined ? undefined : Math.max((timestamp - previousWindowsNetwork.timestamp) / 1000, 0.001);
-  const result = [{
-    rx_bytes: rx,
-    tx_bytes: tx,
-    rx_sec: seconds === undefined ? undefined : Math.max(0, rx - previousWindowsNetwork.rx) / seconds,
-    tx_sec: seconds === undefined ? undefined : Math.max(0, tx - previousWindowsNetwork.tx) / seconds
-  }];
+  const rx = Number(counters.rx);
+  const tx = Number(counters.tx);
+  const rxSec = seconds === undefined ? undefined : Math.max(0, rx - previousWindowsNetwork.rx) / seconds;
+  const txSec = seconds === undefined ? undefined : Math.max(0, tx - previousWindowsNetwork.tx) / seconds;
   previousWindowsNetwork = { timestamp, rx, tx };
-  return result;
+  return [{ rx_bytes: rx, tx_bytes: tx, rx_sec: rxSec, tx_sec: txSec }];
 }
 async function readWindowsCpuTemperature() {
   try {
@@ -321,21 +634,31 @@ async function readWindowsCpuTemperature() {
   return value === undefined ? undefined : { main: value };
 }
 async function readMetrics() {
-  const [load, memory, hardwareArchitecture] = await Promise.allSettled([
-    withTimeout(si.currentLoad(), DEFAULT_METRIC_TIMEOUT_MS),
-    withTimeout(si.mem(), isWindows ? WINDOWS_MEMORY_TIMEOUT_MS : DEFAULT_METRIC_TIMEOUT_MS),
+  const [native, hardwareArchitecture] = await Promise.allSettled([
+    withTimeout(readNativeMetrics(), isWindows ? WINDOWS_MEMORY_TIMEOUT_MS : DEFAULT_METRIC_TIMEOUT_MS),
     readMacHardwareArchitecture()
   ]);
+  let cpuPercent = native.status === "fulfilled" ? finite(native.value.cpuPercent) : null;
+  let memoryTotalBytes = native.status === "fulfilled" ? finite(native.value.memoryTotalBytes) : null;
+  let memoryAvailableBytes = native.status === "fulfilled" ? finite(native.value.memoryAvailableBytes) : null;
+  let fallbackMemoryUsedBytes = null;
+  if (native.status !== "fulfilled") {
+    const [load, memory] = await Promise.allSettled([
+      withTimeout(si.currentLoad(), DEFAULT_METRIC_TIMEOUT_MS),
+      withTimeout(si.mem(), isWindows ? WINDOWS_MEMORY_TIMEOUT_MS : DEFAULT_METRIC_TIMEOUT_MS)
+    ]);
+    cpuPercent = load.status === "fulfilled" ? finite(load.value.currentLoad) : null;
+    memoryTotalBytes = memory.status === "fulfilled" ? finite(memory.value.total) : null;
+    memoryAvailableBytes = memory.status === "fulfilled" ? finite(memory.value.available) : null;
+    fallbackMemoryUsedBytes = memoryTotalBytes !== null && memoryAvailableBytes !== null ? Math.max(0, memoryTotalBytes - memoryAvailableBytes) : memory.status === "fulfilled" ? finite(memory.value.used) : null;
+  }
   const [temperature, graphics, network, mac] = await Promise.allSettled([
     readCachedMetric(cachedCpuTemperature, isWindows ? readWindowsCpuTemperature : () => si.cpuTemperature(), TEMPERATURE_CACHE_MS, Date.now(), TEMPERATURE_CACHE_MS, 2500),
     readCachedMetric(cachedGraphics, () => si.graphics(), SLOW_METRIC_CACHE_MS, Date.now(), SLOW_METRIC_CACHE_MS, 2500),
     readCachedMetric(cachedNetwork, isWindows ? readWindowsNetworkMetrics : () => si.networkStats("*"), isWindows ? NETWORK_CACHE_MS : 2000, Date.now(), OPTIONAL_SOURCE_BACKOFF_MS, isWindows ? WINDOWS_NETWORK_OUTER_TIMEOUT_MS : DEFAULT_METRIC_TIMEOUT_MS),
     isMac ? readCachedMetric(cachedMacMetrics, () => readMacMetrics(), SLOW_METRIC_CACHE_MS, Date.now(), OPTIONAL_SOURCE_BACKOFF_MS, MAC_METRIC_TIMEOUT_MS) : Promise.resolve(undefined)
   ]);
-  const cpuPercent = load.status === "fulfilled" ? finite(load.value.currentLoad) : null;
-  const memoryTotalBytes = memory.status === "fulfilled" ? finite(memory.value.total) : null;
-  const memoryAvailableBytes = memory.status === "fulfilled" ? finite(memory.value.available) : null;
-  const memoryUsedBytes = memoryTotalBytes !== null && memoryAvailableBytes !== null ? Math.max(0, memoryTotalBytes - memoryAvailableBytes) : memory.status === "fulfilled" ? finite(memory.value.used) : null;
+  const memoryUsedBytes = fallbackMemoryUsedBytes ?? (memoryTotalBytes !== null && memoryAvailableBytes !== null ? Math.max(0, memoryTotalBytes - memoryAvailableBytes) : null);
   const memoryPercent = memoryUsedBytes !== null && memoryTotalBytes !== null && memoryTotalBytes > 0 ? memoryUsedBytes / memoryTotalBytes * 100 : null;
   const gpu = selectGpuMetrics(graphics.status === "fulfilled" ? graphics.value : undefined);
   const macMetrics = mac.status === "fulfilled" ? mac.value : undefined;
@@ -527,12 +850,11 @@ function MetricsPanel(props) {
     };
   });
   return (() => {
-    var _el$ = _$createElement("box"), _el$2 = _$createElement("text"), _el$3 = _$createTextNode(` `), _el$4 = _$createElement("box"), _el$5 = _$createElement("text"), _el$6 = _$createElement("text"), _el$8 = _$createElement("text"), _el$9 = _$createTextNode(` · `), _el$0 = _$createTextNode(` `), _el$1 = _$createElement("box"), _el$10 = _$createElement("text"), _el$11 = _$createElement("text"), _el$13 = _$createElement("text"), _el$14 = _$createTextNode(` / `), _el$15 = _$createTextNode(` (`), _el$16 = _$createTextNode(`)`), _el$17 = _$createElement("box"), _el$18 = _$createElement("text"), _el$19 = _$createElement("text"), _el$21 = _$createElement("text"), _el$22 = _$createTextNode(` · `), _el$23 = _$createTextNode(` `), _el$24 = _$createElement("box"), _el$25 = _$createElement("text"), _el$26 = _$createElement("text"), _el$27 = _$createTextNode(` `), _el$28 = _$createTextNode(` `), _el$29 = _$createElement("text"), _el$30 = _$createTextNode(` / `), _el$31 = _$createTextNode(` (`), _el$32 = _$createTextNode(`)`), _el$33 = _$createElement("box"), _el$34 = _$createElement("text"), _el$35 = _$createElement("text"), _el$37 = _$createElement("text"), _el$38 = _$createTextNode(`↓ `), _el$39 = _$createTextNode(` ↑ `);
+    var _el$ = _$createElement("box"), _el$2 = _$createElement("text"), _el$3 = _$createTextNode(` `), _el$4 = _$createElement("box"), _el$5 = _$createElement("text"), _el$6 = _$createElement("text"), _el$8 = _$createElement("text"), _el$9 = _$createTextNode(` · `), _el$0 = _$createTextNode(` `), _el$1 = _$createElement("box"), _el$10 = _$createElement("text"), _el$11 = _$createElement("text"), _el$13 = _$createElement("text"), _el$14 = _$createTextNode(` / `), _el$15 = _$createTextNode(` (`), _el$16 = _$createTextNode(`)`), _el$17 = _$createElement("box"), _el$18 = _$createElement("text"), _el$19 = _$createElement("text"), _el$21 = _$createElement("text"), _el$22 = _$createTextNode(` · `), _el$23 = _$createTextNode(` `), _el$33 = _$createElement("box"), _el$34 = _$createElement("text"), _el$35 = _$createElement("text"), _el$37 = _$createElement("text"), _el$38 = _$createTextNode(`↓ `), _el$39 = _$createTextNode(` ↑ `);
     _$insertNode(_el$, _el$2);
     _$insertNode(_el$, _el$4);
     _$insertNode(_el$, _el$1);
     _$insertNode(_el$, _el$17);
-    _$insertNode(_el$, _el$24);
     _$insertNode(_el$, _el$33);
     _$setProp(_el$, "flexDirection", "column");
     _$setProp(_el$, "paddingLeft", 0);
@@ -574,20 +896,40 @@ function MetricsPanel(props) {
     _$insert(_el$21, () => formatPercent(metricsState.sharedMetrics().gpuPercent), _el$22);
     _$insert(_el$21, () => icons.thermometer, _el$23);
     _$insert(_el$21, () => formatTemperature(metricsState.sharedMetrics().gpuTemperatureCelsius), null);
-    _$insertNode(_el$24, _el$25);
-    _$insertNode(_el$24, _el$26);
-    _$insertNode(_el$24, _el$29);
-    _$setProp(_el$24, "flexDirection", "row");
-    _$insert(_el$25, () => gpuMemory().icon);
-    _$insertNode(_el$26, _el$27);
-    _$insertNode(_el$26, _el$28);
-    _$insert(_el$26, () => gpuMemory().label, _el$28);
-    _$insertNode(_el$29, _el$30);
-    _$insertNode(_el$29, _el$31);
-    _$insertNode(_el$29, _el$32);
-    _$insert(_el$29, () => formatGiB(gpuMemory().usedBytes), _el$30);
-    _$insert(_el$29, () => formatGiB(gpuMemory().totalBytes), _el$31);
-    _$insert(_el$29, () => formatPercent(gpuMemory().percent), _el$32);
+    _$insert(_el$, _$createComponent(Show, {
+      get when() {
+        return metricsState.sharedMetrics().gpuMemoryIsUnified !== true;
+      },
+      get children() {
+        var _el$24 = _$createElement("box"), _el$25 = _$createElement("text"), _el$26 = _$createElement("text"), _el$27 = _$createTextNode(` `), _el$28 = _$createTextNode(` `), _el$29 = _$createElement("text"), _el$30 = _$createTextNode(` / `), _el$31 = _$createTextNode(` (`), _el$32 = _$createTextNode(`)`);
+        _$insertNode(_el$24, _el$25);
+        _$insertNode(_el$24, _el$26);
+        _$insertNode(_el$24, _el$29);
+        _$setProp(_el$24, "flexDirection", "row");
+        _$insert(_el$25, () => gpuMemory().icon);
+        _$insertNode(_el$26, _el$27);
+        _$insertNode(_el$26, _el$28);
+        _$insert(_el$26, () => gpuMemory().label, _el$28);
+        _$insertNode(_el$29, _el$30);
+        _$insertNode(_el$29, _el$31);
+        _$insertNode(_el$29, _el$32);
+        _$insert(_el$29, () => formatGiB(gpuMemory().usedBytes), _el$30);
+        _$insert(_el$29, () => formatGiB(gpuMemory().totalBytes), _el$31);
+        _$insert(_el$29, () => formatPercent(gpuMemory().percent), _el$32);
+        _$effect((_p$) => {
+          var _v$ = props.theme.success, _v$2 = props.theme.text, _v$3 = props.theme.textMuted;
+          _v$ !== _p$.e && (_p$.e = _$setProp(_el$25, "fg", _v$, _p$.e));
+          _v$2 !== _p$.t && (_p$.t = _$setProp(_el$26, "fg", _v$2, _p$.t));
+          _v$3 !== _p$.a && (_p$.a = _$setProp(_el$29, "fg", _v$3, _p$.a));
+          return _p$;
+        }, {
+          e: undefined,
+          t: undefined,
+          a: undefined
+        });
+        return _el$24;
+      }
+    }), _el$33);
     _$insertNode(_el$33, _el$34);
     _$insertNode(_el$33, _el$35);
     _$insertNode(_el$33, _el$37);
@@ -599,24 +941,21 @@ function MetricsPanel(props) {
     _$insert(_el$37, () => formatRate(metricsState.sharedMetrics().downloadBytesPerSecond), _el$39);
     _$insert(_el$37, () => formatRate(metricsState.sharedMetrics().uploadBytesPerSecond), null);
     _$effect((_p$) => {
-      var _v$ = props.theme.text, _v$2 = TextAttributes.BOLD, _v$3 = props.theme.success, _v$4 = props.theme.text, _v$5 = props.theme.textMuted, _v$6 = props.theme.success, _v$7 = props.theme.text, _v$8 = props.theme.textMuted, _v$9 = props.theme.success, _v$0 = props.theme.text, _v$1 = props.theme.textMuted, _v$10 = props.theme.success, _v$11 = props.theme.text, _v$12 = props.theme.textMuted, _v$13 = props.theme.success, _v$14 = props.theme.text, _v$15 = props.theme.textMuted;
-      _v$ !== _p$.e && (_p$.e = _$setProp(_el$2, "fg", _v$, _p$.e));
-      _v$2 !== _p$.t && (_p$.t = _$setProp(_el$2, "attributes", _v$2, _p$.t));
-      _v$3 !== _p$.a && (_p$.a = _$setProp(_el$5, "fg", _v$3, _p$.a));
-      _v$4 !== _p$.o && (_p$.o = _$setProp(_el$6, "fg", _v$4, _p$.o));
-      _v$5 !== _p$.i && (_p$.i = _$setProp(_el$8, "fg", _v$5, _p$.i));
-      _v$6 !== _p$.n && (_p$.n = _$setProp(_el$10, "fg", _v$6, _p$.n));
-      _v$7 !== _p$.s && (_p$.s = _$setProp(_el$11, "fg", _v$7, _p$.s));
-      _v$8 !== _p$.h && (_p$.h = _$setProp(_el$13, "fg", _v$8, _p$.h));
-      _v$9 !== _p$.r && (_p$.r = _$setProp(_el$18, "fg", _v$9, _p$.r));
-      _v$0 !== _p$.d && (_p$.d = _$setProp(_el$19, "fg", _v$0, _p$.d));
-      _v$1 !== _p$.l && (_p$.l = _$setProp(_el$21, "fg", _v$1, _p$.l));
-      _v$10 !== _p$.u && (_p$.u = _$setProp(_el$25, "fg", _v$10, _p$.u));
-      _v$11 !== _p$.c && (_p$.c = _$setProp(_el$26, "fg", _v$11, _p$.c));
-      _v$12 !== _p$.w && (_p$.w = _$setProp(_el$29, "fg", _v$12, _p$.w));
-      _v$13 !== _p$.m && (_p$.m = _$setProp(_el$34, "fg", _v$13, _p$.m));
-      _v$14 !== _p$.f && (_p$.f = _$setProp(_el$35, "fg", _v$14, _p$.f));
-      _v$15 !== _p$.y && (_p$.y = _$setProp(_el$37, "fg", _v$15, _p$.y));
+      var _v$4 = props.theme.text, _v$5 = TextAttributes.BOLD, _v$6 = props.theme.success, _v$7 = props.theme.text, _v$8 = props.theme.textMuted, _v$9 = props.theme.success, _v$0 = props.theme.text, _v$1 = props.theme.textMuted, _v$10 = props.theme.success, _v$11 = props.theme.text, _v$12 = props.theme.textMuted, _v$13 = props.theme.success, _v$14 = props.theme.text, _v$15 = props.theme.textMuted;
+      _v$4 !== _p$.e && (_p$.e = _$setProp(_el$2, "fg", _v$4, _p$.e));
+      _v$5 !== _p$.t && (_p$.t = _$setProp(_el$2, "attributes", _v$5, _p$.t));
+      _v$6 !== _p$.a && (_p$.a = _$setProp(_el$5, "fg", _v$6, _p$.a));
+      _v$7 !== _p$.o && (_p$.o = _$setProp(_el$6, "fg", _v$7, _p$.o));
+      _v$8 !== _p$.i && (_p$.i = _$setProp(_el$8, "fg", _v$8, _p$.i));
+      _v$9 !== _p$.n && (_p$.n = _$setProp(_el$10, "fg", _v$9, _p$.n));
+      _v$0 !== _p$.s && (_p$.s = _$setProp(_el$11, "fg", _v$0, _p$.s));
+      _v$1 !== _p$.h && (_p$.h = _$setProp(_el$13, "fg", _v$1, _p$.h));
+      _v$10 !== _p$.r && (_p$.r = _$setProp(_el$18, "fg", _v$10, _p$.r));
+      _v$11 !== _p$.d && (_p$.d = _$setProp(_el$19, "fg", _v$11, _p$.d));
+      _v$12 !== _p$.l && (_p$.l = _$setProp(_el$21, "fg", _v$12, _p$.l));
+      _v$13 !== _p$.u && (_p$.u = _$setProp(_el$34, "fg", _v$13, _p$.u));
+      _v$14 !== _p$.c && (_p$.c = _$setProp(_el$35, "fg", _v$14, _p$.c));
+      _v$15 !== _p$.w && (_p$.w = _$setProp(_el$37, "fg", _v$15, _p$.w));
       return _p$;
     }, {
       e: undefined,
@@ -632,10 +971,7 @@ function MetricsPanel(props) {
       l: undefined,
       u: undefined,
       c: undefined,
-      w: undefined,
-      m: undefined,
-      f: undefined,
-      y: undefined
+      w: undefined
     });
     return _el$;
   })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-system-metrics-tui",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "OpenCode TUI sidebar plugin for live system metrics",
   "license": "MIT",
   "type": "module",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@opentui/core": "^0.5.10",
     "@opentui/solid": "^0.5.10",
-    "opencode-system-metrics-tui": "^0.1.8",
+    "koffi": "^3.2.1",
     "solid-js": "^1.9.12",
     "systeminformation": "^5.33.8"
   },

package/scripts/build.ts

@@ -6,7 +6,7 @@ const result = await Bun.build({
   target: "node",
   format: "esm",
   plugins: [solidPlugin],
-  external: ["@opencode-ai/plugin/tui", "@opentui/core", "@opentui/solid", "solid-js", "systeminformation"],
+  external: ["@opencode-ai/plugin/tui", "@opentui/core", "@opentui/solid", "koffi", "solid-js", "systeminformation"],
   naming: "[name].js",
 })