troxy-cli 1.29.40 → 1.29.41

package/package.json

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

@@ -113,33 +113,68 @@ function troxyCommand(args, paused) {
 }
 
 
-// Session usage tracking, one count per human prompt (not per step).
-// Weights relative to Opus: list prices put Haiku at 0.25 and Sonnet at 0.5; a
-// Pro-plan meter test (30 prompts each) put Haiku at ~0.33. Haiku sits between.
-// ponytail: turn-weighted and ignores cache writes after a model switch, so it
-// is an estimate; weight by r.usage tokens if the number must be exact.
-const MODEL_COST = { haiku: 0.3, sonnet: 0.5, opus: 1.0 };
-// Kept in $.state (per session) so a `troxy update` hot reload keeps the counts.
-// cost: actual spend in "requested-model prompts".
-const STATS = { plugin: 'troxy-guard', key: 'stats' };
+// 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
+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' };
+const SAVED = { plugin: 'troxy-guard', key: 'saved' }; // { paid, full, meter }; survives a troxy update
+const TROXY_TEAL = '#0a9e88';
 
-async function addStats($, prompts, routed, cost) {
-  const { value: s = { prompts: 0, routed: 0, cost: 0 } } = await $.state.get(STATS);
-  const next = { prompts: s.prompts + prompts, routed: s.routed + routed, cost: s.cost + cost };
-  await $.state.set(STATS, next);
-  $.ui.status(usageLine(next));
+// The turn in flight: { start, ratio }, ratio = price of the model asked for / the one that ran.
+let turn = null;
+
+function bar(fraction) {
+  const filled = Math.max(0, Math.min(10, Math.round(fraction * 10)));
+  return `[${'█'.repeat(filled)}${'░'.repeat(10 - filled)}]`;
+}
+
+// One line, most important first, e.g.
+// [██████░░░░] This session: your bar lasts 1.7x longer · 5h: 19 instead of 32 · 7d: 12 instead of 20 · estimate
+function savedLine(money, rateLimits = []) {
+  const paid = money && money.cost_paid_usd, kept = money && money.dollars_saved_usd;
+  if (!(paid > 0) || !(kept > 0)) return undefined;
+  const scale = (paid + kept) / paid;
+  const parts = [`This session: your bar lasts ${scale.toFixed(scale < 1.1 ? 2 : 1)}x longer`];
+  const windows = rateLimits.filter(w => WINDOW_LABEL[w.kind]);
+  if (windows.some(w => Math.round(w.percentUsed) >= 1)) {
+    for (const w of windows) {
+      const used = Math.round(w.percentUsed);
+      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('estimate');
+  return `${bar(1 / scale)} ${parts.join(' · ')}`;
+}
+
+function sessionLine(t) {
+  return t && savedLine({ cost_paid_usd: t.paid, dollars_saved_usd: t.full - t.paid },
+    Object.entries(t.meter).map(([kind, percentUsed]) => ({ kind, percentUsed })));
 }
 
-function costRatio(fromModel, toModel) {
-  const f = MODEL_COST[tierOf(fromModel)], t = MODEL_COST[tierOf(toModel)];
-  return f && t ? t / f : 1;
+async function snapshot($) {
+  const u = await $.session.usage();
+  const meter = {};
+  for (const w of u.rateLimits || []) if (WINDOW_LABEL[w.kind]) meter[w.kind] = w.percentUsed;
+  return { cost: u.cost ? u.cost.usd : 0, meter };
 }
 
-// e.g. [████████░░░░░░░░░░░░] Troxy extended your usage by 87% · 2 of 3 prompts on a cheaper model
-function usageLine({ prompts, routed, cost }) {
-  const extended = cost > 0 ? Math.round((prompts / cost - 1) * 100) : 0;
-  const filled = prompts ? Math.round((routed / prompts) * 20) : 0;
-  return `[${'█'.repeat(filled)}${'░'.repeat(20 - filled)}] Troxy extended your usage by ${extended}% · ${routed} of ${prompts} prompts on a cheaper model`;
+// Adds one finished turn to the session's totals. Meter deltas are clamped at 0 (a
+// window that reset mid-turn). ponytail: another session running at the same time
+// moves the shared meter too; per-turn deltas keep that small, not zero.
+function addTurn(totals, start, end, ratio) {
+  const t = totals || { paid: 0, full: 0, meter: {} };
+  const paid = Math.max(0, end.cost - start.cost);
+  const meter = { ...t.meter };
+  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 };
 }
 
 // Where the local daemon looks for this session's routing note (see interceptor.js).
@@ -160,6 +195,7 @@ let decision = null;
 
 async function scorePrompt($, e, next) {
   decision = null;
+  turn = { start: await snapshot($), ratio: 1 };
   const sid = await $.session.id();
   const file = modRouteFile($.plugin.root, sid);
   if (file && lastNote !== `${sid}:{}`) { lastNote = `${sid}:{}`; await $.fs.write(file, '{}'); } // clear the previous prompt's note
@@ -171,7 +207,6 @@ async function scorePrompt($, e, next) {
   );
   const score = r.isAnswered ? parseScore(r.text) : null;
   $.ui.log(`troxy scorer: ${r.isAnswered ? JSON.stringify(r.text) : r.reason} -> ${score}`, { to: 'debug' });
-  await addStats($, 1, 0, 1); // full cost until routeStep says otherwise
   if (score !== null) {
     const u = await $.session.usage();
     decision = { score, tokens: estimateTokens(u.context && u.context.tokens, e.text) };
@@ -184,10 +219,6 @@ async function* routeStep($, e, next) {
   if (!decision || e.agentId) return yield* next(e);
   const model = pickModel(decision.score, e.model, decision.tokens);
   if (model !== e.model) {
-    if (!decision.counted) {
-      decision.counted = true;
-      await addStats($, 0, 1, costRatio(e.model, model) - 1);
-    }
     const sid = await $.session.id();
     const file = modRouteFile($.plugin.root, sid);
     const key = `${sid}:${e.model}>${model}`;
@@ -195,6 +226,7 @@ async function* routeStep($, e, next) {
       lastNote = key;
       await $.fs.write(file, JSON.stringify({ from: e.model, to: model, ts: await $.clock.now() }));
     }
+    if (turn) turn.ratio = PRICE[tierOf(e.model)] / PRICE[tierOf(model)];
   }
   return yield* next(model === e.model ? e : { ...e, model });
 }
@@ -203,22 +235,46 @@ export function register(on) {
   on('tool.call', { tool: 'Bash' }, guardBash).catch(failClosed);
   on('session.start', async ($, e, next) => {
     await $.command.register({ name: 'troxy', description: 'Pause or resume Troxy model routing', argumentHint: '[on|off|status]' });
-    // session.start fires again on a hot reload: put the bar back from the kept counts
-    const { value } = await $.state.get(STATS);
-    if (value && value.prompts && !(await $.store.get('paused'))) $.ui.status(usageLine(value));
+    // A resumed session would otherwise inherit its last routing note, and its background
+    // calls before the next prompt would show as savings on the dashboard.
+    const sid = await $.session.id();
+    const file = modRouteFile($.plugin.root, sid);
+    if (file) { lastNote = `${sid}:{}`; await $.fs.write(file, '{}'); }
+    $.ui.status(undefined); // the bar moved to the band above the prompt
     return next(e);
   });
   on('command.run', { command: 'troxy' }, async ($, e) => {
     const r = troxyCommand(e.args, Boolean(await $.store.get('paused')));
     await $.store.set('paused', r.paused);
-    if (r.paused) $.ui.status(undefined);
     return { text: r.text };
   });
   // Routing fails open: a scorer or hook error must never break the session,
   // it just means the requested model is used as-is.
   on('prompt.submit', scorePrompt).catch(($, e, next) => { decision = null; return next(e); });
   on('turn.step', routeStep).catch(async function* ($, e, next) { return yield* next(e); });
+  on('ui.render', { component: 'AbovePrompt' }, async ($, e, next) => {
+    const { value: line } = await $.state.get(LINE); // subscribes the band to the line
+    if (!line || e.props.hasSurvey) return next(e);
+    const { Text } = $.ui.resolve(e);
+    return h(Text, { color: TROXY_TEAL }, `Troxy ${line}`);
+  });
+  // After the answer, so counting never delays a prompt.
+  on('turn.complete', async ($, e, next) => {
+    const r = await next(e);
+    if (turn) {
+      const { start, ratio } = turn;
+      turn = null;
+      try {
+        const { value } = await $.state.get(SAVED);
+        const totals = addTurn(value, start, await snapshot($), ratio);
+        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
+    }
+    return r;
+  });
 }
 
 // Exported for tests only - not part of the mod's runtime contract.
-export const _internal = { toDomainAndFields, guardBash, failClosed, parseScore, pickModel, troxyCommand, modRouteFile, estimateTokens, MODELS, usageLine, costRatio };
+export const _internal = { toDomainAndFields, guardBash, failClosed, parseScore, pickModel, troxyCommand, modRouteFile, estimateTokens, MODELS, savedLine, sessionLine, addTurn };

package/src/mods/troxy-guard/types/index.d.ts

@@ -1,7 +1,8 @@
-export type UsageStats = { prompts: number; routed: number; cost: number }
+export type BarLine = string | null
+export type SessionSaved = { paid: number; full: number; meter: Record<string, number> }
 
 declare module 'claude-code' {
   interface PluginState {
-    'troxy-guard': { stats: UsageStats }
+    'troxy-guard': { line: BarLine; saved: SessionSaved }
   }
 }

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

@@ -63,12 +63,30 @@ test('real subprocess: a real Bash command still runs normally through the mod (
   }
 });
 
-test('usageLine: counts every prompt, extension reflects routed share', () => {
-  const { usageLine, costRatio, MODELS } = _internal;
-  assert.equal(costRatio(MODELS.opus, MODELS.haiku), 0.3);
-  assert.equal(costRatio('some-new-model', MODELS.haiku), 1);
-  // 3 prompts, 2 routed opus->haiku: cost 1 + 0.3 + 0.3 = 1.6, 3/1.6 = +88%
-  assert.match(usageLine({ prompts: 3, routed: 2, cost: 1.6 }), /extended your usage by 88% · 2 of 3 prompts/);
-  assert.match(usageLine({ prompts: 3, routed: 0, cost: 3 }), /by 0% · 0 of 3/);
-  assert.match(usageLine({ prompts: 0, routed: 0, cost: 0 }), /by 0% · 0 of 0/);
+test('savedLine: how much longer the bar lasts, then the meter or the dollars', () => {
+  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),
+    '[██████░░░░] This session: your bar lasts 1.7x longer · 5h: 19 instead of 32 · 7d: 12 instead of 20 · estimate');
+  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');
+  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');
+  assert.equal(savedLine({ cost_paid_usd: 10, dollars_saved_usd: 0 }, meter), undefined);
+  assert.equal(savedLine(null, meter), undefined);
+});
+
+test('addTurn: a session total from its own turns, a routed one counted at the asked-for price', () => {
+  const { addTurn, sessionLine } = _internal;
+  // Opus asked, Sonnet ran (ratio 2): $0.50 paid, $1.00 at Opus prices; meter moved 3 and 1.
+  let t = addTurn(undefined, { cost: 1, meter: { five_hour: 10, seven_day: 4 } }, { cost: 1.5, meter: { five_hour: 13, seven_day: 5 } }, 2);
+  assert.deepEqual(t, { paid: 0.5, full: 1, meter: { five_hour: 3, seven_day: 1 } });
+  // Not routed; the 5h window reset mid-turn, so its move counts as 0, not negative.
+  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');
+  // No routed turn yet: no band.
+  assert.equal(sessionLine(addTurn(undefined, { cost: 0, meter: {} }, { cost: 1, meter: {} }, 1)), undefined);
 });