mcp-use 1.9.0-canary.3 → 1.9.1-canary.0

package/dist/src/server/tools/schema-helpers.d.ts

@@ -0,0 +1,54 @@
+/**
+ * Schema helper utilities for tool registration
+ *
+ * This module provides utilities for converting between different schema formats
+ * used in tool registration.
+ */
+import { z } from "zod";
+/**
+ * Convert a Zod object schema to the internal Record<string, z.ZodSchema> format
+ *
+ * @param zodSchema - Zod object schema to convert
+ * @returns Object mapping parameter names to Zod validation schemas
+ *
+ * @example
+ * ```typescript
+ * const schema = z.object({
+ *   name: z.string(),
+ *   age: z.number().optional()
+ * });
+ * const params = convertZodSchemaToParams(schema);
+ * // Returns: { name: z.string(), age: z.number().optional() }
+ * ```
+ */
+export declare function convertZodSchemaToParams(zodSchema: z.ZodObject<any>): Record<string, z.ZodSchema>;
+/**
+ * Input definition for tool parameters
+ */
+export interface InputDefinition {
+    name: string;
+    type: string;
+    required?: boolean;
+    description?: string;
+}
+/**
+ * Create input schema for tools
+ *
+ * Converts tool input definitions into Zod validation schemas for runtime validation.
+ * Supports common data types (string, number, boolean, object, array) and optional
+ * parameters. Used internally when registering tools with the MCP server.
+ *
+ * @param inputs - Array of input parameter definitions with name, type, and optional flag
+ * @returns Object mapping parameter names to Zod validation schemas
+ *
+ * @example
+ * ```typescript
+ * const schema = createParamsSchema([
+ *   { name: 'query', type: 'string', required: true, description: 'Search query' },
+ *   { name: 'limit', type: 'number', required: false }
+ * ])
+ * // Returns: { query: z.string().describe('Search query'), limit: z.number().optional() }
+ * ```
+ */
+export declare function createParamsSchema(inputs: InputDefinition[]): Record<string, z.ZodSchema>;
+//# sourceMappingURL=schema-helpers.d.ts.map

package/dist/src/server/tools/schema-helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-helpers.d.ts","sourceRoot":"","sources":["../../../../src/server/tools/schema-helpers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,GAC1B,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,CAgB7B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,eAAe,EAAE,GACxB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,CAsC7B"}

package/dist/src/server/tools/tool-execution-helpers.d.ts

@@ -0,0 +1,97 @@
+/**
+ * Tool Execution Helpers
+ *
+ * Helper functions for tool execution context enhancement.
+ * Extracted from tool-registration.ts to reduce duplication and improve maintainability.
+ */
+import type { z } from "zod";
+import type { Context } from "hono";
+import type { CreateMessageRequest, CreateMessageResult, ElicitRequestFormParams, ElicitRequestURLParams, ElicitResult } from "@modelcontextprotocol/sdk/types.js";
+import type { SampleOptions, ElicitOptions, ElicitFormParams, ElicitUrlParams } from "../types/index.js";
+/**
+ * Session data for tool context
+ */
+export interface SessionData {
+    transport: any;
+    lastAccessedAt: number;
+    context?: Context;
+    progressToken?: number;
+    sendNotification?: (notification: {
+        method: string;
+        params: Record<string, any>;
+    }) => Promise<void>;
+    expressRes?: any;
+    honoContext?: Context;
+}
+/**
+ * Result of session context lookup
+ */
+export interface SessionContextResult {
+    requestContext: Context | undefined;
+    session: SessionData | undefined;
+    progressToken: number | undefined;
+    sendNotification: ((notification: {
+        method: string;
+        params: Record<string, any>;
+    }) => Promise<void>) | undefined;
+}
+/**
+ * Find session context from sessions map
+ * Combines session lookup, context matching, and metadata extraction in one pass
+ */
+export declare function findSessionContext(sessions: Map<string, SessionData>, initialRequestContext: Context | undefined, extraProgressToken?: number, extraSendNotification?: (notification: {
+    method: string;
+    params: Record<string, any>;
+}) => Promise<void>): SessionContextResult;
+/**
+ * Send a progress notification
+ */
+export declare function sendProgressNotification(sendNotification: ((notification: {
+    method: string;
+    params: Record<string, any>;
+}) => Promise<void>) | undefined, progressToken: number | undefined, progress: number, total: number | undefined, message: string | undefined): Promise<void>;
+/**
+ * Wrap a promise with a timeout
+ */
+export declare function withTimeout<T>(promise: Promise<T>, timeout: number | undefined, errorMessage: string): Promise<T>;
+/**
+ * Parsed elicit parameters
+ */
+export interface ParsedElicitParams {
+    sdkParams: ElicitRequestFormParams | ElicitRequestURLParams;
+    zodSchema: z.ZodObject<any> | null;
+    options: ElicitOptions | undefined;
+}
+/**
+ * Parse elicit() method parameters handling multiple overload signatures
+ */
+export declare function parseElicitParams(messageOrParams: string | ElicitFormParams | ElicitUrlParams, schemaOrUrlOrOptions?: z.ZodObject<any> | string | ElicitOptions, maybeOptions?: ElicitOptions): ParsedElicitParams;
+/**
+ * Create the sample() method for enhanced context
+ */
+export declare function createSampleMethod(createMessage: (params: CreateMessageRequest["params"], options?: any) => Promise<CreateMessageResult>, progressToken: number | undefined, sendNotification: ((notification: {
+    method: string;
+    params: Record<string, any>;
+}) => Promise<void>) | undefined): {
+    (prompt: string, options?: SampleOptions): Promise<CreateMessageResult>;
+    (sampleParams: CreateMessageRequest["params"], options?: SampleOptions): Promise<CreateMessageResult>;
+};
+/**
+ * Create the elicit() method for enhanced context
+ */
+export declare function createElicitMethod(elicitInput: (params: any, options?: any) => Promise<ElicitResult>): (messageOrParams: string | ElicitFormParams | ElicitUrlParams, schemaOrUrlOrOptions?: z.ZodObject<any> | string | ElicitOptions, maybeOptions?: ElicitOptions) => Promise<ElicitResult>;
+/**
+ * Create the reportProgress() method for enhanced context
+ */
+export declare function createReportProgressMethod(progressToken: number | undefined, sendNotification: ((notification: {
+    method: string;
+    params: Record<string, any>;
+}) => Promise<void>) | undefined): ((progress: number, total?: number, message?: string) => Promise<void>) | undefined;
+/**
+ * Create enhanced context with sample, elicit, and reportProgress methods
+ */
+export declare function createEnhancedContext(baseContext: Context | undefined, createMessage: (params: CreateMessageRequest["params"], options?: any) => Promise<CreateMessageResult>, elicitInput: (params: any, options?: any) => Promise<ElicitResult>, progressToken: number | undefined, sendNotification: ((notification: {
+    method: string;
+    params: Record<string, any>;
+}) => Promise<void>) | undefined): any;
+//# sourceMappingURL=tool-execution-helpers.d.ts.map

package/dist/src/server/tools/tool-execution-helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-execution-helpers.d.ts","sourceRoot":"","sources":["../../../../src/server/tools/tool-execution-helpers.ts"],"names":[],"mappings":"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"}

package/dist/src/server/tools/tool-registration.d.ts

@@ -0,0 +1,85 @@
+/**
+ * Tool Registration
+ *
+ * This module handles the registration of tools with the MCP server.
+ * Tools are functions that can be called by clients with parameters.
+ */
+import type { z } from "zod";
+import type { CreateMessageRequest, CreateMessageResult, ElicitResult } from "@modelcontextprotocol/sdk/types.js";
+import type { ToolDefinition, ToolCallback, InferToolInput, InferToolOutput } from "../types/index.js";
+import { type SessionData } from "./tool-execution-helpers.js";
+/**
+ * Interface representing the server context needed for tool registration
+ */
+export interface ToolServerContext<_HasOAuth extends boolean = false> {
+    /** Official MCP Server instance */
+    server: {
+        registerTool: (name: string, config: any, handler: (params: any, extra?: any) => Promise<any>) => void;
+        server: {
+            createMessage: (params: any, options?: any) => Promise<CreateMessageResult>;
+            elicitInput: (params: any, options?: any) => Promise<ElicitResult>;
+        };
+    };
+    /** Sessions map */
+    sessions: Map<string, SessionData>;
+    /** Registered tools list */
+    registeredTools: string[];
+    /** Convert Zod schema to params */
+    convertZodSchemaToParams(schema: z.ZodObject<any>): Record<string, z.ZodSchema>;
+    /** Create params schema from inputs */
+    createParamsSchema(inputs: any[]): Record<string, z.ZodSchema>;
+    /** Create message for sampling */
+    createMessage(params: CreateMessageRequest["params"], options?: any): Promise<CreateMessageResult>;
+}
+/**
+ * Define a tool that can be called by clients
+ *
+ * Registers a tool with the MCP server that clients can invoke with parameters.
+ * Tools are functions that perform actions, computations, or operations and
+ * return results. They accept structured input parameters and return structured output.
+ *
+ * Supports Apps SDK metadata for ChatGPT integration via the _meta field.
+ *
+ * @param toolDefinition - Configuration object containing tool metadata and handler function
+ * @param toolDefinition.name - Unique identifier for the tool
+ * @param toolDefinition.description - Optional human-readable description of what the tool does
+ * @param toolDefinition.inputs - Array of input parameter definitions (legacy, use schema instead)
+ * @param toolDefinition.schema - Zod object schema for input validation (preferred)
+ * @param toolDefinition.outputSchema - Zod object schema for structured output validation
+ * @param toolDefinition.cb - Async callback function that executes the tool logic with provided parameters
+ * @param toolDefinition._meta - Optional metadata for the tool (e.g. Apps SDK metadata)
+ * @param callback - Optional separate callback function (alternative to cb property)
+ * @returns The server instance for method chaining
+ *
+ * @example
+ * ```typescript
+ * // Using Zod schema (preferred)
+ * server.tool({
+ *   name: 'calculate',
+ *   description: 'Performs mathematical calculations',
+ *   schema: z.object({
+ *     expression: z.string(),
+ *     precision: z.number().optional()
+ *   }),
+ *   cb: async ({ expression, precision = 2 }) => {
+ *     const result = eval(expression)
+ *     return text(`Result: ${result.toFixed(precision)}`)
+ *   }
+ * })
+ *
+ * // Using legacy inputs array
+ * server.tool({
+ *   name: 'greet',
+ *   inputs: [{ name: 'name', type: 'string', required: true }],
+ *   cb: async ({ name }) => text(`Hello, ${name}!`)
+ * })
+ *
+ * // With separate callback for better typing
+ * server.tool({
+ *   name: 'add',
+ *   schema: z.object({ a: z.number(), b: z.number() })
+ * }, async ({ a, b }) => text(`${a + b}`))
+ * ```
+ */
+export declare function toolRegistration<T extends ToolDefinition<any, any, boolean>, TContext extends ToolServerContext<boolean>>(this: TContext, toolDefinition: T, callback?: ToolCallback<InferToolInput<T>, InferToolOutput<T>, boolean>): TContext;
+//# sourceMappingURL=tool-registration.d.ts.map

package/dist/src/server/tools/tool-registration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-registration.d.ts","sourceRoot":"","sources":["../../../../src/server/tools/tool-registration.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EACV,oBAAoB,EACpB,mBAAmB,EACnB,YAAY,EACb,MAAM,oCAAoC,CAAC;AAE5C,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,cAAc,EACd,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,KAAK,WAAW,EAGjB,MAAM,6BAA6B,CAAC;AAErC;;GAEG;AACH,MAAM,WAAW,iBAAiB,CAAC,SAAS,SAAS,OAAO,GAAG,KAAK;IAClE,mCAAmC;IACnC,MAAM,EAAE;QACN,YAAY,EAAE,CACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,KAChD,IAAI,CAAC;QACV,MAAM,EAAE;YACN,aAAa,EAAE,CACb,MAAM,EAAE,GAAG,EACX,OAAO,CAAC,EAAE,GAAG,KACV,OAAO,CAAC,mBAAmB,CAAC,CAAC;YAClC,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;SACpE,CAAC;KACH,CAAC;IACF,mBAAmB;IACnB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACnC,4BAA4B;IAC5B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,mCAAmC;IACnC,wBAAwB,CACtB,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,GACvB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;IAC/B,uCAAuC;IACvC,kBAAkB,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;IAC/D,kCAAkC;IAClC,aAAa,CACX,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,EACtC,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACjC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,wBAAgB,gBAAgB,CAC9B,CAAC,SAAS,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAC3C,QAAQ,SAAS,iBAAiB,CAAC,OAAO,CAAC,EAE3C,IAAI,EAAE,QAAQ,EACd,cAAc,EAAE,CAAC,EACjB,QAAQ,CAAC,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,GACtE,QAAQ,CA6EV"}

package/dist/src/server/types/common.d.ts

@@ -2,6 +2,30 @@
  * Common type definitions shared across different MCP components
  */
 import type { OAuthProvider } from "../oauth/providers/types.js";
+import type { z } from "zod";
+/**
+ * Converts Zod optional fields to TypeScript optional properties.
+ * Transforms { field: T | undefined } to { field?: T }
+ *
+ * This utility enables natural destructuring patterns in callbacks:
+ * - async ({message}) => ... (without type annotation)
+ * - async ({message = "default"}) => ... (with default value)
+ *
+ * Without this, Zod's z.string().optional() produces { message: string | undefined }
+ * which requires the property to be present (though it can be undefined).
+ * This type makes it truly optional: { message?: string }
+ *
+ * Used across all callback types: tools, prompts, and resources.
+ */
+export type OptionalizeUndefinedFields<T> = {
+    [K in keyof T as undefined extends T[K] ? K : never]?: Exclude<T[K], undefined>;
+} & {
+    [K in keyof T as undefined extends T[K] ? never : K]: T[K];
+};
+/**
+ * Infer input type from a Zod schema with proper optional field handling
+ */
+export type InferZodInput<S> = S extends z.ZodTypeAny ? OptionalizeUndefinedFields<z.infer<S>> : Record<string, any>;
 export interface ServerConfig {
     name: string;
     version: string;

package/dist/src/server/types/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/server/types/common.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEjE,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4CG;IACH,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC3D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,GAAG,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,CAAC,MAAM,GAAG,WAAW,CAAC,EAAE,CAAC;IACpC,kEAAkE;IAClE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wDAAwD;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/server/types/common.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,0BAA0B,CAAC,CAAC,IAAI;KACzC,CAAC,IAAI,MAAM,CAAC,IAAI,SAAS,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,EAAE,OAAO,CAC5D,CAAC,CAAC,CAAC,CAAC,EACJ,SAAS,CACV;CACF,GAAG;KACD,CAAC,IAAI,MAAM,CAAC,IAAI,SAAS,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAC3D,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,UAAU,GACjD,0BAA0B,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GACtC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAExB,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4CG;IACH,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC3D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,GAAG,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,CAAC,MAAM,GAAG,WAAW,CAAC,EAAE,CAAC;IACpC,kEAAkE;IAClE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wDAAwD;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB"}

package/dist/src/server/types/index.d.ts

@@ -1,9 +1,10 @@
 /**
  * Centralized type exports for MCP server
  */
-export { ServerConfig, InputDefinition, ResourceAnnotations, } from "./common.js";
+export { ServerConfig, InputDefinition, ResourceAnnotations, OptionalizeUndefinedFields, InferZodInput, } from "./common.js";
 export { McpContext } from "./context.js";
-export { ReadResourceCallback, ReadResourceTemplateCallback, ResourceTemplateConfig, ResourceTemplateDefinition, ResourceDefinition, UIResourceContent, WidgetProps, UIEncoding, RemoteDomFramework, UIResourceDefinition, ExternalUrlUIResource, RawHtmlUIResource, RemoteDomUIResource, AppsSdkUIResource, WidgetConfig, WidgetManifest, DiscoverWidgetsOptions, AppsSdkMetadata, AppsSdkToolMetadata, } from "./resource.js";
-export { ToolCallback, ToolDefinition, InferToolInput, InferToolOutput, EnhancedToolContext, } from "./tool.js";
-export { PromptCallback, PromptDefinition } from "./prompt.js";
+export { ToolContext, SampleOptions, ElicitOptions, ElicitFormParams, ElicitUrlParams, } from "./tool-context.js";
+export { ReadResourceCallback, ReadResourceTemplateCallback, ResourceTemplateConfig, ResourceTemplateDefinition, ResourceTemplateDefinitionWithoutCallback, ResourceDefinition, ResourceDefinitionWithoutCallback, EnhancedResourceContext, UIResourceContent, WidgetProps, UIEncoding, RemoteDomFramework, UIResourceDefinition, ExternalUrlUIResource, RawHtmlUIResource, RemoteDomUIResource, AppsSdkUIResource, WidgetConfig, WidgetManifest, DiscoverWidgetsOptions, AppsSdkMetadata, AppsSdkToolMetadata, } from "./resource.js";
+export { ToolCallback, ToolCallbackWithContext, ToolDefinition, InferToolInput, InferToolOutput, EnhancedToolContext, } from "./tool.js";
+export { PromptCallback, PromptDefinition, PromptDefinitionWithoutCallback, InferPromptInput, EnhancedPromptContext, } from "./prompt.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/server/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/server/types/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,YAAY,EACZ,eAAe,EACf,mBAAmB,GACpB,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,sBAAsB,EACtB,0BAA0B,EAC1B,kBAAkB,EAElB,iBAAiB,EACjB,WAAW,EACX,UAAU,EACV,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EACjB,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,EACZ,cAAc,EACd,sBAAsB,EAEtB,eAAe,EACf,mBAAmB,GACpB,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,YAAY,EACZ,cAAc,EACd,cAAc,EACd,eAAe,EACf,mBAAmB,GACpB,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/server/types/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,0BAA0B,EAC1B,aAAa,GACd,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,EACL,WAAW,EACX,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,sBAAsB,EACtB,0BAA0B,EAC1B,yCAAyC,EACzC,kBAAkB,EAClB,iCAAiC,EACjC,uBAAuB,EAEvB,iBAAiB,EACjB,WAAW,EACX,UAAU,EACV,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EACjB,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,EACZ,cAAc,EACd,sBAAsB,EAEtB,eAAe,EACf,mBAAmB,GACpB,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,cAAc,EACd,cAAc,EACd,eAAe,EACf,mBAAmB,GACpB,MAAM,WAAW,CAAC;AAGnB,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,+BAA+B,EAC/B,gBAAgB,EAChB,qBAAqB,GACtB,MAAM,aAAa,CAAC"}

package/dist/src/server/types/prompt.d.ts

@@ -1,16 +1,71 @@
-import type { GetPromptResult, GetPromptRequest } from "@modelcontextprotocol/sdk/types.js";
-import type { InputDefinition } from "./common.js";
-export type PromptCallback = (params: GetPromptRequest) => Promise<GetPromptResult>;
-export interface PromptDefinition {
+import type { GetPromptResult, CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { InputDefinition, OptionalizeUndefinedFields } from "./common.js";
+import type { z } from "zod";
+import type { TypedCallToolResult } from "../utils/response-helpers.js";
+import type { McpContext } from "./context.js";
+/**
+ * Enhanced Prompt Context that provides access to request context.
+ *
+ * This unified context provides:
+ * - `auth` - Authentication info (when OAuth is configured)
+ * - `req` - Hono request object
+ * - All other Hono Context properties and methods
+ *
+ * @template HasOAuth - Whether OAuth is configured (affects auth availability)
+ */
+export type EnhancedPromptContext<HasOAuth extends boolean = false> = McpContext<HasOAuth>;
+/**
+ * Extract input type from a prompt definition's schema
+ */
+export type InferPromptInput<T> = T extends {
+    schema: infer S;
+} ? S extends z.ZodTypeAny ? OptionalizeUndefinedFields<z.infer<S>> : Record<string, any> : Record<string, any>;
+/**
+ * Helper interface that uses method signature syntax to enable bivariant parameter checking.
+ * @internal
+ */
+interface PromptCallbackBivariant<TInput, HasOAuth extends boolean> {
+    bivarianceHack(params: TInput, ctx: EnhancedPromptContext<HasOAuth>): Promise<CallToolResult | GetPromptResult | TypedCallToolResult<any>>;
+}
+/**
+ * Callback type for prompt execution - supports both CallToolResult (from helpers) and GetPromptResult (old API).
+ * Uses bivariant parameter checking for flexible destructuring patterns.
+ *
+ * @template TInput - Input parameters type
+ * @template HasOAuth - Whether OAuth is configured (affects ctx.auth availability)
+ */
+export type PromptCallback<TInput = Record<string, any>, HasOAuth extends boolean = false> = PromptCallbackBivariant<TInput, HasOAuth>["bivarianceHack"];
+/**
+ * Prompt definition with cb callback (old API)
+ */
+export interface PromptDefinition<TInput = Record<string, any>, HasOAuth extends boolean = false> {
     /** Unique identifier for the prompt */
     name: string;
     /** Human-readable title for the prompt */
     title?: string;
     /** Description of what the prompt does */
     description?: string;
-    /** Argument definitions */
+    /** Argument definitions (legacy, use schema instead) */
     args?: InputDefinition[];
+    /** Zod schema for input validation (preferred) */
+    schema?: z.ZodObject<any>;
     /** Async callback function that generates the prompt */
-    cb: PromptCallback;
+    cb: PromptCallback<TInput, HasOAuth>;
+}
+/**
+ * Prompt definition without cb callback (new API with separate callback parameter)
+ */
+export interface PromptDefinitionWithoutCallback {
+    /** Unique identifier for the prompt */
+    name: string;
+    /** Human-readable title for the prompt */
+    title?: string;
+    /** Description of what the prompt does */
+    description?: string;
+    /** Argument definitions (legacy, use schema instead) */
+    args?: InputDefinition[];
+    /** Zod schema for input validation (preferred) */
+    schema?: z.ZodObject<any>;
 }
+export {};
 //# sourceMappingURL=prompt.d.ts.map

package/dist/src/server/types/prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../../../src/server/types/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,gBAAgB,EACjB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,MAAM,cAAc,GAAG,CAC3B,MAAM,EAAE,gBAAgB,KACrB,OAAO,CAAC,eAAe,CAAC,CAAC;AAE9B,MAAM,WAAW,gBAAgB;IAC/B,uCAAuC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,0CAA0C;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2BAA2B;IAC3B,IAAI,CAAC,EAAE,eAAe,EAAE,CAAC;IACzB,wDAAwD;IACxD,EAAE,EAAE,cAAc,CAAC;CACpB"}
+{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../../../src/server/types/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACf,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C;;;;;;;;;GASG;AACH,MAAM,MAAM,qBAAqB,CAAC,QAAQ,SAAS,OAAO,GAAG,KAAK,IAChE,UAAU,CAAC,QAAQ,CAAC,CAAC;AAEvB;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAC3D,CAAC,SAAS,CAAC,CAAC,UAAU,GACpB,0BAA0B,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GACtC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACrB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAExB;;;GAGG;AACH,UAAU,uBAAuB,CAAC,MAAM,EAAE,QAAQ,SAAS,OAAO;IAChE,cAAc,CACZ,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,qBAAqB,CAAC,QAAQ,CAAC,GACnC,OAAO,CAAC,cAAc,GAAG,eAAe,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;CACzE;AAED;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,CACxB,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC5B,QAAQ,SAAS,OAAO,GAAG,KAAK,IAC9B,uBAAuB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,gBAAgB,CAAC,CAAC;AAEhE;;GAEG;AACH,MAAM,WAAW,gBAAgB,CAC/B,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC5B,QAAQ,SAAS,OAAO,GAAG,KAAK;IAEhC,uCAAuC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,0CAA0C;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wDAAwD;IACxD,IAAI,CAAC,EAAE,eAAe,EAAE,CAAC;IACzB,kDAAkD;IAClD,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC1B,wDAAwD;IACxD,EAAE,EAAE,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;CACtC;AAED;;GAEG;AACH,MAAM,WAAW,+BAA+B;IAC9C,uCAAuC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,0CAA0C;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wDAAwD;IACxD,IAAI,CAAC,EAAE,eAAe,EAAE,CAAC;IACzB,kDAAkD;IAClD,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;CAC3B"}

package/dist/src/server/types/resource.d.ts

@@ -1,6 +1,8 @@
-import type { ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import type { ReadResourceResult, CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import type { ResourceAnnotations } from "./common.js";
 import type { AdaptersConfig } from "@mcp-ui/server";
+import type { TypedCallToolResult } from "../utils/response-helpers.js";
+import type { McpContext } from "./context.js";
 export type UIResourceContent = {
     type: "resource";
     resource: {
@@ -68,8 +70,45 @@ export interface AppsSdkToolMetadata extends Record<string, unknown> {
     /** Whether this tool result can produce a widget */
     "openai/resultCanProduceWidget"?: boolean;
 }
-export type ReadResourceCallback = () => Promise<ReadResourceResult>;
-export type ReadResourceTemplateCallback = (uri: URL, params: Record<string, any>) => Promise<ReadResourceResult>;
+/**
+ * Enhanced Resource Context that provides access to request context.
+ *
+ * This unified context provides:
+ * - `auth` - Authentication info (when OAuth is configured)
+ * - `req` - Hono request object
+ * - All other Hono Context properties and methods
+ *
+ * @template HasOAuth - Whether OAuth is configured (affects auth availability)
+ */
+export type EnhancedResourceContext<HasOAuth extends boolean = false> = McpContext<HasOAuth>;
+/**
+ * Helper interface for bivariant parameter checking on resource callbacks.
+ * @internal
+ */
+interface ReadResourceCallbackBivariant<HasOAuth extends boolean> {
+    bivarianceHack(ctx: EnhancedResourceContext<HasOAuth>): Promise<CallToolResult | ReadResourceResult | TypedCallToolResult<any>>;
+}
+/**
+ * Helper interface for bivariant parameter checking on resource template callbacks.
+ * @internal
+ */
+interface ReadResourceTemplateCallbackBivariant<HasOAuth extends boolean> {
+    bivarianceHack(uri: URL, params: Record<string, any>, ctx: EnhancedResourceContext<HasOAuth>): Promise<CallToolResult | ReadResourceResult | TypedCallToolResult<any>>;
+}
+/**
+ * Callback type for reading a static resource.
+ * Supports both CallToolResult (from helpers) and ReadResourceResult (old API).
+ *
+ * @template HasOAuth - Whether OAuth is configured (affects ctx.auth availability)
+ */
+export type ReadResourceCallback<HasOAuth extends boolean = false> = ReadResourceCallbackBivariant<HasOAuth>["bivarianceHack"];
+/**
+ * Callback type for reading a resource template with parameters.
+ * Supports both CallToolResult (from helpers) and ReadResourceResult (old API).
+ *
+ * @template HasOAuth - Whether OAuth is configured (affects ctx.auth availability)
+ */
+export type ReadResourceTemplateCallback<HasOAuth extends boolean = false> = ReadResourceTemplateCallbackBivariant<HasOAuth>["bivarianceHack"];
 /**
  * Configuration for a resource template
  */
@@ -83,16 +122,33 @@ export interface ResourceTemplateConfig {
     /** Description of the resource */
     description?: string;
 }
-export interface ResourceTemplateDefinition {
+/**
+ * Resource template definition with readCallback (old API)
+ */
+export interface ResourceTemplateDefinition<HasOAuth extends boolean = false> {
+    name: string;
+    resourceTemplate: ResourceTemplateConfig;
+    title?: string;
+    description?: string;
+    annotations?: ResourceAnnotations;
+    readCallback: ReadResourceTemplateCallback<HasOAuth>;
+    _meta?: Record<string, unknown>;
+}
+/**
+ * Resource template definition without readCallback (new API with separate callback parameter)
+ */
+export interface ResourceTemplateDefinitionWithoutCallback {
     name: string;
     resourceTemplate: ResourceTemplateConfig;
     title?: string;
     description?: string;
     annotations?: ResourceAnnotations;
-    readCallback: ReadResourceTemplateCallback;
     _meta?: Record<string, unknown>;
 }
-export interface ResourceDefinition {
+/**
+ * Resource definition with readCallback (old API)
+ */
+export interface ResourceDefinition<HasOAuth extends boolean = false> {
     /** Unique identifier for the resource */
     name: string;
     /** URI pattern for accessing the resource (e.g., 'config://app-settings') */
@@ -101,12 +157,31 @@ export interface ResourceDefinition {
     title?: string;
     /** Optional description of the resource */
     description?: string;
-    /** MIME type of the resource content (required) */
+    /** MIME type of the resource content (required for old API) */
     mimeType: string;
     /** Optional annotations for the resource */
     annotations?: ResourceAnnotations;
     /** Async callback function that returns the resource content */
-    readCallback: ReadResourceCallback;
+    readCallback: ReadResourceCallback<HasOAuth>;
+    _meta?: Record<string, unknown>;
+}
+/**
+ * Resource definition without readCallback (new API with separate callback parameter)
+ * MIME type is optional when using response helpers - it's inferred from the helper
+ */
+export interface ResourceDefinitionWithoutCallback {
+    /** Unique identifier for the resource */
+    name: string;
+    /** URI pattern for accessing the resource (e.g., 'config://app-settings') */
+    uri: string;
+    /** Optional title for the resource */
+    title?: string;
+    /** Optional description of the resource */
+    description?: string;
+    /** MIME type (optional - inferred from response helpers like text(), object(), etc.) */
+    mimeType?: string;
+    /** Optional annotations for the resource */
+    annotations?: ResourceAnnotations;
     _meta?: Record<string, unknown>;
 }
 /**

package/dist/src/server/types/resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../../../src/server/types/resource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../../../src/server/types/resource.ts"],"names":[],"mappings":"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"}