troxy-cli 1.4.23 → 1.6.0

package/bin/troxy.js

@@ -91,19 +91,17 @@ switch (command) {
       console.log(`
   troxy rotate-key [options]
 
-  Creates a new MCP API key, saves it to ~/.troxy/config.json, and optionally
-  revokes the old key. Login required.
+  Creates a new MCP API key, saves it to ~/.troxy/config.json, and revokes
+  the old key immediately. Login required.
 
   Options:
-    --name <name>    Name for the new key (default: "Rotated key")
-    --revoke-old     Revoke the old key immediately after creating the new one
+    --name <name>    Name for the new key (default: keeps current name)
 
   Examples:
     troxy rotate-key
-    troxy rotate-key --revoke-old
-    troxy rotate-key --name "My Agent Key" --revoke-old
+    troxy rotate-key --name "My Agent Key"
 
-  After rotating: update TROXY_API_KEY in your MCP config and restart the MCP server.
+  After rotating: run troxy restart to apply the new key.
 `);
       process.exit(0);
     }
@@ -111,11 +109,10 @@ switch (command) {
     const { loadConfig, saveConfig } = await import('../src/config.js');
     const oldKey    = loadConfig()?.apiKey;
     const oldPrefix = oldKey ? oldKey.substring(0, 11) : null;
-    const name      = flags.name || 'Rotated key';
-    const revokeOld = !!flags['revoke-old'];
+    const name = flags.name || null; // keep existing name if not specified
 
     process.stdout.write('\n  Creating new key... ');
-    const result    = await api.createToken(jwt, { name });
+    const result    = await api.createToken(jwt, { name: name || 'Rotated key' });
     const newKey    = result.key;
     const newPrefix = result.prefix;
     console.log('✓');
@@ -123,7 +120,7 @@ switch (command) {
     saveConfig({ apiKey: newKey });
     console.log('  Saved to ~/.troxy/config.json ✓');
 
-    if (revokeOld && oldPrefix) {
+    if (oldPrefix) {
       process.stdout.write(`  Revoking old key ${oldPrefix}... `);
       const { tokens = [] } = await api.listTokens(jwt);
       const old = tokens.find(t => t.prefix === oldPrefix);
@@ -133,16 +130,14 @@ switch (command) {
 
     console.log(`
   Key rotated:
-    Old:  ${oldPrefix ? oldPrefix + '...' : '(none)'}
+    Old:  ${oldPrefix ? oldPrefix + '... (revoked)' : '(none)'}
     New:  ${newPrefix}...
 
   New key (shown once — save it now):
     ${newKey}
 
   ~/.troxy/config.json updated ✓
-
-  ⚠  If this key runs an MCP, update TROXY_API_KEY in your MCP
-     config and restart the MCP server.
+  Run troxy restart to apply the new key.
 `);
     break;
   }
@@ -360,6 +355,29 @@ switch (command) {
     break;
   }
 
+  // ── Restart MCP service ───────────────────────────────────────
+  case 'restart': {
+    const { execSync: _execSyncRestart } = await import('child_process');
+    const os = (await import('os')).default;
+    console.log('\n  Restarting Troxy MCP service...');
+    try {
+      if (os.platform() === 'linux') {
+        _execSyncRestart('sudo systemctl restart troxy-mcp', { stdio: 'inherit' });
+      } else if (os.platform() === 'darwin') {
+        const { homedir } = await import('os');
+        _execSyncRestart(`launchctl unload ~/Library/LaunchAgents/io.troxy.mcp.plist 2>/dev/null; launchctl load ~/Library/LaunchAgents/io.troxy.mcp.plist`, { shell: true, stdio: 'inherit' });
+      } else {
+        console.error('\n  Restart is only supported on Linux and macOS.\n  On Windows, restart the Troxy MCP process manually.\n');
+        process.exit(1);
+      }
+      console.log('  MCP service restarted  ✓\n');
+    } catch {
+      console.error('\n  Could not restart service. Try manually:\n    Linux: sudo systemctl restart troxy-mcp\n    macOS: launchctl unload/load ~/Library/LaunchAgents/io.troxy.mcp.plist\n');
+      process.exit(1);
+    }
+    break;
+  }
+
   // ── Self-update ───────────────────────────────────────────────
   case 'update': {
     const { execSync } = await import('child_process');
@@ -431,6 +449,7 @@ switch (command) {
 
   Setup (one time, API key required)
     troxy init --key <api-key>     Connect this machine as an MCP + save key
+    troxy restart                  Restart the MCP background service
     troxy uninstall                Remove Troxy from this machine
     troxy status                   API health + MCP status (no login needed)
     troxy update                   Update to the latest version
@@ -444,8 +463,7 @@ switch (command) {
     troxy mcps rename --name "x"   Rename this machine's MCP
 
   Keys
-    troxy rotate-key               Create new MCP key + save it locally
-    troxy rotate-key --revoke-old  Same + revoke the old key immediately
+    troxy rotate-key               Rotate MCP key (revokes old, saves new locally)
 
   Policies
     troxy policies list

package/package.json

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

package/src/policies.js

@@ -15,14 +15,14 @@ const HELP = {
   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`,
   '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`,
-  enable:       `  troxy policies enable --name <policy-name>\n\n  Enables a disabled policy.\n\n  Options:\n    --name   Name of the policy to enable\n`,
-  disable:      `  troxy policies disable --name <policy-name>\n\n  Disables a policy without deleting it.\n\n  Options:\n    --name   Name of the policy to disable\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`,
   delete:       `  troxy policies delete --name <policy-name>\n\n  Permanently deletes a policy.\n\n  Options:\n    --name   Name of the policy to delete\n`,
 };
 
 export async function runPolicies([sub, ...args], flags) {
   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    set-priority   Change a policy's priority\n    enable         Enable a policy\n    disable        Disable a policy\n    delete         Delete a policy\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    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  Run 'troxy policies <subcommand> --help' for subcommand help.\n`));
     process.exit(0);
   }
 
@@ -44,7 +44,7 @@ export async function runPolicies([sub, ...args], flags) {
             p.name,
             p.action,
             _scope(p),
-            p.enabled ? 'enabled' : 'disabled',
+            p.enabled ? 'active' : 'paused',
             _condSummary(p),
             p.applies_to_me ? '✓' : '—',
           ]),
@@ -63,7 +63,7 @@ export async function runPolicies([sub, ...args], flags) {
   Name:          ${p.name}
   Action:        ${p.action}
   Priority:      ${p.priority}
-  Status:        ${p.enabled ? 'enabled' : 'disabled'}
+  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'}
@@ -159,6 +159,13 @@ export async function runPolicies([sub, ...args], flags) {
 
     case 'enable':
     case 'disable': {
+      // Old vocabulary — hard-renamed to resume/pause. Tell the user, exit.
+      const replacement = sub === 'enable' ? 'resume' : 'pause';
+      console.error(`\n  '${sub}' was renamed to '${replacement}'.\n  Run: troxy policies ${replacement} --name "<policy-name>"\n`);
+      process.exit(2);
+    }
+    case 'pause':
+    case 'resume': {
       const name = flags.name;
       if (!name) { console.error('  --name is required\n'); process.exit(1); }
       const { policies = [] } = await api.listPolicies(jwt);
@@ -172,7 +179,7 @@ export async function runPolicies([sub, ...args], flags) {
         or_conditions: policy.or_conditions || [],
         tiers:         policy.tiers || null,
         global:        policy.global !== false,
-        enabled:       sub === 'enable',
+        enabled:       sub === 'resume',
       });
       console.log(`\n  Policy "${name}" ${sub}d ✓\n`);
       break;