troxy-cli 1.21.1 → 1.23.0

package/src/init.js

@@ -185,7 +185,7 @@ export function writeAgentsFile(dir, text) {
   return file;
 }
 
-function prompt(question) {
+export function prompt(question) {
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
   return new Promise(resolve => rl.question(question, ans => { rl.close(); resolve(ans.trim()); }));
 }
@@ -302,6 +302,17 @@ export async function runInit({ key, name } = {}) {
 
   await reprovisionKeyConsumers(key, agentName);
 
+  // Scan for local AI coding tools and (interactively) confirm the plan for
+  // each, so the dashboard shows real subscription cost, not token math.
+  // Non-fatal + TTY-gated inside runToolDetection - a scripted init never
+  // hangs and a scan failure never breaks setup.
+  try {
+    const { runToolDetection } = await import('./tool_detect.js');
+    await runToolDetection(key, { interactive: true });
+  } catch {
+    // Tool detection is a bonus, never a blocker for a successful init.
+  }
+
   console.log('\n  Your payments are now protected.');
   console.log('  Dashboard → https://dash.troxy.io');
   console.log('\n  For more information, visit https://docs.troxy.io\n');
@@ -553,7 +564,7 @@ export function patchClaudeCodeHooks(
 // single marker *file* whose mere existence means "Claude Code is
 // installed" - `~/.claude.json` and `~/.claude/settings.json` are both
 // created lazily and may not exist yet on a fresh install.
-function hasClaudeCode() {
+export function hasClaudeCode() {
   try {
     execSync('claude --version', { stdio: 'ignore' });
     return true;

package/src/mcp-server.js

@@ -12,6 +12,13 @@ const evaluateLogin   = (body, apiKey) => api.evaluateLogin(body, apiKey);
 const evaluateAction  = (body, apiKey) => api.evaluateAction(body, apiKey);
 const evaluateModel   = (body, apiKey) => api.evaluateModel(body, apiKey);
 const reportModelUsage = (body, apiKey) => api.reportModelUsage(body, apiKey);
+// Was missing entirely until 2026-08-15: every other checkpoint had an MCP
+// tool, this one did not, so no MCP-connected agent could ever call
+// /evaluate/secrets - not "the agent chose not to," there was nothing to
+// call. evaluate.py's other_checkpoints discovery (every response advertises
+// the other five) does mention it, but as a raw HTTP URL; useless to an
+// agent whose only way to reach Troxy is through the tools listed here.
+const evaluateSecrets = (body, apiKey) => api.evaluateSecrets(body, apiKey);
 
 export async function runMcp() {
   const config    = loadConfig();
@@ -74,7 +81,7 @@ export async function runMcp() {
         // Token Optimization is supposed to be a precise record, not a mood.
         // The trigger below is mechanical instead: did this turn use a tool,
         // yes or no. That is a fact you can check, not a judgment you make.
-        'You MUST also call the evaluate_model tool at the start of ANY turn where you will use one or more tools of any kind — reading or writing a file, running a command, browsing, calling an external API, anything beyond a plain text reply — and whenever you switch model or effort level partway through the turn. This is not a judgment call about how the turn feels: if you are about to use a tool, call evaluate_model first, every time, regardless of how small the turn seems, and WAIT for the decision before proceeding. Give the exact model id and how many tokens you expect to use. Do not use any tool without first receiving an ALLOW or NOTIFY decision; if BLOCK, pick a cheaper or smaller model and call evaluate_model again with the new id; if ESCALATE, call wait_for_approval and do not proceed until it resolves. Then, at the end of that same turn, you MUST call report_model_usage with the audit_id from that decision and the real token total from your model API. Both halves are required: without the second call Troxy has only your prediction, and the account owner is shown that this agent\'s costs are unverified. Report the true number even when it is far above your estimate. ' +
+        'You MUST also call the evaluate_model tool at the start of ANY turn where you will use one or more tools of any kind — reading or writing a file, running a command, browsing, calling an external API, anything beyond a plain text reply — and whenever you switch model or effort level partway through the turn. This is not a judgment call about how the turn feels: if you are about to use a tool, call evaluate_model first, every time, regardless of how small the turn seems, and WAIT for the decision before proceeding. Give the exact model id, how many tokens you expect to use, and how many tool calls you expect to make this turn (estimated_tool_count). Do not use any tool without first receiving an ALLOW or NOTIFY decision; if BLOCK, pick a cheaper or smaller model and call evaluate_model again with the new id; if ESCALATE, call wait_for_approval and do not proceed until it resolves. Then, at the end of that same turn, you MUST call report_model_usage with the audit_id from that decision and the real token total from your model API. Both halves are required: without the second call Troxy has only your prediction, and the account owner is shown that this agent\'s costs are unverified. Report the true number even when it is far above your estimate. ' +
         (hookCaptureActive
           // Claude Code's own Stop hook already reports real, host-captured
           // usage for every turn in this session, chat-only included - see
@@ -323,6 +330,10 @@ export async function runMcp() {
               type: 'number',
               description: 'How many tokens you expect the task to use in total, input plus output. Troxy prices this itself, so an estimate in tokens is enough; do not convert it to dollars.',
             },
+            estimated_tool_count: {
+              type: 'number',
+              description: 'How many tool calls you expect to make this turn (reading/writing files, running commands, browsing, calling external APIs, etc). Report your honest expectation, not a running total across the session - Troxy uses this alongside estimated_tokens to judge how complex the task actually is.',
+            },
             effort: {
               type: 'string',
               enum: ['low', 'medium', 'high'],
@@ -374,6 +385,48 @@ export async function runMcp() {
           },
         },
       },
+      {
+        name: 'evaluate_secrets',
+        description:
+          'Evaluate whether content you are about to send, write, or publish should be allowed, blocked, or ' +
+          'escalated based on your Troxy policies. Troxy scans the content server-side for API keys, credit ' +
+          'card numbers, passwords, private keys, tokens, and personally identifiable information - you do ' +
+          'not pre-classify it yourself. Call this BEFORE you share a file, send a message, push code, upload ' +
+          'data, or write content to any external destination - anything that leaves the current context. ' +
+          'If you are unsure whether something counts as sensitive, call this anyway.',
+        inputSchema: {
+          type: 'object',
+          required: ['content'],
+          properties: {
+            content: {
+              type: 'string',
+              description: 'The text, code, or data you are about to send or write.',
+            },
+            destination: {
+              type: 'string',
+              description: 'Where it is going: a person, a repo, a channel, a service, or "public" if anyone can see it.',
+            },
+            action: {
+              type: 'string',
+              enum: ['send', 'push', 'upload', 'write', 'share'],
+              description: 'What you are doing with it.',
+            },
+            content_type: {
+              type: 'string',
+              enum: ['code', 'message', 'file', 'config', 'log', 'other'],
+              description: 'What it is.',
+            },
+            agent: {
+              type: 'string',
+              description: 'Name of the agent (optional).',
+            },
+            approval_token: {
+              type: 'string',
+              description: 'Approval token from a previous ESCALATE response. Include this to proceed after the user has approved.',
+            },
+          },
+        },
+      },
     ],
   }));
 
@@ -608,6 +661,38 @@ export async function runMcp() {
       };
     }
 
+    if (toolName === 'evaluate_secrets') {
+      if (agentName && !args.agent) args.agent = agentName;
+      let result;
+      try {
+        result = await evaluateSecrets(args, apiKey);
+      } catch (err) {
+        return { content: [{ type: 'text', text: `Troxy error: ${err.message}` }], isError: true };
+      }
+      if (result.error) {
+        return { content: [{ type: 'text', text: `Troxy error: ${result.error}` }], isError: true };
+      }
+      const { decision, reason, audit_id, approval_token, detections } = result;
+      const found = (detections || []).map(d => d.type).join(', ');
+      const detail = found ? ` Found: ${found}.` : '';
+      let secretsText;
+      switch (decision) {
+        case 'ALLOW':
+        case 'NOTIFY':
+          secretsText = `✓ Approved.${reason ? ` ${reason}` : ''}${detail} You may proceed. (audit: ${audit_id})`;
+          break;
+        case 'BLOCK':
+          secretsText = `✗ Blocked.${reason ? ` ${reason}` : ''}${detail} Do not send, write, or publish this content as-is. (audit: ${audit_id})`;
+          break;
+        case 'ESCALATE':
+          secretsText = `⏳ This requires human approval; a request has been sent to the account owner.${detail}\n\nApproval token: ${approval_token}\n\nNow call wait_for_approval(approval_token="${approval_token}") to automatically detect approval, then call evaluate_secrets again with the same arguments PLUS this approval_token. Do not proceed until it returns approved.`;
+          break;
+        default:
+          secretsText = JSON.stringify(result);
+      }
+      return { content: [{ type: 'text', text: secretsText }], isError: decision === 'BLOCK' };
+    }
+
     if (toolName !== 'evaluate_payment') {
       throw new Error(`Unknown tool: ${toolName}`);
     }

package/src/mcps.js

@@ -60,6 +60,7 @@ export async function runMcps([sub, ...args], flags) {
           m.is_me ? '← you' : '',
         ]),
       );
+      console.log('  Policies: org + space policies apply account-wide, so this count is the same for every agent.\n');
       break;
     }