troxy-cli 1.29.44 → 1.29.45

package/package.json

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

@@ -309,12 +309,20 @@ async function scorePrompt($, e, next) {
   return next(e);
 }
 
+// The model the session last asked for, per session, so a /model switch is seen.
+const lastAsked = new Map();
+
 async function* routeStep($, e, next) {
   // Main loop only: a subagent keeps whatever model it was given.
   if (!decision || e.agentId) return yield* next(e);
+  // 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').
+  const sid = await $.session.id();
+  const prev = lastAsked.get(sid);
+  lastAsked.set(sid, e.model);
+  if (prev && prev !== e.model) { decision = null; return yield* next(e); }
   const model = pickModel(decision.score, e.model, decision.tokens);
   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) {
@@ -388,4 +396,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 };
+export const _internal = { toDomainAndFields, guardBash, failClosed, parseScore, pickModel, troxyCommand, modRouteFile, estimateTokens, MODELS, savedLine, sessionLine, addTurn, statusText, compactPlan, savingsText, fetchSavings, scorePrompt, routeStep };

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

@@ -142,3 +142,36 @@ test('fetchSavings: sends the saved key and the session id; null without a key o
   assert.equal(await fetchSavings(mk({ env: { HOME: '/h' }, config: {} })), null);
   assert.equal(await fetchSavings({ ...mk(), session: { id: async () => 'x' } }), null);
 });
+
+// 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();
+  return {
+    state: { get: async (k) => ({ value: kv.get(k.key) }), set: async (k, v) => kv.set(k.key, v) },
+    store: { get: async () => undefined },
+    session: { id: async () => 'sess-switch-test', usage: async () => ({ context: { tokens: 1000 }, rateLimits: [] }) },
+    plugin: { root: '/tmp/not-installed' },
+    model: { complete: async () => ({ isAnswered: true, text: '0.1' }) },
+    ui: { log: () => {} },
+    clock: { now: async () => 0 },
+    fs: { write: async () => {} },
+  };
+}
+
+async function runTurn($, model) {
+  const { scorePrompt, routeStep } = _internal;
+  await scorePrompt($, { text: 'reply only ok', origin: { kind: 'composer' } }, async (e) => e);
+  let sent;
+  const gen = routeStep($, { model }, async function* (e) { sent = e.model; });
+  for await (const _ of gen) { /* drain */ }
+  return sent;
+}
+
+test('routeStep: a /model switch is honored for that turn, then routing resumes', 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($, sonnet), sonnet); // user picked sonnet: kept
+  assert.equal(await runTurn($, sonnet), haiku);  // same choice again: routing resumes
+});