troxy-cli 1.7.3 → 1.8.0

package/bin/troxy.js

@@ -8,6 +8,12 @@ import { loadConfig } from '../src/config.js';
 import { runPolicies }                 from '../src/policies.js';
 import { runMcps }                     from '../src/mcps.js';
 import { runActivity }                 from '../src/activity.js';
+import { runCards }                    from '../src/cards.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';
 import { api }                         from '../src/api.js';
 import { table }                       from '../src/print.js';
 
@@ -250,6 +256,30 @@ switch (command) {
     await runActivity(flags);
     break;
 
+  case 'cards':
+    await runCards(positional, flags);
+    break;
+
+  case 'settings':
+    await runSettings(positional, flags);
+    break;
+
+  case 'chat-budget':
+    await runChatBudget(positional, flags);
+    break;
+
+  case 'approvals':
+    await runApprovals(positional, flags);
+    break;
+
+  case 'account':
+    await runAccount(positional, flags);
+    break;
+
+  case 'secrets':
+    await runSecrets(positional, flags);
+    break;
+
   case 'insights': {
     if (flags.help || flags.h) {
       console.log(`
@@ -298,7 +328,10 @@ switch (command) {
     if (!sub || sub === 'policies') { await runPolicies(['list'], flags); break; }
     if (sub === 'mcps')             { await runMcps(['list'], flags);     break; }
     if (sub === 'activity')         { await runActivity(flags);           break; }
-    console.error(`  Unknown resource: ${sub}. Try: policies, mcps, activity\n`);
+    if (sub === 'cards')            { await runCards(['list'], flags);    break; }
+    if (sub === 'approvals')        { await runApprovals(['list'], flags); break; }
+    if (sub === 'secrets')          { await runSecrets(['list'], flags);  break; }
+    console.error(`  Unknown resource: ${sub}. Try: policies, mcps, activity, cards, approvals, secrets\n`);
     process.exit(1);
 
   // ── Status ────────────────────────────────────────────────────
@@ -485,10 +518,15 @@ switch (command) {
   Everything else requires: troxy login
 
   MCP
-    troxy pause                    Pause this MCP (blocks all payments)
-    troxy resume                   Resume this MCP
-    troxy mcps list                All MCPs in your account
-    troxy mcps rename --name "x"   Rename this machine's MCP
+    troxy pause                        Pause this MCP (blocks all payments)
+    troxy resume                       Resume this MCP
+    troxy mcps list                    All MCPs in your account
+    troxy mcps rename --name "x"       Rename this machine's MCP
+    troxy mcps create --name "x"       Create a key for another agent/machine
+    troxy mcps revoke --mcp "x"        Revoke an MCP's key
+    troxy mcps pause/resume --mcp "x"  Pause/resume any MCP (not just this one)
+    troxy mcps budget --mcp "x" --currency USD --limit 500
+    troxy mcps set-default-action --mcp "x" --action BLOCK
 
   Keys
     troxy rotate-key               Rotate MCP key (revokes old, saves new locally)
@@ -496,12 +534,40 @@ switch (command) {
   Policies
     troxy policies list
     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 create --name "X" --action BLOCK --mcp "My Laptop"   (scoped to one MCP)
+    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 enable  --name "X"
-    troxy policies disable --name "X"
-    troxy policies delete  --name "X"
+    troxy policies pause  --name "X"
+    troxy policies resume --name "X"
+    troxy policies delete --name "X"
+
+  Cards
+    troxy cards list
+    troxy cards create --name "Work" --last4 1234 --budget 2000
+    troxy cards update --name "Work" --budget 3000
+    troxy cards delete --name "Work"
+
+  Approvals (ESCALATE holds)
+    troxy approvals list
+    troxy approvals approve --id <id>
+    troxy approvals decline --id <id>
+
+  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)
+    troxy secrets list
+    troxy secrets set --name "OpenAI"
+    troxy secrets delete --name "OpenAI"
+
+  Account
+    troxy account clear-data       Wipe activity/policies, keep account + keys
+    troxy account delete           Permanently delete your account (irreversible)
 
   Activity & insights
     troxy activity [--limit 50] [--mine]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "troxy-cli",
-  "version": "1.7.3",
+  "version": "1.8.0",
   "description": "AI payment control — protect your agent's payments with policies",
   "type": "module",
   "bin": {

package/src/account.js

@@ -0,0 +1,52 @@
+import readline                       from 'readline';
+import { api }                        from './api.js';
+import { requireJwt, clearSession }   from './auth.js';
+
+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()); }));
+}
+
+const HELP = {
+  delete:     `  troxy account delete\n\n  PERMANENTLY deletes your Troxy account: all activity, policies, cards,\n  API keys, and the account itself. This cannot be undone. You'll be asked\n  to type your account email to confirm.\n`,
+  'clear-data': `  troxy account clear-data\n\n  Deletes all activity, policies, and pending approvals. Keeps your account\n  and API keys intact, so your MCP connections keep working.\n`,
+};
+
+export async function runAccount([sub, ...args], flags) {
+  if (flags.help || flags.h) {
+    console.log('\n' + (HELP[sub] || `  troxy account <subcommand>\n\n  Subcommands:\n    delete        Permanently delete your account and all data\n    clear-data    Wipe activity/policies but keep the account and API keys\n\n  Run 'troxy account <subcommand> --help' for subcommand help.\n`));
+    process.exit(0);
+  }
+
+  const jwt = requireJwt();
+
+  switch (sub) {
+    case 'delete': {
+      const s = await api.getSettings(jwt);
+      console.log(`\n  This PERMANENTLY deletes your Troxy account (${s.email}):`);
+      console.log('  all activity, policies, cards, and API keys. This cannot be undone.\n');
+      const typed = await prompt(`  Type your account email to confirm: `);
+      if (typed.trim().toLowerCase() !== s.email.toLowerCase()) {
+        console.log('\n  Email did not match. Cancelled.\n');
+        process.exit(1);
+      }
+      await api.deleteAccount(jwt);
+      clearSession();
+      console.log('\n  Account deleted. Run troxy uninstall to remove Troxy from this machine.\n');
+      break;
+    }
+
+    case 'clear-data': {
+      const answer = await prompt('  This deletes all activity, policies, and pending approvals (keeps your account and API keys). Continue? (y/N): ');
+      if (answer.toLowerCase() !== 'y') { console.log('\n  Cancelled.\n'); process.exit(0); }
+      await api.clearData(jwt);
+      console.log('\n  Activity, policies, and pending approvals cleared ✓\n');
+      break;
+    }
+
+    default:
+      console.error(`  Unknown subcommand: ${sub || '(none)'}`);
+      console.error('  Usage: troxy account [delete|clear-data]\n');
+      process.exit(1);
+  }
+}

package/src/api.js

@@ -51,6 +51,29 @@ export const api = {
   listTokens:   (jwt)     => request('GET',    '/tokens',        { jwt }),
   createToken:  (jwt, b)  => request('POST',   '/tokens',        { jwt, body: b }),
   revokeToken:  (jwt, id) => request('DELETE', `/tokens/${id}`,  { jwt }),
+  updateTokenBudget:       (jwt, id, b) => request('PATCH', `/tokens/${id}/budget`, { jwt, body: b }),
+  updateTokenDefaultAction: (jwt, id, action) => request('PATCH', `/tokens/${id}`, { jwt, body: { default_action: action } }),
+
+  // 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 }),
+  resolveApproval: (token, resolved) => request('POST', `/approvals/${encodeURIComponent(token)}/${resolved ? 'approve' : 'reject'}`, {}),
+
+  // Account
+  deleteAccount: (jwt) => request('DELETE', '/account',      { jwt }),
+  clearData:     (jwt) => request('DELETE', '/account/data', { jwt }),
+
+  // Secrets (LLM provider keys)
+  listSecrets:  (jwt)     => request('GET',    '/secrets',       { jwt }),
+  saveSecret:   (jwt, b)  => request('POST',   '/secrets',       { jwt, body: b }),
+  deleteSecret: (jwt, id) => request('DELETE', `/secrets/${id}`, { jwt }),
+
+  // AI policy builder
+  aiPolicy: (jwt, b) => request('POST', '/dashboard/ai-policy', { jwt, body: b }),
 
   // Evaluate + confirm (agent API key)
   evaluate: (body, apiKey) => request('POST', '/evaluate', { apiKey, body }),
@@ -58,7 +81,7 @@ export const api = {
   waitApprovalStatus: (token) => request('GET', `/approvals/${encodeURIComponent(token)}/wait`),
 
   // MCP heartbeat (agent API key)
-  mcpHeartbeat: (apiKey, agentName) => request('POST', '/mcp/heartbeat', { apiKey, body: agentName ? { agent_name: agentName } : undefined }),
+  mcpHeartbeat: (apiKey, agentName, force) => request('POST', '/mcp/heartbeat', { apiKey, body: agentName ? { agent_name: agentName, force_name: !!force } : undefined }),
 
   // MCP status (agent API key — no login needed)
   mcpStatus:  (apiKey) => request('GET', '/mcp/status', { apiKey }),
@@ -69,9 +92,11 @@ export const api = {
   renameToken: (jwt, id, name) => request('PATCH', `/tokens/${id}/name`,   { jwt, body: { name } }),
 
   // Agent read-only API (JWT session auth — run: troxy login)
-  agentStatus:   (jwt)              => request('GET', '/agent/status',   { jwt }),
-  agentPolicies: (jwt)              => request('GET', '/agent/policies',  { jwt }),
-  agentMcps:     (jwt)              => request('GET', '/agent/mcps',      { jwt }),
+  // tokenPrefix (this machine's saved key, first 11 chars) lets the backend
+  // resolve which MCP is "me" for the applies_to_me / is_me fields.
+  agentStatus:   (jwt, tokenPrefix) => request('GET', `/agent/status${tokenPrefix ? `?token_prefix=${encodeURIComponent(tokenPrefix)}` : ''}`,   { jwt }),
+  agentPolicies: (jwt, tokenPrefix) => request('GET', `/agent/policies${tokenPrefix ? `?token_prefix=${encodeURIComponent(tokenPrefix)}` : ''}`,  { jwt }),
+  agentMcps:     (jwt, tokenPrefix) => request('GET', `/agent/mcps${tokenPrefix ? `?token_prefix=${encodeURIComponent(tokenPrefix)}` : ''}`,      { jwt }),
   agentCards:    (jwt)              => request('GET', '/agent/cards',      { jwt }),
   agentActivity: (jwt, limit, mine, tokenPrefix) => request('GET', `/agent/activity?limit=${limit || 20}${mine ? `&mine=true&token_prefix=${encodeURIComponent(tokenPrefix || '')}` : ''}`, { jwt }),
   agentInsights: (jwt, period)      => request('GET', `/agent/insights?period=${period || 30}`, { jwt }),

package/src/approvals.js

@@ -0,0 +1,60 @@
+import { api }        from './api.js';
+import { requireJwt } from './auth.js';
+import { table }      from './print.js';
+
+const HELP = {
+  list:    `  troxy approvals list\n\n  Lists pending ESCALATE holds waiting for your approval.\n`,
+  approve: `  troxy approvals approve --id <id>\n\n  Approves a pending transaction. Use the ID shown by 'troxy approvals list'\n  (an unambiguous prefix is enough).\n`,
+  decline: `  troxy approvals decline --id <id>\n\n  Declines a pending transaction. Use the ID shown by 'troxy approvals list'\n  (an unambiguous prefix is enough).\n`,
+};
+
+async function _find(jwt, idPrefix) {
+  if (!idPrefix) { console.error('  --id is required\n'); process.exit(1); }
+  const { items: approvals = [] } = await api.listApprovals(jwt);
+  const matches = approvals.filter(a => a.id.startsWith(idPrefix));
+  if (matches.length === 0) { console.error(`  No pending approval starting with "${idPrefix}". Run: troxy approvals list\n`); process.exit(1); }
+  if (matches.length > 1)   { console.error(`  "${idPrefix}" matches ${matches.length} pending approvals — use a longer prefix\n`); process.exit(1); }
+  return matches[0];
+}
+
+export async function runApprovals([sub, ...args], flags) {
+  if (flags.help || flags.h) {
+    console.log('\n' + (HELP[sub] || `  troxy approvals <subcommand> [options]\n\n  Subcommands:\n    list       List pending approvals\n    approve    Approve a pending transaction\n    decline    Decline a pending transaction\n\n  Run 'troxy approvals <subcommand> --help' for subcommand help.\n`));
+    process.exit(0);
+  }
+
+  const jwt = requireJwt();
+
+  switch (sub || 'list') {
+    case 'list': {
+      const { items: approvals = [] } = await api.listApprovals(jwt);
+      if (!approvals.length) { console.log('\n  No pending approvals.\n'); return; }
+      console.log();
+      table(
+        ['ID', 'Merchant', 'Amount', 'Agent', 'Card', 'Expires'],
+        approvals.map(a => [
+          a.id.slice(0, 8),
+          a.merchant_name,
+          `$${Number(a.amount).toFixed(2)} ${a.currency}`,
+          a.agent_name,
+          a.card_name,
+          new Date(a.expires_at).toLocaleString(),
+        ]),
+      );
+      break;
+    }
+
+    case 'approve':
+    case 'decline': {
+      const approval = await _find(jwt, flags.id);
+      await api.resolveApproval(approval.approval_token, sub === 'approve');
+      console.log(`\n  ${approval.merchant_name} ($${Number(approval.amount).toFixed(2)}) ${sub === 'approve' ? 'approved' : 'declined'} ✓\n`);
+      break;
+    }
+
+    default:
+      console.error(`  Unknown subcommand: ${sub}`);
+      console.error('  Usage: troxy approvals [list|approve|decline]\n');
+      process.exit(1);
+  }
+}

package/src/cards.js

@@ -0,0 +1,107 @@
+import { api }         from './api.js';
+import { requireJwt }  from './auth.js';
+import { table }       from './print.js';
+
+const HELP = {
+  list:   `  troxy cards list\n\n  Lists all cards (budget/spend aliases) on your account.\n`,
+  create: `  troxy cards create --name <name> --last4 <4 digits> [options]\n\n  Creates a new card alias. Login required.\n\n  Required:\n    --name    Card alias name (e.g. "Work")\n    --last4   Last 4 digits of the card\n\n  Optional:\n    --type              Card type label (default: virtual)\n    --budget <n>        Monthly budget amount\n    --reset-day <n>     Day of month the budget resets (default: 1)\n    --default-action    ALLOW, BLOCK, ESCALATE, or NOTIFY (default: ALLOW)\n    --notes <text>      Free text notes\n\n  Example:\n    troxy cards create --name "Work" --last4 1234 --budget 2000\n`,
+  update: `  troxy cards update --name <name> [options]\n\n  Updates an existing card. Login required.\n\n  Options:\n    --new-name <name>    Rename the card\n    --budget <n>         Set the monthly budget\n    --clear-budget       Remove the monthly budget\n    --reset-day <n>      Day of month the budget resets\n    --status <status>    active or paused\n    --default-action     ALLOW, BLOCK, ESCALATE, or NOTIFY\n    --notes <text>       Free text notes\n\n  Example:\n    troxy cards update --name "Work" --budget 3000\n`,
+  delete: `  troxy cards delete --name <name>\n\n  Permanently deletes a card. Login required.\n`,
+};
+
+export async function runCards([sub, ...args], flags) {
+  if (flags.help || flags.h) {
+    console.log('\n' + (HELP[sub] || `  troxy cards <subcommand> [options]\n\n  Subcommands:\n    list      List all cards\n    create    Create a new card\n    update    Update an existing card\n    delete    Delete a card\n\n  Run 'troxy cards <subcommand> --help' for subcommand help.\n`));
+    process.exit(0);
+  }
+
+  const jwt = requireJwt();
+
+  switch (sub || 'list') {
+    case 'list': {
+      const { cards = [] } = await api.listCards(jwt);
+      if (!cards.length) { console.log('\n  No cards yet.\n'); return; }
+      console.log();
+      table(
+        ['Name', 'Last 4', 'Type', 'Budget', 'Used', 'Reset day', 'Status', 'Default action'],
+        cards.map(c => [
+          c.name,
+          c.last4,
+          c.type,
+          c.budget != null ? `$${Number(c.budget).toFixed(2)}` : '—',
+          c.budget != null ? `$${Number(c.budget_used).toFixed(2)}` : '—',
+          c.reset_day,
+          c.status,
+          c.default_action,
+        ]),
+      );
+      break;
+    }
+
+    case 'create': {
+      const name  = flags.name;
+      const last4 = String(flags.last4 ?? '');
+      if (!name) { console.error('  --name is required\n'); process.exit(1); }
+      if (!/^\d{4}$/.test(last4)) { console.error('  --last4 must be exactly 4 digits\n'); process.exit(1); }
+      const action = flags['default-action'] ? flags['default-action'].toUpperCase() : undefined;
+      if (action && !['ALLOW', 'BLOCK', 'ESCALATE', 'NOTIFY'].includes(action)) {
+        console.error('  --default-action must be ALLOW, BLOCK, ESCALATE, or NOTIFY\n'); process.exit(1);
+      }
+      const body = {
+        name, last4,
+        type: flags.type || undefined,
+        budget: flags.budget != null ? parseFloat(flags.budget) : undefined,
+        reset_day: flags['reset-day'] != null ? parseInt(flags['reset-day'], 10) : undefined,
+        default_action: action,
+        notes: flags.notes || undefined,
+      };
+      const card = await api.createCard(jwt, body);
+      console.log(`\n  Card "${card.name}" created ✓  (•••• ${card.last4})\n`);
+      break;
+    }
+
+    case 'update': {
+      const name = flags.name;
+      if (!name) { console.error('  --name is required\n'); process.exit(1); }
+      const { cards = [] } = await api.listCards(jwt);
+      const card = cards.find(c => c.name.toLowerCase() === name.toLowerCase());
+      if (!card) { console.error(`  Card "${name}" not found\n`); process.exit(1); }
+
+      const body = {};
+      if (flags['new-name']) body.name = flags['new-name'];
+      if (flags['clear-budget']) body.budget = null;
+      else if (flags.budget != null) body.budget = parseFloat(flags.budget);
+      if (flags['reset-day'] != null) body.reset_day = parseInt(flags['reset-day'], 10);
+      if (flags.status) body.status = flags.status;
+      if (flags['default-action']) {
+        const action = flags['default-action'].toUpperCase();
+        if (!['ALLOW', 'BLOCK', 'ESCALATE', 'NOTIFY'].includes(action)) {
+          console.error('  --default-action must be ALLOW, BLOCK, ESCALATE, or NOTIFY\n'); process.exit(1);
+        }
+        body.default_action = action;
+      }
+      if (flags.notes != null) body.notes = flags.notes;
+      if (Object.keys(body).length === 0) { console.error('  Nothing to update — pass at least one option\n'); process.exit(1); }
+
+      await api.updateCard(jwt, card.id, body);
+      console.log(`\n  Card "${name}" updated ✓\n`);
+      break;
+    }
+
+    case 'delete': {
+      const name = flags.name;
+      if (!name) { console.error('  --name is required\n'); process.exit(1); }
+      const { cards = [] } = await api.listCards(jwt);
+      const card = cards.find(c => c.name.toLowerCase() === name.toLowerCase());
+      if (!card) { console.error(`  Card "${name}" not found\n`); process.exit(1); }
+      await api.deleteCard(jwt, card.id);
+      console.log(`\n  Card "${name}" deleted ✓\n`);
+      break;
+    }
+
+    default:
+      console.error(`  Unknown subcommand: ${sub}`);
+      console.error('  Usage: troxy cards [list|create|update|delete]\n');
+      process.exit(1);
+  }
+}

package/src/chat-budget.js

@@ -0,0 +1,73 @@
+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);
+  }
+}

package/src/config.js

@@ -13,6 +13,11 @@ export function loadConfig() {
   }
 }
 
+/** First 11 chars of this machine's saved API key — used to identify "me" to the API. */
+export function localTokenPrefix() {
+  return (loadConfig()?.apiKey || '').substring(0, 11) || null;
+}
+
 export function saveConfig(data) {
   // Owner-only permissions on dir + file — matches what AWS CLI does with
   // ~/.aws/credentials. Stops other users on the same machine from reading

package/src/daemon.js

@@ -19,14 +19,17 @@ export async function runDaemon() {
 
   const { apiKey, agentName } = cfg;
 
-  const beat = () =>
-    api.mcpHeartbeat(apiKey, agentName)
+  // `force` pushes the config name as the authoritative display name. We only
+  // do this on the FIRST beat after (re)start, so a `troxy restart` overrides
+  // the dashboard, while regular beats never clobber a dashboard rename.
+  const beat = (force) =>
+    api.mcpHeartbeat(apiKey, agentName, force)
       .then(() => process.stderr.write(`[troxy-daemon] heartbeat ok\n`))
       .catch(err => process.stderr.write(`[troxy-daemon] heartbeat failed: ${err.message}\n`));
 
   process.stderr.write(`[troxy-daemon] starting (agent: ${agentName || 'unnamed'})\n`);
-  await beat();
-  setInterval(beat, INTERVAL_MS);
+  await beat(true);                       // startup beat: config name wins
+  setInterval(() => beat(false), INTERVAL_MS);  // regular beats: don't touch name
 
   // Keep process alive indefinitely
   process.stdin.resume();

package/src/init.js

@@ -2,7 +2,7 @@ import fs             from 'fs';
 import os             from 'os';
 import path           from 'path';
 import readline       from 'readline';
-import { execSync }   from 'child_process';
+import { execSync, execFileSync } from 'child_process';
 import { saveConfig } from './config.js';
 import { evaluatePayment } from './api.js';
 
@@ -138,7 +138,9 @@ export async function runInit({ key } = {}) {
     if (hasOpenClaw) {
       try {
         const entry = JSON.stringify({ command: 'npx', args: ['troxy-cli', 'mcp'], env: { TROXY_API_KEY: key } });
-        execSync(`openclaw mcp set troxy '${entry}'`, { stdio: 'ignore' });
+        // execFileSync passes args directly to the process (no shell), so the
+        // key can't break out of a quoted string and inject shell commands.
+        execFileSync('openclaw', ['mcp', 'set', 'troxy', entry], { stdio: 'ignore' });
         console.log(`    • OpenClaw  ✓`);
       } catch (err) {
         console.log(`    • OpenClaw  ✗  (${err.message})`);
@@ -174,6 +176,17 @@ function installService(apiKey, agentName) {
   }
 
   if (platform === 'linux') {
+    // The API key lives in a separate root-owned, 600-permission file loaded via
+    // EnvironmentFile= — unit files under /etc/systemd/system are world-readable
+    // (mode 644), so putting the key directly in `Environment=` there would leak
+    // it to every local user on the machine.
+    const envFilePath = '/etc/troxy-mcp.env';
+    const envFile = `TROXY_API_KEY=${apiKey}\nTROXY_AGENT_NAME="${agentName}"\n`;
+    fs.writeFileSync('/tmp/troxy-mcp.env', envFile, { mode: 0o600 });
+    execSync('sudo mv /tmp/troxy-mcp.env ' + envFilePath);
+    execSync(`sudo chown root:root ${envFilePath}`);
+    execSync(`sudo chmod 600 ${envFilePath}`);
+
     const unit = `[Unit]
 Description=Troxy MCP Server
 After=network.target
@@ -183,8 +196,7 @@ ExecStart=${troxy} daemon
 Restart=always
 RestartSec=10
 User=${os.userInfo().username}
-Environment=TROXY_API_KEY=${apiKey}
-Environment=TROXY_AGENT_NAME="${agentName}"
+EnvironmentFile=${envFilePath}
 
 [Install]
 WantedBy=multi-user.target
@@ -225,7 +237,11 @@ WantedBy=multi-user.target
 `;
     const plistPath = path.join(os.homedir(), 'Library/LaunchAgents/ai.troxy.mcp.plist');
     fs.mkdirSync(path.dirname(plistPath), { recursive: true });
-    fs.writeFileSync(plistPath, plist);
+    // The plist embeds the API key in plaintext (launchd has no EnvironmentFile
+    // equivalent) — default file perms are world-readable, so lock it to the
+    // owner only. launchd runs as this same user and can still read it.
+    fs.writeFileSync(plistPath, plist, { mode: 0o600 });
+    fs.chmodSync(plistPath, 0o600);
     try { execSync(`launchctl unload ${plistPath} 2>/dev/null`); } catch {}
     execSync(`launchctl load ${plistPath}`);
 

package/src/mcps.js

@@ -1,23 +1,50 @@
-import { api }                    from './api.js';
-import { loadConfig, saveConfig }  from './config.js';
-import { requireJwt }              from './auth.js';
-import { table }                   from './print.js';
+import { api }                                     from './api.js';
+import { loadConfig, saveConfig, localTokenPrefix } from './config.js';
+import { requireJwt }                              from './auth.js';
+import { table }                                   from './print.js';
 
 const HELP = {
-  list:   `  troxy mcps list\n\n  Lists all MCP connections on your account — name, prefix, status, last seen,\n  policies assigned, default action, and which one is this machine.\n`,
-  rename: `  troxy mcps rename --name <new-name>\n\n  Renames this machine's MCP. The new name appears in the dashboard immediately.\n\n  Options:\n    --name   New name for this machine's MCP\n\n  Example:\n    troxy mcps rename --name "My Laptop"\n`,
+  list:               `  troxy mcps list\n\n  Lists all MCP connections on your account — name, prefix, status, last seen,\n  policies assigned, default action, budgets, and which one is this machine.\n`,
+  rename:             `  troxy mcps rename --name <new-name> [--mcp <target>]\n\n  Renames an MCP. Without --mcp, renames this machine's MCP.\n\n  Options:\n    --name   New name\n    --mcp    Name/prefix of the MCP to rename (default: this machine)\n\n  Example:\n    troxy mcps rename --name "My Laptop"\n    troxy mcps rename --mcp "old-name" --name "Staging Server"\n`,
+  create:             `  troxy mcps create --name <name>\n\n  Creates a new API key for another agent/machine. The key is shown once —\n  save it, then run 'troxy init --key <key>' on that machine.\n\n  Options:\n    --name   Label for the new key\n`,
+  revoke:             `  troxy mcps revoke --mcp <name>\n\n  Permanently revokes an MCP's API key. That machine will stop being able\n  to evaluate payments until reconnected with a new key.\n`,
+  pause:              `  troxy pause / troxy mcps pause [--mcp <name>]\n\n  Pauses an MCP (blocks all its payment evaluations). Without --mcp, pauses\n  this machine's MCP — same as running 'troxy pause'.\n`,
+  resume:             `  troxy resume / troxy mcps resume [--mcp <name>]\n\n  Resumes a paused MCP. Without --mcp, resumes this machine's MCP.\n`,
+  budget:             `  troxy mcps budget --mcp <name> [options]\n\n  Sets or clears a monthly spend limit for a specific MCP.\n\n  Options:\n    --mcp <name>          MCP to configure (required)\n    --currency <cur>      USD, ILS, or EUR (default: USD)\n    --limit <n>           Monthly limit\n    --clear               Remove the limit for that currency\n    --action <action>     block, escalate, notify, or allow — what happens once hit\n    --reset-usage         Reset this cycle's usage back to 0\n\n  Example:\n    troxy mcps budget --mcp "My Laptop" --currency USD --limit 500\n`,
+  'set-default-action': `  troxy mcps set-default-action --mcp <name> --action <action>\n\n  Sets the fallback decision for an MCP when no policy matches.\n\n  Options:\n    --mcp <name>       MCP to configure (required)\n    --action <action>  ALLOW, BLOCK, ESCALATE, or NOTIFY\n`,
 };
 
-export async function runMcps([sub], flags) {
+async function _findToken(jwt, needle) {
+  const { tokens = [] } = await api.listTokens(jwt);
+  const n = needle.toLowerCase();
+  const match = tokens.find(t =>
+    (t.name && t.name.toLowerCase() === n) ||
+    (t.agent_name && t.agent_name.toLowerCase() === n) ||
+    (t.prefix && t.prefix.toLowerCase().startsWith(n))
+  );
+  if (!match) { console.error(`\n  MCP "${needle}" not found. Run: troxy mcps list\n`); process.exit(1); }
+  return match;
+}
+
+async function _localToken(jwt) {
+  const prefix = localTokenPrefix();
+  if (!prefix) { console.error('\n  No API key found. Run: troxy init --key txy-...\n'); process.exit(1); }
+  const { tokens = [] } = await api.listTokens(jwt);
+  const tok = tokens.find(t => t.prefix === prefix);
+  if (!tok) { console.error('\n  Could not find this machine\'s MCP. Run: troxy init --key txy-...\n'); process.exit(1); }
+  return tok;
+}
+
+export async function runMcps([sub, ...args], flags) {
   if (flags.help || flags.h) {
-    console.log('\n' + (HELP[sub] || `  troxy mcps <subcommand> [options]\n\n  Subcommands:\n    list     List all MCP connections\n    rename   Rename this machine's MCP\n\n  Run 'troxy mcps <subcommand> --help' for subcommand help.\n`));
+    console.log('\n' + (HELP[sub] || `  troxy mcps <subcommand> [options]\n\n  Subcommands:\n    list                  List all MCP connections\n    rename                 Rename an MCP\n    create                 Create a new API key for another agent\n    revoke                 Revoke an MCP's key\n    pause / resume          Pause or resume an MCP\n    budget                 Set/clear a per-MCP monthly budget\n    set-default-action      Set the fallback decision for an MCP\n\n  Run 'troxy mcps <subcommand> --help' for subcommand help.\n`));
     process.exit(0);
   }
 
   switch (sub || 'list') {
     case 'list': {
       const jwt = requireJwt();
-      const data = await api.agentMcps(jwt);
+      const data = await api.agentMcps(jwt, localTokenPrefix());
       const mcps = data?.mcps || [];
       if (!mcps.length) { console.log('\n  No MCP connections yet.\n'); return; }
       console.log();
@@ -38,25 +65,91 @@ export async function runMcps([sub], flags) {
 
     case 'rename': {
       const name = flags.name;
-      if (!name) { console.error('\n  Usage: troxy mcps rename --name "new-name"\n'); process.exit(1); }
+      if (!name) { console.error('\n  Usage: troxy mcps rename --name "new-name" [--mcp <target>]\n'); process.exit(1); }
       const jwt = requireJwt();
-      const config = loadConfig();
-      const prefix = (config?.apiKey || '').substring(0, 11);
-      if (!prefix) { console.error('\n  No API key found. Run: troxy init --key txy-...\n'); process.exit(1); }
       process.stdout.write(`\n  Renaming MCP to "${name}"... `);
-      const { tokens = [] } = await api.listTokens(jwt);
-      const tok = tokens.find(t => t.prefix === prefix);
-      if (!tok) { console.error('\nCould not find this machine\'s MCP. Run: troxy init --key txy-...\n'); process.exit(1); }
+      const tok = flags.mcp ? await _findToken(jwt, flags.mcp) : await _localToken(jwt);
       await api.renameToken(jwt, tok.id, name);
-      saveConfig({ ...config, agentName: name });
+      if (!flags.mcp) {
+        const config = loadConfig();
+        saveConfig({ ...config, agentName: name });
+      }
       console.log('✓');
       console.log('  Dashboard and future heartbeats will use the new name.\n');
       break;
     }
 
+    case 'create': {
+      const name = flags.name;
+      if (!name) { console.error('\n  --name is required\n'); process.exit(1); }
+      const jwt = requireJwt();
+      const result = await api.createToken(jwt, { name });
+      console.log(`\n  API key created for "${name}":\n`);
+      console.log(`    ${result.key}\n`);
+      console.log('  Shown once — save it now. Run "troxy init --key <key>" on that machine to connect it.\n');
+      break;
+    }
+
+    case 'revoke': {
+      if (!flags.mcp) { console.error('\n  --mcp is required\n'); process.exit(1); }
+      const jwt = requireJwt();
+      const tok = await _findToken(jwt, flags.mcp);
+      await api.revokeToken(jwt, tok.id);
+      console.log(`\n  MCP "${tok.name || tok.prefix}" revoked ✓\n`);
+      break;
+    }
+
+    case 'pause':
+    case 'resume': {
+      const jwt = requireJwt();
+      const tok = flags.mcp ? await _findToken(jwt, flags.mcp) : await _localToken(jwt);
+      if (sub === 'pause') await api.pauseToken(jwt, tok.id);
+      else                 await api.resumeToken(jwt, tok.id);
+      console.log(`\n  MCP "${tok.name || tok.prefix}" ${sub}d ✓\n`);
+      break;
+    }
+
+    case 'budget': {
+      if (!flags.mcp) { console.error('\n  --mcp is required\n'); process.exit(1); }
+      const jwt = requireJwt();
+      const tok = await _findToken(jwt, flags.mcp);
+      const body = {};
+      if (flags.action) {
+        const action = flags.action.toLowerCase();
+        if (!['block', 'escalate', 'notify', 'allow'].includes(action)) {
+          console.error('  --action must be block, escalate, notify, or allow\n'); process.exit(1);
+        }
+        body.budget_action = action;
+      }
+      if (flags.limit != null || flags.clear || flags.currency) {
+        body.currency = (flags.currency || 'USD').toUpperCase();
+        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)\n'); process.exit(1); }
+      }
+      if (flags['reset-usage']) body.reset_usage = true;
+      if (Object.keys(body).length === 0) { console.error('  Nothing to update — pass at least one option\n'); process.exit(1); }
+      await api.updateTokenBudget(jwt, tok.id, body);
+      console.log(`\n  Budget updated for "${tok.name || tok.prefix}" ✓\n`);
+      break;
+    }
+
+    case 'set-default-action': {
+      if (!flags.mcp) { console.error('\n  --mcp is required\n'); process.exit(1); }
+      const action = (flags.action || '').toUpperCase();
+      if (!['ALLOW', 'BLOCK', 'ESCALATE', 'NOTIFY'].includes(action)) {
+        console.error('  --action must be ALLOW, BLOCK, ESCALATE, or NOTIFY\n'); process.exit(1);
+      }
+      const jwt = requireJwt();
+      const tok = await _findToken(jwt, flags.mcp);
+      await api.updateTokenDefaultAction(jwt, tok.id, action);
+      console.log(`\n  Default action for "${tok.name || tok.prefix}" set to ${action} ✓\n`);
+      break;
+    }
+
     default:
       console.error(`  Unknown subcommand: ${sub}`);
-      console.error('  Usage: troxy mcps [list|rename]\n');
+      console.error('  Usage: troxy mcps [list|rename|create|revoke|pause|resume|budget|set-default-action]\n');
       process.exit(1);
   }
 }

package/src/policies.js

@@ -1,19 +1,20 @@
+import readline               from 'readline';
 import { api }               from './api.js';
 import { requireJwt } from './auth.js';
 import { table }             from './print.js';
+import { localTokenPrefix }  from './config.js';
 
 const DECISION_ICON = { ALLOW: '✓', BLOCK: '✗', ESCALATE: '⏳', NOTIFY: '~', TIERED: '⊕' };
 
-function _scope(p) {
-  if (p.global !== false) return 'all MCPs';
-  if (p.mcps && p.mcps.length > 0) return p.mcps.map(m => m.name || m.token_prefix || 'MCP').join(', ');
-  return 'no MCPs applied';
+function _promptYN(question) {
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  return new Promise(resolve => rl.question(question, ans => { rl.close(); resolve(ans.trim().toLowerCase() === 'y'); }));
 }
 
 const HELP = {
   list:         `  troxy policies list\n\n  Lists all policies in your account with their action, scope, status, and conditions.\n`,
   describe:     `  troxy policies describe --name <policy-name>\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`,
-  create:       `  troxy policies create --name <name> --action <action> [options]\n\n  Creates a new policy. Login required.\n\n  Required:\n    --name     Policy name\n    --action   ALLOW, BLOCK, NOTIFY, or ESCALATE\n\n  Optional conditions:\n    --field      Field to match: amount, merchant_name, tx_per_day\n    --operator   eq, neq, gt, gte, lt, lte, contains, starts_with, not_contains, between\n    --value      Comparison value (e.g. 500, amazon)\n    --value2     Upper bound for 'between' operator\n\n  Priority:\n    --priority <n>   Explicit priority number (default: auto, max+10)\n                     Lower number = higher priority (evaluated first).\n\n  Scope:\n    --mcp <name>   Scope policy to a specific MCP only (default: all MCPs)\n                   Run 'troxy mcps list' to see MCP names.\n\n  Examples:\n    troxy policies create --name "Block large" --action BLOCK --field amount --operator gte --value 500\n    troxy policies create --name "Block Amazon" --action BLOCK --field merchant_name --operator contains --value amazon\n    troxy policies create --name "Cap volume" --action BLOCK --field tx_per_day --operator gt --value 20\n    troxy policies create --name "Allow Wiki" --action ALLOW --priority 5 --field merchant_name --operator contains --value Wiki\n`,
+  create:       `  troxy policies create --name <name> --action <action> [options]\n  troxy policies create --describe "<plain English>"\n\n  Creates a new policy. Login required.\n\n  AI builder:\n    --describe "<text>"   Describe the policy in plain English (e.g. "block\n                          Amazon purchases over $200") and Troxy AI drafts\n                          it for you to confirm. Rate-limited per day.\n\n  Manual — required:\n    --name     Policy name\n    --action   ALLOW, BLOCK, NOTIFY, or ESCALATE\n\n  Manual — optional conditions:\n    --field      Field to match: amount, merchant_name, tx_per_day\n    --operator   eq, neq, gt, gte, lt, lte, contains, starts_with, not_contains, between\n    --value      Comparison value (e.g. 500, amazon)\n    --value2     Upper bound for 'between' operator\n\n  Priority:\n    --priority <n>   Explicit priority number (default: auto, max+10)\n                     Lower number = higher priority (evaluated first).\n\n  Scope (default: all agents — every MCP plus Troxy Chat):\n    --mcp <name>       Scope to one or more MCPs (comma-separated).\n                       Run 'troxy mcps list' to see MCP names.\n    --chat             Include Troxy Chat. Implied by default; combine with\n                       --mcp to scope to specific MCPs *and* chat, or use\n                       alone to scope to Troxy Chat only (no MCPs).\n    --no-chat          Exclude Troxy Chat from this policy's scope.\n\n  Examples:\n    troxy policies create --describe "block Amazon purchases over $200"\n    troxy policies create --name "Block large" --action BLOCK --field amount --operator gte --value 500\n    troxy policies create --name "Block Amazon" --action BLOCK --field merchant_name --operator contains --value amazon\n    troxy policies create --name "Cap volume" --action BLOCK --field tx_per_day --operator gt --value 20\n    troxy policies create --name "Allow Wiki" --action ALLOW --priority 5 --field merchant_name --operator contains --value Wiki\n    troxy policies create --name "Laptop only" --action BLOCK --mcp "My Laptop" --field amount --operator gte --value 100\n    troxy policies create --name "Multi-agent" --action BLOCK --mcp "My Laptop,Server" --field amount --operator gte --value 100\n    troxy policies create --name "Chat only" --action ESCALATE --chat --field amount --operator gte --value 200\n    troxy policies create --name "MCPs, no chat" --action BLOCK --no-chat --field merchant_name --operator contains --value casino\n`,
   'set-priority': `  troxy policies set-priority --name <policy-name> --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\n  Example:\n    troxy policies set-priority --name "Block Wiki" --priority 5\n`,
   resume:       `  troxy policies resume --name <policy-name>\n\n  Resumes a paused policy.\n\n  Options:\n    --name   Name of the policy to resume\n`,
   pause:        `  troxy policies pause --name <policy-name>\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`,
@@ -33,7 +34,7 @@ export async function runPolicies([sub, ...args], flags) {
     const jwt = requireJwt();
     switch (sub || 'list') {
       case 'list': {
-        const data = await api.agentPolicies(jwt);
+        const data = await api.agentPolicies(jwt, localTokenPrefix());
         const policies = data?.policies || [];
         if (!policies.length) { console.log('\n  No policies yet.\n'); return; }
         console.log();
@@ -43,7 +44,7 @@ export async function runPolicies([sub, ...args], flags) {
             p.priority,
             p.name,
             p.action,
-            _scope(p),
+            p.scope,
             p.enabled ? 'active' : 'paused',
             _condSummary(p),
             p.applies_to_me ? '✓' : '—',
@@ -55,10 +56,11 @@ export async function runPolicies([sub, ...args], flags) {
       case 'describe': {
         const name = flags.name;
         if (!name) { console.error('  --name is required  (tip: use single quotes for names with special chars)\n'); process.exit(1); }
-        const data = await api.agentPolicies(jwt);
+        const data = await api.agentPolicies(jwt, localTokenPrefix());
         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:        ${p.action}
@@ -66,7 +68,8 @@ export async function runPolicies([sub, ...args], flags) {
   Status:        ${p.enabled ? 'active' : 'paused'}
   Scope:         ${p.scope}
   Applies here:  ${p.applies_to_me ? 'yes' : 'no'}
-  MCPs:          ${p.mcps.length ? p.mcps.map(m => m.name).join(', ') : p.global ? 'all MCPs' : 'none'}
+  MCPs:          ${mcpList}
+  Troxy Chat:    ${p.applies_to_chat ? 'yes' : 'no'}
   Conditions:    ${_condDetail(p)}
   Created:       ${new Date(p.created_at).toLocaleDateString()}
 `);
@@ -81,6 +84,35 @@ export async function runPolicies([sub, ...args], flags) {
 
   switch (sub) {
     case 'create': {
+      if (flags.describe) {
+        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 });
+        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`);
+        break;
+      }
+
       const name   = flags.name;
       const action = (flags.action || '').toUpperCase();
       if (!name)   { console.error('  --name is required\n');   process.exit(1); }
@@ -114,34 +146,60 @@ export async function runPolicies([sub, ...args], flags) {
         conditions.push(cond);
       }
 
-      // --mcp <name>: scope policy to a specific MCP instead of all
+      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 needle = flags.mcp.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 "${flags.mcp}" not found. Run: troxy mcps list\n`);
-          process.exit(1);
+        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;
-        mcpIds   = [match.id];
-        console.log(`\n  Scoping to MCP: ${match.name || match.agent_name || match.prefix}`);
+        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 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, conditions, enabled: true, global: isGlobal, mcp_ids: mcpIds };
+      const body = { name, action, conditions, enabled: true, global: isGlobal, mcp_ids: mcpIds, applies_to_chat: appliesToChat };
       if (priority != null) body.priority = priority;
       const policy = await api.createPolicy(jwt, body);
-      const scope  = isGlobal ? 'all MCPs' : (policy.mcps?.[0]?.name || flags.mcp);
+      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}, scope: ${scope})\n`);
       break;
     }

package/src/secrets.js

@@ -0,0 +1,101 @@
+import readline       from 'readline';
+import { api }         from './api.js';
+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`,
+  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`,
+};
+
+const CTRL_C    = '';
+const BACKSPACE = '';
+
+function promptHidden(question) {
+  return new Promise(resolve => {
+    const rl = readline.createInterface({ input: process.stdin, output: null });
+    process.stdout.write(question);
+    let buf = '';
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.setEncoding('utf8');
+    const onData = chunk => {
+      for (const ch of chunk) {
+        if (ch === '\r' || ch === '\n') {
+          process.stdin.setRawMode(false);
+          process.stdin.pause();
+          process.stdin.removeListener('data', onData);
+          rl.close();
+          process.stdout.write('\n');
+          resolve(buf.trim());
+          return;
+        } else if (ch === CTRL_C) {
+          process.stdout.write('\n');
+          process.exit(0);
+        } else if (ch === BACKSPACE || ch === '\b') {
+          if (buf.length > 0) { buf = buf.slice(0, -1); process.stdout.write('\b \b'); }
+        } else if (ch >= ' ') {
+          buf += ch;
+          process.stdout.write('•');
+        }
+      }
+    };
+    process.stdin.on('data', onData);
+  });
+}
+
+export async function runSecrets([sub, ...args], flags) {
+  if (flags.help || flags.h) {
+    console.log('\n' + (HELP[sub] || `  troxy secrets <subcommand> [options]\n\n  Subcommands:\n    list      List saved LLM provider keys\n    set       Save or update a key\n    delete    Delete a key\n\n  Run 'troxy secrets <subcommand> --help' for subcommand help.\n`));
+    process.exit(0);
+  }
+
+  const jwt = requireJwt();
+
+  switch (sub || 'list') {
+    case 'list': {
+      const { secrets = [] } = await api.listSecrets(jwt);
+      if (!secrets.length) { console.log('\n  No secrets saved yet.\n'); return; }
+      console.log();
+      table(
+        ['Name', 'Type', 'Preview', 'Updated'],
+        secrets.map(s => [s.name, s.secret_type, s.masked, new Date(s.updated_at).toLocaleDateString()]),
+      );
+      if (secrets.some(s => s.secret_type === 'credit_card')) {
+        console.log('  Card secrets can only be managed from the dashboard.\n');
+      }
+      break;
+    }
+
+    case 'set': {
+      const name = flags.name;
+      if (!name) { console.error('  --name is required\n'); process.exit(1); }
+      const type = (flags.type || 'api_key').toLowerCase();
+      if (!['api_key', 'text'].includes(type)) {
+        console.error('  --type must be api_key or text. Card secrets are dashboard-only.\n'); process.exit(1);
+      }
+      const value = await promptHidden(`  Value for "${name}": `);
+      if (!value) { console.error('  No value entered. Cancelled.\n'); process.exit(1); }
+      await api.saveSecret(jwt, { name, secret_type: type, value });
+      console.log(`\n  Secret "${name}" saved ✓\n`);
+      break;
+    }
+
+    case 'delete': {
+      const name = flags.name;
+      if (!name) { console.error('  --name is required\n'); process.exit(1); }
+      const { secrets = [] } = await api.listSecrets(jwt);
+      const secret = secrets.find(s => s.name.toLowerCase() === name.toLowerCase());
+      if (!secret) { console.error(`  Secret "${name}" not found\n`); process.exit(1); }
+      await api.deleteSecret(jwt, secret.kind);
+      console.log(`\n  Secret "${name}" deleted ✓\n`);
+      break;
+    }
+
+    default:
+      console.error(`  Unknown subcommand: ${sub}`);
+      console.error('  Usage: troxy secrets [list|set|delete]\n');
+      process.exit(1);
+  }
+}

package/src/settings.js

@@ -0,0 +1,86 @@
+import { api }        from './api.js';
+import { requireJwt } from './auth.js';
+
+const VALID_TIMEOUTS = [0, 0.083, 1, 4, 8, 24, 72];
+
+const HELP = {
+  show: `  troxy settings show\n\n  Shows your account settings: default action, approval timeout, and\n  notification preferences.\n`,
+  set:  `  troxy settings set [options]\n\n  Updates account settings. Login required. Pass any combination of:\n\n    --default-action <action>     ALLOW, BLOCK, ESCALATE, or NOTIFY\n                                   (used when no policy matches a transaction)\n    --approval-timeout <hours>    ${VALID_TIMEOUTS.join(', ')}\n                                   (how long an ESCALATE hold waits before auto-resolving)\n    --notify-email <email>        Where to send decision notification emails\n    --notify-on-block             Email me when a transaction is blocked\n    --no-notify-on-block\n    --notify-on-escalate          Email me when a transaction is escalated\n    --no-notify-on-escalate\n    --notify-on-notify            Email me on NOTIFY decisions\n    --no-notify-on-notify\n    --notify-on-allow             Email me when a transaction is allowed\n    --no-notify-on-allow\n\n  Example:\n    troxy settings set --default-action BLOCK --approval-timeout 4\n`,
+};
+
+export async function runSettings([sub, ...args], flags) {
+  if (flags.help || flags.h) {
+    console.log('\n' + (HELP[sub] || `  troxy settings <subcommand> [options]\n\n  Subcommands:\n    show    Show current settings\n    set     Update settings\n\n  Run 'troxy settings <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(`
+  Email:              ${s.email}
+  Default action:      ${s.default_action}
+  Approval timeout:     ${s.approval_timeout_hours} hour${s.approval_timeout_hours === 1 ? '' : 's'}
+
+  Notifications
+    On block:          ${s.notify_prefs.email_on_block ? 'yes' : 'no'}
+    On escalate:       ${s.notify_prefs.email_on_escalate ? 'yes' : 'no'}
+    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;
+    }
+
+    case 'set': {
+      const body = {};
+
+      if (flags['default-action']) {
+        const action = flags['default-action'].toUpperCase();
+        if (!['ALLOW', 'BLOCK', 'ESCALATE', 'NOTIFY'].includes(action)) {
+          console.error('  --default-action must be ALLOW, BLOCK, ESCALATE, or NOTIFY\n'); process.exit(1);
+        }
+        body.default_action = action;
+      }
+
+      if (flags['approval-timeout'] != null) {
+        const timeout = Number(flags['approval-timeout']);
+        if (!VALID_TIMEOUTS.includes(timeout)) {
+          console.error(`  --approval-timeout must be one of: ${VALID_TIMEOUTS.join(', ')}\n`); process.exit(1);
+        }
+        body.approval_timeout_hours = timeout;
+      }
+
+      const notify_prefs = {};
+      if (flags['notify-email'] != null) notify_prefs.notify_email = flags['notify-email'];
+      if (flags['notify-on-block'])         notify_prefs.email_on_block = true;
+      if (flags['no-notify-on-block'])      notify_prefs.email_on_block = false;
+      if (flags['notify-on-escalate'])      notify_prefs.email_on_escalate = true;
+      if (flags['no-notify-on-escalate'])   notify_prefs.email_on_escalate = false;
+      if (flags['notify-on-notify'])        notify_prefs.email_on_notify = true;
+      if (flags['no-notify-on-notify'])     notify_prefs.email_on_notify = false;
+      if (flags['notify-on-allow'])         notify_prefs.email_on_allow = true;
+      if (flags['no-notify-on-allow'])      notify_prefs.email_on_allow = false;
+      if (Object.keys(notify_prefs).length) body.notify_prefs = notify_prefs;
+
+      if (Object.keys(body).length === 0) {
+        console.error('  Nothing to update — pass at least one option. Run troxy settings set --help\n');
+        process.exit(1);
+      }
+
+      await api.updateSettings(jwt, body);
+      console.log('\n  Settings updated ✓\n');
+      break;
+    }
+
+    default:
+      console.error(`  Unknown subcommand: ${sub}`);
+      console.error('  Usage: troxy settings [show|set]\n');
+      process.exit(1);
+  }
+}

package/src/uninstall.js

@@ -44,6 +44,7 @@ function removeService() {
     try { execSync('sudo systemctl stop troxy-mcp 2>/dev/null');    } catch {}
     try { execSync('sudo systemctl disable troxy-mcp 2>/dev/null'); } catch {}
     try { execSync('sudo rm -f /etc/systemd/system/troxy-mcp.service'); } catch {}
+    try { execSync('sudo rm -f /etc/troxy-mcp.env'); } catch {}
     try { execSync('sudo systemctl daemon-reload');                  } catch {}
     return true;