@mapbox/mcp-server 0.5.5 → 0.8.1-dev.0

package/dist/esm/tools/BaseTool.js

@@ -2,21 +2,31 @@
 // Licensed under the MIT License.
 export 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
@@ -26,5 +36,24 @@ export class BaseTool {
             void this.server.server.sendLoggingMessage({ level, data });
         }
     }
+    /**
+     * Validates output data against the output schema with graceful fallback.
+     * If validation fails, logs a warning and returns the raw data.
+     * @param rawData The raw data to validate
+     * @returns The validated data, or raw data if validation fails
+     */
+    validateOutput(rawData) {
+        if (!this.outputSchema) {
+            return rawData;
+        }
+        try {
+            return this.outputSchema.parse(rawData);
+        }
+        catch (validationError) {
+            this.log('warning', `${this.name}: Output schema validation failed: ${validationError instanceof Error ? validationError.message : 'Unknown validation error'}`);
+            // Graceful fallback to raw data
+            return rawData;
+        }
+    }
 }
 //# sourceMappingURL=BaseTool.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../src/tools/BaseTool.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,kCAAkC;AAalC,MAAM,OAAgB,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"}
+{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../src/tools/BaseTool.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,kCAAkC;AAclC,MAAM,OAAgB,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;IAED;;;;;OAKG;IACO,cAAc,CAAI,OAAgB;QAC1C,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,OAAO,OAAY,CAAC;QACtB,CAAC;QAED,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAM,CAAC;QAC/C,CAAC;QAAC,OAAO,eAAe,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CACN,SAAS,EACT,GAAG,IAAI,CAAC,IAAI,sCAAsC,eAAe,YAAY,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,0BAA0B,EAAE,CAC5I,CAAC;YACF,gCAAgC;YAChC,OAAO,OAAY,CAAC;QACtB,CAAC;IACH,CAAC;CACF"}

package/dist/esm/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/esm/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;IAyF1B;;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/esm/tools/MapboxApiBasedTool.js

@@ -1,6 +1,8 @@
 // Copyright (c) Mapbox, Inc.
 // Licensed under the MIT License.
 import { BaseTool } from './BaseTool.js';
+import { context, trace, SpanStatusCode } from '@opentelemetry/api';
+import { createToolExecutionContext } from '../utils/tracing.js';
 export class MapboxApiBasedTool extends BaseTool {
     static get mapboxAccessToken() {
         return process.env.MAPBOX_ACCESS_TOKEN;
@@ -8,8 +10,10 @@ export class MapboxApiBasedTool extends 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)
@@ -28,46 +32,70 @@ export class MapboxApiBasedTool extends 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 = {
+                ...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 context.with(trace.setSpan(context.active(), toolContext.span), async () => {
+                return await this.execute(input, accessToken, toolContext);
+            });
+            // Mark span as successful and end it
+            toolContext.span.setStatus({ code: 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: 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/esm/tools/MapboxApiBasedTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"MapboxApiBasedTool.js","sourceRoot":"","sources":["../../../src/tools/MapboxApiBasedTool.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,kCAAkC;AAIlC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,MAAM,OAAgB,kBAEpB,SAAQ,QAAqB;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"}
+{"version":3,"file":"MapboxApiBasedTool.js","sourceRoot":"","sources":["../../../src/tools/MapboxApiBasedTool.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,kCAAkC;AAIlC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAMzC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpE,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAEjE,MAAM,OAAgB,kBAGpB,SAAQ,QAAmC;IAK3C,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;IAES,WAAW,CAAc;IAEnC,YAAY,MAIX;QACC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;IACxC,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;IACjB,8DAA8D;IAC9D,KAAqC;QAErC,8DAA8D;QAC9D,6EAA6E;QAC7E,6EAA6E;QAC7E,qGAAqG;QACrG,MAAM,SAAS,GAAG,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC;QACzC,MAAM,WAAW,GAAG,SAAS,IAAI,kBAAkB,CAAC,iBAAiB,CAAC;QACtE,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,YAAY,GAChB,0FAA0F,CAAC;YAC7F,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC,CAAC;YACnD,OAAO;gBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;gBAC/C,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;QAED,qDAAqD;QACrD,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;YACxC,MAAM,YAAY,GAAG,yCAAyC,CAAC;YAC/D,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC,CAAC;YACnD,OAAO;gBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;gBAC/C,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;QAED,IAAI,WAA6C,CAAC;QAElD,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAE/C,wEAAwE;YACxE,WAAW,GAAG;gBACZ,GAAG,0BAA0B,CAC3B,IAAI,CAAC,IAAI,EACT,CAAC,EAAE,wDAAwD;gBAC3D,IAAI,CAAC,WAAW,EAChB,KAAK,CACN;gBACD,WAAW,EAAE,IAAI,CAAC,WAAW;aAC9B,CAAC;YAEF,uEAAuE;YACvE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAC/B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,WAAW,CAAC,IAAI,CAAC,EACjD,KAAK,IAAI,EAAE;gBACT,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,WAAY,CAAC,CAAC;YAC9D,CAAC,CACF,CAAC;YAEF,qCAAqC;YACrC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;YACxD,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,OAAO,MAAM,CAAC;QAChB,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;YACzD,IAAI,CAAC,GAAG,CACN,OAAO,EACP,GAAG,IAAI,CAAC,IAAI,6BAA6B,YAAY,EAAE,CACxD,CAAC;YAEF,iCAAiC;YACjC,IAAI,WAAW,EAAE,IAAI,EAAE,CAAC;gBACtB,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC;oBACzB,IAAI,EAAE,cAAc,CAAC,KAAK;oBAC1B,OAAO,EAAE,YAAY;iBACtB,CAAC,CAAC;gBACH,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACzB,CAAC;YAED,MAAM,aAAa,GAAG;gBACpB,OAAO,EAAE,YAAY;gBACrB,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB,CAAC;YAEF,OAAO;gBACL,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,MAAe;wBACrB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;qBACpC;iBACF;gBACD,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;IACH,CAAC;CAWF"}

package/dist/esm/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/esm/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,SAC0iB;IACrjB,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/esm/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/esm/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/esm/tools/category-list-tool/{CategoryListTool.schema.js → CategoryListTool.input.schema.js}

@@ -17,4 +17,4 @@ export const CategoryListInputSchema = 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/esm/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,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9C,QAAQ,EAAE,cAAc,CAAC,QAAQ,EAAE;IACnC,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,GAAG,CAAC;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,wQAAwQ,CACzQ;IACH,MAAM,EAAE,CAAC;SACN,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,EAAE;SACV,OAAO,CAAC,CAAC,CAAC;SACV,QAAQ,CAAC,4DAA4D,CAAC;CAC1E,CAAC,CAAC"}

package/dist/esm/tools/category-list-tool/CategoryListTool.js

@@ -1,25 +1,28 @@
 // Copyright (c) Mapbox, Inc.
 // Licensed under the MIT License.
 import { MapboxApiBasedTool } from '../MapboxApiBasedTool.js';
-import { fetchClient } from '../../utils/fetchRequest.js';
-import { CategoryListInputSchema } from './CategoryListTool.schema.js';
+import { CategoryListInputSchema } from './CategoryListTool.input.schema.js';
+import { CategoryListResponseSchema } from './CategoryListTool.output.schema.js';
+// API Documentation: https://docs.mapbox.com/api/search/search-box/#list-categories
 /**
  * Tool for retrieving the list of supported categories from Mapbox Search API
  */
 export class CategoryListTool extends MapboxApiBasedTool {
-    fetchImpl;
     name = 'category_list_tool';
-    description = 'Tool for retrieving the list of supported categories from Mapbox Search API. Use this when another function requires a list of categories. Returns all available category IDs by default. Only use pagination (limit/offset) if token usage optimization is required. If using pagination, make multiple calls to retrieve ALL categories before proceeding with other tasks to ensure complete data.';
+    description = '[DEPRECATED: Use resource_reader_tool with "mapbox://categories" URI instead] Tool for retrieving the list of supported categories from Mapbox Search API. This tool is kept for backward compatibility with clients that do not support MCP resources. Use this when another function requires a list of categories. Returns all available category IDs by default. Only use pagination (limit/offset) if token usage optimization is required. If using pagination, make multiple calls to retrieve ALL categories before proceeding with other tasks to ensure complete data.';
     annotations = {
-        title: 'Category List Tool',
+        title: 'Category List Tool (Deprecated)',
         readOnlyHint: true,
         destructiveHint: false,
         idempotentHint: true,
         openWorldHint: true
     };
-    constructor(fetchImpl = fetchClient) {
-        super({ inputSchema: CategoryListInputSchema });
-        this.fetchImpl = fetchImpl;
+    constructor(params) {
+        super({
+            inputSchema: CategoryListInputSchema,
+            outputSchema: CategoryListResponseSchema,
+            httpRequest: params.httpRequest
+        });
     }
     async execute(input, accessToken) {
         const url = new URL('https://api.mapbox.com/search/searchbox/v1/list/category');
@@ -27,28 +30,48 @@ export class CategoryListTool extends MapboxApiBasedTool {
         if (input.language) {
             url.searchParams.set('language', input.language);
         }
-        const response = await this.fetchImpl(url.toString(), {
+        const response = await this.httpRequest(url.toString(), {
             method: 'GET',
             headers: {
                 'User-Agent': `@mapbox/mcp-server/${process.env.npm_package_version || 'dev'}`
             }
         });
         if (!response.ok) {
-            throw new Error(`Mapbox API request failed: ${response.status} ${response.statusText}`);
+            return {
+                content: [
+                    {
+                        type: 'text',
+                        text: `Mapbox API request failed: ${response.status} ${response.statusText}`
+                    }
+                ],
+                isError: true
+            };
         }
-        const data = (await response.json());
+        const rawData = await response.json();
+        // Parse the API response (which has the full structure)
+        const data = rawData;
         // Apply pagination - if no limit specified, return all
         const startIndex = input.offset || 0;
         let endIndex = data.listItems.length;
         if (input.limit) {
             endIndex = Math.min(startIndex + input.limit, data.listItems.length);
         }
-        // Return simple object with listItems array
+        // Extract just the category IDs for our simplified response
         const categoryIds = data.listItems
             .slice(startIndex, endIndex)
             .map((item) => item.canonical_id);
+        const result = { listItems: categoryIds };
+        // Validate our simplified output against the schema
+        try {
+            CategoryListResponseSchema.parse(result);
+        }
+        catch (validationError) {
+            this.log('warning', `Output schema validation failed: ${validationError instanceof Error ? validationError.message : 'Unknown validation error'}`);
+        }
         return {
-            listItems: categoryIds
+            content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
+            structuredContent: result,
+            isError: false
         };
     }
 }

package/dist/esm/tools/category-list-tool/CategoryListTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"CategoryListTool.js","sourceRoot":"","sources":["../../../../src/tools/category-list-tool/CategoryListTool.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,kCAAkC;AAElC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAavE;;GAEG;AACH,MAAM,OAAO,gBAAiB,SAAQ,kBAErC;IAYqB;IAXpB,IAAI,GAAG,oBAAoB,CAAC;IAC5B,WAAW,GACT,uYAAuY,CAAC;IAC1Y,WAAW,GAAG;QACZ,KAAK,EAAE,oBAAoB;QAC3B,YAAY,EAAE,IAAI;QAClB,eAAe,EAAE,KAAK;QACtB,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,IAAI;KACpB,CAAC;IAEF,YAAoB,YAA0B,WAAW;QACvD,KAAK,CAAC,EAAE,WAAW,EAAE,uBAAuB,EAAE,CAAC,CAAC;QAD9B,cAAS,GAAT,SAAS,CAA4B;IAEzD,CAAC;IAES,KAAK,CAAC,OAAO,CACrB,KAAwB,EACxB,WAAmB;QAEnB,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,0DAA0D,CAC3D,CAAC;QAEF,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QAElD,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnD,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE;YACpD,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,YAAY,EAAE,sBAAsB,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,KAAK,EAAE;aAC/E;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CACb,8BAA8B,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CACvE,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAyB,CAAC;QAE7D,uDAAuD;QACvD,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC;QACrC,IAAI,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QAErC,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACvE,CAAC;QAED,4CAA4C;QAC5C,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS;aAC/B,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC;aAC3B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEpC,OAAO;YACL,SAAS,EAAE,WAAW;SACvB,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"CategoryListTool.js","sourceRoot":"","sources":["../../../../src/tools/category-list-tool/CategoryListTool.ts"],"names":[],"mappings":"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"}

package/dist/esm/tools/category-list-tool/CategoryListTool.output.schema.d.ts

@@ -0,0 +1,10 @@
+import { z } from 'zod';
+export declare const CategoryListResponseSchema: z.ZodObject<{
+    listItems: z.ZodArray<z.ZodString, "many">;
+}, "strip", z.ZodTypeAny, {
+    listItems: string[];
+}, {
+    listItems: string[];
+}>;
+export type CategoryListResponse = z.infer<typeof CategoryListResponseSchema>;
+//# sourceMappingURL=CategoryListTool.output.schema.d.ts.map

package/dist/esm/tools/category-list-tool/CategoryListTool.output.schema.d.ts.map

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

package/dist/esm/tools/category-list-tool/CategoryListTool.output.schema.js

@@ -0,0 +1,9 @@
+// Copyright (c) Mapbox, Inc.
+// Licensed under the MIT License.
+import { z } from 'zod';
+// Schema for the simplified output that the tool actually returns
+// Just an array of category ID strings
+export const CategoryListResponseSchema = z.object({
+    listItems: z.array(z.string())
+});
+//# sourceMappingURL=CategoryListTool.output.schema.js.map

package/dist/esm/tools/category-list-tool/CategoryListTool.output.schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CategoryListTool.output.schema.js","sourceRoot":"","sources":["../../../../src/tools/category-list-tool/CategoryListTool.output.schema.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,kCAAkC;AAElC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,kEAAkE;AAClE,uCAAuC;AACvC,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,CAAC,MAAM,CAAC;IACjD,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;CAC/B,CAAC,CAAC"}

package/dist/esm/tools/category-search-tool/CategorySearchTool.d.ts

@@ -1,8 +1,10 @@
 import type { z } from 'zod';
 import { MapboxApiBasedTool } from '../MapboxApiBasedTool.js';
-import { CategorySearchInputSchema } from './CategorySearchTool.schema.js';
-export declare class CategorySearchTool extends MapboxApiBasedTool<typeof CategorySearchInputSchema> {
-    private fetch;
+import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+import type { HttpRequest } from '../../utils/types.js';
+import { CategorySearchInputSchema } from './CategorySearchTool.input.schema.js';
+import { CategorySearchResponseSchema } from './CategorySearchTool.output.schema.js';
+export declare class CategorySearchTool extends MapboxApiBasedTool<typeof CategorySearchInputSchema, typeof CategorySearchResponseSchema> {
     name: string;
     description: string;
     annotations: {
@@ -12,11 +14,10 @@ export declare class CategorySearchTool extends MapboxApiBasedTool<typeof Catego
         idempotentHint: boolean;
         openWorldHint: boolean;
     };
-    constructor(fetch?: typeof globalThis.fetch);
+    constructor(params: {
+        httpRequest: HttpRequest;
+    });
     private formatGeoJsonToText;
-    protected execute(input: z.infer<typeof CategorySearchInputSchema>, accessToken: string): Promise<{
-        type: 'text';
-        text: string;
-    }>;
+    protected execute(input: z.infer<typeof CategorySearchInputSchema>, accessToken: string): Promise<CallToolResult>;
 }
 //# sourceMappingURL=CategorySearchTool.d.ts.map

package/dist/esm/tools/category-search-tool/CategorySearchTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CategorySearchTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/category-search-tool/CategorySearchTool.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,qBAAa,kBAAmB,SAAQ,kBAAkB,CACxD,OAAO,yBAAyB,CACjC;IAYa,OAAO,CAAC,KAAK;IAXzB,IAAI,SAA0B;IAC9B,WAAW,SACoX;IAC/X,WAAW;;;;;;MAMT;gBAEkB,KAAK,GAAE,OAAO,UAAU,CAAC,KAAmB;IAIhE,OAAO,CAAC,mBAAmB;cAsDX,OAAO,CACrB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,EAChD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAmE3C"}
+{"version":3,"file":"CategorySearchTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/category-search-tool/CategorySearchTool.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,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,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAQrF,qBAAa,kBAAmB,SAAQ,kBAAkB,CACxD,OAAO,yBAAyB,EAChC,OAAO,4BAA4B,CACpC;IACC,IAAI,SAA0B;IAC9B,WAAW,SACoX;IAC/X,WAAW;;;;;;MAMT;gBAEU,MAAM,EAAE;QAAE,WAAW,EAAE,WAAW,CAAA;KAAE;IAQhD,OAAO,CAAC,mBAAmB;cAwDX,OAAO,CACrB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,EAChD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC;CA6F3B"}

package/dist/esm/tools/category-search-tool/{CategorySearchTool.schema.d.ts → CategorySearchTool.input.schema.d.ts}

@@ -3,7 +3,7 @@ export declare const CategorySearchInputSchema: z.ZodObject<{
     category: z.ZodString;
     language: z.ZodOptional<z.ZodString>;
     limit: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-    proximity: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
+    proximity: z.ZodOptional<z.ZodObject<{
         longitude: z.ZodNumber;
         latitude: z.ZodNumber;
     }, "strip", z.ZodTypeAny, {
@@ -12,10 +12,7 @@ export declare const CategorySearchInputSchema: z.ZodObject<{
     }, {
         longitude: number;
         latitude: number;
-    }>, z.ZodEffects<z.ZodString, "ip" | {
-        longitude: any;
-        latitude: any;
-    }, string>]>>;
+    }>>;
     bbox: z.ZodOptional<z.ZodObject<{
         minLongitude: z.ZodNumber;
         minLatitude: z.ZodNumber;
@@ -36,16 +33,13 @@ export declare const CategorySearchInputSchema: z.ZodObject<{
     poi_category_exclusions: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     format: z.ZodDefault<z.ZodOptional<z.ZodEnum<["json_string", "formatted_text"]>>>;
 }, "strip", z.ZodTypeAny, {
-    limit: number;
     category: string;
+    limit: number;
     format: "json_string" | "formatted_text";
     language?: string | undefined;
     proximity?: {
         longitude: number;
         latitude: number;
-    } | "ip" | {
-        longitude: any;
-        latitude: any;
     } | undefined;
     bbox?: {
         minLongitude: number;
@@ -59,7 +53,7 @@ export declare const CategorySearchInputSchema: z.ZodObject<{
     category: string;
     language?: string | undefined;
     limit?: number | undefined;
-    proximity?: string | {
+    proximity?: {
         longitude: number;
         latitude: number;
     } | undefined;
@@ -73,4 +67,4 @@ export declare const CategorySearchInputSchema: z.ZodObject<{
     poi_category_exclusions?: string[] | undefined;
     format?: "json_string" | "formatted_text" | undefined;
 }>;
-//# sourceMappingURL=CategorySearchTool.schema.d.ts.map
+//# sourceMappingURL=CategorySearchTool.input.schema.d.ts.map

package/dist/esm/tools/category-search-tool/CategorySearchTool.input.schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CategorySearchTool.input.schema.d.ts","sourceRoot":"","sources":["../../../../src/tools/category-search-tool/CategorySearchTool.input.schema.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyCpC,CAAC"}

package/dist/esm/tools/category-search-tool/CategorySearchTool.input.schema.js

@@ -0,0 +1,41 @@
+// Copyright (c) Mapbox, Inc.
+// Licensed under the MIT License.
+import { z } from 'zod';
+import { languageSchema, bboxSchema } from '../../schemas/shared.js';
+export const CategorySearchInputSchema = z.object({
+    category: z
+        .string()
+        .describe('The canonical place category name to search for (e.g., "restaurant", "hotel", "cafe"). To get the full list of supported categories, use the category_list_tool.'),
+    language: languageSchema.optional(),
+    limit: z
+        .number()
+        .min(1)
+        .max(25)
+        .optional()
+        .default(10)
+        .describe('Maximum number of results to return (1-25)'),
+    proximity: z
+        .object({
+        longitude: z.number().min(-180).max(180),
+        latitude: z.number().min(-90).max(90)
+    })
+        .optional()
+        .describe('Location to bias results towards as {longitude, latitude}. If not provided, defaults to IP-based location.'),
+    bbox: bboxSchema
+        .describe('Bounding box to limit results within specified bounds')
+        .optional(),
+    country: z
+        .array(z.string().length(2))
+        .optional()
+        .describe('Array of ISO 3166 alpha 2 country codes to limit results'),
+    poi_category_exclusions: z
+        .array(z.string())
+        .optional()
+        .describe('Array of POI categories to exclude from results'),
+    format: z
+        .enum(['json_string', 'formatted_text'])
+        .optional()
+        .default('formatted_text')
+        .describe('Output format: "json_string" returns raw GeoJSON data as a JSON string that can be parsed; "formatted_text" returns human-readable text with place names, addresses, and coordinates. Both return as text content but json_string contains parseable JSON data while formatted_text is for display.')
+});
+//# sourceMappingURL=CategorySearchTool.input.schema.js.map

package/dist/esm/tools/category-search-tool/CategorySearchTool.input.schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CategorySearchTool.input.schema.js","sourceRoot":"","sources":["../../../../src/tools/category-search-tool/CategorySearchTool.input.schema.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,kCAAkC;AAElC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErE,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC,MAAM,CAAC;IAChD,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,QAAQ,CACP,kKAAkK,CACnK;IACH,QAAQ,EAAE,cAAc,CAAC,QAAQ,EAAE;IACnC,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,EAAE,CAAC;SACP,QAAQ,EAAE;SACV,OAAO,CAAC,EAAE,CAAC;SACX,QAAQ,CAAC,4CAA4C,CAAC;IACzD,SAAS,EAAE,CAAC;SACT,MAAM,CAAC;QACN,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;QACxC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;KACtC,CAAC;SACD,QAAQ,EAAE;SACV,QAAQ,CACP,4GAA4G,CAC7G;IACH,IAAI,EAAE,UAAU;SACb,QAAQ,CAAC,uDAAuD,CAAC;SACjE,QAAQ,EAAE;IACb,OAAO,EAAE,CAAC;SACP,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SAC3B,QAAQ,EAAE;SACV,QAAQ,CAAC,0DAA0D,CAAC;IACvE,uBAAuB,EAAE,CAAC;SACvB,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SACjB,QAAQ,EAAE;SACV,QAAQ,CAAC,iDAAiD,CAAC;IAC9D,MAAM,EAAE,CAAC;SACN,IAAI,CAAC,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;SACvC,QAAQ,EAAE;SACV,OAAO,CAAC,gBAAgB,CAAC;SACzB,QAAQ,CACP,qSAAqS,CACtS;CACJ,CAAC,CAAC"}