open-agents-ai 0.103.55 → 0.103.56

package/dist/index.js

@@ -12962,23 +12962,16 @@ async function handleCmd(cmd) {
                   },
                 });
 
-                // 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)); }
+                // Stash token data for the metering hook (which fires after handler returns
+                // and has the correct peerId from connection context)
+                _tokensByRequest[request.requestId] = {
+                  model: model.name,
+                  inputBytes: prompt.length,
+                  outputBytes: (output || '').length,
+                  tokens: inputTokens + outputTokens,
+                  inputTokens: inputTokens,
+                  outputTokens: outputTokens,
+                };
               } catch (e) {
                 dlog('expose: inference error: ' + (e.message || e));
                 await swrite({
@@ -13205,9 +13198,37 @@ process.on('unhandledRejection', (reason) => {
       dlog('WARNING: could not patch node.dialProtocol \u2014 node=' + !!_patchNode);
     }
 
-    // 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).
+    // v1.5.0: Metering hook that enriches nexus records with token counts.
+    // The nexus library fires this hook AFTER handler returns, so it has the correct
+    // peerId from connection context. We stash token data per requestId so the hook
+    // can merge them into one complete record written to metering.jsonl.
+    var _tokensByRequest = {};
+    try {
+      if (nexus.metering && typeof nexus.metering.addHook === 'function') {
+        nexus.metering.addHook(function(record) {
+          // Only enrich inference capability records
+          if (!record.capability || !record.capability.startsWith('inference:')) return;
+          var tokenData = _tokensByRequest[record.id];
+          delete _tokensByRequest[record.id]; // consume
+          try {
+            appendFileSync(meteringFile, JSON.stringify({
+              timestamp: record.timestamp || Date.now(),
+              peerId: record.peerId || 'unknown',
+              service: record.service || record.capability,
+              capability: record.capability,
+              model: tokenData ? tokenData.model : (record.capability || '').replace('inference:', ''),
+              direction: record.direction || 'inbound',
+              inputBytes: tokenData ? tokenData.inputBytes : (record.inputBytes || 0),
+              outputBytes: tokenData ? tokenData.outputBytes : (record.outputBytes || 0),
+              tokens: tokenData ? tokenData.tokens : 0,
+              inputTokens: tokenData ? tokenData.inputTokens : 0,
+              outputTokens: tokenData ? tokenData.outputTokens : 0,
+              durationMs: record.durationMs || 0,
+            }) + '\\n');
+          } catch {}
+        });
+      }
+    } catch {}
 
     // Write payment events to ledger.jsonl
     try {
@@ -28895,7 +28916,8 @@ ${this.formatConnectionInfo()}`);
                     user.tokensIn += tokIn;
                     user.tokensOut += tokOut;
                     if (record.model || record.capability || record.service) {
-                      const modelName = record.model || (record.capability || record.service || "").replace("inference:", "") || "unknown";
+                      let modelName = record.model || (record.capability || record.service || "").replace("inference:", "") || "unknown";
+                      modelName = modelName.replace(/^open-agents-/, "").replace(/_latest$/, "").replace(/_/g, ":");
                       this._stats.modelUsage.set(modelName, (this._stats.modelUsage.get(modelName) ?? 0) + 1);
                       let mm = user.models.get(modelName);
                       if (!mm) {

package/package.json

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