troxy-cli 1.22.0 → 1.24.0

package/README.md

@@ -50,8 +50,9 @@ npx troxy-cli <command>
 |---------|-------------|
 | `troxy init` | Connect an agent to Troxy — validates API key, sets agent name, patches MCP configs |
 | `troxy login` | Start a 12-hour CLI session (opens browser → copy code → paste into terminal) |
+| `troxy tools` | Scan for installed AI coding tools and set your subscription plan for each |
 | `troxy mcps` | List connected MCP agents and their status |
-| `troxy policies` | List and manage policies |
+| `troxy policies` | List every org/space policy that applies to you (creating one is admin-only) |
 | `troxy activity` | View recent transaction audit log |
 | `troxy insights` | Spending stats and decision breakdown |
 | `troxy status` | Show connection status and account overview |

package/bin/troxy.js

@@ -9,7 +9,6 @@ import { runPolicies }                 from '../src/policies.js';
 import { runMcps }                     from '../src/mcps.js';
 import { runActivity }                 from '../src/activity.js';
 import { runSettings }                 from '../src/settings.js';
-import { runChatBudget }               from '../src/chat-budget.js';
 import { runApprovals }                from '../src/approvals.js';
 import { runAccount }                  from '../src/account.js';
 import { runSecrets }                  from '../src/secrets.js';
@@ -369,10 +368,6 @@ switch (command) {
     await runSettings(positional, flags);
     break;
 
-  case 'chat-budget':
-    await runChatBudget(positional, flags);
-    break;
-
   case 'approvals':
     await runApprovals(positional, flags);
     break;
@@ -677,23 +672,25 @@ switch (command) {
     troxy rotate-key               Rotate MCP key (revokes old, saves new locally)
 
   Policies (all six checkpoints: payment, comms, access, destructive, model, secrets)
+  Admin-only: every write below requires --org. Personal and per-MCP policies
+  no longer exist - a policy is always org-wide or space-wide, and org acts as
+  a ceiling a space policy can never be looser than. list/describe/test need
+  no --org and show every org + space policy that applies to you.
     troxy policies list  /  list --org
     troxy policies describe --name "Block Amazon"
     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 create --describe "block Amazon purchases over $200" --org   (AI builder, payment/comms only)
+    troxy policies create --name "X" --template "Block a secret going somewhere public" --org
+    troxy policies create --name "X" --action BLOCK --domain payment --field amount --operator gte --value 500 --org
+    troxy policies create --name "X" --action BLOCK --domain access --field login_action --operator eq --value signup --org
+    troxy policies create --name "X" --action BLOCK --domain comms --or "field=recipient_domain,operator=contains,value=gmail.com" --org
     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]
+    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)
@@ -704,10 +701,8 @@ switch (command) {
   Settings
     troxy settings show
     troxy settings set --default-action BLOCK --approval-timeout 4
-    troxy chat-budget show
-    troxy chat-budget set --currency USD --limit 500
 
-  LLM keys (Troxy Chat)
+  LLM provider keys
     troxy secrets list
     troxy secrets set --name "OpenAI"
     troxy secrets delete --name "OpenAI"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "troxy-cli",
-  "version": "1.22.0",
+  "version": "1.24.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/api.js

@@ -78,7 +78,6 @@ export const api = {
   // Account settings
   getSettings:      (jwt)    => request('GET',   '/dashboard/settings',    { jwt }),
   updateSettings:   (jwt, b) => request('PATCH', '/dashboard/settings',    { jwt, body: b }),
-  updateChatBudget: (jwt, b) => request('PATCH', '/dashboard/chat-budget', { jwt, body: b }),
 
   // Approvals
   listApprovals:   (jwt)             => request('GET',  '/dashboard/approvals', { jwt }),

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()); }));
 }
@@ -564,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

@@ -81,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
@@ -330,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'],
@@ -574,17 +578,23 @@ export async function runMcp() {
       if (result.error) {
         return { content: [{ type: 'text', text: `Troxy error: ${result.error}` }], isError: true };
       }
-      const { decision, reason, audit_id, approval_token } = result;
+      const { decision, reason, audit_id, approval_token, suggested_model, suggestion_reason } = result;
       const what = `${args.model}${args.effort ? ` at ${args.effort} effort` : ''}`;
       // Every non-blocked branch repeats the audit_id and the instruction to
       // report back. Half the value of this checkpoint is the second call, and
       // an agent that is only told "approved" has no reason to make it.
       const followUp = ` When this turn finishes, call report_model_usage(audit_id="${audit_id}", actual_tokens=<real total>).`;
+      // Advisory only, dark-shipped per org - most orgs never see this field.
+      // Same "call again with the new id" pattern a BLOCK already teaches,
+      // just optional here: the call is still approved either way.
+      const suggestionText = suggested_model
+        ? ` Suggestion: ${suggestion_reason || `${suggested_model} would likely work just as well here.`} If you'd like to use it, call evaluate_model again with model="${suggested_model}" — no obligation, this run is already approved as-is.`
+        : '';
       let modelText;
       switch (decision) {
         case 'ALLOW':
         case 'NOTIFY':
-          modelText = `✓ Approved: ${what}.${reason ? ` ${reason}` : ''} You may run it.${followUp} (audit: ${audit_id})`;
+          modelText = `✓ Approved: ${what}.${reason ? ` ${reason}` : ''} You may run it.${followUp}${suggestionText} (audit: ${audit_id})`;
           break;
         case 'BLOCK':
           modelText = `✗ Blocked: ${what}.${reason ? ` ${reason}` : ''} Do not use this model for this task. Choose a cheaper or smaller model and call evaluate_model again with the new model id. (audit: ${audit_id})`;

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;
     }
 

package/src/policies.js

@@ -30,21 +30,21 @@ function _promptYN(question) {
 }
 
 const HELP = {
-  list: `  troxy policies list [--org]\n\n  Lists policies. --org lists your organization's policies (any member can read them) instead of your personal ones.\n`,
-  describe: `  troxy policies describe --name <policy-name> [--org]\n\n  Shows full details for a single policy.\n\n  Options:\n    --name   Name of the policy (use single quotes for names with special chars)\n    --org    Look up an org policy instead of a personal one\n`,
-  create: `  troxy policies create --name <name> --action <action> --domain <domain> [options]\n  troxy policies create --name <name> --action <action> --template "<template label>"\n  troxy policies create --describe "<plain English>"\n\n  Creates a new policy. Login required.\n\n  Checkpoints (--domain), one per Troxy checkpoint - what the policy is about:\n    payment       paying, buying, sending money            (/evaluate)\n    comms         messages on any channel (email, Slack...) (/evaluate/email)\n    access        logging in or signing up on a site        (/evaluate/login)\n    destructive   deletes, exports, permission/access changes, other consequential actions (/evaluate/action)\n    model         the agent's own model, tokens, cost       (/evaluate/model)\n    secrets       content scanned for secrets before it leaves (/evaluate/secrets)\n\n  Run 'troxy policies fields --domain <domain>' to see the exact fields and\n  operators each checkpoint supports - the same table the server checks\n  against, so nothing here can drift from what actually fires.\n\n  From a template (fastest, matches the dashboard's own template library):\n    --template "<label>"   Exact template label - run 'troxy policies templates' to list them\n    --value / --value2     Override the template's default threshold (only when it has exactly one condition)\n    --action                Override the template's default action\n\n  Manual, single condition:\n    --domain     Required whenever --field is given, unless --field is one of\n                 the original payment fields (amount, merchant_name, tx_per_day),\n                 which still default to --domain payment for old scripts.\n    --field      Field to match - see 'troxy policies fields --domain <domain>'\n    --operator   eq, neq, gt, gte, lt, lte, contains, starts_with, not_contains, between\n    --value      Comparison value\n    --value2     Upper bound for 'between'\n\n  Manual, multiple conditions:\n    --and "field=X,operator=Y,value=Z"   Repeatable. ANDs onto the single --field condition (if any).\n    --or  "field=X,operator=Y,value=Z"   Repeatable. Each becomes its own alternative branch (any\n                                         --and conditions apply to every branch); all branches share --action.\n\n  Raw (full expressiveness, for scripting):\n    --json '<JSON>'   {\"conditions\": [...], \"or_conditions\": [...]} exactly as the API expects.\n                       Cannot be combined with --field/--and/--or/--template.\n\n  AI builder (needs an org AI key; --domain payment or comms only - the other four\n  checkpoints aren't covered by this endpoint yet, use --template or a manual condition):\n    --describe "<text>"   Describe the policy in plain English and Troxy AI drafts it for you to confirm.\n    --domain              payment (default) or comms - which allowlist the AI drafts against.\n\n  Priority:\n    --priority <n>   Explicit priority number (default: auto, max+10). Lower = evaluated first.\n\n  Scope (personal policies only; default: all agents, every MCP plus Troxy Chat):\n    --mcp <name>   Scope to one or more MCPs (comma-separated). Run 'troxy mcps list' for names.\n    --chat         Include Troxy Chat. Implied by default; combine with --mcp for MCPs *and* chat.\n    --no-chat      Exclude Troxy Chat.\n\n  Org policies (applies to every member; requires admin):\n    --org   Create an org-wide policy instead of a personal one. No --mcp/--chat scoping - it's org-wide.\n\n  Examples:\n    troxy policies create --name "Block a secret going public" --template "Block a secret going somewhere public"\n    troxy policies create --name "Cap over 100" --action BLOCK --domain payment --field amount --operator gt --value 100\n    troxy policies create --name "Signups" --action ESCALATE --domain access --field login_action --operator eq --value signup\n    troxy policies create --name "Big exports" --action BLOCK --domain destructive --field action_verb --operator eq --value export --and "field=resource,operator=contains,value=customer"\n    troxy policies create --name "Personal domains" --action BLOCK --domain comms --or "field=recipient_domain,operator=contains,value=gmail.com" --or "field=recipient_domain,operator=contains,value=yahoo.com"\n    troxy policies create --name "Lock down secrets" --action BLOCK --domain secrets --field has_api_key --operator eq --value true --org\n`,
+  list: `  troxy policies list [--org]\n\n  Lists every org and space policy currently in force for you. --org narrows this to just your organization's policies (any member can read them, admin-authored).\n`,
+  describe: `  troxy policies describe --name <policy-name> [--org]\n\n  Shows full details for a single policy.\n\n  Options:\n    --name   Name of the policy (use single quotes for names with special chars)\n    --org    Look up an org policy specifically, instead of the combined org+space view\n`,
+  create: `  troxy policies create --name <name> --action <action> --domain <domain> [options]\n  troxy policies create --name <name> --action <action> --template "<template label>"\n  troxy policies create --describe "<plain English>"\n\n  Creates a new policy. Login required. Policy creation is admin-only and\n  always org-wide - pass --org (admin access required). Personal-scope and\n  per-MCP policies no longer exist; space-scoped creation isn't available\n  from the CLI yet, use the dashboard for that.\n\n  Checkpoints (--domain), one per Troxy checkpoint - what the policy is about:\n    payment       paying, buying, sending money            (/evaluate)\n    comms         messages on any channel (email, Slack...) (/evaluate/email)\n    access        logging in or signing up on a site        (/evaluate/login)\n    destructive   deletes, exports, permission/access changes, other consequential actions (/evaluate/action)\n    model         the agent's own model, tokens, cost       (/evaluate/model)\n    secrets       content scanned for secrets before it leaves (/evaluate/secrets)\n\n  Run 'troxy policies fields --domain <domain>' to see the exact fields and\n  operators each checkpoint supports - the same table the server checks\n  against, so nothing here can drift from what actually fires.\n\n  From a template (fastest, matches the dashboard's own template library):\n    --template "<label>"   Exact template label - run 'troxy policies templates' to list them\n    --value / --value2     Override the template's default threshold (only when it has exactly one condition)\n    --action                Override the template's default action\n\n  Manual, single condition:\n    --domain     Required whenever --field is given, unless --field is one of\n                 the original payment fields (amount, merchant_name, tx_per_day),\n                 which still default to --domain payment for old scripts.\n    --field      Field to match - see 'troxy policies fields --domain <domain>'\n    --operator   eq, neq, gt, gte, lt, lte, contains, starts_with, not_contains, between\n    --value      Comparison value\n    --value2     Upper bound for 'between'\n\n  Manual, multiple conditions:\n    --and "field=X,operator=Y,value=Z"   Repeatable. ANDs onto the single --field condition (if any).\n    --or  "field=X,operator=Y,value=Z"   Repeatable. Each becomes its own alternative branch (any\n                                         --and conditions apply to every branch); all branches share --action.\n\n  Raw (full expressiveness, for scripting):\n    --json '<JSON>'   {\"conditions\": [...], \"or_conditions\": [...]} exactly as the API expects.\n                       Cannot be combined with --field/--and/--or/--template.\n\n  AI builder (org AI key, admin required; --domain payment or comms only - the other four\n  checkpoints aren't covered by this endpoint yet, use --template or a manual condition):\n    --describe "<text>"   Describe the policy in plain English and Troxy AI drafts it for you to confirm.\n    --domain              payment (default) or comms - which allowlist the AI drafts against.\n\n  Priority:\n    --priority <n>   Explicit priority number (default: auto, max+10). Lower = evaluated first.\n\n  Org (required; applies to every member):\n    --org   Admin access required. Every policy created from the CLI is org-wide.\n\n  Examples:\n    troxy policies create --name "Block a secret going public" --template "Block a secret going somewhere public" --org\n    troxy policies create --name "Cap over 100" --action BLOCK --domain payment --field amount --operator gt --value 100 --org\n    troxy policies create --name "Signups" --action ESCALATE --domain access --field login_action --operator eq --value signup --org\n    troxy policies create --name "Big exports" --action BLOCK --domain destructive --field action_verb --operator eq --value export --and "field=resource,operator=contains,value=customer" --org\n    troxy policies create --name "Personal domains" --action BLOCK --domain comms --or "field=recipient_domain,operator=contains,value=gmail.com" --or "field=recipient_domain,operator=contains,value=yahoo.com" --org\n    troxy policies create --name "Lock down secrets" --action BLOCK --domain secrets --field has_api_key --operator eq --value true --org\n`,
   fields: `  troxy policies fields [--domain <domain>]\n\n  Lists the fields, operators and allowed values each checkpoint actually supports -\n  the same table the server validates against, so this can never offer something\n  that saves and then never fires. Omit --domain to see all six.\n`,
   templates: `  troxy policies templates [--category "<name>"] [--search "<text>"]\n\n  Lists the built-in policy templates (the same ones on the dashboard's\n  Policies page). Use a template's exact label with 'policies create --template'.\n`,
   test: `  troxy policies test --domain <domain> --example '<JSON>' [condition flags]\n\n  Dry-runs a condition against an example event - the same "would this rule\n  fire?" check the dashboard's policy drawer offers, without saving anything.\n  Nothing is written: no audit row, no notification, no pending approval.\n\n  Takes the same condition flags as 'create' (--field/--operator/--value/--and/--or/--json/--template),\n  plus:\n    --example '<JSON>'   The event to test against, shaped like what that checkpoint receives.\n                          e.g. --domain payment --example '{\"amount\": 150}'\n\n  Examples:\n    troxy policies test --domain payment --field amount --operator gt --value 100 --example '{"amount": 150}'\n    troxy policies test --domain secrets --field has_api_key --operator eq --value true --example '{"has_api_key": true}'\n`,
-  'set-priority': `  troxy policies set-priority --name <policy-name> --priority <n> [--org]\n\n  Changes the priority of a policy. Lower number = higher priority (evaluated first).\n\n  Options:\n    --name       Name of the policy\n    --priority   New priority number (e.g. 10, 20, 50)\n    --org        Target an org policy (requires admin)\n\n  Example:\n    troxy policies set-priority --name "Block Wiki" --priority 5\n`,
-  resume: `  troxy policies resume --name <policy-name> [--org]\n\n  Resumes a paused policy.\n\n  Options:\n    --name   Name of the policy to resume\n    --org    Target an org policy (requires admin)\n`,
-  pause: `  troxy policies pause --name <policy-name> [--org]\n\n  Pauses a policy without deleting it. The policy stops firing until you resume it.\n\n  Options:\n    --name   Name of the policy to pause\n    --org    Target an org policy (requires admin)\n`,
-  delete: `  troxy policies delete --name <policy-name> [--org]\n\n  Permanently deletes a policy.\n\n  Options:\n    --name   Name of the policy to delete\n    --org    Target an org policy (requires admin)\n`,
+  'set-priority': `  troxy policies set-priority --name <policy-name> --org --priority <n>\n\n  Changes the priority of a policy. Lower number = higher priority (evaluated first).\n\n  Options:\n    --name       Name of the policy\n    --priority   New priority number (e.g. 10, 20, 50)\n    --org        Required. Target the org policy (admin access required; personal-scope policies no longer exist)\n\n  Example:\n    troxy policies set-priority --name "Block Wiki" --priority 5 --org\n`,
+  resume: `  troxy policies resume --name <policy-name> --org\n\n  Resumes a paused policy.\n\n  Options:\n    --name   Name of the policy to resume\n    --org    Required. Target the org policy (admin access required; personal-scope policies no longer exist)\n`,
+  pause: `  troxy policies pause --name <policy-name> --org\n\n  Pauses a policy without deleting it. The policy stops firing until you resume it.\n\n  Options:\n    --name   Name of the policy to pause\n    --org    Required. Target the org policy (admin access required; personal-scope policies no longer exist)\n`,
+  delete: `  troxy policies delete --name <policy-name> --org\n\n  Permanently deletes a policy.\n\n  Options:\n    --name   Name of the policy to delete\n    --org    Required. Target the org policy (admin access required; personal-scope policies no longer exist)\n`,
 };
 
 export async function runPolicies([sub, ...args], flags, multiFlags = {}) {
   if (flags.help || flags.h) {
-    console.log('\n' + (HELP[sub] || `  troxy policies <subcommand> [options]\n\n  Subcommands:\n    list           List all policies\n    describe       Show details for a policy\n    create         Create a new policy\n    templates      List the built-in templates\n    fields         List the fields/operators each checkpoint supports\n    test           Dry-run a condition without saving it\n    set-priority   Change a policy's priority\n    pause          Pause a policy (it stops firing until you resume it)\n    resume         Resume a paused policy\n    delete         Delete a policy\n\n  Any personal-policy subcommand also takes --org, to act on your organization's policies instead (admin required to write).\n\n  Run 'troxy policies <subcommand> --help' for subcommand help.\n`));
+    console.log('\n' + (HELP[sub] || `  troxy policies <subcommand> [options]\n\n  Subcommands:\n    list           List all policies\n    describe       Show details for a policy\n    create         Create a new policy\n    templates      List the built-in templates\n    fields         List the fields/operators each checkpoint supports\n    test           Dry-run a condition without saving it\n    set-priority   Change a policy's priority\n    pause          Pause a policy (it stops firing until you resume it)\n    resume         Resume a paused policy\n    delete         Delete a policy\n\n  Policies are admin-created and always org- or space-scoped - personal policies\n  no longer exist. create/set-priority/pause/resume/delete all require --org\n  (admin access). list/describe/test need no --org and show every org + space\n  policy that applies to you.\n\n  Run 'troxy policies <subcommand> --help' for subcommand help.\n`));
     process.exit(0);
   }
 
@@ -113,7 +113,6 @@ export async function runPolicies([sub, ...args], flags, multiFlags = {}) {
         const p = (data?.policies || []).find(x => x.name.toLowerCase() === name.toLowerCase());
         if (!p) { console.error(`  Policy "${name}" not found\n`); process.exit(1); }
 
-        const mcpList = p.mcps.length ? p.mcps.map(m => m.name).join(', ') : (p.global ? 'all MCPs' : 'none');
         console.log(`
   Name:          ${p.name}
   Action:        ${_displayAction(p)}
@@ -121,8 +120,6 @@ export async function runPolicies([sub, ...args], flags, multiFlags = {}) {
   Status:        ${p.enabled ? 'active' : 'paused'}
   Scope:         ${p.scope}
   Applies here:  ${p.applies_to_me ? 'yes' : 'no'}
-  MCPs:          ${mcpList}
-  Troxy Chat:    ${p.applies_to_chat ? 'yes' : 'no'}
   Conditions:    ${_condDetail(p)}
   Created:       ${new Date(p.created_at).toLocaleDateString()}
 `);
@@ -162,8 +159,20 @@ export async function runPolicies([sub, ...args], flags, multiFlags = {}) {
 
   switch (sub) {
     case 'create': {
+      // Personal-scope and per-MCP policy creation were eliminated (product
+      // decision, 2026-08-20): POST /dashboard/policies no longer exists on
+      // the server at all (falls through to a bare 404), so every policy the
+      // CLI creates now has to go through /orgs/:id/policies instead. --org
+      // is required up front, before touching --describe/--template/manual
+      // condition parsing, so a user who forgets it gets this clear message
+      // instead of the server's generic "not found".
+      if (!flags.org) {
+        console.error('\n  Personal policies no longer exist - policy creation is admin-only and always org-wide.');
+        console.error('  Pass --org (admin access required). Space-scoped creation isn\'t available from the CLI yet - use the dashboard for that.\n');
+        process.exit(1);
+      }
+
       if (flags.describe) {
-        if (flags.org) { console.error('\n  --describe (AI builder) does not support --org yet. Build the policy manually or apply a template.\n'); process.exit(1); }
         // handle_ai_policy (the backend endpoint this hits) only knows two field
         // allowlists, gated on a single is_email boolean - unlike the six-domain
         // condition translator create's other paths use. Nothing here used to
@@ -175,31 +184,23 @@ export async function runPolicies([sub, ...args], flags, multiFlags = {}) {
           console.error(`\n  --describe only supports --domain payment or comms (the AI builder does not cover the other checkpoints yet - try --template or build the condition manually instead).\n`);
           process.exit(1);
         }
+        const org = await _resolveOrgContext(jwt, true);
         process.stdout.write('\n  Asking Troxy AI to build this policy... ');
-        const { tokens = [] } = await api.listTokens(jwt);
-        const mcps = tokens.map(t => ({ id: t.id, name: t.name || t.agent_name || t.prefix }));
-        const draft = await api.aiPolicy(jwt, { text: flags.describe, mcps, is_email: describeDomain === 'comms' });
+        const draft = await api.aiPolicy(jwt, { text: flags.describe, is_email: describeDomain === 'comms' });
         if (draft.error) { console.log('✗'); console.error(`\n  ${draft.error}\n`); process.exit(1); }
         console.log('✓\n');
         console.log(`  Name:       ${draft.name}`);
         console.log(`  Action:     ${draft.action}`);
         if (draft.conditions?.length)    console.log(`  Conditions: ${_condDetail(draft)}`);
-        if (draft.mcp_ids?.length)       console.log(`  Scope:      ${draft.mcp_ids.length} MCP(s)`);
         if (draft.warnings?.length)      console.log(`  Warnings:   ${draft.warnings.join('; ')}`);
         if (draft.note)                  console.log(`  Note:       ${draft.note}`);
         const ok = await _promptYN('\n  Create this policy? (y/N): ');
         if (!ok) { console.log('\n  Cancelled.\n'); process.exit(0); }
-        const body = {
-          name: draft.name, action: draft.action,
-          conditions: draft.conditions || [], or_conditions: draft.or_conditions || [],
-          enabled: true,
-          global: !(draft.mcp_ids && draft.mcp_ids.length),
-          mcp_ids: draft.mcp_ids || [],
-          applies_to_chat: true,
-          source: 'ai',
-        };
-        const policy = await api.createPolicy(jwt, body);
-        console.log(`\n  Policy "${policy.name}" created ✓  (priority: ${policy.priority})\n`);
+        const name = draft.name, action = draft.action, domain = describeDomain,
+              conditions = draft.conditions || [], or_conditions = draft.or_conditions || [];
+        const body = { name, action, domain, conditions, or_conditions };
+        const policy = await api.createOrgPolicy(jwt, org.id, body);
+        console.log(`\n  Org policy "${policy.name}" created ✓  (priority: ${policy.priority}, applies to every member of ${org.name})\n`);
         break;
       }
 
@@ -208,72 +209,13 @@ export async function runPolicies([sub, ...args], flags, multiFlags = {}) {
 
       const { domain, action, conditions, or_conditions } = _buildConditionsFromFlags(flags, multiFlags, { requireAction: true });
 
-      if (flags.org) {
-        const org = await _resolveOrgContext(jwt, true);
-        const priority = flags.priority != null ? parseInt(flags.priority, 10) : undefined;
-        if (flags.priority != null && isNaN(priority)) { console.error('  --priority must be a number\n'); process.exit(1); }
-        const body = { name, action, domain, conditions, or_conditions, enabled: true };
-        if (priority != null) body.priority = priority;
-        const policy = await api.createOrgPolicy(jwt, org.id, body);
-        console.log(`\n  Org policy "${policy.name}" created ✓  (priority: ${policy.priority}, applies to every member of ${org.name})\n`);
-        break;
-      }
-
-      if (flags.chat && flags['no-chat']) {
-        console.error('  --chat and --no-chat cannot both be set\n'); process.exit(1);
-      }
-
-      // --mcp "name" or "name1,name2": scope policy to specific MCPs instead of all.
-      // --chat / --no-chat: include or exclude Troxy Chat (default: included).
-      let isGlobal = true;
-      let mcpIds = [];
-      let mcpNames = [];
-      if (flags.mcp) {
-        const { tokens = [] } = await api.listTokens(jwt);
-        const requested = String(flags.mcp).split(',').map(s => s.trim()).filter(Boolean);
-        for (const raw of requested) {
-          const needle = raw.toLowerCase();
-          const match = tokens.find(t =>
-            (t.name  && t.name.toLowerCase()  === needle) ||
-            (t.agent_name && t.agent_name.toLowerCase() === needle) ||
-            (t.prefix && t.prefix.toLowerCase().startsWith(needle))
-          );
-          if (!match) {
-            console.error(`\n  MCP "${raw}" not found. Run: troxy mcps list\n`);
-            process.exit(1);
-          }
-          mcpIds.push(match.id);
-          mcpNames.push(match.name || match.agent_name || match.prefix);
-        }
-        isGlobal = false;
-        console.log(`\n  Scoping to MCP${mcpNames.length > 1 ? 's' : ''}: ${mcpNames.join(', ')}`);
-      } else if (flags.chat) {
-        // --chat with no --mcp: scope to Troxy Chat only, no MCPs
-        isGlobal = false;
-      }
-
-      const appliesToChat = flags['no-chat'] ? false : true;
-
-      if (!isGlobal && mcpIds.length === 0 && !appliesToChat) {
-        console.error('  Nothing to scope to, pass --mcp, --chat, or drop --no-chat\n'); process.exit(1);
-      }
-
+      const org = await _resolveOrgContext(jwt, true);
       const priority = flags.priority != null ? parseInt(flags.priority, 10) : undefined;
-      if (flags.priority != null && isNaN(priority)) {
-        console.error('  --priority must be a number\n'); process.exit(1);
-      }
-      const body = { name, action, domain, conditions, or_conditions, enabled: true, global: isGlobal, mcp_ids: mcpIds, applies_to_chat: appliesToChat };
+      if (flags.priority != null && isNaN(priority)) { console.error('  --priority must be a number\n'); process.exit(1); }
+      const body = { name, action, domain, conditions, or_conditions, enabled: true };
       if (priority != null) body.priority = priority;
-      const policy = await api.createPolicy(jwt, body);
-      let scope;
-      if (isGlobal) {
-        scope = appliesToChat ? 'all agents' : 'all MCPs';
-      } else {
-        const parts = mcpNames.slice();
-        if (appliesToChat) parts.push('Troxy Chat');
-        scope = parts.length ? parts.join(', ') : 'no agents';
-      }
-      console.log(`\n  Policy "${policy.name}" created ✓  (priority: ${policy.priority}, checkpoint: ${domain}, scope: ${scope})\n`);
+      const policy = await api.createOrgPolicy(jwt, org.id, body);
+      console.log(`\n  Org policy "${policy.name}" created ✓  (priority: ${policy.priority}, checkpoint: ${domain}, applies to every member of ${org.name})\n`);
       break;
     }
 

package/src/secrets.js

@@ -4,7 +4,7 @@ import { requireJwt }  from './auth.js';
 import { table }       from './print.js';
 
 const HELP = {
-  list:   `  troxy secrets list\n\n  Lists your saved LLM provider keys (used by Troxy Chat). Values are\n  never shown, only a masked preview.\n`,
+  list:   `  troxy secrets list\n\n  Lists your saved LLM provider keys. Values are\n  never shown, only a masked preview.\n`,
   set:    `  troxy secrets set --name <name> [--type api_key|text]\n\n  Saves or updates an LLM provider key. You'll be prompted for the value\n  so it never appears in your shell history. Login required.\n\n  Options:\n    --name    Label for this key (e.g. "OpenAI", "Anthropic")\n    --type    api_key (default) or text\n\n  Card secrets are dashboard-only; troxy secrets does not handle them.\n\n  Example:\n    troxy secrets set --name "OpenAI"\n`,
   delete: `  troxy secrets delete --name <name>\n\n  Deletes a saved key. Login required.\n`,
 };

package/src/settings.js

@@ -30,9 +30,6 @@ export async function runSettings([sub, ...args], flags) {
     On notify:         ${s.notify_prefs.email_on_notify ? 'yes' : 'no'}
     On allow:          ${s.notify_prefs.email_on_allow ? 'yes' : 'no'}
     Notify email:      ${s.notify_prefs.notify_email || '(account email)'}
-
-  Chat budget action:  ${s.chat_budget_action}
-  Chat budget limits:  ${s.chat_budget_limits.length ? s.chat_budget_limits.map(b => `${b.currency} ${b.used}/${b.limit}`).join(', ') : 'none set, run troxy chat-budget'}
 `);
       break;
     }

package/src/tests/tool_detect.test.js

@@ -0,0 +1,389 @@
+// tool_detect.js: the AI-tool inventory scan + subscription-plan self-report
+// wired into `troxy init` (after reprovisionKeyConsumers) and standalone
+// `troxy tools`. A single machine can have more than one of these six tools
+// installed at once, and each is tracked independently - never assume "one
+// AI tool per user" (that's the whole reason detectAiTools() returns an
+// array, not a single match).
+//
+// Path-based detection (cursor/github_copilot/windsurf/continue) runs
+// against a real temp HOME, the same technique config.test.js and
+// hook-report.test.js already use - this suite has no fs/execSync mocking
+// anywhere, and a real temp dir is simpler than reimplementing
+// fs.existsSync's contract. claude_code/aider are execSync('<bin>
+// --version') probes; asserting a specific installed/not-installed result
+// for those would depend on whatever machine happens to run the suite (CI
+// vs. a dev box with the CLI on PATH), so those are covered by testing the
+// binExists() mechanism itself with synthetic commands, plus source
+// inspection confirming the real TOOLS entries use it (and, for
+// claude_code, reuse init.js's own hasClaudeCode() rather than
+// reimplementing the probe).
+import { describe, it, before, beforeEach, after, afterEach } from 'node:test';
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname, join } from 'node:path';
+
+// tool_detect.js reads os.homedir() once at module load time (`const home =
+// os.homedir()`), so HOME must point at an isolated temp dir *before* the
+// first import - exactly the trick config.test.js uses to keep tests off
+// the real ~/.troxy (and, here, off the real ~/.cursor, ~/.continue, etc.).
+const TMP = fs.mkdtempSync(path.join(os.tmpdir(), 'troxy-tool-detect-test-'));
+process.env.HOME = TMP;
+process.env.APPDATA = path.join(TMP, 'AppData/Roaming');
+process.env.LOCALAPPDATA = path.join(TMP, 'AppData/Local');
+
+const {
+  detectAiTools,
+  promptForToolPlans,
+  silentToolReport,
+  reportToolPlans,
+  runToolDetection,
+  binExists,
+  TOOLS,
+} = await import('../tool_detect.js');
+const { api } = await import('../api.js');
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const toolDetectSrc = readFileSync(join(__dirname, '..', 'tool_detect.js'), 'utf8');
+
+after(() => fs.rmSync(TMP, { recursive: true, force: true }));
+
+describe('TOOLS registry', () => {
+  it('has exactly the 6 documented tools, in slug form', () => {
+    assert.deepEqual(
+      TOOLS.map(t => t.slug),
+      ['claude_code', 'cursor', 'github_copilot', 'windsurf', 'continue', 'aider'],
+    );
+  });
+
+  // Keep in sync with the backend registry (tool_plans.py TOOL_PLANS) - the
+  // backend validates against its own copy of these slugs, so a slug typo
+  // here would silently fail every report for that tool.
+  const EXPECTED_PLAN_SLUGS = {
+    claude_code:     ['free', 'pro', 'max_5x', 'max_20x', 'api', 'not_sure'],
+    cursor:          ['hobby', 'pro', 'business', 'not_sure'],
+    github_copilot:  ['individual', 'business', 'enterprise', 'not_sure'],
+    windsurf:        ['free', 'pro', 'not_sure'],
+    continue:        ['free', 'pro', 'not_sure'],
+    aider:           ['free', 'pro', 'not_sure'],
+  };
+
+  for (const [slug, expected] of Object.entries(EXPECTED_PLAN_SLUGS)) {
+    it(`${slug} offers exactly the plan slugs the backend registry expects`, () => {
+      const tool = TOOLS.find(t => t.slug === slug);
+      assert.ok(tool, `${slug} missing from TOOLS`);
+      assert.deepEqual(tool.plans.map(p => p.slug), expected);
+    });
+  }
+});
+
+describe('binExists (the mechanism behind claude_code/aider detection)', () => {
+  it('returns true when the command succeeds', () => {
+    assert.equal(binExists('true'), true);
+  });
+
+  it('returns false when the command exits non-zero, without throwing', () => {
+    assert.equal(binExists('false'), false);
+  });
+
+  it('returns false for a binary that does not exist at all', () => {
+    assert.equal(binExists('this-command-almost-certainly-does-not-exist-xyz123 --version'), false);
+  });
+});
+
+describe('claude_code / aider detection wiring', () => {
+  it('claude_code reuses init.js\'s hasClaudeCode() rather than reimplementing the probe', () => {
+    assert.ok(
+      toolDetectSrc.includes("import { prompt, hasClaudeCode } from './init.js'"),
+      'tool_detect.js must import hasClaudeCode from init.js, not redeclare its own execSync probe',
+    );
+    const claudeBlock = toolDetectSrc.slice(
+      toolDetectSrc.indexOf("slug: 'claude_code'"),
+      toolDetectSrc.indexOf("slug: 'cursor'"),
+    );
+    assert.match(claudeBlock, /detect:\s*\(\)\s*=>\s*hasClaudeCode\(\)/);
+  });
+
+  it('aider probes "aider --version" via binExists', () => {
+    const aiderBlock = toolDetectSrc.slice(toolDetectSrc.indexOf("slug: 'aider'"));
+    assert.match(aiderBlock, /detect:\s*\(\)\s*=>\s*binExists\('aider --version'\)/);
+  });
+});
+
+describe('detectAiTools - path-based markers (cursor / github_copilot / windsurf / continue)', () => {
+  function reset() {
+    fs.rmSync(TMP, { recursive: true, force: true });
+    fs.mkdirSync(TMP, { recursive: true });
+  }
+  beforeEach(reset);
+  after(reset);
+
+  it('reports none of the path-based tools installed against a clean home dir', () => {
+    const detected = detectAiTools();
+    for (const slug of ['cursor', 'github_copilot', 'windsurf', 'continue']) {
+      assert.equal(detected.find(d => d.slug === slug).installed, false, `${slug} should not be detected against an empty home dir`);
+    }
+  });
+
+  it("detects Cursor from its own app-support dir (~/Library/Application Support/Cursor)", () => {
+    fs.mkdirSync(path.join(TMP, 'Library/Application Support/Cursor'), { recursive: true });
+    assert.equal(detectAiTools().find(d => d.slug === 'cursor').installed, true);
+  });
+
+  it('does NOT treat a troxy-created .cursor/mcp.json as evidence Cursor is installed', () => {
+    fs.mkdirSync(path.join(TMP, '.cursor'), { recursive: true });
+    fs.writeFileSync(path.join(TMP, '.cursor/mcp.json'), '{}');
+    assert.equal(
+      detectAiTools().find(d => d.slug === 'cursor').installed,
+      false,
+      'the MCP config troxy init itself creates must never look like Cursor being installed',
+    );
+  });
+
+  it('detects GitHub Copilot from ~/.config/github-copilot/hosts.json', () => {
+    fs.mkdirSync(path.join(TMP, '.config/github-copilot'), { recursive: true });
+    fs.writeFileSync(path.join(TMP, '.config/github-copilot/hosts.json'), '{}');
+    assert.equal(detectAiTools().find(d => d.slug === 'github_copilot').installed, true);
+  });
+
+  it('detects Windsurf from ~/.codeium/windsurf/, not the mcp_config.json troxy might create inside it', () => {
+    fs.mkdirSync(path.join(TMP, '.codeium/windsurf'), { recursive: true });
+    assert.equal(detectAiTools().find(d => d.slug === 'windsurf').installed, true);
+
+    // The MCP-specific file alone (same troxy-created-file risk as cursor)
+    // must not be required, but also must not be the thing being matched -
+    // the base dir is. Deleting it, base dir intact, should stay detected.
+    fs.rmSync(path.join(TMP, '.codeium/windsurf'), { recursive: true, force: true });
+    fs.mkdirSync(path.join(TMP, '.codeium/windsurf'), { recursive: true });
+    fs.writeFileSync(path.join(TMP, '.codeium/windsurf/mcp_config.json'), '{}');
+    assert.equal(detectAiTools().find(d => d.slug === 'windsurf').installed, true);
+  });
+
+  it('detects Continue from ~/.continue/', () => {
+    fs.mkdirSync(path.join(TMP, '.continue'), { recursive: true });
+    assert.equal(detectAiTools().find(d => d.slug === 'continue').installed, true);
+  });
+
+  it('a machine with several tools installed reports every one independently - never just the first match', () => {
+    fs.mkdirSync(path.join(TMP, 'Library/Application Support/Cursor'), { recursive: true });
+    fs.mkdirSync(path.join(TMP, '.continue'), { recursive: true });
+    const detected = detectAiTools();
+    assert.equal(detected.find(d => d.slug === 'cursor').installed, true);
+    assert.equal(detected.find(d => d.slug === 'continue').installed, true);
+    assert.equal(detected.find(d => d.slug === 'github_copilot').installed, false);
+    assert.equal(detected.find(d => d.slug === 'windsurf').installed, false);
+  });
+});
+
+describe('silentToolReport (non-interactive fallback shape)', () => {
+  it('reports every installed tool as not_sure with no cycle_day, and skips tools that are not installed', () => {
+    const detected = [
+      { slug: 'claude_code', name: 'Claude Code', installed: true },
+      { slug: 'cursor',      name: 'Cursor',      installed: false },
+      { slug: 'aider',       name: 'Aider',       installed: true },
+    ];
+    assert.deepEqual(silentToolReport(detected), [
+      { slug: 'claude_code', installed: true, plan: 'not_sure', cycle_day: null },
+      { slug: 'aider',       installed: true, plan: 'not_sure', cycle_day: null },
+    ]);
+  });
+
+  it('returns an empty array when nothing is installed', () => {
+    assert.deepEqual(silentToolReport([{ slug: 'cursor', name: 'Cursor', installed: false }]), []);
+  });
+});
+
+describe('runToolDetection - non-interactive guard (a scripted/CI init must never hang on stdin)', () => {
+  let calls;
+  let originalReportToolPlans;
+  let originalIsTTY;
+
+  before(() => {
+    // A deterministic installed tool, independent of whether claude/aider
+    // binaries happen to be on PATH wherever this suite runs - the whole
+    // point of driving detection through the temp-HOME path markers rather
+    // than asserting on the real machine's execSync probes.
+    fs.mkdirSync(path.join(TMP, '.continue'), { recursive: true });
+  });
+  after(() => fs.rmSync(path.join(TMP, '.continue'), { recursive: true, force: true }));
+
+  beforeEach(() => {
+    calls = [];
+    originalReportToolPlans = api.reportToolPlans;
+    api.reportToolPlans = async (apiKey, tools) => { calls.push({ apiKey, tools }); return {}; };
+    originalIsTTY = process.stdin.isTTY;
+  });
+  afterEach(() => {
+    api.reportToolPlans = originalReportToolPlans;
+    process.stdin.isTTY = originalIsTTY;
+  });
+
+  it('skips the interactive prompt and reports every detected tool as not_sure when stdin is not a TTY', async () => {
+    process.stdin.isTTY = false;
+    await runToolDetection('txy-test-key', { interactive: true });
+
+    assert.equal(calls.length, 1, 'reportToolPlans must be called exactly once when at least one tool is installed');
+    assert.equal(calls[0].apiKey, 'txy-test-key');
+    const tools = calls[0].tools;
+    const cont = tools.find(t => t.slug === 'continue');
+    assert.ok(cont, 'the tool detected via the temp-HOME marker must be in the reported set');
+    for (const t of tools) {
+      assert.equal(t.installed, true);
+      assert.equal(t.plan, 'not_sure');
+      assert.equal(t.cycle_day, null);
+    }
+  });
+
+  it('returns promptly rather than blocking on stdin when stdin is not a TTY', async () => {
+    process.stdin.isTTY = false;
+    const start = Date.now();
+    await runToolDetection('txy-test-key', { interactive: true });
+    assert.ok(Date.now() - start < 2000, 'runToolDetection must not block waiting on a readline question nothing will ever answer');
+  });
+
+  it('runToolDetection only takes the interactive path when both interactive AND stdin.isTTY are true', () => {
+    assert.ok(
+      toolDetectSrc.includes('(interactive && process.stdin.isTTY)'),
+      'the non-interactive guard must check both interactive and process.stdin.isTTY, not just one',
+    );
+  });
+});
+
+describe("promptForToolPlans - returns immediately when nothing is installed (no prompt call, no stdin needed)", () => {
+  it('resolves to [] without touching stdin', async () => {
+    const result = await promptForToolPlans([{ slug: 'cursor', name: 'Cursor', installed: false }]);
+    assert.deepEqual(result, []);
+  });
+});
+
+describe('promptForToolPlans numbered-choice parsing (mirrors the real logic in tool_detect.js)', () => {
+  // Mirrors the parsing inside promptForToolPlans's loop: a numbered-menu
+  // answer maps 1-based to the plan array; anything out of range - blank,
+  // 0, a too-large number, non-numeric junk - degrades to 'not_sure' rather
+  // than re-prompting, so a stray keystroke can never hang setup. The last
+  // test in each block below source-checks that the real implementation
+  // still contains this exact logic, so the two can't silently drift apart.
+  function resolvePlanChoice(ans, plans) {
+    const idx = parseInt(ans, 10) - 1;
+    return (idx >= 0 && idx < plans.length) ? plans[idx].slug : 'not_sure';
+  }
+
+  const cursorPlans = TOOLS.find(t => t.slug === 'cursor').plans; // hobby, pro, business, not_sure
+
+  it('maps a valid 1-based numbered choice to the matching plan slug', () => {
+    assert.equal(resolvePlanChoice('1', cursorPlans), 'hobby');
+    assert.equal(resolvePlanChoice('2', cursorPlans), 'pro');
+    assert.equal(resolvePlanChoice('3', cursorPlans), 'business');
+    assert.equal(resolvePlanChoice('4', cursorPlans), 'not_sure');
+  });
+
+  it('defaults to not_sure on a blank answer (Enter to skip)', () => {
+    assert.equal(resolvePlanChoice('', cursorPlans), 'not_sure');
+  });
+
+  it('defaults to not_sure on an out-of-range or non-numeric answer, rather than throwing', () => {
+    assert.equal(resolvePlanChoice('99', cursorPlans), 'not_sure');
+    assert.equal(resolvePlanChoice('0', cursorPlans), 'not_sure');
+    assert.equal(resolvePlanChoice('-1', cursorPlans), 'not_sure');
+    assert.equal(resolvePlanChoice('banana', cursorPlans), 'not_sure');
+  });
+
+  it('the real implementation uses this exact idx = parseInt(ans, 10) - 1 mapping', () => {
+    assert.ok(toolDetectSrc.includes('const idx = parseInt(ans, 10) - 1;'));
+    assert.ok(toolDetectSrc.includes("(idx >= 0 && idx < tool.plans.length) ? tool.plans[idx].slug : 'not_sure'"));
+  });
+});
+
+describe('promptForToolPlans cycle_day parsing (mirrors the real logic)', () => {
+  function resolveCycleDay(ans) {
+    const day = parseInt(ans, 10);
+    return (day >= 1 && day <= 31) ? day : null;
+  }
+
+  it('accepts a valid day 1-31', () => {
+    assert.equal(resolveCycleDay('1'), 1);
+    assert.equal(resolveCycleDay('15'), 15);
+    assert.equal(resolveCycleDay('31'), 31);
+  });
+
+  it('rejects out-of-range or non-numeric input as null (Enter to skip), never throws', () => {
+    assert.equal(resolveCycleDay(''), null);
+    assert.equal(resolveCycleDay('0'), null);
+    assert.equal(resolveCycleDay('32'), null);
+    assert.equal(resolveCycleDay('abc'), null);
+  });
+
+  it('the real implementation uses this exact 1-31 range check', () => {
+    assert.ok(toolDetectSrc.includes('if (day >= 1 && day <= 31) cycle_day = day;'));
+  });
+
+  it('only asks for a renewal day on a real paid plan - never free/hobby/not_sure/api', () => {
+    assert.ok(toolDetectSrc.includes("!['free', 'hobby', 'not_sure', 'api'].includes(plan)"));
+  });
+});
+
+describe('reportToolPlans', () => {
+  let originalReportToolPlans;
+  beforeEach(() => { originalReportToolPlans = api.reportToolPlans; });
+  afterEach(() => { api.reportToolPlans = originalReportToolPlans; });
+
+  it('POSTs the tools array via api.reportToolPlans, unchanged', async () => {
+    let captured;
+    api.reportToolPlans = async (apiKey, tools) => { captured = { apiKey, tools }; return {}; };
+    const results = [{ slug: 'cursor', installed: true, plan: 'pro', cycle_day: 5 }];
+    await reportToolPlans('txy-key', results);
+    assert.deepEqual(captured, { apiKey: 'txy-key', tools: results });
+  });
+
+  it('makes no API call for an empty result set', async () => {
+    let called = false;
+    api.reportToolPlans = async () => { called = true; };
+    await reportToolPlans('txy-key', []);
+    assert.equal(called, false);
+  });
+
+  it('swallows a failed report rather than throwing - must never break `troxy init`', async () => {
+    api.reportToolPlans = async () => { throw new Error('network down'); };
+    await assert.doesNotReject(
+      reportToolPlans('txy-key', [{ slug: 'cursor', installed: true, plan: 'pro', cycle_day: 5 }]),
+    );
+  });
+});
+
+describe('wiring: api.js / bin/troxy.js / init.js', () => {
+  const apiSrc = readFileSync(join(__dirname, '..', 'api.js'), 'utf8');
+  const binSrc = readFileSync(join(__dirname, '..', '..', 'bin', 'troxy.js'), 'utf8');
+  const initSrc = readFileSync(join(__dirname, '..', 'init.js'), 'utf8');
+
+  it("api.js POSTs to /agents/tool-plans with {tools} as the body", () => {
+    assert.ok(apiSrc.includes("'/agents/tool-plans'"), '/agents/tool-plans route missing from api.js');
+    assert.match(
+      apiSrc,
+      /reportToolPlans:\s*\(apiKey,\s*tools\)\s*=>\s*request\('POST',\s*'\/agents\/tool-plans',\s*\{\s*apiKey,\s*body:\s*\{\s*tools\s*\}\s*\}\)/,
+    );
+  });
+
+  it("bin/troxy.js registers a 'tools' subcommand that reuses tool_detect.js's runToolDetection", () => {
+    assert.ok(binSrc.includes("case 'tools'"), 'troxy tools subcommand missing');
+    assert.ok(binSrc.includes("'../src/tool_detect.js'"), 'troxy tools must import from tool_detect.js, not reimplement detection');
+    assert.ok(binSrc.includes('runToolDetection'));
+  });
+
+  it('runInit calls tool detection after reprovisionKeyConsumers, wrapped so a scan failure never blocks init', () => {
+    const reprovisionIdx = initSrc.indexOf('reprovisionKeyConsumers(key, agentName)');
+    const toolIdx = initSrc.indexOf('runToolDetection');
+    assert.ok(reprovisionIdx !== -1, 'reprovisionKeyConsumers call not found in init.js');
+    assert.ok(toolIdx !== -1, 'runToolDetection not wired into runInit');
+    assert.ok(toolIdx > reprovisionIdx, 'tool detection must run after reprovisionKeyConsumers, per spec');
+
+    const surrounding = initSrc.slice(Math.max(0, toolIdx - 200), toolIdx + 300);
+    assert.match(
+      surrounding,
+      /try\s*\{[\s\S]*runToolDetection[\s\S]*\}\s*catch/,
+      'the tool-detection step must be wrapped in try/catch so a scan/report failure never breaks a successful init',
+    );
+  });
+});

package/src/tool_detect.js

@@ -1,9 +1,9 @@
 import fs       from 'fs';
 import os       from 'os';
 import path     from 'path';
-import readline from 'readline';
 import { execSync } from 'child_process';
 import { api }   from './api.js';
+import { prompt, hasClaudeCode } from './init.js';
 
 // AI coding tools we detect + the subscription plans a user can confirm for
 // each. Mirrors the backend registry (troxy-tf-live tool_plans.py TOOL_PLANS)
@@ -19,11 +19,14 @@ import { api }   from './api.js';
 
 const home = os.homedir();
 
-function binExists(cmd) {
+// Exported for direct unit testing of the detection mechanism itself
+// (with a synthetic command / synthetic paths), independent of whether the
+// real tools happen to be installed on whatever machine runs the tests.
+export function binExists(cmd) {
   try { execSync(cmd, { stdio: 'ignore' }); return true; } catch { return false; }
 }
 
-function anyPathExists(paths) {
+export function anyPathExists(paths) {
   return paths.some(p => { try { return fs.existsSync(p); } catch { return false; } });
 }
 
@@ -31,7 +34,10 @@ export const TOOLS = [
   {
     slug: 'claude_code',
     name: 'Claude Code',
-    detect: () => binExists('claude --version'),
+    // Reuses init.js's own hasClaudeCode() as-is (execSync('claude
+    // --version')) rather than reimplementing it - one source of truth for
+    // "is Claude Code on PATH".
+    detect: () => hasClaudeCode(),
     plans: [
       { slug: 'free',     label: 'Free' },
       { slug: 'pro',      label: 'Pro ($20/mo)' },
@@ -97,6 +103,7 @@ export const TOOLS = [
     detect: () => binExists('aider --version'),
     plans: [
       { slug: 'free',     label: 'Free (bring your own API key)' },
+      { slug: 'pro',      label: 'Pro ($15/mo)' },
       { slug: 'not_sure', label: 'Not sure' },
     ],
   },
@@ -106,11 +113,6 @@ export function detectAiTools() {
   return TOOLS.map(t => ({ slug: t.slug, name: t.name, installed: !!t.detect() }));
 }
 
-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()); }));
-}
-
 // For each detected tool: show a numbered plan menu, read a choice, then ask
 // the renewal day. Returns [{slug, installed:true, plan, cycle_day}]. A tool
 // detected but skipped (blank / invalid choice) is reported as 'not_sure' so
@@ -128,7 +130,7 @@ export async function promptForToolPlans(detected) {
     const tool = TOOLS.find(t => t.slug === d.slug);
     console.log(`  ${tool.name}:`);
     tool.plans.forEach((p, i) => console.log(`    ${i + 1}) ${p.label}`));
-    const ans = await _prompt(`  Which plan? [1-${tool.plans.length}, Enter to skip]: `);
+    const ans = await prompt(`  Which plan? [1-${tool.plans.length}, Enter to skip]: `);
     const idx = parseInt(ans, 10) - 1;
     const plan = (idx >= 0 && idx < tool.plans.length) ? tool.plans[idx].slug : 'not_sure';
 
@@ -138,7 +140,7 @@ export async function promptForToolPlans(detected) {
     // have no monthly renewal to track a usage window against.
     const isPaid = chosen && !['free', 'hobby', 'not_sure', 'api'].includes(plan);
     if (isPaid) {
-      const dayAns = await _prompt('  What day of the month does it renew? [1-31, Enter to skip]: ');
+      const dayAns = await prompt('  What day of the month does it renew? [1-31, Enter to skip]: ');
       const day = parseInt(dayAns, 10);
       if (day >= 1 && day <= 31) cycle_day = day;
     }

package/src/chat-budget.js

@@ -1,73 +0,0 @@
-import { api }        from './api.js';
-import { requireJwt } from './auth.js';
-import { table }      from './print.js';
-
-const VALID_CURRENCIES = ['USD', 'ILS', 'EUR'];
-const VALID_ACTIONS    = ['block', 'allow', 'notify', 'escalate'];
-
-const HELP = {
-  show: `  troxy chat-budget show\n\n  Shows Troxy Chat's monthly budget limits and what happens when they're hit.\n`,
-  set:  `  troxy chat-budget set [options]\n\n  Updates Troxy Chat's monthly budget. Login required.\n\n    --currency <cur>    USD, ILS, or EUR (default: USD)\n    --limit <n>          Monthly limit for that currency\n    --clear              Remove the limit for that currency\n    --action <action>    block, allow, notify, or escalate: what happens once the limit is hit\n\n  Examples:\n    troxy chat-budget set --currency USD --limit 500\n    troxy chat-budget set --action notify\n    troxy chat-budget set --currency EUR --clear\n`,
-};
-
-export async function runChatBudget([sub, ...args], flags) {
-  if (flags.help || flags.h) {
-    console.log('\n' + (HELP[sub] || `  troxy chat-budget <subcommand> [options]\n\n  Subcommands:\n    show    Show Troxy Chat's budget\n    set     Update Troxy Chat's budget\n\n  Run 'troxy chat-budget <subcommand> --help' for subcommand help.\n`));
-    process.exit(0);
-  }
-
-  const jwt = requireJwt();
-
-  switch (sub || 'show') {
-    case 'show': {
-      const s = await api.getSettings(jwt);
-      console.log(`\n  Action when budget is hit:  ${s.chat_budget_action}\n`);
-      if (!s.chat_budget_limits.length) {
-        console.log('  No monthly limits set.\n');
-        return;
-      }
-      table(
-        ['Currency', 'Limit', 'Used', 'Remaining'],
-        s.chat_budget_limits.map(b => [b.currency, b.limit, b.used, (b.limit - b.used).toFixed(2)]),
-      );
-      break;
-    }
-
-    case 'set': {
-      const body = {};
-
-      if (flags.action) {
-        const action = flags.action.toLowerCase();
-        if (!VALID_ACTIONS.includes(action)) {
-          console.error(`  --action must be one of: ${VALID_ACTIONS.join(', ')}\n`); process.exit(1);
-        }
-        body.budget_action = action;
-      }
-
-      if (flags.limit != null || flags.clear || flags.currency) {
-        const currency = (flags.currency || 'USD').toUpperCase();
-        if (!VALID_CURRENCIES.includes(currency)) {
-          console.error(`  --currency must be one of: ${VALID_CURRENCIES.join(', ')}\n`); process.exit(1);
-        }
-        body.currency = currency;
-        if (flags.clear) body.limit = null;
-        else if (flags.limit != null) body.limit = parseFloat(flags.limit);
-        else { console.error('  --limit is required (or pass --clear to remove the limit)\n'); process.exit(1); }
-      }
-
-      if (Object.keys(body).length === 0) {
-        console.error('  Nothing to update, pass at least one option. Run troxy chat-budget set --help\n');
-        process.exit(1);
-      }
-
-      await api.updateChatBudget(jwt, body);
-      console.log('\n  Chat budget updated ✓\n');
-      break;
-    }
-
-    default:
-      console.error(`  Unknown subcommand: ${sub}`);
-      console.error('  Usage: troxy chat-budget [show|set]\n');
-      process.exit(1);
-  }
-}