troxy-cli 1.29.58 → 1.29.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "troxy-cli",
-  "version": "1.29.58",
+  "version": "1.29.60",
   "description": "A secure control layer for AI agents: policies across payments, messages, logins, destructive actions, model usage, and secrets, all enforceable from the CLI",
   "homepage": "https://troxy.io",
   "bugs": {

package/src/mods/troxy-guard/hooks/register.js

@@ -188,9 +188,9 @@ function sessionLine(t) {
 // by the server. undefined until something was saved.
 function savingsText(s) {
   const c = (s && s.compressed_tokens) || 0, t = (s && s.trimmed_tokens) || 0;
-  const k = n => n >= 1000 ? `${Math.round(n / 1000)}k` : String(n);
+  const k = n => n >= 1e6 ? `${Math.round(n / 1e5) / 10}M`.replace('.0M', 'M') : n >= 1000 ? `${Math.round(n / 1000)}k` : String(n);
   // Always show, even if 0, so the band is transparent: 0 means no trimming/compression on this turn
-  return `${k(c + t)} tokens saved by compression and trimming`;
+  return `${k(c + t)} tokens not re-sent, thanks to compression and trimming`;
 }
 
 // This session's savings from the server, or null when there is no key, no session id or
@@ -252,6 +252,15 @@ function addTurn(totals, start, end, ratio) {
   return { ...t, paid: t.paid + paid, full: t.full + paid * ratio, meter }; // keeps t.kept
 }
 
+// kept_usd from the server is the whole session's total, but paid only counts turns since
+// the mod began tracking. Count only what arrived after the first reading (the first turn's
+// own clearing is missed, so this undercounts slightly rather than inflating the multiplier).
+function withKept(t, keptUsd) {
+  if (!(keptUsd >= 0)) return {};
+  const keptBase = t.keptBase === undefined ? keptUsd : t.keptBase;
+  return { keptBase, kept: Math.max(0, keptUsd - keptBase) };
+}
+
 // Idle compaction: shrink a big session just before its prompt cache expires (1h), so
 // the summary reads the conversation from cache (~0.1x) and the user comes back to a
 // small session instead of re-sending the whole thing. Never while the plan meter is
@@ -541,9 +550,7 @@ export function register(on) {
       try {
         const { value } = await $.state.get(SAVED);
         const totals = addTurn(value, start, await snapshot($), ratio);
-        // ponytail: kept_usd is the whole session's server total, paid only counts turns
-        // since the mod started tracking; close enough once the session has a few turns.
-        if (savings && savings.kept_usd >= 0) totals.kept = savings.kept_usd;
+        if (savings) Object.assign(totals, withKept(totals, savings.kept_usd));
         await $.state.set(SAVED, totals);
         const line = sessionLine(totals);
         if (line) await $.state.set(LINE, line);
@@ -557,4 +564,4 @@ export function register(on) {
 }
 
 // Exported for tests only - not part of the mod's runtime contract.
-export const _internal = { askedFor, rememberAsked, asked, armCompact, cancelCompact, toDomainAndFields, guardBash, failClosed, parseScore, asRequest, pickModel, troxyCommand, modRouteFile, estimateTokens, MODELS, savedLine, sessionLine, addTurn, statusText, compactPlan, savingsText, fetchSavings, scorePrompt, routeStep, stepModel, HOLD_PROMPTS };
+export const _internal = { askedFor, rememberAsked, asked, armCompact, cancelCompact, toDomainAndFields, guardBash, failClosed, parseScore, asRequest, pickModel, troxyCommand, modRouteFile, estimateTokens, MODELS, savedLine, sessionLine, addTurn, withKept, statusText, compactPlan, savingsText, fetchSavings, scorePrompt, routeStep, stepModel, HOLD_PROMPTS };

package/src/tests/mods-troxy-guard.test.js

@@ -92,6 +92,14 @@ test('addTurn: a session total from its own turns, a routed one counted at the a
   t = addTurn({ ...t, kept: 1.5 }, { cost: 2, meter: {} }, { cost: 2, meter: {} }, 1);
   assert.equal(t.kept, 1.5);
   assert.match(sessionLine(t), /your bar lasts 3\.0x longer · 5h: 3 instead of 9/);
+  // Server total of a session already 28 dollars deep: only growth after the first reading counts.
+  const { withKept } = _internal;
+  let k = { paid: 1, full: 1, meter: {} };
+  Object.assign(k, withKept(k, 28));
+  assert.deepEqual([k.keptBase, k.kept], [28, 0]);
+  Object.assign(k, withKept(k, 29.5));
+  assert.deepEqual([k.keptBase, k.kept], [28, 1.5]);
+  assert.deepEqual(withKept(k, undefined), {});
   // No routed turn yet: no band.
   assert.equal(sessionLine(addTurn(undefined, { cost: 0, meter: {} }, { cost: 1, meter: {} }, 1)), undefined);
 });
@@ -126,10 +134,12 @@ test('compactPlan: big idle sessions compact, small ones and a nearly full bar d
 
 test('savingsText: shows compression + trimming together, 0 when nothing was saved', () => {
   const { savingsText } = _internal;
-  assert.equal(savingsText({ compressed_tokens: 5200, trimmed_tokens: 40100 }), '45k tokens saved by compression and trimming');
-  assert.equal(savingsText({ compressed_tokens: 300, trimmed_tokens: 0 }), '300 tokens saved by compression and trimming');
-  assert.equal(savingsText({ compressed_tokens: 0, trimmed_tokens: 0 }), '0 tokens saved by compression and trimming');
-  assert.equal(savingsText(null), '0 tokens saved by compression and trimming');
+  assert.equal(savingsText({ compressed_tokens: 5200, trimmed_tokens: 40100 }), '45k tokens not re-sent, thanks to compression and trimming');
+  assert.equal(savingsText({ compressed_tokens: 300, trimmed_tokens: 0 }), '300 tokens not re-sent, thanks to compression and trimming');
+  assert.equal(savingsText({ compressed_tokens: 0, trimmed_tokens: 0 }), '0 tokens not re-sent, thanks to compression and trimming');
+  assert.equal(savingsText({ compressed_tokens: 123277, trimmed_tokens: 154512861 }), '154.6M tokens not re-sent, thanks to compression and trimming');
+  assert.equal(savingsText({ compressed_tokens: 0, trimmed_tokens: 2000000 }), '2M tokens not re-sent, thanks to compression and trimming');
+  assert.equal(savingsText(null), '0 tokens not re-sent, thanks to compression and trimming');
 });
 
 test('fetchSavings: sends the saved key and the session id; null without a key or on an error', async () => {