troxy-cli 1.29.29 → 1.29.30

package/package.json

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

@@ -77,6 +77,13 @@ function tierOf(model) {
   return null;
 }
 
+// Context so far plus the prompt being submitted (about 4 characters a token). The
+// context figure alone is ~0 on a session's first prompt, which let a huge first
+// prompt through to Haiku.
+function estimateTokens(contextTokens, text) {
+  return (Number(contextTokens) || 0) + Math.ceil(String(text || '').length / 4);
+}
+
 function parseScore(text) {
   const m = /\d*\.?\d+/.exec(String(text || ''));
   if (!m) return null;
@@ -138,7 +145,7 @@ async function scorePrompt($, e, next) {
   const score = r.isAnswered ? parseScore(r.text) : null;
   if (score !== null) {
     const u = await $.session.usage();
-    decision = { score, tokens: u.context ? u.context.tokens : 0 };
+    decision = { score, tokens: estimateTokens(u.context && u.context.tokens, e.text) };
   }
   return next(e);
 }
@@ -181,4 +188,4 @@ export function register(on) {
 }
 
 // Exported for tests only - not part of the mod's runtime contract.
-export const _internal = { toDomainAndFields, guardBash, failClosed, parseScore, pickModel, troxyCommand, modRouteFile, MODELS };
+export const _internal = { toDomainAndFields, guardBash, failClosed, parseScore, pickModel, troxyCommand, modRouteFile, estimateTokens, MODELS };

package/src/tests/mods-route.test.js

@@ -2,7 +2,7 @@ import { test } from 'node:test';
 import assert from 'node:assert/strict';
 import { _internal } from '../mods/troxy-guard/hooks/register.js';
 
-const { parseScore, pickModel, troxyCommand, modRouteFile, MODELS } = _internal;
+const { parseScore, pickModel, troxyCommand, modRouteFile, estimateTokens, MODELS } = _internal;
 
 test('parseScore: reads a bare number and clamps to 0..1', () => {
   assert.equal(parseScore('0.35'), 0.35);
@@ -65,3 +65,12 @@ test('modRouteFile: null when not installed in ~/.claude/skills (e.g. --plugin-d
   assert.equal(modRouteFile('/work/troxy/src/mods/troxy-guard', sid), null);
   assert.equal(modRouteFile('/Users/a/.claude/skills/troxy-guard', '../x'), null);
 });
+
+test('estimateTokens: counts the prompt being submitted, not just the context so far', () => {
+  assert.equal(estimateTokens(0, 'x'.repeat(240000)), 60000);
+  assert.equal(estimateTokens(30000, 'x'.repeat(40000)), 40000);
+  assert.equal(estimateTokens(undefined, 'hi'), 1);
+  assert.equal(estimateTokens(5, ''), 5);
+  // a first-prompt of ~60k tokens must trip the Haiku floor
+  assert.equal(pickModel(0.05, MODELS.opus, estimateTokens(0, 'x'.repeat(240000))), MODELS.sonnet);
+});