open-agents-ai 0.103.54 → 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) {
@@ -37145,6 +37167,47 @@ function pick(key, variants) {
   narration.lastVariantIdx[key] = idx;
   return variants[idx];
 }
+function extractSubAgentTopic(args) {
+  const raw = String(args["description"] ?? args["prompt"] ?? "");
+  if (!raw || raw.length < 5)
+    return "";
+  let text = raw.replace(/[#*`_~\[\]]/g, "").replace(/^\d+[.)]\s*/gm, "").trim();
+  const sentEnd = text.search(/[.!?]\s/);
+  if (sentEnd > 10 && sentEnd < 80) {
+    text = text.slice(0, sentEnd);
+  } else if (text.length > 80) {
+    const cut = text.lastIndexOf(" ", 80);
+    text = text.slice(0, cut > 20 ? cut : 80);
+  }
+  if (text.length > 0)
+    text = text.charAt(0).toLowerCase() + text.slice(1);
+  return text;
+}
+function extractShellEssence(cmd) {
+  if (!cmd || cmd.length < 3)
+    return "";
+  const npmTest = cmd.match(/npm\s+test\b/);
+  if (npmTest)
+    return "running tests";
+  const npmBuild = cmd.match(/npm\s+run\s+(\S+)/);
+  if (npmBuild)
+    return `running ${npmBuild[1]}`;
+  const gitCmd = cmd.match(/git\s+(commit|push|pull|merge|rebase|checkout|diff|status|log|stash|add)\b/);
+  if (gitCmd)
+    return `git ${gitCmd[1]}`;
+  if (/npm\s+publish/.test(cmd))
+    return "publishing to npm";
+  const nodeScript = cmd.match(/(?:node|tsx?)\s+(\S+)/);
+  if (nodeScript)
+    return `running ${nodeScript[1].split("/").pop()}`;
+  const curlUrl = cmd.match(/curl\s+.*?(https?:\/\/\S{10,40})/);
+  if (curlUrl)
+    return `fetching ${curlUrl[1].replace(/https?:\/\//, "").split("/")[0]}`;
+  const pnpm = cmd.match(/pnpm\s+(-r\s+)?(\S+)/);
+  if (pnpm)
+    return `pnpm ${pnpm[1] || ""}${pnpm[2]}`.trim();
+  return "";
+}
 function getShellCategory(cmd) {
   if (/npm\s+test|vitest|jest|mocha/.test(cmd))
     return "test";
@@ -37220,24 +37283,35 @@ function emotionColor(emotion, stark = false, autist = false) {
     return "";
   if (Math.random() > (stark ? 0.5 : 0.3))
     return "";
+  const lastEmoKey = narration.lastVariantIdx["_emo_quadrant"] ?? -1;
   if (emotion.valence > 0.5 && emotion.arousal > 0.6) {
+    narration.lastVariantIdx["_emo_quadrant"] = 1;
+    if (lastEmoKey === 1 && Math.random() < 0.5)
+      return "";
     return pick("emo_excited", stark ? [
       "Now we're cooking. ",
       "This is what I'm talking about. ",
-      "Brilliant. Absolutely brilliant. ",
+      "Brilliant. ",
       "Watch this. ",
       "We're onto something here. ",
-      "I live for this. ",
-      "Oh this is good. "
+      "Oh this is good. ",
+      "The pieces are falling into place. ",
+      "This is where it gets interesting. ",
+      "I can feel this coming together. "
     ] : [
       "Feeling good about this. ",
       "On a roll here. ",
       "This is going great. ",
       "Momentum building. ",
-      "Loving this. "
+      "Loving this. ",
+      "Making real progress now. ",
+      "Things are clicking. "
     ]);
   }
   if (emotion.valence < -0.3 && emotion.arousal > 0.5) {
+    narration.lastVariantIdx["_emo_quadrant"] = 2;
+    if (lastEmoKey === 2 && Math.random() < 0.5)
+      return "";
     return pick("emo_stressed", stark ? [
       "Fine. The hard way then. ",
       "This is getting personal. ",
@@ -37245,41 +37319,54 @@ function emotionColor(emotion, stark = false, autist = false) {
       "Come on. Think. ",
       "Not today. Not this bug. ",
       "I've beaten worse. ",
-      "Pain is just information. "
+      "There's got to be a way. ",
+      "Okay, new angle. "
     ] : [
       "Pushing through. ",
       "Staying focused. ",
       "Not giving up. ",
       "Determined to crack this. ",
-      "Bear with me. "
+      "Bear with me. ",
+      "Working through this. ",
+      "Let me rethink this. "
     ]);
   }
   if (emotion.valence > 0.3 && emotion.arousal < 0.3) {
+    narration.lastVariantIdx["_emo_quadrant"] = 3;
+    if (lastEmoKey === 3 && Math.random() < 0.5)
+      return "";
     return pick("emo_calm", stark ? [
       "Clean. Just how I like it. ",
       "Smooth. ",
       "Textbook. ",
       "That's the stuff. ",
-      "Effortless. "
+      "Effortless. ",
+      "Exactly as expected. "
     ] : [
       "Nice and steady. ",
       "Smooth sailing. ",
       "Easy does it. ",
-      "Taking it easy. "
+      "Taking it easy. ",
+      "Going well. "
     ]);
   }
   if (emotion.valence < -0.2 && emotion.arousal < 0.3) {
+    narration.lastVariantIdx["_emo_quadrant"] = 4;
+    if (lastEmoKey === 4 && Math.random() < 0.5)
+      return "";
     return pick("emo_subdued", stark ? [
       "Careful now. ",
       "One wrong move and this unravels. ",
       "Measured steps. ",
       "Trust the process. ",
-      "Precision matters here. "
+      "Precision matters here. ",
+      "Methodical. "
     ] : [
       "Being careful here. ",
       "Treading carefully. ",
       "Let me be precise. ",
-      "Taking extra care. "
+      "Taking extra care. ",
+      "One step at a time. "
     ]);
   }
   return "";
@@ -37312,9 +37399,16 @@ function describeToolCall(toolName, args, personality = 2, emotion, stark = fals
       base = pick(poolKey, (FILE_EDIT_VARIANTS[tier] ?? FILE_EDIT_VARIANTS.terse)(file, args));
       break;
     case "shell": {
-      const cat = getShellCategory(String(args["command"] ?? ""));
-      const pool = SHELL_VARIANTS[cat] ?? SHELL_VARIANTS.generic;
-      base = pick(`shell_${cat}_${tier}`, pool[tier] ?? pool.terse);
+      const cmd = String(args["command"] ?? "");
+      const cat = getShellCategory(cmd);
+      const essence = extractShellEssence(cmd);
+      if (essence && tier !== "terse") {
+        const essenceVariants = tier === "chatty" ? [`Alright, ${essence}`, `Let me handle ${essence}`, `Time to ${essence.startsWith("running") ? essence : "run " + essence}`] : [`Now ${essence}`, essence.charAt(0).toUpperCase() + essence.slice(1)];
+        base = pick(`shell_ess_${tier}`, essenceVariants);
+      } else {
+        const pool = SHELL_VARIANTS[cat] ?? SHELL_VARIANTS.generic;
+        base = pick(`shell_${cat}_${tier}`, pool[tier] ?? pool.terse);
+      }
       break;
     }
     case "grep_search":
@@ -37514,9 +37608,47 @@ function extractResultDigest(toolName, content) {
   const exitMatch = text.match(/exit\s*(?:code)?[:\s]*(\d+)/i);
   if (exitMatch && exitMatch[1] !== "0")
     nuggets.push(`exit code ${exitMatch[1]}`);
+  if (nuggets.length === 0) {
+    const contentDigest = extractContentSummary(text, toolName);
+    if (contentDigest)
+      nuggets.push(contentDigest);
+  }
   const digest = nuggets.slice(0, 3).join(", ");
   return digest.length > 100 ? digest.slice(0, 97) + "..." : digest;
 }
+function extractContentSummary(text, toolName) {
+  let cleaned = text.replace(/^\s*\d+[│|:→]\s*/gm, "").replace(/\d{4}-\d{2}-\d{2}T[\d:.]+Z?\s*/g, "").replace(/^[\s*#=-]+$/gm, "").replace(/```[\s\S]*?```/g, "").replace(/^\s*(import|export|const|let|var|function|class|interface|type)\s/gm, "").replace(/[{}()\[\];]/g, "").trim();
+  const lines = cleaned.split("\n").map((l) => l.trim()).filter((l) => l.length > 10);
+  for (const line of lines) {
+    const wordChars = line.replace(/[^a-zA-Z\s]/g, "").trim();
+    if (wordChars.length < line.length * 0.4)
+      continue;
+    if (/^(\/|\.\/)/.test(line))
+      continue;
+    if (/^\s*[{<]/.test(line))
+      continue;
+    let summary = line;
+    if (summary.length > 80) {
+      const cut = summary.lastIndexOf(" ", 80);
+      summary = summary.slice(0, cut > 20 ? cut : 80);
+    }
+    if (summary.length > 0) {
+      summary = summary.charAt(0).toLowerCase() + summary.slice(1);
+      summary = summary.replace(/[.,;:!?]+$/, "");
+    }
+    return summary;
+  }
+  if (toolName === "sub_agent") {
+    const summaryMatch = text.match(/(?:summary|created|completed|result)[:\s]+(.{10,80}?)(?:\n|$)/i);
+    if (summaryMatch) {
+      let s = summaryMatch[1].trim();
+      if (s.length > 0)
+        s = s.charAt(0).toLowerCase() + s.slice(1);
+      return s;
+    }
+  }
+  return "";
+}
 function describeToolResult(toolName, success, personality = 2, resultContent, emotion, stark = false) {
   if (toolName === "task_complete")
     return "";
@@ -37532,6 +37664,16 @@ function describeToolResult(toolName, success, personality = 2, resultContent, e
       return "";
     const base = pick(`result_ok_${tier}`, RESULT_SUCCESS_VARIANTS[tier] ?? RESULT_SUCCESS_VARIANTS.terse);
     if (digest && personality >= 2) {
+      if (tier === "chatty" && digest.length > 15) {
+        if (Math.random() < 0.5) {
+          const contentLeads = [
+            `${emo}Interesting, ${digest}`,
+            `${emo}So we've got ${digest}`,
+            `${emo}${digest.charAt(0).toUpperCase() + digest.slice(1)}, that's useful`
+          ];
+          return pick("digest_lead", contentLeads);
+        }
+      }
       const connectors = tier === "chatty" ? [` \u2014 ${digest}`, `, I see ${digest}`, `. Looks like ${digest}`, `, showing ${digest}`] : tier === "conv" ? [` \u2014 ${digest}`, `, ${digest}`, `. Shows ${digest}`] : [`: ${digest}`];
       return emo + base + pick("digest_conn_ok", connectors);
     }
@@ -38657,18 +38799,18 @@ Error: ${err instanceof Error ? err.message : String(err)}`);
       ]
     };
     SUB_AGENT_VARIANTS = {
-      terse: () => [`Delegating to sub agent`, `Spawning sub agent`, `Handing off`],
-      conv: () => [
-        `Handing this off to a sub agent`,
-        `Bringing in some help for this`,
-        `Delegating this part of the work`
-      ],
-      chatty: () => [
-        `Bringing in reinforcements for this one`,
-        `Let me hand this off to a specialist`,
-        `Calling in backup on this`,
-        `This needs a dedicated agent, passing it along`
-      ]
+      terse: (_f, a) => {
+        const topic = extractSubAgentTopic(a);
+        return topic ? [`Sub agent: ${topic}`, `Delegating: ${topic}`] : [`Delegating to sub agent`, `Spawning sub agent`];
+      },
+      conv: (_f, a) => {
+        const topic = extractSubAgentTopic(a);
+        return topic ? [`Handing off to a sub agent to ${topic}`, `Bringing in help to ${topic}`, `Delegating the ${topic} work`] : [`Handing this off to a sub agent`, `Bringing in some help for this`, `Delegating this part of the work`];
+      },
+      chatty: (_f, a) => {
+        const topic = extractSubAgentTopic(a);
+        return topic ? [`Spinning up a sub agent to ${topic}`, `This part needs a specialist, delegating to ${topic}`, `Calling in backup to handle ${topic}`] : [`Bringing in reinforcements for this one`, `Let me hand this off to a specialist`, `Calling in backup on this`];
+      }
     };
     SHELL_VARIANTS = {
       test: {
@@ -48255,8 +48397,12 @@ ${result.text}`;
               if (parsed.summary)
                 steering = parsed.summary;
             } catch {
-              if (result.summary)
-                steering = `USER STEERING: ${result.summary}`;
+              const raw = result.summary || "";
+              const ackMatch = raw.match(/acknowledgment[:\s]*["']?([^"'\n]{5,80})["']?/i) || raw.match(/^([^.!?\n]{5,80}[.!?])/);
+              if (ackMatch)
+                acknowledgment = ackMatch[1].trim();
+              if (raw.length > 10)
+                steering = `USER STEERING: ${raw}`;
             }
             if (voiceEngine?.enabled) {
               writeContent(() => renderVoiceText(acknowledgment));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.103.54",
+  "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",