troxy-cli 1.28.0 → 1.29.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "troxy-cli",
-  "version": "1.28.0",
+  "version": "1.29.0",
   "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/hook-report.js

@@ -102,6 +102,15 @@ export function usageForCurrentTurn(transcriptPath) {
   const seen = new Map(); // messageId -> {model, tokens, effort}
   let lastModel = null;
   let lastEffort = null;
+  // How many tool_use content blocks this turn has produced so far -
+  // Claude Code writes one JSONL line per content block (see the big
+  // comment above), so this is a real count, not a guess, of tool calls
+  // already made this turn, before whichever one just triggered this hook.
+  // Only the block's `type` tag is read here, a category label
+  // ("tool_use"/"thinking"/"text"), never its actual name or arguments -
+  // same narrow-purpose exception extractReplyText already sets for
+  // touching `content` at all, still never touching real conversation data.
+  let toolUseBlocksSoFar = 0;
   for (const entry of turnLines) {
     const usage = extractUsage(entry);
     if (!usage || !usage.messageId) continue;
@@ -110,6 +119,10 @@ export function usageForCurrentTurn(transcriptPath) {
       lastModel = lastModel || usage.model;
       lastEffort = lastEffort || usage.effort;
     }
+    const content = entry?.type === 'assistant' ? entry.message?.content : null;
+    if (Array.isArray(content) && content.some(b => b?.type === 'tool_use')) {
+      toolUseBlocksSoFar++;
+    }
   }
 
   if (seen.size === 0) return null;
@@ -137,7 +150,10 @@ export function usageForCurrentTurn(transcriptPath) {
   }
   const contentExcerpt = replyText ? replyText.slice(0, MAX_EXCERPT_LEN) : null;
 
-  return { tokens: totalTokens, model: lastModel, effort: lastEffort, turnKey, contentExcerpt };
+  return {
+    tokens: totalTokens, model: lastModel, effort: lastEffort, toolUseBlocksSoFar,
+    turnKey, contentExcerpt,
+  };
 }
 
 function withTimeout(promise, ms) {

package/src/pretooluse-hook.js

@@ -97,6 +97,15 @@ export async function runPreToolUseHook() {
     // guessed low/medium/high. Omitted when the transcript doesn't carry one
     // (an older Claude Code build, or a turn before any assistant reply yet).
     if (usage.effort) body.effort = usage.effort;
+    // How many tools this turn has used so far (from the transcript), plus
+    // the one about to run that triggered this hook. An undercount by
+    // nature - a PreToolUse hook cannot know how many MORE tool calls this
+    // turn will end up making - but a real, current-as-of-right-now number,
+    // not a guess, and the effort-suggestion feature only needs to tell a
+    // turn's first tool call apart from its fifth, not know the eventual
+    // total. Without this, effort was accepted but never actually
+    // classified as "simple", so no suggestion could ever fire from here.
+    body.estimated_tool_count = usage.toolUseBlocksSoFar + 1;
 
     const result = await withTimeout(
       api.evaluateModel(body, apiKey),

package/src/tests/hook-report.test.js

@@ -40,6 +40,10 @@ function assistantLineWithText(messageId, usage, text, model = 'claude-sonnet-5'
   return { type: 'assistant', message: { id: messageId, model, usage, content: [{ type: 'text', text }] } };
 }
 
+function assistantToolUseLine(messageId, usage, toolName = 'Bash', model = 'claude-sonnet-5') {
+  return { type: 'assistant', message: { id: messageId, model, usage, content: [{ type: 'tool_use', name: toolName }] } };
+}
+
 const USAGE_A = { input_tokens: 2, output_tokens: 1176, cache_creation_input_tokens: 4134, cache_read_input_tokens: 244103 };
 
 describe('extractUsage', () => {
@@ -142,6 +146,29 @@ describe('usageForCurrentTurn', () => {
     assert.equal(result.effort, null);
   });
 
+  it('counts tool_use content blocks in the current turn, not text/thinking ones', () => {
+    writeLines([
+      { type: 'user', message: { content: [{ type: 'text', text: 'hi' }] } },
+      // Same real shape: one JSONL line per content block, all three lines
+      // share message.id 'msg_1' and repeat the same usage object.
+      { type: 'assistant', message: { id: 'msg_1', model: 'claude-sonnet-5', usage: { input_tokens: 1, output_tokens: 1 }, content: [{ type: 'thinking', thinking: 'planning' }] } },
+      assistantToolUseLine('msg_1', { input_tokens: 1, output_tokens: 1 }, 'Read'),
+      assistantToolUseLine('msg_2', { input_tokens: 1, output_tokens: 1 }, 'Bash'),
+      assistantLineWithText('msg_3', { input_tokens: 1, output_tokens: 1 }, 'done'),
+    ]);
+    const result = usageForCurrentTurn(transcriptPath());
+    assert.equal(result.toolUseBlocksSoFar, 2);
+  });
+
+  it('toolUseBlocksSoFar is 0 for a turn with no tool use yet', () => {
+    writeLines([
+      { type: 'user', message: { content: [{ type: 'text', text: 'hi' }] } },
+      assistantLineWithText('msg_1', { input_tokens: 1, output_tokens: 1 }, 'just chatting'),
+    ]);
+    const result = usageForCurrentTurn(transcriptPath());
+    assert.equal(result.toolUseBlocksSoFar, 0);
+  });
+
   it('returns a stable turn_key for the same set of message ids, order-independent', () => {
     writeLines([
       { type: 'user', message: { content: [] } },