troxy-cli 1.29.26 → 1.29.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "troxy-cli",
-  "version": "1.29.26",
+  "version": "1.29.28",
   "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/interceptor.js

@@ -103,6 +103,23 @@ export function detectSurface(incomingHeaders) {
 // header is omitted entirely rather than forwarding a stale value.
 const _SANDBOX_STATE_FRESHNESS_MS = 2 * 60 * 1000;
 const _DEFAULT_SANDBOX_STATE_DIR = path.join(os.homedir(), '.troxy', 'sandbox');
+// Written by the troxy-guard mod when it reroutes a prompt to a cheaper model:
+// { from, to, ts } per session. Forwarded so the proxy can credit the saving to
+// the model the user originally asked for (it only ever sees the rerouted one).
+const _DEFAULT_MOD_ROUTE_DIR = path.join(os.homedir(), '.troxy', 'mod-route');
+const _MOD_ROUTE_MAX_AGE_MS = 30 * 60 * 1000;
+
+function _readModRoute(dir, sessionId) {
+  try {
+    const file = sessionArmPath(dir, sessionId);
+    if (!file) return null;
+    const n = JSON.parse(fs.readFileSync(file, 'utf8'));
+    if (typeof n.from !== 'string' || typeof n.to !== 'string' || !(Date.now() - n.ts < _MOD_ROUTE_MAX_AGE_MS)) return null;
+    return n;
+  } catch {
+    return null;
+  }
+}
 
 // Returns the hook's last recorded state ('treated' | 'holdout' | 'skipped')
 // if the state file exists, parses, and was written within the freshness
@@ -135,7 +152,7 @@ function _readSessionArm(sandboxStateDir, sessionId) {
   }
 }
 
-export function buildTroxyForwardHeaders(incomingHeaders, troxyKey, sandboxStateDir = _DEFAULT_SANDBOX_STATE_DIR) {
+export function buildTroxyForwardHeaders(incomingHeaders, troxyKey, sandboxStateDir = _DEFAULT_SANDBOX_STATE_DIR, modRouteDir = _DEFAULT_MOD_ROUTE_DIR) {
   const headers = {};
   for (const [k, v] of Object.entries(incomingHeaders)) {
     if (_HOP_BY_HOP_HEADERS.has(k) || k === 'authorization' || k === 'accept-encoding') continue;
@@ -154,6 +171,11 @@ export function buildTroxyForwardHeaders(incomingHeaders, troxyKey, sandboxState
     ? _readSessionArm(sandboxStateDir, incomingHeaders['x-claude-code-session-id'])
     : _readFreshSandboxState(sandboxStateDir);
   if (sandboxState) headers['x-troxy-tool-sandbox'] = sandboxState;
+  const modRoute = _readModRoute(modRouteDir, incomingHeaders['x-claude-code-session-id']);
+  if (modRoute) {
+    headers['x-troxy-mod-routed-from'] = modRoute.from;
+    headers['x-troxy-mod-routed-to'] = modRoute.to;
+  }
   headers.authorization = `Bearer ${troxyKey}`;
   return headers;
 }

package/src/mods/troxy-guard/hooks/register.js

@@ -48,7 +48,8 @@ async function failClosed($, e, next, err) {
 
 // --- Routing: extend the usage bar by sending easy prompts to a cheaper model.
 //
-// Ported from the proxy's scorer (troxy-tf-live model-proxy/app.py: bands,
+// Ported from the proxy's scorer (troxy-tf-live model-proxy/app.py; bands match
+// the production ROUTE_SCORER_BANDS=0.2:haiku,0.6:sonnet,0.8:opus,
 // never-upward rule, 50k context floor for Haiku). The mod scores each human
 // prompt once with the user's own session via $.model.complete, so there is no
 // Troxy round trip and no credential to carry. One decision per prompt, applied
@@ -60,7 +61,7 @@ const MODELS = {
   opus: 'claude-opus-5-5',
 };
 const RANK = { haiku: 0, sonnet: 1, opus: 2 };
-const BANDS = [[0.1, 'haiku'], [0.6, 'sonnet'], [0.8, 'opus']];
+const BANDS = [[0.2, 'haiku'], [0.6, 'sonnet'], [0.8, 'opus']];
 const HAIKU_CONTEXT_FLOOR_TOKENS = 50000;
 const SCORE_TIMEOUT_MS = 3000;
 const SCORER_PROMPT_CHARS = 4000;
@@ -107,11 +108,27 @@ function troxyCommand(args, paused) {
 // Whether this session has shown its one "Troxy is active" notice yet.
 let announced = false;
 
+// Where the local daemon looks for this session's routing note (see interceptor.js).
+// Only when installed under ~/.claude/skills, so a --plugin-dir test run never writes
+// into a real user's folder.
+function modRouteFile(pluginRoot, sessionId) {
+  const suffix = '/.claude/skills/troxy-guard';
+  if (typeof pluginRoot !== 'string' || !pluginRoot.endsWith(suffix)) return null;
+  if (!/^[A-Za-z0-9-]{8,128}$/.test(String(sessionId))) return null;
+  return `${pluginRoot.slice(0, -suffix.length)}/.troxy/mod-route/sessions/${sessionId}.json`;
+}
+
+// What was last written, so the file is only rewritten when the note changes.
+let lastNote = null;
+
 // The decision for the turn in flight: { score, tokens } or null (no change).
 let decision = null;
 
 async function scorePrompt($, e, next) {
   decision = null;
+  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
   if (await $.store.get('paused')) return next(e);
   const kind = e.origin && e.origin.kind;
   if (kind !== 'composer' && kind !== 'bridge' && kind !== 'sdk') return next(e);
@@ -134,6 +151,15 @@ async function* routeStep($, e, next) {
     announced = true;
     $.ui.toast('Troxy is active');
   }
+  if (model !== e.model) {
+    const sid = await $.session.id();
+    const file = modRouteFile($.plugin.root, sid);
+    const key = `${sid}:${e.model}>${model}`;
+    if (file && lastNote !== key) {
+      lastNote = key;
+      await $.fs.write(file, JSON.stringify({ from: e.model, to: model, ts: await $.clock.now() }));
+    }
+  }
   return yield* next(model === e.model ? e : { ...e, model });
 }
 
@@ -155,4 +181,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, MODELS };
+export const _internal = { toDomainAndFields, guardBash, failClosed, parseScore, pickModel, troxyCommand, modRouteFile, MODELS };

package/src/tests/interceptor.test.js

@@ -122,6 +122,35 @@ describe('buildTroxyForwardHeaders', () => {
     assert.equal(headers['x-troxy-tool-sandbox'], 'treated');
   });
 
+  describe('mod routing note', () => {
+    const SID = 'abcd1234-ef56-7890-abcd-ef1234567890';
+    const note = (dir, obj) => {
+      fs.mkdirSync(path.join(dir, 'sessions'), { recursive: true });
+      fs.writeFileSync(path.join(dir, 'sessions', `${SID}.json`), JSON.stringify(obj));
+    };
+    const build = (dir, sid = SID) => buildTroxyForwardHeaders(
+      { host: 'api.anthropic.com', 'x-claude-code-session-id': sid }, 'txy-key', undefined, dir);
+
+    it('adds from/to headers when the session has a fresh routing note', () => {
+      const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'troxy-modroute-'));
+      note(dir, { from: 'claude-opus-5-5', to: 'claude-haiku-4-5-20251001', ts: Date.now() });
+      const h = build(dir);
+      assert.equal(h['x-troxy-mod-routed-from'], 'claude-opus-5-5');
+      assert.equal(h['x-troxy-mod-routed-to'], 'claude-haiku-4-5-20251001');
+    });
+
+    it('adds nothing when there is no note, a cleared note, a stale note, or a bad session id', () => {
+      const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'troxy-modroute-'));
+      assert.equal(build(dir)['x-troxy-mod-routed-from'], undefined);
+      note(dir, {});
+      assert.equal(build(dir)['x-troxy-mod-routed-from'], undefined);
+      note(dir, { from: 'a', to: 'b', ts: Date.now() - 31 * 60 * 1000 });
+      assert.equal(build(dir)['x-troxy-mod-routed-from'], undefined);
+      note(dir, { from: 'a', to: 'b', ts: Date.now() });
+      assert.equal(build(dir, '../etc/passwd')['x-troxy-mod-routed-from'], undefined);
+    });
+  });
+
   it('omits x-troxy-tool-sandbox header when no state file exists', () => {
     const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'troxy-sandbox-'));
 

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, MODELS } = _internal;
+const { parseScore, pickModel, troxyCommand, modRouteFile, MODELS } = _internal;
 
 test('parseScore: reads a bare number and clamps to 0..1', () => {
   assert.equal(parseScore('0.35'), 0.35);
@@ -16,8 +16,10 @@ test('parseScore: unparseable text is null so the caller keeps the requested mod
   assert.equal(parseScore('hard'), null);
 });
 
-test('pickModel: bands route down from opus (<=0.1 haiku, <=0.6 sonnet, <=0.8 opus)', () => {
+test('pickModel: bands route down from opus (<=0.2 haiku, <=0.6 sonnet, <=0.8 opus)', () => {
   assert.equal(pickModel(0.05, MODELS.opus, 1000), MODELS.haiku);
+  assert.equal(pickModel(0.2, MODELS.opus, 1000), MODELS.haiku);
+  assert.equal(pickModel(0.25, MODELS.opus, 1000), MODELS.sonnet);
   assert.equal(pickModel(0.4, MODELS.opus, 1000), MODELS.sonnet);
   assert.equal(pickModel(0.7, MODELS.opus, 1000), MODELS.opus);
   assert.equal(pickModel(0.95, MODELS.opus, 1000), MODELS.opus);
@@ -52,3 +54,14 @@ test('troxyCommand: off and on flip the setting, status and anything else only r
   assert.match(troxyCommand('status', false).text, /on/);
   assert.equal(troxyCommand('nonsense', false).paused, false);
 });
+
+test('modRouteFile: derives the daemon note path from the installed plugin folder', () => {
+  const sid = 'abcd1234-ef56-7890-abcd-ef1234567890';
+  assert.equal(modRouteFile('/Users/a/.claude/skills/troxy-guard', sid), `/Users/a/.troxy/mod-route/sessions/${sid}.json`);
+});
+
+test('modRouteFile: null when not installed in ~/.claude/skills (e.g. --plugin-dir) or the id is unsafe', () => {
+  const sid = 'abcd1234-ef56-7890-abcd-ef1234567890';
+  assert.equal(modRouteFile('/work/troxy/src/mods/troxy-guard', sid), null);
+  assert.equal(modRouteFile('/Users/a/.claude/skills/troxy-guard', '../x'), null);
+});