troxy-cli 1.29.46 → 1.29.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "troxy-cli",
-  "version": "1.29.46",
+  "version": "1.29.48",
   "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/daemon.js

@@ -105,7 +105,7 @@ export function startInterceptor({
     routeResolver: (host, method, reqPath) => troxyRouteFor(providers, host, method, reqPath),
     // Fresh from disk on every request, not cached at startup - a
     // `troxy rotate-key` takes effect immediately, no daemon restart needed.
-    getTroxyKey: () => loadConfig()?.apiKey || null,
+    getTroxyKey: () => loadConfig()?.apiKey?.trim() || null,
     getCerts: () => certs,
     log: _log,
   });

package/src/interceptor.js

@@ -104,7 +104,7 @@ export function detectSurface(incomingHeaders) {
 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
+// { arm, 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;
@@ -112,12 +112,15 @@ const _MOD_ROUTE_MAX_AGE_MS = 30 * 60 * 1000;
 function _readModRoute(dir, sessionId) {
   try {
     const file = sessionArmPath(dir, sessionId);
-    if (!file) return null;
+    if (!file) return { arm: null, from: null, to: 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;
+    // arm is per-session state and never expires; from/to is only valid if fresh.
+    const arm = n.arm === 'treated' || n.arm === 'holdout' ? n.arm : null;
+    const isFresh = Date.now() - n.ts < _MOD_ROUTE_MAX_AGE_MS;
+    const routed = isFresh && typeof n.from === 'string' && typeof n.to === 'string';
+    return { arm, from: routed ? n.from : null, to: routed ? n.to : null };
   } catch {
-    return null;
+    return { arm: null, from: null, to: null };
   }
 }
 
@@ -172,10 +175,12 @@ export function buildTroxyForwardHeaders(incomingHeaders, troxyKey, sandboxState
     : _readFreshSandboxState(sandboxStateDir);
   if (sandboxState) headers['x-troxy-tool-sandbox'] = sandboxState;
   const modRoute = _readModRoute(modRouteDir, incomingHeaders['x-claude-code-session-id']);
-  if (modRoute) {
+  if (modRoute && modRoute.from) {
     headers['x-troxy-mod-routed-from'] = modRoute.from;
     headers['x-troxy-mod-routed-to'] = modRoute.to;
   }
+  // The mod is this session's one router: the proxy must not route it, and logs the arm.
+  if (modRoute && modRoute.arm) headers['x-troxy-mod-arm'] = modRoute.arm;
   headers.authorization = `Bearer ${troxyKey}`;
   return headers;
 }
@@ -279,13 +284,15 @@ function _relayToTroxy(route, req, res, body, troxyKey, connectTimeoutMs, respon
       resolve(result);
     };
 
-    const upstreamReq = _clientForProtocol(route.upstream).request({
-      method: req.method,
-      hostname: url.hostname,
-      port: url.port || (url.protocol === 'http:' ? 80 : 443),
-      path: url.pathname + search,
-      headers: buildTroxyForwardHeaders(req.headers, troxyKey),
-    }, (upstreamRes) => {
+    let upstreamReq;
+    try {
+      upstreamReq = _clientForProtocol(route.upstream).request({
+        method: req.method,
+        hostname: url.hostname,
+        port: url.port || (url.protocol === 'http:' ? 80 : 443),
+        path: url.pathname + search,
+        headers: buildTroxyForwardHeaders(req.headers, troxyKey),
+      }, (upstreamRes) => {
       if (settled) return; // already failed open on a timeout; drop this late arrival
       settled = true;
       clearTimeout(connectTimer);
@@ -328,6 +335,11 @@ function _relayToTroxy(route, req, res, body, troxyKey, connectTimeoutMs, respon
 
     upstreamReq.on('error', () => settle(false));
     upstreamReq.end(body);
+    } catch (err) {
+      // Invalid header value (e.g. a trailing newline in the key) throws synchronously: fail open.
+      log('troxy request rejected before sending: %s', err.message);
+      settle(false);
+    }
   });
 }
 

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

@@ -148,11 +148,13 @@ function bar(fraction) {
 // [██████░░░░] 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;
+  if (!(paid > 0)) return undefined;
+  const windows = rateLimits.filter(w => WINDOW_LABEL[w.kind]);
+  const hasMovement = windows.some(w => Math.round(w.percentUsed) >= 1);
+  if (!(kept > 0) && !hasMovement) 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)) {
+  if (hasMovement) {
     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)}`}`);
@@ -173,8 +175,8 @@ function sessionLine(t) {
 // by the server. undefined until something was saved.
 function savingsText(s) {
   const c = (s && s.compressed_tokens) || 0, t = (s && s.trimmed_tokens) || 0;
-  if (!(c + t > 0)) return undefined;
   const k = n => n >= 1000 ? `${Math.round(n / 1000)}k` : String(n);
+  // Always show, even if 0, so the band is transparent: 0 means no trimming/compression on this turn
   return `${k(c + t)} tokens saved by compression and trimming`;
 }
 
@@ -209,7 +211,7 @@ function statusText({ version, paused, totals, rateLimits = [], compactOff = fal
     : 'This session: nothing moved to a cheaper model yet');
   const meter = rateLimits.filter(w => WINDOW_LABEL[w.kind]).map(w => `${WINDOW_LABEL[w.kind]} ${Math.round(w.percentUsed)}%`);
   if (meter.length) lines.push(`Plan usage now: ${meter.join(' · ')}`);
-  lines.push(`Past ${ROUTE_CONTEXT_FLOOR_TOKENS / 1000}k tokens of context a session stays on the model it is on (switching would rewrite the cache), unless a prompt needs a stronger one.`);
+  lines.push('The model is picked at the start, after an hour idle or after a compaction, then kept (switching would rewrite the cache). /model always wins.');
   lines.push(compactOff ? 'Idle compaction is off (/troxy compact on).'
     : `Idle compaction is on: sessions over ${COMPACT_MIN_TOKENS / 1000}k tokens are compacted after ${COMPACT_IDLE_MS / 60000} min idle (/troxy compact off).`);
   lines.push('All sessions: dash.troxy.io');
@@ -323,30 +325,49 @@ const lastAsked = new Map();
 // The model each session last ran on and when: its cache is warm for about an hour.
 const lastSent = new Map();
 const WARM_MS = 55 * 60 * 1000;
+// Sessions whose next step is a cold moment because the conversation was just compacted.
+const coldNext = new Set();
+// One router per session, measured: a holdout session is never routed (the proxy
+// doesn't route mod sessions either), so treated vs holdout is a clean A/B.
+const ARM = { plugin: 'troxy-guard', key: 'arm' };
+const MOD_HOLDOUT_FRACTION = 0.1;
+
+// Which model a step runs on. Decide only at a cold moment (first step, 55+ min
+// idle, after a compaction): the cache is cold anyway, so any model is free to
+// pick, at any context size. In between, hold the warm model: no switch, no
+// cache rewrite. The user's own /model always wins and becomes the held model.
+function stepModel({ arm, requested, switched, cold, score, warm }) {
+  if (arm !== 'treated' || switched) return requested;
+  if (cold) return pickModel(score, requested, 0, null);
+  const w = tierOf(warm), rq = tierOf(requested);
+  return w !== null && rq !== null && RANK[w] <= RANK[rq] ? warm : requested;
+}
 
 async function* routeStep($, e, next) {
   // Main loop only: a subagent keeps whatever model it was given.
   if (e.agentId) return yield* next(e);
   const sid = await $.session.id();
   const now = await $.clock.now();
-  // The user picked a different model since the last turn: their choice wins
-  // for this turn (the proxy does the same, route_reason 'user_switch').
+  let { value: arm } = await $.state.get(ARM);
+  if (!arm) { arm = Math.random() < MOD_HOLDOUT_FRACTION ? 'holdout' : 'treated'; await $.state.set(ARM, arm); }
   const prev = lastAsked.get(sid);
   lastAsked.set(sid, e.model);
-  if (prev && prev !== e.model) decision = null;
-  if (!decision) { lastSent.set(sid, { model: e.model, at: now }); return yield* next(e); }
   const ls = lastSent.get(sid);
-  const model = pickModel(decision.score, e.model, decision.tokens, ls && now - ls.at < WARM_MS ? ls.model : null);
+  const model = (await $.store.get('paused')) ? e.model : stepModel({
+    arm, requested: e.model, switched: Boolean(prev && prev !== e.model),
+    cold: !ls || now - ls.at >= WARM_MS || coldNext.has(sid),
+    score: decision ? decision.score : null, warm: ls && ls.model,
+  });
+  coldNext.delete(sid);
   lastSent.set(sid, { model, at: now });
-  if (model !== e.model) {
-    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() }));
-    }
-    if (turn) turn.ratio = PRICE[tierOf(e.model)] / PRICE[tierOf(model)];
+  // The daemon tags every call with the arm, plus from/to when the model changed.
+  const file = modRouteFile($.plugin.root, sid);
+  const key = `${sid}:${arm}:${e.model}>${model}`;
+  if (file && lastNote !== key) {
+    lastNote = key;
+    await $.fs.write(file, JSON.stringify(model === e.model ? { arm, ts: now } : { arm, from: e.model, to: model, ts: now }));
   }
+  if (model !== e.model && turn) turn.ratio = PRICE[tierOf(e.model)] / PRICE[tierOf(model)];
   return yield* next(model === e.model ? e : { ...e, model });
 }
 
@@ -379,6 +400,11 @@ export function register(on) {
   // 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('session.compact', async ($, e, next) => {
+    const r = await next(e);
+    if (!e.agentId) coldNext.add(await $.session.id()); // compacted: the next step is a cold moment
+    return r;
+  });
   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
@@ -412,4 +438,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, estimateTokens, MODELS, savedLine, sessionLine, addTurn, statusText, compactPlan, savingsText, fetchSavings, scorePrompt, routeStep };
+export const _internal = { toDomainAndFields, guardBash, failClosed, parseScore, pickModel, troxyCommand, modRouteFile, estimateTokens, MODELS, savedLine, sessionLine, addTurn, statusText, compactPlan, savingsText, fetchSavings, scorePrompt, routeStep, stepModel };

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

@@ -1,8 +1,9 @@
 export type BarLine = string | null
+export type ModArm = 'treated' | 'holdout' | null
 export type SessionSaved = { paid: number; full: number; meter: Record<string, number> }
 
 declare module 'claude-code' {
   interface PluginState {
-    'troxy-guard': { line: BarLine; saved: SessionSaved; compacted: BarLine; savings: BarLine }
+    'troxy-guard': { line: BarLine; saved: SessionSaved; compacted: BarLine; savings: BarLine; arm: ModArm }
   }
 }

package/src/tests/interceptor.test.js

@@ -149,6 +149,20 @@ describe('buildTroxyForwardHeaders', () => {
       note(dir, { from: 'a', to: 'b', ts: Date.now() });
       assert.equal(build(dir, '../etc/passwd')['x-troxy-mod-routed-from'], undefined);
     });
+
+    it('tags the arm on every call, with or without a reroute', () => {
+      const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'troxy-modroute-'));
+      note(dir, { arm: 'holdout', ts: Date.now() });
+      let h = build(dir);
+      assert.equal(h['x-troxy-mod-arm'], 'holdout');
+      assert.equal(h['x-troxy-mod-routed-from'], undefined);
+      note(dir, { arm: 'treated', from: 'claude-opus-5-5', to: 'claude-haiku-4-5-20251001', ts: Date.now() });
+      h = build(dir);
+      assert.equal(h['x-troxy-mod-arm'], 'treated');
+      assert.equal(h['x-troxy-mod-routed-to'], 'claude-haiku-4-5-20251001');
+      note(dir, { arm: 'bogus', ts: Date.now() });
+      assert.equal(build(dir)['x-troxy-mod-arm'], undefined);
+    });
   });
 
   it('omits x-troxy-tool-sandbox header when no state file exists', () => {
@@ -702,3 +716,58 @@ describe('buildTroxyForwardHeaders session arm', () => {
     assert.equal('x-troxy-tool-sandbox' in headers, false);
   });
 });
+
+describe('interceptor fails open on invalid header values', () => {
+  const openServers = [];
+  after(async () => {
+    openServers.forEach(s => s.close());
+  });
+
+  it('handles API key with trailing newline gracefully without crashing', async () => {
+    // Simulates daemon.js config loading a key with a trailing newline,
+    // before the trim fix. The interceptor must fail open, not crash.
+    const targetServer = net.createServer((socket) => {
+      socket.write('HTTP/1.1 200 OK\r\nContent-Length: 2\r\n\r\nOK');
+      socket.end();
+    });
+    await new Promise(r => targetServer.listen(0, '127.0.0.1', r));
+    openServers.push(targetServer);
+    const targetPort = targetServer.address().port;
+
+    const interceptor = createInterceptor({
+      interceptHosts: ['api.anthropic.com'],
+      routeResolver: (host, method, reqPath) => {
+        if (host === 'api.anthropic.com') {
+          return { method, path: '/v1/messages', upstream: `http://127.0.0.1:${targetPort}` };
+        }
+        return null;
+      },
+      // Return a key with trailing newline - simulates the bug before daemon.js trim
+      getTroxyKey: () => 'txy-test-key\n',
+      getCerts: () => null, // No TLS for this test, it goes straight to HTTP upstream
+      log: () => {},
+    });
+    await new Promise(r => interceptor.listen(0, '127.0.0.1', r));
+    openServers.push(interceptor);
+
+    // Make a request through the proxy to the anthropic host
+    // The invalid header should cause a catch in _relayToTroxy, which should
+    // settle(false) to fail open, not crash the server.
+    const response = await new Promise((resolve, reject) => {
+      const req = net.createConnection(
+        { host: '127.0.0.1', port: interceptor.address().port },
+        () => {
+          req.write('GET / HTTP/1.1\r\nHost: api.anthropic.com\r\nConnection: close\r\n\r\n');
+        }
+      );
+      let body = '';
+      req.on('data', (chunk) => { body += chunk.toString(); });
+      req.on('end', () => resolve(body));
+      req.on('error', reject);
+    });
+
+    // Verify we got a response (either direct relay or error response),
+    // and the server didn't crash
+    assert.ok(response.length > 0, 'should get a response, not crash');
+  });
+});

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

@@ -74,7 +74,8 @@ test('savedLine: how much longer the bar lasts, then the meter or the dollars',
     '[███░░░░░░░] 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({ cost_paid_usd: 10, dollars_saved_usd: 0 }, meter),
+    '[██████████] This session: your bar lasts 1.00x longer · 5h: 19 instead of 19 · 7d: 12 instead of 12 · estimate');
   assert.equal(savedLine(null, meter), undefined);
 });
 
@@ -98,7 +99,7 @@ test('statusText: version, routing, this session, plan usage, where the account
     'Troxy 1.29.42 · routing is on\n'
     + 'This session: your bar lasts 4.0x longer · $0.09 saved of $0.12 at list price · estimate\n'
     + 'Plan usage now: 5h 23% · 7d 77%\n'
-    + 'Past 50k tokens of context a session stays on the model it is on (switching would rewrite the cache), unless a prompt needs a stronger one.\n'
+    + 'The model is picked at the start, after an hour idle or after a compaction, then kept (switching would rewrite the cache). /model always wins.\n'
     + 'Idle compaction is on: sessions over 100k tokens are compacted after 55 min idle (/troxy compact off).\n'
     + 'All sessions: dash.troxy.io\n'
     + 'Type /troxy off to pause routing.');
@@ -119,12 +120,12 @@ test('compactPlan: big idle sessions compact, small ones and a nearly full bar d
   assert.deepEqual(compactPlan({ tokens: 210000, now, rateLimits: [{ kind: 'seven_day', percentUsed: 99 }] }), { action: 'skip' });
 });
 
-test('savingsText: shows compression + trimming together, nothing when nothing was saved', () => {
+test('savingsText: shows compression + trimming together, 0 when nothing was saved', () => {
   const { savingsText } = _internal;
   assert.equal(savingsText({ compressed_tokens: 5200, trimmed_tokens: 40100 }), '45k tokens saved by compression and trimming');
   assert.equal(savingsText({ compressed_tokens: 300, trimmed_tokens: 0 }), '300 tokens saved by compression and trimming');
-  assert.equal(savingsText({ compressed_tokens: 0, trimmed_tokens: 0 }), undefined);
-  assert.equal(savingsText(null), undefined);
+  assert.equal(savingsText({ compressed_tokens: 0, trimmed_tokens: 0 }), '0 tokens saved by compression and trimming');
+  assert.equal(savingsText(null), '0 tokens saved by compression and trimming');
 });
 
 test('fetchSavings: sends the saved key and the session id; null without a key or on an error', async () => {
@@ -146,7 +147,7 @@ test('fetchSavings: sends the saved key and the session id; null without a key o
 // A fake $ just big enough for scorePrompt + routeStep: the scorer says "easy"
 // (score 0.1) and the context is small, so the mod would route down to haiku.
 function routingApi() {
-  const kv = new Map();
+  const kv = new Map([['arm', 'treated']]);
   const sid = 'sess-' + Math.random().toString(36).slice(2, 10);
   return {
     state: { get: async (k) => ({ value: kv.get(k.key) }), set: async (k, v) => kv.set(k.key, v) },
@@ -169,12 +170,23 @@ async function runTurn($, model) {
   return sent;
 }
 
-test('routeStep: a /model switch is honored for that turn, then routing resumes', async () => {
+test('routeStep: a /model switch wins and becomes the held model', async () => {
   const $ = routingApi();
   const opus = _internal.MODELS.opus, sonnet = _internal.MODELS.sonnet, haiku = _internal.MODELS.haiku;
-  assert.equal(await runTurn($, opus), haiku);   // first turn: routed down as before
+  assert.equal(await runTurn($, opus), haiku);   // first turn is cold: routed down
   assert.equal(await runTurn($, sonnet), sonnet); // user picked sonnet: kept
-  assert.equal(await runTurn($, sonnet), haiku);  // same choice again: routing resumes
+  assert.equal(await runTurn($, sonnet), sonnet); // warm on sonnet: held, no switch
+});
+
+test('stepModel: decide only at cold moments, hold in between, holdout never routes', () => {
+  const { stepModel, MODELS: M } = _internal;
+  const base = { arm: 'treated', requested: M.opus, switched: false, warm: M.haiku };
+  assert.equal(stepModel({ ...base, cold: true, score: 0.5 }), M.sonnet);  // cold: pick by score, any size
+  assert.equal(stepModel({ ...base, cold: false, score: 0.9 }), M.haiku);  // warm: hold, even for a hard prompt
+  assert.equal(stepModel({ ...base, cold: false, score: null }), M.haiku); // warm, no score: hold
+  assert.equal(stepModel({ ...base, cold: true, score: null }), M.opus);   // cold, no score: as asked
+  assert.equal(stepModel({ ...base, arm: 'holdout', cold: true, score: 0.1 }), M.opus);
+  assert.equal(stepModel({ ...base, switched: true, cold: false, score: 0.1 }), M.opus);
 });
 
 test('pickModel: past the floor, stay on the warm model unless the prompt needs a stronger one', () => {