open-agents-ai 0.103.53 → 0.103.54

package/dist/index.js

@@ -12071,7 +12071,7 @@ var init_nexus = __esm({
  * Usage: node nexus-daemon.mjs <nexus-dir> <agent-name> [agent-type]
  */
 
-import { NexusClient, createFileAuditHook } from 'open-agents-nexus';
+import { NexusClient } from 'open-agents-nexus';
 import { readFileSync, writeFileSync, existsSync, mkdirSync, unlinkSync, readdirSync, appendFileSync, watch as fsWatch } from 'node:fs';
 import { join } from 'node:path';
 
@@ -12961,6 +12961,24 @@ async function handleCmd(cmd) {
                     tokens: inputTokens + outputTokens,
                   },
                 });
+
+                // Write metering record directly (createFileAuditHook does not capture token data)
+                try {
+                  appendFileSync(meteringFile, JSON.stringify({
+                    timestamp: Date.now(),
+                    peerId: request.from || 'unknown',
+                    service: capName,
+                    capability: capName,
+                    model: model.name,
+                    direction: 'inbound',
+                    inputBytes: prompt.length,
+                    outputBytes: (output || '').length,
+                    tokens: inputTokens + outputTokens,
+                    inputTokens: inputTokens,
+                    outputTokens: outputTokens,
+                    durationMs: Date.now() - logEntry.ts,
+                  }) + '\\n');
+                } catch (mErr) { dlog('metering write error: ' + (mErr.message || mErr)); }
               } catch (e) {
                 dlog('expose: inference error: ' + (e.message || e));
                 await swrite({
@@ -13020,9 +13038,11 @@ async function handleCmd(cmd) {
                   gpuInfo.vramUtilization = gpuInfo.vramTotalMB > 0 ? Math.round((gpuInfo.vramUsedMB / gpuInfo.vramTotalMB) * 100) : 0;
                 }
               } catch (ge) { /* no GPU */ }
+              var cpuModel = '';
+              try { var cpuInfoArr = os.cpus(); if (cpuInfoArr.length > 0) cpuModel = cpuInfoArr[0].model || ''; } catch {}
               var metricsPayload = {
-                cpu: { utilization: Math.min(100, Math.round((loads[0] / cores) * 100)), cores: cores },
-                memory: { utilization: Math.round((usedMem / totalMem) * 100), totalGB: Math.round((totalMem / (1024*1024*1024)) * 10) / 10 },
+                cpu: { utilization: Math.min(100, Math.round((loads[0] / cores) * 100)), cores: cores, model: cpuModel },
+                memory: { utilization: Math.round((usedMem / totalMem) * 100), totalGB: Math.round((totalMem / (1024*1024*1024)) * 10) / 10, usedGB: Math.round((usedMem / (1024*1024*1024)) * 10) / 10 },
                 gpu: gpuInfo,
                 timestamp: new Date().toISOString(),
               };
@@ -13185,12 +13205,9 @@ process.on('unhandledRejection', (reason) => {
       dlog('WARNING: could not patch node.dialProtocol \u2014 node=' + !!_patchNode);
     }
 
-    // v1.5.0: Setup metering audit hook
-    try {
-      if (nexus.metering && typeof nexus.metering.addHook === 'function') {
-        nexus.metering.addHook(createFileAuditHook(meteringFile));
-      }
-    } catch {}
+    // v1.5.0: Metering is now written directly from inference handlers (with token counts).
+    // createFileAuditHook was previously used but produced records with 0 bytes / no tokens.
+    // Keep metering hooks for payment tracking only (below).
 
     // Write payment events to ledger.jsonl
     try {
@@ -28837,18 +28854,23 @@ ${this.formatConnectionInfo()}`);
                     continue;
                   try {
                     const record = JSON.parse(line);
-                    const recInputBytes = record.inputBytes || 0;
-                    const recOutputBytes = record.outputBytes || 0;
-                    const recTotalTokens = typeof record.tokens === "number" ? record.tokens : typeof record.tokens === "object" && record.tokens ? (record.tokens.input || 0) + (record.tokens.output || 0) : 0;
-                    const totalBytes = recInputBytes + recOutputBytes;
                     let tokIn = 0;
                     let tokOut = 0;
-                    if (recTotalTokens > 0 && totalBytes > 0) {
-                      tokIn = Math.round(recTotalTokens * (recInputBytes / totalBytes));
-                      tokOut = recTotalTokens - tokIn;
-                    } else if (recTotalTokens > 0) {
-                      tokIn = Math.round(recTotalTokens / 2);
-                      tokOut = recTotalTokens - tokIn;
+                    if (typeof record.inputTokens === "number" && typeof record.outputTokens === "number") {
+                      tokIn = record.inputTokens;
+                      tokOut = record.outputTokens;
+                    } else {
+                      const recInputBytes = record.inputBytes || 0;
+                      const recOutputBytes = record.outputBytes || 0;
+                      const recTotalTokens = typeof record.tokens === "number" ? record.tokens : typeof record.tokens === "object" && record.tokens ? (record.tokens.input || 0) + (record.tokens.output || 0) : 0;
+                      const totalBytes = recInputBytes + recOutputBytes;
+                      if (recTotalTokens > 0 && totalBytes > 0) {
+                        tokIn = Math.round(recTotalTokens * (recInputBytes / totalBytes));
+                        tokOut = recTotalTokens - tokIn;
+                      } else if (recTotalTokens > 0) {
+                        tokIn = Math.round(recTotalTokens / 2);
+                        tokOut = recTotalTokens - tokIn;
+                      }
                     }
                     this._stats.totalTokensIn += tokIn;
                     this._stats.totalTokensOut += tokOut;
@@ -44527,7 +44549,15 @@ var init_status_bar = __esm({
       _remoteMetricsTimer = null;
       /** Update remote host system metrics (from polling /v1/system/metrics) */
       setRemoteMetrics(metrics) {
-        this._remoteMetrics = metrics;
+        this._remoteMetrics = {
+          ...metrics,
+          cpuCores: metrics.cpuCores ?? 0,
+          cpuModel: metrics.cpuModel ?? "",
+          vramUsedMB: metrics.vramUsedMB ?? 0,
+          vramTotalMB: metrics.vramTotalMB ?? 0,
+          memTotalGB: metrics.memTotalGB ?? 0,
+          memUsedGB: metrics.memUsedGB ?? 0
+        };
         if (this.active)
           this.renderFooterPreserveCursor();
       }
@@ -44598,10 +44628,16 @@ var init_status_bar = __esm({
               if (metricsData?.cpu) {
                 this.setRemoteMetrics({
                   cpuUtil: metricsData.cpu?.utilization ?? 0,
+                  cpuCores: metricsData.cpu?.cores ?? 0,
+                  cpuModel: metricsData.cpu?.model ?? "",
                   gpuUtil: metricsData.gpu?.available ? metricsData.gpu.utilization ?? 0 : -1,
                   gpuName: metricsData.gpu?.name ?? "",
                   vramUtil: metricsData.gpu?.available ? metricsData.gpu.vramUtilization ?? 0 : -1,
-                  memUtil: metricsData.memory?.utilization ?? 0
+                  vramUsedMB: metricsData.gpu?.vramUsedMB ?? 0,
+                  vramTotalMB: metricsData.gpu?.vramTotalMB ?? 0,
+                  memUtil: metricsData.memory?.utilization ?? 0,
+                  memTotalGB: metricsData.memory?.totalGB ?? 0,
+                  memUsedGB: metricsData.memory?.usedGB ?? 0
                 });
                 return;
               }
@@ -45003,29 +45039,44 @@ var init_status_bar = __esm({
         if (this._remoteMetrics) {
           const rm2 = this._remoteMetrics;
           const cpuColor = rm2.cpuUtil > 80 ? c2.red : rm2.cpuUtil > 50 ? c2.yellow : c2.green;
-          const cpuStr = `CPU:${cpuColor(rm2.cpuUtil + "%")}`;
-          const cpuW = 4 + `${rm2.cpuUtil}%`.length;
-          let gpuStr = "";
-          let gpuW = 0;
+          const cpuCoresInfo = rm2.cpuCores > 0 ? ` (${rm2.cpuCores}c` + (rm2.cpuModel ? " " + rm2.cpuModel.replace(/\s+/g, " ").slice(0, 30) : "") + ")" : "";
+          const cpuExpStr = `CPU:${cpuColor(rm2.cpuUtil + "%")}${c2.dim(cpuCoresInfo)}`;
+          const cpuCompStr = `CPU:${cpuColor(rm2.cpuUtil + "%")}`;
+          const cpuExpW = 4 + `${rm2.cpuUtil}%`.length + cpuCoresInfo.length;
+          const cpuCompW = 4 + `${rm2.cpuUtil}%`.length;
+          const memColor = rm2.memUtil > 80 ? c2.red : rm2.memUtil > 50 ? c2.yellow : c2.green;
+          const memDetail = rm2.memTotalGB > 0 ? ` (${rm2.memUsedGB}/${rm2.memTotalGB}GB)` : "";
+          const memExpStr = ` RAM:${memColor(rm2.memUtil + "%")}${c2.dim(memDetail)}`;
+          const memCompStr = ` RAM:${memColor(rm2.memUtil + "%")}`;
+          const memExpW = 5 + `${rm2.memUtil}%`.length + memDetail.length;
+          const memCompW = 5 + `${rm2.memUtil}%`.length;
+          let gpuExpStr = "";
+          let gpuCompStr = "";
+          let gpuExpW = 0;
+          let gpuCompW = 0;
           if (rm2.gpuUtil >= 0) {
             const gpuColor = rm2.gpuUtil > 80 ? c2.red : rm2.gpuUtil > 50 ? c2.yellow : c2.green;
-            gpuStr = ` GPU:${gpuColor(rm2.gpuUtil + "%")}`;
-            gpuW = 5 + `${rm2.gpuUtil}%`.length;
+            const gpuNameShort = rm2.gpuName ? ` (${rm2.gpuName.slice(0, 20)})` : "";
+            gpuExpStr = ` GPU:${gpuColor(rm2.gpuUtil + "%")}${c2.dim(gpuNameShort)}`;
+            gpuCompStr = ` GPU:${gpuColor(rm2.gpuUtil + "%")}`;
+            gpuExpW = 5 + `${rm2.gpuUtil}%`.length + gpuNameShort.length;
+            gpuCompW = 5 + `${rm2.gpuUtil}%`.length;
           }
           let vramStr = "";
           let vramW = 0;
           if (rm2.vramUtil >= 0) {
             const vramColor = rm2.vramUtil > 80 ? c2.red : rm2.vramUtil > 50 ? c2.yellow : c2.green;
-            vramStr = ` VRAM:${vramColor(rm2.vramUtil + "%")}`;
-            vramW = 6 + `${rm2.vramUtil}%`.length;
+            const vramDetail = rm2.vramTotalMB > 0 ? ` (${rm2.vramUsedMB}/${rm2.vramTotalMB}MB)` : "";
+            vramStr = ` VRAM:${vramColor(rm2.vramUtil + "%")}${c2.dim(vramDetail)}`;
+            vramW = 6 + `${rm2.vramUtil}%`.length + vramDetail.length;
           }
-          const remoteExpanded = pastel2(117, "\u{1F4E1}") + " " + cpuStr + gpuStr + vramStr;
-          const remoteCompact = pastel2(117, "\u{1F4E1}") + " " + cpuStr + gpuStr;
+          const remoteExpanded = pastel2(117, "\u{1F4E1}") + " " + cpuExpStr + memExpStr + gpuExpStr + vramStr;
+          const remoteCompact = pastel2(117, "\u{1F4E1}") + " " + cpuCompStr + gpuCompStr;
           sections.push({
             expanded: remoteExpanded,
             compact: remoteCompact,
-            expandedW: 3 + cpuW + gpuW + vramW,
-            compactW: 3 + cpuW + gpuW,
+            expandedW: 3 + cpuExpW + memExpW + gpuExpW + vramW,
+            compactW: 3 + cpuCompW + gpuCompW,
             empty: false
           });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.103.53",
+  "version": "0.103.54",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",