vpsnet-mcp 2.3.2 → 2.3.4

package/README.md

@@ -295,7 +295,7 @@ This MCP server manages your VPS infrastructure through the VPSnet.com API, incl
 
 1. AI reads the local machine's public key (`~/.ssh/id_rsa.pub`)
 2. Uploads it to VPSnet.com via `create_ssh_key`
-3. Deploys it to a VPS via `deploy_ssh_key` (or passes it when ordering with `order_service`)
+3. Deploys it to a VPS via `deploy_ssh_key` with explicit `vm:exec` permission for remote OAuth (or passes it when ordering with `order_service`)
 4. Connects directly: `ssh root@<vps_ip>`
 
 Most AI coding environments (Claude Code, Cline, Cursor, Codex) have built-in terminal access, so the AI can SSH into your VPS immediately after deploying a key — no extra tools needed.
@@ -672,7 +672,7 @@ everything else.
 | `change_title` | Change service display title | `services:manage` | free |
 | `toggle_ipv6` | Enable or disable IPv6 | `services:manage` | free |
 | `toggle_extra_settings` | Toggle ppp, fuse, tuntap, or nfs | `services:manage` | free |
-| `deploy_ssh_key` | Deploy an SSH key to a VPS | `services:manage` | free |
+| `deploy_ssh_key` | Deploy an SSH key to a VPS; remote OAuth also requires `vm:exec` | `services:manage` | free |
 
 ### OS Reinstall
 | Tool | Description | Scope | Paid |

package/build/http-server.js

@@ -44,8 +44,12 @@ export function createRemoteServer(options) {
             || typeof value.sub !== "string" || typeof value.grant_id !== "string" || typeof value.scope !== "string"
             || !Array.isArray(value.services) || !value.services.every(x => typeof x === "string"))
             return null;
+        const scopes = value.scope.split(" ").filter(x => (allowedScopes.includes(x) || x === "vm:files"));
+        // orders_available is the issuer's live client-policy decision, not a client-supplied hint.
+        // A permitted client still needs actual order authority before order capabilities are exposed.
         return { accessToken: match[1], subject: value.sub, grantId: value.grant_id,
-            expiresAt: value.exp, ordersAvailable: options.ordersEnabled === true && value.orders_available === true, scopes: value.scope.split(" ").filter(x => (allowedScopes.includes(x) || x === "vm:files")), services: value.services };
+            expiresAt: value.exp, ordersAvailable: options.ordersEnabled === true && value.orders_available === true
+                && orderScopes.some(scope => scopes.includes(scope)), scopes, services: value.services };
     }
     const http = createServer(async (req, res) => {
         // TLS terminates at the supplied reverse proxy, which must preserve Host.

package/build/index.js

@@ -41,7 +41,7 @@ const EVENT_ID_SCHEMA = z
     .describe("Numeric `event` id or `noty` UUID returned by the action");
 export function createVpsnetServer(options = {}) {
     const server = new McpServer({ name: "vpsnet", version: JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version }, {
-        instructions: options.remoteScopes ? (options.remoteProfile === "orders" ? orderInstructions : remoteInstructions) : [
+        instructions: options.remoteScopes ? (options.remoteProfile === "orders" ? orderInstructions(options.remoteScopes) : remoteInstructions) : [
             "This MCP server controls VPSnet.com services, including VPS service management, DNS zones, domain registration, domain contacts, API keys, billing, and related paid actions.",
             "Use the tool descriptions and API-key scopes to choose the correct surface; do not assume this server is limited to VPS-only operations.",
             "Auth: every request authenticates with the X-API-KEY header (your VPSNet API key). Requests are rate-limited — on HTTP 429, back off and retry after a short delay rather than hammering the endpoint.",
@@ -1661,7 +1661,7 @@ export function createVpsnetServer(options = {}) {
         return { content: [{ type: "text", text: formatJson(data) }] };
     });
     server.registerTool("deploy_ssh_key", {
-        description: "Deploy an SSH key to VPS. Returns a noty UUID; follow it with wait_for_event. ASYNC — wait 15-30 seconds after deploying before attempting SSH. Use list_ssh_keys to get available key IDs. To add your own key first: read ~/.ssh/id_rsa.pub from local machine, then create_ssh_key, then deploy it here. Requires services:manage and a full-access API key.",
+        description: "Deploy an SSH key to VPS. Returns a noty UUID; follow it with wait_for_event. ASYNC — wait 15-30 seconds after deploying before attempting SSH. Use list_ssh_keys to get available key IDs. To add your own key first: read ~/.ssh/id_rsa.pub from local machine, then create_ssh_key, then deploy it here. Remote OAuth requires vm:exec; direct API-key use requires services:manage and a full-access key.",
         inputSchema: {
             orderNo: serviceOrderNoSchema,
             ssh_key: positiveIdSchema.describe("SSH key ID from list_ssh_keys"),

package/build/remote-auth-error.js

@@ -2,7 +2,7 @@ export class RemoteAuthError extends Error {
     kind;
     scope;
     constructor(kind, scope) {
-        super(kind === 'invalid_token' ? 'The connection has expired or was revoked. Reconnect VPSnet in your AI app.' : 'This action needs an additional permission. Reconnect VPSnet and approve it.');
+        super(kind === 'invalid_token' ? 'The connection has expired or was revoked. Re-authorize this existing VPSnet connection in your AI app.' : `This action requires ${scope || 'an additional permission'}. Ask the customer to approve this permission by re-authorizing this existing VPSnet connection in their AI app.`);
         this.kind = kind;
         this.scope = scope;
     }

package/build/remote-policy.js

@@ -7,7 +7,7 @@ export const remoteInstructions = [
     "Firecracker VPS supports general-purpose and resource-intensive Linux workloads with substantial server resources and low virtualization overhead. MicroVM describes the lightweight design, not a small server limit. Consider it when KVM-specific features are unnecessary; match current plans to resource and availability requirements.",
     "Cloud VPS (KVM) offers Linux and BSD support, automatic Windows Server provisioning, three-copy Ceph NVMe storage on enterprise drives with power-loss protection (PLP), HA restart on another host after host failure, and live migration to another node for planned host upgrades, with migration back when appropriate.",
     "Use the connected VPSnet account and only the services and permissions it granted. Never request a model API key.",
-    "Tool discovery describes supported capabilities, not granted authority. If a needed permission is missing, reconnect through OAuth and let the customer select it; never work around a denial.",
+    "Tool discovery describes supported capabilities, not granted authority. Compare the scopes and selected services from get_connected_account with each tool's required scope metadata. Explain missing permissions only when relevant to the user's task. Ask the customer to approve the required permission by re-authorizing this existing VPSnet connection through the AI app's OAuth flow; never work around a denial.",
     "Inspect current capabilities and state before a change. Honor the user's existing authorization; obtain consent when a change expands the task, destroys unrelated data or adds unapproved exposure.",
     "Keep operation IDs, reason codes and idempotency keys. Accepted means pending; read the final state before claiming success.",
     "On disconnect or uncertain response, inspect the existing operation. Never issue a fresh mutation or new idempotency key automatically.",
@@ -19,10 +19,19 @@ export const remoteInstructions = [
     "This connector does not purchase capacity, change payment settings or run model inference. Functions execution uses the customer's VPSnet balance; an AI subscription does not pay those infrastructure charges.",
 ].join("\n");
 export const orderScopes = ["orders:read", "orders:servers", "orders:domains"];
-export const orderInstructions = remoteInstructions.replace("This connector does not purchase capacity, change payment settings or run model inference.", "This VPSnet connection can purchase permanent VPS servers and register domains from the customer’s VPSnet balance when purchase permissions are enabled. Use the existing connection; its owner can change purchase permissions in the VPSnet panel without reconnecting. Quote first, show the final gross EUR amount and period, and confirm only after explicit approval. Domain registration may be non-refundable. Daily and monthly limits cover this connection across token refresh. Never use a new key to retry an uncertain payment; inspect get_purchase_result. Payment settings and saved-card charges are not exposed.");
+export function orderInstructions(scopes) {
+    if (!orderScopes.some(scope => scopes.includes(scope)))
+        return remoteInstructions;
+    const products = [scopes.includes('orders:servers') ? 'purchase permanent VPS servers' : '',
+        scopes.includes('orders:domains') ? 'register domains' : ''].filter(Boolean);
+    const instructions = products.length
+        ? `This VPSnet connection can ${products.join(' and ')} from the customer’s VPSnet balance within its granted permissions. Quote first, show the final gross EUR amount and period, and confirm only after explicit approval. ${scopes.includes('orders:domains') ? 'Domain registration may be non-refundable. ' : ''}Daily and monthly limits cover this connection across token refresh. Never use a new key to retry an uncertain payment; inspect get_purchase_result. Payment settings and saved-card charges are not exposed.`
+        : 'This VPSnet connection can inspect order plans and existing purchase results within its granted permissions. It cannot submit purchases or change payment settings.';
+    return remoteInstructions.replace('This connector does not purchase capacity, change payment settings or run model inference.', instructions);
+}
 export const supportedScopes = ["services:read", "services:manage", "applications:read", "applications:manage", "networking:read", "networking:manage", "functions:read", "functions:manage", "functions:invoke", "vm:diagnostics", "vm:files:read", "vm:files:write", "vm:exec", "services:reinstall", "services:restore", "services:rescue", "dns:read", "dns:write", "dnssec:manage", "domains:read", "domains:manage", "certificates:read", "certificates:manage", "ssh_keys:read", "ssh_keys:manage"];
 const readServices = ["get_service_rescue", "get_guest_agent_status", "get_plan_options", "get_plan_resources", "calculate_plan_change", "get_period_options", "list_restore_points", "list_restore_file_points", "browse_restore_files", "get_restore_file_browse", "list_services", "get_service", "get_service_graphs", "get_service_history", "get_hostname", "get_title", "get_rdns", "get_os_options", "get_backup_status", "get_backup_history", "list_snapshots", "list_firecracker_snapshots", "get_firecracker_backup_status", "get_firecracker_backup_history"];
-const manageServices = ["suspend_service", "resume_service", "flush_iptables", "toggle_ipv6", "toggle_extra_settings", "deploy_ssh_key", "reinstall_os", "rollback_snapshot", "delete_snapshot", "rollback_firecracker_snapshot", "delete_firecracker_snapshot", "start_service", "stop_service", "restart_service", "change_hostname", "reset_hostname", "change_title", "change_rdns", "clear_rdns"];
+const manageServices = ["suspend_service", "resume_service", "flush_iptables", "toggle_ipv6", "toggle_extra_settings", "reinstall_os", "rollback_snapshot", "delete_snapshot", "rollback_firecracker_snapshot", "delete_firecracker_snapshot", "start_service", "stop_service", "restart_service", "change_hostname", "reset_hostname", "change_title", "change_rdns", "clear_rdns"];
 const readApps = ["list_application_registry_credentials", "get_application_data_restore", "list_application_catalog", "list_service_applications", "get_application_installation", "get_application_events", "get_application_health", "get_application_logs", "list_application_recipes", "list_application_recipe_revisions", "export_application_recipe", "discover_service_containers", "get_application_compose_adoption"];
 const manageApps = ["configure_application_resource_thresholds", "validate_application_recipe", "create_application_recipe", "create_application_recipe_revision", "install_application_recipe", "prepare_application_compose_adoption", "confirm_application_compose_adoption", "install_application", "configure_application_access", "manage_application", "cancel_application_action"];
 const permissions = new Map([
@@ -97,6 +106,7 @@ const permissions = new Map([
     ["get_ssh_key", "ssh_keys:read"],
     ["create_ssh_key", "ssh_keys:manage"],
     ["delete_ssh_key", "ssh_keys:manage"],
+    ["deploy_ssh_key", "vm:exec"],
     ["enter_service_rescue", "services:rescue"],
     ["exit_service_rescue", "services:rescue"],
     ["get_system_status", "authenticated"],
@@ -153,13 +163,16 @@ const deduplicatedTools = new Set([
     'run_vm_command', 'inspect_vm', 'read_vm_file', 'write_vm_file', 'create_vm_file', 'cancel_vm_operation',
     'create_function', 'invoke_function', 'confirm_service_order', 'confirm_domain_register',
 ]);
-/** Keep supported tools discoverable for incremental OAuth consent; purchases stay outside this profile. */
+/** Keep management tools discoverable for incremental consent; order tools require granted authority. */
 export function installRemotePolicy(server, scopes, profile = 'directory') {
     const original = server.registerTool.bind(server);
     const register = (name, config, handler) => {
         const required = remoteScope(name, profile);
         if (!required)
             return undefined;
+        const orderTool = profile === 'orders' && orderPermissions.has(name);
+        if (orderTool && (!orderScopes.some(scope => scopes.includes(scope)) || !hasScope(scopes, required)))
+            return undefined;
         const requiredScopes = required === "authenticated" ? [] : required === "vm:session"
             ? (scopes.some(s => s.startsWith("vm:")) ? scopes.filter(s => s.startsWith("vm:")) : ["vm:diagnostics"]) : [required];
         const readOnly = name === 'validate_application_recipe' || required === "authenticated" || required.endsWith(":read") || required === "vm:diagnostics";
@@ -210,11 +223,13 @@ export function installRemotePolicy(server, scopes, profile = 'directory') {
             _meta: { ...(config._meta || {}), securitySchemes },
         }, async (...args) => {
             const context = authorizationContext();
+            if (orderTool && (!context?.ordersAvailable || !hasScope(context.scopes, required))) {
+                return { isError: true, content: [{ type: 'text', text: 'This action is not available for this connection.' }] };
+            }
             if (!context || !hasScope(context.scopes, required)) {
-                if (required.startsWith('orders:'))
-                    return { isError: true, content: [{ type: 'text', text: 'Ordering permission is disabled. The customer can enable purchases and spending limits for this existing connection in VPSnet → AI connections → Purchase permissions. Do not add another connection. After permission is enabled, show the exact quote and ask for approval of the balance charge.' }] };
-                return { isError: true, content: [{ type: "text", text: "Reconnect VPSnet with the required permissions." }],
-                    _meta: { "mcp/www_authenticate": [`Bearer error="insufficient_scope", error_description="Reconnect VPSnet to allow this action on your selected services.", scope="${requiredScopes.join(" ")}"`] } };
+                const message = `This action requires ${requiredScopes.join(' ')}. Ask the customer to approve this permission by re-authorizing this existing VPSnet connection in their AI app.`;
+                return { isError: true, content: [{ type: "text", text: message }],
+                    _meta: { "mcp/www_authenticate": [`Bearer error="insufficient_scope", error_description="${message}", scope="${requiredScopes.join(" ")}"`] } };
             }
             let result;
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vpsnet-mcp",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "type": "module",
   "description": "MCP server for managing VPSnet.com services, applications, DNS, domains, billing, and server lifecycle operations",
   "bin": {