troxy-cli 1.29.55 → 1.29.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "troxy-cli",
-  "version": "1.29.55",
+  "version": "1.29.57",
   "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

@@ -135,8 +135,11 @@ function troxyCommand(args, paused) {
 // The band above the prompt: how much longer this session made the plan meter last.
 // Each turn adds what it cost (the session's own /cost ledger) and how far it moved the
 // 5h/7d meter; a routed turn also counts what it would have cost on the model asked
-// for, at list prices. The account-wide view is the dashboard's.
-const PRICE = { haiku: 1, sonnet: 2, opus: 4 }; // list $/MTok in; output keeps the same ratios
+// for, priced the way the usage bar weighs models. The account-wide view is the dashboard's.
+// List $/MTok in (output keeps the same ratios) times usage-bar points per list dollar,
+// measured from the bar's own readings (usage-audit bar_weights.py, 2026-10-13). The bar
+// charges Haiku more per dollar than list prices imply; same weights as the dashboard.
+const PRICE = { haiku: 1 * 4.45, sonnet: 2 * 3.19, opus: 4 * 2.80 };
 const WINDOW_LABEL = { five_hour: '5h', seven_day: '7d' };
 // Drawn in Troxy's teal: the status line can't be colored and shows as a yellow warning.
 const LINE = { plugin: 'troxy-guard', key: 'line' };
@@ -168,14 +171,16 @@ function savedLine(money, rateLimits = []) {
       parts.push(`${WINDOW_LABEL[w.kind]}: ${used < 1 ? 'not moved yet' : `${used} instead of ${Math.round(used * scale)}`}`);
     }
   } else {
-    parts.push(`$${kept.toFixed(2)} saved of $${(paid + kept).toFixed(2)} at list price`);
+    parts.push('meter not moved yet');
   }
   parts.push('estimate');
   return `${bar(1 / scale)} ${parts.join(' · ')}`;
 }
 
+// t.kept: what the content Troxy cleared or compressed would have cost (server's
+// session-savings kept_usd), on top of the model swaps in t.full.
 function sessionLine(t) {
-  return t && savedLine({ cost_paid_usd: t.paid, dollars_saved_usd: t.full - t.paid },
+  return t && savedLine({ cost_paid_usd: t.paid, dollars_saved_usd: t.full - t.paid + (t.kept || 0) },
     Object.entries(t.meter).map(([kind, percentUsed]) => ({ kind, percentUsed })));
 }
 
@@ -244,7 +249,7 @@ function addTurn(totals, start, end, ratio) {
   for (const k of Object.keys(end.meter)) {
     if (k in start.meter) meter[k] = (meter[k] || 0) + Math.max(0, end.meter[k] - start.meter[k]);
   }
-  return { paid: t.paid + paid, full: t.full + paid * ratio, meter };
+  return { ...t, paid: t.paid + paid, full: t.full + paid * ratio, meter }; // keeps t.kept
 }
 
 // Idle compaction: shrink a big session just before its prompt cache expires (1h), so
@@ -525,21 +530,25 @@ export function register(on) {
   // After the answer, so counting never delays a prompt.
   on('turn.complete', async ($, e, next) => {
     const r = await next(e);
+    let savings = null;
+    try {
+      savings = await fetchSavings($);
+      if (savings) await $.state.set(SAVINGS, savingsText(savings));
+    } catch {} // a missed fetch only leaves the band as it was
     if (turn) {
       const { start, ratio } = turn;
       turn = null;
       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;
         await $.state.set(SAVED, totals);
         const line = sessionLine(totals);
         if (line) await $.state.set(LINE, line);
       } catch {} // a missed turn only leaves the band as it was
     }
-    try {
-      const text = savingsText(await fetchSavings($));
-      if (text) await $.state.set(SAVINGS, text);
-    } catch {} // a missed fetch only leaves the band as it was
     let stayAwake = false;
     try { stayAwake = await bigSession($); } catch {}
     armCompact($, COMPACT_IDLE_MS, { stayAwake, persist: true });

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

@@ -63,7 +63,7 @@ test('real subprocess: a real Bash command still runs normally through the mod (
   }
 });
 
-test('savedLine: how much longer the bar lasts, then the meter or the dollars', () => {
+test('savedLine: how much longer the bar lasts, then the meter', () => {
   const { savedLine } = _internal;
   const meter = [{ kind: 'five_hour', percentUsed: 19 }, { kind: 'seven_day', percentUsed: 12.4 }];
   assert.equal(savedLine({ cost_paid_usd: 19, dollars_saved_usd: 13 }, meter),
@@ -71,9 +71,9 @@ test('savedLine: how much longer the bar lasts, then the meter or the dollars',
   assert.equal(savedLine({ cost_paid_usd: 92, dollars_saved_usd: 8 }, [{ kind: 'five_hour', percentUsed: 12 }, { kind: 'seven_day', percentUsed: 0 }]),
     '[█████████░] This session: your bar lasts 1.09x longer · 5h: 12 instead of 13 · 7d: not moved yet · estimate');
   assert.equal(savedLine({ cost_paid_usd: 1.64, dollars_saved_usd: 4.53 }, [{ kind: 'five_hour', percentUsed: 0.3 }]),
-    '[███░░░░░░░] This session: your bar lasts 3.8x longer · $4.53 saved of $6.17 at list price · estimate');
+    '[███░░░░░░░] This session: your bar lasts 3.8x longer · meter not moved yet · estimate');
   assert.equal(savedLine({ cost_paid_usd: 92, dollars_saved_usd: 8 }, []),
-    '[█████████░] This session: your bar lasts 1.09x longer · $8.00 saved of $100.00 at list price · estimate');
+    '[█████████░] This session: your bar lasts 1.09x longer · meter not moved yet · estimate');
   assert.equal(savedLine({ cost_paid_usd: 10, dollars_saved_usd: 0 }, meter),
     '[██████████] This session: your bar lasts 1.00x longer · 5h: 19 instead of 19 · 7d: 12 instead of 12 · estimate');
   assert.equal(savedLine(null, meter), undefined);
@@ -88,6 +88,10 @@ test('addTurn: a session total from its own turns, a routed one counted at the a
   t = addTurn(t, { cost: 1.5, meter: { five_hour: 13, seven_day: 5 } }, { cost: 2, meter: { five_hour: 1, seven_day: 6 } }, 1);
   assert.deepEqual(t, { paid: 1, full: 1.5, meter: { five_hour: 3, seven_day: 2 } });
   assert.equal(sessionLine(t), '[███████░░░] This session: your bar lasts 1.5x longer · 5h: 3 instead of 5 · 7d: 2 instead of 3 · estimate');
+  // Cleared/compressed content counts too, and survives the next turn: $1 paid, $0.5 swap + $1.5 kept = 3x.
+  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/);
   // No routed turn yet: no band.
   assert.equal(sessionLine(addTurn(undefined, { cost: 0, meter: {} }, { cost: 1, meter: {} }, 1)), undefined);
 });
@@ -97,7 +101,7 @@ test('statusText: version, routing, this session, plan usage, where the account
   const totals = { paid: 0.03, full: 0.12, meter: {} };
   assert.equal(statusText({ version: '1.29.42', paused: false, totals, rateLimits: [{ kind: 'five_hour', percentUsed: 23.4 }, { kind: 'seven_day', percentUsed: 77 }] }),
     'Troxy 1.29.42 · routing is on\n'
-    + 'This session: your bar lasts 4.0x longer · $0.09 saved of $0.12 at list price · estimate\n'
+    + 'This session: your bar lasts 4.0x longer · meter not moved yet · estimate\n'
     + 'Plan usage now: 5h 23% · 7d 77%\n'
     + 'The model is picked at the start, after an hour idle or after a compaction, then kept (switching would rewrite the cache). /model always wins.\n'
     + 'Idle compaction is on: sessions over 100k tokens are compacted after 55 min idle (/troxy compact off).\n'