troxy-cli 1.29.49 → 1.29.51

package/package.json

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

@@ -269,20 +269,59 @@ function compactPlan({ tokens, rateLimits = [], now, off }) {
   return { action: 'wait', inMs: Math.max(0, Math.max(...resets) - now) + COMPACT_AFTER_RESET_MS };
 }
 
+let awake = null;
+
 function cancelCompact() {
   if (compactTimer) compactTimer.cancel();
   compactTimer = null;
+  stopAwake();
 }
 
-function armCompact($, ms) {
+// stayAwake: hold off system sleep (the screen still sleeps) until the timer fires, so a
+// big session compacts on time instead of when the user is back. macOS caffeinate; where
+// it is missing the spawn fails quietly and compact-on-return in scorePrompt covers it.
+function armCompact($, ms, { stayAwake = false, persist = false } = {}) {
   cancelCompact();
-  compactTimer = $.clock.after(ms, () => { compactTimer = null; idleCompact($).catch(() => {}); });
+  if (stayAwake) keepAwake($, ms + 2 * 60 * 1000);
+  // Persisted so a restart (which loses lastSent and the timer) still finds the idle start.
+  if (persist) try {
+    Promise.all([$.session.id(), $.clock.now()])
+      .then(([sid, at]) => $.store.set(`idle_started_${sid}`, at)).catch(() => {});
+  } catch {}
+  compactTimer = $.clock.after(ms, () => {
+    compactTimer = null;
+    idleCompact($).catch(() => {}).finally(stopAwake);
+  });
+}
+
+// ponytail: -t caps it, so if return() cannot kill the child it still ends on its own.
+function keepAwake($, ms) {
+  stopAwake();
+  try {
+    const it = $.process.spawn({ argv: ['caffeinate', '-i', '-t', String(Math.ceil(ms / 1000))] })[Symbol.asyncIterator]();
+    awake = it;
+    it.next().catch(() => {}).finally(() => { if (awake === it) awake = null; });
+  } catch {}
+}
+
+function stopAwake() {
+  const it = awake;
+  awake = null;
+  if (it && it.return) Promise.resolve(it.return()).catch(() => {});
+}
+
+async function bigSession($) {
+  if (await $.store.get('compactOff')) return false;
+  const u = await $.session.usage();
+  return ((u.context && u.context.tokens) || 0) >= COMPACT_MIN_TOKENS;
 }
 
-async function idleCompact($) {
+// late: the user is back after a long idle (the Mac may have slept through the timer),
+// so compact now or not at all: never hold their prompt waiting for a meter reset.
+async function idleCompact($, { late = false } = {}) {
   const u = await $.session.usage();
   const plan = compactPlan({ tokens: u.context && u.context.tokens, rateLimits: u.rateLimits, now: await $.clock.now(), off: await $.store.get('compactOff') });
-  if (plan.action === 'wait') return armCompact($, plan.inMs);
+  if (plan.action === 'wait' && !late) return armCompact($, plan.inMs);
   if (plan.action !== 'compact') return;
   const r = await $.session.compact({ instructions: COMPACT_INSTRUCTIONS });
   if (r.skip) return;
@@ -311,8 +350,20 @@ async function scorePrompt($, e, next) {
   decision = null;
   cancelCompact();
   if ((await $.state.get(COMPACTED)).value) await $.state.set(COMPACTED, null);
-  turn = { start: await snapshot($), ratio: 1 };
   const sid = await $.session.id();
+  // Idle past the timer by the wall clock: a sleeping Mac freezes the timer and a restart
+  // loses it, so the compaction it missed runs here, before this prompt goes out.
+  const now = await $.clock.now();
+  const ls = lastSent.get(sid);
+  let idleSince = ls ? ls.at : null;
+  try {
+    const stored = await $.store.get(`idle_started_${sid}`);
+    if (typeof stored === 'number' && (idleSince == null || stored > idleSince)) idleSince = stored;
+  } catch {}
+  if (idleSince != null && now - idleSince >= COMPACT_IDLE_MS) {
+    try { await idleCompact($, { late: true }); } catch {} // fail open: send the prompt as-is
+  }
+  turn = { start: await snapshot($), ratio: 1 };
   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);
@@ -339,6 +390,23 @@ const coldNext = new Set();
 // 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;
+// The model the user asked for and the one that ran, per session, kept across restarts.
+// The transcript records only the model that ran, so `claude --resume` reopens a routed
+// session on Haiku; without this the mod would take Haiku as the user's pick for good.
+// ponytail: a /model to the same model already showing is invisible, so it stays mapped.
+const asked = new Map();
+async function askedFor($, sid, model, switched) {
+  if (switched) asked.set(sid, null);
+  if (!asked.has(sid)) asked.set(sid, (await $.store.get(`asked:${sid}`)) || null);
+  const r = asked.get(sid);
+  return r && r.ran === model && r.asked !== model ? r.asked : model;
+}
+async function rememberAsked($, sid, want, ran) {
+  const r = asked.get(sid);
+  if (r && r.asked === want && r.ran === ran) return;
+  asked.set(sid, { asked: want, ran });
+  await $.store.set(`asked:${sid}`, { asked: want, ran });
+}
 
 // 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
@@ -360,9 +428,11 @@ async function* routeStep($, e, next) {
   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);
+  const switched = Boolean(prev && prev !== e.model);
+  const want = await askedFor($, sid, e.model, switched);
   const ls = lastSent.get(sid);
-  const model = (await $.store.get('paused')) ? e.model : stepModel({
-    arm, requested: e.model, switched: Boolean(prev && prev !== e.model),
+  const model = (await $.store.get('paused')) ? want : stepModel({
+    arm, requested: want, switched,
     cold: !ls || now - ls.at >= WARM_MS || coldNext.has(sid),
     score: decision ? decision.score : null, warm: ls && ls.model,
   });
@@ -370,12 +440,13 @@ async function* routeStep($, e, next) {
   lastSent.set(sid, { model, at: now });
   // 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}`;
+  const key = `${sid}:${arm}:${want}>${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 }));
+    await $.fs.write(file, JSON.stringify(model === want ? { arm, ts: now } : { arm, from: want, to: model, ts: now }));
   }
-  if (model !== e.model && turn) turn.ratio = PRICE[tierOf(e.model)] / PRICE[tierOf(model)];
+  try { await rememberAsked($, sid, want, model); } catch {} // a missed write only loses this on resume
+  if (model !== want && turn) turn.ratio = PRICE[tierOf(want)] / PRICE[tierOf(model)];
   return yield* next(model === e.model ? e : { ...e, model });
 }
 
@@ -440,10 +511,12 @@ export function register(on) {
       const text = savingsText(await fetchSavings($));
       if (text) await $.state.set(SAVINGS, text);
     } catch {} // a missed fetch only leaves the band as it was
-    armCompact($, COMPACT_IDLE_MS);
+    let stayAwake = false;
+    try { stayAwake = await bigSession($); } catch {}
+    armCompact($, COMPACT_IDLE_MS, { stayAwake, persist: true });
     return r;
   });
 }
 
 // Exported for tests only - not part of the mod's runtime contract.
-export const _internal = { toDomainAndFields, guardBash, failClosed, parseScore, asRequest, pickModel, troxyCommand, modRouteFile, estimateTokens, MODELS, savedLine, sessionLine, addTurn, statusText, compactPlan, savingsText, fetchSavings, scorePrompt, routeStep, stepModel };
+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 };

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

@@ -213,3 +213,82 @@ test('pickModel: no score never causes a switch away from the warm model past th
   assert.equal(pickModel(null, MODELS.opus, 1000, MODELS.haiku), MODELS.haiku); // small context too
   assert.equal(pickModel(null, MODELS.opus, 1000, null), MODELS.opus);           // nothing warm: as asked
 });
+
+test('scorePrompt: back after 55+ min by the wall clock (Mac slept through the timer), a big session compacts first', async () => {
+  const $ = routingApi();
+  let now = 0, compacts = 0, tokens = 174000;
+  $.clock.now = async () => now;
+  $.session.usage = async () => ({ context: { tokens }, rateLimits: [] });
+  $.session.compact = async () => { compacts++; return { tokensBefore: 174000, tokensAfter: 20000 }; };
+  const { opus } = _internal.MODELS;
+  await runTurn($, opus);                  // first prompt: nothing to compact
+  now += 30 * 60 * 1000; await runTurn($, opus);
+  assert.equal(compacts, 0);               // 30 min idle: cache still warm
+  now += 56 * 60 * 1000; await runTurn($, opus);
+  assert.equal(compacts, 1);               // 56 min idle: compacted before the prompt
+  tokens = 50000; now += 2 * 60 * 60 * 1000; await runTurn($, opus);
+  assert.equal(compacts, 1);               // small session: left alone
+  $.session.compact = async () => { throw new Error('turn running'); };
+  tokens = 174000; now += 2 * 60 * 60 * 1000;
+  assert.ok(await runTurn($, opus));       // a failed compaction never blocks the prompt
+});
+
+test('scorePrompt: idle 55+ min across a Claude Code restart still compacts, from the saved idle start', async () => {
+  const { armCompact, cancelCompact } = _internal;
+  const $ = routingApi();
+  const db = new Map();
+  let now = 1000, compacts = 0;
+  $.store = { get: async k => db.get(k), set: async (k, v) => { db.set(k, v); } };
+  $.clock.now = async () => now;
+  $.clock.after = () => ({ cancel() {} });
+  $.session.usage = async () => ({ context: { tokens: 174000 }, rateLimits: [] });
+  $.session.compact = async () => { compacts++; return { tokensBefore: 174000, tokensAfter: 20000 }; };
+  armCompact($, 55 * 60 * 1000, { persist: true }); // end of the last turn before the restart
+  await new Promise(r => setImmediate(r));
+  assert.equal(typeof [...db.values()][0], 'number');
+  now += 40 * 60 * 1000;
+  armCompact($, 55 * 60 * 1000);                     // session.start after the restart: must not reset it
+  await new Promise(r => setImmediate(r));
+  now += 16 * 60 * 1000;
+  await runTurn($, _internal.MODELS.opus);           // fresh process: no lastSent, only the store
+  cancelCompact();
+  assert.equal(compacts, 1);
+});
+
+test('armCompact: a big session keeps the Mac awake until the timer fires, then lets it sleep', async () => {
+  const { armCompact, cancelCompact } = _internal;
+  const spawned = [], stopped = [];
+  let fire;
+  const $ = routingApi();
+  $.clock.after = (ms, fn) => { fire = fn; return { cancel() {} }; };
+  $.session.compact = async () => ({ tokensBefore: 174000, tokensAfter: 20000 });
+  $.session.usage = async () => ({ context: { tokens: 174000 }, rateLimits: [] });
+  $.process = { spawn: ({ argv }) => {
+    spawned.push(argv.join(' '));
+    return { [Symbol.asyncIterator]: () => ({ next: () => new Promise(() => {}), return: async () => { stopped.push(1); return { done: true }; } }) };
+  } };
+  armCompact($, 55 * 60 * 1000, { stayAwake: true });
+  assert.deepEqual(spawned, ['caffeinate -i -t 3420']); // 55 min + 2 min margin
+  fire();
+  await new Promise(r => setTimeout(r, 10));
+  assert.equal(stopped.length, 1);                       // compacted: sleep allowed again
+  armCompact($, 55 * 60 * 1000, { stayAwake: true });
+  cancelCompact();                                        // user typed first
+  assert.equal(stopped.length, 2);
+  armCompact($, 55 * 60 * 1000);                          // small session: never keeps awake
+  assert.equal(spawned.length, 2);
+  cancelCompact();
+});
+
+test('askedFor: a resumed session that reopens on the routed model is mapped back to the model asked for', async () => {
+  const { askedFor, rememberAsked, asked } = _internal;
+  const db = new Map();
+  const $ = { store: { get: async k => db.get(k), set: async (k, v) => { db.set(k, v); } } };
+  const opus = 'claude-opus-5-5', haiku = 'claude-haiku-4-5-20251001', sonnet = 'claude-sonnet-5-5';
+  assert.equal(await askedFor($, 's1', opus, false), opus);
+  await rememberAsked($, 's1', opus, haiku);               // asked Opus, ran Haiku
+  asked.clear();                                           // Claude Code restarts, --resume
+  assert.equal(await askedFor($, 's1', haiku, false), opus); // transcript says Haiku: still Opus asked
+  assert.equal(await askedFor($, 's1', sonnet, true), sonnet); // the user's own /model wins
+  assert.equal(await askedFor($, 's2', haiku, false), haiku);  // never routed: Haiku is the pick
+});