@openrouter/mcp 0.0.1 → 1.1.0

package/README.md

@@ -1,5 +1,11 @@
 # @openrouter/mcp
 
+> [!NOTE]
+> This package is a migration-only compatibility facade. New code should import
+> the canonical `@openrouter/agent/mcp` subpath. Existing `@openrouter/mcp` root
+> and subpath imports remain functional and would only be removed in a future
+> breaking release after migration notice.
+
 Expose the tools of a remote [Model Context Protocol](https://modelcontextprotocol.io) server
 (Streamable HTTP or SSE) as tools you can pass straight into
 [`@openrouter/agent`](https://www.npmjs.com/package/@openrouter/agent)'s `callModel`.
@@ -14,16 +20,41 @@ Expose the tools of a remote [Model Context Protocol](https://modelcontextprotoc
 
 ## Install
 
+For new code, install the agent plus the optional MCP peer:
+
+```bash
+pnpm add @openrouter/agent @modelcontextprotocol/client
+```
+
+Existing applications can keep installing only the compatibility package; it retains `@modelcontextprotocol/client` as a dependency, so the prior transitive-install behavior is unchanged:
+
 ```bash
-pnpm add @openrouter/mcp @openrouter/agent
+pnpm add @openrouter/mcp
 ```
 
+The agent package is marked `sideEffects: false`, and MCP code is exposed only
+through explicit `/mcp` exports. Root and `/tool-set` imports do not statically
+load MCP modules; the MCP SDK is not installed transitively for base agent users.
+The `/mcp` entry point also loads the optional SDK lazily: importing it is safe
+without the peer, while the first connection attempt throws an actionable
+`MCPMissingPeerDependencyError` when the SDK has not been installed.
+
+## Compatibility subpaths
+
+| Existing facade | Canonical replacement |
+| --- | --- |
+| `@openrouter/mcp` | `@openrouter/agent/mcp` |
+| `@openrouter/mcp/create-mcp-tools` | `@openrouter/agent/mcp/create-mcp-tools` |
+| `@openrouter/mcp/types` | `@openrouter/agent/mcp/types` |
+| `@openrouter/mcp/schema` | `@openrouter/agent/mcp/schema` |
+| `@openrouter/mcp/cache` | `@openrouter/agent/mcp/cache` |
+
 ## Quick start
 
 ```ts
 import { OpenRouter } from '@openrouter/agent';
 import { callModel } from '@openrouter/agent/call-model';
-import { createMCPTools } from '@openrouter/mcp';
+import { createMCPTools } from '@openrouter/agent/mcp';
 
 const client = new OpenRouter({ apiKey: process.env.OPENROUTER_API_KEY });
 
@@ -63,7 +94,7 @@ automatically.
 Persist a snapshot and rebuild later without a `listTools()` round-trip:
 
 ```ts
-import { createMCPTools, rehydrateMCPTools } from '@openrouter/mcp';
+import { createMCPTools, rehydrateMCPTools } from '@openrouter/agent/mcp';
 
 const mcp = await createMCPTools({ url, auth, cacheCredentials: true });
 const snapshot = await mcp.serialize();   // plain JSON — store anywhere
@@ -75,7 +106,7 @@ const mcp2 = await rehydrateMCPTools({ snapshot, auth });
 Or let a store manage it (rehydrate on hit, connect + write on miss):
 
 ```ts
-import { InMemoryMCPCacheStore } from '@openrouter/mcp';
+import { InMemoryMCPCacheStore } from '@openrouter/agent/mcp';
 
 const store = new InMemoryMCPCacheStore(); // or your own Redis/DB-backed MCPCacheStore
 const mcp = await createMCPTools({

package/esm/cache.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @deprecated Import from `@openrouter/agent/mcp/cache` instead.
+ * This compatibility subpath remains available for migration.
+ */
+export type { MCPCacheStore } from '@openrouter/agent/mcp/cache';
+export { defaultCacheKey, InMemoryMCPCacheStore } from '@openrouter/agent/mcp/cache';
+//# sourceMappingURL=cache.d.ts.map

package/esm/cache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,YAAY,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC"}

package/esm/cache.js

@@ -0,0 +1,2 @@
+export { defaultCacheKey, InMemoryMCPCacheStore } from '@openrouter/agent/mcp/cache';
+//# sourceMappingURL=cache.js.map

package/esm/cache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC"}

package/esm/create-mcp-tools.d.ts

@@ -1,13 +1,7 @@
-import type { SerializedMCPServer } from './cache/cache-types.js';
-import type { CreateMCPToolsOptions, MCPToolsHandle } from './types.js';
 /**
- * Connect to a remote MCP server, discover its tools, and return a handle whose
- * `.tools` can be passed straight into `callModel({ tools })`. Auth is supplied
- * once and reused for discovery and every subsequent tool call.
- *
- * When `cache` is provided, a valid non-stale snapshot is rehydrated instead of
- * re-listing; otherwise the fresh result is written back to the cache.
+ * @deprecated Import from `@openrouter/agent/mcp/create-mcp-tools` instead.
+ * This compatibility subpath remains available for migration.
  */
-export declare function createMCPTools(options: CreateMCPToolsOptions): Promise<MCPToolsHandle>;
-export type { SerializedMCPServer };
+export type { SerializedMCPServer } from '@openrouter/agent/mcp/create-mcp-tools';
+export { createMCPTools } from '@openrouter/agent/mcp/create-mcp-tools';
 //# sourceMappingURL=create-mcp-tools.d.ts.map

package/esm/create-mcp-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-mcp-tools.d.ts","sourceRoot":"","sources":["../src/create-mcp-tools.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAKlE,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAExE;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,cAAc,CAAC,CAY5F;AA8DD,YAAY,EAAE,mBAAmB,EAAE,CAAC"}
+{"version":3,"file":"create-mcp-tools.d.ts","sourceRoot":"","sources":["../src/create-mcp-tools.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,YAAY,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC"}

package/esm/create-mcp-tools.js

@@ -1,75 +1,6 @@
-import { defaultCacheKey } from './cache/cache-store.js';
-import { isSerializedMCPServer } from './cache/cache-types.js';
-import { freshConnect, normalizeUrl } from './handle.js';
-import { rehydrateMCPTools } from './rehydrate.js';
 /**
- * Connect to a remote MCP server, discover its tools, and return a handle whose
- * `.tools` can be passed straight into `callModel({ tools })`. Auth is supplied
- * once and reused for discovery and every subsequent tool call.
- *
- * When `cache` is provided, a valid non-stale snapshot is rehydrated instead of
- * re-listing; otherwise the fresh result is written back to the cache.
+ * @deprecated Import from `@openrouter/agent/mcp/create-mcp-tools` instead.
+ * This compatibility subpath remains available for migration.
  */
-export async function createMCPTools(options) {
-    const url = normalizeUrl(options.url);
-    const cacheKey = options.cache?.key ?? defaultCacheKey(url.href);
-    if (options.cache !== undefined) {
-        const hit = await tryCacheHit(options, options.cache.store, cacheKey);
-        if (hit !== undefined) {
-            return hit;
-        }
-    }
-    return freshConnect(options, url, cacheKey);
-}
-// Option keys forwarded verbatim from a cache-hit `createMCPTools` call into
-// `rehydrateMCPTools`, so a warm handle applies the same auth, filters, prefix,
-// and credential-caching behavior as a cold one.
-const FORWARDED_REHYDRATE_KEYS = [
-    'auth',
-    'fetch',
-    'clientInfo',
-    'onUnconvertibleSchema',
-    'onElicitation',
-    'signal',
-    'toolNamePrefix',
-    'includeTools',
-    'excludeTools',
-    'resources',
-    'emitProgress',
-    'autoRefreshOnListChanged',
-    'cacheCredentials',
-];
-/** Copy the defined forwarded options from `createMCPTools` into a rehydrate base. */
-function forwardedRehydrateOptions(options) {
-    const out = {};
-    for (const key of FORWARDED_REHYDRATE_KEYS) {
-        const value = options[key];
-        if (value !== undefined) {
-            Object.assign(out, {
-                [key]: value,
-            });
-        }
-    }
-    return out;
-}
-async function tryCacheHit(options, store, cacheKey) {
-    const snapshot = await store.get(cacheKey);
-    if (snapshot === null || snapshot === undefined || !isSerializedMCPServer(snapshot)) {
-        return undefined;
-    }
-    const maxAge = options.staleness?.maxAgeMs;
-    if (maxAge !== undefined && Date.now() - snapshot.cachedAt > maxAge) {
-        return undefined;
-    }
-    // Defer to rehydrate, which reconnects and falls back to a fresh connect on
-    // expiry.
-    return rehydrateMCPTools({
-        snapshot,
-        ...forwardedRehydrateOptions(options),
-        cache: {
-            store,
-            key: cacheKey,
-        },
-    });
-}
+export { createMCPTools } from '@openrouter/agent/mcp/create-mcp-tools';
 //# sourceMappingURL=create-mcp-tools.js.map

package/esm/create-mcp-tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-mcp-tools.js","sourceRoot":"","sources":["../src/create-mcp-tools.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAGnD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAA8B;IACjE,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEjE,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACtE,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtB,OAAO,GAAG,CAAC;QACb,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;AAC9C,CAAC;AAED,6EAA6E;AAC7E,gFAAgF;AAChF,iDAAiD;AACjD,MAAM,wBAAwB,GAAG;IAC/B,MAAM;IACN,OAAO;IACP,YAAY;IACZ,uBAAuB;IACvB,eAAe;IACf,QAAQ;IACR,gBAAgB;IAChB,cAAc;IACd,cAAc;IACd,WAAW;IACX,cAAc;IACd,0BAA0B;IAC1B,kBAAkB;CAC0E,CAAC;AAE/F,sFAAsF;AACtF,SAAS,yBAAyB,CAChC,OAA8B;IAE9B,MAAM,GAAG,GAAsC,EAAE,CAAC;IAClD,KAAK,MAAM,GAAG,IAAI,wBAAwB,EAAE,CAAC;QAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE;gBACjB,CAAC,GAAG,CAAC,EAAE,KAAK;aACb,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,OAA8B,EAC9B,KAAoB,EACpB,QAAgB;IAEhB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC3C,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpF,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC;IAC3C,IAAI,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,QAAQ,GAAG,MAAM,EAAE,CAAC;QACpE,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,4EAA4E;IAC5E,UAAU;IACV,OAAO,iBAAiB,CAAC;QACvB,QAAQ;QACR,GAAG,yBAAyB,CAAC,OAAO,CAAC;QACrC,KAAK,EAAE;YACL,KAAK;YACL,GAAG,EAAE,QAAQ;SACd;KACF,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"create-mcp-tools.js","sourceRoot":"","sources":["../src/create-mcp-tools.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC"}

package/esm/index.d.ts

@@ -1,13 +1,9 @@
-export type { MCPAuth } from './auth/auth-types.js';
-export type { MCPCacheStore } from './cache/cache-store.js';
-export { defaultCacheKey, InMemoryMCPCacheStore } from './cache/cache-store.js';
-export type { SerializedMCPServer, SerializedMCPToolDef, SerializedTokenSet, } from './cache/cache-types.js';
-export { isSerializedMCPServer } from './cache/cache-types.js';
-export { createMCPTools } from './create-mcp-tools.js';
-export { MCPCacheError, MCPConnectionError, MCPError, MCPToolCallError, } from './errors.js';
-export type { RehydrateMCPToolsOptions } from './rehydrate.js';
-export { rehydrateMCPTools } from './rehydrate.js';
-export type { UnconvertibleSchemaMode } from './schema/json-schema-to-zod.js';
-export { convertMcpInputSchema } from './schema/json-schema-to-zod.js';
-export type { CreateMCPToolsOptions, ElicitationHandler, ElicitationResponse, MCPToolsHandle, MCPTransportKind, ResourcesOption, } from './types.js';
+/**
+ * Compatibility facade for the canonical `@openrouter/agent/mcp` integration.
+ *
+ * @deprecated Import from `@openrouter/agent/mcp` instead. This facade remains
+ * available for migration and may be removed only in a future breaking release.
+ */
+export type { CreateMCPToolsOptions, ElicitationHandler, ElicitationResponse, MCPAuth, MCPCacheStore, MCPOAuthClientProvider, MCPProtocolNegotiation, MCPProtocolRevision, MCPToolsHandle, MCPTransportKind, RehydrateMCPToolsOptions, ResourcesOption, SerializedMCPServer, SerializedMCPToolDef, SerializedTokenSet, UnconvertibleSchemaMode, } from '@openrouter/agent/mcp';
+export { convertMcpInputSchema, createMCPTools, defaultCacheKey, InMemoryMCPCacheStore, isSerializedMCPServer, MCPCacheError, MCPCacheWriteError, MCPConnectionError, MCPError, MCPMissingPeerDependencyError, MCPStaleSnapshotError, MCPToolCallError, rehydrateMCPTools, } from '@openrouter/agent/mcp';
 //# sourceMappingURL=index.d.ts.map

package/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,YAAY,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,YAAY,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAChF,YAAY,EACV,mBAAmB,EACnB,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EACL,aAAa,EACb,kBAAkB,EAClB,QAAQ,EACR,gBAAgB,GACjB,MAAM,aAAa,CAAC;AACrB,YAAY,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,YAAY,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAE9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,YAAY,EACV,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,cAAc,EACd,gBAAgB,EAChB,eAAe,GAChB,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,YAAY,EACV,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,OAAO,EACP,aAAa,EACb,sBAAsB,EACtB,sBAAsB,EACtB,mBAAmB,EACnB,cAAc,EACd,gBAAgB,EAChB,wBAAwB,EACxB,eAAe,EACf,mBAAmB,EACnB,oBAAoB,EACpB,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,qBAAqB,EACrB,cAAc,EACd,eAAe,EACf,qBAAqB,EACrB,qBAAqB,EACrB,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,QAAQ,EACR,6BAA6B,EAC7B,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,uBAAuB,CAAC"}

package/esm/index.js

@@ -1,11 +1,2 @@
-// Main factory + rehydration
-// Cache
-export { defaultCacheKey, InMemoryMCPCacheStore } from './cache/cache-store.js';
-export { isSerializedMCPServer } from './cache/cache-types.js';
-export { createMCPTools } from './create-mcp-tools.js';
-// Errors
-export { MCPCacheError, MCPConnectionError, MCPError, MCPToolCallError, } from './errors.js';
-export { rehydrateMCPTools } from './rehydrate.js';
-// Schema conversion (exported for testing/reuse)
-export { convertMcpInputSchema } from './schema/json-schema-to-zod.js';
+export { convertMcpInputSchema, createMCPTools, defaultCacheKey, InMemoryMCPCacheStore, isSerializedMCPServer, MCPCacheError, MCPCacheWriteError, MCPConnectionError, MCPError, MCPMissingPeerDependencyError, MCPStaleSnapshotError, MCPToolCallError, rehydrateMCPTools, } from '@openrouter/agent/mcp';
 //# sourceMappingURL=index.js.map

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAK7B,QAAQ;AACR,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAMhF,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,SAAS;AACT,OAAO,EACL,aAAa,EACb,kBAAkB,EAClB,QAAQ,EACR,gBAAgB,GACjB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,iDAAiD;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAwBA,OAAO,EACL,qBAAqB,EACrB,cAAc,EACd,eAAe,EACf,qBAAqB,EACrB,qBAAqB,EACrB,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,QAAQ,EACR,6BAA6B,EAC7B,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,uBAAuB,CAAC"}

package/esm/schema.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @deprecated Import from `@openrouter/agent/mcp/schema` instead.
+ * This compatibility subpath remains available for migration.
+ */
+export type { UnconvertibleSchemaMode } from '@openrouter/agent/mcp/schema';
+export { convertMcpInputSchema } from '@openrouter/agent/mcp/schema';
+//# sourceMappingURL=schema.d.ts.map

package/esm/schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,YAAY,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC"}

package/esm/schema.js

@@ -0,0 +1,2 @@
+export { convertMcpInputSchema } from '@openrouter/agent/mcp/schema';
+//# sourceMappingURL=schema.js.map

package/esm/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC"}

package/esm/types.d.ts

@@ -1,104 +1,6 @@
-import type { Tool } from '@openrouter/agent/tool-types';
-import type { MCPAuth } from './auth/auth-types.js';
-import type { MCPCacheStore } from './cache/cache-store.js';
-import type { UnconvertibleSchemaMode } from './schema/json-schema-to-zod.js';
-import type { MCPTransportKind } from './transport-types.js';
-export type { MCPTransportKind };
 /**
- * Response to a server-initiated elicitation request. `accept` must carry
- * `content` matching the server's `requestedSchema`.
+ * @deprecated Import from `@openrouter/agent/mcp/types` instead.
+ * This compatibility subpath remains available for migration.
  */
-export type ElicitationResponse = {
-    action: 'accept';
-    content: Record<string, unknown>;
-} | {
-    action: 'decline';
-} | {
-    action: 'cancel';
-};
-/**
- * Handler for server-initiated `elicitation/create` requests during a tool
- * call. If omitted from options, requests are auto-declined so a tool call
- * needing input fails gracefully rather than hanging.
- */
-export type ElicitationHandler = (request: {
-    message: string;
-    requestedSchema: Record<string, unknown>;
-}) => Promise<ElicitationResponse> | ElicitationResponse;
-/** How MCP resources are exposed to the model. */
-export type ResourcesOption = boolean | {
-    mode?: 'synthetic-tools';
-};
-export interface CreateMCPToolsOptions {
-    /** Remote MCP server endpoint. */
-    url: string | URL;
-    /** Transport to use; defaults to `streamableHttp` with SSE fallback. */
-    transport?: MCPTransportKind;
-    /** Authentication, supplied once and reused for discovery + every call. */
-    auth?: MCPAuth;
-    /** Custom fetch implementation for all network requests. */
-    fetch?: typeof fetch;
-    /** Client identity sent during `initialize`. */
-    clientInfo?: {
-        name: string;
-        version: string;
-    };
-    /** Prefix applied to every wrapped tool name (e.g. `"github_"`). */
-    toolNamePrefix?: string;
-    /**
-     * Allow-list of MCP tool names to expose. Applies to discovered MCP tools
-     * only; synthetic `list_resources`/`read_resource` tools are controlled
-     * exclusively by `resources`.
-     */
-    includeTools?: readonly string[];
-    /**
-     * Deny-list of MCP tool names to skip. Applies to discovered MCP tools only;
-     * synthetic `list_resources`/`read_resource` tools are controlled
-     * exclusively by `resources`.
-     */
-    excludeTools?: readonly string[];
-    /** Behavior when a tool's JSON Schema can't be fully represented in Zod. */
-    onUnconvertibleSchema?: UnconvertibleSchemaMode;
-    /** Cache store + key for automatic rehydrate-on-hit / write-on-miss. */
-    cache?: {
-        store: MCPCacheStore;
-        key?: string;
-    };
-    /** Persist resolved tokens/session into the snapshot. Off by default. */
-    cacheCredentials?: boolean;
-    /** Re-list tools when a cached snapshot is older than this. */
-    staleness?: {
-        maxAgeMs?: number;
-    };
-    /** Expose resources as synthetic `list_resources`/`read_resource` tools. */
-    resources?: ResourcesOption;
-    /** Map MCP progress notifications to generator-tool events. Default true. */
-    emitProgress?: boolean;
-    /** Auto-refresh tools on `tools/list_changed`. Default true when connected. */
-    autoRefreshOnListChanged?: boolean;
-    /** Handler for server-initiated elicitation; auto-declines when omitted. */
-    onElicitation?: ElicitationHandler;
-    /** Abort signal threaded into every underlying `callTool`. */
-    signal?: AbortSignal;
-}
-/**
- * Handle returned by {@link createMCPTools}/`rehydrateMCPTools`. Holds a live
- * connection (unless rehydrated offline) and the wrapped tools.
- */
-export interface MCPToolsHandle {
-    /** Tools ready to pass into `callModel({ tools })`. */
-    readonly tools: readonly Tool[];
-    readonly serverInfo?: {
-        name?: string;
-        version?: string;
-    };
-    /** Snapshot for persistence; omits credentials unless `cacheCredentials`. */
-    serialize(): Promise<import('./cache/cache-types.js').SerializedMCPServer>;
-    /** Force a fresh `listTools()` and rebuild the tool set. */
-    refresh(): Promise<readonly Tool[]>;
-    /** Subscribe to auto-refreshes triggered by `tools/list_changed`. */
-    onToolsChanged(listener: (tools: readonly Tool[]) => void): () => void;
-    /** Close the transport and underlying client. */
-    close(): Promise<void>;
-}
+export type { CreateMCPToolsOptions, ElicitationHandler, ElicitationResponse, MCPProtocolNegotiation, MCPProtocolRevision, MCPToolsHandle, MCPTransportKind, ResourcesOption, } from '@openrouter/agent/mcp/types';
 //# sourceMappingURL=types.d.ts.map

package/esm/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,YAAY,EAAE,gBAAgB,EAAE,CAAC;AAEjC;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAC3B;IACE,MAAM,EAAE,QAAQ,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC,GACD;IACE,MAAM,EAAE,SAAS,CAAC;CACnB,GACD;IACE,MAAM,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEN;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1C,KAAK,OAAO,CAAC,mBAAmB,CAAC,GAAG,mBAAmB,CAAC;AAEzD,kDAAkD;AAClD,MAAM,MAAM,eAAe,GACvB,OAAO,GACP;IACE,IAAI,CAAC,EAAE,iBAAiB,CAAC;CAC1B,CAAC;AAEN,MAAM,WAAW,qBAAqB;IACpC,kCAAkC;IAClC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;IAClB,wEAAwE;IACxE,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,2EAA2E;IAC3E,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,4DAA4D;IAC5D,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,gDAAgD;IAChD,UAAU,CAAC,EAAE;QACX,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,oEAAoE;IACpE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;OAIG;IACH,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC;;;;OAIG;IACH,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,4EAA4E;IAC5E,qBAAqB,CAAC,EAAE,uBAAuB,CAAC;IAChD,wEAAwE;IACxE,KAAK,CAAC,EAAE;QACN,KAAK,EAAE,aAAa,CAAC;QACrB,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,CAAC;IACF,yEAAyE;IACzE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,+DAA+D;IAC/D,SAAS,CAAC,EAAE;QACV,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,4EAA4E;IAC5E,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,6EAA6E;IAC7E,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,+EAA+E;IAC/E,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,4EAA4E;IAC5E,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,8DAA8D;IAC9D,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,uDAAuD;IACvD,QAAQ,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,CAAC;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE;QACpB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,6EAA6E;IAC7E,SAAS,IAAI,OAAO,CAAC,OAAO,wBAAwB,EAAE,mBAAmB,CAAC,CAAC;IAC3E,4DAA4D;IAC5D,OAAO,IAAI,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IACpC,qEAAqE;IACrE,cAAc,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACvE,iDAAiD;IACjD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,YAAY,EACV,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,mBAAmB,EACnB,cAAc,EACd,gBAAgB,EAChB,eAAe,GAChB,MAAM,6BAA6B,CAAC"}

package/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@openrouter/mcp",
-  "version": "0.0.1",
+  "version": "1.1.0",
+  "engines": {
+    "node": ">=20"
+  },
   "author": "OpenRouter",
   "description": "Expose remote MCP server tools (Streamable HTTP / SSE) as tools for @openrouter/agent's callModel, with serializable caching and pluggable auth.",
   "keywords": [
@@ -30,12 +33,12 @@
       "default": "./esm/types.js"
     },
     "./schema": {
-      "types": "./esm/schema/json-schema-to-zod.d.ts",
-      "default": "./esm/schema/json-schema-to-zod.js"
+      "types": "./esm/schema.d.ts",
+      "default": "./esm/schema.js"
     },
     "./cache": {
-      "types": "./esm/cache/cache-store.d.ts",
-      "default": "./esm/cache/cache-store.js"
+      "types": "./esm/cache.d.ts",
+      "default": "./esm/cache.js"
     },
     "./package.json": "./package.json"
   },
@@ -54,19 +57,17 @@
     "package.json",
     "README.md"
   ],
+  "dependencies": {
+    "@modelcontextprotocol/client": "^2.0.0",
+    "@openrouter/agent": "0.10.0"
+  },
   "scripts": {
     "lint": "biome check src tests",
     "lint:fix": "biome check --write src tests",
     "build": "tsc",
     "test": "vitest --run --project unit",
-    "test:e2e": "vitest --run --project e2e",
     "test:watch": "vitest --watch --project unit",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "pnpm run build && tsc --noEmit -p tsconfig.typecheck.json",
     "compile": "tsc"
-  },
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.29.0",
-    "@openrouter/agent": "workspace:*",
-    "zod": "^4.0.0"
   }
-}
+}

package/esm/auth/auth-resolver.d.ts

@@ -1,14 +0,0 @@
-import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
-import type { MCPAuth } from './auth-types.js';
-/**
- * The transport-level pieces derived from an {@link MCPAuth}: static headers to
- * merge into `requestInit`, and/or an OAuth provider to hand to the transport.
- * Both flow into the same connected client, so discovery and tool calls share
- * one authenticated session.
- */
-export interface ResolvedAuth {
-    headers: Record<string, string>;
-    authProvider?: OAuthClientProvider;
-}
-export declare function resolveAuth(auth: MCPAuth | undefined): ResolvedAuth;
-//# sourceMappingURL=auth-resolver.d.ts.map

package/esm/auth/auth-resolver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"auth-resolver.d.ts","sourceRoot":"","sources":["../../src/auth/auth-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,YAAY,CAyBnE"}

package/esm/auth/auth-resolver.js

@@ -1,27 +0,0 @@
-export function resolveAuth(auth) {
-    if (auth === undefined) {
-        return {
-            headers: {},
-        };
-    }
-    switch (auth.kind) {
-        case 'bearer':
-            return {
-                headers: {
-                    Authorization: `Bearer ${auth.token}`,
-                },
-            };
-        case 'headers':
-            return {
-                headers: {
-                    ...auth.headers,
-                },
-            };
-        case 'oauth':
-            return {
-                headers: {},
-                authProvider: auth.provider,
-            };
-    }
-}
-//# sourceMappingURL=auth-resolver.js.map

package/esm/auth/auth-resolver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"auth-resolver.js","sourceRoot":"","sources":["../../src/auth/auth-resolver.ts"],"names":[],"mappings":"AAcA,MAAM,UAAU,WAAW,CAAC,IAAyB;IACnD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO;YACL,OAAO,EAAE,EAAE;SACZ,CAAC;IACJ,CAAC;IACD,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO;gBACL,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,IAAI,CAAC,KAAK,EAAE;iBACtC;aACF,CAAC;QACJ,KAAK,SAAS;YACZ,OAAO;gBACL,OAAO,EAAE;oBACP,GAAG,IAAI,CAAC,OAAO;iBAChB;aACF,CAAC;QACJ,KAAK,OAAO;YACV,OAAO;gBACL,OAAO,EAAE,EAAE;gBACX,YAAY,EAAE,IAAI,CAAC,QAAQ;aAC5B,CAAC;IACN,CAAC;AACH,CAAC"}

package/esm/auth/auth-types.d.ts

@@ -1,25 +0,0 @@
-import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
-/**
- * Authentication for a remote MCP server. Supplied once and reused by the
- * connected client for tool discovery and every subsequent tool call.
- *
- * - `bearer`: a static bearer token sent as `Authorization: Bearer <token>`.
- * - `headers`: arbitrary static headers (e.g. API keys, custom auth schemes).
- * - `oauth`: a user-supplied {@link OAuthClientProvider} that owns token
- *   acquisition/refresh. Preferred over caching static tokens.
- */
-export type MCPAuth = {
-    kind: 'bearer';
-    token: string;
-} | {
-    kind: 'headers';
-    headers: Readonly<Record<string, string>>;
-} | {
-    kind: 'oauth';
-    provider: OAuthClientProvider;
-};
-export declare function isOAuthAuth(auth: MCPAuth | undefined): auth is {
-    kind: 'oauth';
-    provider: OAuthClientProvider;
-};
-//# sourceMappingURL=auth-types.d.ts.map

package/esm/auth/auth-types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"auth-types.d.ts","sourceRoot":"","sources":["../../src/auth/auth-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAEpF;;;;;;;;GAQG;AACH,MAAM,MAAM,OAAO,GACf;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,GACD;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CAC3C,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,mBAAmB,CAAC;CAC/B,CAAC;AAEN,wBAAgB,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI,IAAI;IAC9D,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,mBAAmB,CAAC;CAC/B,CAEA"}

package/esm/auth/auth-types.js

@@ -1,4 +0,0 @@
-export function isOAuthAuth(auth) {
-    return auth?.kind === 'oauth';
-}
-//# sourceMappingURL=auth-types.js.map

package/esm/auth/auth-types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"auth-types.js","sourceRoot":"","sources":["../../src/auth/auth-types.ts"],"names":[],"mappings":"AAyBA,MAAM,UAAU,WAAW,CAAC,IAAyB;IAInD,OAAO,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC;AAChC,CAAC"}

package/esm/build-tools.d.ts

@@ -1,27 +0,0 @@
-import type { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import type { Tool } from '@openrouter/agent/tool-types';
-import type { UnconvertibleSchemaMode } from './schema/json-schema-to-zod.js';
-import type { McpToolDef } from './tool-wrapper.js';
-import type { ResourcesOption } from './types.js';
-export interface BuildToolsOptions {
-    client: Client;
-    toolDefs: readonly McpToolDef[];
-    namePrefix?: string;
-    includeTools?: readonly string[];
-    excludeTools?: readonly string[];
-    schemaMode?: UnconvertibleSchemaMode;
-    emitProgress?: boolean;
-    signal?: AbortSignal;
-    resources?: ResourcesOption;
-    /** Whether the server advertised the resources capability. */
-    serverHasResources: boolean;
-}
-/** Apply allow/deny filters to discovered MCP tool definitions. */
-export declare function filterToolDefs(defs: readonly McpToolDef[], includeTools?: readonly string[], excludeTools?: readonly string[]): McpToolDef[];
-/**
- * Build the full ordered tool list for a handle: filtered + wrapped MCP tools,
- * plus synthetic resource tools when enabled. Throws on a name collision so two
- * tools never silently shadow each other in `callModel`.
- */
-export declare function buildTools(options: BuildToolsOptions): Tool[];
-//# sourceMappingURL=build-tools.d.ts.map

package/esm/build-tools.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"build-tools.d.ts","sourceRoot":"","sources":["../src/build-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAGzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,SAAS,UAAU,EAAE,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,8DAA8D;IAC9D,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AASD,mEAAmE;AACnE,wBAAgB,cAAc,CAC5B,IAAI,EAAE,SAAS,UAAU,EAAE,EAC3B,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,EAChC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,GAC/B,UAAU,EAAE,CASd;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI,EAAE,CAqC7D"}