troxy-cli 1.21.0 → 1.22.0

package/bin/troxy.js

@@ -15,18 +15,27 @@ import { runAccount }                  from '../src/account.js';
 import { runSecrets }                  from '../src/secrets.js';
 import { api }                         from '../src/api.js';
 import { table }                       from '../src/print.js';
+import { printSimHelp, runSend, runSignin, runAction, runModelCall, runScan } from '../src/simulate.js';
 
 const [,, command, sub, ...rest] = process.argv;
 const allArgs = [sub, ...rest].filter(Boolean);
 
-// Parse --flag value pairs
+// Parse --flag value pairs. `flags[key]` keeps its original "last occurrence
+// wins" behavior unchanged, for every existing caller that reads it as a
+// plain string. `multiFlags[key]` is new and purely additive: every
+// occurrence of a repeatable flag (e.g. `--and field=... --and field=...`,
+// used by `policies create` to build multi-condition policies), in order.
+// Nothing that doesn't opt into reading multiFlags is affected.
 const flags = {};
+const multiFlags = {};
 const positional = [];
 for (let i = 0; i < allArgs.length; i++) {
   if (allArgs[i].startsWith('--')) {
     const key  = allArgs[i].slice(2);
     const next = allArgs[i + 1];
-    flags[key] = next && !next.startsWith('--') ? allArgs[++i] : true;
+    const val  = next && !next.startsWith('--') ? allArgs[++i] : true;
+    flags[key] = val;
+    (multiFlags[key] ||= []).push(val);
   } else {
     positional.push(allArgs[i]);
   }
@@ -77,6 +86,33 @@ switch (command) {
     await runInit(flags);
     break;
 
+  case 'tools': {
+    if (flags.help || flags.h) {
+      console.log(`
+  troxy tools
+
+  Re-scans this machine for AI coding tools (Claude Code, Cursor, GitHub
+  Copilot, Windsurf, Continue, Aider) and lets you set the subscription plan
+  for each, so the dashboard shows what you actually pay instead of raw
+  token estimates. Run this any time your plan changes.
+`);
+      process.exit(0);
+    }
+    const apiKey = loadConfig()?.apiKey || process.env.TROXY_API_KEY;
+    if (!apiKey) {
+      console.error('\n  Not connected. Run "troxy init --key <your-key>" first.\n');
+      process.exit(1);
+    }
+    const { runToolDetection, detectAiTools } = await import('../src/tool_detect.js');
+    if (detectAiTools().every(d => !d.installed)) {
+      console.log('\n  No supported AI coding tools detected on this machine.\n');
+      break;
+    }
+    await runToolDetection(apiKey, { interactive: true });
+    console.log('  Saved ✓  See it at https://dash.troxy.io\n');
+    break;
+  }
+
   case 'uninstall':
     await runUninstall();
     break;
@@ -286,9 +322,39 @@ switch (command) {
     break;
   }
 
+  // ── Simulate the other five checkpoints ────────────────────────
+  // `pay` above covers /evaluate (payment). Until these existed it was the
+  // only checkpoint testable from the CLI, even though the product had
+  // grown five more - api.js already had wrappers for four of them sitting
+  // unused, and evaluateSecrets was missing outright. See src/simulate.js.
+  case 'send':
+    if (flags.help || flags.h) { printSimHelp('send'); process.exit(0); }
+    await runSend(flags);
+    break;
+
+  case 'signin':
+    if (flags.help || flags.h) { printSimHelp('signin'); process.exit(0); }
+    await runSignin(flags);
+    break;
+
+  case 'action':
+    if (flags.help || flags.h) { printSimHelp('action'); process.exit(0); }
+    await runAction(flags);
+    break;
+
+  case 'model-call':
+    if (flags.help || flags.h) { printSimHelp('model-call'); process.exit(0); }
+    await runModelCall(flags);
+    break;
+
+  case 'scan':
+    if (flags.help || flags.h) { printSimHelp('scan'); process.exit(0); }
+    await runScan(flags);
+    break;
+
   // ── Resources (read-only: --key or saved config; write: login) ─
   case 'policies':
-    await runPolicies(positional, flags);
+    await runPolicies(positional, flags, multiFlags);
     break;
 
   case 'mcps':
@@ -500,7 +566,7 @@ switch (command) {
     // is its picture of which checkpoints exist, and that lives on the server.
     // This is a no-op on a machine with an MCP client, which gets a fresh tool
     // list from the MCP handshake every session anyway.
-    const { refreshHostedInstructions } = await import('../src/init.js');
+    const { refreshHostedInstructions, reprovisionKeyConsumers } = await import('../src/init.js');
     const refresh = async () => {
       try {
         return await refreshHostedInstructions((loadConfig() || {}).apiKey);
@@ -531,7 +597,26 @@ switch (command) {
       }
       // Also refresh the npx cache so MCP servers (e.g. OpenClaw) pick up the new version
       try { execSync(`npx --yes troxy-cli@${latest} --version`, { stdio: 'pipe' }); } catch { /* non-fatal */ }
-      console.log(`✓\n\n  Updated to ${latest}. Restart your terminal and any MCP clients to use the new version.`);
+      console.log(`✓\n\n  Updated to ${latest}.`);
+
+      // Re-run the exact same client/hook provisioning `troxy init` does,
+      // using the key already saved on this machine - a version bump can
+      // change what gets registered (e.g. 1.21.0 added a PreToolUse hook
+      // alongside the existing Stop hook), and `update` silently leaving
+      // that unregistered meant the new version was installed but inert
+      // until someone thought to re-run `init` by hand. Best-effort: a
+      // failure here must not make `update` itself look like it failed when
+      // the actual package upgrade already succeeded.
+      const savedConfig = loadConfig();
+      if (savedConfig?.apiKey) {
+        try {
+          await reprovisionKeyConsumers(savedConfig.apiKey, savedConfig.agentName);
+        } catch (err) {
+          console.error(`\n  Could not refresh MCP client config: ${err.message}`);
+          console.error('  Run "troxy init --key <your-key>" by hand to finish updating.\n');
+        }
+      }
+      console.log('\n  Restart your terminal and any MCP clients to use the new version.');
       if (!await refresh()) console.log('');
     } catch (err) {
       const stderr = err.stderr?.toString() || err.message || '';
@@ -569,6 +654,7 @@ switch (command) {
     troxy init --key <api-key>     Connect this machine as an MCP + save key
     troxy init --key <api-key> --name "My Agent"   Same, no interactive prompt
                                     (for cloud/scripted agents that can't answer stdin)
+    troxy tools                    Scan for AI tools + set your subscription plans
     troxy restart                  Restart the MCP background service
     troxy uninstall                Remove Troxy from this machine
     troxy status                   API health + MCP status (no login needed)
@@ -590,17 +676,25 @@ switch (command) {
   Keys
     troxy rotate-key               Rotate MCP key (revokes old, saves new locally)
 
-  Policies
-    troxy policies list
+  Policies (all six checkpoints: payment, comms, access, destructive, model, secrets)
+    troxy policies list  /  list --org
     troxy policies describe --name "Block Amazon"
-    troxy policies create --describe "block Amazon purchases over $200"   (AI builder)
-    troxy policies create --name "X" --action BLOCK --field amount --operator gte --value 500
+    troxy policies templates                                    (browse the built-in library)
+    troxy policies fields --domain secrets                      (see what each checkpoint supports)
+    troxy policies create --describe "block Amazon purchases over $200"   (AI builder, payment/comms only)
+    troxy policies create --name "X" --template "Block a secret going somewhere public"
+    troxy policies create --name "X" --action BLOCK --domain payment --field amount --operator gte --value 500
+    troxy policies create --name "X" --action BLOCK --domain access --field login_action --operator eq --value signup
+    troxy policies create --name "X" --action BLOCK --domain comms --or "field=recipient_domain,operator=contains,value=gmail.com"
     troxy policies create --name "X" --action BLOCK --mcp "My Laptop,Server"   (scoped to specific MCPs)
     troxy policies create --name "X" --action ESCALATE --chat   (scoped to Troxy Chat only)
-    troxy policies set-priority --name "X" --priority 10
-    troxy policies pause  --name "X"
-    troxy policies resume --name "X"
-    troxy policies delete --name "X"
+    troxy policies create --name "X" --action BLOCK --domain secrets --field has_api_key --operator eq --value true --org
+    troxy policies test --domain payment --field amount --operator gt --value 100 --example '{"amount": 150}'
+    troxy policies set-priority --name "X" --priority 10  [--org]
+    troxy policies pause  --name "X"  [--org]
+    troxy policies resume --name "X"  [--org]
+    troxy policies delete --name "X"  [--org]
+    (--org needs admin access; run 'troxy policies create --help' for the full condition syntax)
 
   Approvals (ESCALATE holds)
     troxy approvals list
@@ -626,9 +720,14 @@ switch (command) {
     troxy activity [--limit 50] [--mine]
     troxy insights [--period 7]
 
-  Simulate
+  Simulate (test your policies against every checkpoint, not just payment)
     troxy pay --merchant "Amazon" --amount 50
     troxy pay --merchant "Google" --amount 300 --category software
+    troxy send --recipient jane@gmail.com --body "the password is hunter2"
+    troxy signin --site coinbase.com --type signup
+    troxy action --verb delete --resource "prod users table" --items 500
+    troxy model-call --model claude-opus-5 --provider anthropic --cost 4.50
+    troxy scan --content "AWS_SECRET_ACCESS_KEY=..." --destination public --do push
 `);
     process.exit(command ? 1 : 0);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "troxy-cli",
-  "version": "1.21.0",
-  "description": "Control layer for AI agents: check payments, emails, logins and destructive actions against your policies",
+  "version": "1.22.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": {
     "email": "support@troxy.io"
@@ -26,9 +26,12 @@
   "keywords": [
     "mcp",
     "ai",
-    "payments",
+    "agents",
     "policy",
-    "agents"
+    "guardrails",
+    "control-layer",
+    "payments",
+    "secrets"
   ],
   "license": "MIT"
 }

package/src/api.js

@@ -52,6 +52,17 @@ export const api = {
   createPolicy:  (jwt, b)    => request('POST',   '/dashboard/policies',        { jwt, body: b }),
   updatePolicy:  (jwt, id, b) => request('PATCH', `/dashboard/policies/${id}`,  { jwt, body: b }),
   deletePolicy:  (jwt, id)   => request('DELETE', `/dashboard/policies/${id}`,  { jwt }),
+  // Would-this-rule-fire, without saving it. Same evaluator the checkpoints
+  // use, so a condition that previews as firing is trusted, not guessed.
+  previewPolicy: (jwt, b)    => request('POST',   '/dashboard/policies/preview', { jwt, body: b }),
+
+  // Org (admin can write, any active member can read - see orgs.py's
+  // is_org_admin vs is_org_member split). org_id comes from currentOrg().
+  currentOrg:      (jwt)             => request('GET',    '/orgs/current',              { jwt }),
+  listOrgPolicies: (jwt, orgId)      => request('GET',    `/orgs/${orgId}/policies`,     { jwt }),
+  createOrgPolicy: (jwt, orgId, b)   => request('POST',   `/orgs/${orgId}/policies`,     { jwt, body: b }),
+  updateOrgPolicy: (jwt, orgId, id, b) => request('PATCH', `/orgs/${orgId}/policies/${id}`, { jwt, body: b }),
+  deleteOrgPolicy: (jwt, orgId, id)  => request('DELETE', `/orgs/${orgId}/policies/${id}`, { jwt }),
 
   // Activity + insights
   activity:   (jwt, limit) => request('GET', `/dashboard/activity?limit=${limit || 20}`, { jwt }),
@@ -94,6 +105,9 @@ export const api = {
   // Only the pair produces usable data. The estimate alone is the agent's own
   // guess, and Token Optimization says so on every agent that never reports.
   evaluateModel: (body, apiKey) => request('POST', '/evaluate/model', { apiKey, body }),
+  // Was missing entirely - every other checkpoint had a wrapper here, secrets
+  // did not, which is part of why nothing in the CLI could exercise it.
+  evaluateSecrets: (body, apiKey) => request('POST', '/evaluate/secrets', { apiKey, body }),
   reportModelUsage: (body, apiKey) => request('POST', '/evaluate/model/complete', { apiKey, body }),
   // Real, host-captured usage for a turn that already happened - not an
   // agent's self-report of what it thinks it used. Called only by the
@@ -119,6 +133,10 @@ export const api = {
   // MCP status (agent API key — no login needed)
   mcpStatus:  (apiKey) => request('GET', '/mcp/status', { apiKey }),
 
+  // AI tool inventory + subscription plans, self-reported by `troxy init` /
+  // `troxy tools`. Agent API key auth, same as the evaluate/heartbeat paths.
+  reportToolPlans: (apiKey, tools) => request('POST', '/agents/tool-plans', { apiKey, body: { tools } }),
+
   // Setup instructions for an agent with no MCP client to configure. Fetched
   // rather than hardcoded so a new checkpoint reaches agents without an npm
   // release — a cloud agent runs init once and never upgrades the package.