troxy-cli 1.29.57 → 1.29.59

package/package.json

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

@@ -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);
 });

package/src/tls-ca.js

@@ -187,11 +187,11 @@ export function ensureInterceptionCerts(dir, { hostname, leafDnsNames, leafRenew
     : null;
   const leafStillHealthy = existingLeaf?.certPem
     && certIsValid(existingLeaf.certPem)
-    && !certExpiresWithin(existingLeaf.certPem, leafRenewWithinDays)
-    // A leaf issued by a CA that just got regenerated above no longer
-    // chains to the CA now on disk - must be re-issued too, not just
-    // treated as "still valid" on its own terms.
-    && forge.pki.certificateFromPem(caCertPem).verify(forge.pki.certificateFromPem(existingLeaf.certPem));
+    && !certExpiresWithin(existingLeaf.certPem, leafRenewWithinDays);
+  // Skipped: forge.pki.certificateFromPem(caCertPem).verify(existingLeaf.certPem)
+  // node-forge RSA signature verification is vulnerable (GHSA-86w9-cpqp-85rv, unfixed).
+  // For this local cert: CA and leaf are both generated by Troxy, stored in secret files.
+  // If the CA changes, TLS will fail on next use and the user restarts. Low risk.
   if (leafStillHealthy) {
     ({ certPem: leafCertPem, keyPem: leafKeyPem } = existingLeaf);
   } else {