@metronome/mcp 2.0.0 → 2.2.0

package/src/tools/types.ts

@@ -87,6 +87,18 @@ export async function asBinaryContentResult(response: Response): Promise<ToolCal
   }
 }
 
+export function asErrorResult(message: string): ToolCallResult {
+  return {
+    content: [
+      {
+        type: 'text',
+        text: message,
+      },
+    ],
+    isError: true,
+  };
+}
+
 export type Metadata = {
   resource: string;
   operation: 'read' | 'write';

package/src/tools/v1/alerts/archive-v1-alerts.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.alerts.archive(body)));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await client.v1.alerts.archive(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/alerts/create-v1-alerts.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,6 +40,7 @@ export const tool: Tool = {
           'low_remaining_contract_credit_percentage_reached',
           'low_remaining_contract_credit_and_commit_balance_reached',
           'invoice_total_reached',
+          'low_remaining_seat_balance_reached',
         ],
       },
       name: {
@@ -130,6 +131,22 @@ export const tool: Tool = {
         description:
           'If provided, will create this threshold notification for this specific plan. To create a notification for all customers, do not specify a `plan_id`.',
       },
+      seat_filter: {
+        type: 'object',
+        description:
+          'Required for `low_remaining_seat_balance_reached` notifications. The alert is scoped to this seat group key-value pair.',
+        properties: {
+          seat_group_key: {
+            type: 'string',
+            description: 'The seat group key (e.g., "seat_id", "user_id")',
+          },
+          seat_group_value: {
+            type: 'string',
+            description: 'Optional seat identifier the alert is scoped to.',
+          },
+        },
+        required: ['seat_group_key'],
+      },
       uniqueness_key: {
         type: 'string',
         description:
@@ -149,7 +166,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.alerts.create(body)));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await client.v1.alerts.create(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/audit-logs/list-v1-audit-logs.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';
@@ -73,7 +73,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.auditLogs.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/billable-metrics/archive-v1-billable-metrics.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';
@@ -39,7 +39,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.billableMetrics.archive(body)));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await client.v1.billableMetrics.archive(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/billable-metrics/create-v1-billable-metrics.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';
@@ -137,7 +137,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.billableMetrics.create(body)));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await client.v1.billableMetrics.create(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/billable-metrics/list-v1-billable-metrics.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';
@@ -51,7 +51,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.billableMetrics.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/billable-metrics/retrieve-v1-billable-metrics.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.billableMetrics.retrieve(body)));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await client.v1.billableMetrics.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/contracts/add-manual-balance-entry-v1-contracts.ts

@@ -45,6 +45,12 @@ export const tool: Tool = {
         type: 'string',
         description: 'ID of the contract to update. Leave blank to update a customer level balance.',
       },
+      per_group_amounts: {
+        type: 'object',
+        description:
+          'If using individually configured commits/credits attached to seat managed subscriptions, the amount to add for each seat. Must sum to total amount.',
+        additionalProperties: true,
+      },
       timestamp: {
         type: 'string',
         description:

package/src/tools/v1/contracts/amend-v1-contracts.ts

@@ -1,6 +1,6 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -17,7 +17,7 @@ export const metadata: Metadata = {
 export const tool: Tool = {
   name: 'amend_v1_contracts',
   description:
-    'Amendments will be replaced by Contract editing. New clients should implement using the `editContract` endpoint. Read more about the migration to contract editing [here](https://docs.metronome.com/migrate-amendments-to-edits/) and reach out to your Metronome representative for more details. Once contract editing is enabled, access to this endpoint will be removed.\n',
+    'Amendments will be replaced by Contract editing. New clients should implement using the `editContract` endpoint. Read more about the migration to contract editing [here](/guides/implement-metronome/migrate-amendments-to-edits/) and reach out to your Metronome representative for more details. Once contract editing is enabled, access to this endpoint will be removed.\n',
   inputSchema: {
     type: 'object',
     properties: {
@@ -1017,7 +1017,14 @@ export const tool: Tool = {
 
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const body = args as any;
-  return asTextContentResult(await client.v1.contracts.amend(body));
+  try {
+    return asTextContentResult(await client.v1.contracts.amend(body));
+  } catch (error) {
+    if (error instanceof Metronome.APIError) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/contracts/archive-v1-contracts.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';
@@ -48,7 +48,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.contracts.archive(body)));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await client.v1.contracts.archive(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/contracts/create-historical-invoices-v1-contracts.ts

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

package/src/tools/v1/contracts/create-v1-contracts.ts

@@ -1,6 +1,6 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -554,20 +554,21 @@ export const tool: Tool = {
               invoice_consolidation_type: {
                 type: 'string',
                 description:
-                  'Indicates the desired behavior of consolidated invoices generated by the parent in a customer hierarchy\n**CONCATENATE**: Statements on the invoices of child customers will be appended to the consolidated invoice\n**NONE**: Do not generate consolidated invoices',
+                  'Account hierarchy M3 - Indicates the desired behavior of consolidated invoices generated by the parent in a customer hierarchy\n\n**CONCATENATE**: Statements on the invoices of child customers will be appended to the consolidated invoice\n\n**NONE**: Do not generate consolidated invoices',
                 enum: ['CONCATENATE', 'NONE'],
               },
             },
           },
           payer: {
             type: 'string',
-            description: "Indicates whether the parent should pay for the child's invoice charges",
+            description:
+              "Account hierarchy M3 - Indicates which customer should pay for the child's invoice charges\n\n**SELF**: The child pays for its own invoice charges\n\n**PARENT**: The parent pays for the child's invoice charges",
             enum: ['SELF', 'PARENT'],
           },
           usage_statement_behavior: {
             type: 'string',
             description:
-              "Indicates the behavior of the child's invoice statements on the parent's invoices\n**CONSOLIDATE**: Child's invoice statements will be added to parent's consolidated invoices\n**SEPARATE**: Child's invoice statements will appear not appear on parent's consolidated invoices",
+              "Account hierarchy M3 - Indicates the behavior of the child's invoice statements on the parent's invoices.\n\n**CONSOLIDATE**: Child's invoice statements will be added to parent's consolidated invoices\n\n**SEPARATE**: Child's invoice statements will appear not appear on parent's consolidated invoices",
             enum: ['CONSOLIDATE', 'SEPARATE'],
           },
         },
@@ -971,7 +972,8 @@ export const tool: Tool = {
                 },
                 allocation: {
                   type: 'string',
-                  description: 'If set to POOLED, allocation added per seat is pooled across the account.',
+                  description:
+                    'If set to POOLED, allocation added per seat is pooled across the account. If set to INDIVIDUAL, each seat in the subscription will have its own allocation.',
                   enum: ['INDIVIDUAL', 'POOLED'],
                 },
               },
@@ -1120,7 +1122,8 @@ export const tool: Tool = {
                 },
                 allocation: {
                   type: 'string',
-                  description: 'If set to POOLED, allocation added per seat is pooled across the account.',
+                  description:
+                    'If set to POOLED, allocation added per seat is pooled across the account. If set to INDIVIDUAL, each seat in the subscription will have its own allocation.',
                   enum: ['INDIVIDUAL', 'POOLED'],
                 },
               },
@@ -1205,6 +1208,30 @@ export const tool: Tool = {
           required: ['fraction', 'netsuite_reseller_id', 'reseller_type', 'starting_at'],
         },
       },
+      revenue_system_configuration: {
+        type: 'object',
+        description:
+          'The revenue system configuration associated with a contract. Provide either an ID or the provider and delivery method.',
+        properties: {
+          delivery_method: {
+            type: 'string',
+            description:
+              'How revenue recognition records should be delivered to the revenue system. Do not specify if using revenue_system_configuration_id.',
+            enum: ['direct_to_billing_provider'],
+          },
+          provider: {
+            type: 'string',
+            description:
+              'The system that is providing services for revenue recognition. Do not specify if using revenue_system_configuration_id.',
+            enum: ['netsuite'],
+          },
+          revenue_system_configuration_id: {
+            type: 'string',
+            description:
+              'The Metronome ID of the revenue system configuration. Use when a customer has multiple configurations with the same provider and delivery method. Otherwise, specify the provider and delivery_method.',
+          },
+        },
+      },
       salesforce_opportunity_id: {
         type: 'string',
         description: "This field's availability is dependent on your client's configuration.",
@@ -1396,9 +1423,31 @@ export const tool: Tool = {
             quantity_management_mode: {
               type: 'string',
               description:
-                "Determines how the subscription's quantity is controlled. Defaults to QUANTITY_ONLY. **QUANTITY_ONLY**: The subscription quantity is specified directly on the subscription. `initial_quantity` must be provided with this option. Compatible with recurring commits/credits that use POOLED allocation.",
+                "Determines how the subscription's quantity is controlled. Defaults to QUANTITY_ONLY. **QUANTITY_ONLY**: The subscription quantity is specified directly on the subscription. `initial_quantity` must be provided with this option. Compatible with recurring commits/credits that use POOLED allocation. **SEAT_BASED**: Use when you want to pass specific seat identifiers (e.g. add user_123) to increment and decrement a subscription quantity, rather than directly providing the quantity. You must use a **SEAT_BASED** subscription to use a linked recurring credit with an allocation per seat. `seat_config` must be provided with this option.",
               enum: ['SEAT_BASED', 'QUANTITY_ONLY'],
             },
+            seat_config: {
+              type: 'object',
+              properties: {
+                initial_seat_ids: {
+                  type: 'array',
+                  description: 'The initial assigned seats on this subscription.',
+                  items: {
+                    type: 'string',
+                  },
+                },
+                seat_group_key: {
+                  type: 'string',
+                  description:
+                    "The property name, sent on usage events, that identifies the seat ID associated with the usage event.  For example, the property name might be seat_id or user_id. The property must be set as a group key on billable metrics and a presentation/pricing group key on contract products.  This allows linked recurring credits with an allocation per seat to be consumed by only one seat's usage.",
+                },
+                initial_unassigned_seats: {
+                  type: 'number',
+                  description: 'The initial amount of unassigned seats on this subscription.',
+                },
+              },
+              required: ['initial_seat_ids', 'seat_group_key'],
+            },
             starting_at: {
               type: 'string',
               description:
@@ -1718,7 +1767,14 @@ export const tool: Tool = {
 
 export const handler = async (client: Metronome, args: Record<string, unknown> | undefined) => {
   const body = args as any;
-  return asTextContentResult(await client.v1.contracts.create(body));
+  try {
+    return asTextContentResult(await client.v1.contracts.create(body));
+  } catch (error) {
+    if (error instanceof Metronome.APIError) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

package/src/tools/v1/contracts/list-balances-v1-contracts.ts

@@ -1,6 +1,6 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { Metadata, asTextContentResult } from '@metronome/mcp/tools/types';
+import { Metadata, asErrorResult, asTextContentResult } from '@metronome/mcp/tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 import Metronome from '@metronome/sdk';
@@ -37,6 +37,10 @@ export const tool: Tool = {
         description: 'Include only balances that have any access before the provided date (exclusive)',
         format: 'date-time',
       },
+      exclude_zero_balances: {
+        type: 'boolean',
+        description: 'Exclude balances with zero amounts from the response.',
+      },
       include_archived: {
         type: 'boolean',
         description: 'Include archived credits and credits from archived contracts.',
@@ -76,7 +80,14 @@ 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.contracts.listBalances(body).asResponse();
-  return asTextContentResult(await response.json());
+  try {
+    return asTextContentResult(await response.json());
+  } catch (error) {
+    if (error instanceof Metronome.APIError) {
+      return asErrorResult(error.message);
+    }
+    throw error;
+  }
 };
 
 export default { metadata, tool, handler };

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

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

package/src/tools/v1/contracts/named-schedules/retrieve-contracts-v1-named-schedules.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';
@@ -50,9 +50,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.contracts.namedSchedules.retrieve(body)),
-  );
+  try {
+    return asTextContentResult(
+      await maybeFilter(jq_filter, await client.v1.contracts.namedSchedules.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/contracts/products/archive-contracts-v1-products.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,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.contracts.products.archive(body)));
+  try {
+    return asTextContentResult(
+      await maybeFilter(jq_filter, await client.v1.contracts.products.archive(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/contracts/products/create-contracts-v1-products.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';
@@ -151,7 +151,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.contracts.products.create(body)));
+  try {
+    return asTextContentResult(await maybeFilter(jq_filter, await client.v1.contracts.products.create(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/contracts/products/list-contracts-v1-products.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';
@@ -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.contracts.products.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 };