@mapbox/mcp-server 0.5.5 → 0.6.1

package/README.md

@@ -192,6 +192,42 @@ npx plop create-tool
 # provide tool name without suffix (e.g. Search)
 ```
 
+## OpenTelemetry Tracing
+
+This MCP server includes comprehensive OpenTelemetry tracing for production observability:
+
+### Quick Demo
+
+```sh
+# Run tracing demo with console output
+npm run demo:tracing
+```
+
+### Testing with Tracing
+
+```sh
+# Run tests with tracing enabled
+npm run test:tracing
+```
+
+### Production Configuration
+
+See [docs/tracing.md](./docs/tracing.md) for complete setup instructions including:
+
+- 🔧 Environment variable configuration
+- 📊 Supported backends (Jaeger, AWS X-Ray, Google Cloud, etc.)
+- 🎯 Custom trace attributes and context
+- 🚀 Performance optimization (minimal overhead)
+- 🔍 Troubleshooting and debugging
+
+**Tracing Features:**
+
+- ✅ Automatic tool execution tracing
+- ✅ HTTP request instrumentation
+- ✅ Configurable exporters (console, OTLP)
+- ✅ Security-conscious (data protection, JWT validation)
+- ✅ Production-ready (<1% CPU overhead)
+
 ## Contributing
 
 We welcome contributions to the Mapbox MCP Server! Please review our standards and guidelines before contributing:

package/dist/commonjs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,eAAe,CAAC"}

package/dist/commonjs/index.js

@@ -8,6 +8,7 @@ const stdio_js_1 = require("@modelcontextprotocol/sdk/server/stdio.js");
 const toolConfig_js_1 = require("./config/toolConfig.js");
 const toolRegistry_js_1 = require("./tools/toolRegistry.js");
 const versionUtils_js_1 = require("./utils/versionUtils.js");
+const tracing_js_1 = require("./utils/tracing.js");
 require("dotenv/config");
 const versionInfo = (0, versionUtils_js_1.getVersionInfo)();
 // Parse configuration from command-line arguments
@@ -28,13 +29,54 @@ const server = new mcp_js_1.McpServer({
 enabledTools.forEach((tool) => {
     tool.installTo(server);
 });
+// MCP-compatible logging functions
+// Completely suppress logging when MCP_DISABLE_LOGGING is set (for MCP inspector compatibility)
+function logIfEnabled(level, ...args) {
+    if (!process.env.MCP_DISABLE_LOGGING) {
+        console[level](...args);
+    }
+}
 async function main() {
+    // Initialize OpenTelemetry tracing if not in test mode
+    if (process.env.NODE_ENV !== 'test' && !process.env.VITEST) {
+        try {
+            await (0, tracing_js_1.initializeTracing)();
+            logIfEnabled('log', `OpenTelemetry tracing: ${(0, tracing_js_1.isTracingInitialized)() ? 'enabled' : 'disabled'}`);
+        }
+        catch (error) {
+            logIfEnabled('warn', 'Failed to initialize tracing:', error);
+        }
+    }
     // Start receiving messages on stdin and sending messages on stdout
     const transport = new stdio_js_1.StdioServerTransport();
     await server.connect(transport);
 }
-main().catch((error) => {
-    console.error('Fatal error starting MCP server:', error);
-    process.exit(1);
+// Ensure cleanup interval is cleared when the process exits
+async function shutdown() {
+    // Shutdown tracing
+    try {
+        await (0, tracing_js_1.shutdownTracing)();
+    }
+    catch (e) {
+        logIfEnabled('error', 'Error shutting down tracing:', e);
+    }
+    process.exit(0);
+}
+function exitWithLog(message, error, code = 1) {
+    logIfEnabled('error', message, error);
+    process.exit(code);
+}
+['SIGINT', 'SIGTERM'].forEach((signal) => {
+    process.on(signal, async () => {
+        try {
+            await shutdown();
+        }
+        finally {
+            process.exit(0);
+        }
+    });
 });
+process.on('uncaughtException', (err) => exitWithLog('Uncaught exception:', err));
+process.on('unhandledRejection', (reason) => exitWithLog('Unhandled rejection:', reason));
+main().catch((error) => exitWithLog('Fatal error starting MCP server:', error));
 //# sourceMappingURL=index.js.map

package/dist/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA,6BAA6B;AAC7B,kCAAkC;;AAElC,oEAAoE;AACpE,wEAAiF;AACjF,0DAA8E;AAC9E,6DAAsD;AACtD,6DAAyD;AACzD,yBAAuB;AAEvB,MAAM,WAAW,GAAG,IAAA,gCAAc,GAAE,CAAC;AAErC,kDAAkD;AAClD,MAAM,MAAM,GAAG,IAAA,uCAAuB,GAAE,CAAC;AAEzC,8CAA8C;AAC9C,MAAM,QAAQ,GAAG,IAAA,6BAAW,GAAE,CAAC;AAC/B,MAAM,YAAY,GAAG,IAAA,2BAAW,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAEnD,uBAAuB;AACvB,MAAM,MAAM,GAAG,IAAI,kBAAS,CAC1B;IACE,IAAI,EAAE,WAAW,CAAC,IAAI;IACtB,OAAO,EAAE,WAAW,CAAC,OAAO;CAC7B,EACD;IACE,YAAY,EAAE;QACZ,KAAK,EAAE,EAAE;KACV;CACF,CACF,CAAC;AAEF,uCAAuC;AACvC,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;IAC5B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,KAAK,UAAU,IAAI;IACjB,mEAAmE;IACnE,MAAM,SAAS,GAAG,IAAI,+BAAoB,EAAE,CAAC;IAC7C,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AAClC,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACrB,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC;IACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/dist/commonjs/schemas/geojson.d.ts

@@ -0,0 +1,115 @@
+/**
+ * GeoJSON interfaces based on RFC 7946
+ * https://tools.ietf.org/html/rfc7946
+ */
+export type GeoJSONGeometryType = 'Point' | 'LineString' | 'Polygon' | 'MultiPoint' | 'MultiLineString' | 'MultiPolygon' | 'GeometryCollection';
+export type GeoJSONFeatureType = 'Feature';
+export type GeoJSONFeatureCollectionType = 'FeatureCollection';
+export type GeoJSONType = GeoJSONGeometryType | GeoJSONFeatureType | GeoJSONFeatureCollectionType;
+/**
+ * Position array [longitude, latitude] or [longitude, latitude, elevation]
+ */
+export type Position = [number, number] | [number, number, number];
+/**
+ * Base interface for all GeoJSON objects
+ */
+export interface GeoJSONBase {
+    type: GeoJSONType;
+    bbox?: [number, number, number, number] | [number, number, number, number, number, number];
+}
+/**
+ * Point geometry
+ */
+export interface Point extends GeoJSONBase {
+    type: 'Point';
+    coordinates: Position;
+}
+/**
+ * LineString geometry
+ */
+export interface LineString extends GeoJSONBase {
+    type: 'LineString';
+    coordinates: Position[];
+}
+/**
+ * Polygon geometry
+ */
+export interface Polygon extends GeoJSONBase {
+    type: 'Polygon';
+    coordinates: Position[][];
+}
+/**
+ * MultiPoint geometry
+ */
+export interface MultiPoint extends GeoJSONBase {
+    type: 'MultiPoint';
+    coordinates: Position[];
+}
+/**
+ * MultiLineString geometry
+ */
+export interface MultiLineString extends GeoJSONBase {
+    type: 'MultiLineString';
+    coordinates: Position[][];
+}
+/**
+ * MultiPolygon geometry
+ */
+export interface MultiPolygon extends GeoJSONBase {
+    type: 'MultiPolygon';
+    coordinates: Position[][][];
+}
+/**
+ * GeometryCollection
+ */
+export interface GeometryCollection extends GeoJSONBase {
+    type: 'GeometryCollection';
+    geometries: Geometry[];
+}
+/**
+ * Union of all geometry types
+ */
+export type Geometry = Point | LineString | Polygon | MultiPoint | MultiLineString | MultiPolygon | GeometryCollection;
+/**
+ * GeoJSON Feature with properties
+ */
+export interface Feature<P = Record<string, unknown>, G extends Geometry = Geometry> extends GeoJSONBase {
+    type: 'Feature';
+    geometry: G | null;
+    properties: P | null;
+    id?: string | number;
+}
+/**
+ * GeoJSON FeatureCollection
+ */
+export interface FeatureCollection<P = Record<string, unknown>, G extends Geometry = Geometry> extends GeoJSONBase {
+    type: 'FeatureCollection';
+    features: Feature<P, G>[];
+}
+/**
+ * Union of all GeoJSON objects
+ */
+export type GeoJSON = Geometry | Feature | FeatureCollection;
+/**
+ * Mapbox-specific properties commonly found in Mapbox API responses
+ */
+export interface MapboxFeatureProperties extends Record<string, unknown> {
+    name?: string;
+    name_preferred?: string;
+    full_address?: string;
+    place_formatted?: string;
+    feature_type?: string;
+    poi_category?: string | string[];
+    category?: string;
+    mapbox_id?: string;
+    address?: string;
+}
+/**
+ * Mapbox Feature with common properties
+ */
+export type MapboxFeature = Feature<MapboxFeatureProperties>;
+/**
+ * Mapbox FeatureCollection with common properties
+ */
+export type MapboxFeatureCollection = FeatureCollection<MapboxFeatureProperties>;
+//# sourceMappingURL=geojson.d.ts.map

package/dist/commonjs/schemas/geojson.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"geojson.d.ts","sourceRoot":"","sources":["../../../src/schemas/geojson.ts"],"names":[],"mappings":"AAGA;;;GAGG;AAEH,MAAM,MAAM,mBAAmB,GAC3B,OAAO,GACP,YAAY,GACZ,SAAS,GACT,YAAY,GACZ,iBAAiB,GACjB,cAAc,GACd,oBAAoB,CAAC;AAEzB,MAAM,MAAM,kBAAkB,GAAG,SAAS,CAAC;AAE3C,MAAM,MAAM,4BAA4B,GAAG,mBAAmB,CAAC;AAE/D,MAAM,MAAM,WAAW,GACnB,mBAAmB,GACnB,kBAAkB,GAClB,4BAA4B,CAAC;AAEjC;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,CAAC,EACD,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAChC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACtD;AAED;;GAEG;AACH,MAAM,WAAW,KAAM,SAAQ,WAAW;IACxC,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,QAAQ,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,UAAW,SAAQ,WAAW;IAC7C,IAAI,EAAE,YAAY,CAAC;IACnB,WAAW,EAAE,QAAQ,EAAE,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,OAAQ,SAAQ,WAAW;IAC1C,IAAI,EAAE,SAAS,CAAC;IAChB,WAAW,EAAE,QAAQ,EAAE,EAAE,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,UAAW,SAAQ,WAAW;IAC7C,IAAI,EAAE,YAAY,CAAC;IACnB,WAAW,EAAE,QAAQ,EAAE,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,WAAW;IAClD,IAAI,EAAE,iBAAiB,CAAC;IACxB,WAAW,EAAE,QAAQ,EAAE,EAAE,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,YAAa,SAAQ,WAAW;IAC/C,IAAI,EAAE,cAAc,CAAC;IACrB,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,WAAW;IACrD,IAAI,EAAE,oBAAoB,CAAC;IAC3B,UAAU,EAAE,QAAQ,EAAE,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,MAAM,QAAQ,GAChB,KAAK,GACL,UAAU,GACV,OAAO,GACP,UAAU,GACV,eAAe,GACf,YAAY,GACZ,kBAAkB,CAAC;AAEvB;;GAEG;AACH,MAAM,WAAW,OAAO,CACtB,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3B,CAAC,SAAS,QAAQ,GAAG,QAAQ,CAC7B,SAAQ,WAAW;IACnB,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC;IACnB,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC;IACrB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB,CAChC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3B,CAAC,SAAS,QAAQ,GAAG,QAAQ,CAC7B,SAAQ,WAAW;IACnB,IAAI,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,MAAM,OAAO,GAAG,QAAQ,GAAG,OAAO,GAAG,iBAAiB,CAAC;AAE7D;;GAEG;AACH,MAAM,WAAW,uBAAwB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACtE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAE7D;;GAEG;AACH,MAAM,MAAM,uBAAuB,GACjC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC"}

package/dist/commonjs/schemas/geojson.js

@@ -0,0 +1,5 @@
+"use strict";
+// Copyright (c) Mapbox, Inc.
+// Licensed under the MIT License.
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=geojson.js.map

package/dist/commonjs/schemas/geojson.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"geojson.js","sourceRoot":"","sources":["../../../src/schemas/geojson.ts"],"names":[],"mappings":";AAAA,6BAA6B;AAC7B,kCAAkC"}

package/dist/commonjs/tools/BaseTool.d.ts

@@ -1,14 +1,17 @@
 import type { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { ToolAnnotations, CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+import type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
 import type { ZodTypeAny } from 'zod';
-export declare abstract class BaseTool<InputSchema extends ZodTypeAny> {
+export declare abstract class BaseTool<InputSchema extends ZodTypeAny, OutputSchema extends ZodTypeAny = ZodTypeAny> {
     abstract readonly name: string;
     abstract readonly description: string;
     abstract readonly annotations: ToolAnnotations;
     readonly inputSchema: InputSchema;
+    readonly outputSchema?: OutputSchema;
     protected server: McpServer | null;
     constructor(params: {
         inputSchema: InputSchema;
+        outputSchema?: OutputSchema;
     });
     /**
      * Installs the tool to the given MCP server.
@@ -17,7 +20,7 @@ export declare abstract class BaseTool<InputSchema extends ZodTypeAny> {
     /**
      * Tool logic to be implemented by subclasses.
      */
-    abstract run(rawInput: unknown, extra?: any): Promise<CallToolResult>;
+    abstract run(rawInput: unknown, extra?: RequestHandlerExtra<any, any>): Promise<CallToolResult>;
     /**
      * Helper method to send logging messages
      */

package/dist/commonjs/tools/BaseTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseTool.d.ts","sourceRoot":"","sources":["../../../src/tools/BaseTool.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,SAAS,EACT,cAAc,EACf,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACf,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AAGtC,8BAAsB,QAAQ,CAAC,WAAW,SAAS,UAAU;IAC3D,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,eAAe,CAAC;IAE/C,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAAQ;gBAE9B,MAAM,EAAE;QAAE,WAAW,EAAE,WAAW,CAAA;KAAE;IAIhD;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,cAAc;IAc5C;;OAEG;IACH,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC;IAErE;;OAEG;IACH,SAAS,CAAC,GAAG,CACX,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,EAC7C,IAAI,EAAE,OAAO,GACZ,IAAI;CAKR"}
+{"version":3,"file":"BaseTool.d.ts","sourceRoot":"","sources":["../../../src/tools/BaseTool.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,SAAS,EACT,cAAc,EACf,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACf,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AAGtC,8BAAsB,QAAQ,CAC5B,WAAW,SAAS,UAAU,EAC9B,YAAY,SAAS,UAAU,GAAG,UAAU;IAE5C,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,eAAe,CAAC;IAE/C,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;IACrC,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAAQ;gBAE9B,MAAM,EAAE;QAClB,WAAW,EAAE,WAAW,CAAC;QACzB,YAAY,CAAC,EAAE,YAAY,CAAC;KAC7B;IAKD;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,cAAc;IA+B5C;;OAEG;IACH,QAAQ,CAAC,GAAG,CACV,QAAQ,EAAE,OAAO,EAEjB,KAAK,CAAC,EAAE,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,GACpC,OAAO,CAAC,cAAc,CAAC;IAE1B;;OAEG;IACH,SAAS,CAAC,GAAG,CACX,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,EAC7C,IAAI,EAAE,OAAO,GACZ,IAAI;CAKR"}

package/dist/commonjs/tools/BaseTool.js

@@ -5,21 +5,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseTool = void 0;
 class BaseTool {
     inputSchema;
+    outputSchema;
     server = null;
     constructor(params) {
         this.inputSchema = params.inputSchema;
+        this.outputSchema = params.outputSchema;
     }
     /**
      * Installs the tool to the given MCP server.
      */
     installTo(server) {
         this.server = server;
-        return server.registerTool(this.name, {
+        const config = {
             title: this.annotations.title,
             description: this.description,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             inputSchema: this.inputSchema.shape,
             annotations: this.annotations
-        }, (args, extra) => this.run(args, extra));
+        };
+        // Add outputSchema if provided
+        if (this.outputSchema) {
+            config.outputSchema =
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                this.outputSchema.shape;
+        }
+        return server.registerTool(this.name, config, (args, extra) => this.run(args, extra));
     }
     /**
      * Helper method to send logging messages

package/dist/commonjs/tools/BaseTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../src/tools/BaseTool.ts"],"names":[],"mappings":";AAAA,6BAA6B;AAC7B,kCAAkC;;;AAalC,MAAsB,QAAQ;IAKnB,WAAW,CAAc;IACxB,MAAM,GAAqB,IAAI,CAAC;IAE1C,YAAY,MAAoC;QAC9C,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,SAAS,CAAC,MAAiB;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,MAAM,CAAC,YAAY,CACxB,IAAI,CAAC,IAAI,EACT;YACE,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK;YAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,WAAW,EAAG,IAAI,CAAC,WAA2C,CAAC,KAAK;YACpE,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,EACD,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CACvC,CAAC;IACJ,CAAC;IAOD;;OAEG;IACO,GAAG,CACX,KAA6C,EAC7C,IAAa;QAEb,IAAI,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;YACxB,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;CACF;AA7CD,4BA6CC"}
+{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../src/tools/BaseTool.ts"],"names":[],"mappings":";AAAA,6BAA6B;AAC7B,kCAAkC;;;AAclC,MAAsB,QAAQ;IAQnB,WAAW,CAAc;IACzB,YAAY,CAAgB;IAC3B,MAAM,GAAqB,IAAI,CAAC;IAE1C,YAAY,MAGX;QACC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACtC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,SAAS,CAAC,MAAiB;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,MAAM,MAAM,GAQR;YACF,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK;YAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,8DAA8D;YAC9D,WAAW,EAAG,IAAI,CAAC,WAA2C,CAAC,KAAK;YACpE,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC;QAEF,+BAA+B;QAC/B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,CAAC,YAAY;gBACjB,8DAA8D;gBAC7D,IAAI,CAAC,YAA4C,CAAC,KAAK,CAAC;QAC7D,CAAC;QAED,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAC5D,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CACtB,CAAC;IACJ,CAAC;IAWD;;OAEG;IACO,GAAG,CACX,KAA6C,EAC7C,IAAa;QAEb,IAAI,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;YACxB,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;CACF;AA1ED,4BA0EC"}

package/dist/commonjs/tools/MapboxApiBasedTool.d.ts

@@ -1,15 +1,20 @@
 import type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
-import type { ZodTypeAny, z } from 'zod';
+import type { ZodTypeAny } from 'zod';
 import { BaseTool } from './BaseTool.js';
-import type { OutputSchema } from './MapboxApiBasedTool.schema.js';
-export declare abstract class MapboxApiBasedTool<InputSchema extends ZodTypeAny> extends BaseTool<InputSchema> {
+import type { CallToolResult, ToolAnnotations } from '@modelcontextprotocol/sdk/types.js';
+import type { HttpRequest } from '../utils/types.js';
+import type { ToolExecutionContext } from '../utils/tracing.js';
+export declare abstract class MapboxApiBasedTool<InputSchema extends ZodTypeAny, OutputSchema extends ZodTypeAny = ZodTypeAny> extends BaseTool<InputSchema, OutputSchema> {
     abstract readonly name: string;
     abstract readonly description: string;
-    abstract readonly annotations: import('@modelcontextprotocol/sdk/types.js').ToolAnnotations;
+    abstract readonly annotations: ToolAnnotations;
     static get mapboxAccessToken(): string | undefined;
     static get mapboxApiEndpoint(): string;
+    protected httpRequest: HttpRequest;
     constructor(params: {
         inputSchema: InputSchema;
+        outputSchema?: OutputSchema;
+        httpRequest: HttpRequest;
     });
     /**
      * Validates if a string has the format of a JWT token (header.payload.signature)
@@ -21,10 +26,10 @@ export declare abstract class MapboxApiBasedTool<InputSchema extends ZodTypeAny>
     /**
      * Validates and runs the tool logic.
      */
-    run(rawInput: unknown, extra?: RequestHandlerExtra<any, any>): Promise<z.infer<typeof OutputSchema>>;
+    run(rawInput: unknown, extra?: RequestHandlerExtra<any, any>): Promise<CallToolResult>;
     /**
-     * Tool logic to be implemented by subclasses.
+     * Tool-specific logic to be implemented by subclasses.
      */
-    protected abstract execute(_input: z.infer<InputSchema>, accessToken: string): Promise<any>;
+    protected abstract execute(input: any, accessToken: string, context: ToolExecutionContext): Promise<CallToolResult>;
 }
 //# sourceMappingURL=MapboxApiBasedTool.d.ts.map

package/dist/commonjs/tools/MapboxApiBasedTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapboxApiBasedTool.d.ts","sourceRoot":"","sources":["../../../src/tools/MapboxApiBasedTool.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEnE,8BAAsB,kBAAkB,CACtC,WAAW,SAAS,UAAU,CAC9B,SAAQ,QAAQ,CAAC,WAAW,CAAC;IAC7B,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,oCAAoC,EAAE,eAAe,CAAC;IAE5F,MAAM,KAAK,iBAAiB,uBAE3B;IAED,MAAM,KAAK,iBAAiB,WAE3B;gBAEW,MAAM,EAAE;QAAE,WAAW,EAAE,WAAW,CAAA;KAAE;IAIhD;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IASxB;;OAEG;IACG,GAAG,CACP,QAAQ,EAAE,OAAO,EACjB,KAAK,CAAC,EAAE,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,GACpC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;IA4DxC;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,CACxB,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,EAC5B,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,GAAG,CAAC;CAChB"}
+{"version":3,"file":"MapboxApiBasedTool.d.ts","sourceRoot":"","sources":["../../../src/tools/MapboxApiBasedTool.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EAChB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,8BAAsB,kBAAkB,CACtC,WAAW,SAAS,UAAU,EAC9B,YAAY,SAAS,UAAU,GAAG,UAAU,CAC5C,SAAQ,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC;IAC3C,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,eAAe,CAAC;IAE/C,MAAM,KAAK,iBAAiB,uBAE3B;IAED,MAAM,KAAK,iBAAiB,WAE3B;IAED,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;gBAEvB,MAAM,EAAE;QAClB,WAAW,EAAE,WAAW,CAAC;QACzB,YAAY,CAAC,EAAE,YAAY,CAAC;QAC5B,WAAW,EAAE,WAAW,CAAC;KAC1B;IAKD;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IASxB;;OAEG;IACG,GAAG,CACP,QAAQ,EAAE,OAAO,EAEjB,KAAK,CAAC,EAAE,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,GACpC,OAAO,CAAC,cAAc,CAAC;IA6F1B;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,CAExB,KAAK,EAAE,GAAG,EACV,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,cAAc,CAAC;CAC3B"}

package/dist/commonjs/tools/MapboxApiBasedTool.js

@@ -4,6 +4,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MapboxApiBasedTool = void 0;
 const BaseTool_js_1 = require("./BaseTool.js");
+const api_1 = require("@opentelemetry/api");
+const tracing_js_1 = require("../utils/tracing.js");
 class MapboxApiBasedTool extends BaseTool_js_1.BaseTool {
     static get mapboxAccessToken() {
         return process.env.MAPBOX_ACCESS_TOKEN;
@@ -11,8 +13,10 @@ class MapboxApiBasedTool extends BaseTool_js_1.BaseTool {
     static get mapboxApiEndpoint() {
         return process.env.MAPBOX_API_ENDPOINT || 'https://api.mapbox.com/';
     }
+    httpRequest;
     constructor(params) {
         super(params);
+        this.httpRequest = params.httpRequest;
     }
     /**
      * Validates if a string has the format of a JWT token (header.payload.signature)
@@ -31,46 +35,70 @@ class MapboxApiBasedTool extends BaseTool_js_1.BaseTool {
     /**
      * Validates and runs the tool logic.
      */
-    async run(rawInput, extra) {
+    async run(rawInput, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    extra) {
+        // First check if token is provided via authentication context
+        // Check both standard token field and accessToken in extra for compatibility
+        // In the streamableHttp, the authInfo is injected into extra from `req.auth`
+        // https://github.com/modelcontextprotocol/typescript-sdk/blob/main/src/server/streamableHttp.ts#L405
+        const authToken = extra?.authInfo?.token;
+        const accessToken = authToken || MapboxApiBasedTool.mapboxAccessToken;
+        if (!accessToken) {
+            const errorMessage = 'No access token available. Please provide via Bearer auth or MAPBOX_ACCESS_TOKEN env var';
+            this.log('error', `${this.name}: ${errorMessage}`);
+            return {
+                content: [{ type: 'text', text: errorMessage }],
+                isError: true
+            };
+        }
+        // Validate that the token has the correct JWT format
+        if (!this.isValidJwtFormat(accessToken)) {
+            const errorMessage = 'Access token is not in valid JWT format';
+            this.log('error', `${this.name}: ${errorMessage}`);
+            return {
+                content: [{ type: 'text', text: errorMessage }],
+                isError: true
+            };
+        }
+        let toolContext;
         try {
-            // First check if token is provided via authentication context
-            // Check both standard token field and accessToken in extra for compatibility
-            // In the streamableHttp, the authInfo is injected into extra from `req.auth`
-            // https://github.com/modelcontextprotocol/typescript-sdk/blob/main/src/server/streamableHttp.ts#L405
-            const authToken = extra?.authInfo?.token;
-            const accessToken = authToken || MapboxApiBasedTool.mapboxAccessToken;
-            if (!accessToken) {
-                throw new Error('No access token available. Please provide via Bearer auth or MAPBOX_ACCESS_TOKEN env var');
-            }
-            // Validate that the token has the correct JWT format
-            if (!this.isValidJwtFormat(accessToken)) {
-                throw new Error('Access token is not in valid JWT format');
-            }
             const input = this.inputSchema.parse(rawInput);
-            const result = await this.execute(input, accessToken);
-            // Check if result is already a content object (image or text)
-            if (result &&
-                typeof result === 'object' &&
-                (result.type === 'image' || result.type === 'text')) {
-                return {
-                    content: [result],
-                    isError: false
-                };
-            }
-            // Otherwise return as text
-            return {
-                content: [{ type: 'text', text: JSON.stringify(result) }],
-                isError: false
+            // Create tool execution context - tracing is handled by the HTTP client
+            toolContext = {
+                ...(0, tracing_js_1.createToolExecutionContext)(this.name, 0, // Input size not needed since tracing is in HTTP client
+                this.httpRequest, extra),
+                httpRequest: this.httpRequest
             };
+            // Execute tool within the tool span context to connect all child spans
+            const result = await api_1.context.with(api_1.trace.setSpan(api_1.context.active(), toolContext.span), async () => {
+                return await this.execute(input, MapboxApiBasedTool.mapboxAccessToken, toolContext);
+            });
+            // Mark span as successful and end it
+            toolContext.span.setStatus({ code: api_1.SpanStatusCode.OK });
+            toolContext.span.end();
+            return result;
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
             this.log('error', `${this.name}: Error during execution: ${errorMessage}`);
+            // Mark span as failed and end it
+            if (toolContext?.span) {
+                toolContext.span.setStatus({
+                    code: api_1.SpanStatusCode.ERROR,
+                    message: errorMessage
+                });
+                toolContext.span.end();
+            }
+            const errorResponse = {
+                message: errorMessage,
+                tool: this.name
+            };
             return {
                 content: [
                     {
                         type: 'text',
-                        text: errorMessage
+                        text: JSON.stringify(errorResponse)
                     }
                 ],
                 isError: true

package/dist/commonjs/tools/MapboxApiBasedTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"MapboxApiBasedTool.js","sourceRoot":"","sources":["../../../src/tools/MapboxApiBasedTool.ts"],"names":[],"mappings":";AAAA,6BAA6B;AAC7B,kCAAkC;;;AAIlC,+CAAyC;AAGzC,MAAsB,kBAEpB,SAAQ,sBAAqB;IAK7B,MAAM,KAAK,iBAAiB;QAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;IACzC,CAAC;IAED,MAAM,KAAK,iBAAiB;QAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,yBAAyB,CAAC;IACtE,CAAC;IAED,YAAY,MAAoC;QAC9C,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IAED;;;;;OAKG;IACK,gBAAgB,CAAC,KAAa;QACpC,0EAA0E;QAC1E,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAErC,qCAAqC;QACrC,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAChD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,GAAG,CACP,QAAiB,EACjB,KAAqC;QAErC,IAAI,CAAC;YACH,8DAA8D;YAC9D,6EAA6E;YAC7E,6EAA6E;YAC7E,qGAAqG;YACrG,MAAM,SAAS,GAAG,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC;YACzC,MAAM,WAAW,GAAG,SAAS,IAAI,kBAAkB,CAAC,iBAAiB,CAAC;YACtE,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CACb,0FAA0F,CAC3F,CAAC;YACJ,CAAC;YAED,qDAAqD;YACrD,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;gBACxC,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;YAC7D,CAAC;YAED,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YAEtD,8DAA8D;YAC9D,IACE,MAAM;gBACN,OAAO,MAAM,KAAK,QAAQ;gBAC1B,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,EACnD,CAAC;gBACD,OAAO;oBACL,OAAO,EAAE,CAAC,MAAM,CAAC;oBACjB,OAAO,EAAE,KAAK;iBACf,CAAC;YACJ,CAAC;YAED,2BAA2B;YAC3B,OAAO;gBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzD,OAAO,EAAE,KAAK;aACf,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAChB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAEzD,IAAI,CAAC,GAAG,CACN,OAAO,EACP,GAAG,IAAI,CAAC,IAAI,6BAA6B,YAAY,EAAE,CACxD,CAAC;YAEF,OAAO;gBACL,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,YAAY;qBACnB;iBACF;gBACD,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;IACH,CAAC;CASF;AA3GD,gDA2GC"}
+{"version":3,"file":"MapboxApiBasedTool.js","sourceRoot":"","sources":["../../../src/tools/MapboxApiBasedTool.ts"],"names":[],"mappings":"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"}

package/dist/commonjs/tools/category-list-tool/CategoryListTool.d.ts

@@ -1,11 +1,13 @@
 import { MapboxApiBasedTool } from '../MapboxApiBasedTool.js';
-import type { CategoryListInput } from './CategoryListTool.schema.js';
-import { CategoryListInputSchema } from './CategoryListTool.schema.js';
+import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+import type { HttpRequest } from '../../utils/types.js';
+import type { CategoryListInput } from './CategoryListTool.input.schema.js';
+import { CategoryListInputSchema } from './CategoryListTool.input.schema.js';
+import { CategoryListResponseSchema } from './CategoryListTool.output.schema.js';
 /**
  * Tool for retrieving the list of supported categories from Mapbox Search API
  */
-export declare class CategoryListTool extends MapboxApiBasedTool<typeof CategoryListInputSchema> {
-    private fetchImpl;
+export declare class CategoryListTool extends MapboxApiBasedTool<typeof CategoryListInputSchema, typeof CategoryListResponseSchema> {
     name: string;
     description: string;
     annotations: {
@@ -15,7 +17,9 @@ export declare class CategoryListTool extends MapboxApiBasedTool<typeof Category
         idempotentHint: boolean;
         openWorldHint: boolean;
     };
-    constructor(fetchImpl?: typeof fetch);
-    protected execute(input: CategoryListInput, accessToken: string): Promise<unknown>;
+    constructor(params: {
+        httpRequest: HttpRequest;
+    });
+    protected execute(input: CategoryListInput, accessToken: string): Promise<CallToolResult>;
 }
 //# sourceMappingURL=CategoryListTool.d.ts.map

package/dist/commonjs/tools/category-list-tool/CategoryListTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CategoryListTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/category-list-tool/CategoryListTool.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAavE;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,kBAAkB,CACtD,OAAO,uBAAuB,CAC/B;IAYa,OAAO,CAAC,SAAS;IAX7B,IAAI,SAAwB;IAC5B,WAAW,SAC+X;IAC1Y,WAAW;;;;;;MAMT;gBAEkB,SAAS,GAAE,OAAO,KAAmB;cAIzC,OAAO,CACrB,KAAK,EAAE,iBAAiB,EACxB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC;CA2CpB"}
+{"version":3,"file":"CategoryListTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/category-list-tool/CategoryListTool.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAiBjF;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,kBAAkB,CACtD,OAAO,uBAAuB,EAC9B,OAAO,0BAA0B,CAClC;IACC,IAAI,SAAwB;IAC5B,WAAW,SAC+X;IAC1Y,WAAW;;;;;;MAMT;gBAEU,MAAM,EAAE;QAAE,WAAW,EAAE,WAAW,CAAA;KAAE;cAQhC,OAAO,CACrB,KAAK,EAAE,iBAAiB,EACxB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC;CAkE3B"}

package/dist/commonjs/tools/category-list-tool/{CategoryListTool.schema.d.ts → CategoryListTool.input.schema.d.ts}

@@ -13,4 +13,4 @@ export declare const CategoryListInputSchema: z.ZodObject<{
     offset?: number | undefined;
 }>;
 export type CategoryListInput = z.infer<typeof CategoryListInputSchema>;
-//# sourceMappingURL=CategoryListTool.schema.d.ts.map
+//# sourceMappingURL=CategoryListTool.input.schema.d.ts.map

package/dist/commonjs/tools/category-list-tool/CategoryListTool.input.schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CategoryListTool.input.schema.d.ts","sourceRoot":"","sources":["../../../../src/tools/category-list-tool/CategoryListTool.input.schema.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,uBAAuB;;;;;;;;;;;;EAgBlC,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC"}

package/dist/commonjs/tools/category-list-tool/{CategoryListTool.schema.js → CategoryListTool.input.schema.js}

@@ -20,4 +20,4 @@ exports.CategoryListInputSchema = zod_1.z.object({
         .default(0)
         .describe('Number of categories to skip for pagination. Default is 0.')
 });
-//# sourceMappingURL=CategoryListTool.schema.js.map
+//# sourceMappingURL=CategoryListTool.input.schema.js.map

package/dist/commonjs/tools/category-list-tool/CategoryListTool.input.schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CategoryListTool.input.schema.js","sourceRoot":"","sources":["../../../../src/tools/category-list-tool/CategoryListTool.input.schema.ts"],"names":[],"mappings":";AAAA,6BAA6B;AAC7B,kCAAkC;;;AAElC,6BAAwB;AACxB,uDAAyD;AAE5C,QAAA,uBAAuB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC9C,QAAQ,EAAE,0BAAc,CAAC,QAAQ,EAAE;IACnC,KAAK,EAAE,OAAC;SACL,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,GAAG,CAAC;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,wQAAwQ,CACzQ;IACH,MAAM,EAAE,OAAC;SACN,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,EAAE;SACV,OAAO,CAAC,CAAC,CAAC;SACV,QAAQ,CAAC,4DAA4D,CAAC;CAC1E,CAAC,CAAC"}