@metronome/mcp 2.0.0 → 2.2.0

package/src/tools/v1/customers/retrieve-billing-configurations-v1-customers.ts

@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { maybeFilter } from '@metronome/mcp/filtering';
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { isJqError, maybeFilter } from '@metronome/mcp/filtering';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -18,7 +18,7 @@ export const metadata: Metadata = {
 export const tool: Tool = {
   name: 'retrieve_billing_configurations_v1_customers',
   description:
-    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nReturns all billing configurations previously set for the customer. Use during the contract provisioning process to fetch the `billing_provider_configuration_id` needed to set the contract billing configuration.\n\n\n# Response Schema\n```json\n{\n  $ref: '#/$defs/customer_retrieve_billing_configurations_response',\n  $defs: {\n    customer_retrieve_billing_configurations_response: {\n      type: 'object',\n      properties: {\n        data: {\n          type: 'array',\n          items: {\n            type: 'object',\n            properties: {\n              id: {\n                type: 'string',\n                description: 'ID of this configuration; can be provided as the billing_provider_configuration_id when creating a contract.'\n              },\n              archived_at: {\n                type: 'string',\n                format: 'date-time'\n              },\n              billing_provider: {\n                type: 'string',\n                description: 'The billing provider set for this configuration.',\n                enum: [                  'aws_marketplace',\n                  'stripe',\n                  'netsuite',\n                  'custom',\n                  'azure_marketplace',\n                  'quickbooks_online',\n                  'workday',\n                  'gcp_marketplace'\n                ]\n              },\n              configuration: {\n                type: 'object',\n                description: 'Configuration for the billing provider. The structure of this object is specific to the billing provider.',\n                additionalProperties: true\n              },\n              customer_id: {\n                type: 'string'\n              },\n              delivery_method: {\n                type: 'string',\n                description: 'The method to use for delivering invoices to this customer.',\n                enum: [                  'direct_to_billing_provider',\n                  'aws_sqs',\n                  'tackle',\n                  'aws_sns'\n                ]\n              },\n              delivery_method_configuration: {\n                type: 'object',\n                description: 'Configuration for the delivery method. The structure of this object is specific to the delivery method.',\n                additionalProperties: true\n              },\n              delivery_method_id: {\n                type: 'string',\n                description: 'ID of the delivery method to use for this customer.'\n              }\n            },\n            required: [              'id',\n              'archived_at',\n              'billing_provider',\n              'configuration',\n              'customer_id',\n              'delivery_method',\n              'delivery_method_configuration',\n              'delivery_method_id'\n            ]\n          }\n        }\n      },\n      required: [        'data'\n      ]\n    }\n  }\n}\n```",
+    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nReturns all billing configurations previously set for the customer. Use during the contract provisioning process to fetch the `billing_provider_configuration_id` needed to set the contract billing configuration.\n\n\n# Response Schema\n```json\n{\n  $ref: '#/$defs/customer_retrieve_billing_configurations_response',\n  $defs: {\n    customer_retrieve_billing_configurations_response: {\n      type: 'object',\n      properties: {\n        data: {\n          type: 'array',\n          items: {\n            type: 'object',\n            properties: {\n              id: {\n                type: 'string',\n                description: 'ID of this configuration; can be provided as the billing_provider_configuration_id when creating a contract.'\n              },\n              archived_at: {\n                type: 'string',\n                format: 'date-time'\n              },\n              billing_provider: {\n                type: 'string',\n                description: 'The billing provider set for this configuration.',\n                enum: [                  'aws_marketplace',\n                  'stripe',\n                  'netsuite',\n                  'custom',\n                  'azure_marketplace',\n                  'quickbooks_online',\n                  'workday',\n                  'gcp_marketplace',\n                  'metronome'\n                ]\n              },\n              configuration: {\n                type: 'object',\n                description: 'Configuration for the billing provider. The structure of this object is specific to the billing provider.',\n                additionalProperties: true\n              },\n              customer_id: {\n                type: 'string'\n              },\n              delivery_method: {\n                type: 'string',\n                description: 'The method to use for delivering invoices to this customer.',\n                enum: [                  'direct_to_billing_provider',\n                  'aws_sqs',\n                  'tackle',\n                  'aws_sns'\n                ]\n              },\n              delivery_method_configuration: {\n                type: 'object',\n                description: 'Configuration for the delivery method. The structure of this object is specific to the delivery method.',\n                additionalProperties: true\n              },\n              delivery_method_id: {\n                type: 'string',\n                description: 'ID of the delivery method to use for this customer.'\n              }\n            },\n            required: [              'id',\n              'archived_at',\n              'billing_provider',\n              'configuration',\n              'customer_id',\n              'delivery_method',\n              'delivery_method_configuration',\n              'delivery_method_id'\n            ]\n          }\n        }\n      },\n      required: [        'data'\n      ]\n    }\n  }\n}\n```",
   inputSchema: {
     type: 'object',
     properties: {
@@ -42,9 +42,16 @@ export const tool: Tool = {
 
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const { jq_filter, ...body } = args as any;
-  return asTextContentResult(
-    await maybeFilter(jq_filter, await client.v1.customers.retrieveBillingConfigurations(body)),
-  );
+  try {
+    return asTextContentResult(
+      await maybeFilter(jq_filter, await client.v1.customers.retrieveBillingConfigurations(body)),
+    );
+  } catch (error) {
+    if (error instanceof Metronome.APIError || isJqError(error)) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/customers/retrieve-v1-customers.ts

@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { maybeFilter } from '@metronome/mcp/filtering';
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { isJqError, maybeFilter } from '@metronome/mcp/filtering';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -41,7 +41,14 @@ export const tool: Tool = {
 
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const { jq_filter, ...body } = args as any;
-  return asTextContentResult(await maybeFilter(jq_filter, await client.v1.customers.retrieve(body)));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await client.v1.customers.retrieve(body)));
+  } catch (error) {
+    if (error instanceof Metronome.APIError || isJqError(error)) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/customers/set-billing-configurations-v1-customers.ts

@@ -1,6 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { isJqError, maybeFilter } from '@metronome/mcp/filtering';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -17,7 +18,7 @@ export const metadata: Metadata = {
 export const tool: Tool = {
   name: 'set_billing_configurations_v1_customers',
   description:
-    "Create a billing configuration for a customer. Once created, these configurations are available to associate to a contract and dictates which downstream system to collect payment in or send the invoice to. You can create multiple configurations per customer. The configuration formats are distinct for each downstream provider.\n\n### Use this endpoint to:\n- Add the initial configuration to an existing customer. Once created, the billing configuration can then be associated to the customer's contract.\n- Add a new configuration to an existing customer. This might be used as part of an upgrade or downgrade workflow where the customer was previously billed through system A (e.g. Stripe) but will now be billed through system B (e.g. AWS). Once created, the new configuration can then be associated to the customer's contract.\n- Multiple configurations can be added per destination. For example, you can create two Stripe billing configurations for a Metronome customer that each have a distinct `collection_method`.\n\n### Delivery method options:\n- `direct_to_billing_provider`: Use when Metronome should send invoices directly to the billing provider's API (e.g., Stripe, NetSuite). This is the most common method for automated billing workflows.\n- `tackle`: Use specifically for AWS Marketplace transactions that require Tackle's co-selling platform for partner attribution and commission tracking.\n- `aws_sqs`: Use when you want invoice data delivered to an AWS SQS queue for custom processing before sending to your billing system.\n- `aws_sns`: Use when you want invoice notifications published to an AWS SNS topic for event-driven billing workflows.\n\n### Key response fields: \nThe id for the customer billing configuration. This id can be used to associate the billing configuration to a contract.\n\n### Usage guidelines:\nMust use the `delivery_method_id` if you have multiple Stripe accounts connected to Metronome.\n",
+    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nCreate a billing configuration for a customer. Once created, these configurations are available to associate to a contract and dictates which downstream system to collect payment in or send the invoice to. You can create multiple configurations per customer. The configuration formats are distinct for each downstream provider.\n\n### Use this endpoint to:\n- Add the initial configuration to an existing customer. Once created, the billing configuration can then be associated to the customer's contract.\n- Add a new configuration to an existing customer. This might be used as part of an upgrade or downgrade workflow where the customer was previously billed through system A (e.g. Stripe) but will now be billed through system B (e.g. AWS). Once created, the new configuration can then be associated to the customer's contract.\n- Multiple configurations can be added per destination. For example, you can create two Stripe billing configurations for a Metronome customer that each have a distinct `collection_method`.\n\n### Delivery method options:\n- `direct_to_billing_provider`: Use when Metronome should send invoices directly to the billing provider's API (e.g., Stripe, NetSuite). This is the most common method for automated billing workflows.\n- `tackle`: Use specifically for AWS Marketplace transactions that require Tackle's co-selling platform for partner attribution and commission tracking.\n- `aws_sqs`: Use when you want invoice data delivered to an AWS SQS queue for custom processing before sending to your billing system.\n- `aws_sns`: Use when you want invoice notifications published to an AWS SNS topic for event-driven billing workflows.\n\n### Key response fields: \nThe id for the customer billing configuration. This id can be used to associate the billing configuration to a contract.\n\n### Usage guidelines:\nMust use the `delivery_method_id` if you have multiple Stripe accounts connected to Metronome.\n\n\n# Response Schema\n```json\n{\n  $ref: '#/$defs/customer_set_billing_configurations_response',\n  $defs: {\n    customer_set_billing_configurations_response: {\n      type: 'object',\n      properties: {\n        data: {\n          type: 'array',\n          items: {\n            type: 'object',\n            properties: {\n              id: {\n                type: 'string',\n                description: 'ID of the created configuration'\n              },\n              billing_provider: {\n                type: 'string',\n                description: 'The billing provider set for this configuration.',\n                enum: [                  'aws_marketplace',\n                  'stripe',\n                  'netsuite',\n                  'custom',\n                  'azure_marketplace',\n                  'quickbooks_online',\n                  'workday',\n                  'gcp_marketplace',\n                  'metronome'\n                ]\n              },\n              configuration: {\n                type: 'object',\n                description: 'Configuration for the billing provider. The structure of this object is specific to the billing provider and delivery method combination.',\n                additionalProperties: true\n              },\n              customer_id: {\n                type: 'string',\n                description: 'ID of the customer this configuration is associated with.'\n              },\n              delivery_method_id: {\n                type: 'string',\n                description: 'ID of the delivery method used for this customer configuration.'\n              },\n              tax_provider: {\n                type: 'string',\n                description: 'The tax provider set for this configuration.',\n                enum: [                  'anrok',\n                  'avalara',\n                  'stripe'\n                ]\n              }\n            }\n          }\n        }\n      },\n      required: [        'data'\n      ]\n    }\n  }\n}\n```",
   inputSchema: {
     type: 'object',
     properties: {
@@ -38,6 +39,7 @@ export const tool: Tool = {
                 'quickbooks_online',
                 'workday',
                 'gcp_marketplace',
+                'metronome',
               ],
             },
             customer_id: {
@@ -70,6 +72,12 @@ export const tool: Tool = {
           required: ['billing_provider', 'customer_id'],
         },
       },
+      jq_filter: {
+        type: 'string',
+        title: 'jq Filter',
+        description:
+          'A jq filter to apply to the response to include certain fields. Consult the output schema in the tool description to see the fields that are available.\n\nFor example: to include only the `name` field in every object of a results array, you can provide ".results[].name".\n\nFor more information, see the [jq documentation](https://jqlang.org/manual/).',
+      },
     },
     required: ['data'],
   },
@@ -77,9 +85,17 @@ export const tool: Tool = {
 };
 
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
-  const body = args as any;
-  const response = await client.v1.customers.setBillingConfigurations(body).asResponse();
-  return asTextContentResult(await response.text());
+  const { jq_filter, ...body } = args as any;
+  try {
+    return asTextContentResult(
+      await maybeFilter(jq_filter, await client.v1.customers.setBillingConfigurations(body)),
+    );
+  } catch (error) {
+    if (error instanceof Metronome.APIError || isJqError(error)) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/customers/set-name-v1-customers.ts

@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { maybeFilter } from '@metronome/mcp/filtering';
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { isJqError, maybeFilter } from '@metronome/mcp/filtering';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -44,7 +44,14 @@ export const tool: Tool = {
 
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const { jq_filter, ...body } = args as any;
-  return asTextContentResult(await maybeFilter(jq_filter, await client.v1.customers.setName(body)));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await client.v1.customers.setName(body)));
+  } catch (error) {
+    if (error instanceof Metronome.APIError || isJqError(error)) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/dashboards/get-embeddable-url-v1-dashboards.ts

@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { maybeFilter } from '@metronome/mcp/filtering';
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { isJqError, maybeFilter } from '@metronome/mcp/filtering';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -126,7 +126,16 @@ export const tool: Tool = {
 
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const { jq_filter, ...body } = args as any;
-  return asTextContentResult(await maybeFilter(jq_filter, await client.v1.dashboards.getEmbeddableURL(body)));
+  try {
+    return asTextContentResult(
+      await maybeFilter(jq_filter, await client.v1.dashboards.getEmbeddableURL(body)),
+    );
+  } catch (error) {
+    if (error instanceof Metronome.APIError || isJqError(error)) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/invoices/regenerate-v1-invoices.ts

@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { maybeFilter } from '@metronome/mcp/filtering';
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { isJqError, maybeFilter } from '@metronome/mcp/filtering';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -40,7 +40,14 @@ export const tool: Tool = {
 
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const { jq_filter, ...body } = args as any;
-  return asTextContentResult(await maybeFilter(jq_filter, await client.v1.invoices.regenerate(body)));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await client.v1.invoices.regenerate(body)));
+  } catch (error) {
+    if (error instanceof Metronome.APIError || isJqError(error)) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/invoices/void-v1-invoices.ts

@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { maybeFilter } from '@metronome/mcp/filtering';
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { isJqError, maybeFilter } from '@metronome/mcp/filtering';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -40,7 +40,14 @@ export const tool: Tool = {
 
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const { jq_filter, ...body } = args as any;
-  return asTextContentResult(await maybeFilter(jq_filter, await client.v1.invoices.void(body)));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await client.v1.invoices.void(body)));
+  } catch (error) {
+    if (error instanceof Metronome.APIError || isJqError(error)) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/payments/attempt-v1-payments.ts

@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { maybeFilter } from '@metronome/mcp/filtering';
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { isJqError, maybeFilter } from '@metronome/mcp/filtering';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -18,7 +18,7 @@ export const metadata: Metadata = {
 export const tool: Tool = {
   name: 'attempt_v1_payments',
   description:
-    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nTrigger a new attempt by canceling any existing attempts for this invoice and creating a new Payment. This will trigger another attempt to charge the Customer's configured Payment Gateway. \nPayment can only be attempted if all of the following are true:\n  - The Metronome Invoice is finalized\n  - PLG Invoicing is configured for the Customer\n  - You cannot attempt payments for invoices that have already been `paid` or `voided`.\n\nAttempting to payment on an ineligible Invoice or Customer will result in a `400` response.\n\n\n# Response Schema\n```json\n{\n  $ref: '#/$defs/payment_attempt_response',\n  $defs: {\n    payment_attempt_response: {\n      type: 'object',\n      properties: {\n        data: {\n          $ref: '#/$defs/payment'\n        }\n      },\n      required: [        'data'\n      ]\n    },\n    payment: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        amount: {\n          type: 'number'\n        },\n        amount_paid: {\n          type: 'number'\n        },\n        contract_id: {\n          type: 'string'\n        },\n        created_at: {\n          type: 'string',\n          format: 'date-time'\n        },\n        customer_id: {\n          type: 'string'\n        },\n        error_message: {\n          type: 'string'\n        },\n        fiat_credit_type: {\n          $ref: '#/$defs/credit_type_data'\n        },\n        invoice_id: {\n          type: 'string'\n        },\n        payment_gateway: {\n          type: 'object',\n          properties: {\n            stripe: {\n              type: 'object',\n              properties: {\n                payment_intent_id: {\n                  type: 'string'\n                },\n                error: {\n                  type: 'object',\n                  properties: {\n                    code: {\n                      type: 'string'\n                    },\n                    decline_code: {\n                      type: 'string'\n                    },\n                    type: {\n                      type: 'string'\n                    }\n                  }\n                }\n              },\n              required: [                'payment_intent_id'\n              ]\n            },\n            type: {\n              type: 'string',\n              enum: [                'stripe'\n              ]\n            }\n          },\n          required: [            'stripe',\n            'type'\n          ]\n        },\n        status: {\n          $ref: '#/$defs/payment_status'\n        },\n        updated_at: {\n          type: 'string',\n          format: 'date-time'\n        }\n      },\n      required: [        'id'\n      ]\n    },\n    credit_type_data: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        name: {\n          type: 'string'\n        }\n      },\n      required: [        'id',\n        'name'\n      ]\n    },\n    payment_status: {\n      type: 'string',\n      enum: [        'pending',\n        'requires_intervention',\n        'paid',\n        'canceled'\n      ]\n    }\n  }\n}\n```",
+    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nTrigger a new attempt by canceling any existing attempts for this invoice and creating a new Payment. This will trigger another attempt to charge the Customer's configured Payment Gateway. \nPayment can only be attempted if all of the following are true:\n  - The Metronome Invoice is finalized\n  - PLG Invoicing is configured for the Customer\n  - You cannot attempt payments for invoices that have already been `paid` or `voided`.\n\nAttempting to payment on an ineligible Invoice or Customer will result in a `400` response.\n\n\n# Response Schema\n```json\n{\n  $ref: '#/$defs/payment_attempt_response',\n  $defs: {\n    payment_attempt_response: {\n      type: 'object',\n      properties: {\n        data: {\n          $ref: '#/$defs/payment'\n        }\n      },\n      required: [        'data'\n      ]\n    },\n    payment: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        amount: {\n          type: 'number'\n        },\n        amount_paid: {\n          type: 'number'\n        },\n        contract_id: {\n          type: 'string'\n        },\n        created_at: {\n          type: 'string',\n          format: 'date-time'\n        },\n        customer_id: {\n          type: 'string'\n        },\n        error_message: {\n          type: 'string'\n        },\n        fiat_credit_type: {\n          $ref: '#/$defs/credit_type_data'\n        },\n        invoice_id: {\n          type: 'string'\n        },\n        payment_gateway: {\n          type: 'object',\n          properties: {\n            stripe: {\n              type: 'object',\n              properties: {\n                payment_intent_id: {\n                  type: 'string'\n                },\n                error: {\n                  type: 'object',\n                  properties: {\n                    code: {\n                      type: 'string'\n                    },\n                    decline_code: {\n                      type: 'string'\n                    },\n                    type: {\n                      type: 'string'\n                    }\n                  }\n                },\n                payment_method_id: {\n                  type: 'string'\n                }\n              },\n              required: [                'payment_intent_id'\n              ]\n            },\n            type: {\n              type: 'string',\n              enum: [                'stripe'\n              ]\n            }\n          },\n          required: [            'stripe',\n            'type'\n          ]\n        },\n        status: {\n          $ref: '#/$defs/payment_status'\n        },\n        updated_at: {\n          type: 'string',\n          format: 'date-time'\n        }\n      },\n      required: [        'id'\n      ]\n    },\n    credit_type_data: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        name: {\n          type: 'string'\n        }\n      },\n      required: [        'id',\n        'name'\n      ]\n    },\n    payment_status: {\n      type: 'string',\n      enum: [        'pending',\n        'requires_intervention',\n        'paid',\n        'canceled'\n      ]\n    }\n  }\n}\n```",
   inputSchema: {
     type: 'object',
     properties: {
@@ -42,7 +42,14 @@ export const tool: Tool = {
 
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const { jq_filter, ...body } = args as any;
-  return asTextContentResult(await maybeFilter(jq_filter, await client.v1.payments.attempt(body)));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await client.v1.payments.attempt(body)));
+  } catch (error) {
+    if (error instanceof Metronome.APIError || isJqError(error)) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/payments/cancel-v1-payments.ts

@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { maybeFilter } from '@metronome/mcp/filtering';
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { isJqError, maybeFilter } from '@metronome/mcp/filtering';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -18,7 +18,7 @@ export const metadata: Metadata = {
 export const tool: Tool = {
   name: 'cancel_v1_payments',
   description:
-    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nCancel an existing payment attempt for an invoice.\n\n\n# Response Schema\n```json\n{\n  $ref: '#/$defs/payment_cancel_response',\n  $defs: {\n    payment_cancel_response: {\n      type: 'object',\n      properties: {\n        data: {\n          $ref: '#/$defs/payment'\n        }\n      },\n      required: [        'data'\n      ]\n    },\n    payment: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        amount: {\n          type: 'number'\n        },\n        amount_paid: {\n          type: 'number'\n        },\n        contract_id: {\n          type: 'string'\n        },\n        created_at: {\n          type: 'string',\n          format: 'date-time'\n        },\n        customer_id: {\n          type: 'string'\n        },\n        error_message: {\n          type: 'string'\n        },\n        fiat_credit_type: {\n          $ref: '#/$defs/credit_type_data'\n        },\n        invoice_id: {\n          type: 'string'\n        },\n        payment_gateway: {\n          type: 'object',\n          properties: {\n            stripe: {\n              type: 'object',\n              properties: {\n                payment_intent_id: {\n                  type: 'string'\n                },\n                error: {\n                  type: 'object',\n                  properties: {\n                    code: {\n                      type: 'string'\n                    },\n                    decline_code: {\n                      type: 'string'\n                    },\n                    type: {\n                      type: 'string'\n                    }\n                  }\n                }\n              },\n              required: [                'payment_intent_id'\n              ]\n            },\n            type: {\n              type: 'string',\n              enum: [                'stripe'\n              ]\n            }\n          },\n          required: [            'stripe',\n            'type'\n          ]\n        },\n        status: {\n          $ref: '#/$defs/payment_status'\n        },\n        updated_at: {\n          type: 'string',\n          format: 'date-time'\n        }\n      },\n      required: [        'id'\n      ]\n    },\n    credit_type_data: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        name: {\n          type: 'string'\n        }\n      },\n      required: [        'id',\n        'name'\n      ]\n    },\n    payment_status: {\n      type: 'string',\n      enum: [        'pending',\n        'requires_intervention',\n        'paid',\n        'canceled'\n      ]\n    }\n  }\n}\n```",
+    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nCancel an existing payment attempt for an invoice.\n\n\n# Response Schema\n```json\n{\n  $ref: '#/$defs/payment_cancel_response',\n  $defs: {\n    payment_cancel_response: {\n      type: 'object',\n      properties: {\n        data: {\n          $ref: '#/$defs/payment'\n        }\n      },\n      required: [        'data'\n      ]\n    },\n    payment: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        amount: {\n          type: 'number'\n        },\n        amount_paid: {\n          type: 'number'\n        },\n        contract_id: {\n          type: 'string'\n        },\n        created_at: {\n          type: 'string',\n          format: 'date-time'\n        },\n        customer_id: {\n          type: 'string'\n        },\n        error_message: {\n          type: 'string'\n        },\n        fiat_credit_type: {\n          $ref: '#/$defs/credit_type_data'\n        },\n        invoice_id: {\n          type: 'string'\n        },\n        payment_gateway: {\n          type: 'object',\n          properties: {\n            stripe: {\n              type: 'object',\n              properties: {\n                payment_intent_id: {\n                  type: 'string'\n                },\n                error: {\n                  type: 'object',\n                  properties: {\n                    code: {\n                      type: 'string'\n                    },\n                    decline_code: {\n                      type: 'string'\n                    },\n                    type: {\n                      type: 'string'\n                    }\n                  }\n                },\n                payment_method_id: {\n                  type: 'string'\n                }\n              },\n              required: [                'payment_intent_id'\n              ]\n            },\n            type: {\n              type: 'string',\n              enum: [                'stripe'\n              ]\n            }\n          },\n          required: [            'stripe',\n            'type'\n          ]\n        },\n        status: {\n          $ref: '#/$defs/payment_status'\n        },\n        updated_at: {\n          type: 'string',\n          format: 'date-time'\n        }\n      },\n      required: [        'id'\n      ]\n    },\n    credit_type_data: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        name: {\n          type: 'string'\n        }\n      },\n      required: [        'id',\n        'name'\n      ]\n    },\n    payment_status: {\n      type: 'string',\n      enum: [        'pending',\n        'requires_intervention',\n        'paid',\n        'canceled'\n      ]\n    }\n  }\n}\n```",
   inputSchema: {
     type: 'object',
     properties: {
@@ -42,7 +42,14 @@ export const tool: Tool = {
 
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const { jq_filter, ...body } = args as any;
-  return asTextContentResult(await maybeFilter(jq_filter, await client.v1.payments.cancel(body)));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await client.v1.payments.cancel(body)));
+  } catch (error) {
+    if (error instanceof Metronome.APIError || isJqError(error)) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/payments/list-v1-payments.ts

@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { maybeFilter } from '@metronome/mcp/filtering';
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { isJqError, maybeFilter } from '@metronome/mcp/filtering';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -18,7 +18,7 @@ export const metadata: Metadata = {
 export const tool: Tool = {
   name: 'list_v1_payments',
   description:
-    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nFetch all payment attempts for the given invoice.\n\n\n# Response Schema\n```json\n{\n  type: 'object',\n  properties: {\n    data: {\n      type: 'array',\n      items: {\n        $ref: '#/$defs/payment'\n      }\n    },\n    next_page: {\n      type: 'string'\n    }\n  },\n  required: [    'data'\n  ],\n  $defs: {\n    payment: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        amount: {\n          type: 'number'\n        },\n        amount_paid: {\n          type: 'number'\n        },\n        contract_id: {\n          type: 'string'\n        },\n        created_at: {\n          type: 'string',\n          format: 'date-time'\n        },\n        customer_id: {\n          type: 'string'\n        },\n        error_message: {\n          type: 'string'\n        },\n        fiat_credit_type: {\n          $ref: '#/$defs/credit_type_data'\n        },\n        invoice_id: {\n          type: 'string'\n        },\n        payment_gateway: {\n          type: 'object',\n          properties: {\n            stripe: {\n              type: 'object',\n              properties: {\n                payment_intent_id: {\n                  type: 'string'\n                },\n                error: {\n                  type: 'object',\n                  properties: {\n                    code: {\n                      type: 'string'\n                    },\n                    decline_code: {\n                      type: 'string'\n                    },\n                    type: {\n                      type: 'string'\n                    }\n                  }\n                }\n              },\n              required: [                'payment_intent_id'\n              ]\n            },\n            type: {\n              type: 'string',\n              enum: [                'stripe'\n              ]\n            }\n          },\n          required: [            'stripe',\n            'type'\n          ]\n        },\n        status: {\n          $ref: '#/$defs/payment_status'\n        },\n        updated_at: {\n          type: 'string',\n          format: 'date-time'\n        }\n      },\n      required: [        'id'\n      ]\n    },\n    credit_type_data: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        name: {\n          type: 'string'\n        }\n      },\n      required: [        'id',\n        'name'\n      ]\n    },\n    payment_status: {\n      type: 'string',\n      enum: [        'pending',\n        'requires_intervention',\n        'paid',\n        'canceled'\n      ]\n    }\n  }\n}\n```",
+    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nFetch all payment attempts for the given invoice.\n\n\n# Response Schema\n```json\n{\n  type: 'object',\n  properties: {\n    data: {\n      type: 'array',\n      items: {\n        $ref: '#/$defs/payment'\n      }\n    },\n    next_page: {\n      type: 'string'\n    }\n  },\n  required: [    'data'\n  ],\n  $defs: {\n    payment: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        amount: {\n          type: 'number'\n        },\n        amount_paid: {\n          type: 'number'\n        },\n        contract_id: {\n          type: 'string'\n        },\n        created_at: {\n          type: 'string',\n          format: 'date-time'\n        },\n        customer_id: {\n          type: 'string'\n        },\n        error_message: {\n          type: 'string'\n        },\n        fiat_credit_type: {\n          $ref: '#/$defs/credit_type_data'\n        },\n        invoice_id: {\n          type: 'string'\n        },\n        payment_gateway: {\n          type: 'object',\n          properties: {\n            stripe: {\n              type: 'object',\n              properties: {\n                payment_intent_id: {\n                  type: 'string'\n                },\n                error: {\n                  type: 'object',\n                  properties: {\n                    code: {\n                      type: 'string'\n                    },\n                    decline_code: {\n                      type: 'string'\n                    },\n                    type: {\n                      type: 'string'\n                    }\n                  }\n                },\n                payment_method_id: {\n                  type: 'string'\n                }\n              },\n              required: [                'payment_intent_id'\n              ]\n            },\n            type: {\n              type: 'string',\n              enum: [                'stripe'\n              ]\n            }\n          },\n          required: [            'stripe',\n            'type'\n          ]\n        },\n        status: {\n          $ref: '#/$defs/payment_status'\n        },\n        updated_at: {\n          type: 'string',\n          format: 'date-time'\n        }\n      },\n      required: [        'id'\n      ]\n    },\n    credit_type_data: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        name: {\n          type: 'string'\n        }\n      },\n      required: [        'id',\n        'name'\n      ]\n    },\n    payment_status: {\n      type: 'string',\n      enum: [        'pending',\n        'requires_intervention',\n        'paid',\n        'canceled'\n      ]\n    }\n  }\n}\n```",
   inputSchema: {
     type: 'object',
     properties: {
@@ -63,7 +63,14 @@ export const tool: Tool = {
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const { jq_filter, ...body } = args as any;
   const response = await client.v1.payments.list(body).asResponse();
-  return asTextContentResult(await maybeFilter(jq_filter, await response.json()));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await response.json()));
+  } catch (error) {
+    if (error instanceof Metronome.APIError || isJqError(error)) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/plans/get-details-v1-plans.ts

@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { maybeFilter } from '@metronome/mcp/filtering';
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { isJqError, maybeFilter } from '@metronome/mcp/filtering';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -18,7 +18,7 @@ export const metadata: Metadata = {
 export const tool: Tool = {
   name: 'get_details_v1_plans',
   description:
-    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nFetch high level details of a specific plan.\n\n# Response Schema\n```json\n{\n  $ref: '#/$defs/plan_get_details_response',\n  $defs: {\n    plan_get_details_response: {\n      type: 'object',\n      properties: {\n        data: {\n          $ref: '#/$defs/plan_detail'\n        }\n      },\n      required: [        'data'\n      ]\n    },\n    plan_detail: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        custom_fields: {\n          type: 'object',\n          description: 'Custom fields to be added eg. { \"key1\": \"value1\", \"key2\": \"value2\" }',\n          additionalProperties: true\n        },\n        name: {\n          type: 'string'\n        },\n        credit_grants: {\n          type: 'array',\n          items: {\n            type: 'object',\n            properties: {\n              amount_granted: {\n                type: 'number'\n              },\n              amount_granted_credit_type: {\n                $ref: '#/$defs/credit_type_data'\n              },\n              amount_paid: {\n                type: 'number'\n              },\n              amount_paid_credit_type: {\n                $ref: '#/$defs/credit_type_data'\n              },\n              effective_duration: {\n                type: 'number'\n              },\n              name: {\n                type: 'string'\n              },\n              priority: {\n                type: 'string'\n              },\n              send_invoice: {\n                type: 'boolean'\n              },\n              reason: {\n                type: 'string'\n              },\n              recurrence_duration: {\n                type: 'number'\n              },\n              recurrence_interval: {\n                type: 'number'\n              }\n            },\n            required: [              'amount_granted',\n              'amount_granted_credit_type',\n              'amount_paid',\n              'amount_paid_credit_type',\n              'effective_duration',\n              'name',\n              'priority',\n              'send_invoice'\n            ]\n          }\n        },\n        description: {\n          type: 'string'\n        },\n        minimums: {\n          type: 'array',\n          items: {\n            type: 'object',\n            properties: {\n              credit_type: {\n                $ref: '#/$defs/credit_type_data'\n              },\n              name: {\n                type: 'string'\n              },\n              start_period: {\n                type: 'number',\n                description: 'Used in price ramps.  Indicates how many billing periods pass before the charge applies.'\n              },\n              value: {\n                type: 'number'\n              }\n            },\n            required: [              'credit_type',\n              'name',\n              'start_period',\n              'value'\n            ]\n          }\n        },\n        overage_rates: {\n          type: 'array',\n          items: {\n            type: 'object',\n            properties: {\n              credit_type: {\n                $ref: '#/$defs/credit_type_data'\n              },\n              fiat_credit_type: {\n                $ref: '#/$defs/credit_type_data'\n              },\n              start_period: {\n                type: 'number',\n                description: 'Used in price ramps.  Indicates how many billing periods pass before the charge applies.'\n              },\n              to_fiat_conversion_factor: {\n                type: 'number'\n              }\n            },\n            required: [              'credit_type',\n              'fiat_credit_type',\n              'start_period',\n              'to_fiat_conversion_factor'\n            ]\n          }\n        }\n      },\n      required: [        'id',\n        'custom_fields',\n        'name'\n      ]\n    },\n    credit_type_data: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        name: {\n          type: 'string'\n        }\n      },\n      required: [        'id',\n        'name'\n      ]\n    }\n  }\n}\n```",
+    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nFetch high level details of a specific plan. This is a Plans (deprecated) endpoint. New clients should implement using Contracts.\n\n\n# Response Schema\n```json\n{\n  $ref: '#/$defs/plan_get_details_response',\n  $defs: {\n    plan_get_details_response: {\n      type: 'object',\n      properties: {\n        data: {\n          $ref: '#/$defs/plan_detail'\n        }\n      },\n      required: [        'data'\n      ]\n    },\n    plan_detail: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        custom_fields: {\n          type: 'object',\n          description: 'Custom fields to be added eg. { \"key1\": \"value1\", \"key2\": \"value2\" }',\n          additionalProperties: true\n        },\n        name: {\n          type: 'string'\n        },\n        credit_grants: {\n          type: 'array',\n          items: {\n            type: 'object',\n            properties: {\n              amount_granted: {\n                type: 'number'\n              },\n              amount_granted_credit_type: {\n                $ref: '#/$defs/credit_type_data'\n              },\n              amount_paid: {\n                type: 'number'\n              },\n              amount_paid_credit_type: {\n                $ref: '#/$defs/credit_type_data'\n              },\n              effective_duration: {\n                type: 'number'\n              },\n              name: {\n                type: 'string'\n              },\n              priority: {\n                type: 'string'\n              },\n              send_invoice: {\n                type: 'boolean'\n              },\n              reason: {\n                type: 'string'\n              },\n              recurrence_duration: {\n                type: 'number'\n              },\n              recurrence_interval: {\n                type: 'number'\n              }\n            },\n            required: [              'amount_granted',\n              'amount_granted_credit_type',\n              'amount_paid',\n              'amount_paid_credit_type',\n              'effective_duration',\n              'name',\n              'priority',\n              'send_invoice'\n            ]\n          }\n        },\n        description: {\n          type: 'string'\n        },\n        minimums: {\n          type: 'array',\n          items: {\n            type: 'object',\n            properties: {\n              credit_type: {\n                $ref: '#/$defs/credit_type_data'\n              },\n              name: {\n                type: 'string'\n              },\n              start_period: {\n                type: 'number',\n                description: 'Used in price ramps.  Indicates how many billing periods pass before the charge applies.'\n              },\n              value: {\n                type: 'number'\n              }\n            },\n            required: [              'credit_type',\n              'name',\n              'start_period',\n              'value'\n            ]\n          }\n        },\n        overage_rates: {\n          type: 'array',\n          items: {\n            type: 'object',\n            properties: {\n              credit_type: {\n                $ref: '#/$defs/credit_type_data'\n              },\n              fiat_credit_type: {\n                $ref: '#/$defs/credit_type_data'\n              },\n              start_period: {\n                type: 'number',\n                description: 'Used in price ramps.  Indicates how many billing periods pass before the charge applies.'\n              },\n              to_fiat_conversion_factor: {\n                type: 'number'\n              }\n            },\n            required: [              'credit_type',\n              'fiat_credit_type',\n              'start_period',\n              'to_fiat_conversion_factor'\n            ]\n          }\n        }\n      },\n      required: [        'id',\n        'custom_fields',\n        'name'\n      ]\n    },\n    credit_type_data: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        name: {\n          type: 'string'\n        }\n      },\n      required: [        'id',\n        'name'\n      ]\n    }\n  }\n}\n```",
   inputSchema: {
     type: 'object',
     properties: {
@@ -41,7 +41,14 @@ export const tool: Tool = {
 
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const { jq_filter, ...body } = args as any;
-  return asTextContentResult(await maybeFilter(jq_filter, await client.v1.plans.getDetails(body)));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await client.v1.plans.getDetails(body)));
+  } catch (error) {
+    if (error instanceof Metronome.APIError || isJqError(error)) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/plans/list-charges-v1-plans.ts

@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { maybeFilter } from '@metronome/mcp/filtering';
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { isJqError, maybeFilter } from '@metronome/mcp/filtering';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -18,7 +18,7 @@ export const metadata: Metadata = {
 export const tool: Tool = {
   name: 'list_charges_v1_plans',
   description:
-    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nFetches a list of charges of a specific plan.\n\n# Response Schema\n```json\n{\n  type: 'object',\n  properties: {\n    data: {\n      type: 'array',\n      items: {\n        $ref: '#/$defs/plan_list_charges_response'\n      }\n    },\n    next_page: {\n      type: 'string'\n    }\n  },\n  required: [    'data',\n    'next_page'\n  ],\n  $defs: {\n    plan_list_charges_response: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        charge_type: {\n          type: 'string',\n          enum: [            'usage',\n            'fixed',\n            'composite',\n            'minimum',\n            'seat'\n          ]\n        },\n        credit_type: {\n          $ref: '#/$defs/credit_type_data'\n        },\n        custom_fields: {\n          type: 'object',\n          description: 'Custom fields to be added eg. { \"key1\": \"value1\", \"key2\": \"value2\" }',\n          additionalProperties: true\n        },\n        name: {\n          type: 'string'\n        },\n        prices: {\n          type: 'array',\n          items: {\n            type: 'object',\n            properties: {\n              tier: {\n                type: 'number',\n                description: 'Used in pricing tiers.  Indicates at what metric value the price applies.'\n              },\n              value: {\n                type: 'number'\n              },\n              collection_interval: {\n                type: 'number'\n              },\n              collection_schedule: {\n                type: 'string'\n              },\n              quantity: {\n                type: 'number'\n              }\n            },\n            required: [              'tier',\n              'value'\n            ]\n          }\n        },\n        product_id: {\n          type: 'string'\n        },\n        product_name: {\n          type: 'string'\n        },\n        quantity: {\n          type: 'number'\n        },\n        start_period: {\n          type: 'number',\n          description: 'Used in price ramps.  Indicates how many billing periods pass before the charge applies.'\n        },\n        tier_reset_frequency: {\n          type: 'number',\n          description: 'Used in pricing tiers.  Indicates how often the tier resets. Default is 1 - the tier count resets every billing period.'\n        },\n        unit_conversion: {\n          type: 'object',\n          description: 'Specifies how quantities for usage based charges will be converted.',\n          properties: {\n            division_factor: {\n              type: 'number',\n              description: 'The conversion factor'\n            },\n            rounding_behavior: {\n              type: 'string',\n              description: 'Whether usage should be rounded down or up to the nearest whole number. If null, quantity will be rounded to 20 decimal places.',\n              enum: [                'floor',\n                'ceiling'\n              ]\n            }\n          },\n          required: [            'division_factor'\n          ]\n        }\n      },\n      required: [        'id',\n        'charge_type',\n        'credit_type',\n        'custom_fields',\n        'name',\n        'prices',\n        'product_id',\n        'product_name'\n      ]\n    },\n    credit_type_data: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        name: {\n          type: 'string'\n        }\n      },\n      required: [        'id',\n        'name'\n      ]\n    }\n  }\n}\n```",
+    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nFetches a list of charges of a specific plan. This is a Plans (deprecated) endpoint. New clients should implement using Contracts.\n\n\n# Response Schema\n```json\n{\n  type: 'object',\n  properties: {\n    data: {\n      type: 'array',\n      items: {\n        $ref: '#/$defs/plan_list_charges_response'\n      }\n    },\n    next_page: {\n      type: 'string'\n    }\n  },\n  required: [    'data',\n    'next_page'\n  ],\n  $defs: {\n    plan_list_charges_response: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        charge_type: {\n          type: 'string',\n          enum: [            'usage',\n            'fixed',\n            'composite',\n            'minimum',\n            'seat'\n          ]\n        },\n        credit_type: {\n          $ref: '#/$defs/credit_type_data'\n        },\n        custom_fields: {\n          type: 'object',\n          description: 'Custom fields to be added eg. { \"key1\": \"value1\", \"key2\": \"value2\" }',\n          additionalProperties: true\n        },\n        name: {\n          type: 'string'\n        },\n        prices: {\n          type: 'array',\n          items: {\n            type: 'object',\n            properties: {\n              tier: {\n                type: 'number',\n                description: 'Used in pricing tiers.  Indicates at what metric value the price applies.'\n              },\n              value: {\n                type: 'number'\n              },\n              collection_interval: {\n                type: 'number'\n              },\n              collection_schedule: {\n                type: 'string'\n              },\n              quantity: {\n                type: 'number'\n              }\n            },\n            required: [              'tier',\n              'value'\n            ]\n          }\n        },\n        product_id: {\n          type: 'string'\n        },\n        product_name: {\n          type: 'string'\n        },\n        quantity: {\n          type: 'number'\n        },\n        start_period: {\n          type: 'number',\n          description: 'Used in price ramps.  Indicates how many billing periods pass before the charge applies.'\n        },\n        tier_reset_frequency: {\n          type: 'number',\n          description: 'Used in pricing tiers.  Indicates how often the tier resets. Default is 1 - the tier count resets every billing period.'\n        },\n        unit_conversion: {\n          type: 'object',\n          description: 'Specifies how quantities for usage based charges will be converted.',\n          properties: {\n            division_factor: {\n              type: 'number',\n              description: 'The conversion factor'\n            },\n            rounding_behavior: {\n              type: 'string',\n              description: 'Whether usage should be rounded down or up to the nearest whole number. If null, quantity will be rounded to 20 decimal places.',\n              enum: [                'floor',\n                'ceiling'\n              ]\n            }\n          },\n          required: [            'division_factor'\n          ]\n        }\n      },\n      required: [        'id',\n        'charge_type',\n        'credit_type',\n        'custom_fields',\n        'name',\n        'prices',\n        'product_id',\n        'product_name'\n      ]\n    },\n    credit_type_data: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        name: {\n          type: 'string'\n        }\n      },\n      required: [        'id',\n        'name'\n      ]\n    }\n  }\n}\n```",
   inputSchema: {
     type: 'object',
     properties: {
@@ -50,7 +50,14 @@ export const tool: Tool = {
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const { jq_filter, ...body } = args as any;
   const response = await client.v1.plans.listCharges(body).asResponse();
-  return asTextContentResult(await maybeFilter(jq_filter, await response.json()));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await response.json()));
+  } catch (error) {
+    if (error instanceof Metronome.APIError || isJqError(error)) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/plans/list-customers-v1-plans.ts

@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { maybeFilter } from '@metronome/mcp/filtering';
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { isJqError, maybeFilter } from '@metronome/mcp/filtering';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -18,7 +18,7 @@ export const metadata: Metadata = {
 export const tool: Tool = {
   name: 'list_customers_v1_plans',
   description:
-    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nFetches a list of customers on a specific plan (by default, only currently active plans are included)\n\n# Response Schema\n```json\n{\n  type: 'object',\n  properties: {\n    data: {\n      type: 'array',\n      items: {\n        $ref: '#/$defs/plan_list_customers_response'\n      }\n    },\n    next_page: {\n      type: 'string'\n    }\n  },\n  required: [    'data',\n    'next_page'\n  ],\n  $defs: {\n    plan_list_customers_response: {\n      type: 'object',\n      properties: {\n        customer_details: {\n          $ref: '#/$defs/customer_detail'\n        },\n        plan_details: {\n          type: 'object',\n          properties: {\n            id: {\n              type: 'string'\n            },\n            custom_fields: {\n              type: 'object',\n              description: 'Custom fields to be added eg. { \"key1\": \"value1\", \"key2\": \"value2\" }',\n              additionalProperties: true\n            },\n            customer_plan_id: {\n              type: 'string'\n            },\n            name: {\n              type: 'string'\n            },\n            starting_on: {\n              type: 'string',\n              description: 'The start date of the plan',\n              format: 'date-time'\n            },\n            ending_before: {\n              type: 'string',\n              description: 'The end date of the plan',\n              format: 'date-time'\n            }\n          },\n          required: [            'id',\n            'custom_fields',\n            'customer_plan_id',\n            'name',\n            'starting_on'\n          ]\n        }\n      },\n      required: [        'customer_details',\n        'plan_details'\n      ]\n    },\n    customer_detail: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string',\n          description: 'the Metronome ID of the customer'\n        },\n        created_at: {\n          type: 'string',\n          description: 'RFC 3339 timestamp indicating when the customer was created.',\n          format: 'date-time'\n        },\n        custom_fields: {\n          type: 'object',\n          description: 'Custom fields to be added eg. { \"key1\": \"value1\", \"key2\": \"value2\" }',\n          additionalProperties: true\n        },\n        customer_config: {\n          type: 'object',\n          properties: {\n            salesforce_account_id: {\n              type: 'string',\n              description: 'The Salesforce account ID for the customer'\n            }\n          },\n          required: [            'salesforce_account_id'\n          ]\n        },\n        external_id: {\n          type: 'string',\n          description: '(deprecated, use ingest_aliases instead) the first ID (Metronome or ingest alias) that can be used in usage events'\n        },\n        ingest_aliases: {\n          type: 'array',\n          description: 'aliases for this customer that can be used instead of the Metronome customer ID in usage events',\n          items: {\n            type: 'string'\n          }\n        },\n        name: {\n          type: 'string'\n        },\n        updated_at: {\n          type: 'string',\n          description: 'RFC 3339 timestamp indicating when the customer was last updated.',\n          format: 'date-time'\n        },\n        archived_at: {\n          type: 'string',\n          description: 'RFC 3339 timestamp indicating when the customer was archived. Null if the customer is active.',\n          format: 'date-time'\n        },\n        current_billable_status: {\n          type: 'object',\n          description: 'This field\\'s availability is dependent on your client\\'s configuration.',\n          properties: {\n            value: {\n              type: 'string',\n              enum: [                'billable',\n                'unbillable'\n              ]\n            },\n            effective_at: {\n              type: 'string',\n              format: 'date-time'\n            }\n          },\n          required: [            'value'\n          ]\n        }\n      },\n      required: [        'id',\n        'created_at',\n        'custom_fields',\n        'customer_config',\n        'external_id',\n        'ingest_aliases',\n        'name',\n        'updated_at'\n      ]\n    }\n  }\n}\n```",
+    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nFetches a list of customers on a specific plan (by default, only currently active plans are included). This is a Plans (deprecated) endpoint. New clients should implement using Contracts.\n\n\n# Response Schema\n```json\n{\n  type: 'object',\n  properties: {\n    data: {\n      type: 'array',\n      items: {\n        $ref: '#/$defs/plan_list_customers_response'\n      }\n    },\n    next_page: {\n      type: 'string'\n    }\n  },\n  required: [    'data',\n    'next_page'\n  ],\n  $defs: {\n    plan_list_customers_response: {\n      type: 'object',\n      properties: {\n        customer_details: {\n          $ref: '#/$defs/customer_detail'\n        },\n        plan_details: {\n          type: 'object',\n          properties: {\n            id: {\n              type: 'string'\n            },\n            custom_fields: {\n              type: 'object',\n              description: 'Custom fields to be added eg. { \"key1\": \"value1\", \"key2\": \"value2\" }',\n              additionalProperties: true\n            },\n            customer_plan_id: {\n              type: 'string'\n            },\n            name: {\n              type: 'string'\n            },\n            starting_on: {\n              type: 'string',\n              description: 'The start date of the plan',\n              format: 'date-time'\n            },\n            ending_before: {\n              type: 'string',\n              description: 'The end date of the plan',\n              format: 'date-time'\n            }\n          },\n          required: [            'id',\n            'custom_fields',\n            'customer_plan_id',\n            'name',\n            'starting_on'\n          ]\n        }\n      },\n      required: [        'customer_details',\n        'plan_details'\n      ]\n    },\n    customer_detail: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string',\n          description: 'the Metronome ID of the customer'\n        },\n        created_at: {\n          type: 'string',\n          description: 'RFC 3339 timestamp indicating when the customer was created.',\n          format: 'date-time'\n        },\n        custom_fields: {\n          type: 'object',\n          description: 'Custom fields to be added eg. { \"key1\": \"value1\", \"key2\": \"value2\" }',\n          additionalProperties: true\n        },\n        customer_config: {\n          type: 'object',\n          properties: {\n            salesforce_account_id: {\n              type: 'string',\n              description: 'The Salesforce account ID for the customer'\n            }\n          },\n          required: [            'salesforce_account_id'\n          ]\n        },\n        external_id: {\n          type: 'string',\n          description: '(deprecated, use ingest_aliases instead) the first ID (Metronome or ingest alias) that can be used in usage events'\n        },\n        ingest_aliases: {\n          type: 'array',\n          description: 'aliases for this customer that can be used instead of the Metronome customer ID in usage events',\n          items: {\n            type: 'string'\n          }\n        },\n        name: {\n          type: 'string'\n        },\n        updated_at: {\n          type: 'string',\n          description: 'RFC 3339 timestamp indicating when the customer was last updated.',\n          format: 'date-time'\n        },\n        archived_at: {\n          type: 'string',\n          description: 'RFC 3339 timestamp indicating when the customer was archived. Null if the customer is active.',\n          format: 'date-time'\n        },\n        current_billable_status: {\n          type: 'object',\n          description: 'This field\\'s availability is dependent on your client\\'s configuration.',\n          properties: {\n            value: {\n              type: 'string',\n              enum: [                'billable',\n                'unbillable'\n              ]\n            },\n            effective_at: {\n              type: 'string',\n              format: 'date-time'\n            }\n          },\n          required: [            'value'\n          ]\n        }\n      },\n      required: [        'id',\n        'created_at',\n        'custom_fields',\n        'customer_config',\n        'external_id',\n        'ingest_aliases',\n        'name',\n        'updated_at'\n      ]\n    }\n  }\n}\n```",
   inputSchema: {
     type: 'object',
     properties: {
@@ -56,7 +56,14 @@ export const tool: Tool = {
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const { jq_filter, ...body } = args as any;
   const response = await client.v1.plans.listCustomers(body).asResponse();
-  return asTextContentResult(await maybeFilter(jq_filter, await response.json()));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await response.json()));
+  } catch (error) {
+    if (error instanceof Metronome.APIError || isJqError(error)) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/plans/list-v1-plans.ts

@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { maybeFilter } from '@metronome/mcp/filtering';
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { isJqError, maybeFilter } from '@metronome/mcp/filtering';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -18,7 +18,7 @@ export const metadata: Metadata = {
 export const tool: Tool = {
   name: 'list_v1_plans',
   description:
-    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nList all available plans.\n\n# Response Schema\n```json\n{\n  type: 'object',\n  properties: {\n    data: {\n      type: 'array',\n      items: {\n        $ref: '#/$defs/plan_list_response'\n      }\n    },\n    next_page: {\n      type: 'string'\n    }\n  },\n  required: [    'data',\n    'next_page'\n  ],\n  $defs: {\n    plan_list_response: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        description: {\n          type: 'string'\n        },\n        name: {\n          type: 'string'\n        },\n        custom_fields: {\n          type: 'object',\n          description: 'Custom fields to be added eg. { \"key1\": \"value1\", \"key2\": \"value2\" }',\n          additionalProperties: true\n        }\n      },\n      required: [        'id',\n        'description',\n        'name'\n      ]\n    }\n  }\n}\n```",
+    "When using this tool, always use the `jq_filter` parameter to reduce the response size and improve performance.\n\nOnly omit if you're sure you don't need the data.\n\nList all available plans. This is a Plans (deprecated) endpoint. New clients should implement using Contracts.\n\n# Response Schema\n```json\n{\n  type: 'object',\n  properties: {\n    data: {\n      type: 'array',\n      items: {\n        $ref: '#/$defs/plan_list_response'\n      }\n    },\n    next_page: {\n      type: 'string'\n    }\n  },\n  required: [    'data',\n    'next_page'\n  ],\n  $defs: {\n    plan_list_response: {\n      type: 'object',\n      properties: {\n        id: {\n          type: 'string'\n        },\n        description: {\n          type: 'string'\n        },\n        name: {\n          type: 'string'\n        },\n        custom_fields: {\n          type: 'object',\n          description: 'Custom fields to be added eg. { \"key1\": \"value1\", \"key2\": \"value2\" }',\n          additionalProperties: true\n        }\n      },\n      required: [        'id',\n        'description',\n        'name'\n      ]\n    }\n  }\n}\n```",
   inputSchema: {
     type: 'object',
     properties: {
@@ -47,7 +47,14 @@ export const tool: Tool = {
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const { jq_filter, ...body } = args as any;
   const response = await client.v1.plans.list(body).asResponse();
-  return asTextContentResult(await maybeFilter(jq_filter, await response.json()));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await response.json()));
+  } catch (error) {
+    if (error instanceof Metronome.APIError || isJqError(error)) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };