troxy-cli 1.30.4 → 1.30.5

package/package.json

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

@@ -230,7 +230,7 @@ const REPORT_KEEP_ROWS = 1000; // kept for the next try while Troxy is unreachab
 let pending = [];
 let compacting = false;
 
-function reportRow({ sid, usage, requested, arm, cold, score, compact, rateLimits, ts, effort, effortAsked, surfaces }) {
+function reportRow({ sid, usage, requested, arm, cold, score, compact, rateLimits, ts, effort, effortAsked, surfaces, compressed }) {
   const rl = {};
   for (const w of rateLimits || []) {
     if (!WINDOW_LABEL[w.kind]) continue;
@@ -243,10 +243,26 @@ function reportRow({ sid, usage, requested, arm, cold, score, compact, rateLimit
     compact: Boolean(compact), input_tokens: usage.input_tokens, output_tokens: usage.output_tokens,
     cache_read_tokens: usage.cache_read_input_tokens, cache_creation_tokens: usage.cache_creation_input_tokens,
     rate_limits: rl, ts, effort: effort || null, effort_requested: effortAsked || null,
+    compressed_tokens: compressed > 0 ? compressed : null,
     surface: (surfaces || []).includes('desktop') ? 'desktop' : (surfaces || []).includes('terminal') ? 'terminal' : null,
   };
 }
 
+// Tokens the compression hook kept out of this session since the last report (it appends one
+// line per compressed tool output, see sandbox/posttooluse-hook.js). Each count is reported once.
+const savedSeen = new Map();
+async function compressedSince($, sid) {
+  try {
+    if (!/^[A-Za-z0-9-]{8,128}$/.test(String(sid))) return 0;
+    const home = await $.env.get('HOME');
+    const text = await $.fs.read(`${home}/.troxy/sandbox/saved/${sid}.log`);
+    const total = String(text).split('\n').reduce((n, l) => n + (Number(l) || 0), 0);
+    const delta = Math.max(0, total - (savedSeen.get(sid) || 0));
+    savedSeen.set(sid, total);
+    return delta;
+  } catch { return 0; }
+}
+
 async function noteStep($, result, meta) {
   const usage = result && result.usage;
   if (!usage || !usage.model) return;
@@ -254,7 +270,8 @@ async function noteStep($, result, meta) {
   try { rateLimits = (await $.session.usage()).rateLimits; } catch {}
   let surfaces = [];
   try { surfaces = await $.session.surfaces(); } catch {}
-  pending.push(reportRow({ ...meta, sid: await $.session.id(), usage, compact: compacting, rateLimits, surfaces, ts: await $.clock.now() }));
+  const sid = await $.session.id();
+  pending.push(reportRow({ ...meta, sid, usage, compact: compacting, rateLimits, surfaces, compressed: await compressedSince($, sid), ts: await $.clock.now() }));
   if (pending.length > REPORT_KEEP_ROWS) pending = pending.slice(-REPORT_KEEP_ROWS);
 }
 
@@ -648,4 +665,4 @@ export function register(on) {
 }
 
 // Exported for tests only - not part of the mod's runtime contract.
-export const _internal = { stepEffort, reportRow, noteStep, flushReport, pendingRows: () => pending, troxyConfig, 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, lastSent };
+export const _internal = { compressedSince, stepEffort, reportRow, noteStep, flushReport, pendingRows: () => pending, troxyConfig, 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, lastSent };

package/src/sandbox/posttooluse-hook.js

@@ -38,6 +38,18 @@ function sessionArm(dir, sessionId, holdoutFraction, randomFn) {
   return arm;
 }
 
+// One line per compression: the tokens it kept out of the conversation (about 4 characters
+// each). The troxy-guard mod reads this per session and reports it, since in the mod-only setup
+// no proxy sees the traffic. Append-only so parallel hook processes never overwrite each other.
+export function recordSaved(dir, sessionId, tokens) {
+  if (typeof sessionId !== 'string' || !SESSION_ID_RE.test(sessionId) || !(tokens > 0)) return;
+  try {
+    const file = path.join(dir, 'saved', `${sessionId}.log`);
+    fs.mkdirSync(path.dirname(file), { recursive: true });
+    fs.appendFileSync(file, `${Math.round(tokens)}\n`);
+  } catch { /* fails open: a missed count never blocks the tool output */ }
+}
+
 function writeState(dir, state) {
   try {
     fs.mkdirSync(dir, { recursive: true });
@@ -117,6 +129,7 @@ export async function buildHookResponse(toolUseBlock, {
     const { handle } = await put(output, { summary, tags: [] }, storeDir);
     writeState(storeDir, 'treated');
     const updatedText = `${summary}\n\n(troxy_recall("${handle}") to fetch the full output)`;
+    recordSaved(storeDir, toolUseBlock?.session_id, (output.length - updatedText.length) / 4);
     return {
       hookSpecificOutput: {
         hookEventName: 'PostToolUse',

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

@@ -439,3 +439,24 @@ test('reportRow: surface is desktop when the app draws the session, terminal oth
   assert.equal(reportRow({ ...base, surfaces: ['terminal'] }).surface, 'terminal');
   assert.equal(reportRow({ ...base, surfaces: [] }).surface, null);
 });
+
+test('reportRow carries the tokens compression kept out, null when none', () => {
+  const { reportRow } = _internal;
+  const usage = { model: 'claude-sonnet-5-5', input_tokens: 1, output_tokens: 1 };
+  assert.equal(reportRow({ sid: 's1', usage, compressed: 4200 }).compressed_tokens, 4200);
+  assert.equal(reportRow({ sid: 's1', usage, compressed: 0 }).compressed_tokens, null);
+  assert.equal(reportRow({ sid: 's1', usage }).compressed_tokens, null);
+});
+
+test('compressedSince reports each compression once, per session', async () => {
+  const { compressedSince } = _internal;
+  const sid = 'cccccccc-1111-2222-3333-444444444444';
+  let log = '1000\n500\n';
+  const $ = { env: { get: async () => '/home/u' }, fs: { read: async (p) => { assert.ok(p.endsWith(`/.troxy/sandbox/saved/${sid}.log`)); return log; } } };
+  assert.equal(await compressedSince($, sid), 1500);
+  assert.equal(await compressedSince($, sid), 0);
+  log += '250\n';
+  assert.equal(await compressedSince($, sid), 250);
+  assert.equal(await compressedSince({ ...$, fs: { read: async () => { throw new Error('no file'); } } }, 'dddddddd-1111-2222'), 0);
+  assert.equal(await compressedSince($, '../etc/passwd'), 0);
+});

package/src/tests/posttooluse-hook.test.js

@@ -223,3 +223,23 @@ test('session_id with path characters is ignored (no file outside the store)', a
     { holdoutFraction: 0.2, randomFn: () => 0, storeDir: dir });
   assert.equal(fs.existsSync(path.join(dir, 'sessions')), false);
 });
+
+test('a compression records the tokens it kept out, per session, one line each', async () => {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'troxy-sandbox-'));
+  const sid = 'aaaaaaaa-1111-2222-3333-444444444444';
+  const opts = { sandboxFraction: 1, holdoutFraction: 0, randomFn: () => 0.5, storeDir: dir };
+  const big = 'x'.repeat(8000);
+  await buildHookResponse({ session_id: sid, tool_response: bashResult(big) }, opts);
+  await buildHookResponse({ session_id: sid, tool_response: bashResult(big) }, opts);
+  const lines = fs.readFileSync(path.join(dir, 'saved', `${sid}.log`), 'utf8').trim().split('\n').map(Number);
+  assert.equal(lines.length, 2);
+  assert.ok(lines.every(n => n > 1000 && n <= 2000)); // about 8000 chars / 4, minus the excerpt
+});
+
+test('no session id or a small output records nothing', async () => {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'troxy-sandbox-'));
+  const opts = { sandboxFraction: 1, holdoutFraction: 0, randomFn: () => 0.5, storeDir: dir };
+  await buildHookResponse({ tool_response: bashResult('x'.repeat(8000)) }, opts);
+  await buildHookResponse({ session_id: 'bbbbbbbb-1111-2222-3333-444444444444', tool_response: bashResult('short') }, opts);
+  assert.equal(fs.existsSync(path.join(dir, 'saved')), false);
+});