@metronome/mcp 2.1.0 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metronome/mcp",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "The official MCP Server for the Metronome API",
   "author": "Metronome <dev-feedback@metronome.com>",
   "types": "./index.d.ts",
@@ -27,14 +27,16 @@
     "fix": "eslint --fix --ext ts,js ."
   },
   "dependencies": {
-    "@metronome/sdk": "^2.1.0",
+    "@metronome/sdk": "^2.2.0",
     "@cloudflare/cabidela": "^0.2.4",
-    "@modelcontextprotocol/sdk": "^1.11.5",
+    "@modelcontextprotocol/sdk": "^1.24.0",
     "@valtown/deno-http-worker": "^0.0.21",
     "cors": "^2.8.5",
     "express": "^5.1.0",
-    "jq-web": "https://github.com/stainless-api/jq-web/releases/download/v0.8.6/jq-web.tar.gz",
+    "fuse.js": "^7.1.0",
+    "jq-web": "https://github.com/stainless-api/jq-web/releases/download/v0.8.8/jq-web.tar.gz",
     "qs": "^6.14.0",
+    "typescript": "5.8.3",
     "yargs": "^17.7.2",
     "zod": "^3.25.20",
     "zod-to-json-schema": "^3.24.5",
@@ -56,12 +58,6 @@
       "types": "./index.d.mts",
       "default": "./index.mjs"
     },
-    "./code-tool-paths": {
-      "require": "./code-tool-paths.cjs"
-    },
-    "./code-tool-paths.cjs": {
-      "default": "./code-tool-paths.cjs"
-    },
     "./code-tool-types": {
       "import": "./code-tool-types.mjs",
       "require": "./code-tool-types.js"
@@ -72,16 +68,6 @@
     "./code-tool-types.mjs": {
       "default": "./code-tool-types.mjs"
     },
-    "./code-tool-worker": {
-      "import": "./code-tool-worker.mjs",
-      "require": "./code-tool-worker.js"
-    },
-    "./code-tool-worker.js": {
-      "default": "./code-tool-worker.js"
-    },
-    "./code-tool-worker.mjs": {
-      "default": "./code-tool-worker.mjs"
-    },
     "./code-tool": {
       "import": "./code-tool.mjs",
       "require": "./code-tool.js"

package/server.js

@@ -22,7 +22,7 @@ var tools_2 = require("./tools.js");
 Object.defineProperty(exports, "endpoints", { enumerable: true, get: function () { return tools_2.endpoints; } });
 const newMcpServer = () => new mcp_js_1.McpServer({
     name: 'metronome_sdk_api',
-    version: '2.1.0',
+    version: '2.2.0',
 }, { capabilities: { tools: {}, logging: {} } });
 exports.newMcpServer = newMcpServer;
 // Create server instance

package/server.mjs

@@ -11,7 +11,7 @@ export { ClientType } from "./compat.mjs";
 export { endpoints } from "./tools.mjs";
 export const newMcpServer = () => new McpServer({
     name: 'metronome_sdk_api',
-    version: '2.1.0',
+    version: '2.2.0',
 }, { capabilities: { tools: {}, logging: {} } });
 // Create server instance
 export const server = newMcpServer();

package/src/code-tool-types.ts

@@ -11,4 +11,8 @@ export type WorkerSuccess = {
   logLines: string[];
   errLines: string[];
 };
-export type WorkerError = { message: string | undefined };
+export type WorkerError = {
+  message: string | undefined;
+  logLines: string[];
+  errLines: string[];
+};

package/src/code-tool.ts

@@ -1,146 +1,62 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { dirname } from 'node:path';
-import { pathToFileURL } from 'node:url';
-import Metronome, { ClientOptions } from '@metronome/sdk';
-import { Endpoint, ContentBlock, Metadata } from './tools/types';
-
+import { Metadata, ToolCallResult, asTextContentResult } from './tools/types';
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
-
-import { WorkerInput, WorkerError, WorkerSuccess } from './code-tool-types';
-
+import { readEnv } from './server';
+import { WorkerSuccess } from './code-tool-types';
 /**
  * A tool that runs code against a copy of the SDK.
  *
- * Instead of exposing every endpoint as it's own tool, which uses up too many tokens for LLMs to use at once,
+ * Instead of exposing every endpoint as its own tool, which uses up too many tokens for LLMs to use at once,
  * we expose a single tool that can be used to search for endpoints by name, resource, operation, or tag, and then
  * a generic endpoint that can be used to invoke any endpoint with the provided arguments.
  *
  * @param endpoints - The endpoints to include in the list.
  */
-export async function codeTool(): Promise<Endpoint> {
+export async function codeTool() {
   const metadata: Metadata = { resource: 'all', operation: 'write', tags: [] };
   const tool: Tool = {
     name: 'execute',
     description:
-      'Runs Typescript code to interact with the API.\nYou are a skilled programmer writing code to interface with the service.\nDefine an async function named "run" that takes a single parameter of an initialized client, and it will be run.\nDo not initialize a client, but instead use the client that you are given as a parameter.\nYou will be returned anything that your function returns, plus the results of any console.log statements.\nIf any code triggers an error, the tool will return an error response, so you do not need to add error handling unless you want to output something more helpful than the raw error.\nIt is not necessary to add comments to code, unless by adding those comments you believe that you can generate better code.\nThis code will run in a container, and you will not be able to use fetch or otherwise interact with the network calls other than through the client you are given.\nAny variables you define won\'t live between successive uses of this call, so make sure to return or log any data you might need later.',
+      'Runs JavaScript code to interact with the API.\n\nYou are a skilled programmer writing code to interface with the service.\nDefine an async function named "run" that takes a single parameter of an initialized SDK client and it will be run.\nWrite code within this template:\n\n```\nasync function run(client) {\n  // Fill this out\n}\n```\n\nYou will be returned anything that your function returns, plus the results of any console.log statements.\nIf any code triggers an error, the tool will return an error response, so you do not need to add error handling unless you want to output something more helpful than the raw error.\nIt is not necessary to add comments to code, unless by adding those comments you believe that you can generate better code.\nThis code will run in a container, and you will not be able to use fetch or otherwise interact with the network calls other than through the client you are given.\nAny variables you define won\'t live between successive uses of this call, so make sure to return or log any data you might need later.',
     inputSchema: { type: 'object', properties: { code: { type: 'string' } } },
   };
-
-  // Import dynamically to avoid failing at import time in cases where the environment is not well-supported.
-  const { newDenoHTTPWorker } = await import('@valtown/deno-http-worker');
-  const { workerPath } = await import('./code-tool-paths.cjs');
-
-  const handler = async (client: Metronome, args: unknown) => {
-    const baseURLHostname = new URL(client.baseURL).hostname;
-    const { code } = args as { code: string };
-
-    const worker = await newDenoHTTPWorker(pathToFileURL(workerPath), {
-      runFlags: [
-        `--node-modules-dir=manual`,
-        `--allow-read=code-tool-worker.mjs,${workerPath.replace(/([\/\\]node_modules)[\/\\].+$/, '$1')}/`,
-        `--allow-net=${baseURLHostname}`,
-        // Allow environment variables because instantiating the client will try to read from them,
-        // even though they are not set.
-        '--allow-env',
-      ],
-      printOutput: true,
-      spawnOptions: {
-        cwd: dirname(workerPath),
+  const handler = async (_: unknown, args: any): Promise<ToolCallResult> => {
+    const code = args.code as string;
+
+    // this is not required, but passing a Stainless API key for the matching project_name
+    // will allow you to run code-mode queries against non-published versions of your SDK.
+    const stainlessAPIKey = readEnv('STAINLESS_API_KEY');
+    const codeModeEndpoint =
+      readEnv('CODE_MODE_ENDPOINT_URL') ?? 'https://api.stainless.com/api/ai/code-tool';
+
+    const res = await fetch(codeModeEndpoint, {
+      method: 'POST',
+      headers: {
+        ...(stainlessAPIKey && { Authorization: stainlessAPIKey }),
+        'Content-Type': 'application/json',
+        client_envs: JSON.stringify({
+          METRONOME_BEARER_TOKEN: readEnv('METRONOME_BEARER_TOKEN'),
+          METRONOME_WEBHOOK_SECRET: readEnv('METRONOME_WEBHOOK_SECRET'),
+          METRONOME_BASE_URL: readEnv('METRONOME_BASE_URL'),
+        }),
       },
+      body: JSON.stringify({
+        project_name: 'metronome',
+        client_opts: {},
+        code,
+      }),
     });
 
-    try {
-      const resp = await new Promise<Response>((resolve, reject) => {
-        worker.addEventListener('exit', (exitCode) => {
-          reject(new Error(`Worker exited with code ${exitCode}`));
-        });
-
-        const opts: ClientOptions = {
-          baseURL: client.baseURL,
-          bearerToken: client.bearerToken,
-          webhookSecret: client.webhookSecret,
-          defaultHeaders: {
-            'X-Stainless-MCP': 'true',
-          },
-        };
-
-        const req = worker.request(
-          'http://localhost',
-          {
-            headers: {
-              'content-type': 'application/json',
-            },
-            method: 'POST',
-          },
-          (resp) => {
-            const body: Uint8Array[] = [];
-            resp.on('error', (err) => {
-              reject(err);
-            });
-            resp.on('data', (chunk) => {
-              body.push(chunk);
-            });
-            resp.on('end', () => {
-              resolve(
-                new Response(Buffer.concat(body).toString(), {
-                  status: resp.statusCode ?? 200,
-                  headers: resp.headers as any,
-                }),
-              );
-            });
-          },
-        );
-
-        const body = JSON.stringify({
-          opts,
-          code,
-        } satisfies WorkerInput);
-
-        req.write(body, (err) => {
-          if (err !== null && err !== undefined) {
-            reject(err);
-          }
-        });
-
-        req.end();
-      });
-
-      if (resp.status === 200) {
-        const { result, logLines, errLines } = (await resp.json()) as WorkerSuccess;
-        const returnOutput: ContentBlock | null =
-          result === null ? null
-          : result === undefined ? null
-          : {
-              type: 'text',
-              text: typeof result === 'string' ? (result as string) : JSON.stringify(result),
-            };
-        const logOutput: ContentBlock | null =
-          logLines.length === 0 ?
-            null
-          : {
-              type: 'text',
-              text: logLines.join('\n'),
-            };
-        const errOutput: ContentBlock | null =
-          errLines.length === 0 ?
-            null
-          : {
-              type: 'text',
-              text: 'Error output:\n' + errLines.join('\n'),
-            };
-        return {
-          content: [returnOutput, logOutput, errOutput].filter((block) => block !== null),
-        };
-      } else {
-        const { message } = (await resp.json()) as WorkerError;
-        throw new Error(message);
-      }
-    } catch (e) {
-      throw e;
-    } finally {
-      worker.terminate();
+    if (!res.ok) {
+      throw new Error(
+        `${res.status}: ${
+          res.statusText
+        } error when trying to contact Code Tool server. Details: ${await res.text()}`,
+      );
     }
+
+    return asTextContentResult((await res.json()) as WorkerSuccess);
   };
 
   return { metadata, tool, handler };

package/src/docs-search-tool.ts

@@ -13,8 +13,7 @@ export const metadata: Metadata = {
 
 export const tool: Tool = {
   name: 'search_docs',
-  description:
-    'Search for documentation for how to use the client to interact with the API.\nThe tool will return an array of Markdown-formatted documentation pages.',
+  description: 'Search for documentation for how to use the client to interact with the API.',
   inputSchema: {
     type: 'object',
     properties: {
@@ -25,7 +24,12 @@ export const tool: Tool = {
       language: {
         type: 'string',
         description: 'The language for the SDK to search for.',
-        enum: ['http', 'python', 'go', 'typescript', 'terraform', 'ruby', 'java', 'kotlin'],
+        enum: ['http', 'python', 'go', 'typescript', 'javascript', 'terraform', 'ruby', 'java', 'kotlin'],
+      },
+      detail: {
+        type: 'string',
+        description: 'The amount of detail to return.',
+        enum: ['default', 'verbose'],
       },
     },
     required: ['query', 'language'],
@@ -42,6 +46,13 @@ export const handler = async (_: unknown, args: Record<string, unknown> | undefi
   const body = args as any;
   const query = new URLSearchParams(body).toString();
   const result = await fetch(`${docsSearchURL}?${query}`);
+
+  if (!result.ok) {
+    throw new Error(
+      `${result.status}: ${result.statusText} when using doc search tool. Details: ${await result.text()}`,
+    );
+  }
+
   return asTextContentResult(await result.json());
 };
 

package/src/dynamic-tools.ts

@@ -14,7 +14,7 @@ function zodToInputSchema(schema: z.ZodSchema) {
 /**
  * A list of tools that expose all the endpoints in the API dynamically.
  *
- * Instead of exposing every endpoint as it's own tool, which uses up too many tokens for LLMs to use at once,
+ * Instead of exposing every endpoint as its own tool, which uses up too many tokens for LLMs to use at once,
  * we expose a single tool that can be used to search for endpoints by name, resource, operation, or tag, and then
  * a generic endpoint that can be used to invoke any endpoint with the provided arguments.
  *

package/src/filtering.ts

@@ -12,3 +12,7 @@ export async function maybeFilter(jqFilter: unknown | undefined, response: any):
 async function jq(json: any, jqFilter: string) {
   return (await initJq).json(json, jqFilter);
 }
+
+export function isJqError(error: any): error is Error {
+  return error instanceof Error && 'stderr' in error;
+}

package/src/headers.ts

@@ -11,7 +11,9 @@ export const parseAuthHeaders = (req: IncomingMessage): Partial<ClientOptions> =
       case 'Bearer':
         return { bearerToken: req.headers.authorization.slice('Bearer '.length) };
       default:
-        throw new Error(`Unsupported authorization scheme`);
+        throw new Error(
+          'Unsupported authorization scheme. Expected the "Authorization" header to be a supported scheme (Bearer).',
+        );
     }
   }
 

package/src/http.ts

@@ -46,12 +46,12 @@ const newServer = ({
       },
       mcpOptions,
     });
-  } catch {
+  } catch (error) {
     res.status(401).json({
       jsonrpc: '2.0',
       error: {
         code: -32000,
-        message: 'Unauthorized',
+        message: `Unauthorized: ${error instanceof Error ? error.message : error}`,
       },
     });
     return null;

package/src/options.ts

@@ -284,8 +284,10 @@ const coerceArray = <T extends z.ZodTypeAny>(zodType: T) =>
   );
 
 const QueryOptions = z.object({
-  tools: coerceArray(z.enum(['dynamic', 'all', 'docs'])).describe('Use dynamic tools or all tools'),
-  no_tools: coerceArray(z.enum(['dynamic', 'all', 'docs'])).describe('Do not use dynamic tools or all tools'),
+  tools: coerceArray(z.enum(['dynamic', 'all', 'code', 'docs'])).describe('Specify which MCP tools to use'),
+  no_tools: coerceArray(z.enum(['dynamic', 'all', 'code', 'docs'])).describe(
+    'Specify which MCP tools to not use.',
+  ),
   tool: coerceArray(z.string()).describe('Include tools matching the specified names'),
   resource: coerceArray(z.string()).describe('Include tools matching the specified resources'),
   operation: coerceArray(z.enum(['read', 'write'])).describe(
@@ -385,11 +387,16 @@ export function parseQueryOptions(defaultOptions: McpOptions, query: unknown): M
     : queryOptions.tools?.includes('docs') ? true
     : defaultOptions.includeDocsTools;
 
+  let codeTools: boolean | undefined =
+    queryOptions.no_tools && queryOptions.no_tools?.includes('code') ? false
+    : queryOptions.tools?.includes('code') && defaultOptions.includeCodeTools ? true
+    : defaultOptions.includeCodeTools;
+
   return {
     client: queryOptions.client ?? defaultOptions.client,
     includeDynamicTools: dynamicTools,
     includeAllTools: allTools,
-    includeCodeTools: undefined,
+    includeCodeTools: codeTools,
     includeDocsTools: docsTools,
     filters,
     capabilities: clientCapabilities,

package/src/server.ts

@@ -34,7 +34,7 @@ export const newMcpServer = () =>
   new McpServer(
     {
       name: 'metronome_sdk_api',
-      version: '2.1.0',
+      version: '2.2.0',
     },
     { capabilities: { tools: {}, logging: {} } },
   );

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: