@mcp-b/webmcp-types 4.0.0 → 5.0.0

package/dist/model-context.d.ts

@@ -1,303 +1,91 @@
-import type { InputSchema, ToolResponse } from './common.js';
+import type { InputSchema, WebMcpToolInput } from './common.js';
 import type { JsonSchemaForInference } from './json-schema.js';
-import type { ToolDescriptor, ToolDescriptorFromSchema, ToolListItem, ToolRawResult } from './tool.js';
-/**
- * Tool info returned by ModelContextTesting.listTools().
- */
-export interface ModelContextTestingToolInfo {
-    name: string;
-    description: string;
-    inputSchema?: string;
-}
-/**
- * Tool info returned by Chromium's producer-facing ModelContext.getTools().
- */
-export interface ModelContextToolInfo extends ModelContextTestingToolInfo {
-    title: string;
-    origin: string;
-    window: Window;
-}
-/**
- * Options supported by ModelContextTesting.executeTool().
- */
-export interface ModelContextTestingExecuteToolOptions {
-    signal?: AbortSignal;
+import type { ModelContextTool, ModelContextToolFromSchema, ToolDescriptor, ToolDescriptorFromSchema, ToolListItem, WebMcpToolAnnotations } from './tool.js';
+/** Options for tools exposed by descendant documents. */
+export interface ModelContextGetToolOptions {
+    fromOrigins?: string[];
 }
-/**
- * Chromium testing API on navigator.modelContextTesting.
- *
- * The native runtime extends EventTarget and fires `toolchange` events.
- */
-export interface ModelContextTesting extends EventTarget {
-    listTools(): ModelContextTestingToolInfo[];
-    executeTool(toolName: string, inputArgsJson: string, options?: ModelContextTestingExecuteToolOptions): Promise<string | null>;
-    getCrossDocumentScriptToolResult?(): Promise<string>;
-    ontoolchange: ((this: ModelContextTesting, ev: Event) => unknown) | null;
-    /**
-     * @deprecated Use `addEventListener('toolchange', ...)` instead.
-     */
-    registerToolsChangedCallback?(callback: () => void): void;
-}
-/**
- * Polyfill-only testing extensions layered on top of ModelContextTesting.
- */
-export interface ModelContextTestingPolyfillExtensions {
-    /**
-     * Registers a callback invoked when the tool list changes.
-     * @deprecated Use `addEventListener('toolchange', ...)` on native runtimes.
-     * Kept for polyfill backward compatibility.
-     */
-    registerToolsChangedCallback(callback: () => void): void;
-    getToolCalls(): Array<{
-        toolName: string;
-        arguments: Record<string, unknown>;
-        timestamp: number;
-    }>;
-    clearToolCalls(): void;
-    setMockToolResponse(toolName: string, response: ToolResponse): void;
-    clearMockToolResponse(toolName: string): void;
-    clearAllMockToolResponses(): void;
-    getRegisteredTools(): ReturnType<ModelContextExtensions['listTools']>;
-    reset(): void;
-}
-/**
- * Any supported tool descriptor.
- *
- * Uses `never` for args so descriptors with stricter argument objects remain assignable.
- */
-export type AnyToolDescriptor = ToolDescriptor<never, unknown, string>;
-/**
- * Infers argument shape from a tool descriptor.
- */
-export type InferToolArgs<TTool> = TTool extends ToolDescriptor<infer TArgs, infer _TResult, infer _TName> ? TArgs : never;
-/**
- * Infers result shape from a tool descriptor.
- */
-export type InferToolResult<TTool> = TTool extends ToolDescriptor<infer _TArgs, infer TResult, infer _TName> ? TResult : never;
-/**
- * Union of tool names from a tuple/array of descriptors.
- */
-export type ToolName<TTools extends readonly {
-    name: string;
-}[]> = TTools[number]['name'];
-/**
- * Extracts a tool descriptor by name from a tuple/array.
- */
-export type ToolByName<TTools extends readonly {
+/** Tool metadata returned by `document.modelContext.getTools()`. */
+export interface RegisteredTool {
     name: string;
-}[], TName extends ToolName<TTools>> = Extract<TTools[number], {
-    name: TName;
-}>;
-/**
- * Tool argument type by tool name from a tuple/array.
- */
-export type ToolArgsByName<TTools extends readonly {
-    name: string;
-}[], TName extends ToolName<TTools>> = InferToolArgs<ToolByName<TTools, TName>>;
-/**
- * Tool result type by tool name from a tuple/array.
- */
-export type ToolResultByName<TTools extends readonly {
-    name: string;
-}[], TName extends ToolName<TTools>> = InferToolResult<ToolByName<TTools, TName>>;
-/**
- * Typed parameters for MCP-B compatibility `callTool`.
- *
- * When a tool has no args (`Record<string, never>`), `arguments` becomes optional.
- */
-export type ToolCallParams<TName extends string = string, TArgs extends Record<string, unknown> = Record<string, never>> = {
-    name: TName;
-} & (TArgs extends Record<string, never> ? {
-    arguments?: TArgs;
-} : {
-    arguments: TArgs;
-});
-/**
- * Event dispatched when a tool is called.
- */
-export interface ToolCallEvent extends Event {
     /**
-     * Tool name being invoked.
+     * Present on every tool Chrome and `@mcp-b/webmcp-polyfill` return today --
+     * the spec defaults it to the empty string when a tool registers no title.
+     * Kept optional deliberately: webmcp#224 proposes dropping that default and
+     * omitting the member instead. Read it as `tool.title || tool.name`: today the
+     * spec default makes it an empty string, which `??` does not fall through.
      */
-    name: string;
+    title?: string;
+    description: string;
     /**
-     * Tool arguments supplied by the caller.
+     * A JSON Schema object since webmcp#241, rolling out from Chrome 154.0.8013
+     * (cross-document tools first). Chrome 149-153 -- most of the Origin Trial
+     * population -- and 154's same-document tools still return the serialized
+     * JSON string the change replaced. Consumers that support both generations
+     * must branch on `typeof` and guard the parse of the string arm.
      */
-    arguments: Record<string, unknown>;
+    inputSchema?: InputSchema | string;
+    window: Window;
+    origin: string;
     /**
-     * Intercepts execution with a custom tool response.
+     * Absent when the tool registered no annotations -- both the spec and the
+     * polyfill omit the member rather than emitting an empty object. Each hint
+     * inside it is always populated, but the object itself is not guaranteed.
      */
-    respondWith: (response: ToolResponse) => void;
+    annotations?: WebMcpToolAnnotations;
 }
-/**
- * Tool identity accepted by compatibility unregister flows.
- *
- * Current Chromium exposes string-name unregistration.
- * MCP-B compatibility runtimes may also accept the originally registered tool object.
- */
-export interface ModelContextToolReference {
+export interface ChromeModelContextExecuteToolOptions {
+    signal?: AbortSignal;
+}
+/** Experimental Chromium methods; feature-detect them before use. */
+export interface ChromeModelContextExtensions {
+    executeTool?(tool: RegisteredTool, inputArguments: string, options?: ChromeModelContextExecuteToolOptions): Promise<string | null>;
+}
+/** @deprecated Metadata returned by `navigator.modelContextTesting`. */
+export interface ModelContextTestingToolInfo {
     name: string;
+    description: string;
+    inputSchema?: string;
 }
-/**
- * Non-standard compatibility handle returned by some runtimes after registerTool().
- *
- * @deprecated Use `options.signal` on `registerTool(tool, options)`. Will be removed in the next major.
- */
-export interface ModelContextToolRegistrationHandle {
-    unregister(): void;
+/** @deprecated Compatibility surface for Chromium's removed testing API. */
+export interface ModelContextTesting extends EventTarget {
+    listTools(): ModelContextTestingToolInfo[];
+    executeTool(toolName: string, inputArgsJson: string, options?: ChromeModelContextExecuteToolOptions): Promise<string | null>;
+    ontoolchange: ((this: ModelContextTesting, event: Event) => unknown) | null;
 }
-/**
- * @see {@link https://webmachinelearning.github.io/webmcp/#dictdef-modelcontextregistertooloptions}
- */
+/** Options accepted by `ModelContext.registerTool()`. */
 export interface ModelContextRegisterToolOptions {
-    /**
-     * An `AbortSignal` whose abortion unregisters the tool. A pre-aborted signal short-circuits registration.
-     */
     signal?: AbortSignal;
-    /**
-     * Origins that can observe this tool from other documents in the same tree.
-     */
     exposedTo?: string[];
 }
+type WidenedSchema<TSchema extends InputSchema> = string extends TSchema['type'] ? unknown : never;
 /**
- * Strict WebMCP core interface on document.modelContext.
+ * Standard `document.modelContext` API.
+ * @see https://webmachinelearning.github.io/webmcp/#modelcontext
  */
-export interface ModelContextCore {
-    /**
-     * Registers a dynamic tool with JSON Schema-driven inference.
-     *
-     * `execute(args)` is inferred from `inputSchema`, and when a literal object
-     * `outputSchema` is provided, `execute(...).structuredContent` is inferred too.
-     */
-    registerTool<TInputSchema extends JsonSchemaForInference, TOutputSchema extends JsonSchemaForInference | undefined = undefined, TName extends string = string>(tool: ToolDescriptorFromSchema<TInputSchema, TOutputSchema, TName>, options?: ModelContextRegisterToolOptions): Promise<void>;
-    /**
-     * Registers a dynamic tool with explicitly typed args/result.
-     */
-    registerTool<TInputSchema extends InputSchema, TArgs extends Record<string, unknown> = Record<string, unknown>, TName extends string = string>(tool: ToolDescriptor<TArgs, ToolRawResult, TName> & {
+export interface ModelContext extends EventTarget {
+    registerTool<const TInputSchema extends JsonSchemaForInference, TResult = unknown, TName extends string = string>(tool: ModelContextToolFromSchema<TInputSchema, TResult, TName>, options?: ModelContextRegisterToolOptions): Promise<void>;
+    registerTool<TInputSchema extends InputSchema, TArgs extends WebMcpToolInput = WebMcpToolInput, TResult = unknown, TName extends string = string>(tool: ModelContextTool<TArgs, TResult, TName> & {
         inputSchema: TInputSchema;
-    } & (TInputSchema extends InputSchema ? string extends TInputSchema['type'] ? unknown : never : unknown), options?: ModelContextRegisterToolOptions): Promise<void>;
-    /**
-     * Registers a dynamic tool without an explicit inputSchema.
-     * Runtime defaults this to an empty object schema.
-     */
-    registerTool<TArgs extends Record<string, unknown> = Record<string, unknown>, TName extends string = string>(tool: Omit<ToolDescriptor<TArgs, ToolRawResult, TName>, 'inputSchema'> & {
+    } & WidenedSchema<TInputSchema>, options?: ModelContextRegisterToolOptions): Promise<void>;
+    registerTool<TArgs extends WebMcpToolInput = Record<string, unknown>, TResult = unknown, TName extends string = string>(tool: Omit<ModelContextTool<TArgs, TResult, TName>, 'inputSchema'> & {
         inputSchema?: undefined;
     }, options?: ModelContextRegisterToolOptions): Promise<void>;
-    /**
-     * Lists currently registered producer tools using the native Chromium preview
-     * shape. Current Chromium returns JSON-stringified schemas here, matching
-     * ModelContextTesting.listTools().
-     */
-    getTools(): Promise<ModelContextToolInfo[]>;
-    /**
-     * Executes a registered tool object returned from getTools().
-     *
-     * This mirrors Chromium's current producer-facing preview API. The testing API
-     * still executes by `(toolName, inputArgsJson)`.
-     */
-    executeTool(tool: ModelContextToolInfo, inputArgsJson: string, options?: ModelContextTestingExecuteToolOptions): Promise<string | null>;
-    /**
-     * Handler invoked when the producer tool list changes.
-     */
-    ontoolchange: ((this: ModelContextCore, ev: Event) => unknown) | null;
-    addEventListener(type: 'toolchange', listener: () => void, options?: boolean | AddEventListenerOptions): void;
-    removeEventListener(type: 'toolchange', listener: () => void, options?: boolean | EventListenerOptions): void;
-    dispatchEvent(event: Event): boolean;
+    getTools(options?: ModelContextGetToolOptions): Promise<RegisteredTool[]>;
+    ontoolchange: ((this: ModelContext, event: Event) => unknown) | null;
 }
-/**
- * MCPB extension surface layered on top of strict WebMCP core.
- * These members are intentionally non-standard.
- */
+/** Non-standard methods exposed by MCP-B runtimes. */
 export interface ModelContextExtensions {
-    /**
-     * Unregisters a dynamic tool by name or tool reference.
-     *
-     * @deprecated Removed from the WebMCP spec on April 23, 2026. Use `registerTool(tool, { signal })`. Will be removed in the next major.
-     */
-    unregisterTool(nameOrTool: string | ModelContextToolReference): void;
-    /**
-     * Lists currently registered tools.
-     */
+    registerTool<const TInputSchema extends JsonSchemaForInference, const TOutputSchema extends JsonSchemaForInference | undefined = undefined, TName extends string = string>(tool: ToolDescriptorFromSchema<TInputSchema, TOutputSchema, TName>, options?: ModelContextRegisterToolOptions): Promise<void>;
+    registerTool<TInputSchema extends InputSchema, TArgs extends WebMcpToolInput = WebMcpToolInput, TName extends string = string>(tool: ToolDescriptor<TArgs, unknown, TName> & {
+        inputSchema: TInputSchema;
+    } & WidenedSchema<TInputSchema>, options?: ModelContextRegisterToolOptions): Promise<void>;
+    registerTool<TArgs extends WebMcpToolInput = Record<string, unknown>, TName extends string = string>(tool: Omit<ToolDescriptor<TArgs, unknown, TName>, 'inputSchema'> & {
+        inputSchema?: undefined;
+    }, options?: ModelContextRegisterToolOptions): Promise<void>;
     listTools(): ToolListItem[];
-    /**
-     * Executes a registered tool by name.
-     *
-     * @deprecated Prefer the WebMCP standard producer path: get a descriptor from
-     * `getTools()` and pass it to `executeTool(tool, inputArgsJson)`. This method
-     * remains as an MCP-B compatibility convenience.
-     */
-    callTool<TName extends string = string, TArgs extends Record<string, unknown> = Record<string, unknown>>(params: {
-        name: TName;
-        arguments?: TArgs;
-    }): Promise<ToolResponse>;
-    /**
-     * Adds a listener for tool invocation events.
-     */
-    addEventListener(type: 'toolcall', listener: (event: ToolCallEvent) => void | Promise<void>, options?: boolean | AddEventListenerOptions): void;
-    /**
-     * Adds a listener for tool list changes.
-     */
-    addEventListener(type: 'toolchange', listener: () => void, options?: boolean | AddEventListenerOptions): void;
-    /**
-     * @deprecated Use `'toolchange'` instead. Will be removed in the next major.
-     */
-    addEventListener(type: 'toolschanged', listener: () => void, options?: boolean | AddEventListenerOptions): void;
-    /**
-     * Removes a listener for tool invocation events.
-     */
-    removeEventListener(type: 'toolcall', listener: (event: ToolCallEvent) => void | Promise<void>, options?: boolean | EventListenerOptions): void;
-    /**
-     * Removes a listener for tool list changes.
-     */
-    removeEventListener(type: 'toolchange', listener: () => void, options?: boolean | EventListenerOptions): void;
-    /**
-     * @deprecated Use `'toolchange'` instead. Will be removed in the next major.
-     */
-    removeEventListener(type: 'toolschanged', listener: () => void, options?: boolean | EventListenerOptions): void;
-    /**
-     * Dispatches an event.
-     */
-    dispatchEvent(event: Event): boolean;
 }
-/**
- * Public document.modelContext type (strict core only).
- */
-export type ModelContext = ModelContextCore;
-/**
- * Full runtime shape including MCPB extensions.
- */
-export type ModelContextWithExtensions = ModelContextCore & ModelContextExtensions;
-/**
- * Strongly-typed `ModelContext` view derived from known tool descriptors.
- *
- * This is useful when your project has a static tool registry and you want
- * name-aware inference for MCP-B compatibility `callTool`.
- */
-export type TypedModelContext<TTools extends readonly {
-    name: string;
-}[] = readonly ToolDescriptor[]> = ModelContextWithExtensions & {
-    /**
-     * Executes a known tool with name-aware argument and response inference.
-     *
-     * @deprecated Prefer the WebMCP standard producer path: get a descriptor from
-     * `getTools()` and pass it to `executeTool(tool, inputArgsJson)`. This typed
-     * convenience remains available for MCP-B compatibility.
-     */
-    callTool<TName extends ToolName<TTools>>(params: ToolCallParams<TName, ToolArgsByName<TTools, TName>>): Promise<ToolResultByName<TTools, TName>>;
-    /**
-     * Fallback call signature for unknown or dynamically-discovered tools.
-     *
-     * @deprecated Prefer the WebMCP standard producer path: get a descriptor from
-     * `getTools()` and pass it to `executeTool(tool, inputArgsJson)`. This typed
-     * convenience remains available for MCP-B compatibility.
-     */
-    callTool(params: {
-        name: string;
-        arguments?: Record<string, unknown>;
-    }): Promise<ToolResponse>;
-    /**
-     * Lists tools with a narrowed name union.
-     */
-    listTools(): Array<ToolListItem<ToolName<TTools>>>;
-};
+export type ChromeModelContext = ModelContext & ChromeModelContextExtensions;
+export type ModelContextWithExtensions = Omit<ModelContext, 'registerTool'> & ModelContextExtensions;
+export {};
 //# sourceMappingURL=model-context.d.ts.map

package/dist/model-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-context.d.ts","sourceRoot":"","sources":["../src/model-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model-context.d.ts","sourceRoot":"","sources":["../src/model-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,EACV,gBAAgB,EAChB,0BAA0B,EAC1B,cAAc,EACd,wBAAwB,EACxB,YAAY,EACZ,qBAAqB,EACtB,MAAM,WAAW,CAAC;AAEnB,yDAAyD;AACzD,MAAM,WAAW,0BAA0B;IACzC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,oEAAoE;AACpE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,WAAW,CAAC,EAAE,qBAAqB,CAAC;CACrC;AAED,MAAM,WAAW,oCAAoC;IACnD,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,qEAAqE;AACrE,MAAM,WAAW,4BAA4B;IAC3C,WAAW,CAAC,CACV,IAAI,EAAE,cAAc,EACpB,cAAc,EAAE,MAAM,EACtB,OAAO,CAAC,EAAE,oCAAoC,GAC7C,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CAC3B;AAED,wEAAwE;AACxE,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,4EAA4E;AAC5E,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,SAAS,IAAI,2BAA2B,EAAE,CAAC;IAC3C,WAAW,CACT,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,oCAAoC,GAC7C,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC1B,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,GAAG,IAAI,CAAC;CAC7E;AAED,yDAAyD;AACzD,MAAM,WAAW,+BAA+B;IAC9C,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,KAAK,aAAa,CAAC,OAAO,SAAS,WAAW,IAAI,MAAM,SAAS,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,GAAG,KAAK,CAAC;AAEnG;;;GAGG;AACH,MAAM,WAAW,YAAa,SAAQ,WAAW;IAC/C,YAAY,CACV,KAAK,CAAC,YAAY,SAAS,sBAAsB,EACjD,OAAO,GAAG,OAAO,EACjB,KAAK,SAAS,MAAM,GAAG,MAAM,EAE7B,IAAI,EAAE,0BAA0B,CAAC,YAAY,EAAE,OAAO,EAAE,KAAK,CAAC,EAC9D,OAAO,CAAC,EAAE,+BAA+B,GACxC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,YAAY,CACV,YAAY,SAAS,WAAW,EAChC,KAAK,SAAS,eAAe,GAAG,eAAe,EAC/C,OAAO,GAAG,OAAO,EACjB,KAAK,SAAS,MAAM,GAAG,MAAM,EAE7B,IAAI,EAAE,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG;QAC9C,WAAW,EAAE,YAAY,CAAC;KAC3B,GAAG,aAAa,CAAC,YAAY,CAAC,EAC/B,OAAO,CAAC,EAAE,+BAA+B,GACxC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,YAAY,CACV,KAAK,SAAS,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvD,OAAO,GAAG,OAAO,EACjB,KAAK,SAAS,MAAM,GAAG,MAAM,EAE7B,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,aAAa,CAAC,GAAG;QACnE,WAAW,CAAC,EAAE,SAAS,CAAC;KACzB,EACD,OAAO,CAAC,EAAE,+BAA+B,GACxC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,QAAQ,CAAC,OAAO,CAAC,EAAE,0BAA0B,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;IAC1E,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,GAAG,IAAI,CAAC;CACtE;AAED,sDAAsD;AACtD,MAAM,WAAW,sBAAsB;IACrC,YAAY,CACV,KAAK,CAAC,YAAY,SAAS,sBAAsB,EACjD,KAAK,CAAC,aAAa,SAAS,sBAAsB,GAAG,SAAS,GAAG,SAAS,EAC1E,KAAK,SAAS,MAAM,GAAG,MAAM,EAE7B,IAAI,EAAE,wBAAwB,CAAC,YAAY,EAAE,aAAa,EAAE,KAAK,CAAC,EAClE,OAAO,CAAC,EAAE,+BAA+B,GACxC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,YAAY,CACV,YAAY,SAAS,WAAW,EAChC,KAAK,SAAS,eAAe,GAAG,eAAe,EAC/C,KAAK,SAAS,MAAM,GAAG,MAAM,EAE7B,IAAI,EAAE,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG;QAC5C,WAAW,EAAE,YAAY,CAAC;KAC3B,GAAG,aAAa,CAAC,YAAY,CAAC,EAC/B,OAAO,CAAC,EAAE,+BAA+B,GACxC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,YAAY,CACV,KAAK,SAAS,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvD,KAAK,SAAS,MAAM,GAAG,MAAM,EAE7B,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,aAAa,CAAC,GAAG;QACjE,WAAW,CAAC,EAAE,SAAS,CAAC;KACzB,EACD,OAAO,CAAC,EAAE,+BAA+B,GACxC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,SAAS,IAAI,YAAY,EAAE,CAAC;CAC7B;AAED,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG,4BAA4B,CAAC;AAC7E,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAAC,YAAY,EAAE,cAAc,CAAC,GACzE,sBAAsB,CAAC"}

package/dist/tool.d.ts

@@ -1,174 +1,56 @@
-import type { CallToolResult, ElicitationParams, ElicitationResult, InputSchema } from './common.js';
+import type { CallToolResult, InputSchema, WebMcpToolInput } from './common.js';
 import type { InferArgsFromInputSchema, InferJsonSchema, JsonSchemaForInference } from './json-schema.js';
+import type { ToolAnnotations as McpToolAnnotations } from '@modelcontextprotocol/server';
 /**
- * Annotations providing hints about tool behavior.
- *
- * @see {@link https://webmachinelearning.github.io/webmcp/#dictdef-toolannotations}
- * @see {@link https://spec.modelcontextprotocol.io/specification/server/tools/}
+ * Annotations in the WebMCP tool dictionary.
+ * @see https://webmachinelearning.github.io/webmcp/#dictdef-toolannotations
  */
-export interface ToolAnnotations {
-    /**
-     * Optional display title.
-     */
-    title?: string;
-    /**
-     * Indicates the tool is read-only.
-     */
-    readOnlyHint?: boolean | 'true' | 'false';
-    /**
-     * Indicates the tool's output may include content from outside the page's trust boundary.
-     */
-    untrustedContentHint?: boolean | 'true' | 'false';
-    /**
-     * Indicates the tool may perform destructive actions.
-     */
-    destructiveHint?: boolean | 'true' | 'false';
-    /**
-     * Indicates the tool can be called repeatedly without changing outcome.
-     */
-    idempotentHint?: boolean | 'true' | 'false';
-    /**
-     * Indicates the tool may reach beyond local context (network, external systems, etc.).
-     */
-    openWorldHint?: boolean | 'true' | 'false';
+export interface WebMcpToolAnnotations {
+    readOnlyHint?: boolean;
+    untrustedContentHint?: boolean;
 }
-/**
- * Raw tool result values accepted by execute handlers before runtime normalization.
- */
-export type ToolRawResult = unknown;
-/**
- * Tool execute return value accepted by WebMCP descriptor types.
- */
-export type ToolExecuteResult<TResult = ToolRawResult> = TResult extends CallToolResult ? TResult : CallToolResult | TResult;
-/**
- * Per-call client provided to tool handlers.
- */
-export interface ModelContextClient {
-    /**
-     * Requests user interaction during the current tool call.
-     */
-    requestUserInteraction(callback: () => Promise<unknown>): Promise<unknown>;
-}
-/**
- * MCPB extension context with additional elicitation helper.
- */
-export interface ToolExecutionContext extends ModelContextClient {
-    /**
-     * Requests user input for the current tool call.
-     *
-     * This function is bound to the active tool call and should only be used
-     * during execution of that call.
-     */
-    elicitInput(params: ElicitationParams): Promise<ElicitationResult>;
-}
-/**
- * Value that may be returned synchronously or via Promise.
- */
+/** MCP annotations plus WebMCP's untrusted-content hint. */
+export type ToolAnnotations = McpToolAnnotations & WebMcpToolAnnotations;
 export type MaybePromise<T> = T | Promise<T>;
 /**
- * Tool descriptor for the Web Model Context API.
- *
- * Tools are functions that AI models can call to perform actions or retrieve
- * information. This interface uses JSON Schema for input/output typing.
- *
- * @template TArgs - Tool input arguments.
- * @template TResult - Tool execution raw result shape (or full CallToolResult).
- * @template TName - Tool name literal type.
- *
- * @see {@link https://spec.modelcontextprotocol.io/specification/server/tools/}
+ * Tool dictionary accepted by the standard browser API.
+ * @see https://webmachinelearning.github.io/webmcp/#dictdef-modelcontexttool
  */
-export interface ToolDescriptor<TArgs extends Record<string, unknown> = Record<string, unknown>, TResult = ToolRawResult, TName extends string = string> {
-    /**
-     * Unique tool identifier.
-     */
+export interface ModelContextTool<TArgs extends WebMcpToolInput = Record<string, unknown>, TResult = unknown, TName extends string = string> {
     name: TName;
-    /**
-     * Optional user-facing label.
-     */
     title?: string;
-    /**
-     * Human-readable summary of what the tool does.
-     */
     description: string;
-    /**
-     * Schema describing accepted input arguments.
-     */
-    inputSchema?: InputSchema;
-    /**
-     * Optional schema describing output payload shape.
-     */
+    inputSchema?: InputSchema | undefined;
+    annotations?: WebMcpToolAnnotations;
+    execute: (input: TArgs) => MaybePromise<TResult>;
+}
+/** Standard tool dictionary with input inferred from a JSON Schema literal. */
+export type ModelContextToolFromSchema<TInputSchema extends InputSchema, TResult = unknown, TName extends string = string> = Omit<ModelContextTool<InferArgsFromInputSchema<TInputSchema>, TResult, TName>, 'inputSchema'> & {
+    inputSchema: TInputSchema;
+};
+/** MCP-B tool dictionary with output metadata. */
+export type ToolDescriptor<TArgs extends WebMcpToolInput = Record<string, unknown>, TResult = unknown, TName extends string = string> = Omit<ModelContextTool<TArgs, TResult, TName>, 'annotations'> & {
     outputSchema?: JsonSchemaForInference;
-    /**
-     * Optional behavior hints for LLM planners.
-     */
     annotations?: ToolAnnotations;
-    /**
-     * Tool execution function.
-     */
-    execute: (args: TArgs, client: ModelContextClient) => MaybePromise<ToolExecuteResult<TResult>>;
-}
-/**
- * Tool response shape inferred from an `outputSchema`.
- *
- * When a literal object output schema is provided, `structuredContent` is
- * narrowed to the inferred schema type for wrapped MCP responses.
- *
- * @template TOutputSchema - Optional literal JSON object schema.
- */
-export type ToolResultFromOutputSchema<TOutputSchema extends JsonSchemaForInference | undefined = undefined> = TOutputSchema extends JsonSchemaForInference ? Omit<CallToolResult, 'structuredContent'> & {
+};
+/** MCP response with `structuredContent` inferred from an output schema. */
+export type ToolResultFromOutputSchema<TOutputSchema extends JsonSchemaForInference | undefined = undefined> = [TOutputSchema] extends [undefined] ? CallToolResult : TOutputSchema extends JsonSchemaForInference ? Omit<CallToolResult, 'structuredContent'> & {
     structuredContent: InferJsonSchema<TOutputSchema>;
-} : CallToolResult;
-/**
- * Execute result typing derived from an optional output schema.
- */
-export type ToolExecuteResultFromOutputSchema<TOutputSchema extends JsonSchemaForInference | undefined = undefined> = TOutputSchema extends JsonSchemaForInference ? InferJsonSchema<TOutputSchema> | ToolResultFromOutputSchema<TOutputSchema> : ToolExecuteResult;
-/**
- * Tool descriptor whose `execute` args are inferred from a JSON Schema.
- *
- * For widened/non-literal schemas, arguments fall back to `Record<string, unknown>`.
- * When `outputSchema` is an inferable literal object schema, `structuredContent` is inferred.
- *
- * @template TInputSchema - JSON Schema for tool arguments.
- * @template TOutputSchema - Optional JSON schema for `structuredContent`.
- * @template TName - Tool name literal type.
- * @template TResult - Optional result type override constrained by inferred output schema.
- */
-export type ToolDescriptorFromSchema<TInputSchema extends {
-    type?: string | readonly string[];
-}, TOutputSchema extends JsonSchemaForInference | undefined = undefined, TName extends string = string> = Omit<ToolDescriptor<InferArgsFromInputSchema<TInputSchema>, ToolExecuteResultFromOutputSchema<TOutputSchema>, TName>, 'execute' | 'inputSchema' | 'outputSchema'> & {
+} : never;
+type ExecuteResult<TOutputSchema extends JsonSchemaForInference | undefined> = [
+    TOutputSchema
+] extends [undefined] ? unknown : TOutputSchema extends JsonSchemaForInference ? InferJsonSchema<TOutputSchema> | ToolResultFromOutputSchema<TOutputSchema> : never;
+/** Tool dictionary with input and output inferred from JSON Schema literals. */
+export type ToolDescriptorFromSchema<TInputSchema extends InputSchema, TOutputSchema extends JsonSchemaForInference | undefined = undefined, TName extends string = string> = Omit<ToolDescriptor<InferArgsFromInputSchema<TInputSchema>, ExecuteResult<TOutputSchema>, TName>, 'inputSchema' | 'outputSchema'> & {
     inputSchema: TInputSchema;
-    execute: (args: InferArgsFromInputSchema<TInputSchema>, client: ModelContextClient) => MaybePromise<ToolExecuteResultFromOutputSchema<TOutputSchema>>;
-} & (TOutputSchema extends JsonSchemaForInference ? {
-    outputSchema: TOutputSchema;
-} : {
+} & ([TOutputSchema] extends [undefined] ? {
     outputSchema?: undefined;
+} : {
+    outputSchema: TOutputSchema;
 });
-/**
- * Tool information returned by listTools().
- * Provides metadata about a registered tool without exposing the execute function.
- *
- * @template TName - Tool name literal type.
- */
-export interface ToolListItem<TName extends string = string> {
-    /**
-     * Unique tool identifier.
-     */
-    name: TName;
-    /**
-     * Human-readable summary of what the tool does.
-     */
-    description: string;
-    /**
-     * JSON Schema describing accepted input arguments.
-     */
+/** Tool metadata returned by the MCP-B `listTools()` extension. */
+export type ToolListItem<TName extends string = string> = Omit<ToolDescriptor<Record<string, unknown>, unknown, TName>, 'execute' | 'inputSchema'> & {
     inputSchema: InputSchema;
-    /**
-     * Optional JSON Schema describing output payload shape.
-     */
-    outputSchema?: JsonSchemaForInference;
-    /**
-     * Optional behavior hints for LLM planners.
-     */
-    annotations?: ToolAnnotations;
-}
+};
+export {};
 //# sourceMappingURL=tool.d.ts.map

package/dist/tool.d.ts.map

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